cogsbox-shape 0.5.118 → 0.5.119

package/dist/schema.js

@@ -126,53 +126,82 @@ function createBuilder(config) {
             clientTransform: config.clientTransform, // <-- FIX: Make sure transform is passed through
             validationTransform: config.validationTransform, // <-- FIX: Make sure transform is passed through
         },
-        initialState: (value, schemaModifier) => {
+        initialState: (value, schemaOrModifier) => {
             if (completedStages.has("new")) {
                 throw new Error("initialState() can only be called once in the chain");
             }
             let actualValue;
             let baseSchema;
-            // Check if value is a Zod schema
+            let finalSchema;
+            // Check if value is a Zod schema (single argument case)
             if (value && typeof value === "object" && "_def" in value) {
                 // It's a Zod schema - infer the default value
                 baseSchema = value;
                 actualValue = inferDefaultFromZod(baseSchema, config.sqlConfig);
+                finalSchema = baseSchema;
             }
             else {
                 // Get the actual value
                 actualValue = isFunction(value) ? value() : value;
-                // Create base Zod schema from the value type
-                // Check if it's a literal value (string, number, boolean)
-                if (typeof actualValue === "string" ||
-                    typeof actualValue === "number" ||
-                    typeof actualValue === "boolean") {
-                    baseSchema = z.literal(actualValue);
+                // If second parameter is provided and is a Zod schema, use it directly
+                if (schemaOrModifier &&
+                    typeof schemaOrModifier === "object" &&
+                    "_def" in schemaOrModifier) {
+                    finalSchema = schemaOrModifier;
                 }
-                else if (actualValue instanceof Date) {
-                    baseSchema = z.date();
-                }
-                else if (actualValue === null) {
-                    baseSchema = z.null();
-                }
-                else if (actualValue === undefined) {
-                    baseSchema = z.undefined();
+                else if (isFunction(schemaOrModifier)) {
+                    // It's a schema modifier function
+                    // Create base Zod schema from the value type
+                    if (typeof actualValue === "string" ||
+                        typeof actualValue === "number" ||
+                        typeof actualValue === "boolean") {
+                        baseSchema = z.literal(actualValue);
+                    }
+                    else if (actualValue instanceof Date) {
+                        baseSchema = z.date();
+                    }
+                    else if (actualValue === null) {
+                        baseSchema = z.null();
+                    }
+                    else if (actualValue === undefined) {
+                        baseSchema = z.undefined();
+                    }
+                    else {
+                        baseSchema = z.any();
+                    }
+                    // Apply the modifier
+                    finalSchema = schemaOrModifier(baseSchema);
                 }
                 else {
-                    baseSchema = z.any();
+                    // No schema provided, create from value type
+                    if (typeof actualValue === "string" ||
+                        typeof actualValue === "number" ||
+                        typeof actualValue === "boolean") {
+                        baseSchema = z.literal(actualValue);
+                    }
+                    else if (actualValue instanceof Date) {
+                        baseSchema = z.date();
+                    }
+                    else if (actualValue === null) {
+                        baseSchema = z.null();
+                    }
+                    else if (actualValue === undefined) {
+                        baseSchema = z.undefined();
+                    }
+                    else {
+                        baseSchema = z.any();
+                    }
+                    finalSchema = baseSchema;
                 }
             }
-            // Apply schema modifier if provided
-            const newSchema = isFunction(schemaModifier)
-                ? schemaModifier(baseSchema)
-                : baseSchema;
             const newCompletedStages = new Set(completedStages);
             newCompletedStages.add("new");
             // Create union for client/validation
-            const clientValidationSchema = z.union([config.sqlZod, newSchema]);
+            const clientValidationSchema = z.union([config.sqlZod, finalSchema]);
             return createBuilder({
                 ...config,
                 stage: "new",
-                newZod: newSchema,
+                newZod: finalSchema,
                 initialValue: actualValue,
                 clientZod: clientValidationSchema,
                 validationZod: clientValidationSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cogsbox-shape",
-    "version": "0.5.118",
+    "version": "0.5.119",
     "description": "A TypeScript library for creating type-safe database schemas with Zod validation, SQL type definitions, and automatic client/server transformations. Unifies client, server, and database types through a single schema definition, with built-in support for relationships and serialization.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",