zodselect 1.2.3 → 1.2.4

package/dist/refine-schema.d.ts

@@ -1,8 +1,8 @@
 import { core, z, ZodAny, ZodArray, ZodBoolean, ZodDate, ZodLiteral, ZodNever, ZodNullable, ZodNumber, ZodObject, ZodOptional, ZodRawShape, ZodString, ZodTuple, ZodType, ZodUnion, ZodUnknown } from 'zod';
 import { IsAny, IsJsonType } from './types.js';
-type ApplyOptionalNullable<T, U extends ZodType> = IsAny<T, U, undefined extends T ? null extends T ? ZodOptional<ZodNullable<U>> : ZodOptional<U> : null extends T ? ZodNullable<U> : U>;
+type ApplyOptionalNullable<T, U extends ZodType> = IsAny<T, U, unknown extends T ? U : undefined extends T ? null extends T ? ZodOptional<ZodNullable<U>> : ZodOptional<U> : null extends T ? ZodNullable<U> : U>;
 type DepthLimit = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-type InternalZodify<T, TDepth extends number = 0> = TDepth extends 9 ? ZodType : IsAny<T, ZodAny, T extends string ? string extends T ? ZodString : ZodLiteral<T> : T extends number ? ZodNumber : T extends boolean ? ZodBoolean : T extends Date ? ZodDate : unknown extends T ? ZodUnknown : T extends Array<infer U> ? ZodArray<Zodify<U, NextDepth<TDepth>>> : T extends object ? IsJsonType<T, true, ZodObject<{
+type InternalZodify<T, TDepth extends number = 0> = TDepth extends 9 ? ZodType : IsAny<T, ZodAny, T extends string ? string extends T ? ZodString : ZodLiteral<T> : T extends number ? number extends T ? ZodNumber : ZodLiteral<T> : T extends boolean ? boolean extends T ? ZodBoolean : ZodLiteral<T> : T extends Date ? ZodDate : unknown extends T ? ZodUnknown : T extends Array<infer U> ? ZodArray<Zodify<U, NextDepth<TDepth>>> : T extends object ? IsJsonType<T, true, ZodObject<{
     [K in keyof T]-?: Zodify<T[K], NextDepth<TDepth>>;
 }, core.$strict>, ZodType<T>> : never>;
 type IsTuple<T, TTrue = true, TFalse = false> = T extends [infer TFirst, infer TSecond, ...infer TRest] ? TTrue : TFalse;
@@ -12,7 +12,7 @@ type Push<T extends any[], V> = [...T, V];
 type ReapplyOptionalNullable<T, U extends z.ZodType> = T extends ZodOptional<ZodNullable<ZodType>> ? ZodOptional<ZodNullable<U>> : T extends ZodNullable<ZodOptional<ZodType>> ? ZodNullable<ZodOptional<U>> : T extends ZodOptional<ZodType> ? ZodOptional<U> : T extends ZodNullable<ZodType> ? ZodNullable<U> : U;
 export type RefinedSchema<T extends ZodType<object> | ZodUnion, TShape extends RefineSchema<T, TIsSimple>, TIsSimple extends boolean> = T extends ZodUnion ? RefinedUnionSchema<T, TShape> : T extends ZodType<object> ? RefinedTypeSchema<z.infer<T>, TShape> : never;
 export type RefinedTypeSchema<T extends object, TShape, TDepth extends number = 0> = TDepth extends keyof DepthLimit ? ZodObject<{
-    [K in keyof T & keyof TShape]: TShape[K] extends (schema: infer S) => ZodType ? ReturnType<TShape[K]> : TShape[K] extends ZodType ? TShape[K] : TShape[K] extends boolean ? Zodify<T[K]> : TShape[K] extends object ? Exclude<T[K], null | undefined> extends Array<infer U> ? U extends object ? ApplyOptionalNullable<T[K], z.ZodArray<RefinedTypeSchema<U, TShape[K], NextDepth<TDepth>>>> : Zodify<T[K]> : Exclude<T[K], null | undefined> extends object ? ApplyOptionalNullable<T[K], RefinedTypeSchema<Exclude<T[K], null | undefined>, TShape[K], NextDepth<TDepth>>> : ZodNever : ZodNever;
+    [K in keyof T & keyof TShape]: TShape[K] extends (schema: infer S) => ZodType ? ReturnType<TShape[K]> : TShape[K] extends ZodType ? TShape[K] : TShape[K] extends boolean ? ZodifyField<T, K> : TShape[K] extends object ? Exclude<T[K], null | undefined> extends Array<infer U> ? U extends object ? ApplyOptionalNullable<T[K], z.ZodArray<RefinedTypeSchema<U, TShape[K], NextDepth<TDepth>>>> : Zodify<T[K]> : Exclude<T[K], null | undefined> extends object ? ApplyOptionalNullable<T[K], RefinedTypeSchema<Exclude<T[K], null | undefined>, TShape[K], NextDepth<TDepth>>> : ZodNever : ZodNever;
 }, core.$strict> : any;
 export type RefinedUnionSchema<T extends ZodUnion, TShape> = ZodUnion<T['options'] extends Readonly<[infer A, ...infer Rest]> ? Rest extends ZodType[] ? [
     ReapplyOptionalNullable<A, A extends ZodType<object> ? RefinedTypeSchema<z.infer<A>, TShape> : Extract<A, ZodType>>,
@@ -36,8 +36,10 @@ export type TuplifyUnion<T, TDepth extends number = 0, L = LastOf<T>, N = [T] ex
 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, IsAny<T, ZodAny, [
-    Exclude<T, null | undefined>
-] extends [string] ? string extends Exclude<T, null | undefined> ? ZodString : ZodLiteral<Exclude<T, null | undefined>> : IsTuple<TuplifyUnion<Exclude<T, null | undefined>, TDepth>, ZodUnion<TuplifyUnion<Exclude<T, null | undefined>, TDepth>>, InternalZodify<Exclude<T, null | undefined>, TDepth>>>>;
+export type Zodify<T, TDepth extends number = 0> = ApplyOptionalNullable<T, IsAny<T, ZodAny, ZodifyLiteral<Exclude<T, null | undefined>, IsTuple<TuplifyUnion<Exclude<T, null | undefined>, TDepth>, ZodUnion<TuplifyUnion<Exclude<T, null | undefined>, TDepth>>, InternalZodify<Exclude<T, null | undefined>, TDepth>>>>>;
+type ZodifyField<T, TKey extends keyof T> = unknown extends T[TKey] ? Partial<Pick<T, TKey>> extends Pick<T, TKey> ? ZodOptional<Zodify<T[TKey]>> : Zodify<T[TKey]> : Zodify<T[TKey]>;
+type ZodifyLiteral<T, TElse> = [
+    T
+] extends [boolean | number | string] ? [T] extends [boolean] ? boolean extends T ? ZodBoolean : ZodLiteral<T> : string extends T ? [T] extends [string] ? ZodString : TElse : number extends T ? [T] extends [number] ? ZodNumber : TElse : ZodLiteral<T> : TElse;
 export declare function refineSchema<T extends ZodType<object> | ZodUnion, TShape extends RefineSchema<T, false>>(schema: T, shape: TShape): RefinedSchema<T, TShape, false>;
 export {};

package/dist/refine-schema.spec.js

@@ -356,3 +356,46 @@ describe('.refineSchema()', () => {
         deepStrictEqual(selected.map(s => refined.parse(s).stage), stage.options);
     });
 });
+describe('.refineSchema() literal and unknown field types', () => {
+    // Regression tests for `Zodify` (refine-schema.ts) when a schema's fields are listed
+    // (e.g. via `buildSelectObject`) instead of selected whole. Before the fix a numeric
+    // literal union widened to `number` and a required `z.unknown()` field became
+    // optional, so the selected type no longer fit the source type. Runtime was
+    // unaffected; these assignments fail the type-check (`tsc`).
+    const question = z.object({
+        answer: z.object({ value: z.unknown() }),
+        flag: z.literal(true),
+        note: z.unknown().optional(),
+        scale: z.union([z.literal(5), z.literal(10)]),
+        steps: z.literal([3, 7]),
+        value: z.unknown()
+    });
+    const survey = z.object({
+        name: z.string(),
+        pages: z.array(z.object({ questions: z.array(question) }))
+    });
+    it('keeps a numeric literal union instead of widening it to number', () => {
+        const refined = refineSchema(survey, { pages: { questions: { scale: true, steps: true } } });
+        // With the bug these resolve to `number`, so the source type can't take them.
+        const scale = {}.scale;
+        const steps = {}.steps;
+        void scale;
+        void steps;
+        const parsed = refined.parse({ pages: [{ questions: [{ scale: 10, steps: 3 }] }] });
+        assert.equal(parsed.pages[0]?.questions[0]?.scale, 10);
+        throws(() => refined.parse({ pages: [{ questions: [{ scale: 7, steps: 3 }] }] }), ZodError);
+    });
+    it('keeps a boolean literal instead of widening it to boolean', () => {
+        const refined = refineSchema(survey, { pages: { questions: { flag: true } } });
+        const isFlag = {}.flag;
+        void isFlag;
+        throws(() => refined.parse({ pages: [{ questions: [{ flag: false }] }] }), ZodError);
+    });
+    it('keeps a required unknown field required', () => {
+        const refined = refineSchema(survey, { pages: { questions: { answer: true, note: true, value: true } } });
+        // With the bug `value` became an optional key; `note` must stay optional.
+        const selected = { answer: { value: 1 }, value: 'x' };
+        const questions = [selected];
+        deepStrictEqual(refined.parse({ pages: [{ questions }] }).pages[0]?.questions, questions);
+    });
+});

package/package.json

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