@neat.is/core 0.5.2 → 0.5.3

package/dist/neatd.js

@@ -2,11 +2,11 @@
 import {
   reconcileDaemonRecordSync,
   startDaemon
-} from "./chunk-DPEPI2N6.js";
+} from "./chunk-X2AMX3QZ.js";
 import {
   listProjects,
   registryPath
-} from "./chunk-BI3XKGVG.js";
+} from "./chunk-GJHEZC5K.js";
 import {
   BindAuthorityError,
   __require

package/dist/server.cjs

@@ -777,11 +777,42 @@ async function readPackageJson(scanPath) {
   const raw = await import_node_fs2.promises.readFile(pkgPath, "utf8");
   return JSON.parse(raw);
 }
+var HOOK_WALK_SKIP_DIRS = /* @__PURE__ */ new Set([
+  "node_modules",
+  "dist",
+  "build",
+  "out",
+  "coverage",
+  "neat-out"
+]);
 async function findHookFiles(scanPath) {
-  const entries = await import_node_fs2.promises.readdir(scanPath);
-  return entries.filter(
-    (e) => (e.startsWith("instrumentation") || e.startsWith("otel-init")) && /\.(ts|js)$/.test(e)
-  ).sort();
+  const found = [];
+  const walk3 = async (dir) => {
+    const entries = await import_node_fs2.promises.readdir(dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        if (entry.name.startsWith(".") || HOOK_WALK_SKIP_DIRS.has(entry.name)) continue;
+        await walk3(import_node_path2.default.join(dir, entry.name));
+      } else if (entry.isFile()) {
+        if ((entry.name.startsWith("instrumentation") || entry.name.startsWith("otel-init")) && /\.(ts|js|cjs|mjs)$/.test(entry.name)) {
+          const rel = import_node_path2.default.relative(scanPath, import_node_path2.default.join(dir, entry.name));
+          found.push(rel.split(import_node_path2.default.sep).join("/"));
+        }
+      }
+    }
+  };
+  await walk3(scanPath);
+  return found.sort();
+}
+async function pickPrimaryHookFile(scanPath, hookFiles, snippet2) {
+  let fallback = null;
+  for (const file of hookFiles) {
+    const content = await import_node_fs2.promises.readFile(import_node_path2.default.join(scanPath, file), "utf8");
+    const patched = splicedContent(content, snippet2);
+    if (patched !== null) return { file, content, patched };
+    if (fallback === null) fallback = { file, content };
+  }
+  return { file: fallback.file, content: fallback.content, patched: null };
 }
 function extendLogPath() {
   return process.env.NEAT_EXTEND_LOG ?? import_node_path2.default.join(import_node_os.default.homedir(), ".neat", "extend-log.ndjson");
@@ -874,7 +905,13 @@ async function applyExtension(ctx, args, options) {
       return { library: args.library, filesTouched: [], depsAdded: [], installOutput: "", alreadyApplied: true };
     }
   }
-  const primaryFile = hookFiles[0];
+  const primary = await pickPrimaryHookFile(ctx.scanPath, hookFiles, args.registration_snippet);
+  if (primary.patched === null) {
+    throw new Error(
+      `Could not find instrumentation insertion point in ${hookFiles.join(", ")}. Expected __INSTRUMENTATION_BLOCK__, instrumentations.push(, or new NodeSDK(.`
+    );
+  }
+  const primaryFile = primary.file;
   const primaryPath = import_node_path2.default.join(ctx.scanPath, primaryFile);
   const filesTouched = [];
   const depsAdded = [];
@@ -886,14 +923,7 @@ async function applyExtension(ctx, args, options) {
     filesTouched.push("package.json");
     depsAdded.push(`${args.instrumentation_package}@${args.version}`);
   }
-  const hookContent = await import_node_fs2.promises.readFile(primaryPath, "utf8");
-  const patched = splicedContent(hookContent, args.registration_snippet);
-  if (!patched) {
-    throw new Error(
-      `Could not find instrumentation insertion point in ${primaryFile}. Expected __INSTRUMENTATION_BLOCK__, instrumentations.push(, or new NodeSDK(.`
-    );
-  }
-  await import_node_fs2.promises.writeFile(primaryPath, patched, "utf8");
+  await import_node_fs2.promises.writeFile(primaryPath, primary.patched, "utf8");
   filesTouched.push(primaryFile);
   const cmd = await detectPackageManager(ctx.scanPath);
   const installer = options?.runInstall ?? runPackageManagerInstall;
@@ -935,7 +965,7 @@ async function dryRunExtension(ctx, args) {
       };
     }
   }
-  const primaryFile = hookFiles[0];
+  const primary = await pickPrimaryHookFile(ctx.scanPath, hookFiles, args.registration_snippet);
   const filesTouched = [];
   const depsToAdd = [];
   let packageJsonPatch = {};
@@ -946,10 +976,8 @@ async function dryRunExtension(ctx, args) {
     depsToAdd.push(`${args.instrumentation_package}@${args.version}`);
     filesTouched.push("package.json");
   }
-  const hookContent = await import_node_fs2.promises.readFile(import_node_path2.default.join(ctx.scanPath, primaryFile), "utf8");
-  const patched = splicedContent(hookContent, args.registration_snippet);
-  if (patched) {
-    filesTouched.push(primaryFile);
+  if (primary.patched !== null) {
+    filesTouched.push(primary.file);
     templatePatch = `+ ${args.registration_snippet}`;
   } else {
     templatePatch = "Could not find insertion point in hook file.";
@@ -5150,14 +5178,21 @@ function engineFromImage(image) {
 // src/extract/databases/dotenv.ts
 var CONNECTION_KEYS = /* @__PURE__ */ new Set([
   "DATABASE_URL",
+  "DATABASE_URI",
   "DB_URL",
+  "DB_URI",
   "POSTGRES_URL",
+  "POSTGRES_URI",
   "POSTGRESQL_URL",
+  "POSTGRESQL_URI",
   "MYSQL_URL",
+  "MYSQL_URI",
+  "MONGODB_URL",
   "MONGODB_URI",
   "MONGO_URL",
   "MONGO_URI",
-  "REDIS_URL"
+  "REDIS_URL",
+  "REDIS_URI"
 ]);
 function parseDotenvLine(line) {
   const trimmed = line.trim();
@@ -9127,7 +9162,7 @@ function registerRoutes(scope, ctx) {
   });
 }
 async function buildApi(opts) {
-  const app = (0, import_fastify.default)({ logger: false });
+  const app = (0, import_fastify.default)({ logger: false, routerOptions: { maxParamLength: 1024 } });
   await app.register(import_cors.default, { origin: true });
   const env = readAuthEnv();
   const authToken = opts.authToken ?? env.authToken;