@neat.is/core 0.4.30 → 0.5.0

package/dist/neatd.js

@@ -2,11 +2,11 @@
 import {
   reconcileDaemonRecordSync,
   startDaemon
-} from "./chunk-2AJHEZIB.js";
+} from "./chunk-5MGHWP6R.js";
 import {
   listProjects,
   registryPath
-} from "./chunk-4M2YMGUM.js";
+} from "./chunk-QQDZSIY3.js";
 import {
   BindAuthorityError,
   __require

package/dist/server.cjs

@@ -1445,7 +1445,7 @@ function databaseRootCauseShape(graph, origin, walk3) {
   for (const id of walk3.path) {
     const owner = resolveOwningService(graph, id);
     if (!owner) continue;
-    const { id: serviceId4, svc } = owner;
+    const { id: serviceId5, svc } = owner;
     const deps = svc.dependencies ?? {};
     for (const pair of candidatePairs) {
       const declared = deps[pair.driver];
@@ -1458,7 +1458,7 @@ function databaseRootCauseShape(graph, origin, walk3) {
       );
       if (!result.compatible) {
         return {
-          rootCauseNode: serviceId4,
+          rootCauseNode: serviceId5,
           rootCauseReason: result.reason ?? "incompatible driver",
           ...result.minDriverVersion ? {
             fixRecommendation: `Upgrade ${svc.name} ${pair.driver} driver to >= ${result.minDriverVersion}`
@@ -1473,7 +1473,7 @@ function serviceRootCauseShape(graph, _origin, walk3) {
   for (const id of walk3.path) {
     const owner = resolveOwningService(graph, id);
     if (!owner) continue;
-    const { id: serviceId4, svc } = owner;
+    const { id: serviceId5, svc } = owner;
     const deps = svc.dependencies ?? {};
     const serviceNodeEngine = svc.nodeEngine;
     for (const constraint of nodeEngineConstraints()) {
@@ -1482,7 +1482,7 @@ function serviceRootCauseShape(graph, _origin, walk3) {
       const result = checkNodeEngineConstraint(constraint, declared, serviceNodeEngine);
       if (!result.compatible && result.reason) {
         return {
-          rootCauseNode: serviceId4,
+          rootCauseNode: serviceId5,
           rootCauseReason: result.reason,
           ...result.requiredNodeVersion ? {
             fixRecommendation: `Bump ${svc.name}'s engines.node to >= ${result.requiredNodeVersion}`
@@ -1497,7 +1497,7 @@ function serviceRootCauseShape(graph, _origin, walk3) {
       const result = checkPackageConflict(conflict, declared, requiredDeclared);
       if (!result.compatible && result.reason) {
         return {
-          rootCauseNode: serviceId4,
+          rootCauseNode: serviceId5,
           rootCauseReason: result.reason,
           fixRecommendation: `Upgrade ${svc.name}'s ${conflict.requires.name} to >= ${conflict.requires.minVersion}`
         };
@@ -1588,9 +1588,9 @@ function rootCauseFromIncidents(nodeId, incidents, errorEvent) {
 function isFailingCallEdge(e) {
   return e.type === import_types.EdgeType.CALLS && (e.signal?.errorCount ?? 0) > 0;
 }
-function callSourcesForService(graph, serviceId4) {
-  const ids = [serviceId4];
-  for (const edgeId of graph.outboundEdges(serviceId4)) {
+function callSourcesForService(graph, serviceId5) {
+  const ids = [serviceId5];
+  for (const edgeId of graph.outboundEdges(serviceId5)) {
     const e = graph.getEdgeAttributes(edgeId);
     if (e.type !== import_types.EdgeType.CONTAINS) continue;
     const tgt = graph.getNodeAttributes(e.target);
@@ -1607,9 +1607,9 @@ function failingCallDominates(e, id, curEdge, curId) {
   }
   return id < curId;
 }
-function dominantFailingCall(graph, serviceId4, visited) {
+function dominantFailingCall(graph, serviceId5, visited) {
   let best = null;
-  for (const src of callSourcesForService(graph, serviceId4)) {
+  for (const src of callSourcesForService(graph, serviceId5)) {
     for (const edgeId of graph.outboundEdges(src)) {
       const e = graph.getEdgeAttributes(edgeId);
       if (!isFailingCallEdge(e)) continue;
@@ -1820,14 +1820,23 @@ function getObservedDependencies(graph, nodeId) {
 function bucketKey(source, target, type) {
   return `${type}|${source}|${target}`;
 }
+function bucketSourceFor(graph, edge) {
+  if (edge.type !== import_types2.EdgeType.CONNECTS_TO) return edge.source;
+  const parsed = (0, import_types2.parseFileId)(edge.source);
+  if (!parsed || !graph.hasNode(edge.target)) return edge.source;
+  const target = graph.getNodeAttributes(edge.target);
+  if (target.type !== import_types2.NodeType.DatabaseNode) return edge.source;
+  return (0, import_types2.serviceId)(parsed.service);
+}
 function bucketEdges(graph) {
   const buckets = /* @__PURE__ */ new Map();
   graph.forEachEdge((id, attrs) => {
     const e = attrs;
     const parsed = (0, import_types2.parseEdgeId)(id);
     const provenance = parsed?.provenance ?? e.provenance;
-    const key = bucketKey(e.source, e.target, e.type);
-    const cur = buckets.get(key) ?? { source: e.source, target: e.target, type: e.type };
+    const source = bucketSourceFor(graph, e);
+    const key = bucketKey(source, e.target, e.type);
+    const cur = buckets.get(key) ?? { source, target: e.target, type: e.type };
     switch (provenance) {
       case import_types2.Provenance.EXTRACTED:
         cur.extracted = e;
@@ -3116,6 +3125,27 @@ function ensureLocalDatabaseNode(graph, serviceName, name, engine) {
   graph.addNode(id, node);
   return id;
 }
+function findDeclaredDatabaseForService(graph, serviceNodeId, engine) {
+  if (!graph.hasNode(serviceNodeId)) return null;
+  const sources = [serviceNodeId];
+  for (const edgeId of graph.outboundEdges(serviceNodeId)) {
+    const e = graph.getEdgeAttributes(edgeId);
+    if (e.type === import_types4.EdgeType.CONTAINS) sources.push(e.target);
+  }
+  const matches = /* @__PURE__ */ new Set();
+  for (const src of sources) {
+    if (!graph.hasNode(src)) continue;
+    for (const edgeId of graph.outboundEdges(src)) {
+      const edge = graph.getEdgeAttributes(edgeId);
+      if (edge.type !== import_types4.EdgeType.CONNECTS_TO || edge.provenance !== import_types4.Provenance.EXTRACTED) continue;
+      if (!graph.hasNode(edge.target)) continue;
+      const target = graph.getNodeAttributes(edge.target);
+      if (target.type !== import_types4.NodeType.DatabaseNode || target.engine !== engine) continue;
+      matches.add(edge.target);
+    }
+  }
+  return matches.size === 1 ? [...matches][0] : null;
+}
 function ensureFrontierNode(graph, host, ts) {
   const id = frontierIdFor(host);
   if (graph.hasNode(id)) {
@@ -3349,13 +3379,18 @@ async function handleSpan(ctx, span) {
         ensureDatabaseNode(ctx.graph, host, span.dbSystem);
         targetId = (0, import_types4.databaseId)(host);
       } else {
-        const localName = span.dbName ?? span.dbSystem;
-        targetId = ensureLocalDatabaseNode(
-          ctx.graph,
-          span.service,
-          localName,
-          span.dbSystem
-        );
+        const declared = findDeclaredDatabaseForService(ctx.graph, sourceId, span.dbSystem);
+        if (declared) {
+          targetId = declared;
+        } else {
+          const localName = span.dbName ?? span.dbSystem;
+          targetId = ensureLocalDatabaseNode(
+            ctx.graph,
+            span.service,
+            localName,
+            span.dbSystem
+          );
+        }
       }
       const result = upsertObservedEdge(
         ctx.graph,
@@ -3539,29 +3574,29 @@ function promoteFrontierNodes(graph, opts = {}) {
     toPromote.push({ frontierId: id, serviceId: target });
   });
   let promoted = 0;
-  for (const { frontierId: frontierId2, serviceId: serviceId4 } of toPromote) {
+  for (const { frontierId: frontierId2, serviceId: serviceId5 } of toPromote) {
     if (opts.policies && opts.policies.length > 0 && opts.policyCtx) {
       const gate = canPromoteFrontier(graph, frontierId2, opts.policies, opts.policyCtx);
       if (!gate.allowed) {
         continue;
       }
     }
-    rewireFrontierEdges(graph, frontierId2, serviceId4);
+    rewireFrontierEdges(graph, frontierId2, serviceId5);
     graph.dropNode(frontierId2);
     promoted++;
   }
   return promoted;
 }
-function rewireFrontierEdges(graph, frontierId2, serviceId4) {
+function rewireFrontierEdges(graph, frontierId2, serviceId5) {
   const inbound = [...graph.inboundEdges(frontierId2)];
   const outbound = [...graph.outboundEdges(frontierId2)];
   for (const edgeId of inbound) {
     const edge = graph.getEdgeAttributes(edgeId);
-    rebuildEdge(graph, edge, edge.source, serviceId4, edgeId);
+    rebuildEdge(graph, edge, edge.source, serviceId5, edgeId);
   }
   for (const edgeId of outbound) {
     const edge = graph.getEdgeAttributes(edgeId);
-    rebuildEdge(graph, edge, serviceId4, edge.target, edgeId);
+    rebuildEdge(graph, edge, serviceId5, edge.target, edgeId);
   }
 }
 function rebuildEdge(graph, edge, newSource, newTarget, oldEdgeId) {
@@ -4357,9 +4392,9 @@ var K8S_KINDS_WITH_HOSTNAMES = /* @__PURE__ */ new Set([
   "StatefulSet",
   "DaemonSet"
 ]);
-function addAliases(graph, serviceId4, candidates) {
-  if (!graph.hasNode(serviceId4)) return;
-  const node = graph.getNodeAttributes(serviceId4);
+function addAliases(graph, serviceId5, candidates) {
+  if (!graph.hasNode(serviceId5)) return;
+  const node = graph.getNodeAttributes(serviceId5);
   if (node.type !== import_types7.NodeType.ServiceNode) return;
   const set = new Set(node.aliases ?? []);
   for (const c of candidates) {
@@ -4369,7 +4404,7 @@ function addAliases(graph, serviceId4, candidates) {
   }
   if (set.size === 0) return;
   const updated = { ...node, aliases: [...set].sort() };
-  graph.replaceNodeAttributes(serviceId4, updated);
+  graph.replaceNodeAttributes(serviceId5, updated);
 }
 function indexServicesByName(services) {
   const map = /* @__PURE__ */ new Map();
@@ -4402,12 +4437,12 @@ async function collectComposeAliases(graph, scanPath, serviceIndex) {
   }
   if (!compose?.services) return;
   for (const [composeName, svc] of Object.entries(compose.services)) {
-    const serviceId4 = serviceIndex.get(composeName);
-    if (!serviceId4) continue;
+    const serviceId5 = serviceIndex.get(composeName);
+    if (!serviceId5) continue;
     const aliases = /* @__PURE__ */ new Set([composeName]);
     if (svc.container_name) aliases.add(svc.container_name);
     if (svc.hostname) aliases.add(svc.hostname);
-    addAliases(graph, serviceId4, aliases);
+    addAliases(graph, serviceId5, aliases);
   }
 }
 var LABEL_KEYS = /* @__PURE__ */ new Set([
@@ -5057,6 +5092,29 @@ async function readIfExists(filePath) {
     return null;
   }
 }
+async function resolveEnvVar(serviceDir, name) {
+  const entries = await import_node_fs14.promises.readdir(serviceDir, { withFileTypes: true }).catch(() => []);
+  const envNames = entries.filter((e) => e.isFile() && (e.name === ".env" || e.name.startsWith(".env."))).map((e) => e.name);
+  const rank = (n) => n === ".env.local" ? 0 : n === ".env" ? 1 : 2;
+  envNames.sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
+  for (const fileName of envNames) {
+    const content = await readIfExists(import_node_path16.default.join(serviceDir, fileName));
+    if (!content) continue;
+    for (const line of content.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const eq = trimmed.indexOf("=");
+      if (eq < 0) continue;
+      if (trimmed.slice(0, eq).trim() !== name) continue;
+      let value = trimmed.slice(eq + 1).trim();
+      if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+        value = value.slice(1, -1);
+      }
+      return value || null;
+    }
+  }
+  return null;
+}
 async function findFirst(serviceDir, candidates) {
   for (const rel of candidates) {
     const abs = import_node_path16.default.join(serviceDir, rel);
@@ -5154,6 +5212,14 @@ async function parse3(serviceDir) {
     const config = parseConnectionString(urlMatch[1]);
     if (config) return [{ ...config, sourceFile: schemaPath }];
   }
+  const envMatch = body.match(/url\s*=\s*env\(\s*"([^"]+)"\s*\)/);
+  if (envMatch) {
+    const resolved = await resolveEnvVar(serviceDir, envMatch[1]);
+    if (resolved) {
+      const config = parseConnectionString(resolved);
+      if (config) return [{ ...config, sourceFile: schemaPath }];
+    }
+  }
   return [
     {
       host: `${engine}-prisma`,