zcb 0.3.2 → 0.3.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcb",
   "description": "Build configs with type safety from zod schema.",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/zod-config-builder",

package/src/createConfigReader.test.ts

@@ -56,6 +56,7 @@ describe('createConfigReader', () => {
       it('should throw the expected error', () => {
         const reader = createReader();
 
+        // @ts-expect-error Required to test error
         expect(() => reader.read('pages.contactDetails.sections')).toThrow(
           'Path resolved to an object or an array of objects, but `read` can only resolve to a primitive value or an array of primitives. Use the `scope` method instead',
         );

package/src/types.ts

@@ -55,16 +55,11 @@ export type Primitive = string | number | boolean | bigint | symbol | null | und
 
 export type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...0[]];
 
-export type Leaves<T, LeafPath extends string[] = [], Depth extends number = 10> = Depth extends never
-  ? never
-  : T extends Primitive
-    ? LeafPath
-    : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      T extends readonly any[]
-      ? LeafPath
-      : {
-          [K in keyof T & string]: Leaves<T[K], [...LeafPath, K], Prev[Depth]>;
-        }[keyof T & string];
+export type IsArrayOfPrimitives<T> = T extends readonly (infer U)[]
+  ? Exclude<U, Primitive> extends never
+    ? true
+    : false
+  : false;
 
 export type OwnKeys<T> = Exclude<
   {
@@ -74,6 +69,16 @@ export type OwnKeys<T> = Exclude<
   `${string}[Symbol.${string}`
 >;
 
+export type Leaves<T, LeafPath extends string[] = [], Depth extends number = 10> = Depth extends never
+  ? never
+  : T extends Primitive
+    ? LeafPath
+    : IsArrayOfPrimitives<T> extends true
+      ? LeafPath
+      : {
+          [K in OwnKeys<T>]: Leaves<T[K], [...LeafPath, K], Prev[Depth]>;
+        }[OwnKeys<T>];
+
 export type Paths<T, ScopePath extends string[] = [], Depth extends number = 10> = Depth extends never
   ? never
   : T extends Primitive