opencroc 1.5.0 → 1.6.0

package/dist/index.js

@@ -1767,11 +1767,32 @@ function createPipeline(config) {
         validationErrors: [],
         duration: 0
       };
+      const backendRoot = path7.resolve(config.backendRoot);
+      const findDir = (name) => {
+        const candidates = [
+          path7.join(backendRoot, name),
+          // ./models
+          path7.join(backendRoot, "src", name),
+          // ./src/models
+          path7.join(backendRoot, "backend", "src", name),
+          // ./backend/src/models
+          path7.join(backendRoot, "backend", name),
+          // ./backend/models
+          path7.join(backendRoot, "server", "src", name),
+          // ./server/src/models
+          path7.join(backendRoot, "app", name)
+          // ./app/models
+        ];
+        for (const c of candidates) {
+          if (fs5.existsSync(c)) return c;
+        }
+        return null;
+      };
+      const modelsRoot = findDir("models");
+      const controllersRoot = findDir("controllers");
       if (activeSteps.includes("scan")) {
-        const backendRoot = path7.resolve(config.backendRoot);
-        const modelsDir = path7.join(backendRoot, "models");
-        if (fs5.existsSync(modelsDir)) {
-          const dirs = fs5.readdirSync(modelsDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+        if (modelsRoot) {
+          const dirs = fs5.readdirSync(modelsRoot, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
           const moduleFilter = config.modules;
           for (const dir of dirs) {
             if (moduleFilter && !moduleFilter.includes(dir)) continue;
@@ -1780,20 +1801,20 @@ function createPipeline(config) {
           if (result.modules.length === 0) {
             result.modules.push("default");
           } else {
-            const rootFiles = fs5.readdirSync(modelsDir).filter((f) => f.endsWith(".ts") && !f.endsWith(".test.ts") && f !== "index.ts");
+            const rootFiles = fs5.readdirSync(modelsRoot).filter((f) => f.endsWith(".ts") && !f.endsWith(".test.ts") && f !== "index.ts");
             if (rootFiles.length > 0) {
               result.modules.unshift("default");
             }
           }
         }
       }
-      const resolveModelDir = (backendRoot, mod) => mod === "default" ? path7.join(backendRoot, "models") : path7.join(backendRoot, "models", mod);
-      const resolveControllerDir = (backendRoot, mod) => mod === "default" ? path7.join(backendRoot, "controllers") : path7.join(backendRoot, "controllers", mod);
+      const resolveModelDir = (_backendRoot, mod) => mod === "default" ? modelsRoot || path7.join(backendRoot, "models") : path7.join(modelsRoot || path7.join(backendRoot, "models"), mod);
+      const resolveControllerDir = (_backendRoot, mod) => mod === "default" ? controllersRoot || path7.join(backendRoot, "controllers") : path7.join(controllersRoot || path7.join(backendRoot, "controllers"), mod);
       if (activeSteps.includes("er-diagram")) {
         const erGen = createERDiagramGenerator();
-        const backendRoot = path7.resolve(config.backendRoot);
+        const backendRoot2 = path7.resolve(config.backendRoot);
         for (const mod of result.modules) {
-          const modelDir = resolveModelDir(backendRoot, mod);
+          const modelDir = resolveModelDir(backendRoot2, mod);
           const tables = fs5.existsSync(modelDir) ? parseModuleModels(modelDir) : [];
           const relations = [];
           const assocFile = path7.join(modelDir, "associations.ts");
@@ -1816,9 +1837,9 @@ function createPipeline(config) {
       }
       if (activeSteps.includes("api-chain")) {
         const chainAnalyzer = createApiChainAnalyzer();
-        const backendRoot = path7.resolve(config.backendRoot);
+        const backendRoot2 = path7.resolve(config.backendRoot);
         for (const mod of result.modules) {
-          const controllerDir = resolveControllerDir(backendRoot, mod);
+          const controllerDir = resolveControllerDir(backendRoot2, mod);
           const endpoints = fs5.existsSync(controllerDir) ? parseControllerDirectory(controllerDir) : [];
           const analysis = chainAnalyzer.analyze(endpoints);
           analysis.moduleName = mod;
@@ -1835,10 +1856,10 @@ function createPipeline(config) {
         }
       }
       if (activeSteps.includes("plan")) {
-        const backendRoot = path7.resolve(config.backendRoot);
+        const backendRoot2 = path7.resolve(config.backendRoot);
         const chainAnalyzer = createApiChainAnalyzer();
         for (const mod of result.modules) {
-          const controllerDir = resolveControllerDir(backendRoot, mod);
+          const controllerDir = resolveControllerDir(backendRoot2, mod);
           const endpoints = fs5.existsSync(controllerDir) ? parseControllerDirectory(controllerDir) : [];
           const analysis = chainAnalyzer.analyze(endpoints);
           const topoOrder = topologicalSort(analysis.dag);