cogsbox-shape 0.5.87 → 0.5.89

package/dist/schema.js

@@ -165,11 +165,13 @@ function createBuilder(config) {
                 : config.sqlZod; // If only a primitive is passed, the "new" schema is still the SQL one.
             const finalDefaultValue = hasSchemaArg
                 ? isFunction(defaultValue)
-                    ? defaultValue() // If it's a function, call it
-                    : defaultValue // If it's a direct value, use it as-is
+                    ? defaultValue()
+                    : defaultValue
                 : isFunction(schemaOrDefault)
-                    ? schemaOrDefault()
-                    : schemaOrDefault;
+                    ? schemaOrDefault({ sql: config.sqlZod })
+                    : schemaOrDefault && schemaOrDefault._def
+                        ? inferDefaultFromZod(schemaOrDefault, config.sqlConfig)
+                        : schemaOrDefault;
             const newCompletedStages = new Set(completedStages);
             newCompletedStages.add("new");
             // ---- THIS IS THE RUNTIME FIX THAT MATCHES YOUR INTERFACE ----
@@ -292,30 +294,30 @@ export function schema(schema) {
 }
 function inferDefaultFromZod(zodType, sqlConfig) {
     if (sqlConfig && typeof sqlConfig === "object" && "type" in sqlConfig) {
-        // --- THIS IS THE NEW, HIGHEST-PRIORITY CHECK ---
-        // If a `default` property exists directly on the SQL config, use it.
+        // --- PRIORITY 1: Check for an explicit `default` on the SQL config ---
         if ("default" in sqlConfig && sqlConfig.default !== undefined) {
-            // Exclude CURRENT_TIMESTAMP as it's a special keyword, not a value.
+            // FIX #1: If the default is CURRENT_TIMESTAMP, it's a DB responsibility.
+            // Return undefined so no client-side default is generated.
             if (sqlConfig.default === "CURRENT_TIMESTAMP") {
-                return new Date();
+                return undefined;
             }
+            // Otherwise, use the provided SQL default.
             return sqlConfig.default;
         }
+        // --- PRESERVED LOGIC: Handle relation types (NO CHANGES HERE) ---
         if (typeof sqlConfig.type === "string" &&
             ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
             const relationConfig = sqlConfig;
             if (relationConfig.type === "hasMany" ||
                 relationConfig.type === "manyToMany") {
-                // For hasMany/manyToMany, default to an array based on defaultCount.
                 return Array.from({ length: relationConfig.defaultCount || 0 }, () => ({}));
             }
             if (relationConfig.type === "hasOne" ||
                 relationConfig.type === "belongsTo") {
-                // For hasOne/belongsTo, default to a single empty object.
                 return {};
             }
         }
-        // Handle SQL type-based generation (this is the fallback)
+        // --- PRESERVED LOGIC: Handle basic SQL types as a fallback (NO CHANGES HERE) ---
         const sqlTypeConfig = sqlConfig;
         if (sqlTypeConfig.type && !sqlTypeConfig.nullable) {
             switch (sqlTypeConfig.type) {
@@ -325,7 +327,7 @@ function inferDefaultFromZod(zodType, sqlConfig) {
                 case "longtext":
                     return "";
                 case "int":
-                    return 0; // This is now only used if no `default` is provided
+                    return 0;
                 case "boolean":
                     return false;
                 case "date":
@@ -337,7 +339,7 @@ function inferDefaultFromZod(zodType, sqlConfig) {
             return null;
         }
     }
-    // Fall back to Zod-based inference (this logic is fine)
+    // --- PRESERVED LOGIC: Fall back to Zod-based inference ---
     if (zodType instanceof z.ZodOptional) {
         return undefined;
     }
@@ -346,6 +348,12 @@ function inferDefaultFromZod(zodType, sqlConfig) {
             ? zodType._def.defaultValue()
             : zodType._def.defaultValue;
     }
+    // --- FIX #2: Add intelligent fallback for unrecognized Zod types ---
+    // This handles z.email(), z.url(), etc., by checking the base type.
+    if (zodType instanceof z.ZodString) {
+        return "";
+    }
+    // Return undefined if no other default can be determined.
     return undefined;
 }
 // export function reference<TField extends object>(config: TField) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cogsbox-shape",
-    "version": "0.5.87",
+    "version": "0.5.89",
     "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",