@pylonts/dsl 1.1.2 → 1.1.3

package/dist/db.js

@@ -68,9 +68,24 @@ export function defineTable(name, schema) {
         table.columns[key].name = key;
         table.columns[key].schema = table;
     }
+    if (table.primaryKey) {
+        const pkFields = Array.isArray(table.primaryKey) ? table.primaryKey : [table.primaryKey];
+        const colRefs = Object.values(table.columns);
+        for (const pk of pkFields) {
+            if (!colRefs.includes(pk)) {
+                throw new Error(`table '${name}': primaryKey field '${pk.name}' must be the exact same object as the corresponding column (extract it to a const and reuse)`);
+            }
+        }
+    }
     for (const [fkName, fk] of Object.entries(table.foreignKeys ?? {})) {
         const refs = Array.isArray(fk.references) ? fk.references : [fk.references];
         const fields = Array.isArray(fk.columns) ? fk.columns : [fk.columns];
+        const colRefs = Object.values(table.columns);
+        for (const fkField of fields) {
+            if (!colRefs.includes(fkField)) {
+                throw new Error(`foreign key ${fkName}: column '${fkField.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`);
+            }
+        }
         for (let i = 0; i < refs.length; i++) {
             const ref = refs[i];
             if (!ref.schema)
@@ -89,11 +104,16 @@ export function defineTable(name, schema) {
     }
     for (const [idxKey, index] of Object.entries(table.indexes ?? {})) {
         const cols = Array.isArray(index.columns) ? index.columns : [index.columns];
+        const colRefs = Object.values(table.columns);
         for (const col of cols) {
             if (typeof col !== 'object' || col === null || typeof col.type !== 'string') {
                 const idxName = index.name ?? idxKey;
                 throw new Error(`index ${idxName}: columns must be Field instances (stringField()/intField()/...), got ${JSON.stringify(col)}`);
             }
+            if (!colRefs.includes(col)) {
+                const idxName = index.name ?? idxKey;
+                throw new Error(`index ${idxName}: column '${col.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`);
+            }
         }
     }
     return table;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pylonts/dsl",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Schema definition DSL with drivers: MySQL DDL, TS enum, TypeBox schema codegen.",
   "type": "module",
   "main": "src/index.ts",
@@ -28,4 +28,4 @@
     "typescript": "^7.0.2",
     "vitest": "^4.1.10"
   }
-}
+}

package/src/db.ts

@@ -120,9 +120,28 @@ export function defineTable<
     table.columns[key].name = key;
     table.columns[key].schema = table;
   }
+  if (table.primaryKey) {
+    const pkFields = Array.isArray(table.primaryKey) ? table.primaryKey : [table.primaryKey];
+    const colRefs = Object.values(table.columns);
+    for (const pk of pkFields) {
+      if (!colRefs.includes(pk)) {
+        throw new Error(
+          `table '${name}': primaryKey field '${pk.name}' must be the exact same object as the corresponding column (extract it to a const and reuse)`,
+        );
+      }
+    }
+  }
   for (const [fkName, fk] of Object.entries(table.foreignKeys ?? {})) {
     const refs = Array.isArray(fk.references) ? fk.references : [fk.references];
     const fields = Array.isArray(fk.columns) ? fk.columns : [fk.columns];
+    const colRefs = Object.values(table.columns);
+    for (const fkField of fields) {
+      if (!colRefs.includes(fkField)) {
+        throw new Error(
+          `foreign key ${fkName}: column '${fkField.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`,
+        );
+      }
+    }
     for (let i = 0; i < refs.length; i++) {
       const ref = refs[i];
       if (!ref.schema) throw new Error(`foreign key ${fkName}: references field has no schema`);
@@ -140,6 +159,7 @@ export function defineTable<
   }
   for (const [idxKey, index] of Object.entries(table.indexes ?? {})) {
     const cols = Array.isArray(index.columns) ? index.columns : [index.columns];
+    const colRefs = Object.values(table.columns);
     for (const col of cols) {
       if (typeof col !== 'object' || col === null || typeof (col as Field).type !== 'string') {
         const idxName = index.name ?? idxKey;
@@ -147,6 +167,12 @@ export function defineTable<
           `index ${idxName}: columns must be Field instances (stringField()/intField()/...), got ${JSON.stringify(col)}`,
         );
       }
+      if (!colRefs.includes(col)) {
+        const idxName = index.name ?? idxKey;
+        throw new Error(
+          `index ${idxName}: column '${col.name}' must be the exact same object as the corresponding column in the table (extract it to a const and reuse)`,
+        );
+      }
     }
   }
   return table;