cogsbox-shape 0.5.5 → 0.5.7

package/dist/schema.d.ts

@@ -1216,9 +1216,15 @@ type BaseSchemaField<T extends SQLType = SQLType> = {
     toClient?: (dbValue: any) => any;
     toDb?: (clientValue: any) => any;
 };
-type ReferenceField<T extends BaseSchemaField = BaseSchemaField> = {
+type ReferenceField = {
     type: "reference";
-    to: () => T;
+    to: () => any;
+    sql: SQLType;
+    zodDbSchema: z.ZodType<any>;
+    zodClientSchema: z.ZodType<any>;
+    defaultValue?: any;
+    toClient?: (dbValue: any) => any;
+    toDb?: (clientValue: any) => any;
 };
 type SchemaField<T extends SQLType = SQLType> = BaseSchemaField<T> | ReferenceField;
 export type Schema<T extends Record<string, SchemaField | (() => Relation<any>)>> = {
@@ -1243,12 +1249,6 @@ 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 () => {
@@ -1256,12 +1256,6 @@ 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;
@@ -1270,12 +1264,6 @@ 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;
@@ -1283,11 +1271,6 @@ 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;
@@ -1296,11 +1279,6 @@ 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 () => {
@@ -1308,11 +1286,6 @@ 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;
@@ -1441,9 +1414,11 @@ type InferSerializedSchema<T> = {
         };
     } : never;
 };
-export declare function reference<T extends BaseSchemaField>(config: {
+type ShapeFieldReturn = ReturnType<typeof shape.sql>;
+export declare function reference<T = any>(config: {
     to: () => T;
-}): ReferenceField<T>;
+    field: ShapeFieldReturn;
+}): ReferenceField;
 export declare function createSchema<T extends Schema<any>>(schema: T): {
     dbSchema: z.ZodObject<Prettify<InferDBSchema<T>>>;
     clientSchema: z.ZodObject<Prettify<OmitNever<InferSchema<T>>>>;

package/dist/schema.js

@@ -309,6 +309,12 @@ export function reference(config) {
     return {
         type: "reference",
         to: config.to,
+        sql: config.field.sql,
+        zodDbSchema: config.field.zodDbSchema,
+        zodClientSchema: config.field.zodClientSchema,
+        defaultValue: config.field.defaultValue,
+        toClient: config.field.toClient,
+        toDb: config.field.toDb,
     };
 }
 function createSerializableSchema(schema) {
@@ -388,14 +394,13 @@ 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" || key === "__schemaId")
+        if (key === "_tableName")
             continue;
         if (typeof value === "function") {
             const relation = value();
@@ -437,22 +442,10 @@ export function createSchema(schema) {
             }
             continue;
         }
-        // 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);
-        }
+        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.5",
+    "version": "0.5.7",
     "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",