@manyducks.co/dolla 2.0.0-alpha.25 → 2.0.0-alpha.27

package/dist/core/dolla.d.ts

@@ -2,7 +2,8 @@ import { type CrashViewProps } from "../views/default-crash-view.js";
 import { Batch } from "./batch.js";
 import { type Markup, type MarkupElement } from "./markup.js";
 import { type ViewElement, type ViewFunction } from "./nodes/view.js";
-import { createRef, createState, createWatcher, derive, isRef, isState, toState, toValue } from "./state.js";
+import { createRef, isRef } from "./ref.js";
+import { createState, createWatcher, derive, isState, toState, toValue } from "./state.js";
 import { HTTP } from "../modules/http.js";
 import { I18n } from "../modules/i18n.js";
 import { Router } from "../modules/router.js";
@@ -46,6 +47,7 @@ export interface DollaModuleConfig<Options = never> {
 export declare class Dolla {
     #private;
     readonly batch: Batch;
+    private readonly stats;
     readonly http: HTTP;
     readonly i18n: I18n;
     readonly router: Router;

package/dist/core/markup.d.ts

@@ -1,7 +1,7 @@
-import type { Renderable, Stringable } from "../types.js";
+import type { Renderable } from "../types.js";
 import type { Dolla } from "./dolla.js";
 import { type ViewContext, type ViewFunction, type ViewResult } from "./nodes/view.js";
-import { MaybeState, type State } from "./state.js";
+import { type MaybeState, type State } from "./state.js";
 export interface ElementContext {
     /**
      * The root Dolla instance this element belongs to.
@@ -19,6 +19,10 @@ export interface ElementContext {
      * Whether to create DOM nodes in the SVG namespace. An `<svg>` element will set this to true and pass it down to children.
      */
     isSVG?: boolean;
+    /**
+     * The name of the nearest parent view.
+     */
+    viewName?: string;
 }
 /**
  * Markup is a set of element metadata that hasn't been constructed into a MarkupElement yet.
@@ -47,6 +51,7 @@ export interface MarkupElement {
     mount(parent: Node, after?: Node): void;
     /**
      * Disconnect from the DOM and clean up. If parentIsUnmounting, DOM operations are skipped.
+     * parentIsUnmounting is set for all children by HTML nodes when they unmount.
      */
     unmount(parentIsUnmounting?: boolean): void;
 }
@@ -55,12 +60,7 @@ export declare function isMarkupElement(value: any): value is MarkupElement;
 export declare function toMarkup(renderables: Renderable | Renderable[]): Markup[];
 export interface MarkupAttributes {
     $text: {
-        value: MaybeState<Stringable>;
-    };
-    $cond: {
-        $predicate: State<any>;
-        thenContent?: Renderable;
-        elseContent?: Renderable;
+        value: any;
     };
     $repeat: {
         $items: State<any[]>;
@@ -68,7 +68,7 @@ export interface MarkupAttributes {
         renderFn: ($item: State<any>, $index: State<number>, c: ViewContext) => ViewResult;
     };
     $observer: {
-        states: State<any>[];
+        sources: MaybeState<any>[];
         renderFn: (...items: any) => Renderable;
     };
     $outlet: {
@@ -99,7 +99,7 @@ export declare function cond(predicate: MaybeState<any>, thenContent?: Renderabl
  */
 export declare function repeat<T>(items: MaybeState<T[]>, keyFn: (value: T, index: number) => string | number | symbol, renderFn: ($value: State<T>, $index: State<number>, ctx: ViewContext) => ViewResult): Markup;
 /**
- * Render `content` into a `parent` node anywhere in the page, rather than at its position in the view.
+ * Renders `content` into a `parent` node anywhere in the page, rather than its usual position in the view.
  */
 export declare function portal(parent: Node, content: Renderable): Markup;
 /**

package/dist/core/nodes/dom.d.ts

@@ -0,0 +1,13 @@
+import type { MarkupElement } from "../markup";
+import { IS_MARKUP_ELEMENT } from "../symbols";
+/**
+ * Wraps any plain DOM node in a MarkupElement interface.
+ */
+export declare class DOMNode implements MarkupElement {
+    [IS_MARKUP_ELEMENT]: boolean;
+    node: Node;
+    get isMounted(): boolean;
+    constructor(node: Node);
+    mount(parent: Node, after?: Node): void;
+    unmount(parentIsUnmounting?: boolean): void;
+}

package/dist/core/nodes/html.d.ts

@@ -1,6 +1,7 @@
 import { type ElementContext, type Markup, type MarkupElement } from "../markup.js";
-import { type Ref, type State, type StopFunction } from "../state.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { type Ref } from "../ref.js";
+import { type State, type StopFunction } from "../state.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
 type HTMLOptions = {
     elementContext: ElementContext;
     tag: string;
@@ -8,9 +9,10 @@ type HTMLOptions = {
     children?: Markup[];
 };
 export declare class HTML implements MarkupElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
+    [IS_MARKUP_ELEMENT]: boolean;
     node: HTMLElement | SVGElement;
     props: Record<string, any>;
+    childMarkup: Markup[];
     children: MarkupElement[];
     stopCallbacks: StopFunction[];
     elementContext: ElementContext;

package/dist/core/nodes/observer.d.ts

@@ -1,10 +1,10 @@
 import type { Renderable } from "../../types.js";
 import { type ElementContext, type MarkupElement } from "../markup.js";
-import { type State } from "../state.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { type MaybeState } from "../state.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
 interface ObserverOptions {
     elementContext: ElementContext;
-    states: State<any>[];
+    sources: MaybeState<any>[];
     renderFn: (...values: any) => Renderable;
 }
 /**
@@ -12,16 +12,15 @@ interface ObserverOptions {
  * Used when a State is passed as a child in a view template.
  */
 export declare class Observer implements MarkupElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
-    node: Node;
-    endNode: Node;
+    [IS_MARKUP_ELEMENT]: boolean;
+    node: Text;
     children: MarkupElement[];
     renderFn: (...values: any) => Renderable;
     elementContext: ElementContext;
     watcher: import("../state.js").StateWatcher;
-    sources: State<any>[];
+    sources: MaybeState<any>[];
     get isMounted(): boolean;
-    constructor({ states, renderFn, elementContext }: ObserverOptions);
+    constructor({ sources, renderFn, elementContext }: ObserverOptions);
     mount(parent: Node, after?: Node): void;
     unmount(parentIsUnmounting?: boolean): void;
     cleanup(parentIsUnmounting: boolean): void;

package/dist/core/nodes/outlet.d.ts

@@ -1,11 +1,11 @@
 import { type MarkupElement } from "../markup.js";
-import { MaybeState, type StopFunction } from "../state.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { type MaybeState, type StopFunction } from "../state.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
 /**
  * Manages several MarkupElements as one.
  */
 export declare class Outlet implements MarkupElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
+    [IS_MARKUP_ELEMENT]: boolean;
     node: Text;
     isMounted: boolean;
     source: MaybeState<MarkupElement[]>;

package/dist/core/nodes/portal.d.ts

@@ -1,6 +1,6 @@
 import { type Renderable } from "../../types.js";
 import { type ElementContext, type MarkupElement } from "../markup.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
 interface PortalConfig {
     content: Renderable;
     parent: Node;
@@ -10,7 +10,7 @@ interface PortalConfig {
  * Renders content into a specified parent node.
  */
 export declare class Portal implements MarkupElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
+    [IS_MARKUP_ELEMENT]: boolean;
     config: PortalConfig;
     element?: MarkupElement;
     get isMounted(): boolean;

package/dist/core/nodes/repeat.d.ts

@@ -1,6 +1,6 @@
 import { type ElementContext, type MarkupElement } from "../markup.js";
 import { type Setter, type State, type StopFunction } from "../state.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
 import { type ViewContext, type ViewResult } from "./view.js";
 interface RepeatOptions<T> {
     elementContext: ElementContext;
@@ -17,9 +17,8 @@ type ConnectedItem<T> = {
     element: MarkupElement;
 };
 export declare class Repeat<T> implements MarkupElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
-    node: Node;
-    endNode: Node;
+    [IS_MARKUP_ELEMENT]: boolean;
+    node: Text;
     $items: State<T[]>;
     stopCallback?: StopFunction;
     connectedItems: ConnectedItem<T>[];

package/dist/core/nodes/view.d.ts

@@ -1,7 +1,8 @@
 import type { Logger } from "../dolla.js";
 import { type ElementContext, type Markup, type MarkupElement } from "../markup.js";
 import { type MaybeState, type State, type StateValues, type StopFunction } from "../state.js";
-import { TYPE_MARKUP_ELEMENT } from "../symbols.js";
+import { IS_MARKUP_ELEMENT } from "../symbols.js";
+import { Emitter } from "@manyducks.co/emitter";
 /**
  * Any valid value that a View can return.
  */
@@ -63,8 +64,14 @@ export interface ViewContext extends Logger {
      */
     outlet(): Markup;
 }
+type ViewEvents = {
+    beforeMount: [];
+    mounted: [];
+    beforeUnmount: [];
+    unmounted: [];
+};
 export declare class View<P> implements ViewElement {
-    [TYPE_MARKUP_ELEMENT]: boolean;
+    [IS_MARKUP_ELEMENT]: boolean;
     uniqueId: string;
     _elementContext: ElementContext;
     _logger: Logger;
@@ -75,15 +82,13 @@ export declare class View<P> implements ViewElement {
     _$children: State<MarkupElement[]>;
     _setChildren: import("../state.js").Setter<MarkupElement[], MarkupElement[]>;
     _watcher: import("../state.js").StateWatcher;
-    _beforeMountCallbacks: (() => any)[];
-    _onMountCallbacks: (() => any)[];
-    _beforeUnmountCallbacks: (() => any)[];
-    _onUnmountCallbacks: (() => any)[];
+    _emitter: Emitter<ViewEvents>;
     constructor(elementContext: ElementContext, view: ViewFunction<P>, props: P, children?: Markup[]);
     get node(): Node;
     isMounted: boolean;
     mount(parent: Node, after?: Node): void;
     unmount(parentIsUnmounting?: boolean): void;
     setChildView(fn: ViewFunction<{}>): View<{}>;
-    initialize(): void;
+    private _initialize;
 }
+export {};

package/dist/core/ref.d.ts

@@ -0,0 +1,29 @@
+/**
+ * A `Ref` is a function that stores a value when called with a single argument,
+ * and returns the most recently stored value when called with no arguments.
+ */
+export interface Ref<T> {
+    /**
+     * Get: returns the current value stored in the ref (or undefined).
+     */
+    (): T | undefined;
+    /**
+     * Set: stores a new `value` in the ref.
+     */
+    <T>(value: T | undefined): void;
+}
+/**
+ * A Ref is a function that returns the last argument it was called with.
+ * Calling it with no arguments will simply return the latest value.
+ * Calling it with an argument will store that value and immediately return it.
+ *
+ * @param value - An (optional) initial value to store.
+ *
+ * @example
+ * const ref = createRef(5);
+ * ref(); // 5
+ * ref(500);
+ * ref(); // 500
+ */
+export declare function createRef<T>(value?: T): Ref<T>;
+export declare function isRef<T extends Node>(value: any): value is Ref<T>;

package/dist/core/state.d.ts

@@ -1,5 +1,5 @@
 import { strictEqual } from "../utils";
-import { TYPE_STATE } from "./symbols";
+import { IS_STATE } from "./symbols";
 /**
  * Stops the observer that created it when called.
  */
@@ -25,7 +25,7 @@ export interface CreateStateOptions<T> {
 export interface WatchOptions<T> {
     /**
      * If true the watch callback will be called for the first time on the next change.
-     * By default the callback is called immediately with the state's current value.
+     * Callback is immediately called with the state's current value by default.
      */
     lazy?: boolean;
 }
@@ -49,34 +49,7 @@ export type SetFunction<I, O = I> = (current: I) => O;
 /** Callback that updates the value of a state. */
 export type Setter<I, O = I> = (value: SetAction<I, O>) => void;
 export type MaybeState<T> = State<T> | T;
-/**
- * A state and setter in one. Useful for passing states that are intended to be updated by subviews.
- */
-export interface SettableState<I, O = I> extends State<I> {
-    /**
-     * Updates the state's value.
-     */
-    set(next: O): void;
-    /**
-     * Takes a callback that recieves the state's current value and returns a new one.
-     */
-    set(callback: (current: I) => O): void;
-}
-/**
- *
- */
-export interface Ref<T> {
-    /**
-     * Get: returns the current value stored in the ref (or undefined).
-     */
-    (): T | undefined;
-    /**
-     * Set: stores a new `value` in the ref.
-     */
-    <T>(value: T | undefined): void;
-}
 export declare function isState<T>(value: any): value is State<T>;
-export declare function isRef<T extends Node>(value: any): value is Ref<T>;
 /**
  * Retrieves a plain value from a variable that may be a state.
  */
@@ -85,6 +58,11 @@ export declare function toValue<T>(source: MaybeState<T>): T;
  * Ensures a variable that may be a state or plain value is a state.
  */
 export declare function toState<T>(value: MaybeState<T>): State<T>;
+/**
+ * ValueHolder implements the core functionality of a State.
+ * It holds a value, which can be retrieved with `get`, updated with `set` and observed with `watch`.
+ * The user-facing API splits up access into a read-only State and a setter function.
+ */
 export declare class ValueHolder<T> implements State<T> {
     value: T;
     watchers: ((value: T) => void)[];
@@ -94,8 +72,11 @@ export declare class ValueHolder<T> implements State<T> {
     set(action: T | SetFunction<T>): void;
     watch(callback: (value: T) => void, options?: WatchOptions<T>): () => void;
 }
+/**
+ * Signal is the implementation of a read-only State.
+ */
 export declare class Signal<T> implements State<T> {
-    [TYPE_STATE]: boolean;
+    [IS_STATE]: boolean;
     __value: State<T>;
     constructor(value: State<T>);
     get(): T;
@@ -128,20 +109,6 @@ export interface DeriveOptions {
  * const $hello = derive([$greeting, name], (greeting, name) => `${greeting}, ${name}!`);
  */
 export declare function derive<Sources extends MaybeState<any>[], T>(sources: [...Sources], fn: (...values: StateValues<Sources>) => T | State<T>, options?: DeriveOptions): State<T>;
-/**
- * A Ref is a function that returns the last argument it was called with.
- * Calling it with no arguments will simply return the latest value.
- * Calling it with an argument will store that value and immediately return it.
- *
- * @param value - An (optional) initial value to store.
- *
- * @example
- * const ref = createRef(5);
- * ref(); // 5
- * ref(500);
- * ref(); // 500
- */
-export declare function createRef<T>(value?: T): Ref<T>;
 export interface StateWatcher {
     /**
      * Watch one or more states, calling the provided `fn` each time one of their values changes.

package/dist/core/stats.d.ts

@@ -0,0 +1,31 @@
+import { Emitter } from "@manyducks.co/emitter";
+import type { Dolla } from "./dolla";
+interface StatsStore {
+    emitter: Emitter<StatsStoreEvents>;
+    stats: {
+        watcherCount: number;
+        viewCount: number;
+    };
+}
+type StatsStoreEvents = {
+    /**
+     * Emitted when any stats are updated in the store.
+     */
+    statsChanged: [];
+    _incrementWatcherCount: [amount: number];
+    _incrementViewCount: [amount: number];
+};
+/**
+ * Tracks runtime statistics.
+ */
+export declare class Stats {
+    #private;
+    constructor(dolla: Dolla);
+}
+export declare function _createStore(): StatsStore;
+export declare function _getStore(): StatsStore;
+export declare function _onWatcherAdded(): void;
+export declare function _onWatcherRemoved(): void;
+export declare function _onViewMounted(): void;
+export declare function _onViewUnmounted(): void;
+export {};

package/dist/core/symbols.d.ts

@@ -1,5 +1,4 @@
-export declare const TYPE_STATE: unique symbol;
-export declare const TYPE_SETTABLE_STATE: unique symbol;
-export declare const TYPE_REF: unique symbol;
-export declare const TYPE_MARKUP: unique symbol;
-export declare const TYPE_MARKUP_ELEMENT: unique symbol;
+export declare const IS_STATE: unique symbol;
+export declare const IS_REF: unique symbol;
+export declare const IS_MARKUP: unique symbol;
+export declare const IS_MARKUP_ELEMENT: unique symbol;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
-export { createRef, createState, derive, isRef, isState, toState, toValue } from "./core/state.js";
-export type { MaybeState, Ref, Setter, State, StopFunction } from "./core/state.js";
+export { createState, derive, isState, toState, toValue } from "./core/state.js";
+export type { MaybeState, Setter, State, StopFunction } from "./core/state.js";
+export { createRef, isRef, type Ref } from "./core/ref.js";
 export { deepEqual, shallowEqual, strictEqual } from "./utils.js";
 export { cond, createMarkup, html, portal, repeat } from "./core/markup.js";
 export type { Markup, MarkupElement } from "./core/markup.js";