@c4a/extract-go 0.7.8 → 0.7.9

package/index.js

@@ -11444,15 +11444,21 @@ function replaceWithCount(value, pattern, replacement, count) {
     return replacement(...args.slice(0, -2));
   });
 }
+var SECRET_TEXT_KEY = "(?:[A-Za-z0-9_.-]*(?:password|passwd|pwd|secret|token|credential|cookie)[A-Za-z0-9_.-]*|api[-_]?key|access[-_]?(?:key|token)|private[-_]?key|client[-_]?secret|authorization)";
+var SECRET_TEXT_ASSIGNMENT = `(?:=\\s*|:\\s+(?=\\S)|:\\s*(?=["']))`;
+var AUTHORIZATION_TEXT_PATTERN = new RegExp(`(\\bauthorization\\s*:\\s*(?:bearer|basic)\\s+)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^\\s,;]+`, "giu");
+var QUERY_SECRET_TEXT_PATTERN = new RegExp(`([?&](?:access_token|refresh_token|api_key|password|secret)=)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^&#\\s]+`, "giu");
+var ASSIGNMENT_SECRET_TEXT_PATTERN = new RegExp(`((?:["']?${SECRET_TEXT_KEY}["']?)\\s*${SECRET_TEXT_ASSIGNMENT})` + `(?!["']?${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})` + `(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu");
 function redactKnownText(value, count) {
+  if (!value.includes(":") && !value.includes("=") && !value.includes("-----BEGIN ")) {
+    return value;
+  }
   let output = value;
   output = replaceWithCount(output, /-----BEGIN (?:RSA |EC |OPENSSH )?PRIVATE KEY-----[\s\S]*?-----END (?:RSA |EC |OPENSSH )?PRIVATE KEY-----/gu, INDEXER_OUTPUT_REDACTION_MARKER, count);
-  output = replaceWithCount(output, new RegExp(`(\\bauthorization\\s*:\\s*(?:bearer|basic)\\s+)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^\\s,;]+`, "giu"), (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
+  output = replaceWithCount(output, AUTHORIZATION_TEXT_PATTERN, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
   output = replaceWithCount(output, /([a-z][a-z0-9+.-]*:\/\/)[^\s/@:]+:[^\s/@]+@/giu, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}@`, count);
-  output = replaceWithCount(output, new RegExp(`([?&](?:access_token|refresh_token|api_key|password|secret)=)` + `(?!${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})[^&#\\s]+`, "giu"), (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
-  const key = "(?:[A-Za-z0-9_.-]*(?:password|passwd|pwd|secret|token|credential|cookie)[A-Za-z0-9_.-]*|api[-_]?key|access[-_]?(?:key|token)|private[-_]?key|client[-_]?secret|authorization)";
-  const assignment = `(?:=\\s*|:\\s+(?=\\S)|:\\s*(?=["']))`;
-  output = replaceWithCount(output, new RegExp(`((?:["']?${key}["']?)\\s*${assignment})` + `(?!["']?${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})` + `(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu"), (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
+  output = replaceWithCount(output, QUERY_SECRET_TEXT_PATTERN, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}`, count);
+  output = replaceWithCount(output, ASSIGNMENT_SECRET_TEXT_PATTERN, (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
   return output;
 }
 function redactBlockedText(value, blocked, count) {
@@ -12359,20 +12365,24 @@ function indexGoSource(source, filePath, options = {}) {
   const tree = parser.parse(source);
   if (!tree)
     throw new Error(`Go parser returned no syntax tree for ${filePath}`);
-  const root = tree.rootNode;
-  const packageName = descendants(root, "package_identifier")[0]?.text ?? "unknown";
-  const imports = extractImports(root, filePath);
-  const relations = extractCallsAndRoutes(root, filePath, imports);
-  return {
-    path: filePath,
-    package: packageName,
-    imports,
-    symbols: extractSymbols(root, filePath, packageName, options.exportedOnly ?? false),
-    calls: relations.calls,
-    routes: relations.routes,
-    parseErrors: countParseErrors(root),
-    lines: source.length === 0 ? 0 : source.split(/\r\n|\r|\n/u).length
-  };
+  try {
+    const root = tree.rootNode;
+    const packageName = descendants(root, "package_identifier")[0]?.text ?? "unknown";
+    const imports = extractImports(root, filePath);
+    const relations = extractCallsAndRoutes(root, filePath, imports);
+    return {
+      path: filePath,
+      package: packageName,
+      imports,
+      symbols: extractSymbols(root, filePath, packageName, options.exportedOnly ?? false),
+      calls: relations.calls,
+      routes: relations.routes,
+      parseErrors: countParseErrors(root),
+      lines: source.length === 0 ? 0 : source.split(/\r\n|\r|\n/u).length
+    };
+  } finally {
+    tree.delete();
+  }
 }
 
 // src/plugin.ts
@@ -12489,6 +12499,7 @@ class GoPlugin {
         relations.push({
           type: "imports" /* Imports */,
           from: entry.path,
+          file: entry.path,
           to: imported.path,
           isExternal: true,
           grounding: "code" /* Code */,
@@ -12503,6 +12514,7 @@ class GoPlugin {
         relations.push({
           type: "calls" /* Calls */,
           from: call.enclosingSymbol,
+          file: entry.path,
           to: call.callee,
           isExternal: call.importPath !== undefined,
           grounding: "code" /* Code */,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/extract-go",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "type": "module",
   "description": "Go extraction plugin and structural index for Context",
   "license": "MIT",