zodselect 1.0.14 → 1.0.16

package/dist/build-select-object.d.ts

@@ -6,9 +6,9 @@ export type ZodSelectAll<T extends ZodType<object> | ZodUnion> = {
 /**
  * Produces a runtime select-all object for the given Zod schema.
  *
- * Every top-level key is set to `true`, which tells the server to include
- * that field in the response.  For union schemas the result is the merged
- * set of keys across all variants.
+ * Every scalar key is set to `true`. Nested object fields are recursively
+ * expanded into nested select objects. Array fields remain `true`.
+ * For union schemas the result is the merged set of keys across all variants.
  *
  * @example
  * ```ts

package/dist/build-select-object.js

@@ -1,10 +1,11 @@
+import { ZodCatch, ZodDefault, ZodLazy, ZodNullable, ZodOptional } from 'zod';
 import { getInnerType, isZodObject, isZodUnion } from './utilities.js';
 /**
  * Produces a runtime select-all object for the given Zod schema.
  *
- * Every top-level key is set to `true`, which tells the server to include
- * that field in the response.  For union schemas the result is the merged
- * set of keys across all variants.
+ * Every scalar key is set to `true`. Nested object fields are recursively
+ * expanded into nested select objects. Array fields remain `true`.
+ * For union schemas the result is the merged set of keys across all variants.
  *
  * @example
  * ```ts
@@ -17,20 +18,47 @@ export function buildSelectObject(schema) {
     collectKeys(schema, result);
     return result;
 }
-function collectKeys(schema, result) {
+/**
+ * Unwraps optional/nullable/default/catch/lazy wrappers but NOT arrays.
+ */
+function unwrapField(schema) {
+    if (schema instanceof ZodOptional
+        || schema instanceof ZodNullable
+        || schema instanceof ZodDefault
+        || schema instanceof ZodCatch) {
+        return unwrapField(schema.def.innerType);
+    }
+    if (schema instanceof ZodLazy) {
+        return unwrapField(schema.def.getter());
+    }
+    return schema;
+}
+const MAX_DEPTH = 10;
+function collectKeys(schema, result, depth = 0) {
+    if (depth >= MAX_DEPTH) {
+        return;
+    }
     schema = getInnerType(schema);
     if (isZodObject(schema)) {
         for (const key in schema.shape) {
-            result[key] = true;
+            const fieldInner = unwrapField(schema.shape[key]);
+            if (isZodObject(fieldInner)) {
+                const nested = {};
+                collectKeys(fieldInner, nested, depth + 1);
+                result[key] = nested;
+            }
+            else {
+                result[key] = true;
+            }
         }
     }
     else if (isZodUnion(schema)) {
         for (const option of schema.options) {
-            collectKeys(option, result);
+            collectKeys(option, result, depth);
         }
     }
     else if (schema.def.type === 'intersection') {
-        collectKeys(schema.def.left, result);
-        collectKeys(schema.def.right, result);
+        collectKeys(schema.def.left, result, depth);
+        collectKeys(schema.def.right, result, depth);
     }
 }

package/dist/build-select-object.spec.js

@@ -45,7 +45,7 @@ describe('.buildSelectObject()', () => {
             c: true
         });
     });
-    it('should only collect top-level keys (not nested)', () => {
+    it('should recursively expand nested objects', () => {
         const schema = z.object({
             active: z.boolean(),
             user: z.object({
@@ -53,6 +53,69 @@ describe('.buildSelectObject()', () => {
                 name: z.string()
             })
         });
-        assert.deepStrictEqual(buildSelectObject(schema), { active: true, user: true });
+        assert.deepStrictEqual(buildSelectObject(schema), {
+            active: true,
+            user: { age: true, name: true }
+        });
+    });
+    it('should recursively expand deeply nested objects', () => {
+        const schema = z.object({
+            name: z.string(),
+            organization: z.object({
+                _id: z.string(),
+                address: z.object({
+                    city: z.string(),
+                    country: z.string()
+                })
+            })
+        });
+        assert.deepStrictEqual(buildSelectObject(schema), {
+            name: true,
+            organization: { _id: true, address: { city: true, country: true } }
+        });
+    });
+    it('should expand optional nested objects', () => {
+        const schema = z.object({
+            name: z.string(),
+            organization: z.object({
+                _id: z.string(),
+                name: z.string()
+            }).optional()
+        });
+        assert.deepStrictEqual(buildSelectObject(schema), {
+            name: true,
+            organization: { _id: true, name: true }
+        });
+    });
+    it('should not expand arrays', () => {
+        const schema = z.object({
+            name: z.string(),
+            tags: z.array(z.string())
+        });
+        assert.deepStrictEqual(buildSelectObject(schema), { name: true, tags: true });
+    });
+    it('should not expand arrays of objects', () => {
+        const schema = z.object({
+            items: z.array(z.object({ id: z.string(), value: z.number() })),
+            name: z.string()
+        });
+        assert.deepStrictEqual(buildSelectObject(schema), { items: true, name: true });
+    });
+    it('should handle recursive schemas without infinite loop', () => {
+        ;
+        const node = z.lazy(() => z.object({
+            children: z.array(node).optional(),
+            name: z.string(),
+            parent: node.optional()
+        }));
+        const schema = z.object({
+            name: z.string(),
+            root: node
+        });
+        // Should not throw or hang — recursive objects hit depth limit
+        const result = buildSelectObject(schema);
+        assert.strictEqual(result.name, true);
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        assert.ok(typeof result.root === 'object' && result.root !== null);
     });
 });

package/dist/refine-schema.d.ts

@@ -33,7 +33,7 @@ export type RefineZodUnion<T extends ZodUnion> = {
     [K in keyof UnionMergedShape<T>]?: UnionMergedShape<T>[K] extends ZodType ? UnionFieldType<UnionMergedShape<T>[K]> : boolean;
 };
 export type TuplifyUnion<T, TDepth extends number = 0, L = LastOf<T>, N = [T] extends [never] ? true : false> = TDepth extends 9 ? [] : true extends N ? [] : Push<TuplifyUnion<Exclude<T, L>, NextDepth<TDepth>>, InternalZodify<L>>;
-type UnionFieldType<T extends ZodType> = z.infer<T> extends Array<infer U> ? Exclude<U, null | undefined> extends object ? boolean | RefineObject<Extract<U, object>, true> : boolean : Exclude<z.infer<T>, null | undefined> extends object ? boolean | RefineObject<Exclude<z.infer<T>, null | undefined>, true> : boolean;
+type UnionFieldType<T extends ZodType> = Exclude<z.infer<T>, null | undefined> extends Array<infer U> ? Exclude<U, null | undefined> extends object ? boolean | RefineObject<Extract<U, object>, true> : boolean : Exclude<z.infer<T>, null | undefined> extends object ? boolean | RefineObject<Exclude<z.infer<T>, null | undefined>, true> : boolean;
 type UnionMergedShape<T extends ZodUnion> = UnionToIntersection<T['options'][number] extends ZodObject<infer Shape extends ZodRawShape> ? Shape : object>;
 export type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
 export type Zodify<T, TDepth extends number = 0> = ApplyOptionalNullable<T, IsTuple<TuplifyUnion<Exclude<T, null | undefined>, TDepth>, ZodUnion<TuplifyUnion<Exclude<T, null | undefined>, TDepth>>, InternalZodify<Exclude<T, null | undefined>, TDepth>>>;

package/dist/refine-schema.spec.js

@@ -233,4 +233,44 @@ describe('.refineSchema()', () => {
         parseResult = schema.parse('123 Main Street');
         deepStrictEqual(parseResult, '123 Main Street');
     });
+    it('should accept selecting a subfield of a union member with an optional array-of-objects field', () => {
+        // Regression test for a bug in `UnionFieldType` (refine-schema.ts).
+        //
+        // `UnionFieldType` chose a union member field's refine shape with
+        // `z.infer<T> extends Array<infer U>` but, unlike `RefineType`, it did not
+        // strip `| undefined` first. For an OPTIONAL array-of-objects member
+        // (`field: Obj.array().optional()`), `z.infer<T>` is `Obj[] | undefined`,
+        // which is NOT assignable to `Array<infer U>`, so the field's refine shape
+        // collapsed to `RefineObject<Obj[]>` (the array's own keys) instead of
+        // `RefineObject<Obj>`. The runtime was unaffected, so this only broke the
+        // type-check (`tsc`), not `tsx --test`.
+        const accessLevel = z.object({
+            _id: z.string(),
+            name: z.string()
+        });
+        const organizationInvitation = z.object({
+            accessLevels: accessLevel.array().optional(),
+            organizationId: z.string(),
+            type: z.literal('organization')
+        });
+        const platformInvitation = z.object({
+            accessLevels: accessLevel.array().optional(),
+            type: z.literal('platform')
+        });
+        const invitation = z.discriminatedUnion('type', [organizationInvitation, platformInvitation]);
+        // Type-level assertion: drilling into a subfield of the optional array
+        // member is a valid select and MUST be assignable to the refine shape.
+        // With the bug present, this `satisfies` fails to compile.
+        const select = {
+            accessLevels: { name: true },
+            type: true
+        };
+        const refined = refineSchema(invitation, select);
+        const parsed = refined.parse({
+            accessLevels: [{ name: 'Admin' }],
+            type: 'organization'
+        });
+        assert.equal(parsed.type, 'organization');
+        assert.deepEqual(parsed.accessLevels, [{ name: 'Admin' }]);
+    });
 });

package/dist/select.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/select.spec.js

@@ -0,0 +1,48 @@
+import { describe, it } from 'node:test';
+import { z } from 'zod';
+const internalService = z.object({
+    name: z.string(),
+    type: z.literal('internal')
+}).strict();
+const externalService = z.object({
+    iconUrl: z.string().optional(),
+    name: z.string(),
+    type: z.literal('external')
+}).strict();
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const serviceType = z.union([internalService, externalService]);
+describe('InferMergedType', () => {
+    it('should resolve to z.infer<T> when used in a generic function with TSelect = undefined', () => {
+        function getServices(options) {
+            void options;
+            return {};
+        }
+        // When called without select, TSelect defaults to undefined
+        // InferMergedType<typeof Service, undefined> should resolve to z.infer<typeof Service>
+        const services = getServices({});
+        const service = Object.values(services)[0];
+        // This is a compile-time test: the assertion below must type-check (all
+        // union members have `name: string`). The impl returns `{}`, so guard the
+        // dereference — the block never runs but TS still checks it.
+        if (service) {
+            const name = service.name;
+            void name;
+        }
+    });
+    it('should resolve to projected type when used in a generic function with a select', () => {
+        function getServices(options) {
+            void options;
+            return {};
+        }
+        // When called with a select, the return type should be the projected type
+        const services = getServices({ select: { name: true } });
+        const service = Object.values(services)[0];
+        // This is a compile-time test: the assertion below must type-check (name
+        // was selected). The impl returns `{}`, so guard the dereference — the
+        // block never runs but TS still checks it.
+        if (service) {
+            const name = service.name;
+            void name;
+        }
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zodselect",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Type-safe selection utility built on top of Zod. Allows for strongly typed field selection, schema merging, and runtime refinement for frontend or backend use.",
   "author": "SecureDataSystems",
   "license": "MIT",