@drskillissue/ganko 0.2.81 → 0.2.82

package/dist/eslint-plugin.cjs

@@ -36063,7 +36063,7 @@ var DYNAMIC_ATTRIBUTE_GUARD = {
   key: "dynamic-attribute:*"
 };
 var SCROLLABLE_VALUES = /* @__PURE__ */ new Set(["auto", "scroll"]);
-function collectMonitoredDeclarations(selector, layerOrder, guard) {
+function collectMonitoredDeclarations(selector, layerOrder, guard, variablesByName) {
   const out = [];
   const declarations = selector.rule.declarations;
   for (let i = 0; i < declarations.length; i++) {
@@ -36079,12 +36079,14 @@ function collectMonitoredDeclarations(selector, layerOrder, guard) {
       specificityScore: selector.specificityScore,
       isImportant: declaration.cascadePosition.isImportant || declaration.node.important
     };
+    const rawValue = declaration.value;
+    const resolvedValue = variablesByName !== null && rawValue.includes("var(") ? substituteVarReferences(rawValue, variablesByName, 0) : rawValue;
     const directSignal = MONITORED_SIGNAL_NAME_MAP.get(property);
     if (directSignal !== void 0) {
-      out.push({ property: directSignal, value: declaration.value, guardProvenance: guard, position });
+      out.push({ property: directSignal, value: resolvedValue, guardProvenance: guard, position });
       continue;
     }
-    const value2 = declaration.value.trim().toLowerCase();
+    const value2 = resolvedValue.trim().toLowerCase();
     const expanded = expandShorthand(property, value2);
     if (expanded === void 0) continue;
     if (expanded === null) {
@@ -36095,7 +36097,7 @@ function collectMonitoredDeclarations(selector, layerOrder, guard) {
         if (!longhand) continue;
         const signal = MONITORED_SIGNAL_NAME_MAP.get(longhand);
         if (signal === void 0) continue;
-        out.push({ property: signal, value: declaration.value, guardProvenance: guard, position });
+        out.push({ property: signal, value: resolvedValue, guardProvenance: guard, position });
       }
       continue;
     }
@@ -36190,19 +36192,6 @@ function augmentCascadeWithTailwind(cascade, node, tailwind) {
   }
 }
 var MAX_VAR_SUBSTITUTION_DEPTH = 10;
-function resolveVarReferencesInCascade(cascade, variablesByName) {
-  for (const [property, declaration] of cascade) {
-    if (!declaration.value.includes("var(")) continue;
-    const resolved = substituteVarReferences(declaration.value, variablesByName, 0);
-    if (resolved !== declaration.value) {
-      cascade.set(property, {
-        value: resolved,
-        source: declaration.source,
-        guardProvenance: declaration.guardProvenance
-      });
-    }
-  }
-}
 function substituteVarReferences(value2, variablesByName, depth) {
   if (depth >= MAX_VAR_SUBSTITUTION_DEPTH) return value2;
   const refs = extractVarReferences(value2);
@@ -36236,7 +36225,7 @@ function selectBestVariableValue(candidates) {
   const first = candidates[0];
   return first ? first.value : null;
 }
-function buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorId, tailwind, variablesByName) {
+function buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorId, tailwind) {
   const out = /* @__PURE__ */ new Map();
   const positions = /* @__PURE__ */ new Map();
   for (let i = 0; i < edges.length; i++) {
@@ -36294,9 +36283,6 @@ function buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorI
   if (tailwind !== null) {
     augmentCascadeWithTailwind(out, node, tailwind);
   }
-  if (variablesByName !== null) {
-    resolveVarReferencesInCascade(out, variablesByName);
-  }
   return out;
 }
 function compareLayoutEdge(a, b) {
@@ -36965,7 +36951,8 @@ function buildLayoutGraph(solids, css, logger = noopLogger) {
     const monitoredDeclarations = collectMonitoredDeclarations(
       selector,
       resolveRuleLayerOrder(selector.rule, css),
-      guard
+      guard,
+      css.variablesByName
     );
     selectorsById.set(selector.id, selector);
     monitoredDeclarationsBySelectorId.set(selector.id, monitoredDeclarations);
@@ -37143,7 +37130,7 @@ function buildLayoutGraph(solids, css, logger = noopLogger) {
     const mutableEdges = appliesByElementNodeMutable.get(node);
     if (mutableEdges) mutableEdges.sort(compareLayoutEdge);
     const edges = mutableEdges ?? EMPTY_EDGE_LIST;
-    const cascade = buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorId, tailwind, css.variablesByName);
+    const cascade = buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorId, tailwind);
     if (trace && cascade.size > 0) {
       const displayDecl = cascade.get("display");
       const flexDirDecl = cascade.get("flex-direction");
@@ -40922,7 +40909,13 @@ var jsxLayoutPolicyTouchTarget = defineCrossRule({
   }
 });
 function checkDimension(snapshot, signal, min, layout, node, emit, messageId, template, tag, policyName) {
-  const px = readKnownPx(snapshot, signal);
+  let px = readKnownPx(snapshot, signal);
+  if (px === null) {
+    const signalValue = readKnownSignalWithGuard(snapshot, signal);
+    if (signalValue !== null && signalValue.guard.kind === 1 /* Conditional */) {
+      px = resolveUnconditionalFallbackPx(layout, node, signal);
+    }
+  }
   if (px === null) return;
   if (px >= min) return;
   emitLayoutDiagnostic(
@@ -40942,6 +40935,20 @@ function checkDimension(snapshot, signal, min, layout, node, emit, messageId, te
     }
   );
 }
+function resolveUnconditionalFallbackPx(layout, node, signal) {
+  const delta = readConditionalSignalDeltaFact(layout, node, signal);
+  if (!delta.hasConditional) return null;
+  const values = delta.unconditionalValues;
+  let bestPx = null;
+  for (let i = 0; i < values.length; i++) {
+    const raw = values[i];
+    if (!raw) continue;
+    const px = parsePxValue(raw);
+    if (px === null) continue;
+    if (bestPx === null || px > bestPx) bestPx = px;
+  }
+  return bestPx;
+}
 
 // src/cross-file/rules/index.ts
 var rules3 = [