cogsbox-shape 0.5.42 → 0.5.43

package/dist/schema.d.ts

@@ -4784,15 +4784,56 @@ export declare function reference<TField extends object>(config: TField): {
     to: TField;
 };
 export declare function createMixedValidationSchema<T extends Schema<any>>(schema: T, clientSchema?: z.ZodObject<any>, dbSchema?: z.ZodObject<any>): z.ZodObject<any>;
+type SchemaDefinition = {
+    _tableName: string;
+    [key: string]: any;
+};
+type InferSchemaByKey<T, Key extends "zodSqlSchema" | "zodClientSchema" | "zodValidationSchema"> = {
+    [K in keyof T as K extends "_tableName" ? never : K]: T[K] extends {
+        config: {
+            [P in Key]: infer S extends z.ZodTypeAny;
+        };
+    } ? S : T[K] extends {
+        type: "reference";
+        to: () => {
+            config: {
+                [P in Key]: infer S extends z.ZodTypeAny;
+            };
+        };
+    } ? S : T[K] extends () => {
+        type: "hasMany" | "manyToMany";
+        schema: infer S extends SchemaDefinition;
+    } ? z.ZodArray<z.ZodObject<Prettify<InferSchemaByKey<S, Key>>>> : T[K] extends () => {
+        type: "hasOne" | "belongsTo";
+        schema: infer S extends SchemaDefinition;
+    } ? z.ZodObject<Prettify<InferSchemaByKey<S, Key>>> : never;
+};
+type InferSqlSchema<T> = InferSchemaByKey<T, "zodSqlSchema">;
+type InferClientSchema<T> = InferSchemaByKey<T, "zodClientSchema">;
+type InferValidationSchema<T> = InferSchemaByKey<T, "zodValidationSchema">;
+type InferDefaultValues2<T> = {
+    [K in keyof T as K extends "_tableName" ? never : K]: T[K] extends {
+        config: {
+            initialValue: infer D;
+        };
+    } ? D : T[K] extends () => {
+        type: "hasMany" | "manyToMany";
+        schema: infer S extends SchemaDefinition;
+        defaultCount?: number;
+    } ? Array<Prettify<InferDefaultValues2<S>>> : T[K] extends () => {
+        type: "hasOne" | "belongsTo";
+        schema: infer S extends SchemaDefinition;
+    } ? Prettify<InferDefaultValues2<S>> : never;
+};
 export declare function createSchema<T extends {
     _tableName: string;
 }>(schema: T extends {
     _tableName: string;
 } ? T : never): {
-    sqlSchema: any;
-    clientSchema: any;
-    validationSchema: any;
-    defaultValues: any;
+    sqlSchema: z.ZodObject<Prettify<InferSqlSchema<T>>>;
+    clientSchema: z.ZodObject<Prettify<InferClientSchema<T>>>;
+    validationSchema: z.ZodObject<Prettify<InferValidationSchema<T>>>;
+    defaultValues: Prettify<InferDefaultValues2<T>>;
 };
 export type InferSchemaTypes<T extends {
     _tableName: string;

package/dist/schema.js

@@ -349,11 +349,11 @@ export function createSchema(schema) {
     const validationFields = {};
     const defaultValues = {};
     for (const key in schema) {
-        if (key === "_tableName" || key.startsWith("__"))
+        if (key === "_tableName")
             continue;
         const field = schema[key];
         // Case 1: Handle relation functions (hasMany, hasOne, etc.)
-        if (isFunction(field)) {
+        if (typeof field === "function") {
             const relation = field();
             if (!isRelation(relation)) {
                 continue;
@@ -362,36 +362,34 @@ export function createSchema(schema) {
             const childSchemaResult = createSchema(relation.schema);
             // For to-many relations, wrap schemas in z.array()
             if (relation.type === "hasMany" || relation.type === "manyToMany") {
-                const arraySchema = z.array(childSchemaResult.validationSchema);
-                // Relations are often not present on creation, so they should be optional.
-                validationFields[key] = arraySchema.optional();
-                clientFields[key] = z.array(childSchemaResult.clientSchema).optional();
-                sqlFields[key] = z.array(childSchemaResult.sqlSchema).optional();
+                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);
             }
             else {
-                // hasOne or belongsTo
-                // Relations are often not present on creation, so they should be optional.
-                validationFields[key] = childSchemaResult.validationSchema.optional();
-                clientFields[key] = childSchemaResult.clientSchema.optional();
-                sqlFields[key] = childSchemaResult.sqlSchema.optional();
+                // For to-one relations, use schemas directly
+                sqlFields[key] = childSchemaResult.sqlSchema;
+                clientFields[key] = childSchemaResult.clientSchema;
+                validationFields[key] = childSchemaResult.validationSchema;
                 defaultValues[key] = childSchemaResult.defaultValues;
             }
         }
-        // Case 2: Handle reference() objects
-        else if (field && field.type === "reference") {
+        else if (field &&
+            typeof field === "object" &&
+            field.type === "reference") {
             const referencedField = field.to();
-            validationFields[key] = referencedField.config.zodValidationSchema;
-            clientFields[key] = referencedField.config.zodClientSchema;
             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) {
-            validationFields[key] = field.config.zodValidationSchema;
-            clientFields[key] = field.config.zodClientSchema;
             sqlFields[key] = field.config.zodSqlSchema;
+            clientFields[key] = field.config.zodClientSchema;
+            validationFields[key] = field.config.zodValidationSchema;
             defaultValues[key] = field.config.initialValue;
         }
     }
@@ -406,7 +404,6 @@ 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 = {};
@@ -439,7 +436,6 @@ 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.42",
+    "version": "0.5.43",
     "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",