@neat.is/core 0.6.2-dev.20260723 → 0.6.2

package/dist/index.cjs

@@ -5671,7 +5671,7 @@ function keywordArrayStrings(argsNode, key) {
   }
   return [];
 }
-function collectApiRouterPrefixes(root) {
+function collectPythonRouterPrefixes(root) {
   const prefixes = /* @__PURE__ */ new Map();
   walk(root, (node) => {
     if (node.type !== "assignment") return;
@@ -5680,7 +5680,8 @@ function collectApiRouterPrefixes(root) {
     const fn = right.childForFieldName("function");
     if (!fn) return;
     const ctor = fn.type === "attribute" ? fn.childForFieldName("attribute")?.text : fn.text;
-    if (ctor !== "APIRouter") return;
+    const prefixKey = ctor === "APIRouter" ? "prefix" : ctor === "Blueprint" ? "url_prefix" : null;
+    if (!prefixKey) return;
     const left = node.childForFieldName("left");
     if (!left || left.type !== "identifier") return;
     const args = right.childForFieldName("arguments");
@@ -5688,7 +5689,7 @@ function collectApiRouterPrefixes(root) {
     for (let i = 0; i < args.namedChildCount; i++) {
       const arg = args.namedChild(i);
       if (arg?.type !== "keyword_argument") continue;
-      if (arg.childForFieldName("name")?.text !== "prefix") continue;
+      if (arg.childForFieldName("name")?.text !== prefixKey) continue;
       const val = arg.childForFieldName("value");
       const p = val ? pyStaticStringText(val) : null;
       if (p !== null) prefixes.set(left.text, p);
@@ -5696,9 +5697,9 @@ function collectApiRouterPrefixes(root) {
   });
   return prefixes;
 }
-function fastapiRoutesFromSource(source, parser) {
+function pythonRoutesFromSource(source, parser, framework) {
   const tree = parseSource2(parser, source);
-  const prefixes = collectApiRouterPrefixes(tree.rootNode);
+  const prefixes = collectPythonRouterPrefixes(tree.rootNode);
   const out = [];
   walk(tree.rootNode, (node) => {
     if (node.type !== "decorator") return;
@@ -5709,7 +5710,9 @@ function fastapiRoutesFromSource(source, parser) {
     const method = fn.childForFieldName("attribute")?.text?.toLowerCase();
     if (!method) return;
     const isVerb = FASTAPI_METHODS.has(method);
-    if (!isVerb && method !== "api_route") return;
+    const isFlaskRoute = method === "route";
+    const isApiRoute = method === "api_route";
+    if (!isVerb && !isFlaskRoute && !isApiRoute) return;
     const args = call.childForFieldName("arguments");
     const first = args?.namedChild(0);
     if (!first || first.type !== "string") return;
@@ -5720,17 +5723,41 @@ function fastapiRoutesFromSource(source, parser) {
     const pathTemplate = canonicalizeTemplate(prefix + rawPath);
     const line = node.startPosition.row + 1;
     if (isVerb) {
-      out.push({ method: method.toUpperCase(), pathTemplate, line, framework: "fastapi" });
+      out.push({ method: method.toUpperCase(), pathTemplate, line, framework });
       return;
     }
     const methods = keywordArrayStrings(args, "methods");
-    const list = methods.length > 0 ? methods : ["ALL"];
+    const list = methods.length > 0 ? methods : isFlaskRoute ? ["GET"] : ["ALL"];
     for (const m of list) {
+      out.push({ method: m === "ALL" ? "ALL" : m.toUpperCase(), pathTemplate, line, framework });
+    }
+  });
+  return out;
+}
+function djangoRoutesFromSource(source, parser) {
+  const tree = parseSource2(parser, source);
+  const out = [];
+  walk(tree.rootNode, (node) => {
+    if (node.type !== "assignment") return;
+    if (node.childForFieldName("left")?.text !== "urlpatterns") return;
+    const list = node.childForFieldName("right");
+    if (!list || list.type !== "list") return;
+    for (let i = 0; i < list.namedChildCount; i++) {
+      const el = list.namedChild(i);
+      if (el?.type !== "call") continue;
+      if (el.childForFieldName("function")?.text !== "path") continue;
+      const args = el.childForFieldName("arguments");
+      const first = args?.namedChild(0);
+      if (first?.type !== "string") continue;
+      const raw = pyStaticStringText(first);
+      if (raw === null) continue;
+      const second = args?.namedChild(1);
+      if (second?.type === "call" && second.childForFieldName("function")?.text === "include") continue;
       out.push({
-        method: m === "ALL" ? "ALL" : m.toUpperCase(),
-        pathTemplate,
-        line,
-        framework: "fastapi"
+        method: "ALL",
+        pathTemplate: canonicalizeTemplate(raw),
+        line: el.startPosition.row + 1,
+        framework: "django"
       });
     }
   });
@@ -5751,7 +5778,10 @@ async function addRoutes(graph, services) {
     const hasHono = deps["hono"] !== void 0;
     const hasNext = deps["next"] !== void 0;
     const hasFastapi = deps["fastapi"] !== void 0;
-    if (!hasExpress && !hasFastify && !hasHono && !hasNext && !hasFastapi) continue;
+    const hasFlask = deps["flask"] !== void 0;
+    const hasDjango = deps["django"] !== void 0;
+    if (!hasExpress && !hasFastify && !hasHono && !hasNext && !hasFastapi && !hasFlask && !hasDjango)
+      continue;
     const files = await loadSourceFiles(service.dir);
     for (const file of files) {
       if (isTestPath(file.path)) continue;
@@ -5762,7 +5792,8 @@ async function addRoutes(graph, services) {
       let routes;
       try {
         if (isPy) {
-          routes = hasFastapi ? fastapiRoutesFromSource(file.content, pyParser) : [];
+          routes = hasFastapi || hasFlask ? pythonRoutesFromSource(file.content, pyParser, hasFastapi ? "fastapi" : "flask") : [];
+          if (hasDjango) routes = routes.concat(djangoRoutesFromSource(file.content, pyParser));
         } else if (hasNext && (isNextAppRouteFile(relFile) || isNextPagesApiFile(relFile))) {
           routes = nextRoutesFromFile(file.content, relFile, jsParser);
         } else if (hasExpress || hasFastify || hasHono) {
@@ -10373,6 +10404,9 @@ var import_node_path52 = __toESM(require("path"), 1);
 var import_node_module = require("module");
 init_otel();
 
+// src/connectors/registry.ts
+init_cjs_shims();
+
 // src/connectors/index.ts
 init_cjs_shims();
 var import_types36 = require("@neat.is/types");
@@ -10484,6 +10518,7 @@ function startConnectorPollLoop(connector, ctx, graph, resolveTarget, options =
       }
     })();
   };
+  tick();
   const interval = setInterval(tick, intervalMs);
   if (typeof interval.unref === "function") interval.unref();
   return () => {
@@ -10492,9 +10527,6 @@ function startConnectorPollLoop(connector, ctx, graph, resolveTarget, options =
   };
 }
 
-// src/connectors/registry.ts
-init_cjs_shims();
-
 // src/connectors/junction.ts
 init_cjs_shims();
 var buckets = /* @__PURE__ */ new Map();
@@ -11102,17 +11134,22 @@ function readRailwayToken(credentials) {
   }
   return token;
 }
-function projectAccessTokenHeader(token) {
-  return { "Project-Access-Token": token };
+var RAILWAY_AUTH_STYLES = ["bearer", "project-access-token"];
+function railwayAuthHeader(style, token) {
+  return style === "bearer" ? { Authorization: `Bearer ${token}` } : { "Project-Access-Token": token };
 }
-async function railwayGraphQL(apiUrl, token, query, variables, accountKey, fetchImpl) {
+var resolvedRailwayAuthStyle = /* @__PURE__ */ new Map();
+function isRailwayNotAuthorized(err) {
+  return err instanceof Error && /not authorized/i.test(err.message);
+}
+async function railwayGraphQLOnce(apiUrl, style, token, query, variables, accountKey, fetchImpl) {
   const res = await junctionFetch(
     apiUrl,
     {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        ...projectAccessTokenHeader(token)
+        ...railwayAuthHeader(style, token)
       },
       body: JSON.stringify({ query, variables })
     },
@@ -11128,6 +11165,26 @@ async function railwayGraphQL(apiUrl, token, query, variables, accountKey, fetch
   if (!body.data) throw new Error("Railway GraphQL response carried no data");
   return body.data;
 }
+async function railwayGraphQL(apiUrl, token, query, variables, accountKey, fetchImpl) {
+  const known = resolvedRailwayAuthStyle.get(token);
+  const styles = known ? [known] : RAILWAY_AUTH_STYLES;
+  let lastNotAuthorized;
+  for (let i = 0; i < styles.length; i++) {
+    const style = styles[i];
+    try {
+      const data = await railwayGraphQLOnce(apiUrl, style, token, query, variables, accountKey, fetchImpl);
+      resolvedRailwayAuthStyle.set(token, style);
+      return data;
+    } catch (err) {
+      if (isRailwayNotAuthorized(err) && i < styles.length - 1) {
+        lastNotAuthorized = err;
+        continue;
+      }
+      throw err;
+    }
+  }
+  throw lastNotAuthorized ?? new Error("Railway GraphQL: no auth style resolved");
+}
 var HTTP_LOGS_QUERY = `
   query HttpLogs($deploymentId: String!, $startDate: String, $endDate: String, $limit: Int) {
     httpLogs(deploymentId: $deploymentId, startDate: $startDate, endDate: $endDate, limit: $limit) {
@@ -12234,6 +12291,27 @@ async function loadConnectorRegistrations(input) {
   }
   return registrations;
 }
+async function startConnectorPolling(input) {
+  const fileConnectors = input.home ? await loadConnectorRegistrations({
+    project: input.project,
+    graph: input.graph,
+    home: input.home,
+    ...input.onSkip ? { onSkip: input.onSkip } : {}
+  }) : [];
+  const all = [...input.extra ?? [], ...fileConnectors];
+  const stopFns = all.map(
+    (registration) => startConnectorPollLoop(
+      registration.connector,
+      { projectDir: input.projectDir, credentials: registration.credentials },
+      input.graph,
+      registration.resolveTarget,
+      { intervalMs: registration.intervalMs, connectorId: registration.id }
+    )
+  );
+  return () => {
+    for (const stop of stopFns) stop();
+  };
+}
 
 // src/daemon.ts
 init_auth();
@@ -12425,31 +12503,16 @@ async function bootstrapProject(entry, connectors = [], neatHome3) {
       staleEventsPath: paths.staleEventsPath,
       project: entry.name
     });
-    const fileConnectors = neatHome3 ? await loadConnectorRegistrations({
+    const stopConnectors = await startConnectorPolling({
       project: entry.name,
       graph,
-      home: neatHome3,
+      projectDir: entry.path,
+      ...neatHome3 ? { home: neatHome3 } : {},
+      extra: connectors,
       onSkip: (skipped, reason) => console.warn(
         `neatd: connector "${skipped.id}" (${skipped.provider}) skipped for project "${entry.name}" \u2014 ${reason}`
       )
-    }) : [];
-    const allConnectors = [...connectors, ...fileConnectors];
-    const stopFns = allConnectors.map(
-      (registration) => startConnectorPollLoop(
-        registration.connector,
-        { projectDir: entry.path, credentials: registration.credentials },
-        graph,
-        registration.resolveTarget,
-        // `connectorId` is threaded through so every tick lands in the
-        // in-process status tracker the connector-status endpoint reads
-        // (ADR-136). Undefined for a programmatic registration, which records
-        // nothing.
-        { intervalMs: registration.intervalMs, connectorId: registration.id }
-      )
-    );
-    const stopConnectors = () => {
-      for (const stop of stopFns) stop();
-    };
+    });
     await touchLastSeen(entry.name).catch(() => {
     });
     return {