@neat.is/core 0.7.8 → 0.7.9

package/dist/{chunk-LN75Z624.js → chunk-N5TPODCX.js}

@@ -3,7 +3,7 @@ import {
   mountBearerAuth,
   readAuthEnv,
   tableFromSqlStatement
-} from "./chunk-Y43UCVZS.js";
+} from "./chunk-UUYCTH2E.js";
 
 // src/graph.ts
 import GraphDefault from "graphology";
@@ -3599,10 +3599,15 @@ function resolveDistToSrc(absFilepath, line) {
   }
   if (!entry) return null;
   try {
-    const pos = entry.consumer.originalPositionFor({
-      line: line !== void 0 && Number.isFinite(line) ? line : 1,
-      column: 0
-    });
+    const queryLine = line !== void 0 && Number.isFinite(line) ? line : 1;
+    let pos = entry.consumer.originalPositionFor({ line: queryLine, column: 0 });
+    if (!pos || !pos.source) {
+      pos = entry.consumer.originalPositionFor({
+        line: queryLine,
+        column: 0,
+        bias: sourceMapJs.SourceMapConsumer.LEAST_UPPER_BOUND
+      });
+    }
     if (!pos || !pos.source) return null;
     const root = entry.consumer.sourceRoot ?? "";
     const resolved = path8.resolve(entry.dir, root, pos.source);
@@ -3611,6 +3616,9 @@ function resolveDistToSrc(absFilepath, line) {
     return null;
   }
 }
+function hasAdjacentSourceMap(absFilepath) {
+  return sourceMapCache.get(absFilepath) != null;
+}
 function callSiteFromSpan(span, serviceNode, scanPath) {
   const filepath = codeFilepathOf(span.attributes);
   if (filepath === void 0) return null;
@@ -3626,7 +3634,7 @@ function callSiteFromSpan(span, serviceNode, scanPath) {
   }
   const relPath = relPathForRuntimeFile(effectivePath, serviceNode, scanPath);
   if (!relPath) return null;
-  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && serviceNode?.name) {
+  if (!resolved && abs.endsWith(".js") && relPath.startsWith("dist/") && !hasAdjacentSourceMap(abs) && serviceNode?.name) {
     warnNoSourceMaps(serviceNode.name);
   }
   const fn = codeFunctionOf(span.attributes);
@@ -3902,7 +3910,7 @@ function resolveServiceId(graph, host, env) {
 function frontierIdFor(host) {
   return frontierId(host);
 }
-function ensureServiceNode(graph, serviceName, env) {
+function resolveFusedServiceId(graph, serviceName, env) {
   const id = serviceId(serviceName, env);
   if (graph.hasNode(id)) return id;
   const wanted = serviceName.toLowerCase();
@@ -3912,17 +3920,21 @@ function ensureServiceNode(graph, serviceName, env) {
     if (svc.discoveredVia === "otel") return false;
     return typeof svc.name === "string" && svc.name.toLowerCase() === wanted;
   });
-  if (extractedId) return extractedId;
+  return extractedId ?? id;
+}
+function ensureServiceNode(graph, serviceName, env) {
+  const resolved = resolveFusedServiceId(graph, serviceName, env);
+  if (graph.hasNode(resolved)) return resolved;
   const node = {
-    id,
+    id: resolved,
     type: NodeType4.ServiceNode,
     name: serviceName,
     language: "unknown",
     discoveredVia: "otel",
     ...env !== "unknown" ? { env } : {}
   };
-  graph.addNode(id, node);
-  return id;
+  graph.addNode(resolved, node);
+  return resolved;
 }
 function ensureInfraNode(graph, kind, name, provider) {
   const id = infraId(kind, name);
@@ -4116,7 +4128,7 @@ async function appendErrorEvent(ctx, ev) {
   await fs7.appendFile(ctx.errorsPath, JSON.stringify(ev) + "\n", "utf8");
 }
 function incidentAffectedNode(span, graph, scanPath) {
-  const sid = serviceId(span.service, span.env);
+  const sid = graph ? resolveFusedServiceId(graph, span.service, span.env) : serviceId(span.service, span.env);
   const serviceNode = graph && graph.hasNode(sid) ? graph.getNodeAttributes(sid) : void 0;
   const callSite = callSiteFromSpan(span, serviceNode, scanPath);
   if (callSite) {
@@ -6047,7 +6059,7 @@ function disambiguate(defs) {
 }
 async function addSymbols(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6063,7 +6075,7 @@ async function addSymbols(graph, services) {
   for (const service of services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(path17.extname(file.path));
+      const parser = parserForExt5(path17.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(path17.relative(service.dir, file.path));
       let defs;
@@ -6221,7 +6233,7 @@ function stringInner(node) {
 }
 async function addSymbolEdges(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6238,7 +6250,7 @@ async function addSymbolEdges(graph, services) {
     const tsPaths = await loadTsPathConfig(service.dir);
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
-      const parser = parserForExt4(path18.extname(file.path));
+      const parser = parserForExt5(path18.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(path18.relative(service.dir, file.path));
       const fileDir = path18.dirname(file.path);
@@ -6506,7 +6518,7 @@ function firstReferenceLines(root, wanted) {
 }
 async function addServerActions(graph, services) {
   const parsers = /* @__PURE__ */ new Map();
-  const parserForExt4 = (ext) => {
+  const parserForExt5 = (ext) => {
     const grammar = GRAMMAR_BY_EXT[ext];
     if (!grammar) return null;
     let parser = parsers.get(ext);
@@ -6529,7 +6541,7 @@ async function addServerActions(graph, services) {
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(path19.extname(file.path));
+      const parser = parserForExt5(path19.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(path19.relative(service.dir, file.path));
       let root;
@@ -6592,7 +6604,7 @@ async function addServerActions(graph, services) {
     }
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = parserForExt4(path19.extname(file.path));
+      const parser = parserForExt5(path19.extname(file.path));
       if (!parser) continue;
       const relPath = toPosix(path19.relative(service.dir, file.path));
       const fileDir = path19.dirname(file.path);
@@ -7567,6 +7579,7 @@ import {
 import path30 from "path";
 import Parser6 from "tree-sitter";
 import JavaScript4 from "tree-sitter-javascript";
+import TypeScript2 from "tree-sitter-typescript";
 import Python3 from "tree-sitter-python";
 import {
   EdgeType as EdgeType13,
@@ -7622,19 +7635,27 @@ function callsFromSource(source, parser, knownHosts) {
   }
   return out;
 }
-function makeJsParser3() {
-  const p = new Parser6();
-  p.setLanguage(JavaScript4);
-  return p;
-}
-function makePyParser3() {
-  const p = new Parser6();
-  p.setLanguage(Python3);
-  return p;
+var GRAMMAR_BY_EXT2 = {
+  ".ts": TypeScript2.typescript,
+  ".tsx": TypeScript2.tsx,
+  ".js": JavaScript4,
+  ".jsx": JavaScript4,
+  ".mjs": JavaScript4,
+  ".cjs": JavaScript4,
+  ".py": Python3
+};
+function parserForExt(ext, cache) {
+  const grammar = GRAMMAR_BY_EXT2[ext] ?? JavaScript4;
+  let parser = cache.get(grammar);
+  if (!parser) {
+    parser = new Parser6();
+    parser.setLanguage(grammar);
+    cache.set(grammar, parser);
+  }
+  return parser;
 }
 async function addHttpCallEdges(graph, services) {
-  const jsParser = makeJsParser3();
-  const pyParser = makePyParser3();
+  const parserCache = /* @__PURE__ */ new Map();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   let nodesAdded = 0;
   let edgesAdded = 0;
@@ -7643,7 +7664,7 @@ async function addHttpCallEdges(graph, services) {
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
       if (isTestPath(file.path)) continue;
-      const parser = path30.extname(file.path) === ".py" ? pyParser : jsParser;
+      const parser = parserForExt(path30.extname(file.path), parserCache);
       let sites;
       try {
         sites = callsFromSource(file.content, parser, knownHosts);
@@ -7722,7 +7743,7 @@ function parseSource5(parser, source) {
     (index) => index >= source.length ? "" : source.slice(index, index + PARSE_CHUNK5)
   );
 }
-function makeJsParser4() {
+function makeJsParser3() {
   const p = new Parser7();
   p.setLanguage(JavaScript5);
   return p;
@@ -7900,7 +7921,7 @@ function findRoute(entries, method, normalizedPath) {
   );
 }
 async function addRouteCallEdges(graph, services) {
-  const jsParser = makeJsParser4();
+  const jsParser = makeJsParser3();
   const { knownHosts, hostToNodeId } = buildServiceHostIndex(services);
   const routeIndex = buildRouteIndex(graph);
   if (routeIndex.size === 0) return { nodesAdded: 0, edgesAdded: 0 };
@@ -8286,7 +8307,7 @@ import JavaScript6 from "tree-sitter-javascript";
 import { infraId as infraId7 } from "@neat.is/types";
 var FIRESTORE_CLIENT_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase\/firestore['"`]/;
 var FIRESTORE_ADMIN_IMPORT_RE = /(?:from\s+['"`]|require\(\s*['"`])firebase-admin(?:\/firestore)?['"`]/;
-function parserForExt(ext) {
+function parserForExt2(ext) {
   const p = new Parser8();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? JavaScript6);
   return p;
@@ -8451,7 +8472,7 @@ function firestoreEndpointsFromFile(file, serviceDir) {
   const hasAdmin = FIRESTORE_ADMIN_IMPORT_RE.test(file.content);
   if (!hasClient && !hasAdmin) return [];
   const fileSdk = hasClient && !hasAdmin ? "client" : hasAdmin && !hasClient ? "admin" : null;
-  const tree = parseSource3(parserForExt(path37.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt2(path37.extname(file.path)), file.content);
   const clientVars = firestoreClientVars(tree.rootNode);
   const collLine = /* @__PURE__ */ new Map();
   const writes = /* @__PURE__ */ new Map();
@@ -8866,7 +8887,7 @@ import Python4 from "tree-sitter-python";
 import { infraId as infraId9 } from "@neat.is/types";
 var SQLALCHEMY_IMPORT_RE = /(?:from|import)\s+(?:flask_sqlalchemy|sqlalchemy)\b/;
 var PARSE_CHUNK6 = 16384;
-function makePyParser4() {
+function makePyParser3() {
   const p = new Parser9();
   p.setLanguage(Python4);
   return p;
@@ -8973,7 +8994,7 @@ function foreignKeyParentTable(call) {
 }
 function sqlalchemyForeignKeys(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   walk3(tree.rootNode, (node) => {
@@ -9010,7 +9031,7 @@ function sqlalchemyForeignKeys(file, serviceDir) {
 }
 function sqlalchemyEndpointsFromFile(file, serviceDir) {
   if (!SQLALCHEMY_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource6(makePyParser4(), file.content);
+  const tree = parseSource6(makePyParser3(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const push = (name, line, columns) => {
@@ -9062,7 +9083,7 @@ function sqlalchemyEndpointsFromFile(file, serviceDir) {
 function buildSqlalchemyModelRegistry(files) {
   const table = /* @__PURE__ */ new Map();
   const ambiguous = /* @__PURE__ */ new Set();
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   for (const file of files) {
     if (!SQLALCHEMY_IMPORT_RE.test(file.content)) continue;
     const tree = parseSource6(parser, file.content);
@@ -9111,7 +9132,7 @@ function importsModelName(content, name) {
 function pythonOrmCrossFileEndpoints(files, serviceDir) {
   const registry = buildSqlalchemyModelRegistry(files);
   if (registry.size === 0) return [];
-  const parser = makePyParser4();
+  const parser = makePyParser3();
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const file of files) {
@@ -9148,7 +9169,7 @@ import Python5 from "tree-sitter-python";
 import { infraId as infraId10 } from "@neat.is/types";
 var DJANGO_IMPORT_RE = /(?:from|import)\s+django\b/;
 var PARSE_CHUNK7 = 16384;
-function makePyParser5() {
+function makePyParser4() {
   const p = new Parser10();
   p.setLanguage(Python5);
   return p;
@@ -9209,7 +9230,7 @@ function readMeta(body) {
 }
 function djangoOrmEndpointsFromFile(file, serviceDir) {
   if (!DJANGO_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource7(makePyParser5(), file.content);
+  const tree = parseSource7(makePyParser4(), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const defaultAppLabel = path40.basename(path40.dirname(file.path));
@@ -9243,7 +9264,7 @@ import JavaScript7 from "tree-sitter-javascript";
 import { infraId as infraId11 } from "@neat.is/types";
 var DRIZZLE_IMPORT_RE = /drizzle-orm/;
 var TABLE_BUILDERS = /* @__PURE__ */ new Set(["pgTable", "mysqlTable", "sqliteTable"]);
-function parserForExt2(ext) {
+function parserForExt3(ext) {
   const p = new Parser11();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? JavaScript7);
   return p;
@@ -9315,7 +9336,7 @@ function columnsFromObject(obj) {
 }
 function drizzleEndpointsFromFile(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(path41.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(path41.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const walk9 = (node) => {
@@ -9404,7 +9425,7 @@ function referencesTargetVar(call) {
 }
 function drizzleForeignKeys(file, serviceDir) {
   if (!DRIZZLE_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt2(path41.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt3(path41.extname(file.path)), file.content);
   const { tables, varToTable } = collectDrizzleTables(tree.rootNode);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -12105,7 +12126,7 @@ import {
 } from "@neat.is/types";
 var ZOD_IMPORT_RE = /\bzod\b/;
 var ZOD_OBJECTS = /* @__PURE__ */ new Set(["z", "zod"]);
-function parserForExt3(ext) {
+function parserForExt4(ext) {
   const p = new Parser16();
   p.setLanguage(GRAMMAR_BY_EXT[ext] ?? JavaScript8);
   return p;
@@ -12194,7 +12215,7 @@ function topLevelSchemas(root) {
 }
 function zodShapesFromFile(file, serviceDir) {
   if (!ZOD_IMPORT_RE.test(file.content)) return [];
-  const tree = parseSource3(parserForExt3(path55.extname(file.path)), file.content);
+  const tree = parseSource3(parserForExt4(path55.extname(file.path)), file.content);
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   for (const { name, call } of topLevelSchemas(tree.rootNode)) {
@@ -18035,4 +18056,4 @@ export {
   deprovisionConnector,
   buildApi
 };
-//# sourceMappingURL=chunk-LN75Z624.js.map
+//# sourceMappingURL=chunk-N5TPODCX.js.map