@drskillissue/ganko 0.2.8 → 0.2.9

package/dist/index.cjs

@@ -3978,6 +3978,10 @@ function getStaticStringFromJSXValue(node) {
     if (import_typescript4.default.isTemplateExpression(expression) && expression.templateSpans.length === 0) {
       return expression.head.text;
     }
+    if (import_typescript4.default.isBinaryExpression(expression) && expression.operatorToken.kind === import_typescript4.default.SyntaxKind.QuestionQuestionToken) {
+      const fallback = getStaticStringFromJSXValue(expression.right);
+      if (fallback !== null) return fallback;
+    }
   }
   return null;
 }
@@ -23266,7 +23270,7 @@ function splitWhitespaceTokens(value2) {
   return out;
 }
 function parseQuadShorthand(raw) {
-  const parts = splitWhitespaceTokens(raw);
+  const parts = splitTopLevelWhitespace(raw);
   if (parts.length === 1) {
     const p0 = parts[0];
     if (!p0) return null;
@@ -23290,7 +23294,7 @@ function parseQuadShorthand(raw) {
   return null;
 }
 function parseBlockShorthand(raw) {
-  const parts = splitWhitespaceTokens(raw);
+  const parts = splitTopLevelWhitespace(raw);
   if (parts.length === 1) {
     const p0 = parts[0];
     if (!p0) return null;
@@ -23375,8 +23379,14 @@ var NUMERIC_VALUE = /^([0-9]*\.?[0-9]+)(px|rem|em|pt)?$/;
 function parsePxValue(raw, contextFontSize = 16) {
   const trimmed = raw.trim().toLowerCase();
   if (trimmed.length === 0) return null;
-  if (trimmed.includes("var(") || trimmed.includes("calc(") || trimmed.includes("%")) return null;
+  if (trimmed.includes("var(") || trimmed.includes("%")) return null;
   if (CSS_WIDE_KEYWORDS.has(trimmed)) return null;
+  if (trimmed.includes("calc(")) {
+    return tryEvalConstantCalc(trimmed, contextFontSize);
+  }
+  if (trimmed.startsWith("min(") || trimmed.startsWith("max(") || trimmed.startsWith("clamp(")) {
+    return tryEvalMathFunction(trimmed, contextFontSize);
+  }
   const match = NUMERIC_VALUE.exec(trimmed);
   if (!match) return null;
   const num = Number(match[1]);
@@ -23387,6 +23397,135 @@ function parsePxValue(raw, contextFontSize = 16) {
   if (unit === "pt") return num * 1.333;
   return null;
 }
+var CALC_CONSTANT_RE = /^calc\((.+)\)$/;
+var CALC_TOKEN_RE = /([0-9]*\.?[0-9]+)(px|rem|em|pt)?|([+\-*/])/g;
+function tryEvalConstantCalc(raw, contextFontSize) {
+  const match = CALC_CONSTANT_RE.exec(raw);
+  if (!match || !match[1]) return null;
+  const inner = match[1].trim();
+  if (inner.includes("var(") || inner.includes("%") || inner.includes("env(") || inner.includes("calc(")) return null;
+  const values = [];
+  const operators = [];
+  let lastWasValue = false;
+  CALC_TOKEN_RE.lastIndex = 0;
+  let tokenMatch;
+  while ((tokenMatch = CALC_TOKEN_RE.exec(inner)) !== null) {
+    const op = tokenMatch[3];
+    if (op !== void 0) {
+      if (!lastWasValue && op === "-") {
+        const nextToken = CALC_TOKEN_RE.exec(inner);
+        if (!nextToken || nextToken[3] !== void 0) return null;
+        const px2 = calcTokenToPx(nextToken, contextFontSize);
+        if (px2 === null) return null;
+        values.push(-px2);
+        lastWasValue = true;
+        continue;
+      }
+      if (!lastWasValue) return null;
+      operators.push(op);
+      lastWasValue = false;
+      continue;
+    }
+    const px = calcTokenToPx(tokenMatch, contextFontSize);
+    if (px === null) return null;
+    values.push(px);
+    lastWasValue = true;
+  }
+  if (values.length === 0 || values.length !== operators.length + 1) return null;
+  const firstValue = values[0];
+  if (firstValue === void 0) return null;
+  const reducedValues = [firstValue];
+  const reducedOps = [];
+  for (let i = 0; i < operators.length; i++) {
+    const op = operators[i];
+    const right = values[i + 1];
+    if (op === void 0 || right === void 0) return null;
+    if (op === "*") {
+      const last = reducedValues[reducedValues.length - 1];
+      if (last === void 0) return null;
+      reducedValues[reducedValues.length - 1] = last * right;
+    } else if (op === "/") {
+      if (right === 0) return null;
+      const last = reducedValues[reducedValues.length - 1];
+      if (last === void 0) return null;
+      reducedValues[reducedValues.length - 1] = last / right;
+    } else {
+      reducedValues.push(right);
+      reducedOps.push(op);
+    }
+  }
+  const base = reducedValues[0];
+  if (base === void 0) return null;
+  let result = base;
+  for (let i = 0; i < reducedOps.length; i++) {
+    const op = reducedOps[i];
+    const right = reducedValues[i + 1];
+    if (op === void 0 || right === void 0) return null;
+    if (op === "+") result += right;
+    else if (op === "-") result -= right;
+    else return null;
+  }
+  return Number.isFinite(result) ? result : null;
+}
+function calcTokenToPx(tokenMatch, contextFontSize) {
+  const num = Number(tokenMatch[1]);
+  if (Number.isNaN(num)) return null;
+  const unit = tokenMatch[2] ?? "";
+  if (unit === "px" || unit === "") return num;
+  if (unit === "rem") return num * 16;
+  if (unit === "em") return num * contextFontSize;
+  if (unit === "pt") return num * 1.333;
+  return null;
+}
+var MATH_FN_RE = /^(min|max|clamp)\((.+)\)$/;
+function tryEvalMathFunction(raw, contextFontSize) {
+  const match = MATH_FN_RE.exec(raw);
+  if (!match || !match[1] || !match[2]) return null;
+  const fn = match[1];
+  const inner = match[2];
+  const args = splitMathArgs(inner);
+  if (args === null) return null;
+  const values = [];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (!arg) return null;
+    const px = parsePxValue(arg.trim(), contextFontSize);
+    if (px === null) return null;
+    values.push(px);
+  }
+  if (values.length === 0) return null;
+  if (fn === "min") return Math.min(...values);
+  if (fn === "max") return Math.max(...values);
+  if (fn === "clamp") {
+    if (values.length !== 3) return null;
+    const [lo, val, hi] = values;
+    return Math.max(lo, Math.min(val, hi));
+  }
+  return null;
+}
+function splitMathArgs(inner) {
+  const args = [];
+  let depth = 0;
+  let start = 0;
+  for (let i = 0; i < inner.length; i++) {
+    const ch = inner[i];
+    if (ch === "(") depth++;
+    else if (ch === ")") {
+      if (depth > 0) depth--;
+      else return null;
+    } else if (ch === "," && depth === 0) {
+      const arg = inner.slice(start, i).trim();
+      if (arg.length === 0) return null;
+      args.push(arg);
+      start = i + 1;
+    }
+  }
+  if (depth !== 0) return null;
+  const tail = inner.slice(start).trim();
+  if (tail.length === 0) return null;
+  args.push(tail);
+  return args;
+}
 function parseUnitlessValue(raw) {
   const trimmed = raw.trim().toLowerCase();
   if (trimmed.length === 0) return null;
@@ -25810,14 +25949,16 @@ function walkAndProcess(graph, file, container, context, collector) {
       if (parentAtRule) {
         parentAtRule.rules.push(rule);
       }
-      const selectorStrings = parseSelectorList(rule.selectorText);
-      for (let j = 0; j < selectorStrings.length; j++) {
-        const selectorText = selectorStrings[j];
-        if (!selectorText) continue;
-        const selector = createSelectorEntity(graph, selectorText, rule);
-        graph.addSelector(selector);
-        rule.selectors.push(selector);
-        graph.registerRuleBySelector(selectorText, rule);
+      if (parentAtRule === null || parentAtRule.kind !== "keyframes") {
+        const selectorStrings = parseSelectorList(rule.selectorText);
+        for (let j = 0; j < selectorStrings.length; j++) {
+          const selectorText = selectorStrings[j];
+          if (!selectorText) continue;
+          const selector = createSelectorEntity(graph, selectorText, rule);
+          graph.addSelector(selector);
+          rule.selectors.push(selector);
+          graph.registerRuleBySelector(selectorText, rule);
+        }
       }
       const ruleChildren = ruleNode.nodes;
       if (ruleChildren && ruleChildren.length > 0) {
@@ -30770,6 +30911,8 @@ var layoutSignalNames = [
   "min-width",
   "min-block-size",
   "min-height",
+  "max-width",
+  "max-height",
   "aspect-ratio",
   "vertical-align",
   "display",
@@ -30788,6 +30931,7 @@ var layoutSignalNames = [
   "place-items",
   "place-self",
   "flex-direction",
+  "flex-basis",
   "grid-auto-flow",
   "appearance",
   "box-sizing",
@@ -30979,6 +31123,7 @@ var MONITORED_SHORTHAND_SET = /* @__PURE__ */ new Set([
   "border-width",
   "margin-block",
   "padding-block",
+  "padding-inline",
   "inset-block",
   "flex-flow"
 ]);
@@ -30991,6 +31136,9 @@ var LENGTH_SIGNAL_SET = /* @__PURE__ */ new Set([
   "min-width",
   "min-block-size",
   "min-height",
+  "max-width",
+  "max-height",
+  "flex-basis",
   "top",
   "bottom",
   "margin-top",
@@ -31186,7 +31334,12 @@ var DIMENSION_KEYWORD_SET = /* @__PURE__ */ new Set([
   "fit-content",
   "min-content",
   "max-content",
-  "stretch"
+  "stretch",
+  "inherit",
+  "initial",
+  "unset",
+  "revert",
+  "revert-layer"
 ]);
 function parseLength(name, raw, source, guard) {
   const px = parseSignedPxValue(raw);
@@ -31235,12 +31388,8 @@ function parseTranslateProperty(name, raw, source, guard) {
 }
 function hasDynamicExpression(raw) {
   if (raw.includes("var(")) return true;
-  if (raw.includes("calc(")) return true;
   if (raw.includes("env(")) return true;
   if (raw.includes("attr(")) return true;
-  if (raw.includes("min(")) return true;
-  if (raw.includes("max(")) return true;
-  if (raw.includes("clamp(")) return true;
   return false;
 }
 function createKnown(name, normalized, source, guard, px, unit, quality) {
@@ -32349,23 +32498,44 @@ function collectCSSScopeBySolidFile(solids, css, moduleResolver) {
       if (!imp) continue;
       if (imp.isTypeOnly) continue;
       const resolvedCssPath = resolver.resolveCss(solid.file, imp.source);
-      if (resolvedCssPath === null) continue;
-      const transitiveScope = getOrCollectTransitiveScope(
-        resolvedCssPath,
-        resolver,
-        cssFilesByNormalizedPath,
-        transitiveScopeByEntryPath
-      );
-      for (let k = 0; k < transitiveScope.length; k++) {
-        const ts137 = transitiveScope[k];
-        if (!ts137) continue;
-        scope.add(ts137);
+      if (resolvedCssPath !== null) {
+        const transitiveScope = getOrCollectTransitiveScope(
+          resolvedCssPath,
+          resolver,
+          cssFilesByNormalizedPath,
+          transitiveScopeByEntryPath
+        );
+        for (let k = 0; k < transitiveScope.length; k++) {
+          const ts137 = transitiveScope[k];
+          if (!ts137) continue;
+          scope.add(ts137);
+        }
+        if (imp.specifiers.length === 0) {
+          for (let k = 0; k < transitiveScope.length; k++) {
+            const ts137 = transitiveScope[k];
+            if (!ts137) continue;
+            globalSideEffectScope.add(ts137);
+          }
+        }
       }
-      if (imp.specifiers.length !== 0) continue;
-      for (let k = 0; k < transitiveScope.length; k++) {
-        const ts137 = transitiveScope[k];
-        if (!ts137) continue;
-        globalSideEffectScope.add(ts137);
+      if (imp.specifiers.length !== 0) {
+        const resolvedSolidPath = resolver.resolveSolid(solid.file, imp.source);
+        if (resolvedSolidPath !== null) {
+          const componentCssPath = resolveColocatedCss(resolvedSolidPath, cssFilesByNormalizedPath);
+          if (componentCssPath !== null) {
+            const componentCssScope = getOrCollectTransitiveScope(
+              componentCssPath,
+              resolver,
+              cssFilesByNormalizedPath,
+              transitiveScopeByEntryPath
+            );
+            for (let k = 0; k < componentCssScope.length; k++) {
+              const cs = componentCssScope[k];
+              if (!cs) continue;
+              scope.add(cs);
+            }
+          }
+        }
       }
     }
     localScopeBySolidFile.set(solid.file, scope);
@@ -32587,6 +32757,7 @@ var import_node_fs5 = require("fs");
 var import_node_path4 = require("path");
 var import_typescript126 = __toESM(require("typescript"), 1);
 var EMPTY_ATTRIBUTES = /* @__PURE__ */ new Map();
+var EMPTY_PROP_BINDINGS = /* @__PURE__ */ new Map();
 var TRANSPARENT_SOLID_PRIMITIVES = /* @__PURE__ */ new Set([
   "For",
   "Index",
@@ -32655,9 +32826,10 @@ function createLayoutComponentHostResolver(solids, moduleResolver, logger = noop
     const staticAttributes = innerHost !== null ? mergeStaticAttributes(entry.staticAttributes, innerHost.descriptor.staticAttributes) : entry.staticAttributes;
     const staticClassTokens = innerHost !== null ? mergeStaticClassTokens(entry.staticClassTokens, innerHost.descriptor.staticClassTokens) : entry.staticClassTokens;
     const forwardsChildren = entry.forwardsChildren || innerHost !== null && innerHost.descriptor.forwardsChildren;
+    const attributePropBindings = innerHost !== null ? mergePropBindings(entry.attributePropBindings, innerHost.descriptor.attributePropBindings) : entry.attributePropBindings;
     if (logger.isLevelEnabled(Level.Trace)) logger.trace(`[component-host]   resolved: tagName=${tagName}, attrs=[${[...staticAttributes.keys()]}], classes=[${staticClassTokens}]`);
     return {
-      descriptor: { tagName, staticAttributes, staticClassTokens, forwardsChildren },
+      descriptor: { tagName, staticAttributes, staticClassTokens, forwardsChildren, attributePropBindings },
       hostElementRef: innerHost?.hostElementRef ?? null
     };
   }
@@ -33084,7 +33256,8 @@ function resolveHostEntryFromJSXElement(graph, node) {
         tagName: element.tagName,
         staticAttributes: collectStaticAttributes(element),
         staticClassTokens: getStaticClassTokensForElementEntity(graph, element),
-        forwardsChildren: detectChildrenForwarding(element)
+        forwardsChildren: detectChildrenForwarding(element),
+        attributePropBindings: collectAttributePropBindings(element)
       },
       hostElementRef: { solid: graph, element }
     };
@@ -33099,7 +33272,8 @@ function resolveHostEntryFromJSXElement(graph, node) {
     filePath: graph.file,
     staticAttributes: collectStaticAttributes(element),
     staticClassTokens: getStaticClassTokensForElementEntity(graph, element),
-    forwardsChildren: detectChildrenForwarding(element)
+    forwardsChildren: detectChildrenForwarding(element),
+    attributePropBindings: collectAttributePropBindings(element)
   };
 }
 function isContextProviderTag(tag) {
@@ -33287,6 +33461,41 @@ function collectStaticAttributes(element) {
   if (out === null) return EMPTY_ATTRIBUTES;
   return out;
 }
+function extractPropMemberName(node) {
+  if (!import_typescript126.default.isJsxExpression(node)) return null;
+  const expression = node.expression;
+  if (!expression) return null;
+  return extractMemberNameFromExpression(expression);
+}
+function extractMemberNameFromExpression(expression) {
+  if (import_typescript126.default.isPropertyAccessExpression(expression)) {
+    return expression.name.text;
+  }
+  if (import_typescript126.default.isCallExpression(expression) && import_typescript126.default.isPropertyAccessExpression(expression.expression) && expression.arguments.length === 0) {
+    return expression.expression.name.text;
+  }
+  if (import_typescript126.default.isBinaryExpression(expression) && expression.operatorToken.kind === import_typescript126.default.SyntaxKind.QuestionQuestionToken) {
+    return extractMemberNameFromExpression(expression.left);
+  }
+  return null;
+}
+function collectAttributePropBindings(element) {
+  let out = null;
+  for (let i = 0; i < element.attributes.length; i++) {
+    const attribute = element.attributes[i];
+    if (!attribute) continue;
+    if (!import_typescript126.default.isJsxAttribute(attribute.node)) continue;
+    if (!attribute.name) continue;
+    if (attribute.valueNode === null) continue;
+    const propName = extractPropMemberName(attribute.valueNode);
+    if (propName === null) continue;
+    const attrName = attribute.name.toLowerCase();
+    if (out === null) out = /* @__PURE__ */ new Map();
+    out.set(attrName, propName);
+  }
+  if (out === null) return EMPTY_PROP_BINDINGS;
+  return out;
+}
 function collectTopLevelVariableInitializers(graph) {
   const out = /* @__PURE__ */ new Map();
   for (let i = 0; i < graph.variables.length; i++) {
@@ -33412,7 +33621,12 @@ function areHostDescriptorsEqual(left, right) {
   if (left.tagName !== right.tagName) return false;
   if (left.forwardsChildren !== right.forwardsChildren) return false;
   if (!areStringListsEqual(left.staticClassTokens, right.staticClassTokens)) return false;
-  return areAttributeMapsEqual(left.staticAttributes, right.staticAttributes);
+  if (!areAttributeMapsEqual(left.staticAttributes, right.staticAttributes)) return false;
+  if (left.attributePropBindings.size !== right.attributePropBindings.size) return false;
+  for (const [key, value2] of left.attributePropBindings) {
+    if (right.attributePropBindings.get(key) !== value2) return false;
+  }
+  return true;
 }
 function areComponentHostEntriesEqual(left, right) {
   if (left.resolution !== right.resolution) return false;
@@ -33455,6 +33669,18 @@ function mergeStaticAttributes(outer, inner) {
   }
   return out;
 }
+function mergePropBindings(outer, inner) {
+  if (inner.size === 0) return outer;
+  if (outer.size === 0) return inner;
+  const out = /* @__PURE__ */ new Map();
+  for (const [name, value2] of inner) {
+    out.set(name, value2);
+  }
+  for (const [name, value2] of outer) {
+    out.set(name, value2);
+  }
+  return out;
+}
 var HTML_TAG_NAMES = /* @__PURE__ */ new Set([
   "a",
   "abbr",
@@ -36270,6 +36496,9 @@ var BLOCK_EXPANSIONS = /* @__PURE__ */ new Map([
   ["padding-block", ["padding-top", "padding-bottom"]],
   ["inset-block", ["inset-block-start", "inset-block-end"]]
 ]);
+var INLINE_EXPANSIONS = /* @__PURE__ */ new Map([
+  ["padding-inline", ["padding-left", "padding-right"]]
+]);
 function expandShorthand(property, value2) {
   const quadTarget = QUAD_EXPANSIONS.get(property);
   if (quadTarget !== void 0) {
@@ -36291,6 +36520,15 @@ function expandShorthand(property, value2) {
       { name: blockTarget[1], value: parsed.end }
     ];
   }
+  const inlineTarget = INLINE_EXPANSIONS.get(property);
+  if (inlineTarget !== void 0) {
+    const parsed = parseBlockShorthand(value2);
+    if (parsed === null) return null;
+    return [
+      { name: inlineTarget[0], value: parsed.start },
+      { name: inlineTarget[1], value: parsed.end }
+    ];
+  }
   if (property === "flex-flow") {
     return expandFlexFlow(value2);
   }
@@ -36328,6 +36566,8 @@ function getShorthandLonghandNames(property) {
   if (quad !== void 0) return [...quad];
   const block = BLOCK_EXPANSIONS.get(property);
   if (block !== void 0) return [...block];
+  const inline = INLINE_EXPANSIONS.get(property);
+  if (inline !== void 0) return [...inline];
   if (property === "flex-flow") return ["flex-direction", "flex-wrap"];
   return null;
 }
@@ -36549,7 +36789,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++) {
@@ -36565,12 +36805,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) {
@@ -36581,7 +36823,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;
     }
@@ -36675,6 +36917,40 @@ function augmentCascadeWithTailwind(cascade, node, tailwind) {
     }
   }
 }
+var MAX_VAR_SUBSTITUTION_DEPTH = 10;
+function substituteVarReferences(value2, variablesByName, depth) {
+  if (depth >= MAX_VAR_SUBSTITUTION_DEPTH) return value2;
+  const refs = extractVarReferences(value2);
+  if (refs.length === 0) return value2;
+  let result = value2;
+  for (let i = refs.length - 1; i >= 0; i--) {
+    const ref = refs[i];
+    if (!ref) continue;
+    const candidates = variablesByName.get(ref.name);
+    const resolvedValue = candidates !== void 0 && candidates.length > 0 ? selectBestVariableValue(candidates) : ref.fallback;
+    if (resolvedValue === null) continue;
+    result = result.slice(0, ref.sourceIndex) + resolvedValue + result.slice(ref.sourceIndex + ref.raw.length);
+  }
+  if (result !== value2 && result.includes("var(")) {
+    return substituteVarReferences(result, variablesByName, depth + 1);
+  }
+  return result;
+}
+function selectBestVariableValue(candidates) {
+  let bestGlobal = null;
+  for (let i = 0; i < candidates.length; i++) {
+    const candidate = candidates[i];
+    if (!candidate) continue;
+    if (candidate.scope.type === "global") {
+      if (bestGlobal === null || candidate.declaration.sourceOrder > bestGlobal.declaration.sourceOrder) {
+        bestGlobal = candidate;
+      }
+    }
+  }
+  if (bestGlobal !== null) return bestGlobal.value;
+  const first = candidates[0];
+  return first ? first.value : null;
+}
 function buildCascadeMapForElement(node, edges, monitoredDeclarationsBySelectorId, tailwind) {
   const out = /* @__PURE__ */ new Map();
   const positions = /* @__PURE__ */ new Map();
@@ -37135,7 +37411,7 @@ function collectLayoutElementRecordsForSolid(solid, selectorRequirements, inline
     const classTokenSet = classTokens.length === 0 ? EMPTY_CLASS_TOKEN_SET : createClassTokenSet(classTokens);
     const inlineStyleKeys = getStaticStyleKeysForElement(solid, element.id);
     const localAttributes = selectorRequirements.needsAttributes ? collectStaticAttributes(element) : EMPTY_ATTRIBUTES2;
-    const attributes = mergeAttributes(localAttributes, meta.resolvedHost?.descriptor.staticAttributes);
+    const attributes = mergeAttributes(localAttributes, meta.resolvedHost?.descriptor.staticAttributes, meta.resolvedHost?.descriptor.attributePropBindings);
     const selectorDispatchKeys = buildSelectorDispatchKeys(attributes, classTokens);
     const inlineStyleValues = inlineStyleValuesByElementId.get(element.id) ?? EMPTY_INLINE_STYLE_VALUES;
     const textualContent = getTextualContentState(element, textContentMemo, compositionMetaByElementId, logger);
@@ -37191,7 +37467,63 @@ function collectCompositionMetaByElementId(solid, componentHostResolver) {
 function resolveHostForElement(componentHostResolver, solidFile, element) {
   if (element.tag === null) return null;
   if (element.isDomElement) return null;
-  return componentHostResolver.resolveHost(solidFile, element.tag);
+  const defaultHost = componentHostResolver.resolveHost(solidFile, element.tag);
+  const asTag = extractPolymorphicAsTag(element);
+  if (asTag !== null) {
+    const asHost = componentHostResolver.resolveHost(solidFile, asTag);
+    if (asHost !== null) return composePolymorphicHost(defaultHost, asHost);
+  }
+  return defaultHost;
+}
+function extractPolymorphicAsTag(element) {
+  for (let i = 0; i < element.attributes.length; i++) {
+    const attr = element.attributes[i];
+    if (!attr) continue;
+    if (attr.name !== "as") continue;
+    if (attr.valueNode === null) continue;
+    if (!import_typescript127.default.isJsxExpression(attr.valueNode)) continue;
+    const expression = attr.valueNode.expression;
+    if (!expression) continue;
+    if (import_typescript127.default.isIdentifier(expression)) return expression.text;
+    if (import_typescript127.default.isPropertyAccessExpression(expression)) return expression.getText();
+    return null;
+  }
+  return null;
+}
+function composePolymorphicHost(outerHost, asHost) {
+  if (outerHost === null) return asHost;
+  const outerDesc = outerHost.descriptor;
+  const asDesc = asHost.descriptor;
+  const staticAttributes = /* @__PURE__ */ new Map();
+  for (const [name, value2] of outerDesc.staticAttributes) staticAttributes.set(name, value2);
+  for (const [name, value2] of asDesc.staticAttributes) staticAttributes.set(name, value2);
+  const classTokenSet = /* @__PURE__ */ new Set();
+  const staticClassTokens = [];
+  for (const token of outerDesc.staticClassTokens) {
+    if (!classTokenSet.has(token)) {
+      classTokenSet.add(token);
+      staticClassTokens.push(token);
+    }
+  }
+  for (const token of asDesc.staticClassTokens) {
+    if (!classTokenSet.has(token)) {
+      classTokenSet.add(token);
+      staticClassTokens.push(token);
+    }
+  }
+  const attributePropBindings = /* @__PURE__ */ new Map();
+  for (const [name, value2] of outerDesc.attributePropBindings) attributePropBindings.set(name, value2);
+  for (const [name, value2] of asDesc.attributePropBindings) attributePropBindings.set(name, value2);
+  return {
+    descriptor: {
+      tagName: asDesc.tagName ?? outerDesc.tagName,
+      staticAttributes,
+      staticClassTokens,
+      forwardsChildren: asDesc.forwardsChildren || outerDesc.forwardsChildren,
+      attributePropBindings
+    },
+    hostElementRef: asHost.hostElementRef ?? outerHost.hostElementRef
+  };
 }
 function resolveTransparentPrimitiveStatus(componentHostResolver, solidFile, element, resolvedHost) {
   if (element.tag === null) return false;
@@ -37234,11 +37566,21 @@ function mergeClassTokens(localTokens, hostTokens) {
   }
   return out;
 }
-function mergeAttributes(localAttributes, hostAttributes) {
+function mergeAttributes(localAttributes, hostAttributes, propBindings) {
   if (hostAttributes === void 0 || hostAttributes.size === 0) return localAttributes;
-  if (localAttributes.size === 0) return hostAttributes;
+  if (localAttributes.size === 0 && (propBindings === void 0 || propBindings.size === 0)) return hostAttributes;
   const out = /* @__PURE__ */ new Map();
   for (const [name, value2] of hostAttributes) {
+    if (propBindings !== void 0) {
+      const propName = propBindings.get(name);
+      if (propName !== void 0) {
+        const callSiteValue = localAttributes.get(propName);
+        if (callSiteValue !== void 0 && callSiteValue !== null) {
+          out.set(name, callSiteValue);
+          continue;
+        }
+      }
+    }
     out.set(name, value2);
   }
   for (const [name, value2] of localAttributes) {
@@ -37305,7 +37647,7 @@ function resolveSiblingTypeCount(totalsByParentId, parentElementId, tagName, sib
 // src/cross-file/layout/build.ts
 var EMPTY_NUMBER_LIST2 = [];
 var EMPTY_EDGE_LIST = Object.freeze([]);
-var NON_RESERVING_DIMENSION_KEYWORDS = /* @__PURE__ */ new Set(["auto", "none", "fit-content", "min-content", "max-content", "stretch"]);
+var NON_RESERVING_DIMENSION_KEYWORDS = /* @__PURE__ */ new Set(["auto", "none", "fit-content", "min-content", "max-content", "stretch", "inherit", "initial", "unset", "revert", "revert-layer"]);
 var BLOCK_LEVEL_DISPLAY_VALUES = /* @__PURE__ */ new Set(["block", "flex", "grid", "table", "list-item", "flow-root", "table-row", "table-cell", "table-caption", "table-row-group", "table-header-group", "table-footer-group", "table-column", "table-column-group"]);
 function buildLayoutGraph(solids, css, logger = noopLogger) {
   const perf = createLayoutPerfStats();
@@ -37335,7 +37677,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);
@@ -37888,7 +38231,7 @@ function computeReservedSpaceFact(snapshot) {
     hasContainIntrinsicSize: hasContainIntrinsic,
     hasUsableAspectRatio: hasAspectRatio,
     hasDeclaredBlockDimension: hasHeight || hasBlockSize || hasMinHeight || hasMinBlockSize,
-    hasDeclaredInlineDimension: hasDeclaredDimension(snapshot, "width") || hasDeclaredDimension(snapshot, "inline-size") || hasDeclaredDimension(snapshot, "min-width") || isBlockLevelDisplay(snapshot)
+    hasDeclaredInlineDimension: hasDeclaredDimension(snapshot, "width") || hasDeclaredDimension(snapshot, "inline-size") || hasDeclaredDimension(snapshot, "min-width") || hasDeclaredDimension(snapshot, "flex-basis") || isBlockLevelDisplay(snapshot)
   };
 }
 function hasDeclaredDimension(snapshot, property) {
@@ -41038,6 +41381,9 @@ function isVisuallyHidden(snapshot) {
   const opacityAttr = node.inlineStyleValues.get("opacity");
   if (opacityAttr === "0") return true;
   if (node.classTokenSet.has("opacity-0")) return true;
+  const width = readKnownPx(snapshot, "width");
+  const height = readKnownPx(snapshot, "height");
+  if (width === 1 && height === 1) return true;
   return false;
 }
 var jsxLayoutPolicyTouchTarget = defineCrossRule({
@@ -41089,6 +41435,18 @@ var jsxLayoutPolicyTouchTarget = defineCrossRule({
         tag,
         policyName
       );
+      checkDimension(
+        snapshot,
+        "max-height",
+        kind === "button" ? policy.minButtonHeight : policy.minInputHeight,
+        layout,
+        node,
+        emit,
+        "heightTooSmall",
+        messages161.heightTooSmall,
+        tag,
+        policyName
+      );
       checkDimension(
         snapshot,
         "width",
@@ -41113,6 +41471,18 @@ var jsxLayoutPolicyTouchTarget = defineCrossRule({
         tag,
         policyName
       );
+      checkDimension(
+        snapshot,
+        "max-width",
+        kind === "button" ? policy.minButtonWidth : policy.minTouchTarget,
+        layout,
+        node,
+        emit,
+        "widthTooSmall",
+        messages161.widthTooSmall,
+        tag,
+        policyName
+      );
       if (kind === "button") {
         checkDimension(
           snapshot,
@@ -41170,7 +41540,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(
@@ -41190,6 +41566,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 = [