cogsbox-shape 0.5.43 → 0.5.45

package/dist/schema.d.ts

@@ -4827,9 +4827,7 @@ type InferDefaultValues2<T> = {
 };
 export declare function createSchema<T extends {
     _tableName: string;
-}>(schema: T extends {
-    _tableName: string;
-} ? T : never): {
+}>(schema: T): {
     sqlSchema: z.ZodObject<Prettify<InferSqlSchema<T>>>;
     clientSchema: z.ZodObject<Prettify<InferClientSchema<T>>>;
     validationSchema: z.ZodObject<Prettify<InferValidationSchema<T>>>;

package/dist/schema.js

@@ -349,43 +349,43 @@ export function createSchema(schema) {
     const validationFields = {};
     const defaultValues = {};
     for (const key in schema) {
-        if (key === "_tableName")
+        if (key === "_tableName" || key.startsWith("__"))
             continue;
         const field = schema[key];
         // Case 1: Handle relation functions (hasMany, hasOne, etc.)
-        if (typeof field === "function") {
+        if (isFunction(field)) {
             const relation = field();
             if (!isRelation(relation)) {
                 continue;
             }
-            // Recursively process the nested schema
             const childSchemaResult = createSchema(relation.schema);
-            // For to-many relations, wrap schemas in z.array()
             if (relation.type === "hasMany" || relation.type === "manyToMany") {
-                sqlFields[key] = z.array(childSchemaResult.sqlSchema);
-                clientFields[key] = z.array(childSchemaResult.clientSchema);
-                validationFields[key] = z.array(childSchemaResult.validationSchema);
-                // Create an array of default values for the relation
-                const count = relation.defaultCount || 0;
-                defaultValues[key] = Array.from({ length: count }, () => childSchemaResult.defaultValues);
+                // CORRECTLY ADD THE RELATION TO THE LIST OF VALIDATION FIELDS
+                // Make it optional, as relations are often not included on create/update.
+                validationFields[key] = z
+                    .array(childSchemaResult.validationSchema)
+                    .optional();
+                clientFields[key] = z.array(childSchemaResult.clientSchema).optional();
+                sqlFields[key] = z.array(childSchemaResult.sqlSchema).optional();
+                defaultValues[key] = Array.from({ length: relation.defaultCount || 0 }, () => childSchemaResult.defaultValues);
             }
             else {
-                // For to-one relations, use schemas directly
-                sqlFields[key] = childSchemaResult.sqlSchema;
-                clientFields[key] = childSchemaResult.clientSchema;
-                validationFields[key] = childSchemaResult.validationSchema;
+                // hasOne or belongsTo
+                validationFields[key] = childSchemaResult.validationSchema.optional();
+                clientFields[key] = childSchemaResult.clientSchema.optional();
+                sqlFields[key] = childSchemaResult.sqlSchema.optional();
                 defaultValues[key] = childSchemaResult.defaultValues;
             }
         }
-        else if (field &&
-            typeof field === "object" &&
-            field.type === "reference") {
+        // Case 2: Handle reference() objects
+        else if (field && field.type === "reference") {
             const referencedField = field.to();
             sqlFields[key] = referencedField.config.zodSqlSchema;
             clientFields[key] = referencedField.config.zodClientSchema;
             validationFields[key] = referencedField.config.zodValidationSchema;
             defaultValues[key] = referencedField.config.initialValue;
         }
+        // Case 3: Handle standard shape.sql() fields
         else if (field && typeof field === "object" && "config" in field) {
             sqlFields[key] = field.config.zodSqlSchema;
             clientFields[key] = field.config.zodClientSchema;
@@ -393,6 +393,7 @@ export function createSchema(schema) {
             defaultValues[key] = field.config.initialValue;
         }
     }
+    // Return the final, correctly typed Zod objects
     return {
         sqlSchema: z.object(sqlFields),
         clientSchema: z.object(clientFields),
@@ -404,6 +405,7 @@ export function createSchema(schema) {
 /**
  * (This is the smart function from the last answer that resolves `toKey` functions)
  */
+// In your cogsbox-shape file, replace the entire `serializeSchemaMetadata` function.
 function serializeSchemaMetadata(schema) {
     const fields = {};
     const relations = {};
@@ -436,6 +438,7 @@ function serializeSchemaMetadata(schema) {
                 console.error(`[cogsbox-shape] Error resolving 'toKey' for relation '${key}' in schema '${schema._tableName}'.`);
                 throw e;
             }
+            // This is the critical part: ADD the processed relation to the relations object.
             relations[key] = {
                 type: "relation",
                 relationType: relation.type,

package/package.json

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