Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"url": "https://github.com/webdeveric/utils/issues"
},
"homepage": "https://github.com/webdeveric/utils/#readme",
"packageManager": "pnpm@9.11.0+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b",
"packageManager": "pnpm@9.13.2+sha512.88c9c3864450350e65a33587ab801acf946d7c814ed1134da4a924f6df5a2120fd36b46aab68f7cd1d413149112d53c7db3a4136624cfd00ff1846a0c6cef48a",
"scripts": {
"clean": "rimraf ./dist/",
"prebuild": "pnpm clean",
Expand All @@ -87,29 +87,23 @@
"prepare": "husky"
},
"prettier": "@webdeveric/prettier-config",
"dependencies": {
"lodash.clonedeep": "^4.5.0",
"lodash.escaperegexp": "^4.1.2"
},
"devDependencies": {
"@types/lodash.clonedeep": "^4.5.9",
"@types/lodash.escaperegexp": "^4.1.9",
"@types/node": "^20.16.10",
"@vitest/coverage-v8": "^2.1.1",
"@types/node": "^20.17.6",
"@vitest/coverage-v8": "^2.1.5",
"@webdeveric/eslint-config-ts": "^0.11.0",
"@webdeveric/prettier-config": "^0.3.0",
"cspell": "^8.14.4",
"cspell": "^8.16.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"husky": "^9.1.6",
"eslint-plugin-import": "^2.31.0",
"husky": "^9.1.7",
"jsdom": "^25.0.1",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"rimraf": "^6.0.1",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"validate-package-exports": "^0.7.0",
"vitest": "^2.1.1"
"vitest": "^2.1.5"
}
}
1,421 changes: 731 additions & 690 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

29 changes: 21 additions & 8 deletions src/describeInput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,24 @@ import { isNumericString } from './predicate/isNumericString.js';

export const describeInput = (input: unknown): string => {
switch (typeof input) {
case 'boolean':
case 'symbol':
return input.toString();
case 'function': {
const args = input.toString().match(/^(function\s*\w*)?(?<args>\([^)]*\))/)?.groups?.args;

return `${input.name || 'anonymous'}${args}`;
}
case 'string':
{
if (isNumericString(input)) {
return 'Numeric String';
}

const tokenMatch = input.match(/^(Basic|Bearer)\s.+/i);
const authType = input.match(/^(?<authType>Basic|Bearer)\s.+/i)?.groups?.authType;

if (Array.isArray(tokenMatch) && tokenMatch[1]) {
return tokenMatch[1];
if (authType) {
return `${authType} Authorization`;
}

if (looksLikeURL(input)) {
Expand All @@ -27,26 +35,31 @@ export const describeInput = (input: unknown): string => {
}
}
break;
case 'number':
if (input === Infinity) {
return 'Infinity';
case 'number': {
if (input === Number.POSITIVE_INFINITY) {
return 'Positive Infinity';
}

if (input === -Infinity) {
if (input === Number.NEGATIVE_INFINITY) {
return 'Negative Infinity';
}

if (Number.isSafeInteger(input)) {
return 'Safe Integer';
}

if (Number.isInteger(input)) {
return 'Integer';
}

if (Number.isFinite(input)) {
return 'Number';
return 'Finite Number';
}

if (Number.isNaN(input)) {
return 'NaN';
}
}
}

return getType(input);
Expand Down
5 changes: 5 additions & 0 deletions src/escapeRegExp.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const pattern = /[.*+?^${}()|[\]\\]/g;

export function escapeRegExp(input: string): string {
return input.length ? input.replace(pattern, '\\$&') : input;
}
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export * from './delay.js';
export * from './delayAnimationFrame.js';
export * from './delayAnimationFrames.js';
export * from './describeInput.js';
export * from './escapeRegExp.js';
export * from './getDateString.js';
export * from './getISODateString.js';
export * from './getMaxValue.js';
Expand Down
4 changes: 1 addition & 3 deletions src/normalize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import cloneDeep from 'lodash.clonedeep';

import { getOwnProperties } from './getOwnProperties.js';
import { isObject } from './predicate/isObject.js';

Expand Down Expand Up @@ -63,7 +61,7 @@ export function normalize<Data extends object, ContextData extends AnyRecord = A
normalizers: AnyNormalizer<Data, Data, ContextData>,
initContextData: ContextInitializer<Data, ContextData> = (): AnyRecord => ({}),
): Data {
const current = cloneDeep(input);
const current = structuredClone(input);

const context: NormalizeContext<Data, ContextData> = Object.seal({
original: input,
Expand Down
2 changes: 1 addition & 1 deletion src/trimEnd.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import escapeRegExp from 'lodash.escaperegexp';
import { escapeRegExp } from './escapeRegExp.js';

export function trimEnd(str: string, char?: string): string {
return char ? str.replace(new RegExp(`${escapeRegExp(char)}+$`), '') : str.trimEnd();
Expand Down
2 changes: 1 addition & 1 deletion src/trimStart.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import escapeRegExp from 'lodash.escaperegexp';
import { escapeRegExp } from './escapeRegExp.js';

export function trimStart(str: string, char?: string): string {
return char ? str.replace(new RegExp(`^${escapeRegExp(char)}+`), '') : str.trimStart();
Expand Down
25 changes: 20 additions & 5 deletions test/describeInput.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,33 @@ import { describeInput } from '../src/describeInput.js';

describe('describeInput()', () => {
it('Returns a string describing the input', () => {
expect(describeInput(true)).toBe('true');
expect(describeInput(false)).toBe('false');
expect(describeInput({})).toBe('Object');
expect(describeInput(Infinity)).toBe('Infinity');
expect(describeInput([])).toBe('Array');
expect(describeInput(new Set())).toBe('Set');
expect(describeInput(() => {})).toBe('anonymous()');
// eslint-disable-next-line @typescript-eslint/no-unused-vars
expect(describeInput(function namedFunction(_name: unknown) {})).toBe('namedFunction(_name)');
// eslint-disable-next-line @typescript-eslint/no-unused-vars
expect(describeInput(function (_name: unknown) {})).toBe('anonymous(_name)');
expect(describeInput(Infinity)).toBe('Positive Infinity');
expect(describeInput(Number.POSITIVE_INFINITY)).toBe('Positive Infinity');
expect(describeInput(-Infinity)).toBe('Negative Infinity');
expect(describeInput(1)).toBe('Integer');
expect(describeInput(1.2)).toBe('Number');
expect(describeInput(Number.NEGATIVE_INFINITY)).toBe('Negative Infinity');
expect(describeInput(-1)).toBe('Safe Integer');
expect(describeInput(2 ** 52)).toBe('Safe Integer');
expect(describeInput(2 ** 53)).toBe('Integer');
expect(describeInput(1.2)).toBe('Finite Number');
expect(describeInput(Number.NaN)).toBe('NaN');
expect(describeInput('123')).toBe('Numeric String');
expect(describeInput('Basic TOKEN')).toBe('Basic');
expect(describeInput('Bearer TOKEN')).toBe('Bearer');
expect(describeInput('Basic TOKEN')).toBe('Basic Authorization');
expect(describeInput('Bearer TOKEN')).toBe('Bearer Authorization');
expect(describeInput('ftp://example.com/')).toContain('URL');
expect(describeInput('https://user:[email protected]/')).toContain('credentials');
expect(describeInput('https:///')).toBe('Invalid URL');
expect(describeInput('Test')).toBe('String');
expect(describeInput(Symbol())).toBe('Symbol()');
expect(describeInput(Symbol('test'))).toBe('Symbol(test)');
});
});
17 changes: 17 additions & 0 deletions test/escapeRegExp.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { describe, expect, it } from 'vitest';

import { escapeRegExp } from '../src/escapeRegExp.js';

describe('escapeRegExp()', () => {
it('escapes special regexp characters', () => {
expect(escapeRegExp('')).toBe('');
expect(escapeRegExp('test')).toBe('test');
expect(escapeRegExp('\\')).toBe('\\\\');
expect(escapeRegExp('image.jpg')).toBe('image\\.jpg');
expect(escapeRegExp('star*')).toBe('star\\*');
expect(escapeRegExp('{}')).toBe('\\{\\}');
expect(escapeRegExp('[]')).toBe('\\[\\]');
expect(escapeRegExp('()')).toBe('\\(\\)');
expect(escapeRegExp('^|+$')).toBe('\\^\\|\\+\\$');
});
});
Loading