@c4a/extract 0.7.5 → 0.7.9

package/bin/c4a-extract-code.js

@@ -13203,15 +13203,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) {
@@ -14220,6 +14226,7 @@ var buildEdgeHashId = (edge2, packageName, modulePath, versionLabel) => hashStab
   isExternal: edge2.isExternal,
   grounding: edge2.grounding,
   source: edge2.source,
+  file: edge2.file ?? null,
   line: edge2.line ?? null,
   versionLabel
 });

package/index.js

@@ -13196,15 +13196,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) {
@@ -14059,7 +14065,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),
@@ -14070,6 +14086,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(),
@@ -14084,6 +14108,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),
@@ -14490,7 +14515,7 @@ var BOM = "\uFEFF";
 var HASH_ID_RE = /^(?:sha256:)?[a-f0-9]{64}$/u;
 var SOURCE_SPAN_HASH_RE = /^[a-f0-9]{8,64}$/u;
 var DOCUMENT_SOURCE_SLUG_RE = /^[a-z0-9][a-z0-9._-]*$/u;
-var DOCUMENT_SOURCE_BATCH_RE = /^\d{8}\/[a-z0-9][a-z0-9._-]*$/u;
+var DOCUMENT_SOURCE_BATCH_RE = /^\d{8}\/[^/\\\x00-\x1f:#?]+$/u;
 function isRecord2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -14509,8 +14534,8 @@ function normalizeHashId(value) {
   return `sha256:${hex}`;
 }
 function assertDocumentSourceType(value) {
-  if (value !== "file" && value !== "lark") {
-    throw new TypeError(`document source_type must be file or lark: ${value}`);
+  if (value !== "file" && value !== "lark" && value !== "note" && value !== "sessions") {
+    throw new TypeError(`document source_type must be file, lark, note or sessions: ${value}`);
   }
 }
 function normalizeDocumentSourceName(name) {
@@ -14558,9 +14583,19 @@ function decodeSnapshotLocatorPath(path3) {
   }
 }
 function parseDocumentSourceLocator(source) {
-  const match = /^(file|lark):(.+)$/u.exec(source);
+  const match = /^(file|lark|note|sessions):(.+)$/u.exec(source);
   if (match?.[1] === undefined || match[2] === undefined)
     return null;
+  if (match[1] === "note" || match[1] === "sessions") {
+    try {
+      const sourceName2 = normalizeDocumentSourceName(match[2]);
+      if (!sourceName2.endsWith(".md") || !/^\d{8}\//u.test(sourceName2))
+        return null;
+      return { sourceType: match[1], sourceName: sourceName2, documentPath: sourceName2.slice(9) };
+    } catch {
+      return null;
+    }
+  }
   const segments = match[2].split("/");
   const batched = /^\d{8}$/u.test(segments[0] ?? "") && segments.length >= 3;
   const sourceName = batched ? `${segments[0]}/${segments[1]}` : segments[0];
@@ -15929,6 +15964,7 @@ var buildEdgeHashId = (edge2, packageName, modulePath, versionLabel) => hashStab
   isExternal: edge2.isExternal,
   grounding: edge2.grounding,
   source: edge2.source,
+  file: edge2.file ?? null,
   line: edge2.line ?? null,
   versionLabel
 });
@@ -16305,6 +16341,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",
-  "version": "0.7.5",
+  "version": "0.7.9",
   "type": "module",
   "description": "Language-plugin framework and repository runner for Context code evidence",
   "license": "MIT",