@housekit/kit 0.1.28 → 0.1.30

package/dist/index.js

@@ -8196,8 +8196,25 @@ async function loadSchema(schemaPath, options) {
       allFiles = allFiles.concat(files);
     }
   }
-  const foundTables = [];
+  const filesByBaseName = new Map;
+  const extensionPriority = { ".ts": 0, ".mjs": 1, ".cjs": 2, ".js": 3 };
   for (const file of allFiles) {
+    const ext2 = extensions.find((e) => file.endsWith(e)) || ".js";
+    const baseNameWithoutExt = file.slice(0, -ext2.length);
+    const existing = filesByBaseName.get(baseNameWithoutExt);
+    if (existing) {
+      const existingExt = extensions.find((e) => existing.endsWith(e)) || ".js";
+      if (extensionPriority[ext2] < extensionPriority[existingExt]) {
+        filesByBaseName.set(baseNameWithoutExt, file);
+      }
+    } else {
+      filesByBaseName.set(baseNameWithoutExt, file);
+    }
+  }
+  const deduplicatedFiles = Array.from(filesByBaseName.values());
+  const foundTables = [];
+  const tableSourceFile = {};
+  for (const file of deduplicatedFiles) {
     const fullPath = resolve2(process.cwd(), file);
     try {
       const module = await jiti.import(fullPath);
@@ -8205,9 +8222,13 @@ async function loadSchema(schemaPath, options) {
         if (value && typeof value === "object" && "toSQL" in value && "$columns" in value && "$table" in value) {
           const table = value;
           if (tables[table.$table]) {
-            throw new Error(`Duplicate: Table "${table.$table}" is defined multiple times.`);
+            if (tables[table.$table] === table) {
+              continue;
+            }
+            throw new Error(`Duplicate: Table "${table.$table}" is defined multiple times (in ${tableSourceFile[table.$table]} and ${file}).`);
           }
           tables[table.$table] = table;
+          tableSourceFile[table.$table] = file;
           foundTables.push(`${table.$table}${key !== table.$table ? ` (${key})` : ""}`);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@housekit/kit",
-    "version": "0.1.28",
+    "version": "0.1.30",
     "description": "CLI tool for HouseKit - manage ClickHouse schemas, migrations, and database operations with type-safe workflows.",
     "type": "module",
     "main": "./dist/index.js",
@@ -48,7 +48,7 @@
     },
     "dependencies": {
         "@clickhouse/client": "^1.14.0",
-        "@housekit/orm": "^0.1.34",
+        "@housekit/orm": "^0.1.36",
         "boxen": "8.0.1",
         "chalk": "^5.6.2",
         "cli-table3": "^0.6.5",