@c4a/extract-style 0.7.0 → 0.7.4

package/index.js

@@ -21982,6 +21982,8 @@ function keyTokens(key) {
   return key.replace(/([a-z0-9])([A-Z])/gu, "$1-$2").replace(/[^A-Za-z0-9]+/gu, "-").toLowerCase().split("-").filter(Boolean);
 }
 function sensitiveKey(key, value) {
+  if (value === INDEXER_OUTPUT_REDACTION_MARKER)
+    return false;
   const tokens = keyTokens(key);
   if (tokens.length === 0)
     return false;
@@ -22023,12 +22025,12 @@ function replaceWithCount(value, pattern, replacement, count) {
 function redactKnownText(value, count) {
   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, /(\bauthorization\s*:\s*(?:bearer|basic)\s+)[^\s,;]+/giu, (_match, prefix) => `${prefix}${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, /([a-z][a-z0-9+.-]*:\/\/)[^\s/@:]+:[^\s/@]+@/giu, (_match, prefix) => `${prefix}${INDEXER_OUTPUT_REDACTION_MARKER}@`, count);
-  output = replaceWithCount(output, /([?&](?:access_token|refresh_token|api_key|password|secret)=)[^&#\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})(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu"), (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
+  output = replaceWithCount(output, new RegExp(`((?:["']?${key}["']?)\\s*${assignment})` + `(?!["']?${escapeRegExp(INDEXER_OUTPUT_REDACTION_MARKER)})` + `(?:"(?:\\\\.|[^"])*"|'(?:\\\\.|[^'])*'|[^\\s,;}\\]]+)`, "giu"), (_match, prefix) => `${prefix}"${INDEXER_OUTPUT_REDACTION_MARKER}"`, count);
   return output;
 }
 function redactBlockedText(value, blocked, count) {
@@ -22296,6 +22298,25 @@ function createIndexerEvidenceAdapterFact(input) {
   FACT_PAYLOADS.set(fact2, payload);
   return fact2;
 }
+function indexerEvidenceAdapterFactPayloads(result) {
+  const payloads = result.files.flatMap((file) => file.facts.map((fact2) => {
+    const payload = FACT_PAYLOADS.get(fact2);
+    if (payload === undefined) {
+      throw new TypeError(`Evidence Adapter fact payload ${fact2.fact_ref} is no longer materialized in this process`);
+    }
+    if (indexerEvidenceAdapterProtocolDigest(payload) !== fact2.payload_digest) {
+      throw new TypeError(`Evidence Adapter fact payload ${fact2.fact_ref} is stale`);
+    }
+    return { fact_ref: fact2.fact_ref, payload };
+  })).sort((left, right) => compareCanonicalText(left.fact_ref, right.fact_ref));
+  return assertIndexerOutputSafe({ channel: "ipc-envelope", value: payloads });
+}
+function materializeIndexerEvidenceAdapterResult(result) {
+  return {
+    result,
+    fact_payloads: indexerEvidenceAdapterFactPayloads(result)
+  };
+}
 function indexerEvidenceAdapterOutputDigest(value) {
   return indexerEvidenceAdapterProtocolDigest(value);
 }
@@ -22690,6 +22711,7 @@ var STATE_PSEUDOS = new Set([
   "visited"
 ]);
 var GENERIC_MODULE_NAMES = new Set(["global", "index", "style", "styles", "theme", "themes", "token", "tokens", "variable", "variables"]);
+var DYNAMIC_SELECTOR_TOKEN = "c4a_dynamic_";
 function locator2(path2, rule2, qualifiedItemPath) {
   return { path: path2, line: rule2.source?.start?.line ?? 1, column: rule2.source?.start?.column ?? 1, qualified_item_path: qualifiedItemPath };
 }
@@ -22724,6 +22746,53 @@ function moduleCandidate(path2) {
   const name = basename.replace(/\.module$/iu, "");
   return name.length > 0 && !GENERIC_MODULE_NAMES.has(name.toLowerCase()) ? name : null;
 }
+function maskScssSelectorInterpolation(selector) {
+  let cursor = 0;
+  let output = "";
+  let dynamic = false;
+  let ordinal = 0;
+  while (cursor < selector.length) {
+    const start = selector.indexOf("#{", cursor);
+    if (start < 0) {
+      output += selector.slice(cursor);
+      break;
+    }
+    output += selector.slice(cursor, start);
+    let index2 = start + 2;
+    let depth = 1;
+    let quote = null;
+    while (index2 < selector.length && depth > 0) {
+      const character = selector[index2];
+      if (quote !== null) {
+        if (character === "\\")
+          index2 += 2;
+        else {
+          if (character === quote)
+            quote = null;
+          index2 += 1;
+        }
+        continue;
+      }
+      if (character === '"' || character === "'")
+        quote = character;
+      else if (character === "{")
+        depth += 1;
+      else if (character === "}")
+        depth -= 1;
+      index2 += 1;
+    }
+    if (depth !== 0)
+      return null;
+    output += `${DYNAMIC_SELECTOR_TOKEN}${ordinal}`;
+    ordinal += 1;
+    cursor = index2;
+    dynamic = true;
+  }
+  return { text: output, dynamic };
+}
+function staticSelectorName(value) {
+  return !value.includes(DYNAMIC_SELECTOR_TOKEN);
+}
 function parseSelectorNode(input) {
   const classNames = new Set;
   const idNames = new Set;
@@ -22731,20 +22800,25 @@ function parseSelectorNode(input) {
   const pseudoClasses = new Set;
   const attributeNames = new Set;
   input.selector.walkClasses((node2) => {
-    classNames.add(node2.value);
+    if (staticSelectorName(node2.value))
+      classNames.add(node2.value);
   });
   input.selector.walkIds((node2) => {
-    idNames.add(node2.value);
+    if (staticSelectorName(node2.value))
+      idNames.add(node2.value);
   });
   input.selector.walkTags((node2) => {
-    typeNames.add(node2.value);
+    if (staticSelectorName(node2.value))
+      typeNames.add(node2.value);
   });
   input.selector.walkPseudos((node2) => {
-    if (!node2.value.startsWith("::"))
-      pseudoClasses.add(node2.value.replace(/^:/u, ""));
+    const value = node2.value.replace(/^:/u, "");
+    if (!node2.value.startsWith("::") && staticSelectorName(value))
+      pseudoClasses.add(value);
   });
   input.selector.walkAttributes((node2) => {
-    attributeNames.add(node2.attribute);
+    if (staticSelectorName(node2.attribute))
+      attributeNames.add(node2.attribute);
   });
   const qualifiedItemPath = `selector:${input.ordinal}`;
   const currentLocator = locator2(input.path, input.rule, qualifiedItemPath);
@@ -22752,7 +22826,7 @@ function parseSelectorNode(input) {
   const selectorRef = `${input.path}#${qualifiedItemPath}`;
   const catalog = {
     selector_ref: selectorRef,
-    selector_digest: indexerEvidenceAdapterProtocolDigest(selectorText),
+    selector_digest: indexerEvidenceAdapterProtocolDigest(input.digestValue ?? selectorText),
     class_names: sorted(classNames),
     id_names: sorted(idNames),
     type_names: sorted(typeNames),
@@ -22780,8 +22854,9 @@ function parseSelectorNode(input) {
       addVariant("class-modifier", modifier);
   }
   const nestedModifier = /^&--([A-Za-z0-9_-]+)$/u.exec(selectorText.trim());
-  if (nestedModifier !== null)
+  if (nestedModifier !== null && staticSelectorName(nestedModifier[1])) {
     addVariant("class-modifier", nestedModifier[1]);
+  }
   const candidates = [];
   for (const name of classNames) {
     const root2 = classRoot(name);
@@ -22801,21 +22876,36 @@ function collectStyleSelectors(input) {
     if (inKeyframes(rule2))
       continue;
     const qualifiedItemPath = `selector:${selectors.length + 1}`;
-    if (rule2.selector.includes("#{")) {
+    const masked = maskScssSelectorInterpolation(rule2.selector);
+    if (masked === null) {
       unsupported = true;
-      diagnostics.push({ code: "style-selector-unsupported", severity: "error", locator: locator2(input.path, rule2, qualifiedItemPath), detail: "dynamic SCSS selector interpolation is unsupported" });
+      diagnostics.push({ code: "style-selector-unsupported", severity: "error", locator: locator2(input.path, rule2, qualifiedItemPath), detail: "SCSS selector interpolation is malformed" });
       continue;
     }
+    if (masked.dynamic) {
+      diagnostics.push({
+        code: "style-selector-dynamic-identity-omitted",
+        severity: "warning",
+        locator: locator2(input.path, rule2, qualifiedItemPath),
+        detail: "dynamic SCSS selector identity is not expanded; only static selector evidence is cataloged"
+      });
+    }
     let root2;
     try {
-      root2 = import_postcss_selector_parser.default().astSync(rule2.selector);
+      root2 = import_postcss_selector_parser.default().astSync(masked.text);
     } catch (error) {
       unsupported = true;
       diagnostics.push({ code: "style-selector-unsupported", severity: "error", locator: locator2(input.path, rule2, qualifiedItemPath), detail: error instanceof Error ? error.message : String(error) });
       continue;
     }
-    for (const selector of root2.nodes) {
-      const parsed = parseSelectorNode({ path: input.path, rule: rule2, selector, ordinal: selectors.length + 1 });
+    for (const [selectorIndex, selector] of root2.nodes.entries()) {
+      const parsed = parseSelectorNode({
+        path: input.path,
+        rule: rule2,
+        selector,
+        ordinal: selectors.length + 1,
+        ...masked.dynamic ? { digestValue: { selector: rule2.selector, selector_ordinal: selectorIndex } } : {}
+      });
       selectors.push(parsed.selector);
       variants.push(...parsed.variants);
       candidates.push(...parsed.candidates);
@@ -23039,11 +23129,15 @@ function styleSourcesToEvidenceAdapterResult(files, invocation) {
     }]
   });
 }
+function styleSourcesToEvidenceAdapterMaterialization(files, invocation) {
+  return materializeIndexerEvidenceAdapterResult(styleSourcesToEvidenceAdapterResult(files, invocation));
+}
 
 // src/index.ts
-var STYLE_EVIDENCE_ADAPTER_EXPORT = "styleSourcesToEvidenceAdapterResult";
+var STYLE_EVIDENCE_ADAPTER_EXPORT = "styleSourcesToEvidenceAdapterMaterialization";
 export {
   styleSourcesToEvidenceAdapterResult,
+  styleSourcesToEvidenceAdapterMaterialization,
   parseStyleSources,
   STYLE_EVIDENCE_ADAPTER_EXPORT
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c4a/extract-style",
-  "version": "0.7.0",
+  "version": "0.7.4",
   "type": "module",
   "description": "Lightweight CSS and SCSS evidence adapter for Context",
   "license": "MIT",