cogsbox-shape 0.5.105 → 0.5.106

package/dist/schema.js

@@ -472,38 +472,57 @@ export function createSchema(schema, relations) {
         if (definition && definition.config) {
             const config = definition.config;
             const sqlConfig = config.sql;
-            if (sqlConfig &&
-                typeof sqlConfig === "object" &&
-                ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
-                // Handle relations
-                const relatedSchemaFactory = sqlConfig.schema;
-                const childSchemaResult = createSchema(relatedSchemaFactory());
-                let baseClientSchema;
-                if (sqlConfig.type === "hasMany" || sqlConfig.type === "manyToMany") {
-                    baseClientSchema = z.array(childSchemaResult.clientSchema).optional();
-                    defaultValues[key] = Array.from({ length: sqlConfig.defaultCount || 0 }, () => childSchemaResult.defaultValues);
+            if (definition && definition.config) {
+                const config = definition.config;
+                const sqlConfig = config.sql;
+                if (sqlConfig &&
+                    typeof sqlConfig === "object" &&
+                    ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
+                    // Handle relations - create a lazy-evaluated schema
+                    const relatedSchemaFactory = sqlConfig.schema;
+                    // Create a lazy getter for the child schema
+                    let cachedChildSchema = null;
+                    const getChildSchema = () => {
+                        if (!cachedChildSchema) {
+                            cachedChildSchema = createSchema(relatedSchemaFactory());
+                        }
+                        return cachedChildSchema;
+                    };
+                    let baseClientSchema;
+                    if (sqlConfig.type === "hasMany" || sqlConfig.type === "manyToMany") {
+                        // Create a custom Zod type that validates lazily
+                        baseClientSchema = z
+                            .array(z.lazy(() => getChildSchema().clientSchema))
+                            .optional();
+                        // Default values use a getter function
+                        defaultValues[key] = Array.from({ length: sqlConfig.defaultCount || 0 }, () => getChildSchema().defaultValues);
+                    }
+                    else {
+                        // Create a custom Zod type that validates lazily
+                        baseClientSchema = z
+                            .lazy(() => getChildSchema().clientSchema)
+                            .optional();
+                        // Default value uses a getter function
+                        defaultValues[key] = () => getChildSchema().defaultValues;
+                    }
+                    clientFields[key] = config.clientTransform
+                        ? config.clientTransform(baseClientSchema)
+                        : baseClientSchema;
+                    validationFields[key] = clientFields[key];
                 }
                 else {
-                    baseClientSchema = childSchemaResult.clientSchema.optional();
-                    defaultValues[key] = childSchemaResult.defaultValues;
-                }
-                clientFields[key] = config.clientTransform
-                    ? config.clientTransform(baseClientSchema)
-                    : baseClientSchema;
-                validationFields[key] = clientFields[key];
-            }
-            else {
-                // Handle regular fields
-                sqlFields[key] = config.zodSqlSchema;
-                clientFields[key] = config.zodClientSchema;
-                validationFields[key] = config.zodValidationSchema;
-                if (config.transforms) {
-                    fieldTransforms[key] = config.transforms;
+                    // Handle regular fields
+                    sqlFields[key] = config.zodSqlSchema;
+                    clientFields[key] = config.zodClientSchema;
+                    validationFields[key] = config.zodValidationSchema;
+                    if (config.transforms) {
+                        fieldTransforms[key] = config.transforms;
+                    }
+                    const initialValueOrFn = config.initialValue;
+                    defaultValues[key] = isFunction(initialValueOrFn)
+                        ? initialValueOrFn()
+                        : initialValueOrFn;
                 }
-                const initialValueOrFn = config.initialValue;
-                defaultValues[key] = isFunction(initialValueOrFn)
-                    ? initialValueOrFn()
-                    : initialValueOrFn;
             }
         }
     }

package/package.json

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