@askrjs/askr 0.3.0 → 0.4.0

package/dist/{interactions-CTeACdT_.js → interactions-D2BoREb-.js}

@@ -1,5 +1,4 @@
-import { t as composeRefs } from "./compose-ref-v0qGlHoN.js";
-import { a as composeHandlers, i as mergeProps, t as ariaDisabled } from "./aria-hKjThHcp.js";
+import { o as mergeProps, r as ariaDisabled, s as composeHandlers, t as composeRefs } from "./compose-ref-DWzdbxsD.js";
 //#region src/foundations/interactions/pressable.ts
 /** Produce click/keyboard props implementing 'press' semantics for an element. */
 function pressable({ disabled, onPress, isNativeButton = false }) {
@@ -270,11 +269,13 @@ function applyInteractionPolicy({ isNative, disabled, onPress, ref }) {
 *
 * Event handlers are composed (policy first).
 * Refs are always composed.
+* `disabled` is owned by the policy when it sets the key (even to undefined).
 * Policy props MUST take precedence to enforce invariants.
 */
 function mergeInteractionProps(childProps, policyProps, userProps) {
 	const mergedUserChild = userProps ? mergeProps(userProps, childProps) : childProps;
 	const out = mergeProps(policyProps, mergedUserChild);
+	if (Object.prototype.hasOwnProperty.call(policyProps, "disabled")) out.disabled = policyProps.disabled;
 	for (const k in out) {
 		if (!k.startsWith("on")) continue;
 		const policyHandler = policyProps?.[k];

package/dist/jsx-dev-runtime.d.ts

@@ -1,46 +1,69 @@
 import {
   IntrinsicFallbackProps,
+  IntrinsicElementForTag,
+  IntrinsicRef,
   JSXElementType,
   JSXComponent,
   KnownIntrinsicElementProps,
   JSXElement,
+  MathMLExtraTag,
   Props,
   Fragment,
 } from './elements.js';
-import { EagerControlPrimitive } from './eager-control.js';
 declare namespace JSX {
   type ElementType = string | symbol | ((props: never) => unknown);
   interface Element extends JSXElement {
     readonly __askrJsxElementBrand?: never;
   }
   interface KnownIntrinsicElements extends KnownIntrinsicElementProps {}
-  interface IntrinsicElements extends KnownIntrinsicElements {
-    [elem: string]:
-      | IntrinsicFallbackProps
-      | KnownIntrinsicElementProps[keyof KnownIntrinsicElementProps];
-  }
-  interface ElementAttributesProperty {
-    props: Props;
+  interface IntrinsicElements
+    extends KnownIntrinsicElements, OtherIntrinsicElements {
+    [elem: `${string}-${string}`]: IntrinsicFallbackProps;
   }
+  type OtherIntrinsicElements = {
+    [
+      Tag in Exclude<
+        | keyof HTMLElementTagNameMap
+        | keyof SVGElementTagNameMap
+        | Exclude<keyof MathMLElementTagNameMap, `${string}-${string}`>
+        | MathMLExtraTag,
+        keyof KnownIntrinsicElementProps
+      >
+    ]: OtherIntrinsicProps<Tag>;
+  };
   interface ElementChildrenAttribute {
     children: unknown;
   }
+
+  /** Attributes every element accepts, including function components. */
+  interface IntrinsicAttributes {
+    key?: string | number;
+  }
 }
-declare function jsxDEV(
-  type: EagerControlPrimitive,
-  props: Props | null,
-  key?: string | number,
-  isStaticChildren?: boolean
-): unknown;
+type OtherIntrinsicProps<Tag extends string> = Omit<
+  IntrinsicFallbackProps,
+  'ref'
+> & { ref?: IntrinsicRef<IntrinsicElementForTag<Tag>> };
+
+type OtherIntrinsicTag =
+  | Exclude<
+      | keyof HTMLElementTagNameMap
+      | keyof SVGElementTagNameMap
+      | Exclude<keyof MathMLElementTagNameMap, `${string}-${string}`>
+      | MathMLExtraTag,
+      keyof KnownIntrinsicElementProps
+    >
+  | `${string}-${string}`;
+
 declare function jsxDEV<TTag extends keyof KnownIntrinsicElementProps>(
   type: TTag,
-  props: KnownIntrinsicElementProps[TTag] | null,
+  props: KnownIntrinsicElementProps[NoInfer<TTag>] | null,
   key?: string | number,
   isStaticChildren?: boolean
 ): JSXElement;
-declare function jsxDEV<TTag extends string>(
-  type: Exclude<TTag, keyof KnownIntrinsicElementProps>,
-  props: IntrinsicFallbackProps | null,
+declare function jsxDEV<TTag extends OtherIntrinsicTag>(
+  type: TTag,
+  props: OtherIntrinsicProps<TTag> | null,
   key?: string | number,
   isStaticChildren?: boolean
 ): JSXElement;

package/dist/jsx-dev-runtime.js

@@ -1,9 +1,5 @@
-import { r as isEagerControlPrimitive } from "./control-C-ApnFs1.js";
 import { n as Fragment, r as STATIC_CHILDREN, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
 //#region src/jsx/jsx-dev-runtime.ts
-function annotatePropsUsage(props) {
-	return props ?? {};
-}
 function markStaticChildren(props) {
 	if (Array.isArray(props.children)) Object.defineProperty(props.children, STATIC_CHILDREN, {
 		value: true,
@@ -12,9 +8,8 @@ function markStaticChildren(props) {
 	return props;
 }
 function jsxDEV(type, props, key, isStaticChildren = false) {
-	const normalizedProps = annotatePropsUsage(props);
+	const normalizedProps = props ?? {};
 	const preparedProps = isStaticChildren ? markStaticChildren(normalizedProps) : normalizedProps;
-	if (isEagerControlPrimitive(type)) return type(preparedProps);
 	return {
 		$$typeof: ELEMENT_TYPE,
 		type,

package/dist/{jsx-runtime-CPJXAOBF.js → jsx-runtime-C4idqHY0.js}

@@ -1,4 +1,3 @@
-import { r as isEagerControlPrimitive } from "./control-C-ApnFs1.js";
 import { r as STATIC_CHILDREN, t as ELEMENT_TYPE } from "./jsx-DRS-qjiN.js";
 //#region src/jsx/jsx-runtime.ts
 function markStaticChildren(props) {
@@ -10,7 +9,6 @@ function markStaticChildren(props) {
 function jsxDEV(type, props, key, isStaticChildren = false) {
 	const normalizedProps = props ?? {};
 	if (isStaticChildren) markStaticChildren(normalizedProps);
-	if (typeof type === "function" && isEagerControlPrimitive(type)) return type(normalizedProps);
 	return {
 		$$typeof: ELEMENT_TYPE,
 		type,
@@ -19,19 +17,32 @@ function jsxDEV(type, props, key, isStaticChildren = false) {
 	};
 }
 function jsx(type, props, key) {
-	const normalizedProps = props ?? {};
-	if (typeof type === "function" && isEagerControlPrimitive(type)) return type(normalizedProps);
 	return {
 		$$typeof: ELEMENT_TYPE,
 		type,
-		props: normalizedProps,
+		props: props ?? {},
 		key: key ?? null
 	};
 }
+/**
+* Classic element factory. The automatic JSX transform falls back to it for a
+* `key` written after a spread (`<Row {...props} key={id} />`). The key and
+* the development-only `__self`/`__source` props are taken out of `props`,
+* and child arguments become `props.children`.
+*/
+function createElement(type, props, ...children) {
+	const { key, __self, __source, ...rest } = props ?? {};
+	const elementKey = key ?? void 0;
+	if (children.length > 1) {
+		rest.children = children;
+		return jsxs(type, rest, elementKey);
+	}
+	if (children.length === 1) rest.children = children[0];
+	return jsx(type, rest, elementKey);
+}
 function jsxs(type, props, key) {
 	const normalizedProps = props ?? {};
 	markStaticChildren(normalizedProps);
-	if (typeof type === "function" && isEagerControlPrimitive(type)) return type(normalizedProps);
 	return {
 		$$typeof: ELEMENT_TYPE,
 		type,
@@ -40,4 +51,4 @@ function jsxs(type, props, key) {
 	};
 }
 //#endregion
-export { jsxDEV as n, jsxs as r, jsx as t };
+export { jsxs as i, jsx as n, jsxDEV as r, createElement as t };

package/dist/jsx-runtime.js

@@ -1,3 +1,3 @@
 import { n as Fragment } from "./jsx-DRS-qjiN.js";
-import { n as jsxDEV, r as jsxs, t as jsx } from "./jsx-runtime-CPJXAOBF.js";
+import { i as jsxs, n as jsx, r as jsxDEV } from "./jsx-runtime-C4idqHY0.js";
 export { Fragment, jsx, jsxDEV, jsxs };

package/dist/jsx.d.ts

@@ -1,43 +1,66 @@
 import {
   IntrinsicFallbackProps,
+  IntrinsicElementForTag,
+  IntrinsicRef,
   KnownIntrinsicElementProps,
+  MathMLExtraTag,
   JSXElement,
   Props,
 } from './elements.js';
-import { EagerControlPrimitive } from './eager-control.js';
 declare namespace JSX {
   type ElementType = string | symbol | ((props: never) => unknown);
   interface Element extends JSXElement {
     readonly __askrJsxElementBrand?: never;
   }
   interface KnownIntrinsicElements extends KnownIntrinsicElementProps {}
-  interface IntrinsicElements extends KnownIntrinsicElements {
-    [elem: string]:
-      | IntrinsicFallbackProps
-      | KnownIntrinsicElementProps[keyof KnownIntrinsicElementProps];
-  }
-  interface ElementAttributesProperty {
-    props: Props;
+  interface IntrinsicElements
+    extends KnownIntrinsicElements, OtherIntrinsicElements {
+    [elem: `${string}-${string}`]: IntrinsicFallbackProps;
   }
+  type OtherIntrinsicElements = {
+    [
+      Tag in Exclude<
+        | keyof HTMLElementTagNameMap
+        | keyof SVGElementTagNameMap
+        | Exclude<keyof MathMLElementTagNameMap, `${string}-${string}`>
+        | MathMLExtraTag,
+        keyof KnownIntrinsicElementProps
+      >
+    ]: OtherIntrinsicProps<Tag>;
+  };
   interface ElementChildrenAttribute {
     children: unknown;
   }
+
+  /** Attributes every element accepts, including function components. */
+  interface IntrinsicAttributes {
+    key?: string | number;
+  }
 }
-declare function jsxDEV(
-  type: EagerControlPrimitive,
-  props: Props | null,
-  key?: string | number,
-  isStaticChildren?: boolean
-): unknown;
+type OtherIntrinsicProps<Tag extends string> = Omit<
+  IntrinsicFallbackProps,
+  'ref'
+> & { ref?: IntrinsicRef<IntrinsicElementForTag<Tag>> };
+
+type OtherIntrinsicTag =
+  | Exclude<
+      | keyof HTMLElementTagNameMap
+      | keyof SVGElementTagNameMap
+      | Exclude<keyof MathMLElementTagNameMap, `${string}-${string}`>
+      | MathMLExtraTag,
+      keyof KnownIntrinsicElementProps
+    >
+  | `${string}-${string}`;
+
 declare function jsxDEV<TTag extends keyof KnownIntrinsicElementProps>(
   type: TTag,
-  props: KnownIntrinsicElementProps[TTag] | null,
+  props: KnownIntrinsicElementProps[NoInfer<TTag>] | null,
   key?: string | number,
   isStaticChildren?: boolean
 ): JSXElement;
-declare function jsxDEV<TTag extends string>(
-  type: Exclude<TTag, keyof KnownIntrinsicElementProps>,
-  props: IntrinsicFallbackProps | null,
+declare function jsxDEV<TTag extends OtherIntrinsicTag>(
+  type: TTag,
+  props: OtherIntrinsicProps<TTag> | null,
   key?: string | number,
   isStaticChildren?: boolean
 ): JSXElement;
@@ -54,19 +77,14 @@ declare function jsxDEV(
   isStaticChildren?: boolean
 ): JSXElement;
 /** JSX factory for elements with a single or no child, used by the `jsxImportSource` transform. */
-declare function jsx(
-  type: EagerControlPrimitive,
-  props: Props | null,
-  key?: string | number
-): unknown;
 declare function jsx<TTag extends keyof KnownIntrinsicElementProps>(
   type: TTag,
-  props: KnownIntrinsicElementProps[TTag] | null,
+  props: KnownIntrinsicElementProps[NoInfer<TTag>] | null,
   key?: string | number
 ): JSXElement;
-declare function jsx<TTag extends string>(
-  type: Exclude<TTag, keyof KnownIntrinsicElementProps>,
-  props: IntrinsicFallbackProps | null,
+declare function jsx<TTag extends OtherIntrinsicTag>(
+  type: TTag,
+  props: OtherIntrinsicProps<TTag> | null,
   key?: string | number
 ): JSXElement;
 declare function jsx<TProps extends object>(
@@ -80,19 +98,14 @@ declare function jsx(
   key?: string | number
 ): JSXElement;
 /** JSX factory for elements with multiple static children, used by the `jsxImportSource` transform. */
-declare function jsxs(
-  type: EagerControlPrimitive,
-  props: Props | null,
-  key?: string | number
-): unknown;
 declare function jsxs<TTag extends keyof KnownIntrinsicElementProps>(
   type: TTag,
-  props: KnownIntrinsicElementProps[TTag] | null,
+  props: KnownIntrinsicElementProps[NoInfer<TTag>] | null,
   key?: string | number
 ): JSXElement;
-declare function jsxs<TTag extends string>(
-  type: Exclude<TTag, keyof KnownIntrinsicElementProps>,
-  props: IntrinsicFallbackProps | null,
+declare function jsxs<TTag extends OtherIntrinsicTag>(
+  type: TTag,
+  props: OtherIntrinsicProps<TTag> | null,
   key?: string | number
 ): JSXElement;
 declare function jsxs<TProps extends object>(
@@ -105,4 +118,15 @@ declare function jsxs(
   props: Props | null,
   key?: string | number
 ): JSXElement;
-export { jsxs, jsx, jsxDEV, JSX };
+/**
+ * Classic element factory. The automatic JSX transform falls back to it for a
+ * `key` written after a spread (`<Row {...props} key={id} />`). The key and
+ * the development-only `__self`/`__source` props are taken out of `props`,
+ * and child arguments become `props.children`.
+ */
+declare function createElement(
+  type: string | symbol | ((props: never) => unknown),
+  props: Record<string, unknown> | null,
+  ...children: unknown[]
+): JSXElement;
+export { createElement, jsxs, jsx, jsxDEV, JSX };

package/dist/{manifest-D1P3UNWV.js → manifest-CW9gyNBY.js}

@@ -1,5 +1,5 @@
-import { A as getDefaultRouteAuthOptions, B as setDefaultRouteBasePath, I as insertRecordSorted, M as getRouteList, N as getRouteRecords, V as withRouteTable, h as addRouteToStores, j as getDefaultRouteBasePath, s as normalizeRouteBasePath, v as createRouteTable, z as setDefaultRouteAuthOptions } from "./route-matching-CUzZ31gT.js";
-//#region src/runtime/execution-model.ts
+import { $ as withRouteTable, G as getRouteRecords, H as getDefaultRouteAuthOptions, J as insertRecordSorted, O as addRouteToStores, Q as setDefaultRouteBasePath, S as normalizeRouteBasePath, U as getDefaultRouteBasePath, W as getRouteList, Z as setDefaultRouteAuthOptions, j as createRouteTable } from "./resolution-Cx82-xjW.js";
+//#region src/common/execution-model.ts
 const EXECUTION_MODEL_KEY = Symbol.for("__ASKR_EXECUTION_MODEL__");
 function getExecutionModel() {
 	return globalThis[EXECUTION_MODEL_KEY];
@@ -7,7 +7,7 @@ function getExecutionModel() {
 function assertExecutionModel(model) {
 	const g = globalThis;
 	const cur = g[EXECUTION_MODEL_KEY];
-	if (cur && cur !== model) throw new Error(`[Askr] mixing execution models is not allowed (current: ${cur}, attempted: ${model}). Choose exactly one: createSPA, createSSR, or createIslands.`);
+	if (cur && cur !== model) throw new Error(`[Askr] mixing execution models is not allowed (current: ${cur}, attempted: ${model}). Choose exactly one: createSPA/hydrateSPA or createIslands.`);
 	if (!cur) g[EXECUTION_MODEL_KEY] = model;
 }
 //#endregion