praxis-kit 4.1.3 → 6.0.0

package/dist/web/index.js

@@ -313,6 +313,19 @@ function makeResolveTag(defaultTag) {
   };
 }
 
+// ../../lib/primitive/src/rule/rule-brand.ts
+var RULE_BRAND = /* @__PURE__ */ Symbol("praxis-kit/dynamic-rule");
+
+// ../../lib/primitive/src/rule/is-dynamic-rule.ts
+function isDynamicRule(rule) {
+  return isObject(rule, true) && rule[RULE_BRAND] === true;
+}
+
+// ../../lib/primitive/src/rule/resolve-rule.ts
+function resolveRule(rule, context) {
+  return isDynamicRule(rule) ? rule.resolve(context) : rule;
+}
+
 // ../../lib/primitive/src/utils/assert-never.ts
 function assertNever(value) {
   throw new Error(`Unexpected value: ${String(value)}`);
@@ -1714,32 +1727,68 @@ var RuleValidator = class _RuleValidator extends InvariantBase {
 };
 
 // ../../lib/contract/src/children/children-evaluator.ts
+var isTextLike = (child) => isString(child) || isNumber(child);
+function checkPositionCardinalityInvariant(rules, context) {
+  iterate.forEach(rules, (rule) => {
+    const { name, position, cardinality } = rule;
+    if ((position === "first" || position === "last") && (cardinality.kind === "unbounded" || cardinality.max > 1)) {
+      throw new RangeError(
+        `ChildrenEvaluator [${context}]: rule "${name}" sets position="${position}" with an unbound or >1 max. position="first|last" implies max=1.`
+      );
+    }
+  });
+}
 var ChildrenEvaluator = class extends InvariantBase {
   #context;
-  #rules;
-  #ruleNames;
+  /** Rules with a static cardinality — normalized once, reused on every evaluate() call. */
+  #staticRules;
+  /** Rules whose cardinality is `dynamic(...)` — re-resolved against a ChildRuleContext per call. */
+  #dynamicRuleInputs;
   #matcher;
   #ruleValidator;
-  constructor(rules, diagnostics, context = "Component") {
+  #exclusiveChildren;
+  #allowText;
+  constructor(rules, diagnostics, context = "Component", options = {}) {
     super(diagnostics);
     this.#context = context;
-    this.#rules = rules.map((r) => normalizeChildRule(r));
-    this.#ruleNames = this.#rules.map((r) => r.name);
-    iterate.forEach(this.#rules, (rule) => {
-      const { name, position, cardinality } = rule;
-      if ((position === "first" || position === "last") && (cardinality.kind === "unbounded" || cardinality.max > 1)) {
-        throw new RangeError(
-          `ChildrenEvaluator [${context}]: rule "${name}" sets position="${position}" with an unbound or >1 max. position="first|last" implies max=1.`
-        );
-      }
+    this.#exclusiveChildren = options.exclusiveChildren ?? false;
+    this.#allowText = options.allowText ?? true;
+    const staticRuleInputs = [];
+    const dynamicRuleInputs = [];
+    iterate.forEach(rules, (rule) => {
+      if (isDynamicRule(rule.cardinality)) dynamicRuleInputs.push(rule);
+      else staticRuleInputs.push(rule);
     });
-    this.#matcher = new RuleMatcher(this.#rules);
+    this.#dynamicRuleInputs = dynamicRuleInputs;
+    this.#staticRules = staticRuleInputs.map(
+      (r) => normalizeChildRule(r)
+    );
     this.#ruleValidator = new RuleValidator(context, diagnostics);
+    if (this.#dynamicRuleInputs.length === 0) {
+      checkPositionCardinalityInvariant(this.#staticRules, context);
+      this.#matcher = new RuleMatcher(this.#staticRules);
+    } else {
+      this.#matcher = void 0;
+    }
   }
-  evaluate(children) {
+  /**
+   * @param context Required when any rule has a `dynamic(...)` cardinality —
+   *   supplies the resolved tag/props those rules are evaluated against.
+   */
+  evaluate(children, context) {
     if (!this.active) return;
-    const { matrix, unexpectedIndices, ambiguousIndices } = this.#matcher.match(children);
-    this.#ruleValidator.validate(this.#rules, matrix, children.length);
+    const { rules, matcher } = this.#resolveRules(context);
+    const {
+      matrix,
+      unexpectedIndices: rawUnexpectedIndices,
+      ambiguousIndices
+    } = matcher.match(children);
+    this.#ruleValidator.validate(rules, matrix, children.length);
+    const unexpectedIndices = new Set(
+      [...rawUnexpectedIndices].filter(
+        (ci) => isTextLike(children[ci]) ? this.#allowText === false : this.#exclusiveChildren
+      )
+    );
     if (unexpectedIndices.size === 0 && ambiguousIndices.size === 0) return;
     const violating = [...unexpectedIndices, ...ambiguousIndices].sort((a, b) => a - b);
     iterate.forEach(violating, (ci) => {
@@ -1748,11 +1797,28 @@ var ChildrenEvaluator = class extends InvariantBase {
         this.violate(ContractDiagnostics.unexpectedChild(typeName, ci, this.#context));
       } else {
         const matches = matrix.childToRules.forward.get(ci);
-        const names = [...matches].map((ri) => this.#ruleNames[ri] ?? `#${ri}`);
+        const names = [...matches].map((ri) => rules[ri]?.name ?? `#${ri}`);
         this.violate(ContractDiagnostics.ambiguousChild(typeName, ci, names, this.#context));
       }
     });
   }
+  #resolveRules(context) {
+    if (this.#dynamicRuleInputs.length === 0) {
+      return { rules: this.#staticRules, matcher: this.#matcher };
+    }
+    if (context === void 0) {
+      throw new RangeError(
+        `ChildrenEvaluator [${this.#context}]: rule(s) have a dynamic(...) cardinality \u2014 evaluate() requires a context argument to resolve them.`
+      );
+    }
+    const resolvedDynamicRules = this.#dynamicRuleInputs.map((r) => {
+      const cardinality = resolveRule(r.cardinality, context);
+      return normalizeChildRule({ ...r, cardinality });
+    });
+    checkPositionCardinalityInvariant(resolvedDynamicRules, this.#context);
+    const rules = [...this.#staticRules, ...resolvedDynamicRules];
+    return { rules, matcher: new RuleMatcher(rules) };
+  }
 };
 
 // ../../lib/contract/src/props/get-disabled-props.ts
@@ -1861,8 +1927,11 @@ function metadata(name = "metadata") {
 function firstOptional(name, tag) {
   return { name, match: isTag(tag), cardinality: { max: 1 }, position: "first" };
 }
-function contract(children) {
-  return { diagnostics: warnDiagnostics, children };
+function contract(children, options) {
+  return { diagnostics: warnDiagnostics, children, ...options };
+}
+function closedContract(children) {
+  return contract(children, { exclusiveChildren: true });
 }
 function ariaContract(aria) {
   return { diagnostics: warnDiagnostics, aria };
@@ -1888,8 +1957,10 @@ var VOID_TAGS = [
 ];
 var TEXT_ONLY_TAGS = ["option", "script", "style", "textarea", "title"];
 var LANDMARK_TAGS = ["article", "aside", "footer", "header", "main", "nav"];
-var listContract = contract([{ name: "list-item", match: isTag("li", ...METADATA_TAGS) }]);
-var tableContract = contract([
+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 } },
@@ -1897,29 +1968,31 @@ var tableContract = contract([
   { name: "tfoot", match: isTag("tfoot"), cardinality: { max: 1 } },
   { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
 ]);
-var tableBodyContract = contract([
+var tableBodyContract = closedContract([
   { name: "table-row", match: isTag("tr", ...METADATA_TAGS) }
 ]);
-var tableRowContract = contract([
+var tableRowContract = closedContract([
   { name: "table-cell", match: isTag("td", "th", ...METADATA_TAGS) }
 ]);
-var colgroupContract = contract([{ name: "column", match: isTag("col", "template") }]);
-var dlContract = contract([
+var colgroupContract = closedContract([
+  { name: "column", match: isTag("col", "template") }
+]);
+var dlContract = closedContract([
   { name: "term", match: isTag("dt") },
   { name: "description", match: isTag("dd") },
   { name: "group", match: isTag("div") },
   metadata()
 ]);
-var selectContract = contract([
+var selectContract = closedContract([
   { name: "option", match: isTag("option", "optgroup", "hr", ...METADATA_TAGS) }
 ]);
-var optgroupContract = contract([
+var optgroupContract = closedContract([
   { name: "option", match: isTag("option", ...METADATA_TAGS) }
 ]);
-var datalistContract = contract([
+var datalistContract = closedContract([
   { name: "option", match: isTag("option", ...METADATA_TAGS) }
 ]);
-var pictureContract = contract([
+var pictureContract = closedContract([
   { name: "source", match: isTag("source", ...METADATA_TAGS) },
   { name: "image", match: isTag("img"), cardinality: { min: 1, max: 1 }, position: "last" }
 ]);
@@ -1935,23 +2008,18 @@ var mediaContract = contract([
   metadata(),
   { name: "content", match: isOpenContent("source", "track", ...METADATA_TAGS) }
 ]);
-var headContract = contract([
+var headContract = closedContract([
   {
     name: "metadata",
     match: isTag("base", "link", "meta", "noscript", "script", "style", "template", "title")
   }
 ]);
-var htmlContract = contract([
+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([]);
-var textOnlyContract = contract([
-  {
-    name: "text",
-    match: (child) => isString(child) || isNumber(child)
-  }
-]);
+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]);
@@ -1996,9 +2064,15 @@ var htmlContracts = {
 var htmlDiagnostics = warnDiagnostics2;
 function buildEvaluatorMap() {
   const map2 = /* @__PURE__ */ new Map();
-  iterate.forEachEntry(htmlContracts, (tag, { children }) => {
-    if (children?.length) {
-      map2.set(tag, new ChildrenEvaluator(children, htmlDiagnostics, `<${tag}>`));
+  iterate.forEachEntry(htmlContracts, (tag, { children, exclusiveChildren, allowText }) => {
+    if (children?.length || exclusiveChildren || allowText === false) {
+      map2.set(
+        tag,
+        new ChildrenEvaluator(children ?? [], htmlDiagnostics, `<${tag}>`, {
+          exclusiveChildren,
+          allowText
+        })
+      );
     }
   });
   return map2;
@@ -2209,7 +2283,7 @@ function definePipeline(factory) {
 }
 
 // ../core/src/options/resolve-factory-options.ts
-import { silentDiagnostics } from "../_shared/diagnostics.js";
+import { resolveDiagnostics, silentDiagnostics } from "../_shared/diagnostics.js";
 var EMPTY_VARIANT_KEYS = /* @__PURE__ */ new Set();
 function composeNormalizers(normalizers, fn) {
   if (!normalizers?.length) return fn;
@@ -2230,7 +2304,7 @@ function resolveFactoryOptions(options = {}) {
   const variantKeys = styling?.variants === void 0 ? EMPTY_VARIANT_KEYS : new Set(Object.keys(styling.variants));
   return Object.freeze({
     defaultTag: options.tag ?? "div",
-    diagnostics: enforcement?.diagnostics ?? silentDiagnostics,
+    diagnostics: resolveDiagnostics(enforcement?.diagnostics, silentDiagnostics),
     variantKeys,
     ...whenDefined("displayName", options.name),
     ...whenDefined("defaultProps", options.defaults),
@@ -2243,6 +2317,8 @@ function resolveFactoryOptions(options = {}) {
     ...whenDefined("normalizeFn", composedNormalizeFn),
     ...whenDefined("ariaRules", enforcement?.aria),
     ...whenDefined("childRules", enforcement?.children),
+    ...whenDefined("exclusiveChildren", enforcement?.exclusiveChildren),
+    ...whenDefined("allowText", enforcement?.allowText),
     ...whenDefined("allowedAs", enforcement?.allowedAs),
     ...whenDefined("precomputedClasses", styling?.precomputedClasses)
   });
@@ -2427,16 +2503,22 @@ function buildCoreRuntime(normalized) {
 }
 
 // ../../lib/adapter-utils/src/runtime/build-engines.ts
-function buildEngines(diagnostics, childRules, context) {
-  return childRules?.length ? { childrenEvaluator: new ChildrenEvaluator(childRules, diagnostics, context) } : {};
+function buildEngines(diagnostics, childRules, context, childrenOptions) {
+  const { exclusiveChildren, allowText } = childrenOptions ?? {};
+  return childRules?.length || exclusiveChildren || allowText === false ? {
+    childrenEvaluator: new ChildrenEvaluator(childRules ?? [], diagnostics, context, {
+      exclusiveChildren,
+      allowText
+    })
+  } : {};
 }
 
 // ../../lib/adapter-utils/src/runtime/resolve-adapter-common-options.ts
-import { throwDiagnostics as throwDiagnostics2, silentDiagnostics as silentDiagnostics3 } from "../_shared/diagnostics.js";
+import { throwDiagnostics as throwDiagnostics2, silentDiagnostics as silentDiagnostics3, resolveDiagnostics as resolveDiagnostics2 } from "../_shared/diagnostics.js";
 function resolveAdapterCommonOptions(options, defaultName = "PolymorphicComponent", defaultDiagnostics = throwDiagnostics2) {
   return {
     name: options.name ?? defaultName,
-    diagnostics: options.enforcement?.diagnostics ?? defaultDiagnostics
+    diagnostics: resolveDiagnostics2(options.enforcement?.diagnostics, defaultDiagnostics)
   };
 }
 
@@ -2528,13 +2610,10 @@ function toLooseBundle(bundle) {
   }
   return bundle;
 }
-function resolveHostState(bundle, props) {
-  const { as, className, recipe, ...rest } = props;
-  const { options, resolveAria, resolveClasses, resolveProps, resolveTag: resolveTag2 } = bundle.runtime;
+function resolveTagAndNormalizedProps(bundle, props) {
+  const { as, className: _className, recipe: _recipe, ...rest } = props;
+  const { options, resolveProps, resolveTag: resolveTag2 } = bundle.runtime;
   const tag = resolveTag2(as);
-  if (options.allowedAs !== void 0) {
-    enforceAllowedAs(tag, options.allowedAs, options.diagnostics, options.displayName);
-  }
   const mergedProps = resolveProps(rest);
   const normalizedProps = typeof options.normalizeFn === "function" ? options.normalizeFn(mergedProps) : mergedProps;
   const htmlNormalizers = options.htmlPropNormalizersFn?.(tag);
@@ -2544,6 +2623,15 @@ function resolveHostState(bundle, props) {
       Object.assign(finalProps, normalize(finalProps));
     }
   }
+  return { tag, normalizedProps: finalProps };
+}
+function resolveHostState(bundle, props) {
+  const { className, recipe } = props;
+  const { options, resolveAria, resolveClasses } = bundle.runtime;
+  const { tag, normalizedProps: finalProps } = resolveTagAndNormalizedProps(bundle, props);
+  if (options.allowedAs !== void 0) {
+    enforceAllowedAs(tag, options.allowedAs, options.diagnostics, options.displayName);
+  }
   const resolvedClass = resolveClasses(
     tag,
     finalProps,
@@ -2552,7 +2640,7 @@ function resolveHostState(bundle, props) {
   );
   const ariaResult = resolveAria(tag, finalProps);
   const attributes = applyFilter(ariaResult.props, bundle.filterProps, options.variantKeys);
-  return { className: resolvedClass, attributes };
+  return { className: resolvedClass, attributes, tag, normalizedProps: finalProps };
 }
 function diffAndApplyAttributes(host, state, prevPipelineAttrs, incomingProps) {
   const hasOwn2 = Object.hasOwn;
@@ -2594,7 +2682,8 @@ function buildRuntime(options) {
   const { childrenEvaluator } = buildEngines(
     normalized.diagnostics,
     enforcement?.children,
-    normalized.name
+    normalized.name,
+    { exclusiveChildren: enforcement?.exclusiveChildren, allowText: enforcement?.allowText }
   );
   const filterProps = composeFilter(ownedKeys, customFilter);
   return {
@@ -2658,14 +2747,8 @@ function createContractComponent(options) {
       const self = this._self;
       const {
         childrenEvaluator,
-        runtime: { options: options2, resolveTag: resolveTag2 }
+        runtime: { options: options2 }
       } = bundle;
-      const tag = resolveTag2(self.as);
-      const children = Array.from(this.childNodes);
-      if (childrenEvaluator) {
-        childrenEvaluator.evaluate(children);
-      }
-      options2.htmlChildrenEvaluatorFn?.(tag)?.evaluate(children);
       const observedSet = new Set(
         this.constructor.observedAttributes ?? []
       );
@@ -2681,7 +2764,16 @@ function createContractComponent(options) {
         const val = self[key] ?? this.getAttribute(key);
         if (val != null) props[key] = val;
       }
-      diffAndApplyAttributes(this, resolveHostState(looseBundle, props), this._pipelineAttrs, props);
+      const hostState = resolveHostState(looseBundle, props);
+      const children = Array.from(this.childNodes);
+      if (childrenEvaluator) {
+        childrenEvaluator.evaluate(children, {
+          tag: hostState.tag,
+          props: hostState.normalizedProps
+        });
+      }
+      options2.htmlChildrenEvaluatorFn?.(hostState.tag)?.evaluate(children);
+      diffAndApplyAttributes(this, hostState, this._pipelineAttrs, props);
     }
   }
   if (options.name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "praxis-kit",
-  "version": "4.1.3",
+  "version": "6.0.0",
   "type": "module",
   "exports": {
     "./react": {
@@ -23,6 +23,9 @@
       "types": "./dist/svelte/index.d.ts",
       "import": "./dist/svelte/index.js"
     },
+    "./svelte/Polymorphic.svelte": {
+      "svelte": "./dist/svelte/Polymorphic.svelte"
+    },
     "./vue": {
       "types": "./dist/vue/index.d.ts",
       "import": "./dist/vue/index.js"
@@ -61,6 +64,52 @@
       "import": "./dist/contract/index.js"
     }
   },
+  "typesVersions": {
+    "*": {
+      "react": [
+        "./dist/react/index.d.ts"
+      ],
+      "react/legacy": [
+        "./dist/react/legacy.d.ts"
+      ],
+      "preact": [
+        "./dist/preact/index.d.ts"
+      ],
+      "solid": [
+        "./dist/solid/index.d.ts"
+      ],
+      "svelte": [
+        "./dist/svelte/index.d.ts"
+      ],
+      "vue": [
+        "./dist/vue/index.d.ts"
+      ],
+      "lit": [
+        "./dist/lit/index.d.ts"
+      ],
+      "web": [
+        "./dist/web/index.d.ts"
+      ],
+      "tailwind": [
+        "./dist/tailwind/index.d.ts"
+      ],
+      "eslint": [
+        "./dist/eslint/index.d.ts"
+      ],
+      "ts-plugin": [
+        "./dist/ts-plugin/index.d.cts"
+      ],
+      "vite-plugin": [
+        "./dist/vite-plugin/index.d.ts"
+      ],
+      "codemod": [
+        "./dist/codemod/index.d.ts"
+      ],
+      "contract": [
+        "./dist/contract/index.d.ts"
+      ]
+    }
+  },
   "bin": {
     "praxis-codemod": "./dist/codemod/index.js"
   },
@@ -71,7 +120,7 @@
   "sideEffects": false,
   "dependencies": {
     "clsx": "^2.1.1",
-    "type-fest": "^5.7.0"
+    "type-fest": "^5.8.0"
   },
   "peerDependencies": {
     "react": ">=18",
@@ -115,10 +164,12 @@
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
+    "esbuild": "^0.28.1",
+    "esbuild-plugin-solid": "^0.6.0",
     "@types/node": "^25.9.1",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.0.0",
-    "@typescript-eslint/utils": "8.60.0",
+    "@typescript-eslint/utils": "8.63.0",
     "lit": "^3.0.0",
     "preact": "^10.25.0",
     "react": "^19.2.7",
@@ -127,14 +178,16 @@
     "svelte": "^5.56.3",
     "ts-morph": "^28.0.0",
     "tsup": "^8.5.1",
+    "tsx": "^4.22.5",
     "typescript": "^6.0.3",
-    "vite": "^8.1.3",
+    "vite": "^8.1.4",
     "vue": "^3.5.38",
-    "@praxis-kit/adapter-utils": "0.0.0",
     "@praxis-kit/core": "0.0.0",
+    "@praxis-kit/adapter-utils": "0.0.0",
     "@praxis-kit/diagnostics": "0.0.0",
-    "@praxis-kit/primitive": "0.0.0",
-    "@praxis-kit/vite-plugin": "0.0.0"
+    "@praxis-kit/pipeline": "0.0.0",
+    "@praxis-kit/vite-plugin": "0.0.0",
+    "@praxis-kit/primitive": "0.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -173,7 +226,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "build": "rm -rf dist && tsup && node scripts/postbuild.mjs",
+    "build": "rm -rf dist && tsup && tsx scripts/postbuild.ts",
     "dev": "tsup --watch",
     "lint": "eslint . --fix",
     "lint:check": "eslint .",