praxis-kit 6.5.0 → 6.6.0

package/dist/lit/index.d.ts

@@ -232,6 +232,16 @@ type EnforcementOptions<TAllowed extends ElementType = ElementType> = {
      */
     readonly diagnostics?: Diagnostics | DiagnosticsMode;
     readonly aria?: readonly AriaRule[];
+    /**
+     * Rules that need `AriaPolicyEngine`'s fix-application/caching machinery
+     * (`AriaRule`'s `readsProps`, fixable `AriaFix` results) but have no
+     * relationship to ARIA semantics — an HTML fact or a security check like a
+     * dangerous-URL-scheme guard, for example. Evaluated together with `aria`
+     * (both run through the same engine, merged into one rule set) — this is a
+     * separate bucket purely so a non-ARIA rule doesn't have to sit under the
+     * misleading `aria` name to get the machinery it needs.
+     */
+    readonly rules?: readonly AriaRule[];
     readonly children?: readonly ChildRuleInput[];
     /**
      * When true, only children matching a `children` rule (or text, per `allowText`)

package/dist/lit/index.js

@@ -25,6 +25,9 @@ function isNull(value) {
 function isNonNull(value) {
   return value != null;
 }
+function isNullish(value) {
+  return isNull(value) || value === void 0;
+}
 
 // ../../lib/primitive/src/utils/type-guards.ts
 function isObject(value, excludeArrays = false) {
@@ -526,20 +529,29 @@ function isAriaAttributeValidForRole(attr, role) {
 }
 
 // ../../lib/primitive/src/guards/aria/is-aria-role.ts
+function lookupImplicitRole(tag) {
+  return IMPLICIT_ROLE_RECORD[tag];
+}
 function isStrongImplicitRole(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STRONG_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STRONG_ROLES_SET.has(role);
 }
-function isStandaloneTag(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STANDALONE_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+function hasStandaloneRole(tag) {
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STANDALONE_ROLES_SET.has(role);
 }
-function getInputImplicitRole(type) {
-  if (!isString(type) || !(type in INPUT_TYPE_ROLE_MAP)) return void 0;
-  return INPUT_TYPE_ROLE_MAP[type];
+var LIST_ELIGIBLE_INPUT_TYPES = /* @__PURE__ */ new Set(["text", "search", "tel", "url", "email"]);
+function getInputImplicitRole(type, list) {
+  if (!isString(type)) return void 0;
+  const role = INPUT_TYPE_ROLE_MAP[type];
+  if (!role) return void 0;
+  if (!isNullish(list) && LIST_ELIGIBLE_INPUT_TYPES.has(type)) {
+    return "combobox";
+  }
+  return role;
 }
 function getConditionalImplicitRole(tag, ariaLabel, ariaLabelledBy) {
-  const isNamed = isString(ariaLabel) || isString(ariaLabelledBy);
+  const isNamed = isString(ariaLabel) && ariaLabel.trim().length > 0 || isString(ariaLabelledBy) && ariaLabelledBy.trim().length > 0;
   if (!isNamed) return void 0;
   if (tag === "section") return "region";
   if (tag === "form") return "form";
@@ -585,7 +597,7 @@ function isTag(...args) {
 // ../../lib/contract/src/aria/aria-role-policy.ts
 function getImplicitRole(tag, props) {
   if (tag in IMPLICIT_ROLE_RECORD) return IMPLICIT_ROLE_RECORD[tag];
-  if (tag === "input") return getInputImplicitRole(props?.type);
+  if (tag === "input") return getInputImplicitRole(props?.type, props?.list);
   if (tag === "img") return props?.alt === "" ? "none" : "img";
   if (tag === "section" || tag === "form") {
     return getConditionalImplicitRole(tag, props?.["aria-label"], props?.["aria-labelledby"]);
@@ -1228,7 +1240,6 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (!isIntrinsicTag(tag)) return { proceed: false, result: { props, violations: [] } };
     const implicitRole = getImplicitRole(tag, props);
     const hasRole = isNonNull(implicitRole) || isString(props.role) && props.role.length > 0;
-    if (!hasRole) return { proceed: false, result: { props, violations: [] } };
     const normalized = _AriaPolicyEngine.#normalizeEmptyRole(tag, props);
     const workingProps = normalized.normalized ? normalized.result.props : props;
     const preExistingViolations = normalized.normalized ? normalized.result.violations : [];
@@ -1238,6 +1249,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       tag,
       implicitRole,
       effectiveRole,
+      hasRole,
       props: workingProps,
       preExistingViolations,
       context: { tag, props: workingProps, implicitRole, effectiveRole }
@@ -1281,6 +1293,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static evaluate(tag, props) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
+    if (!derived.hasRole)
+      return { props: derived.props, violations: [...derived.preExistingViolations] };
     const {
       tag: narrowedTag,
       implicitRole,
@@ -1305,10 +1319,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(
-      [..._AriaPolicyEngine.#getRules(context), ...extraRules],
-      context
-    );
+    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
+    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1507,7 +1519,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static #checkStandaloneRegion({ tag, props, implicitRole }) {
     const role = props.role;
     if (role !== "region") return NO_VIOLATIONS2;
-    if (!isStandaloneTag(tag)) return NO_VIOLATIONS2;
+    if (!hasStandaloneRole(tag)) return NO_VIOLATIONS2;
     const diagnostic = HtmlDiagnostics.standaloneRegionOverride(tag, implicitRole ?? tag);
     return [
       {
@@ -2997,6 +3009,11 @@ function composeNormalizers(normalizers, fn) {
 function whenDefined(key, value) {
   return value === void 0 ? {} : { [key]: value };
 }
+function mergeAriaRules(aria, rules) {
+  if (!aria?.length) return rules;
+  if (!rules?.length) return aria;
+  return [...aria, ...rules];
+}
 function resolveFactoryOptions(options = {}) {
   const { styling, enforcement } = options;
   const composedNormalizeFn = composeNormalizers(enforcement?.props, options.normalize);
@@ -3017,7 +3034,7 @@ function resolveFactoryOptions(options = {}) {
     ...whenDefined("defaultVariants", styling?.defaults),
     ...whenDefined("compoundVariants", styling?.compounds),
     ...whenDefined("normalizeFn", composedNormalizeFn),
-    ...whenDefined("ariaRules", enforcement?.aria),
+    ...whenDefined("ariaRules", mergeAriaRules(enforcement?.aria, enforcement?.rules)),
     ...whenDefined("childRules", enforcement?.children),
     ...whenDefined("exclusiveChildren", enforcement?.exclusiveChildren),
     ...whenDefined("allowText", enforcement?.allowText),

package/dist/preact/index.d.ts

@@ -249,6 +249,16 @@ type EnforcementOptions<TAllowed extends ElementType = ElementType> = {
      */
     readonly diagnostics?: Diagnostics | DiagnosticsMode;
     readonly aria?: readonly AriaRule[];
+    /**
+     * Rules that need `AriaPolicyEngine`'s fix-application/caching machinery
+     * (`AriaRule`'s `readsProps`, fixable `AriaFix` results) but have no
+     * relationship to ARIA semantics — an HTML fact or a security check like a
+     * dangerous-URL-scheme guard, for example. Evaluated together with `aria`
+     * (both run through the same engine, merged into one rule set) — this is a
+     * separate bucket purely so a non-ARIA rule doesn't have to sit under the
+     * misleading `aria` name to get the machinery it needs.
+     */
+    readonly rules?: readonly AriaRule[];
     readonly children?: readonly ChildRuleInput[];
     /**
      * When true, only children matching a `children` rule (or text, per `allowText`)
@@ -337,6 +347,15 @@ type PolymorphicWithAsChild<G extends PolymorphicGenerics, TAs extends ElementTy
 type PolymorphicComponent<G extends PolymorphicGenerics> = {
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicWithAsChild<G, TAs>): AnyVNode;
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicProps<G, TAs>): AnyVNode;
+    /**
+     * Non-generic fallback overload used for type extraction.
+     *
+     * TypeScript resolves conditional types such as
+     * `ComponentProps<typeof Component>` against only the final overload.
+     * Anchoring that overload to the default element preserves correct prop
+     * inference for tools such as Storybook and `ComponentProps`.
+     */
+    (props: PolymorphicProps<G, DefaultOf<G>>): AnyVNode;
     displayName?: string;
 };
 

package/dist/preact/index.js

@@ -23,6 +23,9 @@ function isNull(value) {
 function isNonNull(value) {
   return value != null;
 }
+function isNullish(value) {
+  return isNull(value) || value === void 0;
+}
 
 // ../../lib/primitive/src/utils/type-guards.ts
 function isObject(value, excludeArrays = false) {
@@ -637,20 +640,29 @@ function isAriaAttributeValidForRole(attr, role) {
 }
 
 // ../../lib/primitive/src/guards/aria/is-aria-role.ts
+function lookupImplicitRole(tag) {
+  return IMPLICIT_ROLE_RECORD[tag];
+}
 function isStrongImplicitRole(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STRONG_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STRONG_ROLES_SET.has(role);
 }
-function isStandaloneTag(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STANDALONE_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+function hasStandaloneRole(tag) {
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STANDALONE_ROLES_SET.has(role);
 }
-function getInputImplicitRole(type) {
-  if (!isString(type) || !(type in INPUT_TYPE_ROLE_MAP)) return void 0;
-  return INPUT_TYPE_ROLE_MAP[type];
+var LIST_ELIGIBLE_INPUT_TYPES = /* @__PURE__ */ new Set(["text", "search", "tel", "url", "email"]);
+function getInputImplicitRole(type, list) {
+  if (!isString(type)) return void 0;
+  const role = INPUT_TYPE_ROLE_MAP[type];
+  if (!role) return void 0;
+  if (!isNullish(list) && LIST_ELIGIBLE_INPUT_TYPES.has(type)) {
+    return "combobox";
+  }
+  return role;
 }
 function getConditionalImplicitRole(tag, ariaLabel, ariaLabelledBy) {
-  const isNamed = isString(ariaLabel) || isString(ariaLabelledBy);
+  const isNamed = isString(ariaLabel) && ariaLabel.trim().length > 0 || isString(ariaLabelledBy) && ariaLabelledBy.trim().length > 0;
   if (!isNamed) return void 0;
   if (tag === "section") return "region";
   if (tag === "form") return "form";
@@ -722,7 +734,7 @@ function defineContractComponent(options) {
 // ../../lib/contract/src/aria/aria-role-policy.ts
 function getImplicitRole(tag, props) {
   if (tag in IMPLICIT_ROLE_RECORD) return IMPLICIT_ROLE_RECORD[tag];
-  if (tag === "input") return getInputImplicitRole(props?.type);
+  if (tag === "input") return getInputImplicitRole(props?.type, props?.list);
   if (tag === "img") return props?.alt === "" ? "none" : "img";
   if (tag === "section" || tag === "form") {
     return getConditionalImplicitRole(tag, props?.["aria-label"], props?.["aria-labelledby"]);
@@ -1411,7 +1423,6 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (!isIntrinsicTag(tag)) return { proceed: false, result: { props, violations: [] } };
     const implicitRole = getImplicitRole(tag, props);
     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);
     const workingProps = normalized.normalized ? normalized.result.props : props;
     const preExistingViolations = normalized.normalized ? normalized.result.violations : [];
@@ -1421,6 +1432,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       tag,
       implicitRole,
       effectiveRole,
+      hasRole: hasRole2,
       props: workingProps,
       preExistingViolations,
       context: { tag, props: workingProps, implicitRole, effectiveRole }
@@ -1464,6 +1476,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static evaluate(tag, props) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
+    if (!derived.hasRole)
+      return { props: derived.props, violations: [...derived.preExistingViolations] };
     const {
       tag: narrowedTag,
       implicitRole,
@@ -1488,10 +1502,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(
-      [..._AriaPolicyEngine.#getRules(context), ...extraRules],
-      context
-    );
+    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
+    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1690,7 +1702,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static #checkStandaloneRegion({ tag, props, implicitRole }) {
     const role = props.role;
     if (role !== "region") return NO_VIOLATIONS2;
-    if (!isStandaloneTag(tag)) return NO_VIOLATIONS2;
+    if (!hasStandaloneRole(tag)) return NO_VIOLATIONS2;
     const diagnostic = HtmlDiagnostics.standaloneRegionOverride(tag, implicitRole ?? tag);
     return [
       {
@@ -3180,6 +3192,11 @@ function composeNormalizers(normalizers, fn) {
 function whenDefined(key, value) {
   return value === void 0 ? {} : { [key]: value };
 }
+function mergeAriaRules(aria, rules) {
+  if (!aria?.length) return rules;
+  if (!rules?.length) return aria;
+  return [...aria, ...rules];
+}
 function resolveFactoryOptions(options = {}) {
   const { styling, enforcement } = options;
   const composedNormalizeFn = composeNormalizers(enforcement?.props, options.normalize);
@@ -3200,7 +3217,7 @@ function resolveFactoryOptions(options = {}) {
     ...whenDefined("defaultVariants", styling?.defaults),
     ...whenDefined("compoundVariants", styling?.compounds),
     ...whenDefined("normalizeFn", composedNormalizeFn),
-    ...whenDefined("ariaRules", enforcement?.aria),
+    ...whenDefined("ariaRules", mergeAriaRules(enforcement?.aria, enforcement?.rules)),
     ...whenDefined("childRules", enforcement?.children),
     ...whenDefined("exclusiveChildren", enforcement?.exclusiveChildren),
     ...whenDefined("allowText", enforcement?.allowText),

package/dist/react/index.d.ts

@@ -1,5 +1,5 @@
-import { U as UnknownProps, E as ElementType, a as EmptyRecord, V as VariantMap, R as RecipeMap, A as AnyClassPluginFactory, b as ReactFactoryOptions, P as PolymorphicComponent, c as PolymorphicGenerics, d as ExtractPluginProps } from '../react-options-DoFNqNdY.js';
-export { e as AnyFactoryOptions, f as ElementRef, F as FactoryOptions, g as PolymorphicProps, h as PolymorphicWithAsChild, i as PolymorphicWithRender, j as RenderCallbackProps, S as Slottable, k as SlottableProps, m as composeRefs, l as defineContractComponent, m as mergeRefs } from '../react-options-DoFNqNdY.js';
+import { U as UnknownProps, E as ElementType, a as EmptyRecord, V as VariantMap, R as RecipeMap, A as AnyClassPluginFactory, b as ReactFactoryOptions, P as PolymorphicComponent, c as PolymorphicGenerics, d as ExtractPluginProps } from '../react-options-BUBVohU6.js';
+export { e as AnyFactoryOptions, f as ElementRef, F as FactoryOptions, g as PolymorphicProps, h as PolymorphicWithAsChild, i as PolymorphicWithRender, j as RenderCallbackProps, S as Slottable, k as SlottableProps, m as composeRefs, l as defineContractComponent, m as mergeRefs } from '../react-options-BUBVohU6.js';
 import * as react from 'react';
 import { ReactElement, Ref } from 'react';
 import 'type-fest';

package/dist/react/index.js

@@ -12,7 +12,7 @@ import {
   makeCloneSlotChild,
   mergeRefs,
   render
-} from "../chunk-AM5J6PY3.js";
+} from "../chunk-OCG5VM4H.js";
 
 // ../../adapters/react/src/current/slot/composeRefs.ts
 function getChildRef(element) {

package/dist/react/legacy.d.ts

@@ -1,5 +1,5 @@
-import { E as ElementType, U as UnknownProps, a as EmptyRecord, V as VariantMap, R as RecipeMap, A as AnyClassPluginFactory, b as ReactFactoryOptions, P as PolymorphicComponent, c as PolymorphicGenerics, d as ExtractPluginProps } from '../react-options-DoFNqNdY.js';
-export { e as AnyFactoryOptions, f as ElementRef, F as FactoryOptions, g as PolymorphicProps, h as PolymorphicWithAsChild, i as PolymorphicWithRender, j as RenderCallbackProps, S as Slottable, k as SlottableProps, l as defineContractComponent, m as mergeRefs } from '../react-options-DoFNqNdY.js';
+import { E as ElementType, U as UnknownProps, a as EmptyRecord, V as VariantMap, R as RecipeMap, A as AnyClassPluginFactory, b as ReactFactoryOptions, P as PolymorphicComponent, c as PolymorphicGenerics, d as ExtractPluginProps } from '../react-options-BUBVohU6.js';
+export { e as AnyFactoryOptions, f as ElementRef, F as FactoryOptions, g as PolymorphicProps, h as PolymorphicWithAsChild, i as PolymorphicWithRender, j as RenderCallbackProps, S as Slottable, k as SlottableProps, l as defineContractComponent, m as mergeRefs } from '../react-options-BUBVohU6.js';
 import * as react from 'react';
 import 'type-fest';
 import '../_shared/diagnostics.js';

package/dist/react/legacy.js

@@ -13,7 +13,7 @@ import {
   makeCloneSlotChild,
   mergeRefs,
   render
-} from "../chunk-AM5J6PY3.js";
+} from "../chunk-OCG5VM4H.js";
 
 // ../../adapters/react/src/legacy/create-contract-component.ts
 import { forwardRef as forwardRef2 } from "react";

package/dist/{react-options-DoFNqNdY.d.ts → react-options-BUBVohU6.d.ts}

@@ -250,6 +250,16 @@ type EnforcementOptions<TAllowed extends ElementType = ElementType> = {
      */
     readonly diagnostics?: Diagnostics | DiagnosticsMode;
     readonly aria?: readonly AriaRule[];
+    /**
+     * Rules that need `AriaPolicyEngine`'s fix-application/caching machinery
+     * (`AriaRule`'s `readsProps`, fixable `AriaFix` results) but have no
+     * relationship to ARIA semantics — an HTML fact or a security check like a
+     * dangerous-URL-scheme guard, for example. Evaluated together with `aria`
+     * (both run through the same engine, merged into one rule set) — this is a
+     * separate bucket purely so a non-ARIA rule doesn't have to sit under the
+     * misleading `aria` name to get the machinery it needs.
+     */
+    readonly rules?: readonly AriaRule[];
     readonly children?: readonly ChildRuleInput[];
     /**
      * When true, only children matching a `children` rule (or text, per `allowText`)
@@ -339,25 +349,27 @@ type SlotComponent = ComponentType<UnknownProps>;
 type RenderCallbackProps = Readonly<AnyRecord>;
 
 /**
- * Maps a polymorphic element type to the instance type exposed through `ref`.
+ * Resolves the instance type exposed through `ref` for a polymorphic
+ * element.
  *
- * Intrinsic HTML elements resolve to their corresponding DOM element type;
- * custom React components currently fall back to `unknown`.
+ * Intrinsic HTML elements map to their corresponding DOM element type;
+ * custom React components currently resolve to `unknown`.
  */
 type ElementRef<T extends ElementType> = T extends IntrinsicTag ? HTMLElementTagNameMap[T] : unknown;
 /**
- * React's intrinsic JSX props for a given element.
+ * React's intrinsic JSX props for an element type.
  *
- * Custom components intentionally fall back to `UnknownProps`; the component's
- * own prop model defines their accepted props instead.
+ * Custom components intentionally resolve to `UnknownProps`; their own
+ * prop definitions determine the accepted props.
  */
 type IntrinsicJSXProps<T extends ElementType> = T extends IntrinsicTag ? JSX.IntrinsicElements[T] : UnknownProps;
 /**
- * Removes index signatures while preserving explicitly named properties.
+ * Removes index signatures while preserving explicitly declared
+ * properties.
  *
- * This prevents generic fallback constraints such as `Record<string, unknown>`
- * from collapsing `keyof T` to `string`, which would cause
- * `Omit<IntrinsicJSXProps<T>, keyof ...>` to remove every intrinsic prop.
+ * Prevents broad index signatures (for example `Record<string, unknown>`)
+ * from causing `keyof T` to become `string`, which would otherwise erase
+ * every intrinsic prop during `Omit`.
  */
 type StripIndexSignature<T> = {
     [K in keyof T as string extends K ? never : K]: T[K];
@@ -367,18 +379,16 @@ type ComponentProps<G extends PolymorphicGenerics> = StripIndexSignature<PropsOf
 /** Variant props generated from the component's variant definitions. */
 type ComponentVariants<G extends PolymorphicGenerics> = StripIndexSignature<VariantProps<VariantsOf<G>>>;
 /**
- * Props owned by the component itself.
+ * Props defined by the component itself.
  *
- * These take precedence over intrinsic HTML props when names overlap.
+ * These override intrinsic JSX props with the same name.
  */
 type OwnedProps<G extends PolymorphicGenerics> = ComponentProps<G> & ComponentVariants<G>;
 /**
- * Polymorphic rendering controls.
+ * Props that control how the component renders.
  *
- * These describe *how* the component renders rather than the data it owns.
- *
- * `children` and `asChild` are intentionally omitted so each render mode
- * can provide its own stricter contract.
+ * `children` and `asChild` are intentionally omitted so each render
+ * strategy can define its own contract.
  */
 type PolymorphicControlProps<G extends PolymorphicGenerics, TAs extends ElementType> = {
     /**
@@ -398,22 +408,21 @@ type PolymorphicControlProps<G extends PolymorphicGenerics, TAs extends ElementT
     ref?: Ref<ElementRef<TAs>>;
 };
 /**
- * Complete set of props owned by the component.
+ * All props reserved by the polymorphic component.
  *
- * Used primarily as the exclusion list when inheriting intrinsic JSX props.
+ * Used primarily to exclude conflicting intrinsic JSX props.
  */
 type ControlProps<G extends PolymorphicGenerics, TAs extends ElementType> = OwnedProps<G> & PolymorphicControlProps<G, TAs>;
 /**
- * Intrinsic JSX props after removing every prop owned by the component.
+ * Intrinsic JSX props after removing every reserved component prop.
  *
- * Component props always win over intrinsic props with the same name.
+ * Component-defined props always take precedence.
  */
 type IntrinsicPropsWithoutOwned<G extends PolymorphicGenerics, TAs extends ElementType> = Omit<IntrinsicJSXProps<TAs>, keyof ControlProps<G, TAs> | 'children'>;
 /**
- * Base props shared by every render mode.
+ * Props shared by every rendering strategy.
  *
- * Render modes contribute only their discriminants (`asChild`, `render`,
- * `children`, etc.).
+ * Each render mode contributes only its discriminating props.
  */
 type BaseProps<G extends PolymorphicGenerics, TAs extends ElementType> = IntrinsicPropsWithoutOwned<G, TAs> & ControlProps<G, TAs>;
 /** Standard rendering (`asChild` absent or false). */
@@ -433,12 +442,9 @@ type SlotRenderMode = {
     children: ReactElement | NonEmptyTuple<ReactElement>;
 };
 /**
- * Render callback.
- *
- * The callback receives fully resolved props (classes, refs, filtered props)
- * and is responsible for rendering the target element.
+ * Render callback mode.
  *
- * This provides the flexibility of `asChild` without `cloneElement`.
+ * Receives the fully resolved props and returns the rendered element.
  */
 type CallbackRenderMode = {
     render: (props: RenderCallbackProps) => ReactElement;
@@ -464,16 +470,26 @@ type PolymorphicWithRender<G extends PolymorphicGenerics, TAs extends ElementTyp
 /**
  * A polymorphic React component.
  *
- * Overloads form a discriminated union:
+ * Overloads provide three rendering strategies:
  *
- * • `render`   → render callback
- * • `asChild`  → Slot rendering
- * • otherwise  → normal rendering
+ * - `render`   — render callback
+ * - `asChild`  — slot rendering
+ * - default    — standard polymorphic rendering
  */
 type PolymorphicComponent<G extends PolymorphicGenerics> = {
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicWithRender<G, TAs>): ReactElement;
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicWithAsChild<G, TAs>): ReactElement;
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicProps<G, TAs>): ReactElement;
+    /**
+     * Non-generic fallback overload used for type extraction.
+     *
+     * TypeScript resolves conditional types such as
+     * `React.ComponentProps<typeof Component>` against only the final
+     * overload. Anchoring that overload to the default element preserves
+     * correct prop inference for tools such as Storybook and
+     * `React.ComponentProps`.
+     */
+    (props: PolymorphicProps<G, DefaultOf<G>>): ReactElement;
     displayName?: string;
 };
 

package/dist/solid/index.d.ts

@@ -249,6 +249,16 @@ type EnforcementOptions<TAllowed extends ElementType = ElementType> = {
      */
     readonly diagnostics?: Diagnostics | DiagnosticsMode;
     readonly aria?: readonly AriaRule[];
+    /**
+     * Rules that need `AriaPolicyEngine`'s fix-application/caching machinery
+     * (`AriaRule`'s `readsProps`, fixable `AriaFix` results) but have no
+     * relationship to ARIA semantics — an HTML fact or a security check like a
+     * dangerous-URL-scheme guard, for example. Evaluated together with `aria`
+     * (both run through the same engine, merged into one rule set) — this is a
+     * separate bucket purely so a non-ARIA rule doesn't have to sit under the
+     * misleading `aria` name to get the machinery it needs.
+     */
+    readonly rules?: readonly AriaRule[];
     readonly children?: readonly ChildRuleInput[];
     /**
      * When true, only children matching a `children` rule (or text, per `allowText`)
@@ -332,6 +342,15 @@ type PolymorphicProps<G extends PolymorphicGenerics, TAs extends ElementType = D
 }) | AsChildProps<G>>;
 type PolymorphicComponent<G extends PolymorphicGenerics> = {
     <TAs extends ElementType = DefaultOf<G>>(props: PolymorphicProps<G, TAs>): JSX.Element;
+    /**
+     * Non-generic fallback overload used for type extraction.
+     *
+     * TypeScript resolves conditional types such as
+     * `ComponentProps<typeof Component>` against only the final overload.
+     * Anchoring that overload to the default element preserves correct prop
+     * inference for tools such as Storybook and `ComponentProps`.
+     */
+    (props: PolymorphicProps<G, DefaultOf<G>>): JSX.Element;
     displayName?: string;
 };
 

package/dist/solid/index.js

@@ -20,6 +20,9 @@ function isNull(value) {
 function isNonNull(value) {
   return value != null;
 }
+function isNullish(value) {
+  return isNull(value) || value === void 0;
+}
 
 // ../../lib/primitive/src/utils/type-guards.ts
 function isObject(value, excludeArrays = false) {
@@ -607,20 +610,29 @@ function isAriaAttributeValidForRole(attr, role) {
 }
 
 // ../../lib/primitive/src/guards/aria/is-aria-role.ts
+function lookupImplicitRole(tag) {
+  return IMPLICIT_ROLE_RECORD[tag];
+}
 function isStrongImplicitRole(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STRONG_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STRONG_ROLES_SET.has(role);
 }
-function isStandaloneTag(tag) {
-  if (!(tag in IMPLICIT_ROLE_RECORD)) return false;
-  return STANDALONE_ROLES_SET.has(IMPLICIT_ROLE_RECORD[tag]);
+function hasStandaloneRole(tag) {
+  const role = lookupImplicitRole(tag);
+  return !isNullish(role) && STANDALONE_ROLES_SET.has(role);
 }
-function getInputImplicitRole(type) {
-  if (!isString(type) || !(type in INPUT_TYPE_ROLE_MAP)) return void 0;
-  return INPUT_TYPE_ROLE_MAP[type];
+var LIST_ELIGIBLE_INPUT_TYPES = /* @__PURE__ */ new Set(["text", "search", "tel", "url", "email"]);
+function getInputImplicitRole(type, list) {
+  if (!isString(type)) return void 0;
+  const role = INPUT_TYPE_ROLE_MAP[type];
+  if (!role) return void 0;
+  if (!isNullish(list) && LIST_ELIGIBLE_INPUT_TYPES.has(type)) {
+    return "combobox";
+  }
+  return role;
 }
 function getConditionalImplicitRole(tag, ariaLabel, ariaLabelledBy) {
-  const isNamed = isString(ariaLabel) || isString(ariaLabelledBy);
+  const isNamed = isString(ariaLabel) && ariaLabel.trim().length > 0 || isString(ariaLabelledBy) && ariaLabelledBy.trim().length > 0;
   if (!isNamed) return void 0;
   if (tag === "section") return "region";
   if (tag === "form") return "form";
@@ -681,7 +693,7 @@ function defineContractComponent(options) {
 // ../../lib/contract/src/aria/aria-role-policy.ts
 function getImplicitRole(tag, props) {
   if (tag in IMPLICIT_ROLE_RECORD) return IMPLICIT_ROLE_RECORD[tag];
-  if (tag === "input") return getInputImplicitRole(props?.type);
+  if (tag === "input") return getInputImplicitRole(props?.type, props?.list);
   if (tag === "img") return props?.alt === "" ? "none" : "img";
   if (tag === "section" || tag === "form") {
     return getConditionalImplicitRole(tag, props?.["aria-label"], props?.["aria-labelledby"]);
@@ -1370,7 +1382,6 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (!isIntrinsicTag(tag)) return { proceed: false, result: { props, violations: [] } };
     const implicitRole = getImplicitRole(tag, props);
     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);
     const workingProps = normalized.normalized ? normalized.result.props : props;
     const preExistingViolations = normalized.normalized ? normalized.result.violations : [];
@@ -1380,6 +1391,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       tag,
       implicitRole,
       effectiveRole,
+      hasRole: hasRole2,
       props: workingProps,
       preExistingViolations,
       context: { tag, props: workingProps, implicitRole, effectiveRole }
@@ -1423,6 +1435,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static evaluate(tag, props) {
     const derived = _AriaPolicyEngine.#deriveContext(tag, props);
     if (!derived.proceed) return derived.result;
+    if (!derived.hasRole)
+      return { props: derived.props, violations: [...derived.preExistingViolations] };
     const {
       tag: narrowedTag,
       implicitRole,
@@ -1447,10 +1461,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
       props: workingProps,
       preExistingViolations
     } = derived;
-    const { violations, fixes } = _AriaPolicyEngine.#runRules(
-      [..._AriaPolicyEngine.#getRules(context), ...extraRules],
-      context
-    );
+    const rules = derived.hasRole ? [..._AriaPolicyEngine.#getRules(context), ...extraRules] : extraRules;
+    const { violations, fixes } = _AriaPolicyEngine.#runRules(rules, context);
     const next = _AriaPolicyEngine.#applyFixes(narrowedTag, implicitRole, workingProps, fixes);
     return { props: next, violations: [...preExistingViolations, ...violations] };
   }
@@ -1649,7 +1661,7 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   static #checkStandaloneRegion({ tag, props, implicitRole }) {
     const role = props.role;
     if (role !== "region") return NO_VIOLATIONS2;
-    if (!isStandaloneTag(tag)) return NO_VIOLATIONS2;
+    if (!hasStandaloneRole(tag)) return NO_VIOLATIONS2;
     const diagnostic = HtmlDiagnostics.standaloneRegionOverride(tag, implicitRole ?? tag);
     return [
       {
@@ -3139,6 +3151,11 @@ function composeNormalizers(normalizers, fn) {
 function whenDefined(key, value) {
   return value === void 0 ? {} : { [key]: value };
 }
+function mergeAriaRules(aria, rules) {
+  if (!aria?.length) return rules;
+  if (!rules?.length) return aria;
+  return [...aria, ...rules];
+}
 function resolveFactoryOptions(options = {}) {
   const { styling, enforcement } = options;
   const composedNormalizeFn = composeNormalizers(enforcement?.props, options.normalize);
@@ -3159,7 +3176,7 @@ function resolveFactoryOptions(options = {}) {
     ...whenDefined("defaultVariants", styling?.defaults),
     ...whenDefined("compoundVariants", styling?.compounds),
     ...whenDefined("normalizeFn", composedNormalizeFn),
-    ...whenDefined("ariaRules", enforcement?.aria),
+    ...whenDefined("ariaRules", mergeAriaRules(enforcement?.aria, enforcement?.rules)),
     ...whenDefined("childRules", enforcement?.children),
     ...whenDefined("exclusiveChildren", enforcement?.exclusiveChildren),
     ...whenDefined("allowText", enforcement?.allowText),