@typed/template 0.3.0 → 0.3.2

package/dist/dts/internal/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/internal/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAc1C;;GAEG;AACH,eAAO,MAAM,qBAAqB,aAOhC,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,aAiB5B,CAAA;AAEF,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAA;CACjE;AAED,wBAAgB,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAE/E;AA2nBD,eAAO,MAAM,MAAM,EAAE,MAAmF,CAAA;AAMxG;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,UAc1D"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/internal/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAe1C;;GAEG;AACH,eAAO,MAAM,qBAAqB,aAOhC,CAAA;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,aAiB5B,CAAA;AAEF,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAA;CACjE;AAED,wBAAgB,KAAK,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAE/E;AAmoBD,eAAO,MAAM,MAAM,EAAE,MAAmF,CAAA;AAMxG;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,UAc1D"}

package/dist/dts/internal/render.d.ts

@@ -1,30 +1,16 @@
 import { Effect } from "effect";
-import type { Cause } from "effect/Cause";
-import * as Context from "effect/Context";
-import { Scope } from "effect/Scope";
 import type { BrowserEntry } from "../Entry.js";
-import type { Part, Parts, SparsePart } from "../Part.js";
-import type { Placeholder } from "../Placeholder.js";
 import type { ToRendered } from "../Render.js";
-import type { Renderable } from "../Renderable.js";
 import type { RenderContext } from "../RenderContext.js";
 import type { RenderEvent } from "../RenderEvent.js";
 import type { RenderTemplate } from "../RenderTemplate.js";
 import type * as Template from "../Template.js";
-import { type EventSource } from "./EventSource.js";
-import { HydrateContext } from "./HydrateContext.js";
-import type { IndexRefCounter } from "./indexRefCounter.js";
-import type { ParentChildNodes } from "./utils.js";
 /**
  * Here for "standard" browser rendering, a TemplateInstance is effectively a live
  * view into the contents rendered by the Template.
  */
 export declare const renderTemplate: (document: Document, renderContext: RenderContext) => RenderTemplate;
-export declare function renderValues<Values extends ReadonlyArray<Renderable<any, any>>>(values: Values, parts: Parts, refCounter: IndexRefCounter, ctx: Context.Context<any> | Context.Context<never>, makeHydrateContext?: (index: number) => HydrateContext): Effect.Effect<Placeholder.Context<Values[number]> | Scope, never, void>;
-export declare function renderSparsePart(values: ReadonlyArray<Renderable<any, any>>, part: SparsePart, refCounter: IndexRefCounter): Effect.Effect<unknown, never, import("effect/Fiber").RuntimeFiber<unknown, void>>;
-export declare function renderPart<Values extends ReadonlyArray<Renderable<any, any>>>(values: Values, part: Part, refCounter: IndexRefCounter, ctx: Context.Context<any> | Context.Context<never>, hydrateCtx?: () => HydrateContext): Effect.Effect<any, never, void>;
 export declare function attachRoot<T extends RenderEvent | null>(cache: RenderContext["renderCache"], where: HTMLElement, what: RenderEvent | null): Effect.Effect<never, never, ToRendered<T>>;
 export declare function getBrowserEntry(document: Document, ctx: RenderContext, templateStrings: TemplateStringsArray): BrowserEntry;
-export declare function buildParts<E>(document: Document, ctx: RenderContext, template: Template.Template, content: ParentChildNodes, eventSource: EventSource, onCause: (cause: Cause<E>) => Effect.Effect<never, never, void>, isHydrating: boolean): Parts;
 export declare function buildTemplate(document: Document, { nodes }: Template.Template): DocumentFragment;
 //# sourceMappingURL=render.d.ts.map

package/dist/dts/internal/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/internal/render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/internal/render.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAS/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAsf/C;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,KAAK,cAmEhF,CAAA;AAkEH,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,IAAI,EACrD,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,EACnC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,WAAW,GAAG,IAAI,GACvB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAiB5C;AAiBD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,aAAa,EAClB,eAAe,EAAE,oBAAoB,GACpC,YAAY,CAkBd;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,QAAQ,GAAG,gBAAgB,CAQhG"}

package/dist/esm/internal/EventSource.js

@@ -1,21 +1,36 @@
 import { Effect, Scope } from "effect";
+import * as Fiber from "effect/Fiber";
 import * as Runtime from "effect/Runtime";
 import { getElements } from "../ElementSource";
 const disposable = (f) => ({
     [Symbol.dispose]: f
 });
+const dispose = (d) => d[Symbol.dispose]();
 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);
+        const sets = listeners.get(event);
+        const isOnce = entry[1].options?.once === true;
+        if (sets === undefined) {
+            const normal = new Set();
+            const once = new Set();
+            if (isOnce) {
+                once.add(entry);
+            }
+            else {
+                normal.add(entry);
+            }
+            listeners.set(event, [normal, once]);
         }
         else {
-            set.add(entry);
+            const [normal, once] = sets;
+            if (isOnce) {
+                once.add(entry);
+            }
+            else {
+                normal.add(entry);
+            }
         }
     }
     function addEventListener(element, event, handler) {
@@ -28,35 +43,45 @@ export function makeEventSource() {
     }
     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)));
+        for (const [event, sets] of bubbleListeners) {
+            for (const handlers of sets) {
+                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)));
+        for (const [event, sets] of captureListeners) {
+            for (const handlers of sets) {
+                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) {
+        const elements = getElements(rendered);
+        if (elements.length === 0 || (!hasBubbleListeners && !hasCaptureListeners)) {
             return Effect.unit;
         }
         return Effect.flatMap(Effect.runtime(), (runtime) => {
-            const elements = getElements(rendered);
             const disposables = [];
+            const fibers = new Map();
             const runFork = Runtime.runFork(runtime);
-            const run = (effect) => runFork(Effect.fromFiberEffect(Effect.forkIn(effect, scope)));
+            const run = (effect) => {
+                const id = Symbol();
+                const fiber = runFork(Effect.onExit(effect, () => Effect.sync(() => fibers.delete(id))));
+                fibers.set(id, fiber);
+                return fiber;
+            };
             for (const element of elements) {
                 if (hasBubbleListeners) {
                     disposables.push(...setupBubbleListeners(element, run));
@@ -65,7 +90,12 @@ export function makeEventSource() {
                     disposables.push(...setupCaptureListeners(element, run));
                 }
             }
-            return Scope.addFinalizer(scope, Effect.sync(() => disposables.forEach((d) => d[Symbol.dispose]())));
+            return Scope.addFinalizer(scope, Effect.suspend(() => {
+                disposables.forEach(dispose);
+                if (fibers.size === 0)
+                    return Effect.unit;
+                return Fiber.interruptAll(fibers.values());
+            }));
         });
     }
     return {
@@ -84,7 +114,7 @@ function proxyCurrentTargetForCaptureEvents(event, currentTarget) {
 function getDerivedAddEventListenerOptions(entries) {
     const hs = Array.from(entries);
     return {
-        once: hs.some((h) => h[1].options?.once === true),
+        once: hs.every((h) => h[1].options?.once === true),
         passive: hs.every((h) => h[1].options?.passive === true)
     };
 }

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

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

package/dist/esm/internal/chunks.js

@@ -28,6 +28,19 @@ export const getAllTextUntilElementClose = (tagName) => {
     return chunker(new RegExp(`([^<]+)(\\s*<\\/${tagName}\\s*>)`, "gi"));
 };
 export const getWhitespace = chunker(/(\s+)/g);
+const tagNameRegexCache = new Map();
+const tagNameRegex = (tagName) => {
+    return `(<\\/\\s*${tagName}\\s*>)`;
+};
+export const getClosingTagName = (tagName) => {
+    const current = tagNameRegexCache.get(tagName);
+    if (current !== undefined) {
+        return current;
+    }
+    const matcher = chunker(new RegExp(tagNameRegex(tagName), "gi"));
+    tagNameRegexCache.set(tagName, matcher);
+    return matcher;
+};
 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":"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"}

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,15 +1,15 @@
 import * as Fx from "@typed/fx/Fx";
 import * as Effect from "effect/Effect";
 import { DomRenderEvent } from "../RenderEvent.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.
@@ -18,7 +18,6 @@ export const hydrateTemplate = (document, renderContext) => {
     const render_ = renderTemplate(document, renderContext);
     return (templateStrings, values) => {
         return Fx.make((sink) => Effect.gen(function* (_) {
-            const eventSource = makeEventSource();
             const context = yield* _(Effect.context());
             const hydrateCtx = unsafeGet(context, HydrateContext);
             const scope = unsafeGet(context, Scope);
@@ -26,30 +25,57 @@ export const hydrateTemplate = (document, renderContext) => {
             if (hydrateCtx.hydrate === false) {
                 return render_(templateStrings, values);
             }
-            const { parts, template, where, wire } = getHydrateEntry({
+            const either = getHydrateEntry({
                 ...hydrateCtx,
                 document,
                 renderContext,
-                eventSource,
-                strings: templateStrings,
-                onCause: sink.onFailure
+                strings: templateStrings
             });
-            // 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, context, (index) => ({
-                    where,
-                    rootIndex: index,
-                    parentTemplate: template,
-                    hydrate: true
-                })));
-                // Wait for initial work to be completed
-                yield* _(refCounter.wait);
+            if (Either.isLeft(either)) {
+                hydrateCtx.hydrate = false;
+                return render_(templateStrings, values);
             }
-            hydrateCtx.hydrate = false;
-            yield* _(eventSource.setup(wire, scope));
+            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
+            });
+            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);
         }));
     };
@@ -65,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);
     }
-    return 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 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) {
@@ -117,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, eventSource, 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 parts = buildParts(document, renderContext, template, where, eventSource, onCause, true);
     const wire = (() => {
         if (!parentTemplate) {
             const childNodes = Array.from(where.childNodes).filter((node) => isComment(node) ? !isCommentWithValue(node, END) : true);
@@ -154,11 +193,10 @@ export function getHydrateEntry({ childIndex, document, eventSource, onCause, pa
         }
         return Array.from(where.childNodes).filter((node) => !isCommentWithValue(node, `hole${rootIndex}`));
     })();
-    return {
+    return Either.right({
         template,
         wire,
-        parts,
         where
-    };
+    });
 }
 //# sourceMappingURL=hydrate.js.map

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

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

package/dist/esm/internal/parser.js

@@ -2,7 +2,7 @@ import * as Chunk from "effect/Chunk";
 import { globalValue } from "effect/GlobalValue";
 import * as Option from "effect/Option";
 import * as Template from "../Template.js";
-import { getPart, getStrictPart, getTextUntilCloseBrace, getTextUntilPart, getWhitespace, PART_STRING } from "./chunks.js";
+import { getClosingTagName, getPart, getStrictPart, getTextUntilCloseBrace, getTextUntilPart, getWhitespace, PART_STRING } from "./chunks.js";
 // TODO: Consider ways to surface useful errors and warnings.
 // TODO: Profile for performance optimization
 /**
@@ -66,6 +66,7 @@ const isWhitespaceToken = (input, pos) => SPACE_REGEX.test(input[pos]);
 const isOpenTagEndToken = (input, pos) => input[pos] === chars.greaterThan;
 const isSelfClosingTagEndToken = (input, pos) => input[pos] === chars.slash && input[pos + 1] === chars.greaterThan;
 const isCommentEndToken = (input, pos) => input[pos] === chars.hypen && input[pos + 1] === chars.hypen && input[pos + 2] === chars.greaterThan;
+const isGreaterThanToken = (input, pos) => input[pos] === chars.greaterThan;
 const Continue = (a) => ["continue", a];
 const Break = (a) => ["break", Option.fromNullable(a)];
 const Skip = ["skip"];
@@ -182,9 +183,12 @@ class ParserImpl {
                 this.consumeAmount(2);
                 return [this.parseComment()];
             }
-            else {
+            else if (nextChar.toLowerCase() === "d") {
                 return [this.parseDocType()];
             }
+            else {
+                throw new SyntaxError(`Unknown comment type ${nextChar}`);
+            }
         }
         else if (nextChar === "/") { // Self-closing tag
             return this.selfClosingTagEnd();
@@ -242,9 +246,14 @@ class ParserImpl {
             const children = this.parseTemplateChildren();
             this.path.pop();
             const element = new Template.ElementNode(tagName, attributes, children);
+            this.skipWhitespace();
+            this.consumeClosingTag(tagName);
             return element;
         }
     }
+    consumeClosingTag(tagName) {
+        this.chunk(getClosingTagName(tagName));
+    }
     parseSelfClosingElement(tagName) {
         const attributes = this.parseAttributes();
         return new Template.SelfClosingElementNode(tagName, attributes);
@@ -272,7 +281,7 @@ class ParserImpl {
         return this.addPart(new Template.SparseCommentNode(textAndParts));
     }
     parseDocType() {
-        this.parseTextUntil((char) => char === chars.greaterThan);
+        this.parseTextUntil(isGreaterThanToken);
         this.consumeAmount(1);
         this.skipWhitespace();
         return new Template.DocType("html");
@@ -406,16 +415,16 @@ class ParserImpl {
         return f(index);
     }
     parseTextUntil(predicate) {
-        let text = "";
+        const start = this.pos;
+        let i = 0;
         while (this.pos < this.length) {
-            const char = this.nextChar();
             if (predicate(this.input, this.pos)) {
                 break;
             }
-            text += char;
+            i++;
             this.consumeAmount(1);
         }
-        return text;
+        return this.input.slice(start, start + i);
     }
     parseTextUntilMany(predicates) {
         const [keys, length] = getPredicatesCache(predicates);