@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.
- package/dist/cjs/Directive.js +1 -1
- package/dist/cjs/Directive.js.map +1 -1
- package/dist/cjs/ElementRef.js +23 -13
- package/dist/cjs/ElementRef.js.map +1 -1
- package/dist/cjs/ElementSource.js +16 -18
- package/dist/cjs/ElementSource.js.map +1 -1
- package/dist/cjs/EventHandler.js +1 -1
- package/dist/cjs/EventHandler.js.map +1 -1
- package/dist/cjs/Html.js +31 -32
- package/dist/cjs/Html.js.map +1 -1
- package/dist/cjs/HtmlChunk.js +4 -1
- package/dist/cjs/HtmlChunk.js.map +1 -1
- package/dist/cjs/Hydrate.js +1 -1
- package/dist/cjs/Hydrate.js.map +1 -1
- package/dist/cjs/Many.js +14 -13
- package/dist/cjs/Many.js.map +1 -1
- package/dist/cjs/Parser.js +11 -323
- package/dist/cjs/Parser.js.map +1 -1
- package/dist/cjs/Placeholder.js +3 -3
- package/dist/cjs/Placeholder.js.map +1 -1
- package/dist/cjs/Platform.js +4 -4
- package/dist/cjs/Platform.js.map +1 -1
- package/dist/cjs/Render.js +1 -1
- package/dist/cjs/Render.js.map +1 -1
- package/dist/cjs/RenderContext.js +48 -27
- package/dist/cjs/RenderContext.js.map +1 -1
- package/dist/cjs/RenderTemplate.js +2 -17
- package/dist/cjs/RenderTemplate.js.map +1 -1
- package/dist/cjs/Template.js +27 -1
- package/dist/cjs/Template.js.map +1 -1
- package/dist/cjs/TemplateInstance.js +2 -2
- package/dist/cjs/TemplateInstance.js.map +1 -1
- package/dist/cjs/Test.js +20 -7
- package/dist/cjs/Test.js.map +1 -1
- package/dist/cjs/index.js +0 -12
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/internal/EventSource.js +95 -0
- package/dist/cjs/internal/EventSource.js.map +1 -0
- package/dist/cjs/internal/browser.js +11 -11
- package/dist/cjs/internal/browser.js.map +1 -1
- package/dist/cjs/internal/hydrate.js +49 -50
- package/dist/cjs/internal/hydrate.js.map +1 -1
- package/dist/cjs/internal/indexRefCounter.js +49 -2
- package/dist/cjs/internal/indexRefCounter.js.map +1 -1
- package/dist/cjs/internal/parser.js +60 -17
- package/dist/cjs/internal/parser.js.map +1 -1
- package/dist/cjs/internal/parts.js +128 -28
- package/dist/cjs/internal/parts.js.map +1 -1
- package/dist/cjs/internal/render.js +486 -53
- package/dist/cjs/internal/render.js.map +1 -1
- package/dist/cjs/internal/server.js +5 -2
- package/dist/cjs/internal/server.js.map +1 -1
- package/dist/dts/Directive.d.ts.map +1 -1
- package/dist/dts/ElementRef.d.ts +4 -2
- package/dist/dts/ElementRef.d.ts.map +1 -1
- package/dist/dts/ElementSource.d.ts +10 -5
- package/dist/dts/ElementSource.d.ts.map +1 -1
- package/dist/dts/EventHandler.d.ts.map +1 -1
- package/dist/dts/Html.d.ts +1 -1
- package/dist/dts/Html.d.ts.map +1 -1
- package/dist/dts/HtmlChunk.d.ts.map +1 -1
- package/dist/dts/Many.d.ts +13 -11
- package/dist/dts/Many.d.ts.map +1 -1
- package/dist/dts/Parser.d.ts +3 -6
- package/dist/dts/Parser.d.ts.map +1 -1
- package/dist/dts/Part.d.ts +13 -3
- package/dist/dts/Part.d.ts.map +1 -1
- package/dist/dts/Placeholder.d.ts +2 -2
- package/dist/dts/Placeholder.d.ts.map +1 -1
- package/dist/dts/Render.d.ts +2 -1
- package/dist/dts/Render.d.ts.map +1 -1
- package/dist/dts/RenderContext.d.ts +5 -4
- package/dist/dts/RenderContext.d.ts.map +1 -1
- package/dist/dts/RenderTemplate.d.ts +2 -16
- package/dist/dts/RenderTemplate.d.ts.map +1 -1
- package/dist/dts/Renderable.d.ts +2 -2
- package/dist/dts/Renderable.d.ts.map +1 -1
- package/dist/dts/Template.d.ts +21 -3
- package/dist/dts/Template.d.ts.map +1 -1
- package/dist/dts/TemplateInstance.d.ts +3 -2
- package/dist/dts/TemplateInstance.d.ts.map +1 -1
- package/dist/dts/Test.d.ts +4 -6
- package/dist/dts/Test.d.ts.map +1 -1
- package/dist/dts/index.d.ts +0 -4
- package/dist/dts/index.d.ts.map +1 -1
- package/dist/dts/internal/EventSource.d.ts +12 -0
- package/dist/dts/internal/EventSource.d.ts.map +1 -0
- package/dist/dts/internal/browser.d.ts.map +1 -1
- package/dist/dts/internal/hydrate.d.ts +5 -5
- package/dist/dts/internal/hydrate.d.ts.map +1 -1
- package/dist/dts/internal/indexRefCounter.d.ts +5 -0
- package/dist/dts/internal/indexRefCounter.d.ts.map +1 -1
- package/dist/dts/internal/module-augmentation.d.ts +0 -4
- package/dist/dts/internal/module-augmentation.d.ts.map +1 -1
- package/dist/dts/internal/parser.d.ts +8 -0
- package/dist/dts/internal/parser.d.ts.map +1 -1
- package/dist/dts/internal/parts.d.ts +66 -56
- package/dist/dts/internal/parts.d.ts.map +1 -1
- package/dist/dts/internal/render.d.ts +7 -7
- package/dist/dts/internal/render.d.ts.map +1 -1
- package/dist/dts/internal/server.d.ts.map +1 -1
- package/dist/esm/Directive.js +1 -1
- package/dist/esm/Directive.js.map +1 -1
- package/dist/esm/ElementRef.js +12 -7
- package/dist/esm/ElementRef.js.map +1 -1
- package/dist/esm/ElementSource.js +16 -13
- package/dist/esm/ElementSource.js.map +1 -1
- package/dist/esm/EventHandler.js +1 -1
- package/dist/esm/EventHandler.js.map +1 -1
- package/dist/esm/Html.js +29 -24
- package/dist/esm/Html.js.map +1 -1
- package/dist/esm/HtmlChunk.js +6 -1
- package/dist/esm/HtmlChunk.js.map +1 -1
- package/dist/esm/Hydrate.js +1 -1
- package/dist/esm/Hydrate.js.map +1 -1
- package/dist/esm/Many.js +14 -10
- package/dist/esm/Many.js.map +1 -1
- package/dist/esm/Parser.js +6 -335
- package/dist/esm/Parser.js.map +1 -1
- package/dist/esm/Placeholder.js +2 -2
- package/dist/esm/Placeholder.js.map +1 -1
- package/dist/esm/Platform.js +2 -2
- package/dist/esm/Platform.js.map +1 -1
- package/dist/esm/Render.js +1 -1
- package/dist/esm/Render.js.map +1 -1
- package/dist/esm/RenderContext.js +38 -17
- package/dist/esm/RenderContext.js.map +1 -1
- package/dist/esm/RenderTemplate.js +2 -12
- package/dist/esm/RenderTemplate.js.map +1 -1
- package/dist/esm/Template.js +24 -0
- package/dist/esm/Template.js.map +1 -1
- package/dist/esm/TemplateInstance.js +2 -2
- package/dist/esm/TemplateInstance.js.map +1 -1
- package/dist/esm/Test.js +20 -7
- package/dist/esm/Test.js.map +1 -1
- package/dist/esm/index.js +0 -4
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/internal/EventSource.js +91 -0
- package/dist/esm/internal/EventSource.js.map +1 -0
- package/dist/esm/internal/browser.js +12 -12
- package/dist/esm/internal/browser.js.map +1 -1
- package/dist/esm/internal/hydrate.js +45 -46
- package/dist/esm/internal/hydrate.js.map +1 -1
- package/dist/esm/internal/indexRefCounter.js +50 -2
- package/dist/esm/internal/indexRefCounter.js.map +1 -1
- package/dist/esm/internal/parser.js +84 -17
- package/dist/esm/internal/parser.js.map +1 -1
- package/dist/esm/internal/parts.js +110 -27
- package/dist/esm/internal/parts.js.map +1 -1
- package/dist/esm/internal/render.js +476 -58
- package/dist/esm/internal/render.js.map +1 -1
- package/dist/esm/internal/server.js +5 -4
- package/dist/esm/internal/server.js.map +1 -1
- package/package.json +10 -26
- package/src/Directive.ts +1 -1
- package/src/ElementRef.ts +18 -14
- package/src/ElementSource.ts +62 -47
- package/src/EventHandler.ts +1 -1
- package/src/Html.ts +58 -57
- package/src/HtmlChunk.ts +15 -1
- package/src/Hydrate.ts +1 -1
- package/src/Many.ts +53 -43
- package/src/Parser.ts +10 -453
- package/src/Part.ts +15 -3
- package/src/Placeholder.ts +4 -4
- package/src/Platform.ts +2 -2
- package/src/Render.ts +7 -2
- package/src/RenderContext.ts +47 -19
- package/src/RenderTemplate.ts +9 -54
- package/src/Renderable.ts +2 -1
- package/src/Template.ts +26 -0
- package/src/TemplateInstance.ts +9 -9
- package/src/Test.ts +40 -21
- package/src/index.ts +0 -4
- package/src/internal/EventSource.ts +153 -0
- package/src/internal/browser.ts +26 -25
- package/src/internal/hydrate.ts +68 -61
- package/src/internal/indexRefCounter.ts +63 -2
- package/src/internal/module-augmentation.ts +0 -4
- package/src/internal/parser.ts +92 -19
- package/src/internal/parts.ts +158 -73
- package/src/internal/render.ts +701 -89
- package/src/internal/server.ts +5 -3
- package/Token/package.json +0 -6
- package/Tokenizer/package.json +0 -6
- package/dist/cjs/Token.js +0 -270
- package/dist/cjs/Token.js.map +0 -1
- package/dist/cjs/Tokenizer.js +0 -18
- package/dist/cjs/Tokenizer.js.map +0 -1
- package/dist/cjs/internal/readAttribute.js +0 -34
- package/dist/cjs/internal/readAttribute.js.map +0 -1
- package/dist/cjs/internal/tokenizer.js +0 -264
- package/dist/cjs/internal/tokenizer.js.map +0 -1
- package/dist/dts/Token.d.ts +0 -202
- package/dist/dts/Token.d.ts.map +0 -1
- package/dist/dts/Tokenizer.d.ts +0 -6
- package/dist/dts/Tokenizer.d.ts.map +0 -1
- package/dist/dts/internal/readAttribute.d.ts +0 -9
- package/dist/dts/internal/readAttribute.d.ts.map +0 -1
- package/dist/dts/internal/tokenizer.d.ts +0 -3
- package/dist/dts/internal/tokenizer.d.ts.map +0 -1
- package/dist/esm/Token.js +0 -264
- package/dist/esm/Token.js.map +0 -1
- package/dist/esm/Tokenizer.js +0 -9
- package/dist/esm/Tokenizer.js.map +0 -1
- package/dist/esm/internal/readAttribute.js +0 -24
- package/dist/esm/internal/readAttribute.js.map +0 -1
- package/dist/esm/internal/tokenizer.js +0 -296
- package/dist/esm/internal/tokenizer.js.map +0 -1
- package/src/Token.ts +0 -269
- package/src/Tokenizer.ts +0 -10
- package/src/internal/readAttribute.ts +0 -28
- 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("
|
|
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
|
|
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;
|
|
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 =
|
|
19
|
+
const window = yield* _(getOrMakeWindow(options));
|
|
20
20
|
const elementRef = yield* _(ElementRef.make());
|
|
21
|
-
const errors = yield* _(
|
|
22
|
-
const fiber = yield* _(fx, render,
|
|
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.
|
|
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
|
|
66
|
-
|
|
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
|
package/dist/esm/Test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Test.js","sourceRoot":"","sources":["../../src/Test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.js
CHANGED
package/dist/esm/index.js.map
CHANGED
|
@@ -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
|
|
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":"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"}
|
|
@@ -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
|
|
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(
|
|
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(
|
|
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":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,QAAQ,MAAM,UAAU,CAAA;
|
|
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
|
|
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) =>
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
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,
|
|
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
|
|
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
|
-
|
|
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;
|
|
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
|
|
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;
|
|
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"}
|