@typed/template 0.3.0 → 0.3.2

package/dist/cjs/internal/EventSource.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.makeEventSource = makeEventSource;
 var _effect = /*#__PURE__*/require("effect");
+var Fiber = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Fiber"));
 var Runtime = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Runtime"));
 var _ElementSource = /*#__PURE__*/require("../ElementSource");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -12,17 +13,29 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 const disposable = f => ({
   [Symbol.dispose]: f
 });
+const dispose = d => d[Symbol.dispose]();
 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) {
@@ -34,33 +47,43 @@ function makeEventSource() {
   }
   function setupBubbleListeners(element, run) {
     const disposables = [];
-    for (const [event, handlers] of bubbleListeners) {
-      const listener = ev => run(_effect.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : _effect.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.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : _effect.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.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el)) : _effect.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.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el)) : _effect.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 = (0, _ElementSource.getElements)(rendered);
+    if (elements.length === 0 || !hasBubbleListeners && !hasCaptureListeners) {
       return _effect.Effect.unit;
     }
     return _effect.Effect.flatMap(_effect.Effect.runtime(), runtime => {
-      const elements = (0, _ElementSource.getElements)(rendered);
       const disposables = [];
+      const fibers = new Map();
       const runFork = Runtime.runFork(runtime);
-      const run = effect => runFork(_effect.Effect.fromFiberEffect(_effect.Effect.forkIn(effect, scope)));
+      const run = effect => {
+        const id = Symbol();
+        const fiber = runFork(_effect.Effect.onExit(effect, () => _effect.Effect.sync(() => fibers.delete(id))));
+        fibers.set(id, fiber);
+        return fiber;
+      };
       for (const element of elements) {
         if (hasBubbleListeners) {
           disposables.push(...setupBubbleListeners(element, run));
@@ -69,7 +92,11 @@ function makeEventSource() {
           disposables.push(...setupCaptureListeners(element, run));
         }
       }
-      return _effect.Scope.addFinalizer(scope, _effect.Effect.sync(() => disposables.forEach(d => d[Symbol.dispose]())));
+      return _effect.Scope.addFinalizer(scope, _effect.Effect.suspend(() => {
+        disposables.forEach(dispose);
+        if (fibers.size === 0) return _effect.Effect.unit;
+        return Fiber.interruptAll(fibers.values());
+      }));
     });
   }
   return {
@@ -88,7 +115,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/cjs/internal/EventSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventSource.js","names":["_effect","require","Runtime","_interopRequireWildcard","_ElementSource","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","disposable","f","Symbol","dispose","makeEventSource","bubbleListeners","Map","captureListeners","addListener","listeners","event","entry","undefined","Set","add","addEventListener","element","handler","options","capture","setupBubbleListeners","run","disposables","handlers","listener","ev","Effect","forEach","el","target","contains","unit","getDerivedAddEventListenerOptions","push","removeEventListener","setupCaptureListeners","proxyCurrentTargetForCaptureEvents","setup","rendered","scope","hasBubbleListeners","size","hasCaptureListeners","flatMap","runtime","elements","getElements","runFork","effect","fromFiberEffect","forkIn","Scope","addFinalizer","sync","d","EVENT_PROPERTY_TO_REPLACE","currentTarget","Proxy","property","entries","hs","Array","from","once","some","h","passive","every"],"sources":["../../../src/internal/EventSource.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"EventSource.js","names":["_effect","require","Fiber","_interopRequireWildcard","Runtime","_ElementSource","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","disposable","f","Symbol","dispose","d","makeEventSource","bubbleListeners","Map","captureListeners","addListener","listeners","event","entry","sets","isOnce","options","once","undefined","normal","Set","add","addEventListener","element","handler","capture","setupBubbleListeners","run","disposables","handlers","listener","ev","Effect","forEach","el","target","contains","unit","getDerivedAddEventListenerOptions","push","removeEventListener","setupCaptureListeners","proxyCurrentTargetForCaptureEvents","setup","rendered","scope","hasBubbleListeners","size","hasCaptureListeners","elements","getElements","length","flatMap","runtime","fibers","runFork","effect","id","fiber","onExit","sync","delete","Scope","addFinalizer","suspend","interruptAll","values","EVENT_PROPERTY_TO_REPLACE","currentTarget","Proxy","property","entries","hs","Array","from","every","h","passive"],"sources":["../../../src/internal/EventSource.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/cjs/internal/chunks.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWhitespace = exports.getTextUntilPart = exports.getTextUntilCloseBrace = exports.getStrictPart = exports.getSelfClosingTagEnd = exports.getPart = exports.getOpeningTagEnd = exports.getOpeningTag = exports.getComment = exports.getClosingTag = exports.getBooleanAttribute = exports.getAttributeWithoutQuotes = exports.getAttributeWithQuotes = exports.getAllTextUntilElementClose = exports.STRICT_PART_REGEX = exports.PART_STRING = exports.PART_REGEX = void 0;
+exports.getWhitespace = exports.getTextUntilPart = exports.getTextUntilCloseBrace = exports.getStrictPart = exports.getSelfClosingTagEnd = exports.getPart = exports.getOpeningTagEnd = exports.getOpeningTag = exports.getComment = exports.getClosingTagName = exports.getClosingTag = exports.getBooleanAttribute = exports.getAttributeWithoutQuotes = exports.getAttributeWithQuotes = exports.getAllTextUntilElementClose = exports.STRICT_PART_REGEX = exports.PART_STRING = exports.PART_REGEX = void 0;
 const PART_STRING = i => `{{__PART${i}__}}`;
 exports.PART_STRING = PART_STRING;
 const PART_REGEX = exports.PART_REGEX = /(\{\{__PART(\d+)__\}\})/g;
@@ -36,6 +36,20 @@ const getAllTextUntilElementClose = tagName => {
 };
 exports.getAllTextUntilElementClose = getAllTextUntilElementClose;
 const getWhitespace = exports.getWhitespace = /*#__PURE__*/chunker(/(\s+)/g);
+const tagNameRegexCache = /*#__PURE__*/new Map();
+const tagNameRegex = tagName => {
+  return `(<\\/\\s*${tagName}\\s*>)`;
+};
+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;
+};
+exports.getClosingTagName = getClosingTagName;
 function chunker(regex) {
   return (str, pos) => {
     regex.lastIndex = pos;

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

@@ -1 +1 @@
-{"version":3,"file":"chunks.js","names":["PART_STRING","i","exports","PART_REGEX","getPart","chunker","STRICT_PART_REGEX","getStrictPart","getOpeningTag","getOpeningTagEnd","getClosingTag","getSelfClosingTagEnd","getComment","getTextUntilPart","getTextUntilCloseBrace","getAttributeWithQuotes","getAttributeWithoutQuotes","getBooleanAttribute","getAllTextUntilElementClose","tagName","RegExp","getWhitespace","regex","str","pos","lastIndex","match","exec","index","length"],"sources":["../../../src/internal/chunks.ts"],"sourcesContent":[null],"mappings":";;;;;;AAKO,MAAMA,WAAW,GAAIC,CAAS,IAAK,WAAWA,CAAC,MAAM;AAAAC,OAAA,CAAAF,WAAA,GAAAA,WAAA;AAErD,MAAMG,UAAU,GAAAD,OAAA,CAAAC,UAAA,GAAG,0BAA0B;AAE7C,MAAMC,OAAO,GAAAF,OAAA,CAAAE,OAAA,gBAAGC,OAAO,CAACF,UAAU,CAAC;AAEnC,MAAMG,iBAAiB,GAAAJ,OAAA,CAAAI,iBAAA,GAAG,4BAA4B;AAEtD,MAAMC,aAAa,GAAAL,OAAA,CAAAK,aAAA,gBAAGF,OAAO,CAACC,iBAAiB,CAAC;AAEhD,MAAME,aAAa,GAAAN,OAAA,CAAAM,aAAA,gBAAGH,OAAO,CAAC,uCAAuC,CAAC;AAEtE,MAAMI,gBAAgB,GAAAP,OAAA,CAAAO,gBAAA,gBAAGJ,OAAO,CAAC,aAAa,CAAC;AAEtD;AACA;AACA;AACO,MAAMK,aAAa,GAAAR,OAAA,CAAAQ,aAAA,gBAAGL,OAAO,CAAC,mDAAmD,CAAC;AAElF,MAAMM,oBAAoB,GAAAT,OAAA,CAAAS,oBAAA,gBAAGN,OAAO,CAAC,YAAY,CAAC;AAElD,MAAMO,UAAU,GAAAV,OAAA,CAAAU,UAAA,gBAAGP,OAAO,CAAC,iBAAiB,CAAC;AAEpD;AACA;AACO,MAAMQ,gBAAgB,GAAAX,OAAA,CAAAW,gBAAA,gBAAGR,OAAO,CAAC,+BAA+B,CAAC;AAExE;AACA;AACO,MAAMS,sBAAsB,GAAAZ,OAAA,CAAAY,sBAAA,gBAAGT,OAAO,CAAC,iBAAiB,CAAC;AAEhE;AACO,MAAMU,sBAAsB,GAAAb,OAAA,CAAAa,sBAAA,gBAAGV,OAAO,CAC3C,uDAAuD,CACxD;AAED;AACO,MAAMW,yBAAyB,GAAAd,OAAA,CAAAc,yBAAA,gBAAGX,OAAO,CAC9C,uDAAuD,CACxD;AAED;AAEO,MAAMY,mBAAmB,GAAAf,OAAA,CAAAe,mBAAA,gBAAGZ,OAAO,CAAC,sDAAsD,CAAC;AAElG;AACO,MAAMa,2BAA2B,GAAIC,OAAe,IAAI;EAC7D,OAAOd,OAAO,CAAC,IAAIe,MAAM,CAAC,mBAAmBD,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC;AACtE,CAAC;AAAAjB,OAAA,CAAAgB,2BAAA,GAAAA,2BAAA;AAEM,MAAMG,aAAa,GAAAnB,OAAA,CAAAmB,aAAA,gBAAGhB,OAAO,CAAC,QAAQ,CAAC;AAE9C,SAASA,OAAOA,CAACiB,KAAa;EAC5B,OAAO,CAACC,GAAW,EAAEC,GAAW,KAA2B;IACzDF,KAAK,CAACG,SAAS,GAAGD,GAAG;IACrB,MAAME,KAAK,GAAGJ,KAAK,CAACK,IAAI,CAACJ,GAAG,CAAC;IAC7BD,KAAK,CAACG,SAAS,GAAG,CAAC;IAEnB,IAAI,CAACC,KAAK,IAAIA,KAAK,CAACE,KAAK,KAAKJ,GAAG,EAAE;MACjC;IACF,CAAC,MAAM;MACL,OAAO;QACLK,MAAM,EAAEH,KAAK,CAAC,CAAC,CAAC,CAACG,MAAM;QACvBH;OACQ;IACZ;EACF,CAAC;AACH"}
+{"version":3,"file":"chunks.js","names":["PART_STRING","i","exports","PART_REGEX","getPart","chunker","STRICT_PART_REGEX","getStrictPart","getOpeningTag","getOpeningTagEnd","getClosingTag","getSelfClosingTagEnd","getComment","getTextUntilPart","getTextUntilCloseBrace","getAttributeWithQuotes","getAttributeWithoutQuotes","getBooleanAttribute","getAllTextUntilElementClose","tagName","RegExp","getWhitespace","tagNameRegexCache","Map","tagNameRegex","getClosingTagName","current","get","undefined","matcher","set","regex","str","pos","lastIndex","match","exec","index","length"],"sources":["../../../src/internal/chunks.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/cjs/internal/errors.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CouldNotFindRootElement = exports.CouldNotFindCommentError = void 0;
+exports.isHydrationError = isHydrationError;
 class CouldNotFindCommentError extends Error {
   partIndex;
   constructor(partIndex) {
@@ -20,4 +21,7 @@ class CouldNotFindRootElement extends Error {
   }
 }
 exports.CouldNotFindRootElement = CouldNotFindRootElement;
+function isHydrationError(e) {
+  return e instanceof CouldNotFindCommentError || e instanceof CouldNotFindRootElement;
+}
 //# sourceMappingURL=errors.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"errors.js","names":["CouldNotFindCommentError","Error","partIndex","constructor","exports","CouldNotFindRootElement"],"sources":["../../../src/internal/errors.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAM,MAAOA,wBAAyB,SAAQC,KAAK;EAC5BC,SAAA;EAArBC,YAAqBD,SAAiB;IACpC,KAAK,CAAC,mCAAmCA,SAAS,EAAE,CAAC;IADlC,KAAAA,SAAS,GAATA,SAAS;EAE9B;;AACDE,OAAA,CAAAJ,wBAAA,GAAAA,wBAAA;AAEK,MAAOK,uBAAwB,SAAQJ,KAAK;EAC3BC,SAAA;EAArBC,YAAqBD,SAAiB;IACpC,KAAK,CAAC,yCAAyCA,SAAS,EAAE,CAAC;IADxC,KAAAA,SAAS,GAATA,SAAS;EAE9B;;AACDE,OAAA,CAAAC,uBAAA,GAAAA,uBAAA"}
+{"version":3,"file":"errors.js","names":["CouldNotFindCommentError","Error","partIndex","constructor","exports","CouldNotFindRootElement","isHydrationError","e"],"sources":["../../../src/internal/errors.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAM,MAAOA,wBAAyB,SAAQC,KAAK;EAC5BC,SAAA;EAArBC,YAAqBD,SAAiB;IACpC,KAAK,CAAC,mCAAmCA,SAAS,EAAE,CAAC;IADlC,KAAAA,SAAS,GAATA,SAAS;EAE9B;;AACDE,OAAA,CAAAJ,wBAAA,GAAAA,wBAAA;AAEK,MAAOK,uBAAwB,SAAQJ,KAAK;EAC3BC,SAAA;EAArBC,YAAqBD,SAAiB;IACpC,KAAK,CAAC,yCAAyCA,SAAS,EAAE,CAAC;IADxC,KAAAA,SAAS,GAATA,SAAS;EAE9B;;AACDE,OAAA,CAAAC,uBAAA,GAAAA,uBAAA;AAEK,SAAUC,gBAAgBA,CAACC,CAAU;EACzC,OAAOA,CAAC,YAAYP,wBAAwB,IAAIO,CAAC,YAAYF,uBAAuB;AACtF"}

package/dist/cjs/internal/hydrate.js

@@ -15,6 +15,7 @@ var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/
 var _RenderEvent = /*#__PURE__*/require("../RenderEvent.js");
 var _indexRefCounter = /*#__PURE__*/require("./indexRefCounter.js");
 var _context = /*#__PURE__*/require("@typed/context");
+var _effect = /*#__PURE__*/require("effect");
 var _Scope = /*#__PURE__*/require("effect/Scope");
 var _errors = /*#__PURE__*/require("./errors.js");
 var _EventSource = /*#__PURE__*/require("./EventSource.js");
@@ -23,7 +24,6 @@ var _render = /*#__PURE__*/require("./render.js");
 var _utils = /*#__PURE__*/require("./utils.js");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-// TODO: Handle missing comment errors
 /**
  * Here for "standard" browser rendering, a TemplateInstance is effectively a live
  * view into the contents rendered by the Template.
@@ -32,7 +32,6 @@ const hydrateTemplate = (document, renderContext) => {
   const render_ = (0, _render.renderTemplate)(document, renderContext);
   return (templateStrings, values) => {
     return Fx.make(sink => Effect.gen(function* (_) {
-      const eventSource = (0, _EventSource.makeEventSource)();
       const context = yield* _(Effect.context());
       const hydrateCtx = (0, _context.unsafeGet)(context, _HydrateContext.HydrateContext);
       const scope = (0, _context.unsafeGet)(context, _Scope.Scope);
@@ -40,35 +39,60 @@ const hydrateTemplate = (document, renderContext) => {
       if (hydrateCtx.hydrate === false) {
         return render_(templateStrings, values);
       }
+      const either = getHydrateEntry({
+        ...hydrateCtx,
+        document,
+        renderContext,
+        strings: templateStrings
+      });
+      if (_effect.Either.isLeft(either)) {
+        hydrateCtx.hydrate = false;
+        return render_(templateStrings, values);
+      }
       const {
-        parts,
         template,
         where,
         wire
-      } = getHydrateEntry({
-        ...hydrateCtx,
+      } = either.right;
+      if (values.length === 0) return yield* _(sink.onSuccess((0, _RenderEvent.DomRenderEvent)(wire)), Effect.zipRight(Effect.never));
+      const makeHydrateContext = index => ({
+        where,
+        rootIndex: index,
+        parentTemplate: template,
+        hydrate: true
+      });
+      const refCounter = yield* _((0, _indexRefCounter.indexRefCounter2)());
+      const ctx = {
+        context,
         document,
+        eventSource: (0, _EventSource.makeEventSource)(),
+        expected: 0,
+        refCounter,
         renderContext,
-        eventSource,
-        strings: templateStrings,
-        onCause: sink.onFailure
-      });
-      // If there are parts we need to render them before constructing our Wire
-      if (parts.length > 0) {
-        const refCounter = yield* _((0, _indexRefCounter.indexRefCounter)(parts.length));
-        // Do the work
-        yield* _((0, _render.renderValues)(values, parts, refCounter, context, index => ({
-          where,
-          rootIndex: index,
-          parentTemplate: template,
-          hydrate: true
-        })));
-        // Wait for initial work to be completed
-        yield* _(refCounter.wait);
+        onCause: sink.onFailure,
+        values,
+        makeHydrateContext
+      };
+      // Connect our interpolated values to our template parts
+      const effects = [];
+      for (const [part, path] of template.parts) {
+        const eff = (0, _render.renderPart2)(part, where, path, ctx);
+        if (eff !== null) {
+          effects.push(...(Array.isArray(eff) ? eff : [eff]));
+        }
       }
-      hydrateCtx.hydrate = false;
-      yield* _(eventSource.setup(wire, scope));
+      // 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((0, _RenderEvent.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);
     }));
   };
@@ -85,46 +109,56 @@ const START = "typed-start";
 const END = "typed-end";
 // Finds all of the childNodes between the "typed-start" and "typed-end" comments
 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;
 }
 function findTemplateResultPartChildNodes(where, parentTemplate, childTemplate, partIndex, childIndex) {
   const [, path] = parentTemplate.parts[partIndex];
   const parentNode = (0, _utils.findPath)(where, path);
-  const childNodes = findPartChildNodes(parentNode, childTemplate?.hash, partIndex);
+  const childNodesEither = findPartChildNodes(parentNode, childTemplate.hash, partIndex);
+  if (_effect.Either.isLeft(childNodesEither)) return _effect.Either.left(childNodesEither.left);
+  const childNodes = childNodesEither.right;
   const parentChildNodes = {
     parentNode,
     childNodes: childIndex !== undefined ? [childNodes[childIndex]] : childNodes
   };
-  return parentChildNodes;
+  return _effect.Either.right(parentChildNodes);
 }
 function findPartChildNodes({
   childNodes
 }, hash, partIndex) {
-  const [comment, index] = findPartComment(childNodes, partIndex);
+  const either = findPartComment(childNodes, partIndex);
+  if (_effect.Either.isLeft(either)) return _effect.Either.left(either.left);
+  const [comment, index] = either.right;
   const nodes = [];
   const previousHoleValue = `hole${partIndex - 1}`;
   if (hash) {
@@ -137,29 +171,27 @@ function findPartChildNodes({
       }
     }
   } else {
-    return [...(0, _utils.getPreviousNodes)(comment, partIndex), comment];
+    return _effect.Either.right([...(0, _utils.getPreviousNodes)(comment, partIndex), comment]);
   }
   if (nodes.length === 0) {
-    throw new _errors.CouldNotFindRootElement(partIndex);
+    return _effect.Either.left(new _errors.CouldNotFindRootElement(partIndex));
   }
   nodes.push(comment);
-  return nodes;
+  return _effect.Either.right(nodes);
 }
 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 ((0, _utils.isCommentWithValue)(node, search)) {
-      return [node, i];
+      return _effect.Either.right([node, i]);
     }
   }
-  throw new _errors.CouldNotFindCommentError(partIndex);
+  return _effect.Either.left(new _errors.CouldNotFindCommentError(partIndex));
 }
 function getHydrateEntry({
   childIndex,
   document,
-  eventSource,
-  onCause,
   parentTemplate,
   renderContext,
   rootIndex,
@@ -170,9 +202,12 @@ function getHydrateEntry({
     template
   } = (0, _render.getBrowserEntry)(document, renderContext, strings);
   if (parentTemplate) {
-    where = findTemplateResultPartChildNodes(where, parentTemplate, template, rootIndex, childIndex);
+    const either = findTemplateResultPartChildNodes(where, parentTemplate, template, rootIndex, childIndex);
+    if (_effect.Either.isLeft(either)) {
+      return _effect.Either.left(either.left);
+    }
+    where = either.right;
   }
-  const parts = (0, _render.buildParts)(document, renderContext, template, where, eventSource, onCause, true);
   const wire = (() => {
     if (!parentTemplate) {
       const childNodes = Array.from(where.childNodes).filter(node => (0, _utils.isComment)(node) ? !(0, _utils.isCommentWithValue)(node, END) : true);
@@ -186,11 +221,10 @@ function getHydrateEntry({
     }
     return Array.from(where.childNodes).filter(node => !(0, _utils.isCommentWithValue)(node, `hole${rootIndex}`));
   })();
-  return {
+  return _effect.Either.right({
     template,
     wire,
-    parts,
     where
-  };
+  });
 }
 //# sourceMappingURL=hydrate.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"hydrate.js","names":["Fx","_interopRequireWildcard","require","Effect","_RenderEvent","_indexRefCounter","_context","_Scope","_errors","_EventSource","_HydrateContext","_render","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","hydrateTemplate","document","renderContext","render_","renderTemplate","templateStrings","values","make","sink","gen","_","eventSource","makeEventSource","context","hydrateCtx","unsafeGet","HydrateContext","scope","Scope","hydrate","parts","template","where","wire","getHydrateEntry","strings","onCause","onFailure","length","refCounter","indexRefCounter","renderValues","index","rootIndex","parentTemplate","wait","setup","onSuccess","DomRenderEvent","never","exports","findRootParentChildNodes","childNodes","findRootChildNodes","parentNode","START","END","start","end","node","nodeType","COMMENT_NODE","nodeValue","push","findTemplateResultPartChildNodes","childTemplate","partIndex","childIndex","path","findPath","findPartChildNodes","hash","parentChildNodes","undefined","comment","findPartComment","nodes","previousHoleValue","isHtmlElement","dataset","typed","unshift","isCommentWithValue","getPreviousNodes","CouldNotFindRootElement","search","CouldNotFindCommentError","getBrowserEntry","buildParts","Array","from","filter","isComment"],"sources":["../../../src/internal/hydrate.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"hydrate.js","names":["Fx","_interopRequireWildcard","require","Effect","_RenderEvent","_indexRefCounter","_context","_effect","_Scope","_errors","_EventSource","_HydrateContext","_render","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","hydrateTemplate","document","renderContext","render_","renderTemplate","templateStrings","values","make","sink","gen","_","context","hydrateCtx","unsafeGet","HydrateContext","scope","Scope","hydrate","either","getHydrateEntry","strings","Either","isLeft","template","where","wire","right","length","onSuccess","DomRenderEvent","zipRight","never","makeHydrateContext","index","rootIndex","parentTemplate","refCounter","indexRefCounter2","ctx","eventSource","makeEventSource","expected","onCause","onFailure","effects","part","path","parts","eff","renderPart2","push","Array","isArray","forkAll","setup","exports","findRootParentChildNodes","childNodes","findRootChildNodes","parentNode","START","END","start","end","node","nodeType","COMMENT_NODE","nodeValue","from","rootChildNodes","j","findTemplateResultPartChildNodes","childTemplate","partIndex","childIndex","findPath","childNodesEither","findPartChildNodes","hash","left","parentChildNodes","undefined","findPartComment","comment","nodes","previousHoleValue","isHtmlElement","dataset","typed","unshift","isCommentWithValue","getPreviousNodes","CouldNotFindRootElement","search","CouldNotFindCommentError","getBrowserEntry","filter","isComment"],"sources":["../../../src/internal/hydrate.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/cjs/internal/parser.js

@@ -53,6 +53,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"];
@@ -166,8 +167,10 @@ class ParserImpl {
       if (nextChar == "-") {
         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
@@ -224,9 +227,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((0, _chunks.getClosingTagName)(tagName));
+  }
   parseSelfClosingElement(tagName) {
     const attributes = this.parseAttributes();
     return new Template.SelfClosingElementNode(tagName, attributes);
@@ -253,7 +261,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");
@@ -387,16 +395,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);