cogsbox-shape 0.5.40 → 0.5.41

package/dist/schema.js

@@ -340,7 +340,7 @@ function isRelation(value) {
         typeof value === "object" &&
         "type" in value &&
         "fromKey" in value &&
-        "toKey" in value &&
+        typeof value.toKey === "function" && // More specific check
         "schema" in value);
 }
 export function createSchema(schema) {
@@ -418,9 +418,13 @@ function serializeSchemaMetadata(schema) {
                 continue;
             let toKeyName = null;
             try {
-                const targetFieldBuilder = relation.toKey();
+                let targetFieldDefinition = relation.toKey();
+                if (targetFieldDefinition &&
+                    targetFieldDefinition.type === "reference") {
+                    targetFieldDefinition = targetFieldDefinition.to();
+                }
                 for (const targetKey in relation.schema) {
-                    if (relation.schema[targetKey] === targetFieldBuilder) {
+                    if (relation.schema[targetKey] === targetFieldDefinition) {
                         toKeyName = targetKey;
                         break;
                     }
@@ -444,10 +448,23 @@ function serializeSchemaMetadata(schema) {
             fields[key] = { type: "field", sql: definition.config.sql };
             if (definition.config.sql.pk === true) {
                 if (primaryKey)
-                    console.warn(`[cogsbox-shape] Multiple primary keys in schema '${schema._tableName}'. Using last one found: '${key}'.`);
+                    console.warn(`[cogsbox-shape] Multiple primary keys found. Using last one: '${key}'.`);
                 primaryKey = key;
             }
         }
+        else if (definition && definition.type === "reference") {
+            const targetFieldBuilder = definition.to();
+            if (targetFieldBuilder &&
+                targetFieldBuilder.config &&
+                targetFieldBuilder.config.sql) {
+                fields[key] = { type: "field", sql: targetFieldBuilder.config.sql };
+                if (targetFieldBuilder.config.sql.pk) {
+                    if (primaryKey)
+                        console.warn(`[cogsbox-shape] Multiple primary keys found. Using last one: '${key}'.`);
+                    primaryKey = key;
+                }
+            }
+        }
     }
     return { _tableName: schema._tableName, primaryKey, fields, relations };
 }

package/package.json

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