ai-spec-dev 0.29.0 → 0.30.0

package/dist/cli/index.mjs

@@ -5497,6 +5497,41 @@ async function loadDslForSpec(specFilePath) {
 // core/frontend-context-loader.ts
 import * as fs7 from "fs-extra";
 import * as path6 from "path";
+function parseImportStatements(content) {
+  const stripped = content.replace(/\/\*[\s\S]*?\*\//g, (m) => "\n".repeat(m.split("\n").length - 1));
+  const collapsed = stripped.replace(/import\s*\{[^}]*\}/gs, (m) => m.replace(/\n\s*/g, " "));
+  const results = [];
+  for (const rawLine of collapsed.split("\n")) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    if (/^import\s+type\b/.test(line)) continue;
+    if (!line.startsWith("import")) continue;
+    const match = line.match(/^(import\s+([\s\S]+?)\s+from\s+['"]([^'"]+)['"])/);
+    if (!match) continue;
+    results.push({
+      line: match[1],
+      modulePath: match[3],
+      specifiers: match[2]
+    });
+  }
+  return results;
+}
+var HTTP_MODULE_PATTERNS = [
+  // Project path aliases (@/, @@/, ~/, #/) — catches '@/utils/request', '~/lib/http', etc.
+  /^(?:@{1,2}|~|#)[/\\]/,
+  // Well-known HTTP libraries (exact name match)
+  /^(?:axios|ky(?:-universal)?|undici|node-fetch|cross-fetch|got|superagent|alova|openapi-fetch)$/,
+  // Relative imports whose path contains an HTTP-utility keyword
+  /\.{1,2}\/[^'"]*(?:http|request|fetch|client|api)[^'"]*/
+];
+function findHttpClientImport(content) {
+  for (const stmt of parseImportStatements(content)) {
+    if (HTTP_MODULE_PATTERNS.some((p) => p.test(stmt.modulePath))) {
+      return stmt.line;
+    }
+  }
+  return void 0;
+}
 var STATE_MANAGEMENT_LIBS = [
   "zustand",
   "redux",
@@ -5685,13 +5720,12 @@ ${preview}`);
       } catch {
       }
     }
-    const httpImportRegex = /^import(?!\s+type)\s+(?:[\w*]+|\{[^}]+\})\s+from\s+['"]((?:@{1,2}|~|#)[/\\][^'"]+|\.{1,2}\/[^'"]*(?:http|request|fetch|client|api)[^'"]*|axios|ky(?:-universal)?|undici|node-fetch|cross-fetch|got|superagent|alova|openapi-fetch)['"]/im;
     for (const relPath of ctx.existingApiFiles.slice(0, 5)) {
       try {
         const content = await fs7.readFile(path6.join(projectRoot, relPath), "utf-8");
-        const match = content.match(httpImportRegex);
-        if (match) {
-          ctx.httpClientImport = match[0].trim();
+        const found = findHttpClientImport(content);
+        if (found) {
+          ctx.httpClientImport = found;
           break;
         }
       } catch {
@@ -5821,13 +5855,28 @@ async function extractRouteModuleContext(projectRoot, ctx) {
     moduleFiles.push(...files);
   }
   if (moduleFiles.length === 0) return;
-  const layoutImportRegex = /^(?:const\s+Layout\s*=.*import\(['"][^'"]+['"]\)|import\s+Layout\s+from\s+['"][^'"]+['"])/m;
+  const dynamicLayoutRegex = /const\s+Layout\s*=\s*(?:defineAsyncComponent\s*\(\s*)?(?:\(\s*\))?\s*(?:=>|function[^(]*\()\s*(?:[^)]*\))?\s*(?:=>)?\s*import\s*\(\s*['"]([^'"]+)['"]\s*\)/;
   for (const relPath of moduleFiles) {
     try {
       const content = await fs7.readFile(path6.join(projectRoot, relPath), "utf-8");
-      const match = content.match(layoutImportRegex);
-      if (match) {
-        ctx.layoutImport = match[0].trim();
+      const stmts = parseImportStatements(content);
+      const staticLayout = stmts.find(
+        (s) => /\bLayout\b/.test(s.specifiers) && /layout/i.test(s.modulePath)
+      );
+      if (staticLayout) {
+        ctx.layoutImport = staticLayout.line;
+        const preview = content.split("\n").slice(0, 100).join("\n");
+        ctx.routeModuleExample = { path: relPath, content: preview };
+        break;
+      }
+      const singleLine = content.replace(
+        /const\s+Layout\s*=[\s\S]*?import\s*\([^)]+\)/gm,
+        (m) => m.replace(/\n\s*/g, " ")
+      );
+      const dynMatch = singleLine.match(dynamicLayoutRegex);
+      if (dynMatch) {
+        const constMatch = content.match(/^const\s+Layout\s*=.+/m);
+        ctx.layoutImport = constMatch ? constMatch[0].trim() : dynMatch[0].trim();
         const preview = content.split("\n").slice(0, 100).join("\n");
         ctx.routeModuleExample = { path: relPath, content: preview };
         break;
@@ -7812,6 +7861,60 @@ function parseErrors(output, source) {
   }
   return errors;
 }
+function parseRelativeImports(content, fromFileRel) {
+  const relDir = path15.dirname(fromFileRel);
+  const results = [];
+  const normalized = content.replace(/import\s*\{[^}]*\}/gs, (m) => m.replace(/\n\s*/g, " "));
+  for (const line of normalized.split("\n")) {
+    const trimmed = line.trim();
+    if (/^import\s+type\b/.test(trimmed)) continue;
+    const match = trimmed.match(/^import\b[^'"]*from\s+['"](\.\.?\/[^'"]+)['"]/);
+    if (!match) continue;
+    const resolved = path15.normalize(path15.join(relDir, match[1]));
+    results.push(resolved);
+  }
+  return results;
+}
+async function buildRepairOrder(errorsByFile, workingDir) {
+  const files = Array.from(errorsByFile.keys());
+  if (files.length <= 1) return Array.from(errorsByFile.entries());
+  const deps = new Map(files.map((f) => [f, []]));
+  for (const file of files) {
+    try {
+      const content = await fs16.readFile(path15.join(workingDir, file), "utf-8");
+      const importedPaths = parseRelativeImports(content, file);
+      for (const importedPath of importedPaths) {
+        const matched = files.find((f) => {
+          if (f === file) return false;
+          const fNoExt = f.replace(/\.[^.]+$/, "");
+          return importedPath === fNoExt || importedPath === f || `${importedPath}.ts` === f || `${importedPath}.tsx` === f || `${importedPath}.js` === f || `${importedPath}.jsx` === f;
+        });
+        if (matched) deps.get(file).push(matched);
+      }
+    } catch {
+    }
+  }
+  const dependents = new Map(files.map((f) => [f, []]));
+  for (const [file, fileDeps] of deps) {
+    for (const dep of fileDeps) dependents.get(dep).push(file);
+  }
+  const inDegree = new Map(files.map((f) => [f, deps.get(f).length]));
+  const queue = files.filter((f) => inDegree.get(f) === 0);
+  const sorted = [];
+  while (queue.length > 0) {
+    const file = queue.shift();
+    sorted.push(file);
+    for (const dependent of dependents.get(file) ?? []) {
+      const degree = (inDegree.get(dependent) ?? 1) - 1;
+      inDegree.set(dependent, degree);
+      if (degree === 0) queue.push(dependent);
+    }
+  }
+  for (const f of files) {
+    if (!sorted.includes(f)) sorted.push(f);
+  }
+  return sorted.map((f) => [f, errorsByFile.get(f)]);
+}
 async function attemptFix(provider, errors, workingDir, dsl) {
   const results = [];
   const errorsByFile = /* @__PURE__ */ new Map();
@@ -7820,7 +7923,8 @@ async function attemptFix(provider, errors, workingDir, dsl) {
     if (!errorsByFile.has(file)) errorsByFile.set(file, []);
     errorsByFile.get(file).push(err);
   }
-  for (const [file, fileErrors] of errorsByFile) {
+  const sortedEntries = await buildRepairOrder(errorsByFile, workingDir);
+  for (const [file, fileErrors] of sortedEntries) {
     const fullPath = path15.join(workingDir, file);
     let existingContent = "";
     try {