@c4a/extract-ts 0.7.8 → 0.7.10-alpha.1

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) {
@@ -13163,9 +13169,11 @@ async function enrichPublicContracts(input) {
     getNewLine: () => `
 `
   };
-  const program = ts5.createProgram([...sources.keys()], options, host);
   for (const source of sources.values())
     input.symbols.push(...runtimeRegistrations(source), ...federationContracts(source));
+  if (!input.symbols.some((symbol) => symbol.visibility === "exported" /* Exported */))
+    return;
+  const program = ts5.createProgram([...sources.keys()], options, host);
   const checker = program.getTypeChecker();
   const diagnosticsByFile = new Map;
   for (const symbol of input.symbols) {
@@ -14485,6 +14493,8 @@ var scriptKind = (filePath) => {
 };
 var createEcmaScriptSourceFile = (source, filePath) => ts6.createSourceFile(filePath, source, ts6.ScriptTarget.Latest, true, scriptKind(filePath));
 var treeSitterCompatibleJsxSource = (sourceFile, source) => {
+  if (!source.includes("&"))
+    return source;
   const characters = source.split("");
   let changed = false;
   const visit2 = (node2) => {
@@ -14728,8 +14738,7 @@ var collectDynamicDiagnostics = (sourceFile) => {
   visit2(sourceFile);
   return diagnostics;
 };
-var analyzeCommonJsModule = (source, filePath) => {
-  const sourceFile = createEcmaScriptSourceFile(source, filePath);
+var analyzeCommonJsModule = (source, filePath, sourceFile = createEcmaScriptSourceFile(source, filePath)) => {
   const bindings = collectBindings(sourceFile);
   const bindingMap = new Map(bindings.map((binding) => [binding.localName, binding]));
   const result = {
@@ -14967,101 +14976,105 @@ var traceFile = async (filePath, fs, state) => {
     const tree = await parseFile(parserSource, jsxLike);
     if (!tree)
       return [];
-    const root = tree.rootNode;
-    const localDeclarations = collectLocalDeclarations(root);
-    const importBindings = collectImportBindings(root);
-    for (const declaration of commonJs.syntheticDeclarations) {
-      localDeclarations.set(declaration.name, declaration.name);
-    }
-    for (const binding of commonJs.bindings) {
-      importBindings.set(binding.localName, {
-        source: binding.source,
-        importedName: binding.importedName
-      });
-    }
-    const exportsList = [];
-    for (const node2 of root.namedChildren) {
-      if (node2.type !== "export_statement")
-        continue;
-      const stringNode = node2.namedChildren.find((child) => child.type === "string");
-      const exportClause = node2.namedChildren.find((child) => child.type === "export_clause");
-      const declaration = node2.namedChildren.find((child) => DECLARATION_TYPES2.has(child.type));
-      if (declaration) {
-        for (const name of getDeclarationName(declaration)) {
-          exportsList.push({ exportedName: name, localName: name, declarationFile: filePath });
-        }
-        continue;
-      }
-      if (node2.text.startsWith("export default ")) {
-        const identifier = node2.namedChildren.find((child) => child.type === "identifier" || child.type === "type_identifier");
-        if (identifier && localDeclarations.has(identifier.text)) {
-          exportsList.push({
-            exportedName: identifier.text,
-            localName: identifier.text,
-            declarationFile: filePath
-          });
-        }
-        continue;
+    try {
+      const root = tree.rootNode;
+      const localDeclarations = collectLocalDeclarations(root);
+      const importBindings = collectImportBindings(root);
+      for (const declaration of commonJs.syntheticDeclarations) {
+        localDeclarations.set(declaration.name, declaration.name);
+      }
+      for (const binding of commonJs.bindings) {
+        importBindings.set(binding.localName, {
+          source: binding.source,
+          importedName: binding.importedName
+        });
       }
-      if (!exportClause) {
-        if (stringNode && node2.text.startsWith("export *")) {
-          const targetPath2 = await resolveImportSourcePath(filePath, stripQuotes(stringNode.text), fs, state.resolver);
-          if (targetPath2) {
-            exportsList.push(...await traceFile(targetPath2, fs, state));
+      const exportsList = [];
+      for (const node2 of root.namedChildren) {
+        if (node2.type !== "export_statement")
+          continue;
+        const stringNode = node2.namedChildren.find((child) => child.type === "string");
+        const exportClause = node2.namedChildren.find((child) => child.type === "export_clause");
+        const declaration = node2.namedChildren.find((child) => DECLARATION_TYPES2.has(child.type));
+        if (declaration) {
+          for (const name of getDeclarationName(declaration)) {
+            exportsList.push({ exportedName: name, localName: name, declarationFile: filePath });
           }
+          continue;
         }
-        continue;
-      }
-      if (!stringNode) {
-        for (const specifier of exportClause.namedChildren.filter((child) => child.type === "export_specifier")) {
-          const parsed = parseExportSpecifier(specifier);
-          if (!parsed)
-            continue;
-          if (localDeclarations.has(parsed.localName)) {
+        if (node2.text.startsWith("export default ")) {
+          const identifier = node2.namedChildren.find((child) => child.type === "identifier" || child.type === "type_identifier");
+          if (identifier && localDeclarations.has(identifier.text)) {
             exportsList.push({
-              exportedName: parsed.exportedName,
-              localName: parsed.localName,
+              exportedName: identifier.text,
+              localName: identifier.text,
               declarationFile: filePath
             });
-            continue;
           }
-          const importBinding = importBindings.get(parsed.localName);
-          if (importBinding) {
-            exportsList.push(...await traceImportedBinding(filePath, importBinding, parsed.exportedName, fs, state));
+          continue;
+        }
+        if (!exportClause) {
+          if (stringNode && node2.text.startsWith("export *")) {
+            const targetPath2 = await resolveImportSourcePath(filePath, stripQuotes(stringNode.text), fs, state.resolver);
+            if (targetPath2) {
+              exportsList.push(...await traceFile(targetPath2, fs, state));
+            }
           }
+          continue;
         }
-        continue;
-      }
-      const targetPath = await resolveImportSourcePath(filePath, stripQuotes(stringNode.text), fs, state.resolver);
-      if (!targetPath)
-        continue;
-      const traced = await traceFile(targetPath, fs, state);
-      for (const specifier of exportClause.namedChildren.filter((child) => child.type === "export_specifier")) {
-        const parsed = parseExportSpecifier(specifier);
-        if (!parsed)
+        if (!stringNode) {
+          for (const specifier of exportClause.namedChildren.filter((child) => child.type === "export_specifier")) {
+            const parsed = parseExportSpecifier(specifier);
+            if (!parsed)
+              continue;
+            if (localDeclarations.has(parsed.localName)) {
+              exportsList.push({
+                exportedName: parsed.exportedName,
+                localName: parsed.localName,
+                declarationFile: filePath
+              });
+              continue;
+            }
+            const importBinding = importBindings.get(parsed.localName);
+            if (importBinding) {
+              exportsList.push(...await traceImportedBinding(filePath, importBinding, parsed.exportedName, fs, state));
+            }
+          }
           continue;
-        const match = traced.find((item) => item.exportedName === parsed.localName);
-        if (!match)
+        }
+        const targetPath = await resolveImportSourcePath(filePath, stripQuotes(stringNode.text), fs, state.resolver);
+        if (!targetPath)
           continue;
-        exportsList.push({
-          exportedName: parsed.exportedName,
-          localName: match.localName,
-          declarationFile: match.declarationFile
-        });
+        const traced = await traceFile(targetPath, fs, state);
+        for (const specifier of exportClause.namedChildren.filter((child) => child.type === "export_specifier")) {
+          const parsed = parseExportSpecifier(specifier);
+          if (!parsed)
+            continue;
+          const match = traced.find((item) => item.exportedName === parsed.localName);
+          if (!match)
+            continue;
+          exportsList.push({
+            exportedName: parsed.exportedName,
+            localName: match.localName,
+            declarationFile: match.declarationFile
+          });
+        }
       }
+      exportsList.push(...await traceCommonJsExports({
+        analysis: commonJs,
+        filePath,
+        localDeclarations,
+        traceImported: (source2, importedName, exportedName) => traceImportedBinding(filePath, { source: source2, importedName }, exportedName, fs, state),
+        traceWildcard: async (source2) => {
+          const targetPath = await resolveImportSourcePath(filePath, source2, fs, state.resolver);
+          return targetPath ? traceFile(targetPath, fs, state) : [];
+        }
+      }));
+      return uniqueExports(exportsList);
+    } finally {
+      tree.delete();
+      state.inFlight.delete(filePath);
     }
-    exportsList.push(...await traceCommonJsExports({
-      analysis: commonJs,
-      filePath,
-      localDeclarations,
-      traceImported: (source2, importedName, exportedName) => traceImportedBinding(filePath, { source: source2, importedName }, exportedName, fs, state),
-      traceWildcard: async (source2) => {
-        const targetPath = await resolveImportSourcePath(filePath, source2, fs, state.resolver);
-        return targetPath ? traceFile(targetPath, fs, state) : [];
-      }
-    }));
-    state.inFlight.delete(filePath);
-    return uniqueExports(exportsList);
   })();
   state.cache.set(filePath, promise);
   return promise;
@@ -15115,8 +15128,7 @@ var declarationName = (node2, sourceFile) => {
   }
   return null;
 };
-var collectStaticCallRelations = (source, filePath, importBindings) => {
-  const sourceFile = createEcmaScriptSourceFile(source, filePath);
+var collectStaticCallRelations = (source, filePath, importBindings, sourceFile = createEcmaScriptSourceFile(source, filePath)) => {
   const relations = [];
   const visit2 = (node2, owner) => {
     const namedOwner = declarationName(node2, sourceFile) ?? owner;
@@ -15432,7 +15444,7 @@ var appendCommonJsSyntheticDeclarations = (commonJs, filePath, declarations) =>
 var analyzeFile = async (filePath, fs, resolver = { mappings: [] }) => {
   const source = await fs.readFile(filePath);
   const sourceFile = createEcmaScriptSourceFile(source, filePath);
-  const commonJs = analyzeCommonJsModule(source, filePath);
+  const commonJs = analyzeCommonJsModule(source, filePath, sourceFile);
   const jsxLike = isJsxLikePath(filePath);
   const parserSource = jsxLike ? treeSitterCompatibleJsxSource(sourceFile, source) : source;
   const tree = await parseFile(parserSource, jsxLike);
@@ -15456,47 +15468,51 @@ var analyzeFile = async (filePath, fs, resolver = { mappings: [] }) => {
       diagnostics
     };
   }
-  if (commonJs.diagnostics.length > 0) {
-    return {
-      declarations: new Map,
-      importBindings: new Map,
-      relations: [],
-      lines: countLines(source),
-      disposition: "unsupported",
-      diagnostics: commonJs.diagnostics
-    };
-  }
-  const root = tree.rootNode;
-  const relations = [];
-  const importBindings = await collectImportBindings2(root, filePath, fs, resolver, relations, commonJs);
-  const declarations = new Map;
-  for (const relation of relations) {
-    if (relation.from === "") {
-      relation.from = filePath;
+  try {
+    if (commonJs.diagnostics.length > 0) {
+      return {
+        declarations: new Map,
+        importBindings: new Map,
+        relations: [],
+        lines: countLines(source),
+        disposition: "unsupported",
+        diagnostics: commonJs.diagnostics
+      };
     }
-  }
-  for (const child of root.namedChildren) {
-    if (DECLARATION_TYPES.has(child.type)) {
-      analyzeDeclaration(child, filePath, declarations, importBindings, relations);
-      continue;
+    const root = tree.rootNode;
+    const relations = [];
+    const importBindings = await collectImportBindings2(root, filePath, fs, resolver, relations, commonJs);
+    const declarations = new Map;
+    for (const relation of relations) {
+      if (relation.from === "") {
+        relation.from = filePath;
+      }
     }
-    if (child.type !== "export_statement")
-      continue;
-    const declaration = child.namedChildren.find((node2) => DECLARATION_TYPES.has(node2.type));
-    if (declaration) {
-      analyzeDeclaration(declaration, filePath, declarations, importBindings, relations);
+    for (const child of root.namedChildren) {
+      if (DECLARATION_TYPES.has(child.type)) {
+        analyzeDeclaration(child, filePath, declarations, importBindings, relations);
+        continue;
+      }
+      if (child.type !== "export_statement")
+        continue;
+      const declaration = child.namedChildren.find((node2) => DECLARATION_TYPES.has(node2.type));
+      if (declaration) {
+        analyzeDeclaration(declaration, filePath, declarations, importBindings, relations);
+      }
     }
+    appendCommonJsSyntheticDeclarations(commonJs, filePath, declarations);
+    relations.push(...collectStaticCallRelations(source, filePath, importBindings, sourceFile));
+    return {
+      declarations,
+      importBindings,
+      relations: relations.map((relation) => ({ ...relation, file: filePath })),
+      lines: countLines(source),
+      disposition: "analyzed",
+      diagnostics: []
+    };
+  } finally {
+    tree.delete();
   }
-  appendCommonJsSyntheticDeclarations(commonJs, filePath, declarations);
-  relations.push(...collectStaticCallRelations(source, filePath, importBindings));
-  return {
-    declarations,
-    importBindings,
-    relations: relations.map((relation) => ({ ...relation, file: filePath })),
-    lines: countLines(source),
-    disposition: "analyzed",
-    diagnostics: []
-  };
 };
 
 // src/symbolExtractor.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/extract-ts",
-  "version": "0.7.8",
+  "version": "0.7.10-alpha.1",
   "type": "module",
   "description": "TypeScript and JavaScript extraction plugin for the Context ExtractionResult v2 contract",
   "license": "MIT",