agenttwin 0.3.2 → 0.3.3

package/dist/api.js

@@ -245,24 +245,24 @@ var init_files = __esm({
 });
 
 // src/inventory/entrypoints.ts
-function codeOnly(source) {
-  return source.replace(/\/\*[\s\S]*?\*\/|\/\/[^\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`/g, (part) => part.replace(/[^\n]/g, " "));
-}
+import { parse } from "@babel/parser";
 function exportedEntrypoints(source) {
-  const code = codeOnly(source);
-  const pattern = /\bexport\s+(?:default\s+)?(?:async\s+)?function\s+(\w+)\s*\([^)]*\)[^{;]*\{|\bexport\s+(?:const|let)\s+(\w+)\s*=\s*(?:async\s*)?\([^)]*\)\s*(?::[^=;]+)?=>\s*\{/g;
   const result = [];
-  let match;
-  while (match = pattern.exec(code)) {
-    let depth = 1, end = pattern.lastIndex;
-    while (end < code.length && depth) {
-      if (code[end] === "{") depth++;
-      if (code[end] === "}") depth--;
-      end++;
+  let file;
+  try {
+    file = parse(source, { sourceType: "unambiguous", plugins: ["typescript", "jsx"], errorRecovery: true });
+  } catch {
+    return result;
+  }
+  for (const node of file.program.body) {
+    if (node.type !== "ExportNamedDeclaration" && node.type !== "ExportDefaultDeclaration") continue;
+    const declaration = node.declaration;
+    if (!declaration) continue;
+    if (declaration.type === "FunctionDeclaration" && declaration.id && declaration.body.loc) result.push({ name: declaration.id.name, startLine: node.loc.start.line, endLine: declaration.body.loc.end.line });
+    if (declaration.type === "VariableDeclaration") for (const variable of declaration.declarations) {
+      const fn = variable.init;
+      if (variable.id.type === "Identifier" && fn && (fn.type === "ArrowFunctionExpression" || fn.type === "FunctionExpression") && fn.body.type === "BlockStatement" && fn.body.loc) result.push({ name: variable.id.name, startLine: node.loc.start.line, endLine: fn.body.loc.end.line });
     }
-    if (depth) continue;
-    result.push({ name: match[1] || match[2], startLine: code.slice(0, match.index).split("\n").length, endLine: code.slice(0, end).split("\n").length });
-    pattern.lastIndex = end;
   }
   return result;
 }
@@ -821,7 +821,7 @@ async function projectProducts(cwd, data, base) {
     const { w, path, fn } = value;
     const source = path ? await files.read(path, 2e5) : void 0;
     const entry = source && fn ? exportedEntrypoints(source).find((e) => e.name === fn) : void 0;
-    const body2 = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : source ?? "";
+    const body2 = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : fn ? "" : source ?? "";
     const matches = products.filter((p) => found.has(p.key) && p.pattern.test(body2)).map((p) => google.id + ":" + p.key);
     if (!matches.length) {
       unresolved = true;

package/dist/cli.js

@@ -202,24 +202,24 @@ var init_files = __esm({
 });
 
 // src/inventory/entrypoints.ts
-function codeOnly(source) {
-  return source.replace(/\/\*[\s\S]*?\*\/|\/\/[^\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`/g, (part) => part.replace(/[^\n]/g, " "));
-}
+import { parse } from "@babel/parser";
 function exportedEntrypoints(source) {
-  const code = codeOnly(source);
-  const pattern = /\bexport\s+(?:default\s+)?(?:async\s+)?function\s+(\w+)\s*\([^)]*\)[^{;]*\{|\bexport\s+(?:const|let)\s+(\w+)\s*=\s*(?:async\s*)?\([^)]*\)\s*(?::[^=;]+)?=>\s*\{/g;
   const result = [];
-  let match;
-  while (match = pattern.exec(code)) {
-    let depth = 1, end = pattern.lastIndex;
-    while (end < code.length && depth) {
-      if (code[end] === "{") depth++;
-      if (code[end] === "}") depth--;
-      end++;
+  let file;
+  try {
+    file = parse(source, { sourceType: "unambiguous", plugins: ["typescript", "jsx"], errorRecovery: true });
+  } catch {
+    return result;
+  }
+  for (const node of file.program.body) {
+    if (node.type !== "ExportNamedDeclaration" && node.type !== "ExportDefaultDeclaration") continue;
+    const declaration = node.declaration;
+    if (!declaration) continue;
+    if (declaration.type === "FunctionDeclaration" && declaration.id && declaration.body.loc) result.push({ name: declaration.id.name, startLine: node.loc.start.line, endLine: declaration.body.loc.end.line });
+    if (declaration.type === "VariableDeclaration") for (const variable of declaration.declarations) {
+      const fn = variable.init;
+      if (variable.id.type === "Identifier" && fn && (fn.type === "ArrowFunctionExpression" || fn.type === "FunctionExpression") && fn.body.type === "BlockStatement" && fn.body.loc) result.push({ name: variable.id.name, startLine: node.loc.start.line, endLine: fn.body.loc.end.line });
     }
-    if (depth) continue;
-    result.push({ name: match[1] || match[2], startLine: code.slice(0, match.index).split("\n").length, endLine: code.slice(0, end).split("\n").length });
-    pattern.lastIndex = end;
   }
   return result;
 }
@@ -828,7 +828,7 @@ async function projectProducts(cwd, data, base) {
     const { w, path, fn } = value;
     const source = path ? await files.read(path, 2e5) : void 0;
     const entry = source && fn ? exportedEntrypoints(source).find((e) => e.name === fn) : void 0;
-    const body = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : source ?? "";
+    const body = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : fn ? "" : source ?? "";
     const matches = products.filter((p) => found.has(p.key) && p.pattern.test(body)).map((p) => google.id + ":" + p.key);
     if (!matches.length) {
       unresolved = true;

package/dist/gateway.js

@@ -245,24 +245,24 @@ var init_files = __esm({
 });
 
 // src/inventory/entrypoints.ts
-function codeOnly(source) {
-  return source.replace(/\/\*[\s\S]*?\*\/|\/\/[^\n]*|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`/g, (part) => part.replace(/[^\n]/g, " "));
-}
+import { parse } from "@babel/parser";
 function exportedEntrypoints(source) {
-  const code = codeOnly(source);
-  const pattern = /\bexport\s+(?:default\s+)?(?:async\s+)?function\s+(\w+)\s*\([^)]*\)[^{;]*\{|\bexport\s+(?:const|let)\s+(\w+)\s*=\s*(?:async\s*)?\([^)]*\)\s*(?::[^=;]+)?=>\s*\{/g;
   const result = [];
-  let match;
-  while (match = pattern.exec(code)) {
-    let depth = 1, end = pattern.lastIndex;
-    while (end < code.length && depth) {
-      if (code[end] === "{") depth++;
-      if (code[end] === "}") depth--;
-      end++;
+  let file;
+  try {
+    file = parse(source, { sourceType: "unambiguous", plugins: ["typescript", "jsx"], errorRecovery: true });
+  } catch {
+    return result;
+  }
+  for (const node of file.program.body) {
+    if (node.type !== "ExportNamedDeclaration" && node.type !== "ExportDefaultDeclaration") continue;
+    const declaration = node.declaration;
+    if (!declaration) continue;
+    if (declaration.type === "FunctionDeclaration" && declaration.id && declaration.body.loc) result.push({ name: declaration.id.name, startLine: node.loc.start.line, endLine: declaration.body.loc.end.line });
+    if (declaration.type === "VariableDeclaration") for (const variable of declaration.declarations) {
+      const fn = variable.init;
+      if (variable.id.type === "Identifier" && fn && (fn.type === "ArrowFunctionExpression" || fn.type === "FunctionExpression") && fn.body.type === "BlockStatement" && fn.body.loc) result.push({ name: variable.id.name, startLine: node.loc.start.line, endLine: fn.body.loc.end.line });
     }
-    if (depth) continue;
-    result.push({ name: match[1] || match[2], startLine: code.slice(0, match.index).split("\n").length, endLine: code.slice(0, end).split("\n").length });
-    pattern.lastIndex = end;
   }
   return result;
 }
@@ -821,7 +821,7 @@ async function projectProducts(cwd, data, base) {
     const { w, path, fn } = value;
     const source = path ? await files.read(path, 2e5) : void 0;
     const entry = source && fn ? exportedEntrypoints(source).find((e) => e.name === fn) : void 0;
-    const body2 = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : source ?? "";
+    const body2 = source && entry ? source.split("\n").slice(entry.startLine - 1, entry.endLine).join("\n") : fn ? "" : source ?? "";
     const matches = products.filter((p) => found.has(p.key) && p.pattern.test(body2)).map((p) => google.id + ":" + p.key);
     if (!matches.length) {
       unresolved = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenttwin",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Give your agent a test world before it touches the real one.",
   "keywords": [
     "agent",
@@ -36,6 +36,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@babel/parser": "^8.0.7",
     "e2b": "^2.52.1",
     "yaml": "^2.9.1"
   },