@c4a/extract-go 0.7.5 → 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) {
@@ -12099,6 +12105,44 @@ function functionSignature(node2) {
 function symbolId(filePath, kind, qualifiedName) {
   return `go:${filePath}#${kind}:${qualifiedName}`;
 }
+function declaredParameters(node2) {
+  if (node2 === null)
+    return [];
+  if (node2.type !== "parameter_list")
+    return [{ name: "", type: node2.text, optional: false, rest: false }];
+  return node2.namedChildren.flatMap((parameter) => {
+    const type = parameter.childForFieldName("type");
+    if (type === null)
+      return [];
+    const names = parameter.namedChildren.filter((child) => child.type === "identifier" && child.id !== type.id);
+    const rest = parameter.type === "variadic_parameter_declaration";
+    return (names.length === 0 ? [""] : names.map((name) => name.text)).map((name) => ({
+      name,
+      type: type.text,
+      optional: rest,
+      rest
+    }));
+  });
+}
+function declaredFields(node2, filePath) {
+  const list = node2.namedChildren.find((child) => child.type === "field_declaration_list");
+  return (list?.namedChildren ?? []).flatMap((field) => {
+    if (field.type !== "field_declaration")
+      return [];
+    const type = field.childForFieldName("type");
+    if (type === null)
+      return [];
+    const names = field.namedChildren.filter((child) => child.type === "field_identifier");
+    const tag = field.childForFieldName("tag")?.text;
+    return (names.length === 0 ? [type.text] : names.map((name) => name.text)).map((name) => ({
+      name,
+      type: type.text,
+      embedded: names.length === 0,
+      location: locationFor(filePath, field),
+      ...tag === undefined ? {} : { tag }
+    }));
+  });
+}
 function extractSymbols(root, filePath, packageName, exportedOnly) {
   const symbols = [];
   for (const node2 of root.namedChildren) {
@@ -12119,6 +12163,8 @@ function extractSymbols(root, filePath, packageName, exportedOnly) {
         ...receiver ? { receiver } : {},
         exported: isExported(name),
         signature: functionSignature(node2),
+        parameters: declaredParameters(node2.childForFieldName("parameters")),
+        results: declaredParameters(node2.childForFieldName("result")),
         ...doc ? { doc } : {},
         location: locationFor(filePath, node2)
       });
@@ -12140,6 +12186,7 @@ function extractSymbols(root, filePath, packageName, exportedOnly) {
           package: packageName,
           exported: isExported(name),
           signature: compact(`type ${name} ${typeNode.text}`),
+          ...kind2 === "struct" ? { fields: declaredFields(typeNode, filePath) } : {},
           ...doc ? { doc } : {},
           location: locationFor(filePath, spec)
         });
@@ -12189,7 +12236,7 @@ function unquoteGoString(value) {
     return trimmed.slice(1, -1);
   }
 }
-function extractImports(root) {
+function extractImports(root, filePath) {
   const imports = [];
   for (const spec of descendants(root, "import_spec")) {
     const pathNode = spec.childForFieldName("path") ?? spec.namedChildren.find((child) => child.type.endsWith("string_literal"));
@@ -12198,7 +12245,7 @@ function extractImports(root) {
       continue;
     const explicitAlias = spec.childForFieldName("name")?.text;
     const alias = explicitAlias && explicitAlias !== "." && explicitAlias !== "_" ? explicitAlias : importPath.split("/").at(-1) ?? importPath;
-    imports.push({ alias, path: importPath });
+    imports.push({ alias, path: importPath, location: locationFor(filePath, spec) });
   }
   return imports.sort((left, right) => left.alias.localeCompare(right.alias) || left.path.localeCompare(right.path));
 }
@@ -12318,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);
-  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
@@ -12365,6 +12416,18 @@ function symbolInfo(filePath, symbol) {
     line: symbol.location.startLine,
     endLine: symbol.location.endLine,
     signature: symbol.signature,
+    ...symbol.parameters === undefined ? {} : { params: symbol.parameters },
+    ...symbol.results === undefined ? {} : { returnType: symbol.results.map((item) => item.type).join(", ") || null },
+    ...symbol.fields === undefined ? {} : { members: symbol.fields.map((field) => ({
+      name: field.name,
+      kind: "prop" /* Prop */,
+      visibility: /^[A-Z]/u.test(field.name) ? "exported" /* Exported */ : "internal" /* Internal */,
+      file: filePath,
+      line: field.location.startLine,
+      endLine: field.location.endLine,
+      typeAnnotation: field.type,
+      ...field.tag === undefined ? {} : { doc: field.tag }
+    })) },
     ...symbol.doc ? { doc: symbol.doc } : {}
   };
 }
@@ -12432,12 +12495,26 @@ class GoPlugin {
       const indexed = indexGoSource(source, entry.path, { exportedOnly: false });
       files.push({ path: entry.path, language: "go", lines: indexed.lines });
       symbols.push(...indexed.symbols.map((symbol) => symbolInfo(entry.path, symbol)));
+      for (const imported of indexed.imports) {
+        relations.push({
+          type: "imports" /* Imports */,
+          from: entry.path,
+          file: entry.path,
+          to: imported.path,
+          isExternal: true,
+          grounding: "code" /* Code */,
+          confidence: 1,
+          source: "ast" /* Ast */,
+          ...imported.location === undefined ? {} : { line: imported.location.startLine }
+        });
+      }
       for (const call of indexed.calls) {
         if (!call.enclosingSymbol)
           continue;
         relations.push({
           type: "calls" /* Calls */,
           from: call.enclosingSymbol,
+          file: entry.path,
           to: call.callee,
           isExternal: call.importPath !== undefined,
           grounding: "code" /* Code */,
@@ -12454,7 +12531,14 @@ class GoPlugin {
           file: entry.path,
           line: route.location.startLine,
           endLine: route.location.endLine,
-          signature: `${route.method} ${route.path} -> ${route.handler}`
+          signature: `${route.method} ${route.path} -> ${route.handler}`,
+          registration: {
+            kind: "http",
+            method: route.method,
+            key: route.path,
+            handler: route.handler,
+            middleware: route.middleware
+          }
         });
       }
     }
@@ -12595,7 +12679,17 @@ var relationSourceSchema = exports_external.enum([
 var packageKindSchema2 = exports_external.enum(Object.values(PackageKind));
 var symbolParamSchema = exports_external.object({
   name: exports_external.string().min(1),
-  type: exports_external.string().min(1).nullable()
+  type: exports_external.string().min(1).nullable(),
+  optional: exports_external.boolean().optional(),
+  rest: exports_external.boolean().optional(),
+  defaultValue: exports_external.string().optional()
+});
+var registrationSchema = exports_external.object({
+  kind: exports_external.enum(["http", "schedule", "event"]),
+  key: exports_external.string(),
+  handler: exports_external.string(),
+  method: exports_external.string().optional(),
+  middleware: exports_external.array(exports_external.string())
 });
 var symbolInfoSchema = exports_external.lazy(() => exports_external.object({
   name: exports_external.string().min(1),
@@ -12606,6 +12700,14 @@ var symbolInfoSchema = exports_external.lazy(() => exports_external.object({
   endLine: exports_external.number().int().positive(),
   members: exports_external.array(symbolInfoSchema).optional(),
   params: exports_external.array(symbolParamSchema).optional(),
+  optional: exports_external.boolean().optional(),
+  readonly: exports_external.boolean().optional(),
+  defaultValue: exports_external.string().optional(),
+  typeParameters: exports_external.string().optional(),
+  overloads: exports_external.array(exports_external.string()).optional(),
+  publicEntrypoints: exports_external.array(exports_external.string()).optional(),
+  contractResolution: exports_external.enum(["resolved", "declaration-only"]).optional(),
+  registration: registrationSchema.optional(),
   returnType: exports_external.string().min(1).nullable().optional(),
   typeAnnotation: exports_external.string().min(1).nullable().optional(),
   extends: exports_external.string().min(1).nullable().optional(),
@@ -12620,6 +12722,7 @@ var relationInfoSchema = exports_external.object({
   type: relationTypeSchema,
   from: exports_external.string().min(1),
   to: exports_external.string().min(1),
+  file: exports_external.string().min(1).optional(),
   isExternal: exports_external.boolean(),
   grounding: groundingSchema,
   confidence: exports_external.number().min(0).max(1),
@@ -12900,6 +13003,8 @@ function semanticExtractionPayload(extraction) {
   };
 }
 function relationSourceFile(relation, symbols, filePaths) {
+  if (relation.file !== undefined)
+    return filePaths.has(relation.file) ? relation.file : null;
   if (filePaths.has(relation.from))
     return relation.from;
   const candidates = symbols.filter((symbol) => symbol.name === relation.from);

package/package.json

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