@shapeshift-labs/frontier-lang-compiler 0.2.153 → 0.2.155

package/dist/internal/index-impl/projectSymbolGraphCssModuleMemberAccess.js

@@ -0,0 +1,84 @@
+import { readStaticMemberLiteral } from './staticMemberLiteral.js';
+import { escapeRegExp, isIdentifierChar } from './projectSymbolGraphCssModuleUtils.js';
+
+const IdentifierPattern = /^[A-Za-z_$][\w$]*$/;
+
+function cssModuleMemberAccess(sourceText, receiverEnd) {
+  let index = receiverEnd;
+  while (index < sourceText.length && /\s/.test(sourceText[index])) index += 1;
+  if (sourceText[index] === '?' && sourceText[index + 1] === '.') index += 2;
+  else if (sourceText[index] === '.') index += 1;
+  else if (sourceText[index] === '[') return cssModuleComputedAccess(sourceText, index);
+  else return undefined;
+  while (index < sourceText.length && /\s/.test(sourceText[index])) index += 1;
+  const match = /^[A-Za-z_$][\w$]*/.exec(sourceText.slice(index));
+  return match ? { accessKind: 'dot', memberName: match[0], end: index + match[0].length } : undefined;
+}
+
+function cssModuleComputedAccess(sourceText, open) {
+  const close = findMatchingBracket(sourceText, open);
+  if (close === -1) return { status: 'blocked', reasonCode: 'css-module-dynamic-member-access-unproved', end: open + 1 };
+  let index = open + 1;
+  while (index < close && /\s/.test(sourceText[index])) index += 1;
+  const literal = readStaticMemberLiteral(sourceText, index, close);
+  if (!literal || !IdentifierPattern.test(literal.value)) {
+    return { status: 'blocked', reasonCode: 'css-module-dynamic-member-access-unproved', end: close + 1, expressionText: sourceText.slice(open, close + 1) };
+  }
+  return { accessKind: literal.literalKind === 'static-template-literal' ? 'static-template' : 'static-bracket', memberName: literal.value, end: close + 1 };
+}
+
+function cssModuleStaticExpressionAccess(expressionText, localName) {
+  const value = String(expressionText ?? '').trim();
+  if (!value.startsWith(localName)) return undefined;
+  if (isIdentifierChar(value[localName.length])) return undefined;
+  const access = cssModuleMemberAccess(value, localName.length);
+  if (!access || access.status === 'blocked' || access.end !== value.length) return undefined;
+  return {
+    accessKind: access.accessKind,
+    memberName: access.memberName,
+    optional: /\?\./.test(value.slice(0, access.end))
+  };
+}
+
+function cssModuleExpressionHasCall(expressionText) {
+  const value = String(expressionText ?? '');
+  return /\?\.\s*\(/.test(value) || /\b[A-Za-z_$][\w$]*(?:\s*(?:\.|\?\.)\s*[A-Za-z_$][\w$]*)*\s*\(/.test(value);
+}
+
+function cssModuleExpressionHasBlockedAccess(expressionText, localName) {
+  const value = String(expressionText ?? '');
+  for (const occurrence of identifierOccurrences(value, localName)) {
+    const access = cssModuleMemberAccess(value, occurrence.end);
+    if (access?.status === 'blocked') return true;
+  }
+  return false;
+}
+
+function identifierOccurrences(sourceText, name) {
+  const result = [];
+  const pattern = new RegExp(`\\b${escapeRegExp(name)}\\b`, 'g');
+  for (const match of sourceText.matchAll(pattern)) {
+    const start = match.index;
+    const end = start + name.length;
+    if (isIdentifierChar(sourceText[start - 1]) || isIdentifierChar(sourceText[end])) continue;
+    result.push({ start, end });
+  }
+  return result;
+}
+
+function findMatchingBracket(sourceText, open) {
+  let depth = 0;
+  for (let index = open; index < sourceText.length; index += 1) {
+    if (sourceText[index] === '[') depth += 1;
+    else if (sourceText[index] === ']' && --depth === 0) return index;
+  }
+  return -1;
+}
+
+export {
+  cssModuleExpressionHasBlockedAccess,
+  cssModuleExpressionHasCall,
+  cssModuleMemberAccess,
+  cssModuleStaticExpressionAccess,
+  identifierOccurrences
+};

package/dist/internal/index-impl/projectSymbolGraphCssModuleScanners.js

@@ -1,8 +1,6 @@
-import { readStaticMemberLiteral } from './staticMemberLiteral.js';
 import {
   bindingsForSourcePath,
   escapeRegExp,
-  isIdentifierChar,
   localKey,
   sourceSpanForRange
 } from './projectSymbolGraphCssModuleUtils.js';
@@ -11,8 +9,13 @@ import {
   cssModulePropBlocker,
   cssModuleUseSiteRecord
 } from './projectSymbolGraphCssModuleRecords.js';
-
-const IdentifierPattern = /^[A-Za-z_$][\w$]*$/;
+import {
+  cssModuleExpressionHasBlockedAccess,
+  cssModuleExpressionHasCall,
+  cssModuleMemberAccess,
+  cssModuleStaticExpressionAccess,
+  identifierOccurrences
+} from './projectSymbolGraphCssModuleMemberAccess.js';
 
 function cssModuleLexicalUseSites(importBindings, sourceTextsByPath) {
   const useSites = [];
@@ -99,13 +102,15 @@ function cssModuleJsxUseSites(bindingsByLocal, jsxPropRecords) {
     useSites.push(...cssModuleJsxStaticUseSites(sourceBindings, prop));
     const classNameBindings = bindingsForSourcePath(bindingsByLocal, prop.sourcePath);
     if (prop.propName !== 'className' || !classNameBindings.length) continue;
+    useSites.push(...cssModuleJsxStaticComputedUseSites(classNameBindings, prop));
+    useSites.push(...cssModuleJsxHelperUseSites(classNameBindings, prop));
     blockers.push(...cssModuleJsxBlockers(classNameBindings, prop));
   }
   return { useSites, blockers };
 }
 
 function cssModuleJsxStaticUseSites(sourceBindings, prop) {
-  if (prop.propName !== 'className' || prop.propValueKind !== 'reference') return [];
+  if (prop.propName !== 'className' || (prop.propValueKind !== 'reference' && prop.propValueKind !== 'optional-reference')) return [];
   const referencePath = prop.propValueReferencePath ?? [];
   if (referencePath.length < 2) return [];
   return sourceBindings.map((binding) => cssModuleUseSiteRecord(binding, {
@@ -117,43 +122,75 @@ function cssModuleJsxStaticUseSites(sourceBindings, prop) {
     sourcePath: prop.sourcePath,
     sourceHash: prop.sourceHash,
     sourceSpan: prop.sourceSpan,
-    jsxPropRecordId: prop.id
+    jsxPropRecordId: prop.id,
+    conditionalRuntimePresence: prop.propValueKind === 'optional-reference' || undefined
   }));
 }
 
-function cssModuleJsxBlockers(classNameBindings, prop) {
-  if (prop.propValueKind === 'string') {
-    return classNameBindings.map((binding) => cssModulePropBlocker(binding, prop, 'css-module-string-literal-classname-unproved'));
-  }
-  if (!prop.propValueDynamicBlockerReasonCode) return [];
+function cssModuleJsxStaticComputedUseSites(classNameBindings, prop) {
+  if (prop.propValueKind === 'reference' || prop.propValueKind === 'optional-reference') return [];
   const expressionText = prop.propValueExpressionText ?? prop.propValueDynamicText ?? '';
-  return classNameBindings
-    .filter((binding) => expressionText.includes(binding.localName))
-    .map((binding) => cssModulePropBlocker(binding, prop, jsxDynamicReason(prop.propValueDynamicBlockerReasonCode)));
+  return classNameBindings.flatMap((binding) => {
+    const access = cssModuleStaticExpressionAccess(expressionText, binding.localName);
+    if (!access) return [];
+    return [cssModuleUseSiteRecord(binding, {
+      useSiteKind: 'jsx-className',
+      accessKind: access.accessKind,
+      exportName: access.memberName,
+      receiverLocalName: binding.localName,
+      expressionText,
+      sourcePath: prop.sourcePath,
+      sourceHash: prop.sourceHash,
+      sourceSpan: prop.sourceSpan,
+      jsxPropRecordId: prop.id,
+      conditionalRuntimePresence: access.optional || undefined
+    })];
+  });
 }
 
-function cssModuleMemberAccess(sourceText, receiverEnd) {
-  let index = receiverEnd;
-  while (index < sourceText.length && /\s/.test(sourceText[index])) index += 1;
-  if (sourceText[index] === '?' && sourceText[index + 1] === '.') index += 2;
-  else if (sourceText[index] === '.') index += 1;
-  else if (sourceText[index] === '[') return cssModuleComputedAccess(sourceText, index);
-  else return undefined;
-  while (index < sourceText.length && /\s/.test(sourceText[index])) index += 1;
-  const match = /^[A-Za-z_$][\w$]*/.exec(sourceText.slice(index));
-  return match ? { accessKind: 'dot', memberName: match[0], end: index + match[0].length } : undefined;
+function cssModuleJsxHelperUseSites(classNameBindings, prop) {
+  const expressionText = prop.propValueExpressionText ?? prop.propValueDynamicText ?? '';
+  if (!cssModuleExpressionHasCall(expressionText)) return [];
+  const useSites = [];
+  for (const binding of classNameBindings) {
+    for (const occurrence of identifierOccurrences(expressionText, binding.localName)) {
+      const access = cssModuleMemberAccess(expressionText, occurrence.end);
+      if (!access || access.status === 'blocked') continue;
+      if (memberWriteOperation(expressionText, occurrence.start, access.end)) continue;
+      useSites.push(cssModuleUseSiteRecord(binding, {
+        useSiteKind: 'jsx-className-helper',
+        accessKind: access.accessKind,
+        exportName: access.memberName,
+        receiverLocalName: binding.localName,
+        expressionText: expressionText.slice(occurrence.start, access.end),
+        sourcePath: prop.sourcePath,
+        sourceHash: prop.sourceHash,
+        sourceSpan: prop.sourceSpan,
+        jsxPropRecordId: prop.id,
+        conditionalRuntimePresence: cssModuleHelperArgumentIsConditional(expressionText, occurrence.start) || undefined
+      }));
+    }
+  }
+  return useSites;
 }
 
-function cssModuleComputedAccess(sourceText, open) {
-  const close = findMatchingBracket(sourceText, open);
-  if (close === -1) return { status: 'blocked', reasonCode: 'css-module-dynamic-member-access-unproved', end: open + 1 };
-  let index = open + 1;
-  while (index < close && /\s/.test(sourceText[index])) index += 1;
-  const literal = readStaticMemberLiteral(sourceText, index, close);
-  if (!literal || !IdentifierPattern.test(literal.value)) {
-    return { status: 'blocked', reasonCode: 'css-module-dynamic-member-access-unproved', end: close + 1, expressionText: sourceText.slice(open, close + 1) };
+function cssModuleJsxBlockers(classNameBindings, prop) {
+  if (prop.propValueKind === 'string') {
+    return classNameBindings.map((binding) => cssModulePropBlocker(binding, prop, 'css-module-string-literal-classname-unproved'));
   }
-  return { accessKind: literal.literalKind === 'static-template-literal' ? 'static-template' : 'static-bracket', memberName: literal.value, end: close + 1 };
+  const expressionText = prop.propValueExpressionText ?? prop.propValueDynamicText ?? '';
+  if (!expressionText) return [];
+  return classNameBindings.flatMap((binding) => {
+    if (!expressionText.includes(binding.localName)) return [];
+    const reasonCodes = [];
+    if (cssModuleExpressionHasCall(expressionText)) reasonCodes.push('css-module-helper-call-unproved');
+    if (cssModuleExpressionHasBlockedAccess(expressionText, binding.localName)) reasonCodes.push('css-module-dynamic-member-access-unproved');
+    if (!reasonCodes.length && cssModuleStaticExpressionAccess(expressionText, binding.localName)) return [];
+    if (!reasonCodes.length && prop.propValueDynamicBlockerReasonCode) {
+      reasonCodes.push(jsxDynamicReason(prop.propValueDynamicBlockerReasonCode));
+    }
+    return [...new Set(reasonCodes)].map((reasonCode) => cssModulePropBlocker(binding, prop, reasonCode));
+  });
 }
 
 function memberWriteOperation(sourceText, start, end) {
@@ -183,15 +220,6 @@ function hasPrefixUpdateOperator(code, tokenStart) {
   return before < 0 || !/[A-Za-z0-9_$)\]]/.test(code[before]);
 }
 
-function findMatchingBracket(sourceText, open) {
-  let depth = 0;
-  for (let index = open; index < sourceText.length; index += 1) {
-    if (sourceText[index] === '[') depth += 1;
-    else if (sourceText[index] === ']' && --depth === 0) return index;
-  }
-  return -1;
-}
-
 function destructuringProperty(text) {
   const value = String(text ?? '').trim();
   const [rawName, rawLocal] = value.split(':').map((part) => part.trim());
@@ -221,16 +249,14 @@ function splitTopLevelComma(text, baseOffset) {
   return parts;
 }
 
-function identifierOccurrences(sourceText, name) {
-  const result = [];
-  const pattern = new RegExp(`\\b${escapeRegExp(name)}\\b`, 'g');
-  for (const match of sourceText.matchAll(pattern)) {
-    const start = match.index;
-    const end = start + name.length;
-    if (isIdentifierChar(sourceText[start - 1]) || isIdentifierChar(sourceText[end])) continue;
-    result.push({ start, end });
-  }
-  return result;
+function cssModuleHelperArgumentIsConditional(expressionText, occurrenceStart) {
+  const prefix = expressionText.slice(0, occurrenceStart);
+  const suffix = expressionText.slice(occurrenceStart);
+  const lastComma = prefix.lastIndexOf(',');
+  const argumentPrefix = prefix.slice(lastComma + 1);
+  const nextComma = suffix.indexOf(',');
+  const argumentText = `${argumentPrefix}${nextComma === -1 ? suffix : suffix.slice(0, nextComma)}`;
+  return /(?:&&|\|\||\?)/.test(argumentText);
 }
 
 function jsxDynamicReason(reasonCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshift-labs/frontier-lang-compiler",
-  "version": "0.2.153",
+  "version": "0.2.155",
   "description": "Compiler facade for Frontier Lang source documents and language projection adapters.",
   "type": "module",
   "main": "./dist/index.js",
@@ -63,7 +63,7 @@
   "dependencies": {
     "@shapeshift-labs/frontier-lang-c": "0.2.9",
     "@shapeshift-labs/frontier-lang-checker": "0.3.8",
-    "@shapeshift-labs/frontier-lang-css": "^0.1.4",
+    "@shapeshift-labs/frontier-lang-css": "^0.1.5",
     "@shapeshift-labs/frontier-lang-javascript": "0.2.9",
     "@shapeshift-labs/frontier-lang-kernel": "0.3.12",
     "@shapeshift-labs/frontier-lang-parser": "0.3.8",