@neat.is/core 0.9.5 → 0.9.6

package/dist/neatd.js

@@ -2,11 +2,11 @@
 import {
   reconcileDaemonRecordSync,
   startDaemon
-} from "./chunk-4SLKQNG7.js";
+} from "./chunk-XYAZOGEX.js";
 import {
   listProjects,
   registryPath
-} from "./chunk-DGAI4VOE.js";
+} from "./chunk-XOGTJVUM.js";
 import {
   BindAuthorityError,
   __require

package/dist/server.cjs

@@ -11513,27 +11513,72 @@ function walk2(node, visit) {
     if (child) walk2(child, visit);
   }
 }
-function reconstructUrl(node) {
-  if (node.type === "string") {
+function resolveStaticString(node, constMap, depth = 0) {
+  if (!node || depth > 4) return null;
+  if (node.type === "string") return stringText(node);
+  if (node.type === "template_string") {
+    let out = "";
+    let sawSub = false;
     for (let i = 0; i < node.namedChildCount; i++) {
       const child = node.namedChild(i);
-      if (child?.type === "string_fragment") return child.text;
+      if (!child) continue;
+      if (child.type === "string_fragment") out += child.text;
+      else if (child.type === "template_substitution") sawSub = true;
     }
-    return "";
+    return sawSub ? null : out;
+  }
+  if (node.type === "identifier") return constMap.get(node.text) ?? null;
+  if (node.type === "binary_expression") {
+    const left = resolveStaticString(node.childForFieldName("left"), constMap, depth + 1);
+    if (left !== null) return left;
+    return resolveStaticString(node.childForFieldName("right"), constMap, depth + 1);
+  }
+  if (node.type === "parenthesized_expression") {
+    return resolveStaticString(node.namedChild(0), constMap, depth + 1);
+  }
+  return null;
+}
+function collectStaticStringBindings(root) {
+  const map = /* @__PURE__ */ new Map();
+  walk2(root, (node) => {
+    if (node.type !== "variable_declarator") return;
+    const name = node.childForFieldName("name");
+    if (!name || name.type !== "identifier") return;
+    const resolved = resolveStaticString(node.childForFieldName("value"), map);
+    if (resolved !== null) map.set(name.text, resolved);
+  });
+  return map;
+}
+function reconstructUrl(node, constMap) {
+  if (node.type === "string") {
+    const s = stringText(node);
+    return s === null ? null : { url: s, approximate: false };
   }
   if (node.type === "template_string") {
     let out = "";
+    let approximate = false;
+    let sawPart = false;
     for (let i = 0; i < node.namedChildCount; i++) {
       const child = node.namedChild(i);
       if (!child) continue;
-      if (child.type === "string_fragment") out += child.text;
-      else if (child.type === "template_substitution") out += ":param";
+      if (child.type === "string_fragment") {
+        out += child.text;
+        sawPart = true;
+      } else if (child.type === "template_substitution") {
+        sawPart = true;
+        const resolved = resolveStaticString(child.namedChild(0), constMap);
+        if (resolved !== null) out += resolved;
+        else {
+          out += ":param";
+          approximate = true;
+        }
+      }
     }
-    if (out.length === 0) {
+    if (!sawPart) {
       const raw = node.text;
-      return raw.length >= 2 ? raw.slice(1, -1) : "";
+      return { url: raw.length >= 2 ? raw.slice(1, -1) : "", approximate: false };
     }
-    return out;
+    return { url: out, approximate };
   }
   return null;
 }
@@ -11587,23 +11632,57 @@ function matchHost(urlStr, knownHosts) {
   }
   return null;
 }
+function hostSlotUnresolved(url) {
+  const schemeRel = url.indexOf("//");
+  let authority;
+  if (schemeRel >= 0) {
+    const rest = url.slice(schemeRel + 2);
+    const slash = rest.indexOf("/");
+    authority = slash >= 0 ? rest.slice(0, slash) : rest;
+  } else {
+    const slash = url.indexOf("/");
+    authority = slash >= 0 ? url.slice(0, slash) : url;
+  }
+  return authority.length === 0 || authority.includes(":param");
+}
+function pathHasLiteralAnchor(pathTemplate) {
+  const segs = normalizePathTemplate(pathTemplate).split("/").filter((s) => s.length > 0);
+  if (segs.length === 0) return false;
+  return segs.some((s) => s !== ":param");
+}
 function clientCallSitesFromSource(source, parser, knownHosts) {
   const tree = parseSource5(parser, source);
   const out = [];
+  const constMap = collectStaticStringBindings(tree.rootNode);
   const push = (urlNode, method, callNode) => {
-    const urlStr = reconstructUrl(urlNode);
-    if (!urlStr) return;
-    const host = matchHost(urlStr, knownHosts);
-    if (!host) return;
-    const p = pathOf(urlStr);
-    if (p === null) return;
+    const rec = reconstructUrl(urlNode, constMap);
+    if (!rec) return;
     const line = callNode.startPosition.row + 1;
+    const host = matchHost(rec.url, knownHosts);
+    if (host === null) {
+      if (rec.approximate && hostSlotUnresolved(rec.url)) {
+        out.push({
+          host: null,
+          method,
+          pathTemplate: "",
+          line,
+          snippet: snippet(source, line),
+          approximate: true,
+          reason: "base URL interpolation could not be resolved statically"
+        });
+      }
+      return;
+    }
+    const p = pathOf(rec.url);
+    if (p === null) return;
     out.push({
       host,
       method,
       pathTemplate: p,
       line,
-      snippet: snippet(source, line)
+      snippet: snippet(source, line),
+      approximate: rec.approximate,
+      reason: rec.approximate ? "path segment interpolation could not be resolved statically" : void 0
     });
   };
   walk2(tree.rootNode, (node) => {
@@ -11699,6 +11778,35 @@ async function addRouteCallEdges(graph, services) {
       if (sites.length === 0) continue;
       const relFile = toPosix(import_node_path40.default.relative(service.dir, file.path));
       for (const site of sites) {
+        if (site.host === null) {
+          const dedupKey2 = `${relFile}|unresolved-host`;
+          if (seen.has(dedupKey2)) continue;
+          seen.add(dedupKey2);
+          const { fileNodeId: fileNodeId2, nodesAdded: n2, edgesAdded: e2 } = ensureFileNode(
+            graph,
+            service.pkg.name,
+            service.node.id,
+            relFile
+          );
+          nodesAdded += n2;
+          edgesAdded += e2;
+          noteExtractedDropped({
+            source: fileNodeId2,
+            target: "route:unresolved",
+            type: import_types28.EdgeType.CALLS,
+            confidence: (0, import_types28.confidenceForExtracted)("reconstructed-approximate"),
+            confidenceKind: "reconstructed-approximate",
+            evidence: {
+              file: relFile,
+              line: site.line,
+              snippet: site.snippet,
+              method: site.method,
+              approximate: true,
+              reason: site.reason
+            }
+          });
+          continue;
+        }
         const serverServiceId = hostToNodeId.get(site.host);
         if (!serverServiceId || serverServiceId === service.node.id) continue;
         const entries = routeIndex.get(serverServiceId);
@@ -11717,13 +11825,16 @@ async function addRouteCallEdges(graph, services) {
         );
         nodesAdded += n;
         edgesAdded += e;
-        const confidence = (0, import_types28.confidenceForExtracted)("verified-call-site");
+        const anchored = pathHasLiteralAnchor(site.pathTemplate);
+        const confidenceKind = site.approximate && !anchored ? "reconstructed-approximate" : "verified-call-site";
+        const confidence = (0, import_types28.confidenceForExtracted)(confidenceKind);
         const ev = {
           file: relFile,
           line: site.line,
           snippet: site.snippet,
           method: site.method ?? match.method,
-          pathTemplate: site.pathTemplate
+          pathTemplate: site.pathTemplate,
+          ...confidenceKind === "reconstructed-approximate" ? { approximate: true, reason: site.reason } : {}
         };
         if (!(0, import_types28.passesExtractedFloor)(confidence)) {
           noteExtractedDropped({
@@ -11731,7 +11842,7 @@ async function addRouteCallEdges(graph, services) {
             target: match.routeNodeId,
             type: import_types28.EdgeType.CALLS,
             confidence,
-            confidenceKind: "verified-call-site",
+            confidenceKind,
             evidence: ev
           });
           continue;