praxis-kit 6.1.0 → 6.1.1

package/dist/solid/index.js

@@ -1,7 +1,20 @@
 // ../../lib/primitive/src/guards/children/component-id.ts
 var COMPONENT_DEFAULT_TAG = /* @__PURE__ */ Symbol.for("praxis.component-default-tag");
 
-// ../../lib/primitive/src/utils/is-object.ts
+// ../../lib/primitive/src/guards/foundational/is-defined.ts
+function isUndefined(value) {
+  return value === void 0;
+}
+
+// ../../lib/primitive/src/guards/foundational/is-null.ts
+function isNull(value) {
+  return value === null;
+}
+function isNonNull(value) {
+  return value != null;
+}
+
+// ../../lib/primitive/src/utils/type-guards.ts
 function isObject(value, excludeArrays = false) {
   if (value === null || typeof value !== "object") return false;
   return excludeArrays ? !Array.isArray(value) : true;
@@ -13,16 +26,6 @@ function isNumber(value) {
   return typeof value === "number";
 }
 
-// ../../lib/primitive/src/guards/foundational/is-defined.ts
-function isUndefined(value) {
-  return value === void 0;
-}
-
-// ../../lib/primitive/src/guards/foundational/is-null.ts
-function isNull(value) {
-  return value === null;
-}
-
 // ../../lib/primitive/src/guards/children/is-tag.ts
 function getAsProp(child) {
   if (!isObject(child) || !("props" in child)) return void 0;
@@ -1065,7 +1068,7 @@ var InvariantBase = class {
 };
 
 // ../../lib/contract/src/aria/polymorphic-validator.ts
-var VALID = [{ valid: true }];
+var NO_VIOLATIONS = [{ valid: true }];
 function isIntrinsicTag(tag) {
   return isString(tag);
 }
@@ -1107,17 +1110,20 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static #deriveContext(tag, props) {
     if (!isIntrinsicTag(tag)) return { proceed: false, result: { props, violations: [] } };
     const implicitRole = getImplicitRole(tag, props);
-    const hasRole2 = implicitRole != null || isString(props.role) && props.role.length > 0;
+    const hasRole2 = isNonNull(implicitRole) || isString(props.role) && props.role.length > 0;
     if (!hasRole2) return { proceed: false, result: { props, violations: [] } };
     const normalized = _AriaPolicyEngine.#normalizeEmptyRole(tag, props);
-    if (normalized.normalized) return { proceed: false, result: normalized.result };
-    const effectiveRole = props.role ?? implicitRole;
+    const workingProps = normalized.normalized ? normalized.result.props : props;
+    const preExistingViolations = normalized.normalized ? normalized.result.violations : [];
+    const effectiveRole = workingProps.role ?? implicitRole;
     return {
       proceed: true,
       tag,
       implicitRole,
       effectiveRole,
-      context: { tag, props, implicitRole, effectiveRole }
+      props: workingProps,
+      preExistingViolations,
+      context: { tag, props: workingProps, implicitRole, effectiveRole }
     };
   }
   static #runRules(rules, context) {
@@ -1132,7 +1138,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         } = context;
         const { message, attribute, severity } = result;
         const resolvedMessage = message ?? result.diagnostic?.message;
-        const fallbackDiag = resolvedMessage == null ? AriaDiagnostics.invalidRole(role, tag) : void 0;
+        const fallbackDiag = isNonNull(resolvedMessage) ? void 0 : AriaDiagnostics.invalidRole(role, tag);
         violations.push({
           message: resolvedMessage ?? fallbackDiag.message,
           tag,
@@ -1140,8 +1146,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
           attribute,
           severity,
           phase: "evaluate",
-          ...result.diagnostic != null && { diagnostic: result.diagnostic },
-          ...fallbackDiag != null && { diagnostic: fallbackDiag }
+          ...isNonNull(result.diagnostic) && { diagnostic: result.diagnostic },
+          ...isNonNull(fallbackDiag) && { diagnostic: fallbackDiag }
         });
         if (result.fixable) fixes.push(result.fix);
       });
@@ -1149,7 +1155,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     return { violations, fixes };
   }
   static #getRules(context) {
-    if (_AriaPolicyEngine.#hasRole(context.props) || context.effectiveRole != null && _AriaPolicyEngine.#LIVE_REGION_ROLES.has(context.effectiveRole)) {
+    if (_AriaPolicyEngine.#hasRole(context.props) || isNonNull(context.effectiveRole) && _AriaPolicyEngine.#LIVE_REGION_ROLES.has(context.effectiveRole)) {
       return _AriaPolicyEngine.#pipeline;
     }
     return _AriaPolicyEngine.#implicitOnlyRules;
@@ -1157,24 +1163,36 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static evaluate(tag, props) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
-    const { tag: narrowedTag, implicitRole, context } = derived;
+    const {
+      tag: narrowedTag,
+      implicitRole,
+      context,
+      props: workingProps,
+      preExistingViolations
+    } = derived;
     const { violations, fixes } = _AriaPolicyEngine.#runRules(
       _AriaPolicyEngine.#getRules(context),
       context
     );
-    const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, props, fixes);
-    return { props: next, violations };
+    const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
+    return { props: next, violations: [...preExistingViolations, ...violations] };
   }
   static #evaluateWithRules(tag, props, extraRules) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
-    const { tag: narrowedTag, implicitRole, context } = derived;
+    const {
+      tag: narrowedTag,
+      implicitRole,
+      context,
+      props: workingProps,
+      preExistingViolations
+    } = derived;
     const { violations, fixes } = _AriaPolicyEngine.#runRules(
       [..._AriaPolicyEngine.#getRules(context), ...extraRules],
       context
     );
-    const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, props, fixes);
-    return { props: next, violations };
+    const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
+    return { props: next, violations: [...preExistingViolations, ...violations] };
   }
   report(violations) {
     iterate.forEach(violations, (v) => {
@@ -1183,12 +1201,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       else this.warn(d);
     });
   }
-  // Cache key covers only the aria-relevant subset of props (tag + role + aria-* attrs).
-  // Non-aria props (className, onClick, etc.) do not affect ARIA decisions and are excluded
-  // so cache hits survive re-renders that only change non-aria props.
-  // Note: #extraRules are NOT included in the key — each engine instance has its own Map,
-  // so two engines with different rules never share cache entries. If caching ever becomes
-  // static/shared, rule identity would need to be folded into the key.
+  // Cache key covers only the aria-relevant subset of props (tag + role + aria-* attrs) —
+  // exactly what the built-in pipeline reads. Non-aria props (className, onClick, etc.) do
+  // not affect built-in ARIA decisions and are excluded so cache hits survive re-renders
+  // that only change non-aria props. This key alone is unsound for #extraRules, which may
+  // read arbitrary props outside this set — validate() extends it with #extraRulesKeySuffix,
+  // or bypasses the cache, to account for that.
   static #createPlanKey(tag, props) {
     if (!isIntrinsicTag(tag)) return null;
     const parts = [tag];
@@ -1204,6 +1222,23 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (ariaEntries.length > 0) parts.push(...ariaEntries.sort());
     return parts.join("|");
   }
+  // Extends the base cache key with the props each extra rule declares it reads (`readsProps`).
+  // Returns null — meaning "don't cache" — if any extra rule omits `readsProps` (it may read
+  // arbitrary props the key can't account for) or if a declared prop's value isn't a primitive
+  // (object/array identity isn't stably representable in a string key).
+  static #extraRulesKeySuffix(extraRules, props) {
+    const parts = [];
+    for (const rule of extraRules) {
+      const readsProps = rule.readsProps;
+      if (!isNonNull(readsProps)) return null;
+      for (const propKey of readsProps) {
+        const v = props[propKey];
+        if (v !== void 0 && !isString(v) && !isNumber(v) && typeof v !== "boolean") return null;
+        parts.push(`x:${propKey}:${String(v)}`);
+      }
+    }
+    return parts.sort().join("|");
+  }
   static #computePlan(inputProps, resultProps) {
     const removals = /* @__PURE__ */ new Set();
     const updates = {};
@@ -1227,7 +1262,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     return next;
   }
   validate(tag, props) {
-    const key = _AriaPolicyEngine.#createPlanKey(tag, props);
+    const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
+    let key = baseKey;
+    if (this.#extraRules.length > 0) {
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
+    }
     if (!isNull(key)) {
       const cached = this.#planCache.get(key);
       if (cached !== void 0) {
@@ -1317,7 +1357,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     implicitRole
   }) {
     const role = props.role;
-    if (!implicitRole || !role || role === implicitRole) return VALID;
+    if (!implicitRole || !role || role === implicitRole) return NO_VIOLATIONS;
     if (isStrongImplicitRole(tag) && role === "region") {
       return [
         {
@@ -1329,11 +1369,11 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         }
       ];
     }
-    return VALID;
+    return NO_VIOLATIONS;
   }
   static #checkRedundantRole({ tag, props, implicitRole }) {
     const role = props.role;
-    if (!implicitRole || !role || role !== implicitRole) return VALID;
+    if (!implicitRole || !role || role !== implicitRole) return NO_VIOLATIONS;
     return [
       {
         valid: false,
@@ -1346,8 +1386,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   }
   static #checkStandaloneRegion({ tag, props, implicitRole }) {
     const role = props.role;
-    if (role !== "region") return VALID;
-    if (!isStandaloneTag(tag)) return VALID;
+    if (role !== "region") return NO_VIOLATIONS;
+    if (!isStandaloneTag(tag)) return NO_VIOLATIONS;
     return [
       {
         valid: false,
@@ -1363,7 +1403,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     props,
     effectiveRole
   }) {
-    if (effectiveRole === "none" || effectiveRole === "presentation") return VALID;
+    if (effectiveRole === "none" || effectiveRole === "presentation") return NO_VIOLATIONS;
     const results = [];
     iterate.forEachEntry(props, (key) => {
       if (!key.startsWith("aria-")) return;
@@ -1481,12 +1521,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     }
   }
   static #checkAriaAttributeValues({ props, effectiveRole }) {
-    if (effectiveRole === "none" || effectiveRole === "presentation") return VALID;
+    if (effectiveRole === "none" || effectiveRole === "presentation") return NO_VIOLATIONS;
     const results = [];
     iterate.forEachEntry(props, (key, value) => {
       if (!key.startsWith("aria-")) return;
       const type = _AriaPolicyEngine.#ARIA_VALUE_TYPES.get(key);
-      if (type == null) return;
+      if (!isNonNull(type)) return;
       if (_AriaPolicyEngine.#isValidAriaValue(value, type)) return;
       results.push({
         valid: false,
@@ -1517,13 +1557,13 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     props,
     effectiveRole
   }) {
-    if (effectiveRole === "none" || effectiveRole === "presentation") return VALID;
+    if (effectiveRole === "none" || effectiveRole === "presentation") return NO_VIOLATIONS;
     const implicitLevel = _AriaPolicyEngine.#HEADING_IMPLICIT_LEVELS.get(tag);
-    if (implicitLevel == null) return VALID;
+    if (!isNonNull(implicitLevel)) return NO_VIOLATIONS;
     const raw = props["aria-level"];
-    if (raw == null) return VALID;
+    if (!isNonNull(raw)) return NO_VIOLATIONS;
     const n = typeof raw === "number" ? raw : typeof raw === "string" ? parseInt(raw, 10) : NaN;
-    if (!Number.isFinite(n) || n !== implicitLevel) return VALID;
+    if (!Number.isFinite(n) || n !== implicitLevel) return NO_VIOLATIONS;
     return [
       {
         valid: false,
@@ -1546,9 +1586,10 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     props,
     effectiveRole
   }) {
-    if (!effectiveRole || !_AriaPolicyEngine.#NAME_REQUIRED_ROLES.has(effectiveRole)) return VALID;
-    if ("aria-label" in props || "aria-labelledby" in props) return VALID;
-    if (tag === "img" && typeof props.alt === "string" && props.alt.length > 0) return VALID;
+    if (!effectiveRole || !_AriaPolicyEngine.#NAME_REQUIRED_ROLES.has(effectiveRole))
+      return NO_VIOLATIONS;
+    if ("aria-label" in props || "aria-labelledby" in props) return NO_VIOLATIONS;
+    if (tag === "img" && typeof props.alt === "string" && props.alt.length > 0) return NO_VIOLATIONS;
     return [
       {
         valid: false,
@@ -1571,9 +1612,9 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     props,
     effectiveRole
   }) {
-    if (!effectiveRole) return VALID;
+    if (!effectiveRole) return NO_VIOLATIONS;
     const required = _AriaPolicyEngine.#REQUIRED_PROPERTIES.get(effectiveRole);
-    if (required == null) return VALID;
+    if (!isNonNull(required)) return NO_VIOLATIONS;
     const results = [];
     iterate.forEach(required, (attr) => {
       if (attr in props) return;
@@ -1597,12 +1638,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   ]);
   // WAI-ARIA 1.2 §6.6: aria-hidden="true" must not be placed on focusable elements.
   static #checkAriaHiddenOnFocusable({ tag, props }) {
-    if (props["aria-hidden"] !== "true" && props["aria-hidden"] !== true) return VALID;
+    if (props["aria-hidden"] !== "true" && props["aria-hidden"] !== true) return NO_VIOLATIONS;
     const isInteractive = _AriaPolicyEngine.#INTERACTIVE_TAGS.has(tag);
     if (!isInteractive) {
       const tabindex = props.tabindex;
       const n = typeof tabindex === "number" ? tabindex : typeof tabindex === "string" ? parseInt(tabindex, 10) : NaN;
-      if (!Number.isFinite(n) || n < 0) return VALID;
+      if (!Number.isFinite(n) || n < 0) return NO_VIOLATIONS;
     }
     return [
       {
@@ -1621,7 +1662,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     props,
     effectiveRole
   }) {
-    if (effectiveRole !== "none" && effectiveRole !== "presentation") return VALID;
+    if (effectiveRole !== "none" && effectiveRole !== "presentation") return NO_VIOLATIONS;
     const results = [];
     iterate.forEachEntry(props, (key) => {
       if (!key.startsWith("aria-")) return;
@@ -1645,10 +1686,10 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     ["timer", "off"]
   ]);
   static #checkMissingLiveRegion({ effectiveRole, props }) {
-    if (!effectiveRole) return VALID;
+    if (!effectiveRole) return NO_VIOLATIONS;
     const impliedLive = _AriaPolicyEngine.#LIVE_REGION_ROLES.get(effectiveRole);
-    if (!impliedLive) return VALID;
-    if ("aria-live" in props) return VALID;
+    if (!impliedLive) return NO_VIOLATIONS;
+    if ("aria-live" in props) return NO_VIOLATIONS;
     const injectLive = {
       kind: `injectLive:${effectiveRole}`,
       apply: (ctx) => ({
@@ -1668,8 +1709,9 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     ];
   }
   static #checkMissingAtomic({ effectiveRole, props }) {
-    if (!effectiveRole || !_AriaPolicyEngine.#LIVE_REGION_ROLES.has(effectiveRole)) return VALID;
-    if ("aria-atomic" in props) return VALID;
+    if (!effectiveRole || !_AriaPolicyEngine.#LIVE_REGION_ROLES.has(effectiveRole))
+      return NO_VIOLATIONS;
+    if ("aria-atomic" in props) return NO_VIOLATIONS;
     return [
       {
         valid: false,
@@ -1693,8 +1735,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   };
   static #checkInvalidAriaRelevant({ props }) {
     const relevant = props["aria-relevant"];
-    if (relevant === void 0) return VALID;
-    if (typeof relevant !== "string") return VALID;
+    if (relevant === void 0) return NO_VIOLATIONS;
+    if (typeof relevant !== "string") return NO_VIOLATIONS;
     const tokens = relevant.trim().split(/\s+/);
     const invalid = tokens.filter((t) => !_AriaPolicyEngine.#VALID_RELEVANT_TOKENS.has(t));
     if (invalid.length > 0) {
@@ -1721,7 +1763,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         }
       ];
     }
-    return VALID;
+    return NO_VIOLATIONS;
   }
 };
 
@@ -2422,7 +2464,7 @@ function createClassPipeline(resolved) {
     const staticClasses = staticResolver.resolve(tag, recipe !== void 0);
     const variantClasses = variantResolver.resolve({ props, recipe });
     if (!className)
-      return staticClasses && variantClasses ? `${staticClasses} ${variantClasses}` : staticClasses || variantClasses;
+      return (staticClasses && variantClasses ? `${staticClasses} ${variantClasses}` : staticClasses || variantClasses) || void 0;
     return cn(staticClasses, variantClasses, className);
   };
 }
@@ -2633,7 +2675,7 @@ function createPolymorphic2(options = {}) {
       if (process.env.NODE_ENV !== "production") {
         validateRenderProps(resolved.diagnostics, resolved, props, recipe);
       }
-      return classPipeline(tag, props, className, recipe);
+      return classPipeline(tag, props, className, recipe) || void 0;
     },
     resolveAria(tag, props) {
       return resolveAriaFn(tag, props);

package/dist/svelte/Polymorphic.svelte

@@ -50,7 +50,7 @@
 
   function buildDomProps(
     props: UnknownProps,
-    classStr: string,
+    classStr: string | undefined,
     tag: ElementType,
   ): ResolvedAttributes {
     const { role, style, ...r } = normalizeEventKeys(props)
@@ -67,7 +67,7 @@
     return bundle.runtime.resolveAria(tag, ep).props as ResolvedAttributes
   }
 
-  function buildSlotProps(props: UnknownProps, classStr: string): UnknownProps {
+  function buildSlotProps(props: UnknownProps, classStr: string | undefined): UnknownProps {
     const { role, ...r } = props
     return {
       ...r,

package/dist/svelte/index.d.ts

@@ -159,7 +159,7 @@ interface BaseClassOptions {
     baseClassName?: ClassName;
 }
 
-type ClassPipelineFn = (tag: unknown, props: AnyRecord, className?: ClassName, recipe?: string) => string;
+type ClassPipelineFn = (tag: unknown, props: AnyRecord, className?: ClassName, recipe?: string) => string | undefined;
 
 interface RecipeOptions<TVariants extends VariantMap = VariantMap> {
     recipeMap?: Record<string, RecipeTarget<TVariants>>;
@@ -238,7 +238,9 @@ type AriaInvalidWithoutFix<M extends string = string> = AriaInvalidBase<M> & {
 type AriaInvalidResult<M extends string = string> = AriaInvalidWithFix<M> | AriaInvalidWithoutFix<M>;
 type AriaResult = ValidResult | AriaInvalidResult;
 
-type AriaRule<C extends AriaContext = AriaContext> = (context: C) => readonly AriaResult[];
+type AriaRule<C extends AriaContext = AriaContext> = ((context: C) => readonly AriaResult[]) & {
+    readonly readsProps?: readonly string[];
+};
 
 type PropNormalizer = (props: Readonly<AnyRecord & IntrinsicProps>) => Partial<AnyRecord & IntrinsicProps>;
 
@@ -318,7 +320,7 @@ type ResolveAriaFn = <P extends IntrinsicProps>(tag: ElementType, props: P) => {
     props: P;
 };
 
-type ResolveClassNameFn<Props extends AnyRecord, TSlot extends string = never> = (tag: ElementType, props: Props, className?: ClassName, recipe?: TSlot) => string;
+type ResolveClassNameFn<Props extends AnyRecord, TSlot extends string = never> = (tag: ElementType, props: Props, className?: ClassName, recipe?: TSlot) => string | undefined;
 
 type ResolvePropsFn<Props extends AnyRecord> = <P extends Partial<Props>>(props: P) => Simplify<Omit<Props, keyof P> & P>;