cogsbox-shape 0.5.2 → 0.5.5

package/dist/schema.d.ts

@@ -1216,9 +1216,9 @@ type BaseSchemaField<T extends SQLType = SQLType> = {
     toClient?: (dbValue: any) => any;
     toDb?: (clientValue: any) => any;
 };
-type ReferenceField = {
+type ReferenceField<T extends BaseSchemaField = BaseSchemaField> = {
     type: "reference";
-    to: () => BaseSchemaField;
+    to: () => T;
 };
 type SchemaField<T extends SQLType = SQLType> = BaseSchemaField<T> | ReferenceField;
 export type Schema<T extends Record<string, SchemaField | (() => Relation<any>)>> = {
@@ -1243,6 +1243,12 @@ type Prettify<T> = {
 } & {};
 type InferSchema<T> = {
     [K in keyof T as K extends "_tableName" | "__schemaId" ? never : K]: T[K] extends {
+        type: "reference";
+        to: () => infer RefField;
+    } ? RefField extends {
+        zodClientSchema: infer ClientType extends z.ZodTypeAny;
+        toClient?: (dbValue: any) => infer TransformedType;
+    } ? RefField["toClient"] extends Function ? z.ZodType<TransformedType> : ClientType extends z.ZodNever ? z.ZodOptional<z.ZodDate> : ClientType : never : T[K] extends {
         zodClientSchema: infer ClientType extends z.ZodTypeAny;
         toClient?: (dbValue: any) => infer TransformedType;
     } ? T[K]["toClient"] extends Function ? z.ZodType<TransformedType> : ClientType extends z.ZodNever ? z.ZodOptional<z.ZodDate> : ClientType : T[K] extends () => {
@@ -1250,6 +1256,12 @@ type InferSchema<T> = {
         schema: infer S;
     } ? z.ZodArray<z.ZodObject<{
         [P in keyof S as P extends "_tableName" | "__schemaId" ? never : P]: S[P] extends {
+            type: "reference";
+            to: () => infer RefField;
+        } ? RefField extends {
+            zodClientSchema: z.ZodTypeAny;
+            toClient?: (dbValue: any) => any;
+        } ? RefField["toClient"] extends Function ? z.ZodType<ReturnType<RefField["toClient"]>> : RefField["zodClientSchema"] extends z.ZodNever ? z.ZodOptional<z.ZodDate> : RefField["zodClientSchema"] : never : S[P] extends {
             zodClientSchema: z.ZodTypeAny;
             toClient?: (dbValue: any) => any;
         } ? S[P]["toClient"] extends Function ? z.ZodType<ReturnType<S[P]["toClient"]>> : S[P]["zodClientSchema"] extends z.ZodNever ? z.ZodOptional<z.ZodDate> : S[P]["zodClientSchema"] : never;
@@ -1258,6 +1270,12 @@ type InferSchema<T> = {
         schema: infer S;
     } ? z.ZodObject<{
         [P in keyof S as P extends "_tableName" | "__schemaId" ? never : P]: S[P] extends {
+            type: "reference";
+            to: () => infer RefField;
+        } ? RefField extends {
+            zodClientSchema: z.ZodTypeAny;
+            toClient?: (dbValue: any) => any;
+        } ? RefField["toClient"] extends Function ? z.ZodType<ReturnType<RefField["toClient"]>> : RefField["zodClientSchema"] extends z.ZodNever ? z.ZodOptional<z.ZodDate> : RefField["zodClientSchema"] : never : S[P] extends {
             zodClientSchema: z.ZodTypeAny;
             toClient?: (dbValue: any) => any;
         } ? S[P]["toClient"] extends Function ? z.ZodType<ReturnType<S[P]["toClient"]>> : S[P]["zodClientSchema"] extends z.ZodNever ? z.ZodOptional<z.ZodDate> : S[P]["zodClientSchema"] : never;
@@ -1265,6 +1283,11 @@ type InferSchema<T> = {
 };
 export type InferDBSchema<T> = {
     [K in keyof T as K extends "_tableName" | "__schemaId" ? never : K]: T[K] extends {
+        type: "reference";
+        to: () => infer RefField;
+    } ? RefField extends {
+        zodDbSchema: infer DbType extends z.ZodTypeAny;
+    } ? DbType : never : T[K] extends {
         zodDbSchema: infer DbType extends z.ZodTypeAny;
     } ? DbType : T[K] extends {
         dbType: infer DbType extends z.ZodTypeAny;
@@ -1273,6 +1296,11 @@ export type InferDBSchema<T> = {
         schema: infer S;
     } ? z.ZodArray<z.ZodObject<{
         [P in keyof S as P extends "_tableName" | "__schemaId" ? never : P]: S[P] extends {
+            type: "reference";
+            to: () => infer RefField;
+        } ? RefField extends {
+            zodDbSchema: infer DbType extends z.ZodTypeAny;
+        } ? DbType : never : S[P] extends {
             zodDbSchema: infer DbType extends z.ZodTypeAny;
         } ? DbType : never;
     }>> : T[K] extends () => {
@@ -1280,6 +1308,11 @@ export type InferDBSchema<T> = {
         schema: infer S;
     } ? z.ZodObject<{
         [P in keyof S as P extends "_tableName" | "__schemaId" ? never : P]: S[P] extends {
+            type: "reference";
+            to: () => infer RefField;
+        } ? RefField extends {
+            zodDbSchema: infer DbType extends z.ZodTypeAny;
+        } ? DbType : never : S[P] extends {
             zodDbSchema: infer DbType extends z.ZodTypeAny;
         } ? DbType : never;
     }> : never;
@@ -1408,19 +1441,22 @@ type InferSerializedSchema<T> = {
         };
     } : never;
 };
-export declare function reference(config: {
-    to: () => BaseSchemaField;
-}): SchemaField;
+export declare function reference<T extends BaseSchemaField>(config: {
+    to: () => T;
+}): ReferenceField<T>;
 export declare function createSchema<T extends Schema<any>>(schema: T): {
     dbSchema: z.ZodObject<Prettify<InferDBSchema<T>>>;
-    clientSchema: z.ZodObject<Prettify<InferSchema<T> extends infer T_3 ? { [K in keyof T_3 as InferSchema<T>[K] extends never ? never : K]: InferSchema<T>[K]; } : never>>;
-    defaultValues: Prettify<ConfigWithOptionalProps<T> extends infer T_4 ? { [K_1 in keyof T_4 as ConfigWithOptionalProps<T>[K_1] extends never ? never : K_1]: ConfigWithOptionalProps<T>[K_1]; } : never>;
-    initialValues: () => Prettify<ConfigWithOptionalProps<T> extends infer T_5 ? { [K_1 in keyof T_5 as ConfigWithOptionalProps<T>[K_1] extends never ? never : K_1]: ConfigWithOptionalProps<T>[K_1]; } : never>;
+    clientSchema: z.ZodObject<Prettify<OmitNever<InferSchema<T>>>>;
+    defaultValues: Prettify<OmitNever<ConfigWithOptionalProps<T>>>;
+    initialValues: () => Prettify<OmitNever<ConfigWithOptionalProps<T>>>;
     serialized: Prettify<InferSerializedSchema<T>> & {
         _tableName: string;
         __schemaId: string;
     };
 };
+type OmitNever<T> = {
+    [K in keyof T as T[K] extends never ? never : K]: T[K];
+};
 type DefaultValue<T> = Prettify<DeepWriteable<InferDefaultValues<T>>>;
 type GetMandatoryKeys<T> = {
     [P in keyof T]: T[P] extends Exclude<T[P], undefined> ? P : never;

package/dist/schema.js

@@ -305,7 +305,6 @@ function inferDefaultFromZod(zodType, sqlConfig) {
     }
     return undefined;
 }
-// Update reference function
 export function reference(config) {
     return {
         type: "reference",
@@ -389,13 +388,14 @@ function createSerializableSchema(schema) {
     }
     return serializableSchema;
 }
+// Update the createSchema function to handle references in the main loop
 export function createSchema(schema) {
     const serialized = createSerializableSchema(schema);
     const dbFields = {};
     const clientFields = {};
     const defaultValues = {};
     for (const [key, value] of Object.entries(schema)) {
-        if (key === "_tableName")
+        if (key === "_tableName" || key === "__schemaId")
             continue;
         if (typeof value === "function") {
             const relation = value();
@@ -437,10 +437,22 @@ export function createSchema(schema) {
             }
             continue;
         }
-        dbFields[key] = value.zodDbSchema;
-        clientFields[key] = value.zodClientSchema;
-        defaultValues[key] =
-            value.defaultValue ?? inferDefaultFromZod(value.zodClientSchema);
+        // Handle references - this is the key addition
+        if (value && typeof value === "object" && value.type === "reference") {
+            const referencedField = value.to();
+            dbFields[key] = referencedField.zodDbSchema;
+            clientFields[key] = referencedField.zodClientSchema;
+            defaultValues[key] =
+                referencedField.defaultValue ??
+                    inferDefaultFromZod(referencedField.zodClientSchema);
+        }
+        else {
+            // Handle regular fields
+            dbFields[key] = value.zodDbSchema;
+            clientFields[key] = value.zodClientSchema;
+            defaultValues[key] =
+                value.defaultValue ?? inferDefaultFromZod(value.zodClientSchema);
+        }
     }
     return {
         dbSchema: z.object(dbFields),

package/package.json

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