@typed/template 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (213) hide show
  1. package/dist/cjs/Directive.js +1 -1
  2. package/dist/cjs/Directive.js.map +1 -1
  3. package/dist/cjs/ElementRef.js +23 -13
  4. package/dist/cjs/ElementRef.js.map +1 -1
  5. package/dist/cjs/ElementSource.js +16 -18
  6. package/dist/cjs/ElementSource.js.map +1 -1
  7. package/dist/cjs/EventHandler.js +1 -1
  8. package/dist/cjs/EventHandler.js.map +1 -1
  9. package/dist/cjs/Html.js +31 -32
  10. package/dist/cjs/Html.js.map +1 -1
  11. package/dist/cjs/HtmlChunk.js +4 -1
  12. package/dist/cjs/HtmlChunk.js.map +1 -1
  13. package/dist/cjs/Hydrate.js +1 -1
  14. package/dist/cjs/Hydrate.js.map +1 -1
  15. package/dist/cjs/Many.js +14 -13
  16. package/dist/cjs/Many.js.map +1 -1
  17. package/dist/cjs/Parser.js +11 -323
  18. package/dist/cjs/Parser.js.map +1 -1
  19. package/dist/cjs/Placeholder.js +3 -3
  20. package/dist/cjs/Placeholder.js.map +1 -1
  21. package/dist/cjs/Platform.js +4 -4
  22. package/dist/cjs/Platform.js.map +1 -1
  23. package/dist/cjs/Render.js +1 -1
  24. package/dist/cjs/Render.js.map +1 -1
  25. package/dist/cjs/RenderContext.js +48 -27
  26. package/dist/cjs/RenderContext.js.map +1 -1
  27. package/dist/cjs/RenderTemplate.js +2 -17
  28. package/dist/cjs/RenderTemplate.js.map +1 -1
  29. package/dist/cjs/Template.js +27 -1
  30. package/dist/cjs/Template.js.map +1 -1
  31. package/dist/cjs/TemplateInstance.js +2 -2
  32. package/dist/cjs/TemplateInstance.js.map +1 -1
  33. package/dist/cjs/Test.js +20 -7
  34. package/dist/cjs/Test.js.map +1 -1
  35. package/dist/cjs/index.js +0 -12
  36. package/dist/cjs/index.js.map +1 -1
  37. package/dist/cjs/internal/EventSource.js +95 -0
  38. package/dist/cjs/internal/EventSource.js.map +1 -0
  39. package/dist/cjs/internal/browser.js +11 -11
  40. package/dist/cjs/internal/browser.js.map +1 -1
  41. package/dist/cjs/internal/hydrate.js +49 -50
  42. package/dist/cjs/internal/hydrate.js.map +1 -1
  43. package/dist/cjs/internal/indexRefCounter.js +49 -2
  44. package/dist/cjs/internal/indexRefCounter.js.map +1 -1
  45. package/dist/cjs/internal/parser.js +60 -17
  46. package/dist/cjs/internal/parser.js.map +1 -1
  47. package/dist/cjs/internal/parts.js +128 -28
  48. package/dist/cjs/internal/parts.js.map +1 -1
  49. package/dist/cjs/internal/render.js +486 -53
  50. package/dist/cjs/internal/render.js.map +1 -1
  51. package/dist/cjs/internal/server.js +5 -2
  52. package/dist/cjs/internal/server.js.map +1 -1
  53. package/dist/dts/Directive.d.ts.map +1 -1
  54. package/dist/dts/ElementRef.d.ts +4 -2
  55. package/dist/dts/ElementRef.d.ts.map +1 -1
  56. package/dist/dts/ElementSource.d.ts +10 -5
  57. package/dist/dts/ElementSource.d.ts.map +1 -1
  58. package/dist/dts/EventHandler.d.ts.map +1 -1
  59. package/dist/dts/Html.d.ts +1 -1
  60. package/dist/dts/Html.d.ts.map +1 -1
  61. package/dist/dts/HtmlChunk.d.ts.map +1 -1
  62. package/dist/dts/Many.d.ts +13 -11
  63. package/dist/dts/Many.d.ts.map +1 -1
  64. package/dist/dts/Parser.d.ts +3 -6
  65. package/dist/dts/Parser.d.ts.map +1 -1
  66. package/dist/dts/Part.d.ts +13 -3
  67. package/dist/dts/Part.d.ts.map +1 -1
  68. package/dist/dts/Placeholder.d.ts +2 -2
  69. package/dist/dts/Placeholder.d.ts.map +1 -1
  70. package/dist/dts/Render.d.ts +2 -1
  71. package/dist/dts/Render.d.ts.map +1 -1
  72. package/dist/dts/RenderContext.d.ts +5 -4
  73. package/dist/dts/RenderContext.d.ts.map +1 -1
  74. package/dist/dts/RenderTemplate.d.ts +2 -16
  75. package/dist/dts/RenderTemplate.d.ts.map +1 -1
  76. package/dist/dts/Renderable.d.ts +2 -2
  77. package/dist/dts/Renderable.d.ts.map +1 -1
  78. package/dist/dts/Template.d.ts +21 -3
  79. package/dist/dts/Template.d.ts.map +1 -1
  80. package/dist/dts/TemplateInstance.d.ts +3 -2
  81. package/dist/dts/TemplateInstance.d.ts.map +1 -1
  82. package/dist/dts/Test.d.ts +4 -6
  83. package/dist/dts/Test.d.ts.map +1 -1
  84. package/dist/dts/index.d.ts +0 -4
  85. package/dist/dts/index.d.ts.map +1 -1
  86. package/dist/dts/internal/EventSource.d.ts +12 -0
  87. package/dist/dts/internal/EventSource.d.ts.map +1 -0
  88. package/dist/dts/internal/browser.d.ts.map +1 -1
  89. package/dist/dts/internal/hydrate.d.ts +5 -5
  90. package/dist/dts/internal/hydrate.d.ts.map +1 -1
  91. package/dist/dts/internal/indexRefCounter.d.ts +5 -0
  92. package/dist/dts/internal/indexRefCounter.d.ts.map +1 -1
  93. package/dist/dts/internal/module-augmentation.d.ts +0 -4
  94. package/dist/dts/internal/module-augmentation.d.ts.map +1 -1
  95. package/dist/dts/internal/parser.d.ts +8 -0
  96. package/dist/dts/internal/parser.d.ts.map +1 -1
  97. package/dist/dts/internal/parts.d.ts +66 -56
  98. package/dist/dts/internal/parts.d.ts.map +1 -1
  99. package/dist/dts/internal/render.d.ts +7 -7
  100. package/dist/dts/internal/render.d.ts.map +1 -1
  101. package/dist/dts/internal/server.d.ts.map +1 -1
  102. package/dist/esm/Directive.js +1 -1
  103. package/dist/esm/Directive.js.map +1 -1
  104. package/dist/esm/ElementRef.js +12 -7
  105. package/dist/esm/ElementRef.js.map +1 -1
  106. package/dist/esm/ElementSource.js +16 -13
  107. package/dist/esm/ElementSource.js.map +1 -1
  108. package/dist/esm/EventHandler.js +1 -1
  109. package/dist/esm/EventHandler.js.map +1 -1
  110. package/dist/esm/Html.js +29 -24
  111. package/dist/esm/Html.js.map +1 -1
  112. package/dist/esm/HtmlChunk.js +6 -1
  113. package/dist/esm/HtmlChunk.js.map +1 -1
  114. package/dist/esm/Hydrate.js +1 -1
  115. package/dist/esm/Hydrate.js.map +1 -1
  116. package/dist/esm/Many.js +14 -10
  117. package/dist/esm/Many.js.map +1 -1
  118. package/dist/esm/Parser.js +6 -335
  119. package/dist/esm/Parser.js.map +1 -1
  120. package/dist/esm/Placeholder.js +2 -2
  121. package/dist/esm/Placeholder.js.map +1 -1
  122. package/dist/esm/Platform.js +2 -2
  123. package/dist/esm/Platform.js.map +1 -1
  124. package/dist/esm/Render.js +1 -1
  125. package/dist/esm/Render.js.map +1 -1
  126. package/dist/esm/RenderContext.js +38 -17
  127. package/dist/esm/RenderContext.js.map +1 -1
  128. package/dist/esm/RenderTemplate.js +2 -12
  129. package/dist/esm/RenderTemplate.js.map +1 -1
  130. package/dist/esm/Template.js +24 -0
  131. package/dist/esm/Template.js.map +1 -1
  132. package/dist/esm/TemplateInstance.js +2 -2
  133. package/dist/esm/TemplateInstance.js.map +1 -1
  134. package/dist/esm/Test.js +20 -7
  135. package/dist/esm/Test.js.map +1 -1
  136. package/dist/esm/index.js +0 -4
  137. package/dist/esm/index.js.map +1 -1
  138. package/dist/esm/internal/EventSource.js +91 -0
  139. package/dist/esm/internal/EventSource.js.map +1 -0
  140. package/dist/esm/internal/browser.js +12 -12
  141. package/dist/esm/internal/browser.js.map +1 -1
  142. package/dist/esm/internal/hydrate.js +45 -46
  143. package/dist/esm/internal/hydrate.js.map +1 -1
  144. package/dist/esm/internal/indexRefCounter.js +50 -2
  145. package/dist/esm/internal/indexRefCounter.js.map +1 -1
  146. package/dist/esm/internal/parser.js +84 -17
  147. package/dist/esm/internal/parser.js.map +1 -1
  148. package/dist/esm/internal/parts.js +110 -27
  149. package/dist/esm/internal/parts.js.map +1 -1
  150. package/dist/esm/internal/render.js +476 -58
  151. package/dist/esm/internal/render.js.map +1 -1
  152. package/dist/esm/internal/server.js +5 -4
  153. package/dist/esm/internal/server.js.map +1 -1
  154. package/package.json +10 -26
  155. package/src/Directive.ts +1 -1
  156. package/src/ElementRef.ts +18 -14
  157. package/src/ElementSource.ts +62 -47
  158. package/src/EventHandler.ts +1 -1
  159. package/src/Html.ts +58 -57
  160. package/src/HtmlChunk.ts +15 -1
  161. package/src/Hydrate.ts +1 -1
  162. package/src/Many.ts +53 -43
  163. package/src/Parser.ts +10 -453
  164. package/src/Part.ts +15 -3
  165. package/src/Placeholder.ts +4 -4
  166. package/src/Platform.ts +2 -2
  167. package/src/Render.ts +7 -2
  168. package/src/RenderContext.ts +47 -19
  169. package/src/RenderTemplate.ts +9 -54
  170. package/src/Renderable.ts +2 -1
  171. package/src/Template.ts +26 -0
  172. package/src/TemplateInstance.ts +9 -9
  173. package/src/Test.ts +40 -21
  174. package/src/index.ts +0 -4
  175. package/src/internal/EventSource.ts +153 -0
  176. package/src/internal/browser.ts +26 -25
  177. package/src/internal/hydrate.ts +68 -61
  178. package/src/internal/indexRefCounter.ts +63 -2
  179. package/src/internal/module-augmentation.ts +0 -4
  180. package/src/internal/parser.ts +92 -19
  181. package/src/internal/parts.ts +158 -73
  182. package/src/internal/render.ts +701 -89
  183. package/src/internal/server.ts +5 -3
  184. package/Token/package.json +0 -6
  185. package/Tokenizer/package.json +0 -6
  186. package/dist/cjs/Token.js +0 -270
  187. package/dist/cjs/Token.js.map +0 -1
  188. package/dist/cjs/Tokenizer.js +0 -18
  189. package/dist/cjs/Tokenizer.js.map +0 -1
  190. package/dist/cjs/internal/readAttribute.js +0 -34
  191. package/dist/cjs/internal/readAttribute.js.map +0 -1
  192. package/dist/cjs/internal/tokenizer.js +0 -264
  193. package/dist/cjs/internal/tokenizer.js.map +0 -1
  194. package/dist/dts/Token.d.ts +0 -202
  195. package/dist/dts/Token.d.ts.map +0 -1
  196. package/dist/dts/Tokenizer.d.ts +0 -6
  197. package/dist/dts/Tokenizer.d.ts.map +0 -1
  198. package/dist/dts/internal/readAttribute.d.ts +0 -9
  199. package/dist/dts/internal/readAttribute.d.ts.map +0 -1
  200. package/dist/dts/internal/tokenizer.d.ts +0 -3
  201. package/dist/dts/internal/tokenizer.d.ts.map +0 -1
  202. package/dist/esm/Token.js +0 -264
  203. package/dist/esm/Token.js.map +0 -1
  204. package/dist/esm/Tokenizer.js +0 -9
  205. package/dist/esm/Tokenizer.js.map +0 -1
  206. package/dist/esm/internal/readAttribute.js +0 -24
  207. package/dist/esm/internal/readAttribute.js.map +0 -1
  208. package/dist/esm/internal/tokenizer.js +0 -296
  209. package/dist/esm/internal/tokenizer.js.map +0 -1
  210. package/src/Token.ts +0 -269
  211. package/src/Tokenizer.ts +0 -10
  212. package/src/internal/readAttribute.ts +0 -28
  213. package/src/internal/tokenizer.ts +0 -338
@@ -6,14 +6,14 @@ import { ElementRefTypeId } from "./ElementRef.js";
6
6
  /**
7
7
  * @since 1.0.0
8
8
  */
9
- export const TemplateInstanceTypeId = Symbol.for("./TemplateInstance.js");
9
+ export const TemplateInstanceTypeId = Symbol.for("@typed/template/TemplateInstance");
10
10
  /**
11
11
  * @since 1.0.0
12
12
  */
13
13
  export function TemplateInstance(events, ref) {
14
14
  return new TemplateInstanceImpl(events, ref);
15
15
  }
16
- // @ts-expect-error placeholder issues
16
+ // @ts-expect-error does not implement Placeholder
17
17
  class TemplateInstanceImpl extends FxEffectBase {
18
18
  i0;
19
19
  i1;
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,11 +1,11 @@
1
1
  import * as Fx from "@typed/fx/Fx";
2
2
  import * as RefArray from "@typed/fx/RefArray";
3
+ import * as RefSubject from "@typed/fx/RefSubject";
3
4
  import * as Sink from "@typed/fx/Sink";
4
5
  import * as Cause from "effect/Cause";
5
6
  import * as Effect from "effect/Effect";
6
7
  import * as Either from "effect/Either";
7
8
  import * as Fiber from "effect/Fiber";
8
- import * as happyDOM from "happy-dom";
9
9
  import * as ElementRef from "./ElementRef.js";
10
10
  import { ROOT_CSS_SELECTOR } from "./ElementSource.js";
11
11
  import { adjustTime } from "./internal/utils.js";
@@ -16,13 +16,13 @@ import * as RenderContext from "./RenderContext.js";
16
16
  */
17
17
  export function testRender(fx, options) {
18
18
  return Effect.gen(function* (_) {
19
- const window = makeWindow(options);
19
+ const window = yield* _(getOrMakeWindow(options));
20
20
  const elementRef = yield* _(ElementRef.make());
21
- const errors = yield* _(RefArray.make(Effect.succeed([])));
22
- const fiber = yield* _(fx, render, Fx.run(Sink.Sink((cause) => Cause.failureOrCause(cause).pipe(Either.match({
21
+ const errors = yield* _(RefSubject.make(Effect.succeed([])));
22
+ const fiber = yield* _(fx, render, (x) => x.run(Sink.make((cause) => Cause.failureOrCause(cause).pipe(Either.match({
23
23
  onLeft: (error) => RefArray.append(errors, error),
24
24
  onRight: (cause) => errors.onFailure(cause)
25
- })), (rendered) => ElementRef.set(elementRef, rendered))), Effect.forkScoped, Effect.provide(RenderContext.browser(window, { skipRenderScheduling: true })));
25
+ })), (rendered) => ElementRef.set(elementRef, rendered))), Effect.forkScoped, Effect.provide(RenderContext.dom(window, { skipRenderScheduling: true })));
26
26
  const test = {
27
27
  window,
28
28
  document: window.document,
@@ -38,6 +38,8 @@ export function testRender(fx, options) {
38
38
  // Allow our fibers to start
39
39
  yield* _(adjustTime(1));
40
40
  yield* _(adjustTime(1));
41
+ // Await the first render
42
+ yield* _(Fx.first(elementRef), Effect.race(Effect.delay(Effect.dieMessage(`Rendering taking too long`), 1000)));
41
43
  return test;
42
44
  });
43
45
  }
@@ -62,7 +64,18 @@ export function click(rendered, options) {
62
64
  return dispatchEvent(rendered, { event: "click", ...options, eventInit: { bubbles: true, ...options?.eventInit } });
63
65
  }
64
66
  // internals
65
- function makeWindow(options) {
66
- return new happyDOM.Window(options);
67
+ function getOrMakeWindow(options) {
68
+ if (typeof window !== "undefined" && typeof document !== "undefined") {
69
+ return Effect.gen(function* (_) {
70
+ window.document.head.innerHTML = "";
71
+ window.document.body.innerHTML = "";
72
+ yield* _(Effect.addFinalizer(() => Effect.sync(() => {
73
+ window.document.head.innerHTML = "";
74
+ window.document.body.innerHTML = "";
75
+ })));
76
+ return window;
77
+ });
78
+ }
79
+ return Effect.promise(() => import("happy-dom").then((happyDOM) => new happyDOM.Window(options)));
67
80
  }
68
81
  //# sourceMappingURL=Test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"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"}
package/dist/esm/index.js CHANGED
@@ -58,8 +58,4 @@ export * from "./RenderEvent.js";
58
58
  * @since 1.0.0
59
59
  */
60
60
  export * from "./RenderTemplate.js";
61
- /**
62
- * @since 1.0.0
63
- */
64
- export * from "./TemplateInstance.js";
65
61
  //# sourceMappingURL=index.js.map
@@ -1 +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"}
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"}
@@ -0,0 +1,91 @@
1
+ import { Effect, Scope } from "effect";
2
+ import * as Runtime from "effect/Runtime";
3
+ import { getElements } from "../ElementSource";
4
+ const disposable = (f) => ({
5
+ [Symbol.dispose]: f
6
+ });
7
+ export function makeEventSource() {
8
+ const bubbleListeners = new Map();
9
+ const captureListeners = new Map();
10
+ function addListener(listeners, event, entry) {
11
+ const set = listeners.get(event);
12
+ if (set === undefined) {
13
+ const set = new Set();
14
+ set.add(entry);
15
+ listeners.set(event, set);
16
+ }
17
+ else {
18
+ set.add(entry);
19
+ }
20
+ }
21
+ function addEventListener(element, event, handler) {
22
+ if (handler.options?.capture === true) {
23
+ return addListener(captureListeners, event, [element, handler]);
24
+ }
25
+ else {
26
+ return addListener(bubbleListeners, event, [element, handler]);
27
+ }
28
+ }
29
+ function setupBubbleListeners(element, run) {
30
+ const disposables = [];
31
+ for (const [event, handlers] of bubbleListeners) {
32
+ const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : Effect.unit));
33
+ element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
34
+ disposables.push(disposable(() => element.removeEventListener(event, listener)));
35
+ }
36
+ return disposables;
37
+ }
38
+ function setupCaptureListeners(element, run) {
39
+ const disposables = [];
40
+ for (const [event, handlers] of captureListeners) {
41
+ const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target)
42
+ ? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el))
43
+ : Effect.unit));
44
+ element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
45
+ disposables.push(disposable(() => element.removeEventListener(event, listener)));
46
+ }
47
+ return disposables;
48
+ }
49
+ function setup(rendered, scope) {
50
+ const hasBubbleListeners = bubbleListeners.size > 0;
51
+ const hasCaptureListeners = captureListeners.size > 0;
52
+ if (!hasBubbleListeners && !hasCaptureListeners) {
53
+ return Effect.unit;
54
+ }
55
+ return Effect.flatMap(Effect.runtime(), (runtime) => {
56
+ const elements = getElements(rendered);
57
+ const disposables = [];
58
+ const runFork = Runtime.runFork(runtime);
59
+ const run = (effect) => runFork(Effect.fromFiberEffect(Effect.forkIn(effect, scope)));
60
+ for (const element of elements) {
61
+ if (hasBubbleListeners) {
62
+ disposables.push(...setupBubbleListeners(element, run));
63
+ }
64
+ if (hasCaptureListeners) {
65
+ disposables.push(...setupCaptureListeners(element, run));
66
+ }
67
+ }
68
+ return Scope.addFinalizer(scope, Effect.sync(() => disposables.forEach((d) => d[Symbol.dispose]())));
69
+ });
70
+ }
71
+ return {
72
+ addEventListener,
73
+ setup
74
+ };
75
+ }
76
+ const EVENT_PROPERTY_TO_REPLACE = "currentTarget";
77
+ function proxyCurrentTargetForCaptureEvents(event, currentTarget) {
78
+ return new Proxy(event, {
79
+ get(target, property) {
80
+ return property === EVENT_PROPERTY_TO_REPLACE ? currentTarget : target[property];
81
+ }
82
+ });
83
+ }
84
+ function getDerivedAddEventListenerOptions(entries) {
85
+ const hs = Array.from(entries);
86
+ return {
87
+ once: hs.some((h) => h[1].options?.once === true),
88
+ passive: hs.every((h) => h[1].options?.passive === true)
89
+ };
90
+ }
91
+ //# sourceMappingURL=EventSource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"EventSource.js","sourceRoot":"","sources":["../../../src/internal/EventSource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAoB9C,MAAM,UAAU,GAAG,CAAC,CAAa,EAAc,EAAE,CAAC,CAAC;IACjD,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;CACpB,CAAC,CAAA;AAEF,MAAM,UAAU,eAAe;IAC7B,MAAM,eAAe,GAAG,IAAI,GAAG,EAG5B,CAAA;IACH,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAG7B,CAAA;IAEH,SAAS,WAAW,CAClB,SAGC,EACD,KAAgB,EAChB,KAAY;QAEZ,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAChC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAS,CAAA;YAC5B,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACd,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;QAC3B,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;IAED,SAAS,gBAAgB,CACvB,OAAgB,EAChB,KAAgB,EAChB,OAAoB;QAEpB,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YACtC,OAAO,WAAW,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;QACjE,CAAC;aAAM,CAAC;YACN,OAAO,WAAW,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED,SAAS,oBAAoB,CAAC,OAAgB,EAAE,GAAQ;QACtD,MAAM,WAAW,GAAsB,EAAE,CAAA;QAEzC,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,CAAC,EAAS,EAAE,EAAE,CAC7B,GAAG,CACD,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CACzC,EAAE,CAAC,MAAM,KAAK,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAC1F,CAAA;YACH,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,iCAAiC,CAAC,QAAQ,CAAC,CAAC,CAAA;YACtF,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;QAClF,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,SAAS,qBAAqB,CAAC,OAAgB,EAAE,GAAQ;QACvD,MAAM,WAAW,GAAsB,EAAE,CAAA;QAEzC,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACjD,MAAM,QAAQ,GAAG,CAAC,EAAS,EAAE,EAAE,CAC7B,GAAG,CACD,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CACzC,EAAE,CAAC,MAAM,KAAK,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAc,CAAC;gBAChD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,kCAAkC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7D,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,CAAA;YACH,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,iCAAiC,CAAC,QAAQ,CAAC,CAAC,CAAA;YACtF,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;QAClF,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,SAAS,KAAK,CAAC,QAAkB,EAAE,KAAkB;QACnD,MAAM,kBAAkB,GAAG,eAAe,CAAC,IAAI,GAAG,CAAC,CAAA;QACnD,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAA;QAErD,IAAI,CAAC,kBAAkB,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAChD,OAAO,MAAM,CAAC,IAAI,CAAA;QACpB,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAS,EAAE,CAAC,OAAO,EAAE,EAAE;YACzD,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;YACtC,MAAM,WAAW,GAAsB,EAAE,CAAA;YACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACxC,MAAM,GAAG,GAAQ,CAAO,MAAkC,EAAE,EAAE,CAC5D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;YAE/D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC/B,IAAI,kBAAkB,EAAE,CAAC;oBACvB,WAAW,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;gBACzD,CAAC;gBACD,IAAI,mBAAmB,EAAE,CAAC;oBACxB,WAAW,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;gBAC1D,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACtG,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,gBAAgB;QAChB,KAAK;KACN,CAAA;AACH,CAAC;AAED,MAAM,yBAAyB,GAAG,eAAe,CAAA;AAEjD,SAAS,kCAAkC,CAAkB,KAAQ,EAAE,aAAsB;IAC3F,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE;QACtB,GAAG,CAAC,MAAS,EAAE,QAAyB;YACtC,OAAO,QAAQ,KAAK,yBAAyB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAA;QAC7F,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,iCAAiC,CAAC,OAAmB;IAC5D,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC9B,OAAO;QACL,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,KAAK,IAAI,CAAC;QACjD,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;KACzD,CAAA;AACH,CAAC"}
@@ -55,16 +55,7 @@ export function diffChildren(comment, currentNodes, nextNodes, document) {
55
55
  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
56
56
  comment.parentNode,
57
57
  // Document Fragments cannot be removed, so we filter them out
58
- currentNodes.filter((x) => x.nodeType !== x.DOCUMENT_FRAGMENT_NODE), nextNodes.flatMap(flattenRenderEvent), diffable(document), comment);
59
- }
60
- function flattenRenderEvent(x) {
61
- if (isRenderEvent(x)) {
62
- const value = x.valueOf();
63
- return Array.isArray(value) ? value : [value];
64
- }
65
- else {
66
- return [x];
67
- }
58
+ currentNodes.filter((x) => x.nodeType !== x.DOCUMENT_FRAGMENT_NODE), nextNodes, diffable(document), comment);
68
59
  }
69
60
  function matchValue(value, onText, onNodes) {
70
61
  switch (typeof value) {
@@ -86,17 +77,26 @@ function matchValue(value, onText, onNodes) {
86
77
  return onNodes([]);
87
78
  // or diffed, if these contains nodes or "wires"
88
79
  else if (value.some((x) => typeof x === "object")) {
89
- return onNodes(value.flatMap((x) => (x === null ? [] : [isRenderEvent(x) ? x.valueOf() : x])));
80
+ return onNodes(value.flatMap(renderEventToArray));
90
81
  } // in all other cases the content is stringified as is
91
82
  else
92
83
  return onText(String(value));
93
84
  }
94
85
  else {
95
- return onNodes([isRenderEvent(value) ? value.valueOf() : value]);
86
+ return onNodes(renderEventToArray(value));
96
87
  }
97
88
  }
98
89
  case "function":
99
90
  return onNodes([]);
100
91
  }
101
92
  }
93
+ function renderEventToArray(x) {
94
+ if (x === null || x === undefined)
95
+ return [];
96
+ if (isRenderEvent(x)) {
97
+ const value = x.valueOf();
98
+ return Array.isArray(value) ? value : [value];
99
+ }
100
+ return [x];
101
+ }
102
102
  //# sourceMappingURL=browser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/internal/browser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/internal/browser.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,11 @@
1
1
  import * as Fx from "@typed/fx/Fx";
2
- import * as Subject from "@typed/fx/Subject";
3
- import { Effect } from "effect";
4
- import * as ElementRef from "../ElementRef.js";
2
+ import * as Effect from "effect/Effect";
5
3
  import { DomRenderEvent } from "../RenderEvent.js";
6
- import { TemplateInstance } from "../TemplateInstance.js";
7
4
  import { indexRefCounter } from "./indexRefCounter.js";
8
5
  import { unsafeGet } from "@typed/context";
6
+ import { Scope } from "effect/Scope";
9
7
  import { CouldNotFindCommentError, CouldNotFindRootElement } from "./errors.js";
8
+ import { makeEventSource } from "./EventSource.js";
10
9
  import { HydrateContext } from "./HydrateContext.js";
11
10
  import { buildParts, getBrowserEntry, renderTemplate, renderValues } from "./render.js";
12
11
  import { findPath, getPreviousNodes, isComment, isCommentWithValue, isHtmlElement } from "./utils.js";
@@ -15,45 +14,45 @@ import { findPath, getPreviousNodes, isComment, isCommentWithValue, isHtmlElemen
15
14
  * Here for "standard" browser rendering, a TemplateInstance is effectively a live
16
15
  * view into the contents rendered by the Template.
17
16
  */
18
- export const hydrateTemplate = (document, renderContext) => (templateStrings, values, providedRef) => {
19
- return Effect.gen(function* (_) {
20
- const context = yield* _(Effect.context());
21
- const hydrateCtx = unsafeGet(context, HydrateContext);
22
- // If we're not longer hydrating, just render normally
23
- if (!hydrateCtx.hydrate) {
24
- return yield* _(renderTemplate(document, renderContext)(templateStrings, values, providedRef));
25
- }
26
- const elementRef = providedRef || (yield* _(ElementRef.make()));
27
- const events = Fx.map(elementRef, DomRenderEvent);
28
- const errors = Subject.make();
29
- const { getParts, template, where, wire } = getHydrateEntry({
30
- ...hydrateCtx,
31
- document,
32
- renderContext,
33
- elementRef,
34
- strings: templateStrings,
35
- onCause: errors.onFailure
36
- });
37
- const parts = yield* _(getParts);
38
- // If there are parts we need to render them before constructing our Wire
39
- if (parts.length > 0) {
40
- const refCounter = yield* _(indexRefCounter(parts.length));
41
- // Do the work
42
- yield* _(renderValues(values, parts, refCounter, errors.onFailure, (index) => ({
43
- where,
44
- rootIndex: index,
45
- parentTemplate: template,
46
- hydrate: true
47
- })));
48
- // Wait for initial work to be completed
49
- yield* _(refCounter.wait);
50
- }
51
- hydrateCtx.hydrate = false;
52
- // Set the element when it is ready
53
- yield* _(ElementRef.set(elementRef, wire));
54
- // Return the Template instance
55
- return TemplateInstance(Fx.merge([events, errors]), elementRef);
56
- });
17
+ export const hydrateTemplate = (document, renderContext) => {
18
+ const render_ = renderTemplate(document, renderContext);
19
+ return (templateStrings, values) => {
20
+ return Fx.make((sink) => Effect.gen(function* (_) {
21
+ const eventSource = makeEventSource();
22
+ const context = yield* _(Effect.context());
23
+ const hydrateCtx = unsafeGet(context, HydrateContext);
24
+ const scope = unsafeGet(context, Scope);
25
+ // If we're not longer hydrating, just render normally
26
+ if (hydrateCtx.hydrate === false) {
27
+ return render_(templateStrings, values);
28
+ }
29
+ const { parts, template, where, wire } = getHydrateEntry({
30
+ ...hydrateCtx,
31
+ document,
32
+ renderContext,
33
+ eventSource,
34
+ strings: templateStrings,
35
+ onCause: sink.onFailure
36
+ });
37
+ // If there are parts we need to render them before constructing our Wire
38
+ if (parts.length > 0) {
39
+ const refCounter = yield* _(indexRefCounter(parts.length));
40
+ // Do the work
41
+ yield* _(renderValues(values, parts, refCounter, context, (index) => ({
42
+ where,
43
+ rootIndex: index,
44
+ parentTemplate: template,
45
+ hydrate: true
46
+ })));
47
+ // Wait for initial work to be completed
48
+ yield* _(refCounter.wait);
49
+ }
50
+ hydrateCtx.hydrate = false;
51
+ yield* _(eventSource.setup(wire, scope));
52
+ yield* _(sink.onSuccess(DomRenderEvent(wire)));
53
+ yield* _(Effect.never);
54
+ }));
55
+ };
57
56
  };
58
57
  export function findRootParentChildNodes(where) {
59
58
  const childNodes = findRootChildNodes(where);
@@ -136,12 +135,12 @@ export function findPartComment(childNodes, partIndex) {
136
135
  }
137
136
  throw new CouldNotFindCommentError(partIndex);
138
137
  }
139
- export function getHydrateEntry({ childIndex, document, elementRef, onCause, parentTemplate, renderContext, rootIndex, strings, where }) {
138
+ export function getHydrateEntry({ childIndex, document, eventSource, onCause, parentTemplate, renderContext, rootIndex, strings, where }) {
140
139
  const { template } = getBrowserEntry(document, renderContext, strings);
141
140
  if (parentTemplate) {
142
141
  where = findTemplateResultPartChildNodes(where, parentTemplate, template, rootIndex, childIndex);
143
142
  }
144
- const getParts = buildParts(document, renderContext, template, where, elementRef, onCause, true);
143
+ const parts = buildParts(document, renderContext, template, where, eventSource, onCause, true);
145
144
  const wire = (() => {
146
145
  if (!parentTemplate) {
147
146
  const childNodes = Array.from(where.childNodes).filter((node) => isComment(node) ? !isCommentWithValue(node, END) : true);
@@ -158,7 +157,7 @@ export function getHydrateEntry({ childIndex, document, elementRef, onCause, par
158
157
  return {
159
158
  template,
160
159
  wire,
161
- getParts,
160
+ parts,
162
161
  where
163
162
  };
164
163
  }
@@ -1 +1 @@
1
- {"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../../../src/internal/hydrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,OAAO,MAAM,mBAAmB,CAAA;AAG5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAA;AAI9C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACvF,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,aAAa,EAEd,MAAM,YAAY,CAAA;AAEnB,sCAAsC;AAEtC;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,CAC5B,CACE,eAAqC,EACrC,MAAc,EACd,WAAsC,EACtC,EAAE;IACF,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;QAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC,CAAA;QACjD,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;QAErD,sDAAsD;QACtD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,eAAe,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAA;QAChG,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAK,CAAC,CAAC,CAAA;QAClE,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAA4C,CAAA;QAEvE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC;YAC1D,GAAG,UAAU;YACb,QAAQ;YACR,aAAa;YACb,UAAU;YACV,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE,MAAM,CAAC,SAAS;SAC1B,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QAEhC,yEAAyE;QACzE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;YAE1D,cAAc;YACd,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,KAAa,EAAkB,EAAE,CAAC,CAAC;gBACrG,KAAK;gBACL,SAAS,EAAE,KAAK;gBAChB,cAAc,EAAE,QAAQ;gBACxB,OAAO,EAAE,IAAI;aACd,CAAC,CAAC,CAAC,CAAA;YAEJ,wCAAwC;YACxC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC3B,CAAC;QAED,UAAU,CAAC,OAAO,GAAG,KAAK,CAAA;QAE1B,mCAAmC;QACnC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,IAAS,CAAC,CAAC,CAAA;QAE/C,+BAA+B;QAC/B,OAAO,gBAAgB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;IACjE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAEH,MAAM,UAAU,wBAAwB,CAAC,KAAkB;IACzD,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAE5C,OAAO;QACL,UAAU,EAAE,KAAK;QACjB,UAAU;KACX,CAAA;AACH,CAAC;AAED,MAAM,KAAK,GAAG,aAAa,CAAA;AAC3B,MAAM,GAAG,GAAG,WAAW,CAAA;AAEvB,iFAAiF;AACjF,MAAM,UAAU,kBAAkB,CAAC,KAAkB;IACnD,MAAM,UAAU,GAAgB,EAAE,CAAA;IAElC,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,GAAG,GAAG,UAAU,CAAC,MAAM,CAAA;IAE3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;gBAC7B,KAAK,GAAG,CAAC,CAAA;gBACT,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,SAAS,KAAK,GAAG,EAAE,CAAC;gBAC3B,GAAG,GAAG,CAAC,CAAA;gBACP,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,KAAuB,EACvB,cAAwB,EACxB,aAA8B,EAC9B,SAAiB,EACjB,UAAmB;IAEnB,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAgB,CAAA;IACvD,MAAM,UAAU,GAAG,kBAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACjF,MAAM,gBAAgB,GAAG;QACvB,UAAU;QACV,UAAU,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;KAC7E,CAAA;IAED,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,EAAE,UAAU,EAAoB,EAChC,IAA+B,EAC/B,SAAiB;IAEjB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,eAAe,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAE/D,MAAM,KAAK,GAAgB,EAAE,CAAA;IAC7B,MAAM,iBAAiB,GAAG,OAAO,SAAS,GAAG,CAAC,EAAE,CAAA;IAEhD,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;YAE1B,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACvD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACrB,CAAC;iBAAM,IAAI,SAAS,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,CAAC;gBACxE,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,uBAAuB,CAAC,SAAS,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEnB,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,UAA2B,EAAE,SAAiB;IAC5E,MAAM,MAAM,GAAG,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,SAAS,EAAE,CAAA;IAElE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAE1B,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAU,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,SAAS,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAC9B,UAAU,EACV,QAAQ,EACR,UAAU,EACV,OAAO,EACP,cAAc,EACd,aAAa,EACb,SAAS,EACT,OAAO,EACP,KAAK,EAWN;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;IAEtE,IAAI,cAAc,EAAE,CAAC;QACnB,KAAK,GAAG,gCAAgC,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAClG,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAEhG,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE;QACjB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9D,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CACxD,CAAA;YAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAO,UAAU,CAAC,CAAC,CAAC,CAAA;YACtB,CAAC;YAED,OAAO,UAAU,CAAA;QACnB,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAC5B,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,CACxC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,SAAS,EAAE,CAAC,CACxD,CAAA;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO;QACL,QAAQ;QACR,IAAI;QACJ,QAAQ;QACR,KAAK;KACG,CAAA;AACZ,CAAC"}
1
+ {"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../../../src/internal/hydrate.ts"],"names":[],"mappings":"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"}
@@ -1,22 +1,70 @@
1
1
  import * as Deferred from "effect/Deferred";
2
2
  import * as Effect from "effect/Effect";
3
+ import * as Option from "effect/Option";
3
4
  /**
4
5
  * @internal
5
6
  */
6
7
  export function indexRefCounter(expected) {
7
8
  return Effect.map(Deferred.make(), (deferred) => {
9
+ const done = Deferred.succeed(deferred, undefined);
8
10
  const indexes = new Set(Array.from({ length: expected }, (_, i) => i));
9
11
  function release(index) {
10
12
  return Effect.suspend(() => {
11
13
  if (indexes.delete(index) && indexes.size === 0) {
12
- return Deferred.succeed(deferred, undefined);
14
+ return done;
13
15
  }
14
- else
16
+ else {
15
17
  return Effect.unit;
18
+ }
19
+ });
20
+ }
21
+ return {
22
+ release,
23
+ wait: Deferred.await(deferred)
24
+ };
25
+ });
26
+ }
27
+ /**
28
+ * @internal
29
+ */
30
+ export function indexRefCounter2() {
31
+ return Effect.map(Deferred.make(), (deferred) => {
32
+ let expected = Option.none();
33
+ const done = Deferred.succeed(deferred, undefined);
34
+ const indexes = new Set();
35
+ function isDone() {
36
+ if (Option.isSome(expected)) {
37
+ return indexes.size === expected.value;
38
+ }
39
+ else {
40
+ return false;
41
+ }
42
+ }
43
+ function release(index) {
44
+ return Effect.suspend(() => {
45
+ indexes.add(index);
46
+ if (isDone()) {
47
+ return done;
48
+ }
49
+ else {
50
+ return Effect.succeed(false);
51
+ }
52
+ });
53
+ }
54
+ function expect(count) {
55
+ return Effect.suspend(() => {
56
+ expected = Option.some(count);
57
+ if (isDone()) {
58
+ return Effect.as(done, false);
59
+ }
60
+ else {
61
+ return Effect.succeed(true);
62
+ }
16
63
  });
17
64
  }
18
65
  return {
19
66
  release,
67
+ expect,
20
68
  wait: Deferred.await(deferred)
21
69
  };
22
70
  });
@@ -1 +1 @@
1
- {"version":3,"file":"indexRefCounter.js","sourceRoot":"","sources":["../../../src/internal/indexRefCounter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAOvC;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAK9C,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC3D,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9E,SAAS,OAAO,CAAC,KAAa;YAC5B,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBAChD,OAAO,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;gBAC9C,CAAC;;oBAAM,OAAO,MAAM,CAAC,IAAI,CAAA;YAC3B,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO;YACL,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC/B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"indexRefCounter.js","sourceRoot":"","sources":["../../../src/internal/indexRefCounter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAOvC;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAK9C,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAClD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAE9E,SAAS,OAAO,CAAC,KAAa;YAC5B,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAA;gBACb,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC,IAAI,CAAA;gBACpB,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO;YACL,OAAO;YACP,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC/B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAQD;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAK9B,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAe,EAAE,CAAC,QAAQ,EAAE,EAAE;QAC3D,IAAI,QAAQ,GAA0B,MAAM,CAAC,IAAI,EAAU,CAAA;QAC3D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAClD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;QAEjC,SAAS,MAAM;YACb,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,KAAK,CAAA;YACxC,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QAED,SAAS,OAAO,CAAC,KAAa;YAC5B,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClB,IAAI,MAAM,EAAE,EAAE,CAAC;oBACb,OAAO,IAAI,CAAA;gBACb,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,SAAS,MAAM,CAAC,KAAa;YAC3B,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzB,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBAC7B,IAAI,MAAM,EAAE,EAAE,CAAC;oBACb,OAAO,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC/B,CAAC;qBAAM,CAAC;oBACN,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO;YACL,OAAO;YACP,MAAM;YACN,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC/B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}