pathtrace 2.1.0 → 2.1.2

package/dist/types.d.ts

@@ -1,13 +1,13 @@
-export type ObjectLiteral = Record<string | number, any>;
-type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
+export type ObjectLiteral = Record<PropertyKey, any>;
+type ToWrappedNumber<T> = T extends `[${number}]` ? T : T extends number ? `[${T}]` : T;
 type PrevIndex = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
-type KeyConcat<A extends string | number, B extends string | number> = B extends `${number}` | number ? `${A}[${B}]` : B extends `[${number}]` ? `${A}${B}` : `${A}.${B}`;
-type EscapeKey<T extends string | number> = T extends `${infer A}.${infer B}` ? `${A}\\.${EscapeKey<B>}` : T extends `[${number}]` ? `\\[${T}\\]` : T;
+type KeyConcat<A extends string | number, B extends string | number> = A extends number | `[${number}]` ? (B extends number | `[${number}]` ? `${ToWrappedNumber<A>}${ToWrappedNumber<B>}` : `${ToWrappedNumber<A>}.${B}`) : B extends number | `[${number}]` ? `${A}${ToWrappedNumber<B>}` : `${A}.${B}`;
+type EscapeKey<T extends string | number> = T extends `[${infer U}]` ? `\\[${U}\\]` : T;
 type Glob = '*' | '**';
-type GlobPaths<T extends string | number, Depth extends number = 4> = [Depth] extends [0] ? never : T extends Glob | `${Glob}.${string | number}` ? never : T extends `${infer A}.${infer B}` ? EscapeKey<A> | KeyConcat<EscapeKey<A>, GlobPaths<B, PrevIndex[Depth]>> : T extends string | number ? T : never;
-type ArrayPaths<K extends string | number, P> = P extends string | number ? (KeyConcat<K, number> | KeyConcat<KeyConcat<K, number>, P> | KeyConcat<'**', GlobPaths<P>> | K) : never;
-type ObjectPaths<K extends string | number, P> = P extends string | number ? (KeyConcat<K, P> | KeyConcat<K, '*'> | KeyConcat<K, '**'> | KeyConcat<'*', P> | KeyConcat<'**', GlobPaths<P>> | K) : never;
+type GlobNext<T extends string | number, Depth extends number = 4> = [Depth] extends [0] ? never : T extends `${Glob}.${infer U}` ? T | U : T;
+type PathNormalize<T> = T extends `${infer A}.[${infer B}].${infer C}` ? `${A}[${B}].${C}` : T;
+type PathVariants<K extends string | number, P> = P extends string | number ? (PathNormalize<K | KeyConcat<K, P> | KeyConcat<K, '*'> | KeyConcat<K, '**'> | KeyConcat<'*', P> | KeyConcat<'**', GlobNext<P>>>) : never;
 export type Path<T, Depth extends number = 4> = [Depth] extends [0] ? never : T extends ObjectLiteral ? {
-    [Key in keyof T & (string | number)]: T[Key] extends unknown[] ? ArrayPaths<EscapeKey<Key>, Path<ArrayElement<T[Key]>, PrevIndex[Depth]>> : T[Key] extends ObjectLiteral ? ObjectPaths<EscapeKey<Key>, Path<T[Key], PrevIndex[Depth]>> : EscapeKey<Key>;
-}[keyof T & (string | number)] : T extends unknown[] ? Path<ArrayElement<T>, PrevIndex[Depth]> : never;
+    [Key in keyof T & (string | number)]: T[Key] extends (infer U)[] ? EscapeKey<Key> | PathVariants<EscapeKey<Key>, Path<U, PrevIndex[Depth]>> : T[Key] extends ObjectLiteral ? EscapeKey<Key> | PathVariants<EscapeKey<Key>, Path<T[Key], PrevIndex[Depth]>> : EscapeKey<Key>;
+}[keyof T & (string | number)] : never;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pathtrace",
-    "version": "2.1.0",
+    "version": "2.1.2",
     "description": "Simplifies working with nested objects and arrays by providing easy methods to retrieve, set, and check values at any path.",
     "exports": {
         "./package.json": "./package.json",
@@ -20,7 +20,7 @@
         "build:types": "tsc --emitDeclarationOnly -p tsconfig.json",
         "build:js": "rollup -c",
         "build": "rimraf ./dist && cross-env NODE_ENV=production npm run build:js && npm run build:types",
-        "test": "cross-env NODE_ENV=test vitest run",
+        "test": "cross-env NODE_ENV=test vitest run --typecheck",
         "test:coverage": "cross-env NODE_ENV=test vitest run --coverage",
         "lint": "eslint --ext .js,.vue,.ts ./src ./test",
         "lint:fix": "npm run lint -- --fix"