praxis-kit 5.0.0 → 6.1.0

package/dist/lit/index.js

@@ -313,6 +313,19 @@ function makeResolveTag(defaultTag) {
   };
 }
 
+// ../../lib/primitive/src/rule/rule-brand.ts
+var RULE_BRAND = /* @__PURE__ */ Symbol("praxis-kit/dynamic-rule");
+
+// ../../lib/primitive/src/rule/is-dynamic-rule.ts
+function isDynamicRule(rule) {
+  return isObject(rule, true) && rule[RULE_BRAND] === true;
+}
+
+// ../../lib/primitive/src/rule/resolve-rule.ts
+function resolveRule(rule, context) {
+  return isDynamicRule(rule) ? rule.resolve(context) : rule;
+}
+
 // ../../lib/primitive/src/utils/assert-never.ts
 function assertNever(value) {
   throw new Error(`Unexpected value: ${String(value)}`);
@@ -494,6 +507,45 @@ var iterate = Object.freeze({
   values
 });
 
+// ../../lib/primitive/src/utils/lru-cache.ts
+var LRUCache = class {
+  #maxSize;
+  #store = /* @__PURE__ */ new Map();
+  constructor(maxSize) {
+    if (!Number.isInteger(maxSize) || maxSize < 1) {
+      throw new RangeError("LRUCache maxSize must be a positive integer.");
+    }
+    this.#maxSize = maxSize;
+  }
+  get(key) {
+    if (!this.#store.has(key)) return void 0;
+    const value = this.#store.get(key);
+    this.#store.delete(key);
+    this.#store.set(key, value);
+    return value;
+  }
+  set(key, value) {
+    this.#store.delete(key);
+    this.#store.set(key, value);
+    if (this.#store.size > this.#maxSize) {
+      const lru = this.#store.keys().next().value;
+      if (lru !== void 0) this.#store.delete(lru);
+    }
+  }
+  has(key) {
+    return this.#store.has(key);
+  }
+  delete(key) {
+    return this.#store.delete(key);
+  }
+  get size() {
+    return this.#store.size;
+  }
+  clear() {
+    this.#store.clear();
+  }
+};
+
 // ../../lib/primitive/src/utils/merge-props.ts
 function mergeProps(defaultProps, props) {
   return {
@@ -538,28 +590,6 @@ function isTag(...args) {
   return tag !== void 0 && set2.has(tag);
 }
 
-// ../../lib/contract/src/strict/invariant-base.ts
-var InvariantBase = class {
-  diagnostics;
-  constructor(diagnostics) {
-    this.diagnostics = diagnostics;
-  }
-  get active() {
-    return this.diagnostics.active;
-  }
-  violate(input) {
-    this.diagnostics.error(input);
-  }
-  // Always caps at warn — never throws. ARIA 'warning' violations route here
-  // so they surface even in strict='throw' mode without aborting a render.
-  warn(input) {
-    this.diagnostics.warn(input);
-  }
-  invariant(condition, input) {
-    if (!condition) this.violate(input);
-  }
-};
-
 // ../../lib/contract/src/diagnostics/aria.ts
 import { DiagnosticCategory, DiagnosticCode } from "../_shared/diagnostics.js";
 var AriaDiagnostics = {
@@ -870,6 +900,28 @@ var HtmlDiagnostics = {
   }
 };
 
+// ../../lib/contract/src/strict/invariant-base.ts
+var InvariantBase = class {
+  diagnostics;
+  constructor(diagnostics) {
+    this.diagnostics = diagnostics;
+  }
+  get active() {
+    return this.diagnostics.active;
+  }
+  violate(input) {
+    this.diagnostics.error(input);
+  }
+  // Always caps at warn — never throws. ARIA 'warning' violations route here
+  // so they surface even in strict='throw' mode without aborting a render.
+  warn(input) {
+    this.diagnostics.warn(input);
+  }
+  invariant(condition, input) {
+    if (!condition) this.violate(input);
+  }
+};
+
 // ../../lib/contract/src/aria/polymorphic-validator.ts
 var VALID = [{ valid: true }];
 function isIntrinsicTag(tag) {
@@ -881,8 +933,7 @@ function omitProp(obj, key) {
 }
 var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   #extraRules;
-  #planCache = /* @__PURE__ */ new Map();
-  static #MAX_CACHE = 100;
+  #planCache = new LRUCache(100);
   // Memoized AriaFix objects keyed by attribute name — the ARIA attribute set is
   // finite so this Map is bounded and avoids recreating closures on every cache miss.
   static #removeAttributeFixCache = /* @__PURE__ */ new Map();
@@ -1038,8 +1089,6 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (!isNull(key)) {
       const cached = this.#planCache.get(key);
       if (cached !== void 0) {
-        this.#planCache.delete(key);
-        this.#planCache.set(key, cached);
         if (cached.violations.length > 0) this.report(cached.violations);
         return {
           props: _AriaPolicyEngine.#applyPlan(props, cached.removals, cached.updates),
@@ -1056,10 +1105,6 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       );
       const plan = { removals, updates, violations: result.violations };
       this.#planCache.set(key, plan);
-      if (this.#planCache.size > _AriaPolicyEngine.#MAX_CACHE) {
-        const lru = this.#planCache.keys().next().value;
-        if (lru !== void 0) this.#planCache.delete(lru);
-      }
     }
     return result;
   }
@@ -1715,10 +1760,22 @@ var RuleValidator = class _RuleValidator extends InvariantBase {
 
 // ../../lib/contract/src/children/children-evaluator.ts
 var isTextLike = (child) => isString(child) || isNumber(child);
+function checkPositionCardinalityInvariant(rules, context) {
+  iterate.forEach(rules, (rule) => {
+    const { name, position, cardinality } = rule;
+    if ((position === "first" || position === "last") && (cardinality.kind === "unbounded" || cardinality.max > 1)) {
+      throw new RangeError(
+        `ChildrenEvaluator [${context}]: rule "${name}" sets position="${position}" with an unbound or >1 max. position="first|last" implies max=1.`
+      );
+    }
+  });
+}
 var ChildrenEvaluator = class extends InvariantBase {
   #context;
-  #rules;
-  #ruleNames;
+  /** Rules with a static cardinality — normalized once, reused on every evaluate() call. */
+  #staticRules;
+  /** Rules whose cardinality is `dynamic(...)` — re-resolved against a ChildRuleContext per call. */
+  #dynamicRuleInputs;
   #matcher;
   #ruleValidator;
   #exclusiveChildren;
@@ -1726,29 +1783,39 @@ var ChildrenEvaluator = class extends InvariantBase {
   constructor(rules, diagnostics, context = "Component", options = {}) {
     super(diagnostics);
     this.#context = context;
-    this.#rules = rules.map((r) => normalizeChildRule(r));
-    this.#ruleNames = this.#rules.map((r) => r.name);
     this.#exclusiveChildren = options.exclusiveChildren ?? false;
     this.#allowText = options.allowText ?? true;
-    iterate.forEach(this.#rules, (rule) => {
-      const { name, position, cardinality } = rule;
-      if ((position === "first" || position === "last") && (cardinality.kind === "unbounded" || cardinality.max > 1)) {
-        throw new RangeError(
-          `ChildrenEvaluator [${context}]: rule "${name}" sets position="${position}" with an unbound or >1 max. position="first|last" implies max=1.`
-        );
-      }
+    const staticRuleInputs = [];
+    const dynamicRuleInputs = [];
+    iterate.forEach(rules, (rule) => {
+      if (isDynamicRule(rule.cardinality)) dynamicRuleInputs.push(rule);
+      else staticRuleInputs.push(rule);
     });
-    this.#matcher = new RuleMatcher(this.#rules);
+    this.#dynamicRuleInputs = dynamicRuleInputs;
+    this.#staticRules = staticRuleInputs.map(
+      (r) => normalizeChildRule(r)
+    );
     this.#ruleValidator = new RuleValidator(context, diagnostics);
+    if (this.#dynamicRuleInputs.length === 0) {
+      checkPositionCardinalityInvariant(this.#staticRules, context);
+      this.#matcher = new RuleMatcher(this.#staticRules);
+    } else {
+      this.#matcher = void 0;
+    }
   }
-  evaluate(children) {
+  /**
+   * @param context Required when any rule has a `dynamic(...)` cardinality —
+   *   supplies the resolved tag/props those rules are evaluated against.
+   */
+  evaluate(children, context) {
     if (!this.active) return;
+    const { rules, matcher } = this.#resolveRules(context);
     const {
       matrix,
       unexpectedIndices: rawUnexpectedIndices,
       ambiguousIndices
-    } = this.#matcher.match(children);
-    this.#ruleValidator.validate(this.#rules, matrix, children.length);
+    } = matcher.match(children);
+    this.#ruleValidator.validate(rules, matrix, children.length);
     const unexpectedIndices = new Set(
       [...rawUnexpectedIndices].filter(
         (ci) => isTextLike(children[ci]) ? this.#allowText === false : this.#exclusiveChildren
@@ -1762,11 +1829,28 @@ var ChildrenEvaluator = class extends InvariantBase {
         this.violate(ContractDiagnostics.unexpectedChild(typeName, ci, this.#context));
       } else {
         const matches = matrix.childToRules.forward.get(ci);
-        const names = [...matches].map((ri) => this.#ruleNames[ri] ?? `#${ri}`);
+        const names = [...matches].map((ri) => rules[ri]?.name ?? `#${ri}`);
         this.violate(ContractDiagnostics.ambiguousChild(typeName, ci, names, this.#context));
       }
     });
   }
+  #resolveRules(context) {
+    if (this.#dynamicRuleInputs.length === 0) {
+      return { rules: this.#staticRules, matcher: this.#matcher };
+    }
+    if (context === void 0) {
+      throw new RangeError(
+        `ChildrenEvaluator [${this.#context}]: rule(s) have a dynamic(...) cardinality \u2014 evaluate() requires a context argument to resolve them.`
+      );
+    }
+    const resolvedDynamicRules = this.#dynamicRuleInputs.map((r) => {
+      const cardinality = resolveRule(r.cardinality, context);
+      return normalizeChildRule({ ...r, cardinality });
+    });
+    checkPositionCardinalityInvariant(resolvedDynamicRules, this.#context);
+    const rules = [...this.#staticRules, ...resolvedDynamicRules];
+    return { rules, matcher: new RuleMatcher(rules) };
+  }
 };
 
 // ../../lib/contract/src/props/get-disabled-props.ts
@@ -2095,7 +2179,7 @@ function cva2(base, config) {
 // ../../lib/styling/src/static-class-resolver.ts
 var StaticClassResolver = class {
   #baseClass;
-  #cache = /* @__PURE__ */ new Map();
+  #cache = new LRUCache(200);
   #resolveTag;
   constructor(baseClass, tagMap) {
     this.#baseClass = Array.isArray(baseClass) ? baseClass.join(" ") : baseClass;
@@ -2109,17 +2193,9 @@ var StaticClassResolver = class {
   resolve(tag, skipTagMap = false) {
     if (typeof tag !== "string" || skipTagMap) return this.#baseClass;
     const cached = this.#cache.get(tag);
-    if (cached !== void 0) {
-      this.#cache.delete(tag);
-      this.#cache.set(tag, cached);
-      return cached;
-    }
+    if (cached !== void 0) return cached;
     const result = this.#resolveTag(tag);
     this.#cache.set(tag, result);
-    if (this.#cache.size > 200) {
-      const lru = this.#cache.keys().next().value;
-      if (lru !== void 0) this.#cache.delete(lru);
-    }
     return result;
   }
 };
@@ -2130,7 +2206,7 @@ var VariantClassResolver = class _VariantClassResolver {
   #recipeMap;
   #variantKeys;
   #precomputedClasses;
-  #cache = /* @__PURE__ */ new Map();
+  #cache = new LRUCache(1e3);
   constructor(cvaFn, recipeMap, variantKeys, precomputedClasses) {
     this.#cvaFn = cvaFn ?? null;
     this.#recipeMap = Object.freeze(recipeMap ?? {});
@@ -2145,17 +2221,9 @@ var VariantClassResolver = class _VariantClassResolver {
       if (precomputed !== void 0) return precomputed;
     }
     const cached = this.#cache.get(cacheKey);
-    if (cached !== void 0) {
-      this.#cache.delete(cacheKey);
-      this.#cache.set(cacheKey, cached);
-      return cached;
-    }
+    if (cached !== void 0) return cached;
     const result = this.#compute(props, recipe);
     this.#cache.set(cacheKey, result);
-    if (this.#cache.size > 1e3) {
-      const lru = this.#cache.keys().next().value;
-      if (lru !== void 0) this.#cache.delete(lru);
-    }
     return result;
   }
   #compute(props, recipe) {
@@ -2558,13 +2626,10 @@ function toLooseBundle(bundle) {
   }
   return bundle;
 }
-function resolveHostState(bundle, props) {
-  const { as, className, recipe, ...rest } = props;
-  const { options, resolveAria, resolveClasses, resolveProps, resolveTag: resolveTag2 } = bundle.runtime;
+function resolveTagAndNormalizedProps(bundle, props) {
+  const { as, className: _className, recipe: _recipe, ...rest } = props;
+  const { options, resolveProps, resolveTag: resolveTag2 } = bundle.runtime;
   const tag = resolveTag2(as);
-  if (options.allowedAs !== void 0) {
-    enforceAllowedAs(tag, options.allowedAs, options.diagnostics, options.displayName);
-  }
   const mergedProps = resolveProps(rest);
   const normalizedProps = typeof options.normalizeFn === "function" ? options.normalizeFn(mergedProps) : mergedProps;
   const htmlNormalizers = options.htmlPropNormalizersFn?.(tag);
@@ -2574,6 +2639,15 @@ function resolveHostState(bundle, props) {
       Object.assign(finalProps, normalize(finalProps));
     }
   }
+  return { tag, normalizedProps: finalProps };
+}
+function resolveHostState(bundle, props) {
+  const { className, recipe } = props;
+  const { options, resolveAria, resolveClasses } = bundle.runtime;
+  const { tag, normalizedProps: finalProps } = resolveTagAndNormalizedProps(bundle, props);
+  if (options.allowedAs !== void 0) {
+    enforceAllowedAs(tag, options.allowedAs, options.diagnostics, options.displayName);
+  }
   const resolvedClass = resolveClasses(
     tag,
     finalProps,
@@ -2582,7 +2656,7 @@ function resolveHostState(bundle, props) {
   );
   const ariaResult = resolveAria(tag, finalProps);
   const attributes = applyFilter(ariaResult.props, bundle.filterProps, options.variantKeys);
-  return { className: resolvedClass, attributes };
+  return { className: resolvedClass, attributes, tag, normalizedProps: finalProps };
 }
 function diffAndApplyAttributes(host, state, prevPipelineAttrs, incomingProps) {
   const hasOwn2 = Object.hasOwn;
@@ -2721,7 +2795,11 @@ function createContractComponent(options) {
     get _self() {
       return this;
     }
-    _applyPraxis() {
+    // Start with all current DOM attributes so the ARIA engine sees role,
+    // aria-*, and any other pass-through attributes. Shared by render() and
+    // _applyPraxis(), which run at different points in the same update cycle
+    // and can't share a local variable.
+    _buildProps() {
       const self = this._self;
       const props = {};
       iterate.forEach(iterate.items(this.attributes), (attr) => {
@@ -2735,14 +2813,18 @@ function createContractComponent(options) {
         const val = self[key];
         if (val != null) props[key] = val;
       });
+      return props;
+    }
+    _applyPraxis() {
+      const props = this._buildProps();
       diffAndApplyAttributes(this, resolveHostState(looseBundle, props), this._pipelineAttrs, props);
     }
     render() {
       const children = Array.from(this.childNodes);
+      const { tag, normalizedProps } = resolveTagAndNormalizedProps(looseBundle, this._buildProps());
       if (bundle.childrenEvaluator) {
-        bundle.childrenEvaluator.evaluate(children);
+        bundle.childrenEvaluator.evaluate(children, { tag, props: normalizedProps });
       }
-      const tag = bundle.runtime.resolveTag(this._self.as);
       bundle.runtime.options.htmlChildrenEvaluatorFn?.(tag)?.evaluate(children);
       return html`<slot></slot>`;
     }

package/dist/preact/index.d.ts

@@ -30,6 +30,26 @@ type MinMax = {
 };
 type CardinalityInput = Partial<MinMax>;
 
+/**
+ * Resolved per-instance state available to a dynamic (`dynamic(...)`) child
+ * rule field — the same tag/props every adapter already computes before
+ * evaluating children, exposed so a rule can vary by them (e.g. cardinality
+ * that depends on the resolved `as` tag).
+ */
+type ChildRuleContext = {
+    readonly tag: unknown;
+    readonly props: Readonly<AnyRecord>;
+};
+
+declare const RULE_BRAND: unique symbol;
+
+type DynamicRule<T, C = unknown> = {
+    readonly [RULE_BRAND]: true;
+    resolve(context: C): T;
+};
+
+type Rule<T, C = unknown> = T | DynamicRule<T, C>;
+
 type ChildRuleMatch<T, U extends T = T> = (child: T) => child is U;
 
 type ChildRulePosition = 'first' | 'last' | 'any';
@@ -37,7 +57,13 @@ type ChildRulePosition = 'first' | 'last' | 'any';
 type ChildRuleInput<T = unknown, U extends T = T> = {
     name: string;
     match: ChildRuleMatch<T, U>;
-    cardinality?: CardinalityInput;
+    /**
+     * Either a static cardinality, or `dynamic((ctx) => ...)` to derive it from
+     * the resolved tag/props (e.g. a different max depending on `as`). `match`
+     * stays static-only — it's already a function, so a dynamic wrapper would
+     * be indistinguishable from the predicate itself without one.
+     */
+    cardinality?: Rule<CardinalityInput, ChildRuleContext>;
     position?: ChildRulePosition;
     /**
      * Optional component-type reference for O(1) dispatch index.