zodselect 1.2.2 → 1.2.3

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

@@ -3,7 +3,8 @@ import { UnionToIntersection } from './refine-schema.js';
 import { ZodSelect } from './select.js';
 type Depth = [0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 type FieldSelectAll<T, TDepth extends number> = TDepth extends 0 ? true : Unwrap<T> extends ZodArray<infer TItem> ? ItemSelectAll<TItem, Depth[TDepth]> : ItemSelectAll<T, Depth[TDepth]>;
-type ItemSelectAll<T, TDepth extends number> = Unwrap<T> extends ZodObject<infer TShape, any> ? ObjectSelectAll<TShape, TDepth> : Unwrap<T> extends ZodUnion<infer TOptions> ? UnionShape<TOptions> extends infer TShape extends ZodRawShape ? ObjectSelectAll<TShape, TDepth> : true : true;
+type ItemSelectAll<T, TDepth extends number> = Unwrap<T> extends ZodObject<infer TShape, any> ? ObjectSelectAll<TShape, TDepth> : Unwrap<T> extends ZodUnion<infer TOptions> ? [NotObject<TOptions[number]>] extends [never] ? UnionShape<TOptions> extends infer TShape extends ZodRawShape ? ObjectSelectAll<TShape, TDepth> : true : true : true;
+type NotObject<T> = T extends unknown ? Unwrap<T> extends ZodObject<any, any> ? never : T : never;
 type ObjectSelectAll<TShape extends ZodRawShape, TDepth extends number> = {
     [K in keyof TShape]-?: FieldSelectAll<TShape[K], TDepth>;
 };
@@ -11,7 +12,7 @@ type ShapeOf<T> = T extends unknown ? Unwrap<T> extends ZodObject<infer TShape,
 /** The shapes of a union's object variants, merged; `unknown` when it has none. */
 type UnionShape<TOptions> = UnionToIntersection<TOptions extends readonly (infer TOption)[] ? ShapeOf<TOption> : never>;
 type Unwrap<T> = T extends ZodCatch<infer I> | ZodDefault<infer I> | ZodNullable<infer I> | ZodOptional<infer I> ? Unwrap<I> : T extends ZodLazy<infer I> ? Unwrap<I> : T;
-/** What {@link buildSelectObject} answers: nested for objects, unions with an object variant, and arrays of either; `true` for anything else. */
+/** What {@link buildSelectObject} answers: nested for objects, unions of objects, and arrays of either; `true` for anything else. */
 export type ZodSelectAll<T extends ZodType<object> | ZodUnion> = Unwrap<T> extends ZodObject<infer TShape, any> ? ObjectSelectAll<TShape, 10> : {
     [K in keyof ZodSelect<T, true>]-?: true;
 };
@@ -20,9 +21,10 @@ export type ZodSelectAll<T extends ZodType<object> | ZodUnion> = Unwrap<T> exten
  *
  * Every scalar key is set to `true`. Nested object fields, and arrays of
  * objects, are recursively expanded into nested select objects. A union field
- * with an object variant, such as a file stored as an id and read as the file,
- * expands into the merged keys of its object variants. Other arrays and
- * records remain `true`.
+ * whose every variant is an object expands into their merged keys. A union
+ * with any other variant, such as a name that is a string or a structured
+ * name, remains `true`: its sub-fields would miss the plain value. Other arrays
+ * and records remain `true`.
  * For union schemas the result is the merged set of keys across all variants.
  *
  * @example

package/dist/build-select-object.js

@@ -5,9 +5,10 @@ import { getInnerType, isZodArray, isZodObject, isZodUnion } from './utilities.j
  *
  * Every scalar key is set to `true`. Nested object fields, and arrays of
  * objects, are recursively expanded into nested select objects. A union field
- * with an object variant, such as a file stored as an id and read as the file,
- * expands into the merged keys of its object variants. Other arrays and
- * records remain `true`.
+ * whose every variant is an object expands into their merged keys. A union
+ * with any other variant, such as a name that is a string or a structured
+ * name, remains `true`: its sub-fields would miss the plain value. Other arrays
+ * and records remain `true`.
  * For union schemas the result is the merged set of keys across all variants.
  *
  * @example
@@ -46,7 +47,7 @@ function collectKeys(schema, result, depth = 0) {
         for (const key in schema.shape) {
             const field = unwrapField(schema.shape[key]);
             const fieldInner = isZodArray(field) ? unwrapField(field.def.element) : field;
-            if (isZodObject(fieldInner) || hasObjectVariant(fieldInner)) {
+            if (isZodObject(fieldInner) || isUnionOfObjects(fieldInner)) {
                 const nested = {};
                 collectKeys(fieldInner, nested, depth + 1);
                 result[key] = nested;
@@ -66,6 +67,6 @@ function collectKeys(schema, result, depth = 0) {
         collectKeys(schema.def.right, result, depth);
     }
 }
-function hasObjectVariant(schema) {
-    return isZodUnion(schema) && schema.options.some(option => isZodObject(unwrapField(option)));
+function isUnionOfObjects(schema) {
+    return isZodUnion(schema) && schema.options.every(option => isZodObject(unwrapField(option)));
 }

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

@@ -148,15 +148,15 @@ describe('.buildSelectObject()', () => {
         assert.ok(isTyped);
         assert.deepStrictEqual(select, { byKey: true, matrix: true, tags: true });
     });
-    it('should expand a union field into the keys of its object variants', () => {
+    it('should select a union field whole when a variant is not an object', () => {
         const schema = z.object({
             file: z.union([z.object({ _id: z.string(), filename: z.string() }), z.string()]),
-            name: z.string()
+            name: z.union([z.string(), z.object({ first: z.string(), last: z.string() })])
         });
         const select = buildSelectObject(schema);
         const isTyped = true;
         assert.ok(isTyped);
-        assert.deepStrictEqual(select, { file: { _id: true, filename: true }, name: true });
+        assert.deepStrictEqual(select, { file: true, name: true });
     });
     it('should merge the keys of every object variant of a union field', () => {
         const schema = z.object({
@@ -183,16 +183,6 @@ describe('.buildSelectObject()', () => {
         assert.ok(isTyped);
         assert.deepStrictEqual(select, { options: { a: true, b: true } });
     });
-    it('should expand an attachment whose file is stored as an id and read as the file', () => {
-        const file = z.object({ _id: z.string(), contentType: z.string().optional(), filename: z.string() });
-        const revision = z.object({ file: z.union([file, z.string()]), uploadedBy: z.object({ _id: z.string(), username: z.string() }) });
-        const schema = z.object({ attachments: z.array(revision.extend({ history: z.array(revision).optional(), title: z.string().optional() })).optional() });
-        const select = buildSelectObject(schema);
-        const revisionSelect = { file: { _id: true, contentType: true, filename: true }, uploadedBy: { _id: true, username: true } };
-        const isTyped = true;
-        assert.ok(isTyped);
-        assert.deepStrictEqual(select, { attachments: { ...revisionSelect, history: revisionSelect, title: true } });
-    });
     it('should be a select the schema accepts', () => {
         const schema = z.object({
             client: z.object({ _id: z.string(), name: z.string() }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zodselect",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "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",