@typed/template 0.2.0 → 0.3.1

package/dist/esm/TemplateInstance.js

@@ -6,14 +6,14 @@ import { ElementRefTypeId } from "./ElementRef.js";
 /**
  * @since 1.0.0
  */
-export const TemplateInstanceTypeId = Symbol.for("./TemplateInstance.js");
+export const TemplateInstanceTypeId = Symbol.for("@typed/template/TemplateInstance");
 /**
  * @since 1.0.0
  */
 export function TemplateInstance(events, ref) {
     return new TemplateInstanceImpl(events, ref);
 }
-// @ts-expect-error placeholder issues
+// @ts-expect-error does not implement Placeholder
 class TemplateInstanceImpl extends FxEffectBase {
     i0;
     i1;

package/dist/esm/TemplateInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateInstance.js","sourceRoot":"","sources":["../../src/TemplateInstance.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAK3C,OAAO,EAAmB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAInE;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;AAuBzE;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAoC,EACpC,GAAkB;IAElB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAQ,CAAA;AACrD,CAAC;AAED,sCAAsC;AACtC,MAAM,oBACJ,SAAQ,YAAyE;IAWtE;IACA;IATF,CAAC,sBAAsB,CAAC,GAA2B,sBAAsB,CAAA;IAClF,KAAK,CAAiC;IACtC,MAAM,CAAkC;IACxC,QAAQ,CAAoC;IAC5C,aAAa,CAAyC;IACtD,OAAO,CAAqC;IAE5C,YACW,EAAgC,EAChC,EAAiB;QAE1B,KAAK,EAAE,CAAA;QAHE,OAAE,GAAF,EAAE,CAA8B;QAChC,OAAE,GAAF,EAAE,CAAe;QAI1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAA;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,CAAA;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAA;IAClD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,EAAE,CAAA;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,EAAE,CAAA;IAChB,CAAC;CACF"}
+{"version":3,"file":"TemplateInstance.js","sourceRoot":"","sources":["../../src/TemplateInstance.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAM3C,OAAO,EAAmB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAGnE;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;AAuBpF;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC9B,MAAoC,EACpC,GAAkB;IAElB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,GAAG,CAAQ,CAAA;AACrD,CAAC;AAED,kDAAkD;AAClD,MAAM,oBACJ,SAAQ,YAAyE;IAWtE;IACA;IATF,CAAC,sBAAsB,CAAC,GAA2B,sBAAsB,CAAA;IAClF,KAAK,CAAiC;IACtC,MAAM,CAAkC;IACxC,QAAQ,CAAoC;IAC5C,aAAa,CAAyC;IACtD,OAAO,CAAqC;IAE5C,YACW,EAAgC,EAChC,EAAiB;QAE1B,KAAK,EAAE,CAAA;QAHE,OAAE,GAAF,EAAE,CAA8B;QAChC,OAAE,GAAF,EAAE,CAAe;QAI1B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,CAAA;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,CAAA;QAC1C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAA;IAClD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,EAAE,CAAA;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,EAAE,CAAA;IAChB,CAAC;CACF"}

package/dist/esm/Test.js

@@ -1,11 +1,11 @@
 import * as Fx from "@typed/fx/Fx";
 import * as RefArray from "@typed/fx/RefArray";
+import * as RefSubject from "@typed/fx/RefSubject";
 import * as Sink from "@typed/fx/Sink";
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Either from "effect/Either";
 import * as Fiber from "effect/Fiber";
-import * as happyDOM from "happy-dom";
 import * as ElementRef from "./ElementRef.js";
 import { ROOT_CSS_SELECTOR } from "./ElementSource.js";
 import { adjustTime } from "./internal/utils.js";
@@ -16,13 +16,13 @@ import * as RenderContext from "./RenderContext.js";
  */
 export function testRender(fx, options) {
     return Effect.gen(function* (_) {
-        const window = makeWindow(options);
+        const window = yield* _(getOrMakeWindow(options));
         const elementRef = yield* _(ElementRef.make());
-        const errors = yield* _(RefArray.make(Effect.succeed([])));
-        const fiber = yield* _(fx, render, Fx.run(Sink.Sink((cause) => Cause.failureOrCause(cause).pipe(Either.match({
+        const errors = yield* _(RefSubject.make(Effect.succeed([])));
+        const fiber = yield* _(fx, render, (x) => x.run(Sink.make((cause) => Cause.failureOrCause(cause).pipe(Either.match({
             onLeft: (error) => RefArray.append(errors, error),
             onRight: (cause) => errors.onFailure(cause)
-        })), (rendered) => ElementRef.set(elementRef, rendered))), Effect.forkScoped, Effect.provide(RenderContext.browser(window, { skipRenderScheduling: true })));
+        })), (rendered) => ElementRef.set(elementRef, rendered))), Effect.forkScoped, Effect.provide(RenderContext.dom(window, { skipRenderScheduling: true })));
         const test = {
             window,
             document: window.document,
@@ -38,6 +38,8 @@ export function testRender(fx, options) {
         // Allow our fibers to start
         yield* _(adjustTime(1));
         yield* _(adjustTime(1));
+        // Await the first render
+        yield* _(Fx.first(elementRef), Effect.race(Effect.delay(Effect.dieMessage(`Rendering taking too long`), 1000)));
         return test;
     });
 }
@@ -62,7 +64,18 @@ export function click(rendered, options) {
     return dispatchEvent(rendered, { event: "click", ...options, eventInit: { bubbles: true, ...options?.eventInit } });
 }
 // internals
-function makeWindow(options) {
-    return new happyDOM.Window(options);
+function getOrMakeWindow(options) {
+    if (typeof window !== "undefined" && typeof document !== "undefined") {
+        return Effect.gen(function* (_) {
+            window.document.head.innerHTML = "";
+            window.document.body.innerHTML = "";
+            yield* _(Effect.addFinalizer(() => Effect.sync(() => {
+                window.document.head.innerHTML = "";
+                window.document.body.innerHTML = "";
+            })));
+            return window;
+        });
+    }
+    return Effect.promise(() => import("happy-dom").then((happyDOM) => new happyDOM.Window(options)));
 }
 //# sourceMappingURL=Test.js.map

package/dist/esm/Test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -58,8 +58,4 @@ export * from "./RenderEvent.js";
  * @since 1.0.0
  */
 export * from "./RenderTemplate.js";
-/**
- * @since 1.0.0
- */
-export * from "./TemplateInstance.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,mCAAmC,CAAA;AAE1C;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD;;GAEG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,cAAc,CAAA;AAC5B;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,kBAAkB,CAAA;AAChC;;GAEG;AACH,cAAc,aAAa,CAAA;AAC3B;;GAEG;AACH,cAAc,iBAAiB,CAAA;AAC/B;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD;;GAEG;AACH,cAAc,kBAAkB,CAAA;AAChC;;GAEG;AACH,cAAc,qBAAqB,CAAA;AACnC;;GAEG;AACH,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,mCAAmC,CAAA;AAE1C;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD;;GAEG;AACH,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,cAAc,CAAA;AAC5B;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,WAAW,CAAA;AACzB;;GAEG;AACH,cAAc,kBAAkB,CAAA;AAChC;;GAEG;AACH,cAAc,aAAa,CAAA;AAC3B;;GAEG;AACH,cAAc,iBAAiB,CAAA;AAC/B;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD;;GAEG;AACH,cAAc,kBAAkB,CAAA;AAChC;;GAEG;AACH,cAAc,qBAAqB,CAAA"}

package/dist/esm/internal/EventSource.js

@@ -0,0 +1,91 @@
+import { Effect, Scope } from "effect";
+import * as Runtime from "effect/Runtime";
+import { getElements } from "../ElementSource";
+const disposable = (f) => ({
+    [Symbol.dispose]: f
+});
+export function makeEventSource() {
+    const bubbleListeners = new Map();
+    const captureListeners = new Map();
+    function addListener(listeners, event, entry) {
+        const set = listeners.get(event);
+        if (set === undefined) {
+            const set = new Set();
+            set.add(entry);
+            listeners.set(event, set);
+        }
+        else {
+            set.add(entry);
+        }
+    }
+    function addEventListener(element, event, handler) {
+        if (handler.options?.capture === true) {
+            return addListener(captureListeners, event, [element, handler]);
+        }
+        else {
+            return addListener(bubbleListeners, event, [element, handler]);
+        }
+    }
+    function setupBubbleListeners(element, run) {
+        const disposables = [];
+        for (const [event, handlers] of bubbleListeners) {
+            const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : Effect.unit));
+            element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
+            disposables.push(disposable(() => element.removeEventListener(event, listener)));
+        }
+        return disposables;
+    }
+    function setupCaptureListeners(element, run) {
+        const disposables = [];
+        for (const [event, handlers] of captureListeners) {
+            const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target)
+                ? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el))
+                : Effect.unit));
+            element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
+            disposables.push(disposable(() => element.removeEventListener(event, listener)));
+        }
+        return disposables;
+    }
+    function setup(rendered, scope) {
+        const hasBubbleListeners = bubbleListeners.size > 0;
+        const hasCaptureListeners = captureListeners.size > 0;
+        if (!hasBubbleListeners && !hasCaptureListeners) {
+            return Effect.unit;
+        }
+        return Effect.flatMap(Effect.runtime(), (runtime) => {
+            const elements = getElements(rendered);
+            const disposables = [];
+            const runFork = Runtime.runFork(runtime);
+            const run = (effect) => runFork(Effect.fromFiberEffect(Effect.forkIn(effect, scope)));
+            for (const element of elements) {
+                if (hasBubbleListeners) {
+                    disposables.push(...setupBubbleListeners(element, run));
+                }
+                if (hasCaptureListeners) {
+                    disposables.push(...setupCaptureListeners(element, run));
+                }
+            }
+            return Scope.addFinalizer(scope, Effect.sync(() => disposables.forEach((d) => d[Symbol.dispose]())));
+        });
+    }
+    return {
+        addEventListener,
+        setup
+    };
+}
+const EVENT_PROPERTY_TO_REPLACE = "currentTarget";
+function proxyCurrentTargetForCaptureEvents(event, currentTarget) {
+    return new Proxy(event, {
+        get(target, property) {
+            return property === EVENT_PROPERTY_TO_REPLACE ? currentTarget : target[property];
+        }
+    });
+}
+function getDerivedAddEventListenerOptions(entries) {
+    const hs = Array.from(entries);
+    return {
+        once: hs.some((h) => h[1].options?.once === true),
+        passive: hs.every((h) => h[1].options?.passive === true)
+    };
+}
+//# sourceMappingURL=EventSource.js.map

package/dist/esm/internal/EventSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventSource.js","sourceRoot":"","sources":["../../../src/internal/EventSource.ts"],"names":[],"mappings":"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"}

package/dist/esm/internal/browser.js

@@ -55,16 +55,7 @@ export function diffChildren(comment, currentNodes, nextNodes, document) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     comment.parentNode, 
     // Document Fragments cannot be removed, so we filter them out
-    currentNodes.filter((x) => x.nodeType !== x.DOCUMENT_FRAGMENT_NODE), nextNodes.flatMap(flattenRenderEvent), diffable(document), comment);
-}
-function flattenRenderEvent(x) {
-    if (isRenderEvent(x)) {
-        const value = x.valueOf();
-        return Array.isArray(value) ? value : [value];
-    }
-    else {
-        return [x];
-    }
+    currentNodes.filter((x) => x.nodeType !== x.DOCUMENT_FRAGMENT_NODE), nextNodes, diffable(document), comment);
 }
 function matchValue(value, onText, onNodes) {
     switch (typeof value) {
@@ -86,17 +77,26 @@ function matchValue(value, onText, onNodes) {
                     return onNodes([]);
                 // or diffed, if these contains nodes or "wires"
                 else if (value.some((x) => typeof x === "object")) {
-                    return onNodes(value.flatMap((x) => (x === null ? [] : [isRenderEvent(x) ? x.valueOf() : x])));
+                    return onNodes(value.flatMap(renderEventToArray));
                 } // in all other cases the content is stringified as is
                 else
                     return onText(String(value));
             }
             else {
-                return onNodes([isRenderEvent(value) ? value.valueOf() : value]);
+                return onNodes(renderEventToArray(value));
             }
         }
         case "function":
             return onNodes([]);
     }
 }
+function renderEventToArray(x) {
+    if (x === null || x === undefined)
+        return [];
+    if (isRenderEvent(x)) {
+        const value = x.valueOf();
+        return Array.isArray(value) ? value : [value];
+    }
+    return [x];
+}
 //# sourceMappingURL=browser.js.map

package/dist/esm/internal/browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/internal/browser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/internal/browser.ts"],"names":[],"mappings":"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"}

package/dist/esm/internal/chunks.js

@@ -28,6 +28,8 @@ export const getAllTextUntilElementClose = (tagName) => {
     return chunker(new RegExp(`([^<]+)(\\s*<\\/${tagName}\\s*>)`, "gi"));
 };
 export const getWhitespace = chunker(/(\s+)/g);
+const tagNameRegex = (tagName) => `(<\\/\\s*${tagName}\\s*>)`;
+export const getClosingTagName = (tagName) => chunker(new RegExp(tagNameRegex(tagName), "gi"));
 function chunker(regex) {
     return (str, pos) => {
         regex.lastIndex = pos;

package/dist/esm/internal/chunks.js.map

@@ -1 +1 @@
-{"version":3,"file":"chunks.js","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAA;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,0BAA0B,CAAA;AAEpD,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,4BAA4B,CAAA;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAEtD,+BAA+B;AAC/B,sEAAsE;AACtE,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEpD,gDAAgD;AAChD,qFAAqF;AACrF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAExE,gDAAgD;AAChD,sFAAsF;AACtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEhE,+CAA+C;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAC3C,uDAAuD,CACxD,CAAA;AAED,0EAA0E;AAC1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC9C,uDAAuD,CACxD,CAAA;AAED,oDAAoD;AAEpD,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAA;AAElG,qEAAqE;AACrE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7D,OAAO,OAAO,CAAC,IAAI,MAAM,CAAC,mBAAmB,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;AACtE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE9C,SAAS,OAAO,CAAC,KAAa;IAC5B,OAAO,CAAC,GAAW,EAAE,GAAW,EAAyB,EAAE;QACzD,KAAK,CAAC,SAAS,GAAG,GAAG,CAAA;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,KAAK,CAAC,SAAS,GAAG,CAAC,CAAA;QAEnB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;YAClC,OAAM;QACR,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;gBACvB,KAAK;aACG,CAAA;QACZ,CAAC;IACH,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"chunks.js","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAA;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,0BAA0B,CAAA;AAEpD,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,4BAA4B,CAAA;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAEtD,+BAA+B;AAC/B,sEAAsE;AACtE,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEpD,gDAAgD;AAChD,qFAAqF;AACrF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAExE,gDAAgD;AAChD,sFAAsF;AACtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEhE,+CAA+C;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAC3C,uDAAuD,CACxD,CAAA;AAED,0EAA0E;AAC1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC9C,uDAAuD,CACxD,CAAA;AAED,oDAAoD;AAEpD,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAA;AAElG,qEAAqE;AACrE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7D,OAAO,OAAO,CAAC,IAAI,MAAM,CAAC,mBAAmB,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;AACtE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE9C,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,YAAY,OAAO,QAAQ,CAAA;AAErE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;AAEtG,SAAS,OAAO,CAAC,KAAa;IAC5B,OAAO,CAAC,GAAW,EAAE,GAAW,EAAyB,EAAE;QACzD,KAAK,CAAC,SAAS,GAAG,GAAG,CAAA;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,KAAK,CAAC,SAAS,GAAG,CAAC,CAAA;QAEnB,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,GAAG,EAAE,CAAC;YAClC,OAAM;QACR,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;gBACvB,KAAK;aACG,CAAA;QACZ,CAAC;IACH,CAAC,CAAA;AACH,CAAC"}

package/dist/esm/internal/errors.js

@@ -12,4 +12,7 @@ export class CouldNotFindRootElement extends Error {
         this.partIndex = partIndex;
     }
 }
+export function isHydrationError(e) {
+    return e instanceof CouldNotFindCommentError || e instanceof CouldNotFindRootElement;
+}
 //# sourceMappingURL=errors.js.map

package/dist/esm/internal/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IAC5B;IAArB,YAAqB,SAAiB;QACpC,KAAK,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAA;QADlC,cAAS,GAAT,SAAS,CAAQ;IAEtC,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAC3B;IAArB,YAAqB,SAAiB;QACpC,KAAK,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAA;QADxC,cAAS,GAAT,SAAS,CAAQ;IAEtC,CAAC;CACF"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/internal/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IAC5B;IAArB,YAAqB,SAAiB;QACpC,KAAK,CAAC,mCAAmC,SAAS,EAAE,CAAC,CAAA;QADlC,cAAS,GAAT,SAAS,CAAQ;IAEtC,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAC3B;IAArB,YAAqB,SAAiB;QACpC,KAAK,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAA;QADxC,cAAS,GAAT,SAAS,CAAQ;IAEtC,CAAC;CACF;AAED,MAAM,UAAU,gBAAgB,CAAC,CAAU;IACzC,OAAO,CAAC,YAAY,wBAAwB,IAAI,CAAC,YAAY,uBAAuB,CAAA;AACtF,CAAC"}

package/dist/esm/internal/hydrate.js

@@ -1,59 +1,84 @@
 import * as Fx from "@typed/fx/Fx";
-import * as Subject from "@typed/fx/Subject";
-import { Effect } from "effect";
-import * as ElementRef from "../ElementRef.js";
+import * as Effect from "effect/Effect";
 import { DomRenderEvent } from "../RenderEvent.js";
-import { TemplateInstance } from "../TemplateInstance.js";
-import { indexRefCounter } from "./indexRefCounter.js";
+import { indexRefCounter2 } from "./indexRefCounter.js";
 import { unsafeGet } from "@typed/context";
+import { Either } from "effect";
+import { Scope } from "effect/Scope";
 import { CouldNotFindCommentError, CouldNotFindRootElement } from "./errors.js";
+import { makeEventSource } from "./EventSource.js";
 import { HydrateContext } from "./HydrateContext.js";
-import { buildParts, getBrowserEntry, renderTemplate, renderValues } from "./render.js";
+import { getBrowserEntry, renderPart2, renderTemplate } from "./render.js";
 import { findPath, getPreviousNodes, isComment, isCommentWithValue, isHtmlElement } from "./utils.js";
-// TODO: Handle missing comment errors
 /**
  * Here for "standard" browser rendering, a TemplateInstance is effectively a live
  * view into the contents rendered by the Template.
  */
-export const hydrateTemplate = (document, renderContext) => (templateStrings, values, providedRef) => {
-    return Effect.gen(function* (_) {
-        const context = yield* _(Effect.context());
-        const hydrateCtx = unsafeGet(context, HydrateContext);
-        // If we're not longer hydrating, just render normally
-        if (!hydrateCtx.hydrate) {
-            return yield* _(renderTemplate(document, renderContext)(templateStrings, values, providedRef));
-        }
-        const elementRef = providedRef || (yield* _(ElementRef.make()));
-        const events = Fx.map(elementRef, DomRenderEvent);
-        const errors = Subject.make();
-        const { getParts, template, where, wire } = getHydrateEntry({
-            ...hydrateCtx,
-            document,
-            renderContext,
-            elementRef,
-            strings: templateStrings,
-            onCause: errors.onFailure
-        });
-        const parts = yield* _(getParts);
-        // If there are parts we need to render them before constructing our Wire
-        if (parts.length > 0) {
-            const refCounter = yield* _(indexRefCounter(parts.length));
-            // Do the work
-            yield* _(renderValues(values, parts, refCounter, errors.onFailure, (index) => ({
+export const hydrateTemplate = (document, renderContext) => {
+    const render_ = renderTemplate(document, renderContext);
+    return (templateStrings, values) => {
+        return Fx.make((sink) => Effect.gen(function* (_) {
+            const context = yield* _(Effect.context());
+            const hydrateCtx = unsafeGet(context, HydrateContext);
+            const scope = unsafeGet(context, Scope);
+            // If we're not longer hydrating, just render normally
+            if (hydrateCtx.hydrate === false) {
+                return render_(templateStrings, values);
+            }
+            const either = getHydrateEntry({
+                ...hydrateCtx,
+                document,
+                renderContext,
+                strings: templateStrings
+            });
+            if (Either.isLeft(either)) {
+                hydrateCtx.hydrate = false;
+                return render_(templateStrings, values);
+            }
+            const { template, where, wire } = either.right;
+            if (values.length === 0)
+                return yield* _(sink.onSuccess(DomRenderEvent(wire)), Effect.zipRight(Effect.never));
+            const makeHydrateContext = (index) => ({
                 where,
                 rootIndex: index,
                 parentTemplate: template,
                 hydrate: true
-            })));
-            // Wait for initial work to be completed
-            yield* _(refCounter.wait);
-        }
-        hydrateCtx.hydrate = false;
-        // Set the element when it is ready
-        yield* _(ElementRef.set(elementRef, wire));
-        // Return the Template instance
-        return TemplateInstance(Fx.merge([events, errors]), elementRef);
-    });
+            });
+            const refCounter = yield* _(indexRefCounter2());
+            const ctx = {
+                context,
+                document,
+                eventSource: makeEventSource(),
+                expected: 0,
+                refCounter,
+                renderContext,
+                onCause: sink.onFailure,
+                values,
+                makeHydrateContext
+            };
+            // Connect our interpolated values to our template parts
+            const effects = [];
+            for (const [part, path] of template.parts) {
+                const eff = renderPart2(part, where, path, ctx);
+                if (eff !== null) {
+                    effects.push(...(Array.isArray(eff) ? eff : [eff]));
+                }
+            }
+            // Fork any effects necessary
+            if (effects.length > 0) {
+                yield* _(Effect.forkAll(effects));
+            }
+            // Set the element when it is ready
+            yield* _(ctx.eventSource.setup(wire, scope));
+            // Emit our DomRenderEvent
+            yield* _(sink.onSuccess(DomRenderEvent(wire)));
+            // Stop hydrating
+            hydrateCtx.hydrate = false;
+            // Ensure our templates last forever in the DOM environment
+            // so event listeners are kept attached to the current Scope.
+            yield* _(Effect.never);
+        }));
+    };
 };
 export function findRootParentChildNodes(where) {
     const childNodes = findRootChildNodes(where);
@@ -66,44 +91,54 @@ const START = "typed-start";
 const END = "typed-end";
 // Finds all of the childNodes between the "typed-start" and "typed-end" comments
 export function findRootChildNodes(where) {
-    const childNodes = [];
-    let start = 0;
-    let end = childNodes.length;
-    for (let i = 0; i < where.childNodes.length; i++) {
-        const node = where.childNodes[i];
-        if (node.nodeType === node.COMMENT_NODE) {
-            if (node.nodeValue === START) {
-                start = i;
-                break;
-            }
+    let start = -1;
+    let end = -1;
+    const { childNodes } = where;
+    const length = childNodes.length;
+    for (let i = 0; i < length; i++) {
+        const node = childNodes[i];
+        if (node.nodeType === node.COMMENT_NODE && node.nodeValue === START) {
+            start = i;
+            break;
         }
     }
-    for (let i = where.childNodes.length - 1; i >= start; i--) {
-        const node = where.childNodes[i];
-        if (node.nodeType === node.COMMENT_NODE) {
-            if (node.nodeValue === END) {
-                end = i;
-                break;
-            }
+    for (let i = length - 1; i >= start; i--) {
+        const node = childNodes[i];
+        if (node.nodeType === node.COMMENT_NODE && node.nodeValue === END) {
+            end = i;
+            break;
         }
     }
-    for (let i = start + 1; i <= end; i++) {
-        childNodes.push(where.childNodes[i]);
+    // If we can't find the start and end comments, just return all childNodes
+    if (start === -1 && end === -1) {
+        return Array.from(childNodes);
+    }
+    start = start === -1 ? 0 : start;
+    end = end === -1 ? length - 1 : end;
+    const rootChildNodes = Array(end - start);
+    for (let i = start + 1, j = 0; i <= end; i++) {
+        rootChildNodes[j++] = childNodes[i];
     }
-    return childNodes;
+    return rootChildNodes;
 }
 export function findTemplateResultPartChildNodes(where, parentTemplate, childTemplate, partIndex, childIndex) {
     const [, path] = parentTemplate.parts[partIndex];
     const parentNode = findPath(where, path);
-    const childNodes = findPartChildNodes(parentNode, childTemplate?.hash, partIndex);
+    const childNodesEither = findPartChildNodes(parentNode, childTemplate.hash, partIndex);
+    if (Either.isLeft(childNodesEither))
+        return Either.left(childNodesEither.left);
+    const childNodes = childNodesEither.right;
     const parentChildNodes = {
         parentNode,
         childNodes: childIndex !== undefined ? [childNodes[childIndex]] : childNodes
     };
-    return parentChildNodes;
+    return Either.right(parentChildNodes);
 }
 export function findPartChildNodes({ childNodes }, hash, partIndex) {
-    const [comment, index] = findPartComment(childNodes, partIndex);
+    const either = findPartComment(childNodes, partIndex);
+    if (Either.isLeft(either))
+        return Either.left(either.left);
+    const [comment, index] = either.right;
     const nodes = [];
     const previousHoleValue = `hole${partIndex - 1}`;
     if (hash) {
@@ -118,30 +153,33 @@ export function findPartChildNodes({ childNodes }, hash, partIndex) {
         }
     }
     else {
-        return [...getPreviousNodes(comment, partIndex), comment];
+        return Either.right([...getPreviousNodes(comment, partIndex), comment]);
     }
     if (nodes.length === 0) {
-        throw new CouldNotFindRootElement(partIndex);
+        return Either.left(new CouldNotFindRootElement(partIndex));
     }
     nodes.push(comment);
-    return nodes;
+    return Either.right(nodes);
 }
 export function findPartComment(childNodes, partIndex) {
     const search = partIndex === -1 ? `typed-end` : `hole${partIndex}`;
     for (let i = 0; i < childNodes.length; ++i) {
         const node = childNodes[i];
         if (isCommentWithValue(node, search)) {
-            return [node, i];
+            return Either.right([node, i]);
         }
     }
-    throw new CouldNotFindCommentError(partIndex);
+    return Either.left(new CouldNotFindCommentError(partIndex));
 }
-export function getHydrateEntry({ childIndex, document, elementRef, onCause, parentTemplate, renderContext, rootIndex, strings, where }) {
+export function getHydrateEntry({ childIndex, document, parentTemplate, renderContext, rootIndex, strings, where }) {
     const { template } = getBrowserEntry(document, renderContext, strings);
     if (parentTemplate) {
-        where = findTemplateResultPartChildNodes(where, parentTemplate, template, rootIndex, childIndex);
+        const either = findTemplateResultPartChildNodes(where, parentTemplate, template, rootIndex, childIndex);
+        if (Either.isLeft(either)) {
+            return Either.left(either.left);
+        }
+        where = either.right;
     }
-    const getParts = buildParts(document, renderContext, template, where, elementRef, onCause, true);
     const wire = (() => {
         if (!parentTemplate) {
             const childNodes = Array.from(where.childNodes).filter((node) => isComment(node) ? !isCommentWithValue(node, END) : true);
@@ -155,11 +193,10 @@ export function getHydrateEntry({ childIndex, document, elementRef, onCause, par
         }
         return Array.from(where.childNodes).filter((node) => !isCommentWithValue(node, `hole${rootIndex}`));
     })();
-    return {
+    return Either.right({
         template,
         wire,
-        getParts,
         where
-    };
+    });
 }
 //# sourceMappingURL=hydrate.js.map