praxis-kit 6.6.0 → 7.0.0

package/dist/solid/index.js

@@ -8,6 +8,11 @@ function makeResolveTag(defaultTag) {
 // ../../lib/primitive/src/rule/rule-brand.ts
 var RULE_BRAND = /* @__PURE__ */ Symbol("praxis-kit/dynamic-rule");
 
+// ../../lib/primitive/src/rule/dynamic.ts
+function dynamic(resolve) {
+  return { [RULE_BRAND]: true, resolve };
+}
+
 // ../../lib/primitive/src/guards/foundational/is-defined.ts
 function isUndefined(value) {
   return value === void 0;
@@ -21,7 +26,7 @@ function isNonNull(value) {
   return value != null;
 }
 function isNullish(value) {
-  return isNull(value) || value === void 0;
+  return isNull(value) || isUndefined(value);
 }
 
 // ../../lib/primitive/src/utils/type-guards.ts
@@ -598,6 +603,24 @@ var ROLE_RESTRICTED_ATTRIBUTES = /* @__PURE__ */ new Map([
   ]
 ]);
 
+// ../../lib/primitive/src/constants/html/void-tags.ts
+var VOID_TAGS = [
+  "area",
+  "base",
+  "br",
+  "col",
+  "embed",
+  "hr",
+  "img",
+  "input",
+  "link",
+  "meta",
+  "param",
+  "source",
+  "track",
+  "wbr"
+];
+
 // ../../lib/primitive/src/guards/aria/is-aria-attribute.ts
 function isGlobalAriaAttribute(attr) {
   return GLOBAL_ARIA_ATTRIBUTES.has(attr);
@@ -1588,7 +1611,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     const cached = _AriaPolicyEngine.#removeAttributeFixCache.get(attr);
     if (cached) return cached;
     const fix = {
-      kind: `removeAttribute:${attr}`,
+      kind: "removeAttribute",
+      attribute: attr,
       apply: ({ props }) => {
         if (!(attr in props)) return { applied: false, next: props };
         return { applied: true, next: omitProp(props, attr), previous: props };
@@ -1859,7 +1883,8 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
     if (!impliedLive) return NO_VIOLATIONS2;
     if ("aria-live" in props) return NO_VIOLATIONS2;
     const injectLive = {
-      kind: `injectLive:${effectiveRole}`,
+      kind: "injectLive",
+      attribute: "aria-live",
       apply: (ctx) => ({
         applied: true,
         next: { ...ctx.props, "aria-live": impliedLive },
@@ -1928,6 +1953,23 @@ var AriaPolicyEngine = class _AriaPolicyEngine extends InvariantBase {
   }
 };
 
+// ../../lib/contract/src/aria/factories.ts
+function removeProp(props, key) {
+  const next = { ...props };
+  delete next[key];
+  return next;
+}
+function removeAttributeFix(attribute) {
+  return Object.freeze({
+    kind: "removeAttribute",
+    attribute,
+    apply: ({ props }) => {
+      if (!(attribute in props)) return { applied: false, next: props };
+      return { applied: true, next: removeProp(props, attribute), previous: props };
+    }
+  });
+}
+
 // ../../lib/contract/src/children/get-type-name.ts
 function getTypeName(value) {
   if (value === null) return "null";
@@ -2244,6 +2286,77 @@ var readonlyProps = ({
 // ../core/src/html/evaluators.ts
 import { warnDiagnostics as warnDiagnostics2 } from "../_shared/diagnostics.js";
 
+// ../core/src/html/contracts/categories.ts
+var METADATA_TAGS = ["script", "template"];
+var TEXT_ONLY_TAGS = [
+  "option",
+  "script",
+  "style",
+  "textarea",
+  "title"
+];
+var LANDMARK_TAGS = [
+  "article",
+  "aside",
+  "footer",
+  "header",
+  "main",
+  "nav"
+];
+var INTERACTIVE_CONTENT_TAGS = [
+  "a",
+  "button",
+  "input",
+  "select",
+  "textarea",
+  "label"
+];
+var LABELABLE_TAGS = [
+  "button",
+  "input",
+  "meter",
+  "output",
+  "progress",
+  "select",
+  "textarea"
+];
+var OTHER_INTERACTIVE_TAGS = [
+  "a",
+  "details",
+  "embed",
+  "iframe"
+];
+var P_BLOCKED_TAGS = [
+  "address",
+  "article",
+  "aside",
+  "blockquote",
+  "details",
+  "dialog",
+  "div",
+  "dl",
+  "fieldset",
+  "figure",
+  "footer",
+  "form",
+  "h1",
+  "h2",
+  "h3",
+  "h4",
+  "h5",
+  "h6",
+  "header",
+  "hr",
+  "main",
+  "nav",
+  "ol",
+  "p",
+  "pre",
+  "section",
+  "table",
+  "ul"
+];
+
 // ../core/src/html/spec/vocabulary/input.ts
 var TEXT_INPUT_TYPES = ["text", "search", "url", "tel", "email", "password"];
 var NUMERIC_INPUT_TYPES = [
@@ -2298,20 +2411,6 @@ var INPUT_MUTUALLY_EXCLUSIVE_POLICIES = [
 
 // ../core/src/html/spec/validators/attribute-type-validator.ts
 var DEFAULT_INPUT_TYPE = "text";
-function omit(props, key) {
-  const next = { ...props };
-  delete next[key];
-  return next;
-}
-function removeAttributeFix(attribute) {
-  return {
-    kind: `removeAttribute:${attribute}`,
-    apply: ({ props }) => {
-      if (!(attribute in props)) return { applied: false, next: props };
-      return { applied: true, next: omit(props, attribute), previous: props };
-    }
-  };
-}
 function createInputAttributeTypeRule({
   attribute,
   allowedTypes
@@ -2623,7 +2722,11 @@ var ALLOWED_ROLES = {
     "treeitem"
   ],
   dialog: ["alertdialog"],
-  fieldset: ["none", "presentation", "radiogroup"]
+  fieldset: ["none", "presentation", "radiogroup"],
+  // `<label>` has no implicit role and no documented alternates — its native labeling
+  // semantics (control association, accessible-name contribution) aren't reproducible via
+  // ARIA, so any explicit `role` should be avoided rather than substituted.
+  label: []
 };
 var ELEMENT_SPECS = {
   input: inputElementSpec,
@@ -2664,7 +2767,10 @@ var roleNotPermittedRule = Object.assign(
 );
 
 // ../core/src/html/aria-rules.ts
-var LANDMARK_TAG_SET = /* @__PURE__ */ new Set(["article", "aside", "footer", "header", "main", "nav"]);
+function defineAriaRule(tags, rule) {
+  return Object.assign(rule, { tags });
+}
+var LANDMARK_TAG_SET = new Set(LANDMARK_TAGS);
 var removeLandmarkRoleOverride = {
   kind: "removeRole",
   apply: ({ props }) => {
@@ -2673,10 +2779,11 @@ var removeLandmarkRoleOverride = {
     return { applied: true, next: rest, previous: props };
   }
 };
-var landmarkRoleRule = Object.assign(
+var landmarkRoleRule = defineAriaRule(
+  LANDMARK_TAGS,
   ({ tag, props, implicitRole }) => {
     if (!LANDMARK_TAG_SET.has(tag) || !implicitRole) return [];
-    const role = props.role;
+    const { role } = props;
     if (!role || role === implicitRole) return [];
     const diagnostic = HtmlDiagnostics.landmarkRoleOverride(tag, implicitRole, role);
     return [
@@ -2688,8 +2795,7 @@ var landmarkRoleRule = Object.assign(
         diagnostic
       }
     ];
-  },
-  { tags: [...LANDMARK_TAG_SET] }
+  }
 );
 function requireAccessibleName({ tag, props }) {
   if ("aria-label" in props || "aria-labelledby" in props) return [];
@@ -2702,38 +2808,44 @@ function requireAccessibleName({ tag, props }) {
     }
   ];
 }
-var NAMED_LANDMARK_TAGS = /* @__PURE__ */ new Set(["nav", "aside"]);
-var landmarkNameAdvisory = Object.assign(
+var NAMED_LANDMARK_TAGS = ["nav", "aside"];
+var NAMED_LANDMARK_TAG_SET = new Set(NAMED_LANDMARK_TAGS);
+var landmarkAccessibleNameRule = defineAriaRule(
+  NAMED_LANDMARK_TAGS,
   (ctx) => {
-    if (!ctx.implicitRole || !NAMED_LANDMARK_TAGS.has(ctx.tag)) return [];
+    if (!ctx.implicitRole || !NAMED_LANDMARK_TAG_SET.has(ctx.tag)) return [];
     return requireAccessibleName(ctx);
-  },
-  { tags: [...NAMED_LANDMARK_TAGS] }
+  }
 );
 var HTML_ARIA_RULES = [
   landmarkRoleRule,
-  landmarkNameAdvisory,
+  landmarkAccessibleNameRule,
   roleNotPermittedRule,
   ...INPUT_RULES
 ];
 
-// ../core/src/html/contracts.ts
+// ../core/src/html/contracts/helpers.ts
 import { warnDiagnostics } from "../_shared/diagnostics.js";
+function isVNodeLike(child) {
+  return isObject(child) && "type" in child;
+}
 function isOpenContent(...blockedTags) {
   const set2 = new Set(blockedTags);
   return (child) => {
-    if (!isObject(child) || !("type" in child)) return false;
+    if (!isVNodeLike(child)) return false;
     const tag = getTag(child);
     return tag === void 0 || !set2.has(tag);
   };
 }
-var METADATA_TAGS = ["script", "template"];
 var metadataMatch = isTag(...METADATA_TAGS);
 function metadata(name = "metadata") {
   return { name, match: metadataMatch };
 }
+function optional(name, tag) {
+  return { name, match: isTag(tag), cardinality: { max: 1 } };
+}
 function firstOptional(name, tag) {
-  return { name, match: isTag(tag), cardinality: { max: 1 }, position: "first" };
+  return { ...optional(name, tag), position: "first" };
 }
 function contract(children, options) {
   return { diagnostics: warnDiagnostics, children, ...options };
@@ -2747,50 +2859,41 @@ function ariaContract(aria) {
 function firstChildContract(name, tag) {
   return contract([firstOptional(name, tag), { name: "content", match: isOpenContent(tag) }]);
 }
-var VOID_TAGS = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "embed",
-  "hr",
-  "img",
-  "input",
-  "link",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
-var TEXT_ONLY_TAGS = ["option", "script", "style", "textarea", "title"];
-var LANDMARK_TAGS = ["article", "aside", "footer", "header", "main", "nav"];
-var listContract = closedContract([
-  { name: "list-item", match: isTag("li", ...METADATA_TAGS) }
-]);
-var tableContract = closedContract([
-  firstOptional("caption", "caption"),
-  { name: "colgroup", match: isTag("colgroup") },
-  { name: "thead", match: isTag("thead"), cardinality: { max: 1 } },
-  { name: "tbody", match: isTag("tbody") },
-  { name: "tfoot", match: isTag("tfoot"), cardinality: { max: 1 } },
-  { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
-]);
-var tableBodyContract = closedContract([
-  { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
-]);
-var tableRowContract = closedContract([
-  { name: "table-cell", match: isTag("td", "th", ...METADATA_TAGS) }
-]);
-var colgroupContract = closedContract([
-  { name: "column", match: isTag("col", "template") }
+function getChildProp(child, key) {
+  if (!isVNodeLike(child)) return void 0;
+  const { props } = child;
+  if (!isObject(props)) return void 0;
+  return props[key];
+}
+
+// ../core/src/html/contracts/aria/landmarks.ts
+var landmarkContract = ariaContract([landmarkRoleRule, landmarkAccessibleNameRule]);
+
+// ../core/src/html/contracts/aria/widgets.ts
+var dialogContract = ariaContract([requireAccessibleName]);
+var menuContract = ariaContract([requireAccessibleName]);
+var menubarContract = ariaContract([requireAccessibleName]);
+var treeContract = ariaContract([requireAccessibleName]);
+var gridContract = ariaContract([requireAccessibleName]);
+var listboxContract = ariaContract([requireAccessibleName]);
+var tablistContract = ariaContract([requireAccessibleName]);
+var radiogroupContract = ariaContract([requireAccessibleName]);
+
+// ../core/src/html/contracts/html/document.ts
+var headContract = closedContract([
+  {
+    name: "metadata",
+    match: isTag("base", "link", "meta", "noscript", "script", "style", "template", "title")
+  }
 ]);
-var dlContract = closedContract([
-  { name: "term", match: isTag("dt") },
-  { name: "description", match: isTag("dd") },
-  { name: "group", match: isTag("div") },
-  metadata()
+var htmlContract = closedContract([
+  { name: "head", match: isTag("head"), cardinality: { min: 1, max: 1 }, position: "first" },
+  { name: "body", match: isTag("body"), cardinality: { min: 1, max: 1 } }
 ]);
+var voidContract = contract([], { exclusiveChildren: true, allowText: false });
+var textOnlyContract = contract([], { exclusiveChildren: true });
+
+// ../core/src/html/contracts/html/forms.ts
 var selectContract = closedContract([
   { name: "option", match: isTag("option", "optgroup", "hr", ...METADATA_TAGS) }
 ]);
@@ -2800,6 +2903,59 @@ var optgroupContract = closedContract([
 var datalistContract = closedContract([
   { name: "option", match: isTag("option", ...METADATA_TAGS) }
 ]);
+var buttonContract = closedContract([
+  { name: "content", match: isOpenContent(...INTERACTIVE_CONTENT_TAGS) }
+]);
+var anchorContract = closedContract([
+  { name: "content", match: isOpenContent(...INTERACTIVE_CONTENT_TAGS) }
+]);
+var labelableTagMatch = isTag(...LABELABLE_TAGS);
+function isLabelableControl(child) {
+  if (!labelableTagMatch(child)) return false;
+  if (getTag(child) !== "input") return true;
+  const type = getChildProp(child, "type");
+  return !isString(type) || type !== "hidden";
+}
+function hasAccessibleNameProp(props) {
+  return "aria-label" in props || "aria-labelledby" in props;
+}
+function isNonEmptyTextChild(child) {
+  if (isNumber(child)) return true;
+  return isString(child) && child.trim().length > 0;
+}
+var labelContract = contract([
+  { name: "control", match: isLabelableControl, cardinality: { max: 1 } },
+  { name: "nested-label", match: isTag("label"), cardinality: { max: 0 } },
+  {
+    name: "other-interactive-content",
+    match: isTag(...OTHER_INTERACTIVE_TAGS),
+    cardinality: { max: 0 }
+  },
+  {
+    name: "accessible-name",
+    match: isNonEmptyTextChild,
+    cardinality: dynamic(
+      (ctx) => hasAccessibleNameProp(ctx.props) ? { min: 0 } : { min: 1 }
+    )
+  }
+]);
+
+// ../core/src/html/contracts/html/grouping.ts
+var detailsContract = firstChildContract("summary", "summary");
+var fieldsetContract = firstChildContract("legend", "legend");
+
+// ../core/src/html/contracts/html/lists.ts
+var listContract = closedContract([
+  { name: "list-item", match: isTag("li", ...METADATA_TAGS) }
+]);
+var dlContract = closedContract([
+  { name: "term", match: isTag("dt") },
+  { name: "description", match: isTag("dd") },
+  { name: "group", match: isTag("div") },
+  metadata()
+]);
+
+// ../core/src/html/contracts/html/media.ts
 var pictureContract = closedContract([
   { name: "source", match: isTag("source", ...METADATA_TAGS) },
   { name: "image", match: isTag("img"), cardinality: { min: 1, max: 1 }, position: "last" }
@@ -2808,91 +2964,49 @@ var figureContract = contract([
   { name: "caption", match: isTag("figcaption"), cardinality: { max: 1 } },
   { name: "content", match: isOpenContent("figcaption") }
 ]);
-var detailsContract = firstChildContract("summary", "summary");
-var fieldsetContract = firstChildContract("legend", "legend");
 var objectContract = contract([
   { name: "param", match: isTag("param") },
   { name: "content", match: isOpenContent("param") }
 ]);
-var INTERACTIVE_CONTENT_TAGS = ["a", "button", "input", "select", "textarea", "label"];
-var buttonContract = closedContract([
-  { name: "content", match: isOpenContent(...INTERACTIVE_CONTENT_TAGS) }
-]);
-var anchorContract = closedContract([
-  { name: "content", match: isOpenContent(...INTERACTIVE_CONTENT_TAGS) }
-]);
-var LABELABLE_TAGS = [
-  "button",
-  "input",
-  "meter",
-  "output",
-  "progress",
-  "select",
-  "textarea"
-];
-var labelContract = contract([
-  { name: "control", match: isTag(...LABELABLE_TAGS), cardinality: { max: 1 } }
-]);
-var P_BLOCKED_TAGS = [
-  "address",
-  "article",
-  "aside",
-  "blockquote",
-  "details",
-  "dialog",
-  "div",
-  "dl",
-  "fieldset",
-  "figure",
-  "footer",
-  "form",
-  "h1",
-  "h2",
-  "h3",
-  "h4",
-  "h5",
-  "h6",
-  "header",
-  "hr",
-  "main",
-  "nav",
-  "ol",
-  "p",
-  "pre",
-  "section",
-  "table",
-  "ul"
-];
-var pContract = closedContract([
-  { name: "content", match: isOpenContent(...P_BLOCKED_TAGS) }
-]);
 var mediaContract = contract([
   { name: "source", match: isTag("source") },
   { name: "track", match: isTag("track") },
   metadata(),
   { name: "content", match: isOpenContent("source", "track", ...METADATA_TAGS) }
 ]);
-var headContract = closedContract([
-  {
-    name: "metadata",
-    match: isTag("base", "link", "meta", "noscript", "script", "style", "template", "title")
-  }
+
+// ../core/src/html/contracts/html/tables.ts
+var tableContract = closedContract([
+  firstOptional("caption", "caption"),
+  { name: "colgroup", match: isTag("colgroup") },
+  { name: "thead", match: isTag("thead"), cardinality: { max: 1 } },
+  { name: "tbody", match: isTag("tbody") },
+  { name: "tfoot", match: isTag("tfoot"), cardinality: { max: 1 } },
+  { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
 ]);
-var htmlContract = closedContract([
-  { name: "head", match: isTag("head"), cardinality: { min: 1, max: 1 }, position: "first" },
-  { name: "body", match: isTag("body"), cardinality: { min: 1, max: 1 } }
+var tableBodyContract = closedContract([
+  { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
 ]);
-var voidContract = contract([], { exclusiveChildren: true, allowText: false });
-var textOnlyContract = contract([], { exclusiveChildren: true });
-var landmarkContract = ariaContract([landmarkRoleRule, landmarkNameAdvisory]);
-var dialogContract = ariaContract([requireAccessibleName]);
-var menuContract = ariaContract([requireAccessibleName]);
-var menubarContract = ariaContract([requireAccessibleName]);
-var treeContract = ariaContract([requireAccessibleName]);
-var gridContract = ariaContract([requireAccessibleName]);
-var listboxContract = ariaContract([requireAccessibleName]);
-var tablistContract = ariaContract([requireAccessibleName]);
-var radiogroupContract = ariaContract([requireAccessibleName]);
+var tableRowContract = closedContract([
+  { name: "table-cell", match: isTag("td", "th", ...METADATA_TAGS) }
+]);
+var colgroupContract = closedContract([
+  { name: "column", match: isTag("col", "template") }
+]);
+
+// ../core/src/html/contracts/html/text.ts
+var pContract = closedContract([
+  { name: "content", match: isOpenContent(...P_BLOCKED_TAGS) }
+]);
+
+// ../core/src/html/contracts/build-map.ts
+function buildMap(groups) {
+  return Object.fromEntries(
+    groups.flatMap(([keys2, value]) => keys2.map((key) => [key, value]))
+  );
+}
+
+// ../core/src/html/contracts/maps.ts
 var CONTRACT_GROUPS = [
   [VOID_TAGS, voidContract],
   [TEXT_ONLY_TAGS, textOnlyContract],
@@ -2901,13 +3015,8 @@ var CONTRACT_GROUPS = [
   [["audio", "video"], mediaContract],
   [["thead", "tbody", "tfoot"], tableBodyContract]
 ];
-function contractMap(groups) {
-  return Object.fromEntries(
-    groups.flatMap(([tags, enforcement]) => tags.map((tag) => [tag, enforcement]))
-  );
-}
 var htmlContracts = {
-  ...contractMap(CONTRACT_GROUPS),
+  ...buildMap(CONTRACT_GROUPS),
   table: tableContract,
   tr: tableRowContract,
   colgroup: colgroupContract,
@@ -3546,7 +3655,10 @@ function render({
     }));
   }
   if (process.env.NODE_ENV !== "production") {
-    createEffect(() => runtime.options.htmlChildrenEvaluatorFn?.(tag())?.evaluate(toChildArray(known.children)));
+    createEffect(() => runtime.options.htmlChildrenEvaluatorFn?.(tag())?.evaluate(toChildArray(known.children), {
+      tag: tag(),
+      props: normalizedProps()
+    }));
   }
   const slotResult = tryRenderAsChild(known, filteredProps, resolvedClass, slotValidator);
   if (slotResult !== null) return slotResult;

package/dist/svelte/Polymorphic.svelte

@@ -130,7 +130,9 @@
       if (process.env.NODE_ENV === 'production' || !hostEl) return
       const childArray = Array.from(hostEl.childNodes)
       bundle.childrenEvaluator?.evaluate(childArray, { tag, props: normalizedProps })
-      bundle.runtime.options.htmlChildrenEvaluatorFn?.(tag)?.evaluate(childArray)
+      bundle.runtime.options.htmlChildrenEvaluatorFn
+        ?.(tag)
+        ?.evaluate(childArray, { tag, props: normalizedProps })
     })
   }
 </script>

package/dist/svelte/index.d.ts

@@ -29,13 +29,6 @@ type MinMax = {
 };
 type CardinalityInput = Partial<MinMax>;
 
-/** Structural counterpart to `@praxis-kit/contract`'s `ChildrenEvaluator` class — `lib/primitive`
- *  may not depend on `lib/contract` (see `primitive-no-upper-layers` in .dependency-cruiser.cjs),
- *  so this describes only the shape consumers actually call. Mirrors `AriaEngine`'s pattern. */
-type ChildrenEvaluator$1 = {
-    evaluate: (children: unknown[]) => void;
-};
-
 /**
  * Resolved per-instance state available to a dynamic (`dynamic(...)`) child
  * rule field — the same tag/props every adapter already computes before
@@ -47,6 +40,13 @@ type ChildRuleContext = {
     readonly props: Readonly<AnyRecord>;
 };
 
+/** Structural counterpart to `@praxis-kit/contract`'s `ChildrenEvaluator` class — `lib/primitive`
+ *  may not depend on `lib/contract` (see `primitive-no-upper-layers` in .dependency-cruiser.cjs),
+ *  so this describes only the shape consumers actually call. Mirrors `AriaEngine`'s pattern. */
+type ChildrenEvaluator$1 = {
+    evaluate: (children: unknown[], context?: ChildRuleContext) => void;
+};
+
 declare const RULE_BRAND: unique symbol;
 
 type DynamicRule<T, C = unknown> = {
@@ -200,8 +200,8 @@ type AriaContext = {
     readonly props: ReadonlyDeep<IntrinsicProps>;
 };
 
-type RemoveAttributeFixKind = `removeAttribute:${string}`;
-type InjectLiveFixKind = `injectLive:${string}`;
+type RemoveAttributeFixKind = 'removeAttribute';
+type InjectLiveFixKind = 'injectLive';
 type FixKind = 'removeRole' | 'setRole' | 'normalizeRelevantAll' | RemoveAttributeFixKind | InjectLiveFixKind;
 
 type AriaFixResult = {
@@ -214,6 +214,9 @@ type AriaFixResult = {
 };
 type AriaFix = {
     readonly kind: FixKind;
+    /** The attribute a `'removeAttribute'`/`'injectLive'` fix targets — always set for those
+     *  kinds, absent for kinds with no single-attribute target (`'removeRole'`, etc.). */
+    readonly attribute?: string;
     readonly priority?: number;
     readonly source?: string;
     readonly apply: (context: AriaContext) => AriaFixResult;