@calmdown/pyxis 1.0.0-rc.1 → 1.0.0-rc.2

package/dist/core-dev.d.ts

@@ -3,10 +3,6 @@
  * Puts `T` into a union with `null` and `undefined`.
  */
 type Nil<T> = T | null | undefined;
-/**
- * Converts the union `U` into an intersection type.
- */
-type Intersection<U, TEmpty = {}> = [U] extends [never] ? TEmpty : (U extends any ? (u: U) => void : never) extends ((i: infer I) => void) ? I : never;
 /**
  * A type describing any map of intrinsic elements and their props.
  */
@@ -156,7 +152,7 @@ interface Extension<TNode, TExtensionKey extends string = string, TIntrinsicElem
   readonly set: (node: TNode, prop: string, value: any, group: MountingGroup<TNode>) => void;
 }
 type ExtensionsType<TNode> = { [_ in string]?: Extension<TNode>; };
-type ExtensionProps<TExtensionKey extends string, TProps extends PropsType> = Intersection<{ [TPropKey in keyof TProps]-?: TPropKey extends string ? { readonly [_ in `${TExtensionKey}:${TPropKey}`]?: TProps[TPropKey]; } : never; }[keyof TProps]>;
+type ExtensionProps<TExtensionKey extends string, TProps extends PropsType> = { readonly [TExtPropKey in `${TExtensionKey}:${keyof TProps & string}`]?: (TExtPropKey extends `${TExtensionKey}:${infer TPropKey}` ? TProps[TPropKey] : never); };
 //#endregion
 //#region src/data/Atom.d.ts
 /**
@@ -164,7 +160,7 @@ type ExtensionProps<TExtensionKey extends string, TProps extends PropsType> = In
  */
 declare const S_ATOM: unique symbol;
 /** Contract for Atoms where they need to be read. */
-interface ReadonlyAtom<out T> extends DependencyList {
+interface ReadAtom<out T> extends DependencyList {
   /** Pyxis Atom type guard marker. */
   readonly [S_ATOM]: true;
   /**
@@ -183,7 +179,7 @@ interface ReadonlyAtom<out T> extends DependencyList {
  * @see {@link read}
  * @see {@link write}
  */
-interface Atom<T = unknown> extends ReadonlyAtom<T> {
+interface Atom<T = unknown> extends ReadAtom<T> {
   /**
    * Sets the value of this Atom. Does nothing if this Atom is readonly. Only use this method when
    * the target is guaranteed to be an Atom, otherwise it is recommended to use the `write` or
@@ -213,7 +209,7 @@ type MaybeAtom<T> = Atom<T> | T;
  * @see {@link peek}
  * @see {@link isAtom}
  */
-type MaybeReadonlyAtom<T> = ReadonlyAtom<T> | T;
+type MaybeReadAtom<T> = ReadAtom<T> | T;
 /**
  * Creates an empty Atom; i.e. value set to `undefined`.
  */
@@ -228,7 +224,7 @@ declare function atomOf<T>(initialValue: MaybeAtom<T>, lifecycle?: Lifecycle, de
  * Atom type guard, checks if the provided input is an Atom.
  */
 declare function isAtom<T = unknown>(input: Nil<MaybeAtom<T>>): input is Atom<T>;
-declare function isAtom<T = unknown>(input: Nil<MaybeReadonlyAtom<T>>): input is ReadonlyAtom<T>;
+declare function isAtom<T = unknown>(input: Nil<MaybeReadAtom<T>>): input is ReadAtom<T>;
 declare function isAtom<T = unknown>(input: unknown): input is Atom<T>;
 /**
  * Checks if the provided input is an Atom and reads its value. Non-atom inputs are returned as-is.
@@ -238,7 +234,7 @@ declare function isAtom<T = unknown>(input: unknown): input is Atom<T>;
  * @see {@link peek}
  * @see {@link update}
  */
-declare function read<A>(input: A): A extends MaybeReadonlyAtom<infer T> ? T : never;
+declare function read<A>(input: A): A extends MaybeReadAtom<infer T> ? T : never;
 /**
  * Checks if the provided input is an Atom and reads its value. Non-atom inputs are returned as-is.
  * Does NOT report read access when inside an effect.
@@ -247,7 +243,7 @@ declare function read<A>(input: A): A extends MaybeReadonlyAtom<infer T> ? T : n
  * @see {@link write}
  * @see {@link update}
  */
-declare function peek<A>(input: A): A extends MaybeReadonlyAtom<infer T> ? T : never;
+declare function peek<A>(input: A): A extends MaybeReadAtom<infer T> ? T : never;
 /**
  * Checks if the provided input is an Atom, writes its value and returns the new value.
  *
@@ -311,7 +307,7 @@ type JsxChildrenProp<T> = T extends readonly [any, any, ...any[]] ? T extends re
 /**
  * Primitive types accepted to render as text.
  */
-type JsxText = MaybeReadonlyAtom<Nil<string | number | boolean | bigint>>;
+type JsxText = MaybeReadAtom<Nil<string | number | boolean | bigint>>;
 /**
  * Describes the objects returned by JSX factories.
  *
@@ -517,9 +513,9 @@ interface ReadonlyList<T> extends Iterable<T>, DependencyList {
    */
   delta(): ListDelta<T> | null;
   /**
-   * Gets the underlying array of items. The array is read-only, attempts to mutate this array
-   * will cause observers to go out of sync.
-   * Reactive in effects and derivations.
+   * Gets the underlying array of items. The array is read-only, mutating it will cause observers
+   * to go out of sync.
+   * Non-reactive in effects and derivations.
    */
   raw(): readonly T[];
   /**
@@ -650,13 +646,13 @@ interface ShowDataProps<T> {
   when?: MaybeAtom<boolean>;
   proxy?: never;
   data: MaybeAtom<T>;
-  children: [template: DataTemplate<T> | ReadonlyAtom<Nil<DataTemplate<T>>>];
+  children: [template: DataTemplate<T> | ReadAtom<Nil<DataTemplate<T>>>];
 }
 interface ShowProxyDataProps<T, P extends readonly (keyof T)[]> {
   when?: MaybeAtom<boolean>;
   proxy: P;
   data: MaybeAtom<T>;
-  children: [template: DataTemplate<Proxied<T, P>> | ReadonlyAtom<Nil<DataTemplate<Proxied<T, P>>>>];
+  children: [template: DataTemplate<Proxied<T, P>> | ReadAtom<Nil<DataTemplate<Proxied<T, P>>>>];
 }
 /**
  * The built-in Show Component dynamically mounting and unmounting a Template
@@ -700,7 +696,7 @@ declare function consumerOf<T>(context: Context<T>): Atom<T> | null;
  * `consumerOf(context)`.
  * @see {@link consumerOf}
  */
-declare function host<T>(context: Context<T>, defaultValue?: T, devId?: string): ContextAtom<T>;
+declare function host<C>(context: C, defaultValue?: C extends Context<infer T> ? T : never, devId?: string): C extends Context<infer T> ? ContextAtom<T> : never;
 //#endregion
 //#region src/data/Effect.d.ts
 interface EffectBlock {
@@ -715,6 +711,11 @@ interface Effect<T> {}
  * unmount.
  */
 declare function effect(block: EffectBlock, lifecycle?: Lifecycle): void;
+/**
+ * Runs a block of code removed from any effects. Accessing atoms within this block will be ignored
+ * by any effect that may otherwise be observing this code.
+ */
+declare function noEffect<T>(block: () => T): T;
 //#endregion
 //#region src/data/Derivation.d.ts
 /**
@@ -773,8 +774,10 @@ declare function peeks(strings: TemplateStringsArray, ...values: JsxText[]): str
 //#region src/Builder.d.ts
 interface PyxisBuilder<TNode, TIntrinsicElements extends ElementsType> {
   build: () => Renderer<TNode, TIntrinsicElements>;
-  extend: <TExtensionKey extends string, TExtendedIntrinsicElements extends ElementsType>(extensionKey: TExtensionKey, extension: (extensionKey: TExtensionKey, intrinsicElements: TIntrinsicElements) => TExtendedIntrinsicElements) => PyxisBuilder<TNode, TExtendedIntrinsicElements>;
+  extend: <TExtensionKey extends string, TExtendedIntrinsicElements extends ElementsType>(extensionKey: TExtensionKey, extension: (extensionKey: TExtensionKey, intrinsicElements: TIntrinsicElements) => TExtendedIntrinsicElements) => PyxisBuilder<TNode, Merged<TExtendedIntrinsicElements>>;
 }
+type MergeIntersection<T> = { [K in keyof T]: T[K]; } & {};
+type Merged<T> = { [K in keyof T]: MergeIntersection<T[K]>; };
 declare function pyxis<TNode, TIntrinsicElements extends ElementsType>(adapter: Adapter<TNode, TIntrinsicElements>): PyxisBuilder<TNode, TIntrinsicElements>;
 //#endregion
 //#region src/jsx.d.ts
@@ -783,5 +786,5 @@ declare function jsx<TProps extends PropsType>(component: Component<TProps>, pro
 declare function jsxs(tagName: string, props: PropsType, key?: any): JsxResult;
 declare function jsxs<TProps extends PropsType>(component: Component<TProps>, props: TProps, key?: any): JsxResult;
 //#endregion
-export { type Adapter, type Atom, ChangeKind, type Component, type Context, type DataTemplate, type Derivation, type EffectBlock, type ElementsOf, type ElementsType, type Equals, type Extension, type ExtensionProps, type ExtensionsType, Fragment, type FragmentProps, type HNode, type Intersection, Iterator, type JsxChildren, type JsxChildrenProp, type JsxObject, type JsxProps, type JsxResult, type JsxText, type Lifecycle, type List, type ListChange, type ListCleared, type ListDelta, type ListItemChanged, type ListItemInserted, type ListItemRemoved, type MaybeAtom, type MaybeReadonlyAtom, type MountBlock, type MountingGroup, Native, type Nil, type NodeType, type PropsOf, type PropsType, type Proxied, type ProxyAtom, type ProxyIteratorProps, type PyxisBuilder, type ReadonlyAtom, type ReadonlyList, RefExtension, type RefExtensionType, type RefFn, type RemountIteratorProps, type Renderer, type S_ATOM, type S_NODE_TYPE, Show, type ShowProps, type TickFn, type UnmountBlock, type WithChildren, atomOf, bind, component, consumerOf, createContext, derived, effect, fork, getLifecycle, host, insert, isAtom, jsx, jsxs, listOf, mount, mountJsx, mounted, peek, peeks, proxyOf, pyxis, read, reads, sync, tick, tock, track, unmount, unmounted, untrack, update, withLifecycle, write };
+export { type Adapter, type Atom, ChangeKind, type Component, type Context, type DataTemplate, type Derivation, type EffectBlock, type ElementsOf, type ElementsType, type Equals, type Extension, type ExtensionProps, type ExtensionsType, Fragment, type FragmentProps, type HNode, Iterator, type JsxChildren, type JsxChildrenProp, type JsxObject, type JsxProps, type JsxResult, type JsxText, type Lifecycle, type List, type ListChange, type ListCleared, type ListDelta, type ListItemChanged, type ListItemInserted, type ListItemRemoved, type MaybeAtom, type MaybeReadAtom, type MountBlock, type MountingGroup, Native, type Nil, type NodeType, type PropsOf, type PropsType, type Proxied, type ProxyAtom, type ProxyIteratorProps, type PyxisBuilder, type ReadAtom, type ReadonlyList, RefExtension, type RefExtensionType, type RefFn, type RemountIteratorProps, type Renderer, type S_ATOM, type S_NODE_TYPE, Show, type ShowProps, type TickFn, type UnmountBlock, type WithChildren, atomOf, bind, component, consumerOf, createContext, derived, effect, fork, getLifecycle, host, insert, isAtom, jsx, jsxs, listOf, mount, mountJsx, mounted, noEffect, peek, peeks, proxyOf, pyxis, read, reads, sync, tick, tock, track, unmount, unmounted, untrack, update, withLifecycle, write };
 //# sourceMappingURL=core-dev.d.ts.map

package/dist/core-dev.js

@@ -388,6 +388,19 @@ function reportAccess(atom) {
 	}
 }
 /**
+* Runs a block of code removed from any effects. Accessing atoms within this block will be ignored
+* by any effect that may otherwise be observing this code.
+*/
+function noEffect(block) {
+	const previousEffect = $currentEffect;
+	$currentEffect = null;
+	try {
+		return block();
+	} finally {
+		$currentEffect = previousEffect;
+	}
+}
+/**
 * Asserts that the current code is not running within an effect block.
 * Only used in development; In production, this function should be removed by the bundler.
 */
@@ -503,97 +516,6 @@ function Text(jsx, hParent, nUsedParent, _nRealParent, nBefore, isBatch) {
 	insert(node, null, hParent, nUsedParent, nBefore, isBatch);
 }
 
-//#endregion
-//#region src/data/Context.ts
-function createContext() {
-	let $symbol = Symbol();
-	{
-		const devId = arguments[0];
-		$symbol = globalThis.__PYXIS_HMR__.state.restore(createContext, devId) ?? $symbol;
-		globalThis.__PYXIS_HMR__.state.preserve(createContext, devId, $symbol);
-	}
-	return { $symbol };
-}
-let $currentContainer;
-let $isNewContainer = false;
-/** @internal */
-function getContextContainer() {
-	return $currentContainer;
-}
-/** @internal */
-function setContextContainer(container) {
-	$currentContainer = container;
-	$isNewContainer = false;
-}
-/**
-* Gets a consumer Atom for the given Context. This atom will be read-only.
-* @see {@link host}
-*/
-function consumerOf(context) {
-	__DEV__assertNotEffect();
-	const { $symbol } = context;
-	let ptr = $currentContainer;
-	let atom;
-	while (ptr && !(atom = ptr[$symbol])) ptr = ptr.$parent;
-	return atom ?? null;
-}
-function host(context, defaultValue) {
-	__DEV__assertNotEffect();
-	if (!$isNewContainer || !$currentContainer) {
-		$isNewContainer = true;
-		$currentContainer = { $parent: $currentContainer };
-	}
-	const lifecycle = getLifecycle();
-	{
-		const devId = arguments[2];
-		globalThis.__PYXIS_HMR__.state.restore(lifecycle, devId, (value) => {
-			defaultValue = value;
-		});
-	}
-	const localAtom = {
-		[S_ATOM]: true,
-		$lifecycle: lifecycle,
-		$tracksValue: true,
-		$value: defaultValue,
-		get: getLocalValue,
-		set: setValue$1
-	};
-	if (defaultValue === void 0) {
-		const ancestorAtom = consumerOf(context);
-		if (ancestorAtom) {
-			localAtom.get = getAncestorValue;
-			localAtom.$ancestor = ancestorAtom;
-			link(lifecycle, ancestorAtom, localAtom.$dep = {
-				$fn: notify$1,
-				$a0: localAtom
-			});
-		}
-	}
-	localAtom.$devId = arguments[2];
-	if (Object.hasOwn($currentContainer, context.$symbol)) throw new Error("Component declares multiple hosts of the same Context.");
-	$currentContainer[context.$symbol] = localAtom;
-	return localAtom;
-}
-function getAncestorValue() {
-	return this.$ancestor.get();
-}
-function getLocalValue() {
-	return this.$value;
-}
-function setValue$1(value) {
-	let oldValue;
-	if (this.$ancestor) {
-		oldValue = this.$ancestor.get();
-		unlink(this.$dep);
-		this.$dep = null;
-		this.$ancestor = null;
-		this.get = getLocalValue;
-	} else oldValue = this.$value;
-	this.$value = value;
-	globalThis.__PYXIS_HMR__.state.preserve(this.$lifecycle, this.$devId, value);
-	return !Object.is(oldValue, value);
-}
-
 //#endregion
 //#region src/Renderer.ts
 /** @internal */
@@ -635,7 +557,6 @@ function fork(hParent, hBefore = null) {
 		$scheduler: ng.$scheduler,
 		$extensions: ng.$extensions,
 		$life: 1,
-		$context: getContextContainer(),
 		$pg: ng,
 		$ng: null
 	};
@@ -694,7 +615,6 @@ function mount(jsx, hGroup, nUsedParent, nRealParent, nBefore, isBatch) {
 		return;
 	}
 	const previousLifecycle = setLifecycle(hGroup);
-	setContextContainer(hGroup.$context);
 	try {
 		mountJsx(jsx, hGroup, nUsedParent, nRealParent, nBefore, isBatch);
 	} finally {
@@ -838,6 +758,97 @@ function Fragment(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 	mountJsx(jsx.children, hParent, nUsedParent, nRealParent, nBefore, isBatch);
 }
 
+//#endregion
+//#region src/data/Context.ts
+function createContext() {
+	let $symbol = Symbol();
+	{
+		const devId = arguments[0];
+		$symbol = globalThis.__PYXIS_HMR__.state.restore(createContext, devId) ?? $symbol;
+		globalThis.__PYXIS_HMR__.state.preserve(createContext, devId, $symbol);
+	}
+	return { $symbol };
+}
+let $currentContainer = null;
+let $isNewContainer = false;
+/** @internal */
+function getContextContainer() {
+	return $currentContainer;
+}
+/** @internal */
+function setContextContainer(container) {
+	$currentContainer = container;
+	$isNewContainer = false;
+}
+/**
+* Gets a consumer Atom for the given Context. This atom will be read-only.
+* @see {@link host}
+*/
+function consumerOf(context) {
+	__DEV__assertNotEffect();
+	const { $symbol } = context;
+	let ptr = $currentContainer;
+	let atom;
+	while (ptr && !(atom = ptr[$symbol])) ptr = ptr.$parent;
+	return atom ?? null;
+}
+function host(context, defaultValue) {
+	__DEV__assertNotEffect();
+	if (!$isNewContainer || !$currentContainer) {
+		$isNewContainer = true;
+		$currentContainer = { $parent: $currentContainer };
+	}
+	const lifecycle = getLifecycle();
+	{
+		const devId = arguments[2];
+		globalThis.__PYXIS_HMR__.state.restore(lifecycle, devId, (value) => {
+			defaultValue = value;
+		});
+	}
+	const localAtom = {
+		[S_ATOM]: true,
+		$lifecycle: lifecycle,
+		$tracksValue: true,
+		$value: defaultValue,
+		get: getLocalValue,
+		set: setValue$1
+	};
+	if (defaultValue === void 0) {
+		const ancestorAtom = consumerOf(context);
+		if (ancestorAtom) {
+			localAtom.get = getAncestorValue;
+			localAtom.$ancestor = ancestorAtom;
+			link(lifecycle, ancestorAtom, localAtom.$dep = {
+				$fn: notify$1,
+				$a0: localAtom
+			});
+		}
+	}
+	localAtom.$devId = arguments[2];
+	if (Object.hasOwn($currentContainer, context.$symbol)) throw new Error("Component declares multiple hosts of the same Context.");
+	$currentContainer[context.$symbol] = localAtom;
+	return localAtom;
+}
+function getAncestorValue() {
+	return this.$ancestor.get();
+}
+function getLocalValue() {
+	return this.$value;
+}
+function setValue$1(value) {
+	let oldValue;
+	if (this.$ancestor) {
+		oldValue = this.$ancestor.get();
+		unlink(this.$dep);
+		this.$dep = null;
+		this.$ancestor = null;
+		this.get = getLocalValue;
+	} else oldValue = this.$value;
+	this.$value = value;
+	globalThis.__PYXIS_HMR__.state.preserve(this.$lifecycle, this.$devId, value);
+	return !Object.is(oldValue, value);
+}
+
 //#endregion
 //#region src/data/ListDelta.ts
 /** @internal */
@@ -1269,6 +1280,7 @@ function Iterator(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 	const isProxy = proxyKeys !== void 0;
 	const template = jsx.children[0];
 	const hGroup = fork(hParent);
+	const context = getContextContainer();
 	const { adapter } = hGroup;
 	const shouldBatch = Boolean(adapter.batch);
 	const nListEndMarker = adapter.marker("/Iterator");
@@ -1307,6 +1319,7 @@ function Iterator(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 						unmount(item);
 						ref = items[oi]?.$marker ?? nListEndMarker;
 						insert(item.$marker, null, item, nRealParent, ref, false);
+						setContextContainer(context);
 						mount(withLifecycle(item, template, item.$data = change.newItem), item, nRealParent, nRealParent, ref, false);
 					}
 					break;
@@ -1323,6 +1336,7 @@ function Iterator(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 							nBatchBefore = null;
 						} else nBatchBefore = ref;
 						insert(item.$marker, null, item, nBatchParent, nBatchBefore, isLocalBatch);
+						setContextContainer(context);
 						mount(withLifecycle(item, template, item.$data), item, nBatchParent, nRealParent, nBatchBefore, isLocalBatch);
 						if (isLocalBatch && (inserted >= lengthChange || !(tmp = changes[ci + 1]) || tmp.kind !== 2 || tmp.index !== ni)) {
 							adapter.insert(nBatchParent, nRealParent, ref);
@@ -1361,6 +1375,7 @@ function Iterator(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 			item = newItems[tmp.$index] = recycled[ri--];
 			updateProxy(item.$data, tmp.$item, proxyKeys);
 			track(item, hGroup, ref = newItems[tmp.$index + 1]);
+			setContextContainer(context);
 			mount(withLifecycle(item, template, item.$data), item, nRealParent, nRealParent, ref?.$marker ?? nListEndMarker, false);
 		}
 		while (ri >= 0) {
@@ -1451,6 +1466,7 @@ function Show(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 		return;
 	}
 	const hGroup = fork(hParent);
+	const context = getContextContainer();
 	let nMarker = nBefore;
 	effect(() => {
 		if (read(when) === false) return;
@@ -1461,6 +1477,7 @@ function Show(jsx, hParent, nUsedParent, nRealParent, nBefore, isBatch) {
 			nBatchParent = adapter.batch();
 			nBatchBefore = null;
 		}
+		setContextContainer(context);
 		mount(withLifecycle(hGroup, read(template), read(dataOrProxy)), hGroup, nBatchParent, nRealParent, nBatchBefore, isLocalBatch || isBatch);
 		if (isLocalBatch) adapter.insert(nBatchParent, nUsedParent, nMarker);
 		return () => unmount(hGroup);
@@ -1581,7 +1598,6 @@ function delta() {
 	return this.$delta;
 }
 function raw() {
-	reportAccess(this);
 	return this.$items;
 }
 function forEach(callback, thisArg) {
@@ -1787,6 +1803,7 @@ function component(block) {
 				insert(nMarker, null, hParent, nUsedParent, nBefore, isBatch);
 				unmounted(globalThis.__PYXIS_HMR__.component.subscribe(devId, (impl) => {
 					unmount(hGroup);
+					setContextContainer(context);
 					mount({
 						...jsx,
 						[S_COMPONENT]: (() => mountJsx(impl(jsx), hGroup, nUsedParent, nRealParent, nMarker, isBatch))
@@ -1824,5 +1841,5 @@ function jsxs(componentOrTagName, props, key) {
 }
 
 //#endregion
-export { ChangeKind, Fragment, Iterator, Native, RefExtension, Show, atomOf, bind, component, consumerOf, createContext, derived, effect, fork, getLifecycle, host, insert, isAtom, jsx, jsxs, listOf, mount, mountJsx, mounted, peek, peeks, proxyOf, pyxis, read, reads, sync, tick, tock, track, unmount, unmounted, untrack, update, withLifecycle, write };
+export { ChangeKind, Fragment, Iterator, Native, RefExtension, Show, atomOf, bind, component, consumerOf, createContext, derived, effect, fork, getLifecycle, host, insert, isAtom, jsx, jsxs, listOf, mount, mountJsx, mounted, noEffect, peek, peeks, proxyOf, pyxis, read, reads, sync, tick, tock, track, unmount, unmounted, untrack, update, withLifecycle, write };
 //# sourceMappingURL=core-dev.js.map