@dbcube/schema-builder 1.0.18 → 1.0.20

package/dist/index.cjs

@@ -660,7 +660,7 @@ var DependencyResolver = class {
       } else if (import_fs3.default.existsSync(file)) {
         filePath = import_path2.default.resolve(file);
       } else {
-        filePath = import_path2.default.join(process.cwd(), "dbcube", "cubes", file);
+        filePath = import_path2.default.join(process.cwd(), "dbcube", file);
       }
       try {
         const tableNameResult = FileUtils_default.extracTableNameFromCube(filePath);
@@ -757,7 +757,6 @@ var DependencyResolver = class {
       }
     }
     if (result.length !== dependencies.length) {
-      console.warn("\u26A0\uFE0F  Circular dependencies detected in tables. Some tables may not execute in optimal order.");
       for (const dep of dependencies) {
         if (!result.includes(dep.tableName)) {
           result.push(dep.tableName);
@@ -778,7 +777,6 @@ var DependencyResolver = class {
         import_fs3.default.mkdirSync(dbcubeDir, { recursive: true });
       }
       import_fs3.default.writeFileSync(orderFile, JSON.stringify(order, null, 2), "utf8");
-      console.log(`\u{1F4C4} Execution order saved to: ${import_path2.default.relative(projectRoot, orderFile)}`);
     } catch (error) {
       console.error("\u274C Failed to save execution order:", error);
     }
@@ -806,14 +804,13 @@ var DependencyResolver = class {
   static orderCubeFiles(cubeFiles, cubeType) {
     const executionOrder = this.loadExecutionOrder();
     if (!executionOrder) {
-      console.log("\u{1F4C4} No execution order found, processing files in current order");
       return cubeFiles;
     }
     const orderList = cubeType === "table" ? executionOrder.tables : executionOrder.seeders;
     const orderedFiles = [];
     const fileMap = /* @__PURE__ */ new Map();
     for (const file of cubeFiles) {
-      const filePath = import_path2.default.isAbsolute(file) ? file : import_path2.default.join(process.cwd(), "dbcube", "cubes", file);
+      const filePath = import_path2.default.isAbsolute(file) ? file : import_path2.default.join(process.cwd(), "dbcube", file);
       const tableNameResult = FileUtils_default.extracTableNameFromCube(filePath);
       const tableName = tableNameResult.status === 200 ? tableNameResult.message : import_path2.default.basename(file, `.${cubeType}.cube`);
       fileMap.set(tableName, file);
@@ -827,7 +824,6 @@ var DependencyResolver = class {
     for (const [, file] of fileMap) {
       orderedFiles.push(file);
     }
-    console.log(`\u{1F4CB} Using dependency order: ${orderList.join(" \u2192 ")}`);
     return orderedFiles;
   }
 };
@@ -934,6 +930,62 @@ var Schema = class {
       return 1;
     }
   }
+  /**
+   * Extracts foreign key dependencies from a cube file
+   */
+  extractForeignKeyDependencies(filePath) {
+    const dependencies = [];
+    try {
+      const content = import_fs4.default.readFileSync(filePath, "utf8");
+      const lines = content.split("\n");
+      let insideForeignKey = false;
+      let braceCount = 0;
+      for (const line of lines) {
+        if (/foreign\s*:\s*\{/.test(line)) {
+          insideForeignKey = true;
+          braceCount = 1;
+          const sameLineMatch = line.match(/table\s*:\s*["']([^"']+)["']/);
+          if (sameLineMatch) {
+            dependencies.push(sameLineMatch[1]);
+            insideForeignKey = false;
+            braceCount = 0;
+          }
+          continue;
+        }
+        if (insideForeignKey) {
+          braceCount += (line.match(/\{/g) || []).length;
+          braceCount -= (line.match(/\}/g) || []).length;
+          const tableMatch = line.match(/table\s*:\s*["']([^"']+)["']/);
+          if (tableMatch) {
+            dependencies.push(tableMatch[1]);
+          }
+          if (braceCount === 0) {
+            insideForeignKey = false;
+          }
+        }
+      }
+    } catch (error) {
+      console.error(`Error reading dependencies from ${filePath}:`, error);
+    }
+    return dependencies;
+  }
+  /**
+   * Finds the line number where a foreign key table reference is located
+   */
+  findForeignKeyLineNumber(filePath, tableName) {
+    try {
+      const content = import_fs4.default.readFileSync(filePath, "utf8");
+      const lines = content.split("\n");
+      for (let i = 0; i < lines.length; i++) {
+        if (lines[i].includes(`table: "${tableName}"`) || lines[i].includes(`table: '${tableName}'`)) {
+          return i + 1;
+        }
+      }
+      return 1;
+    } catch {
+      return 1;
+    }
+  }
   async createDatabase() {
     const startTime = Date.now();
     const rootPath = import_path3.default.resolve(process.cwd());
@@ -980,15 +1032,14 @@ var Schema = class {
   }
   async refreshTables() {
     const startTime = Date.now();
-    const cubesDir = import_path3.default.join(process.cwd(), "dbcube", "cubes");
+    const cubesDir = import_path3.default.join(process.cwd(), "dbcube");
     if (!import_fs4.default.existsSync(cubesDir)) {
       throw new Error("\u274C The cubes folder does not exist");
     }
-    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", "table.cube");
+    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", ".table.cube");
     if (cubeFiles.length === 0) {
       throw new Error("\u274C There are no cubes to execute");
     }
-    console.log("\u{1F504} Resolving table dependencies...");
     DependencyResolver.resolveDependencies(cubeFiles, "table");
     const orderedCubeFiles = DependencyResolver.orderCubeFiles(cubeFiles, "table");
     UIUtils.showOperationHeader("EXECUTING REFRESH TABLES", this.name, "\u{1F504}");
@@ -997,6 +1048,7 @@ var Schema = class {
     let errorCount = 0;
     const processedTables = [];
     const errors = [];
+    const failedTables = /* @__PURE__ */ new Set();
     for (let index = 0; index < orderedCubeFiles.length; index++) {
       const file = orderedCubeFiles[index];
       const filePath = import_path3.default.isAbsolute(file) ? file : import_path3.default.join(cubesDir, file);
@@ -1010,6 +1062,22 @@ var Schema = class {
           if (!validation.isValid && validation.error) {
             UIUtils.showItemError(tableName, validation.error.error);
             errors.push(validation.error);
+            failedTables.add(tableName);
+            errorCount++;
+            continue;
+          }
+          const dependencies = this.extractForeignKeyDependencies(filePath);
+          const missingDependencies = dependencies.filter((dep) => failedTables.has(dep));
+          if (missingDependencies.length > 0) {
+            const dependencyError = {
+              itemName: tableName,
+              error: `Cannot refresh table '${tableName}' because it depends on failed table(s): ${missingDependencies.join(", ")}`,
+              filePath,
+              lineNumber: this.findForeignKeyLineNumber(filePath, missingDependencies[0])
+            };
+            UIUtils.showItemError(tableName, dependencyError.error);
+            errors.push(dependencyError);
+            failedTables.add(tableName);
             errorCount++;
             continue;
           }
@@ -1066,6 +1134,7 @@ var Schema = class {
           };
           UIUtils.showItemError(tableName, error.message);
           errors.push(processError);
+          failedTables.add(tableName);
           errorCount++;
         }
       }
@@ -1085,15 +1154,14 @@ var Schema = class {
   }
   async freshTables() {
     const startTime = Date.now();
-    const cubesDir = import_path3.default.join(process.cwd(), "dbcube", "cubes");
+    const cubesDir = import_path3.default.join(process.cwd(), "dbcube");
     if (!import_fs4.default.existsSync(cubesDir)) {
       throw new Error("\u274C The cubes folder does not exist");
     }
-    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", "table.cube");
+    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", ".table.cube");
     if (cubeFiles.length === 0) {
       throw new Error("\u274C There are no cubes to execute");
     }
-    console.log("\u{1F504} Resolving table dependencies...");
     DependencyResolver.resolveDependencies(cubeFiles, "table");
     const orderedCubeFiles = DependencyResolver.orderCubeFiles(cubeFiles, "table");
     UIUtils.showOperationHeader("EXECUTING FRESH TABLES", this.name);
@@ -1102,6 +1170,7 @@ var Schema = class {
     let errorCount = 0;
     const processedTables = [];
     const errors = [];
+    const failedTables = /* @__PURE__ */ new Set();
     for (let index = 0; index < orderedCubeFiles.length; index++) {
       const file = orderedCubeFiles[index];
       const filePath = import_path3.default.isAbsolute(file) ? file : import_path3.default.join(cubesDir, file);
@@ -1115,6 +1184,22 @@ var Schema = class {
           if (!validation.isValid && validation.error) {
             UIUtils.showItemError(tableName, validation.error.error);
             errors.push(validation.error);
+            failedTables.add(tableName);
+            errorCount++;
+            continue;
+          }
+          const dependencies = this.extractForeignKeyDependencies(filePath);
+          const missingDependencies = dependencies.filter((dep) => failedTables.has(dep));
+          if (missingDependencies.length > 0) {
+            const dependencyError = {
+              itemName: tableName,
+              error: `Cannot create table '${tableName}' because it depends on failed table(s): ${missingDependencies.join(", ")}`,
+              filePath,
+              lineNumber: this.findForeignKeyLineNumber(filePath, missingDependencies[0])
+            };
+            UIUtils.showItemError(tableName, dependencyError.error);
+            errors.push(dependencyError);
+            failedTables.add(tableName);
             errorCount++;
             continue;
           }
@@ -1169,6 +1254,7 @@ var Schema = class {
           };
           UIUtils.showItemError(tableName, error.message);
           errors.push(processError);
+          failedTables.add(tableName);
           errorCount++;
         }
       }
@@ -1188,11 +1274,11 @@ var Schema = class {
   }
   async executeSeeders() {
     const startTime = Date.now();
-    const cubesDir = import_path3.default.join(process.cwd(), "dbcube", "cubes");
+    const cubesDir = import_path3.default.join(process.cwd(), "dbcube");
     if (!import_fs4.default.existsSync(cubesDir)) {
       throw new Error("\u274C The cubes folder does not exist");
     }
-    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", "seeder.cube");
+    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", ".seeder.cube");
     if (cubeFiles.length === 0) {
       throw new Error("\u274C There are no cubes to execute");
     }
@@ -1260,12 +1346,12 @@ var Schema = class {
   }
   async executeTriggers() {
     const startTime = Date.now();
-    const cubesDir = import_path3.default.join(process.cwd(), "dbcube", "cubes");
+    const cubesDir = import_path3.default.join(process.cwd(), "dbcube");
     const triggersDirExit = import_path3.default.join(process.cwd(), "dbcube", "triggers");
     if (!import_fs4.default.existsSync(cubesDir)) {
       throw new Error("\u274C The cubes folder does not exist");
     }
-    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", "trigger.cube");
+    const cubeFiles = FileUtils_default.getCubeFilesRecursively("dbcube", ".trigger.cube");
     if (cubeFiles.length === 0) {
       throw new Error("\u274C There are no cubes to execute");
     }