cogsbox-shape 0.5.85 → 0.5.87

package/dist/schema.d.ts

@@ -45,11 +45,11 @@ export interface IBuilderMethods<T extends SQLType | RelationConfig<any>, TSql e
         }) => TNewNext) | TNewNext, defaultValue: TDefaultNext): Prettify<Builder<"new", T, TSql, z.ZodUnion<[
             TNewNext,
             z.ZodLiteral<TDefaultNext extends () => infer R ? R : TDefaultNext>
-        ]>, IsLiteralType<z.infer<TNewNext>> extends true ? TDefaultNext extends () => infer R ? R : TDefaultNext : z.infer<TNewNext>, z.ZodUnion<[
+        ]>, IsLiteralType<z.infer<TNewNext>> extends true ? TDefaultNext extends () => infer R ? R : TDefaultNext : z.infer<TNewNext>, (TDefaultNext extends () => infer R ? R : TDefaultNext) extends z.infer<TNewNext> ? z.ZodUnion<[TSql, TNewNext]> : z.ZodUnion<[
             TSql,
             TNewNext,
             z.ZodLiteral<TDefaultNext extends () => infer R ? R : TDefaultNext>
-        ]>, z.ZodUnion<[
+        ]>, (TDefaultNext extends () => infer R ? R : TDefaultNext) extends z.infer<TNewNext> ? z.ZodUnion<[TSql, TNewNext]> : z.ZodUnion<[
             TSql,
             TNewNext,
             z.ZodLiteral<TDefaultNext extends () => infer R ? R : TDefaultNext>
@@ -150,9 +150,9 @@ export type EnrichFields<T extends ShapeSchema> = {
     [K in keyof T]: K extends string ? EnrichedField<K, T[K], T> : T[K];
 };
 export declare const SchemaWrapperBrand: unique symbol;
-export declare function schema<T extends ShapeSchema>(schema: T): EnrichFields<T> & {
+export declare function schema<T extends ShapeSchema>(schema: T): Prettify<EnrichFields<T> & {
     _tableName: T["_tableName"];
-};
+}>;
 export type RelationType = "hasMany" | "hasOne" | "manyToMany";
 type BaseSchemaField<T extends SQLType = SQLType> = {
     type: "field";
@@ -184,10 +184,6 @@ type Relation<U extends Schema<any>> = {
     defaultCount?: number;
 };
 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", Depth extends any[] = []> = Depth["length"] extends 10 ? any : {
     [K in keyof T as K extends "_tableName" | typeof SchemaWrapperBrand ? never : K]: T[K] extends {
         config: {
@@ -223,30 +219,16 @@ type InferSchemaByKey<T, Key extends "zodSqlSchema" | "zodClientSchema" | "zodVa
 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;
     [SchemaWrapperBrand]?: true;
 }, R extends Record<string, any> = {}, TActualSchema extends Omit<T & R, typeof SchemaWrapperBrand> = Omit<T & R, typeof SchemaWrapperBrand>>(schema: T, relations?: R): {
-    sqlSchema: z.ZodObject<Prettify<InferSqlSchema<TActualSchema>>>;
-    clientSchema: z.ZodObject<Prettify<InferClientSchema<TActualSchema>>>;
-    validationSchema: z.ZodObject<Prettify<InferValidationSchema<TActualSchema>>>;
-    defaultValues: Prettify<InferDefaultValues2<TActualSchema>>;
-    toClient: (dbObject: z.infer<z.ZodObject<Prettify<InferSqlSchema<TActualSchema>>>>) => z.infer<z.ZodObject<Prettify<InferClientSchema<TActualSchema>>>>;
-    toDb: (clientObject: z.infer<z.ZodObject<Prettify<InferClientSchema<TActualSchema>>>>) => z.infer<z.ZodObject<Prettify<InferSqlSchema<TActualSchema>>>>;
+    sqlSchema: z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodSqlSchema">>>;
+    clientSchema: z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>;
+    validationSchema: z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodValidationSchema">>>;
+    defaultValues: Prettify<DeriveDefaults<TActualSchema>>;
+    toClient: (dbObject: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodSqlSchema">>>>) => z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>>;
+    toDb: (clientObject: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodClientSchema">>>>) => z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<TActualSchema, "zodSqlSchema">>>>;
 };
 type RelationBuilders<TSchema> = {
     reference: <TField extends object>(fieldGetter: () => TField) => {
@@ -257,18 +239,23 @@ type RelationBuilders<TSchema> = {
         fromKey: keyof TSchema & string;
         toKey: () => TField;
         defaultCount?: number;
-    }) => Builder<"relation", RelationConfig<TField["__parentTableType"]>, z.ZodArray<z.ZodObject<InferSqlSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, any[], z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferValidationSchema<TField["__parentTableType"]>>>>;
-    hasOne: <T extends Schema<any>>(config: {
+    }) => Builder<"relation", BaseRelationConfig<TField["__parentTableType"]> & {
+        type: "hasMany";
+    }, z.ZodArray<z.ZodObject<InferSqlSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, any[], z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferValidationSchema<TField["__parentTableType"]>>>>;
+    hasOne: <T extends Schema<any>, K extends keyof T & string, TField extends EnrichedField<K, T[K], T>>(config: {
         fromKey: keyof TSchema & string;
-        toKey: () => T[keyof T];
-        schema: () => T;
-    }) => Builder<"relation", RelationConfig<T>, z.ZodArray<any>, z.ZodArray<any>, any[], z.ZodArray<any>, z.ZodArray<any>>;
+        toKey: () => TField;
+    }) => Builder<"relation", BaseRelationConfig<TField["__parentTableType"]> & {
+        type: "hasOne";
+    }, z.ZodArray<z.ZodObject<InferSqlSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, any, z.ZodArray<z.ZodObject<InferClientSchema<TField["__parentTableType"]>>>, z.ZodArray<z.ZodObject<InferValidationSchema<TField["__parentTableType"]>>>>;
     manyToMany: <T extends Schema<any>>(config: {
         fromKey: keyof TSchema & string;
         toKey: () => T[keyof T];
         schema: () => T;
         defaultCount?: number;
-    }) => Builder<"relation", RelationConfig<T>, z.ZodOptional<z.ZodArray<z.ZodAny>>, z.ZodOptional<z.ZodArray<z.ZodAny>>, any[], z.ZodOptional<z.ZodArray<z.ZodAny>>, z.ZodOptional<z.ZodArray<z.ZodAny>>>;
+    }) => Builder<"relation", BaseRelationConfig<T> & {
+        type: "manyToMany";
+    }, z.ZodOptional<z.ZodArray<z.ZodAny>>, z.ZodOptional<z.ZodArray<z.ZodAny>>, any[], z.ZodOptional<z.ZodArray<z.ZodAny>>, z.ZodOptional<z.ZodArray<z.ZodAny>>>;
 };
 export declare function schemaRelations<TSchema extends Schema<any>, RefObject extends Record<string, any>>(baseSchema: TSchema, referencesBuilder: (rel: RelationBuilders<TSchema>) => RefObject): {
     [K in keyof RefObject]: RefObject[K] & {
@@ -290,12 +277,11 @@ type DeriveSchemaByKey<T, Key extends "zodSqlSchema" | "zodClientSchema" | "zodV
                 schema: () => infer S;
             };
         };
-    } ? z.ZodArray<S extends {
+    } ? S extends {
         _tableName: string;
-    } ? z.ZodObject<Prettify<DeriveSchemaByKey<S, Key, [...Depth, 1]>>> : z.ZodObject<any>> : T[K] extends {
+    } ? z.ZodArray<z.ZodObject<Prettify<DeriveSchemaByKey<S, Key, [...Depth, 1]>>>> : never : T[K] extends {
         config: {
             sql: {
-                type: "hasOne" | "belongsTo";
                 schema: () => infer S;
             };
         };
@@ -314,29 +300,36 @@ type DeriveSchemaByKey<T, Key extends "zodSqlSchema" | "zodClientSchema" | "zodV
         };
     } ? ZodSchema : never;
 };
-type DeriveDefaults<T> = Prettify<{
+type DeriveDefaults<T, Depth extends any[] = []> = Prettify<Depth["length"] extends 10 ? any : {
     [K in keyof T as K extends "_tableName" | typeof SchemaWrapperBrand ? never : K]: T[K] extends {
+        config: {
+            sql: infer SqlConfig;
+            initialValue: infer D;
+        };
+    } ? SqlConfig extends {
+        type: "hasMany" | "manyToMany";
+        schema: () => infer S;
+    } ? Array<DeriveDefaults<S, [...Depth, 1]>> : SqlConfig extends {
+        type: "hasOne" | "belongsTo";
+        schema: () => infer S;
+    } ? DeriveDefaults<S, [...Depth, 1]> : D extends () => infer R ? R : D : T[K] extends {
+        type: "reference";
+        to: () => infer RefField;
+    } ? RefField extends {
         config: {
             initialValue: infer D;
         };
-    } ? D extends () => infer R ? R : D : never;
+    } ? D extends () => infer R ? R : D : never : never;
 }>;
 export type InferFromSchema<T extends {
     _tableName: string;
 }> = Prettify<{
-    /** The Zod schema for the **SQL (database)** layer. */
     SqlSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodSqlSchema">>>;
-    /** The Zod schema for the **Client** layer. */
     ClientSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodClientSchema">>>;
-    /** The Zod schema for the **Validation** layer. */
     ValidationSchema: z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodValidationSchema">>>;
-    /** The TypeScript type for data as it exists in the **database**. */
     Sql: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodSqlSchema">>>>;
-    /** The TypeScript type for data as it is represented on the **client**. */
     Client: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodClientSchema">>>>;
-    /** The TypeScript type for **validation** data, often the most flexible shape. */
     Validation: z.infer<z.ZodObject<Prettify<DeriveSchemaByKey<T, "zodValidationSchema">>>>;
-    /** The TypeScript type for the object of **default values**. */
     Defaults: DeriveDefaults<T>;
 }>;
 export {};

package/dist/schema.js

@@ -301,10 +301,19 @@ function inferDefaultFromZod(zodType, sqlConfig) {
             }
             return sqlConfig.default;
         }
-        // Check if it's a relation config (this logic is fine)
         if (typeof sqlConfig.type === "string" &&
             ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
-            // ... your existing relation logic is fine ...
+            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)
         const sqlTypeConfig = sqlConfig;
@@ -422,85 +431,69 @@ export function createSchema(schema, relations) {
     const validationFields = {};
     const defaultValues = {};
     const fieldTransforms = {};
-    // --- PASS 1: Process main schema fields (no relations here) ---
-    for (const key in schema) {
-        if (key === "_tableName" || key.startsWith("__"))
+    const fullSchema = { ...schema, ...(relations || {}) };
+    for (const key in fullSchema) {
+        if (key === "_tableName" ||
+            key.startsWith("__") ||
+            key === String(SchemaWrapperBrand))
+            continue;
+        const definition = fullSchema[key];
+        // --- THIS IS THE FIX ---
+        // The condition now correctly checks for EITHER a `reference` type OR a builder with a `.config`.
+        if (!definition ||
+            (definition.type !== "reference" && !definition.config)) {
             continue;
-        const definition = schema[key];
-        if (definition && definition.type === "reference") {
-            // Handle reference fields
+        }
+        if (definition.type === "reference") {
+            // This block now correctly processes `testId`.
             const referencedFieldBuilder = definition.to();
             const referencedConfig = referencedFieldBuilder.config;
             sqlFields[key] = referencedConfig.zodSqlSchema;
             clientFields[key] = referencedConfig.zodClientSchema;
             validationFields[key] = referencedConfig.zodValidationSchema;
-            // Foreign key fields should get their own default, not the referenced field's default
             defaultValues[key] = inferDefaultFromZod(referencedConfig.zodClientSchema, { ...referencedConfig.sql, default: undefined });
         }
-        else if (definition && definition.config) {
-            // Handle regular fields with builder pattern
+        else {
+            // This block handles fields with a `.config` property, like `pets`.
             const config = definition.config;
-            sqlFields[key] = config.zodSqlSchema;
-            clientFields[key] = config.zodClientSchema;
-            validationFields[key] = config.zodValidationSchema;
-            if (config.transforms) {
-                fieldTransforms[key] = config.transforms;
-            }
-            // Handle initial value
-            const initialValueOrFn = config.initialValue;
-            if (isFunction(initialValueOrFn)) {
-                defaultValues[key] = initialValueOrFn();
+            const sqlConfig = config.sql;
+            if (sqlConfig &&
+                typeof sqlConfig === "object" &&
+                ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
+                const relatedSchemaFactory = sqlConfig.schema;
+                const childSchemaResult = createSchema(relatedSchemaFactory());
+                let baseSqlSchema;
+                let baseClientSchema;
+                if (sqlConfig.type === "hasMany" || sqlConfig.type === "manyToMany") {
+                    baseSqlSchema = z.array(childSchemaResult.sqlSchema);
+                    baseClientSchema = z.array(childSchemaResult.clientSchema);
+                    defaultValues[key] = Array.from({ length: sqlConfig.defaultCount || 0 }, () => childSchemaResult.defaultValues);
+                }
+                else {
+                    baseSqlSchema = childSchemaResult.sqlSchema;
+                    baseClientSchema = childSchemaResult.clientSchema;
+                    defaultValues[key] = childSchemaResult.defaultValues;
+                }
+                sqlFields[key] = baseSqlSchema.optional();
+                clientFields[key] = config.clientTransform
+                    ? config.clientTransform(baseClientSchema)
+                    : baseClientSchema;
+                validationFields[key] = clientFields[key];
             }
             else {
-                defaultValues[key] = initialValueOrFn;
-            }
-        }
-    }
-    // --- PASS 2: Process relations if provided ---
-    if (relations) {
-        for (const key in relations) {
-            const relationDefinition = relations[key];
-            if (relationDefinition && relationDefinition.config) {
-                const config = relationDefinition.config;
-                const sqlConfig = config.sql;
-                if (sqlConfig &&
-                    typeof sqlConfig === "object" &&
-                    ["hasMany", "hasOne", "belongsTo", "manyToMany"].includes(sqlConfig.type)) {
-                    const relationConfig = sqlConfig;
-                    const childSchemaResult = createSchema(relationConfig.schema());
-                    // Create the base schemas based on relation type
-                    let baseSqlSchema;
-                    let baseClientSchema;
-                    let baseValidationSchema;
-                    if (relationConfig.type === "hasMany" ||
-                        relationConfig.type === "manyToMany") {
-                        baseSqlSchema = z.array(childSchemaResult.sqlSchema);
-                        baseClientSchema = z.array(childSchemaResult.clientSchema);
-                        baseValidationSchema = z.array(childSchemaResult.validationSchema);
-                        defaultValues[key] = Array.from({ length: relationConfig.defaultCount || 0 }, () => childSchemaResult.defaultValues);
-                    }
-                    else {
-                        baseSqlSchema = childSchemaResult.sqlSchema;
-                        baseClientSchema = childSchemaResult.clientSchema;
-                        baseValidationSchema = childSchemaResult.validationSchema;
-                        defaultValues[key] = childSchemaResult.defaultValues;
-                    }
-                    // Apply transforms if they exist
-                    const finalClientSchema = config.clientTransform
-                        ? config.clientTransform(baseClientSchema)
-                        : baseClientSchema;
-                    const finalValidationSchema = config.validationTransform
-                        ? config.validationTransform(baseValidationSchema)
-                        : finalClientSchema;
-                    // Assign the schemas
-                    sqlFields[key] = baseSqlSchema.optional(); // SQL fields are optional for lazy loading
-                    clientFields[key] = finalClientSchema;
-                    validationFields[key] = finalValidationSchema;
+                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;
             }
         }
     }
-    // Create transform functions
     const toClient = (dbObject) => {
         const clientObject = { ...dbObject };
         for (const key in fieldTransforms) {
@@ -558,7 +551,7 @@ export function schemaRelations(baseSchema, referencesBuilder) {
                 type: "hasOne",
                 fromKey: config.fromKey,
                 toKey: config.toKey,
-                schema: config.schema,
+                schema: () => config.toKey.__parentTableType,
             };
             const relationZodType = z.any();
             return createBuilder({

package/package.json

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