praxis-kit 7.8.0 → 7.8.1

package/dist/{chunk-QYP7KLRE.js → chunk-CCWOPNX2.js}

@@ -1608,7 +1608,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1618,8 +1618,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1690,11 +1694,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1707,7 +1717,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3598,10 +3608,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3686,8 +3696,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };
@@ -4047,7 +4057,7 @@ function buildElementProps(props, className, ref, children) {
 }
 function renderIntrinsic(state, ref, runtime) {
   const elementProps = buildElementProps(state.props, state.className, ref, state.children);
-  const domProps = typeof state.tag === "string" ? runtime.resolveAria(state.tag, elementProps).props : elementProps;
+  const domProps = typeof state.tag === "string" ? runtime.resolveAria(state.tag, elementProps, state.normalizedProps).props : elementProps;
   return createElement2(state.tag, domProps);
 }
 function render({

package/dist/lit/index.js

@@ -1430,7 +1430,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1440,8 +1440,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1512,11 +1516,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1529,7 +1539,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3420,10 +3430,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3508,8 +3518,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };

package/dist/preact/index.js

@@ -1607,7 +1607,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1617,8 +1617,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1689,11 +1693,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1706,7 +1716,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3597,10 +3607,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3685,8 +3695,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };
@@ -4009,7 +4019,7 @@ function buildElementProps(props, className, ref, children) {
 }
 function renderIntrinsic(state, ref, runtime) {
   const elementProps = buildElementProps(state.props, state.className, ref, state.children);
-  const domProps = typeof state.tag === "string" ? runtime.resolveAria(state.tag, elementProps).props : elementProps;
+  const domProps = typeof state.tag === "string" ? runtime.resolveAria(state.tag, elementProps, state.normalizedProps).props : elementProps;
   return h2(state.tag, domProps);
 }
 function render({

package/dist/react/index.js

@@ -15,7 +15,7 @@ import {
   makeCloneSlotChild,
   mergeRefs,
   render
-} from "../chunk-QYP7KLRE.js";
+} from "../chunk-CCWOPNX2.js";
 
 // ../../adapters/react/src/current/create-contract-component.ts
 import { useCallback, useRef } from "react";

package/dist/react/legacy.js

@@ -12,7 +12,7 @@ import {
   makeCloneSlotChild,
   mergeRefs,
   render
-} from "../chunk-QYP7KLRE.js";
+} from "../chunk-CCWOPNX2.js";
 
 // ../../adapters/react/src/legacy/create-contract-component.ts
 import { forwardRef as forwardRef2, useCallback, useRef } from "react";

package/dist/solid/index.js

@@ -1580,7 +1580,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1590,8 +1590,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1662,11 +1666,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1679,7 +1689,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3570,10 +3580,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3658,8 +3668,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };
@@ -3829,8 +3839,8 @@ function buildSlotProps(props, classStr, ref) {
 function resolveTag2(runtime, as) {
   return runtime.resolveTag(as);
 }
-function resolveDomProps(tag, elementProps, runtime) {
-  return isString(tag) ? runtime.resolveAria(tag, elementProps).props : elementProps;
+function resolveDomProps(tag, elementProps, runtime, normalizedProps) {
+  return isString(tag) ? runtime.resolveAria(tag, elementProps, normalizedProps).props : elementProps;
 }
 function tryRenderAsChild(known, filteredProps, resolvedClass, slotValidator) {
   if (!known.asChild) return null;
@@ -3885,7 +3895,7 @@ function render({
   if (slotResult !== null) return slotResult;
   const domProps = createMemo(() => {
     const ep = buildElementProps(filteredProps(), resolvedClass(), known.ref, known.children);
-    return resolveDomProps(tag(), ep, runtime);
+    return resolveDomProps(tag(), ep, runtime, normalizedProps());
   });
   return _$createComponent(Dynamic, _$mergeProps({
     get component() {

package/dist/svelte/Polymorphic.svelte

@@ -65,6 +65,7 @@
     props: UnknownProps,
     classStr: string | undefined,
     tag: ElementType,
+    normalizedProps: UnknownProps,
   ): ResolvedAttributes {
     const { role, style, ...r } = normalizeEventKeys(props)
     const styleStr = isObject(style, true)
@@ -77,7 +78,8 @@
     }
     if (isKnownAriaRole(role)) ep.role = role
     if (!isString(tag)) return ep as ResolvedAttributes
-    return bundle.runtime.resolveAria(tag, ep).props as ResolvedAttributes
+    return bundle.runtime.resolveAria(tag, ep, normalizedProps as IntrinsicProps)
+      .props as ResolvedAttributes
   }
 
   // Unlike buildDomProps above, this intentionally skips normalizeEventKeys and style
@@ -129,7 +131,7 @@
   const filteredProps = $derived(
     applyFilter(normalizedProps, bundle.filterProps, bundle.runtime.options.variantKeys),
   )
-  const domProps = $derived(buildDomProps(filteredProps, resolvedClass, tag))
+  const domProps = $derived(buildDomProps(filteredProps, resolvedClass, tag, normalizedProps))
 
   // Resolves whether to render as child slot; also enforces as+asChild mutual exclusion.
   const useAsChild = $derived.by(() => {

package/dist/svelte/index.d.ts

@@ -564,7 +564,7 @@ type ResolvedFactoryOptions<TDefault extends ElementType = ElementType, Props ex
     readonly precomputedClasses?: Readonly<StringMap<string>>;
 };
 
-type ResolveAriaFn = <P extends IntrinsicProps>(tag: ElementType, props: P) => {
+type ResolveAriaFn = <P extends IntrinsicProps>(tag: ElementType, props: P, extraProps?: IntrinsicProps) => {
     props: P;
 };
 
@@ -707,7 +707,7 @@ type ClassResolver = Readonly<{
     resolveClasses(tag: ElementType, props: ResolvedProps, className?: ClassName, recipe?: string): string | undefined;
 }>;
 type AriaResolver = Readonly<{
-    resolveAria<P extends IntrinsicProps>(tag: ElementType, props: P): {
+    resolveAria<P extends IntrinsicProps>(tag: ElementType, props: P, extraProps?: IntrinsicProps): {
         props: P;
     };
 }>;

package/dist/svelte/index.js

@@ -1446,7 +1446,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1456,8 +1456,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1528,11 +1532,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1545,7 +1555,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3436,10 +3446,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3524,8 +3534,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };

package/dist/vue/index.js

@@ -1583,7 +1583,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1593,8 +1593,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1665,11 +1669,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1682,7 +1692,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3573,10 +3583,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3661,8 +3671,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };
@@ -3898,7 +3908,11 @@ function buildElementProps(props, className, elementRef) {
 }
 function renderIntrinsic(state, runtime, slots, elementRef) {
   const elementProps = buildElementProps(state.props, state.className, elementRef);
-  const domProps = runtime.resolveAria(state.tag, elementProps).props;
+  const domProps = runtime.resolveAria(
+    state.tag,
+    elementProps,
+    state.normalizedProps
+  ).props;
   return h3(state.tag, domProps, slots.default ? { default: slots.default } : void 0);
 }
 function validateSlotDirectives(directives, validator) {

package/dist/web/index.js

@@ -1430,7 +1430,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
-  static #evaluateWithRules(tag, props, extraRules) {
+  static #evaluateWithRules(tag, props, extraRules, extraProps) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
     const {
@@ -1440,8 +1440,12 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
+    const builtinRules = derived.hasRole ? _AriaPolicyEngine.#getRules(context) : [];
+    const builtin = _AriaPolicyEngine.#runRules(builtinRules, context);
+    const extraContext = extraProps === void 0 ? context : { ...context, props: extraProps };
+    const extra = _AriaPolicyEngine.#runRules(extraRules, extraContext);
+    const violations = [...builtin.violations, ...extra.violations];
+    const fixes = [...builtin.fixes, ...extra.fixes];
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1512,11 +1516,17 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     Object.assign(next, updates);
     return next;
   }
-  validate(tag, props) {
+  // `extraProps`, when supplied, is the pre-variant-filter props object (the same one
+  // `normalize()` receives) — used only as the evaluation context for this engine's own
+  // #extraRules (a consumer's `enforcement.aria`/`enforcement.rules`), never for the built-in
+  // role-semantic pipeline or for the props a fix can apply to. Defaults to `props` so callers
+  // that don't have a separate pre-filter object (or don't need one) see unchanged behavior.
+  validate(tag, props, extraProps) {
+    const ruleProps = extraProps ?? props;
     const baseKey = _AriaPolicyEngine.#createPlanKey(tag, props);
     let key = baseKey;
     if (this.#extraRules.length > 0) {
-      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, props);
+      const suffix = _AriaPolicyEngine.#extraRulesKeySuffix(this.#extraRules, ruleProps);
       key = isNonNull(baseKey) && isNonNull(suffix) ? `${baseKey}|${suffix}` : null;
     }
     if (!isNull(key)) {
@@ -1529,7 +1539,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
         };
       }
     }
-    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules) : _AriaPolicyEngine.evaluate(tag, props);
+    const result = this.#extraRules.length ? _AriaPolicyEngine.#evaluateWithRules(tag, props, this.#extraRules, extraProps) : _AriaPolicyEngine.evaluate(tag, props);
     if (result.violations.length > 0) this.report(result.violations);
     if (!isNull(key)) {
       const { removals, updates } = _AriaPolicyEngine.#computePlan(
@@ -3420,10 +3430,10 @@ function resolveAriaRules(resolved) {
 var createAriaPipeline = (resolved) => {
   const rules = resolveAriaRules(resolved);
   const engine = new AriaPolicyEngine(resolved.diagnostics, rules.length ? { rules } : void 0);
-  return (tag, props) => engine.validate(tag, props);
+  return (tag, props, extraProps) => engine.validate(tag, props, extraProps);
 };
 var memoizedAriaPipeline = definePipeline(createAriaPipeline);
-function resolveAriaPassthrough(_tag, props) {
+function resolveAriaPassthrough(_tag, props, _extraProps) {
   return { props };
 }
 
@@ -3508,8 +3518,8 @@ function createPolymorphic(options = {}) {
       }
       return classPipeline(tag, props, className, recipe) || void 0;
     },
-    resolveAria(tag, props) {
-      return resolveAriaFn(tag, props);
+    resolveAria(tag, props, extraProps) {
+      return resolveAriaFn(tag, props, extraProps);
     }
   };
   const runtimeObject = pluginResult ? { ...methods, options: resolved, hasStyling: true, classPlugin: pluginResult } : { ...methods, options: resolved };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "praxis-kit",
-  "version": "7.8.0",
+  "version": "7.8.1",
   "type": "module",
   "exports": {
     "./react": {
@@ -203,10 +203,10 @@
     "typescript": "^6.0.3",
     "vite": "^8.2.1",
     "vue": "^3.5.41",
-    "@praxis-kit/adapter-utils": "0.0.0",
-    "@praxis-kit/diagnostics": "0.0.0",
     "@praxis-kit/core": "0.0.0",
+    "@praxis-kit/adapter-utils": "0.0.0",
     "@praxis-kit/pipeline": "0.0.0",
+    "@praxis-kit/diagnostics": "0.0.0",
     "@praxis-kit/primitive": "0.0.0",
     "@praxis-kit/vite-plugin": "0.0.0"
   },