@typed/template 0.9.6 → 0.10.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/RenderQueue/package.json +6 -0
- package/dist/cjs/Directive.js +1 -1
- package/dist/cjs/Directive.js.map +1 -1
- package/dist/cjs/ElementRef.js +1 -1
- package/dist/cjs/ElementRef.js.map +1 -1
- package/dist/cjs/ElementSource.js +1 -1
- package/dist/cjs/ElementSource.js.map +1 -1
- package/dist/cjs/EventHandler.js +11 -4
- package/dist/cjs/EventHandler.js.map +1 -1
- package/dist/cjs/Html.js +84 -44
- package/dist/cjs/Html.js.map +1 -1
- package/dist/cjs/HtmlChunk.js +67 -21
- package/dist/cjs/HtmlChunk.js.map +1 -1
- package/dist/cjs/Hydrate.js +6 -6
- package/dist/cjs/Hydrate.js.map +1 -1
- package/dist/cjs/Many.js +4 -4
- package/dist/cjs/Many.js.map +1 -1
- package/dist/cjs/Meta.js +10 -3
- package/dist/cjs/Meta.js.map +1 -1
- package/dist/cjs/Parser.js +1 -1
- package/dist/cjs/Placeholder.js +5 -9
- package/dist/cjs/Placeholder.js.map +1 -1
- package/dist/cjs/Platform.js +7 -5
- package/dist/cjs/Platform.js.map +1 -1
- package/dist/cjs/Render.js +8 -7
- package/dist/cjs/Render.js.map +1 -1
- package/dist/cjs/RenderContext.js +8 -92
- package/dist/cjs/RenderContext.js.map +1 -1
- package/dist/cjs/RenderEvent.js +9 -1
- package/dist/cjs/RenderEvent.js.map +1 -1
- package/dist/cjs/RenderQueue.js +341 -0
- package/dist/cjs/RenderQueue.js.map +1 -0
- package/dist/cjs/RenderTemplate.js +1 -1
- package/dist/cjs/RenderTemplate.js.map +1 -1
- package/dist/cjs/Template.js +12 -0
- package/dist/cjs/Template.js.map +1 -1
- package/dist/cjs/Test.js +64 -33
- package/dist/cjs/Test.js.map +1 -1
- package/dist/cjs/Vitest.js +12 -20
- package/dist/cjs/Vitest.js.map +1 -1
- package/dist/cjs/index.js +6 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/internal/EventSource.js +16 -9
- package/dist/cjs/internal/EventSource.js.map +1 -1
- package/dist/cjs/internal/HydrateContext.js.map +1 -1
- package/dist/cjs/internal/browser.js +11 -10
- package/dist/cjs/internal/browser.js.map +1 -1
- package/dist/cjs/internal/character-entities.js +2141 -0
- package/dist/cjs/internal/character-entities.js.map +1 -0
- package/dist/cjs/internal/errors.js +19 -2
- package/dist/cjs/internal/errors.js.map +1 -1
- package/dist/cjs/internal/indexRefCounter.js +36 -63
- package/dist/cjs/internal/indexRefCounter.js.map +1 -1
- package/dist/cjs/internal/parser.js +18 -17
- package/dist/cjs/internal/parser.js.map +1 -1
- package/dist/cjs/internal/parser2.js +382 -0
- package/dist/cjs/internal/parser2.js.map +1 -0
- package/dist/cjs/internal/server-parts.js +124 -0
- package/dist/cjs/internal/server-parts.js.map +1 -0
- package/dist/cjs/internal/server.js +15 -185
- package/dist/cjs/internal/server.js.map +1 -1
- package/dist/cjs/internal/utils.js +73 -9
- package/dist/cjs/internal/utils.js.map +1 -1
- package/dist/cjs/internal/v2/SyncPart.js +6 -0
- package/dist/cjs/internal/v2/SyncPart.js.map +1 -0
- package/dist/cjs/internal/v2/helpers.js +15 -0
- package/dist/cjs/internal/v2/helpers.js.map +1 -0
- package/dist/cjs/internal/v2/hydrate.js +202 -0
- package/dist/cjs/internal/v2/hydrate.js.map +1 -0
- package/dist/cjs/internal/v2/hydration-template.js +269 -0
- package/dist/cjs/internal/v2/hydration-template.js.map +1 -0
- package/dist/cjs/internal/v2/parts.js +169 -0
- package/dist/cjs/internal/v2/parts.js.map +1 -0
- package/dist/cjs/internal/v2/render-entry.js +110 -0
- package/dist/cjs/internal/v2/render-entry.js.map +1 -0
- package/dist/cjs/internal/v2/render-sync-parts.js +318 -0
- package/dist/cjs/internal/v2/render-sync-parts.js.map +1 -0
- package/dist/cjs/internal/v2/render.js +417 -0
- package/dist/cjs/internal/v2/render.js.map +1 -0
- package/dist/cjs/internal/v2/sync-parts.js +115 -0
- package/dist/cjs/internal/v2/sync-parts.js.map +1 -0
- package/dist/dts/ElementRef.d.ts +1 -1
- package/dist/dts/ElementRef.d.ts.map +1 -1
- package/dist/dts/ElementSource.d.ts +1 -1
- package/dist/dts/ElementSource.d.ts.map +1 -1
- package/dist/dts/EventHandler.d.ts +12 -8
- package/dist/dts/EventHandler.d.ts.map +1 -1
- package/dist/dts/Html.d.ts +6 -5
- package/dist/dts/Html.d.ts.map +1 -1
- package/dist/dts/HtmlChunk.d.ts.map +1 -1
- package/dist/dts/Hydrate.d.ts +1 -3
- package/dist/dts/Hydrate.d.ts.map +1 -1
- package/dist/dts/Many.d.ts +9 -11
- package/dist/dts/Many.d.ts.map +1 -1
- package/dist/dts/Meta.d.ts +5 -1
- package/dist/dts/Meta.d.ts.map +1 -1
- package/dist/dts/Parser.d.ts +1 -1
- package/dist/dts/Parser.d.ts.map +1 -1
- package/dist/dts/Part.d.ts +20 -56
- package/dist/dts/Part.d.ts.map +1 -1
- package/dist/dts/Placeholder.d.ts +6 -10
- package/dist/dts/Placeholder.d.ts.map +1 -1
- package/dist/dts/Platform.d.ts +2 -4
- package/dist/dts/Platform.d.ts.map +1 -1
- package/dist/dts/Render.d.ts +4 -8
- package/dist/dts/Render.d.ts.map +1 -1
- package/dist/dts/RenderContext.d.ts +3 -22
- package/dist/dts/RenderContext.d.ts.map +1 -1
- package/dist/dts/RenderEvent.d.ts +6 -1
- package/dist/dts/RenderEvent.d.ts.map +1 -1
- package/dist/dts/RenderQueue.d.ts +103 -0
- package/dist/dts/RenderQueue.d.ts.map +1 -0
- package/dist/dts/RenderTemplate.d.ts +3 -2
- package/dist/dts/RenderTemplate.d.ts.map +1 -1
- package/dist/dts/Renderable.d.ts +1 -1
- package/dist/dts/Template.d.ts +14 -1
- package/dist/dts/Template.d.ts.map +1 -1
- package/dist/dts/Test.d.ts +14 -1
- package/dist/dts/Test.d.ts.map +1 -1
- package/dist/dts/Vitest.d.ts +11 -8
- package/dist/dts/Vitest.d.ts.map +1 -1
- package/dist/dts/index.d.ts +4 -0
- package/dist/dts/index.d.ts.map +1 -1
- package/dist/dts/internal/EventSource.d.ts +2 -1
- package/dist/dts/internal/EventSource.d.ts.map +1 -1
- package/dist/dts/internal/browser.d.ts +3 -3
- package/dist/dts/internal/browser.d.ts.map +1 -1
- package/dist/dts/internal/character-entities.d.ts +2133 -0
- package/dist/dts/internal/character-entities.d.ts.map +1 -0
- package/dist/dts/internal/errors.d.ts +9 -1
- package/dist/dts/internal/errors.d.ts.map +1 -1
- package/dist/dts/internal/indexRefCounter.d.ts +0 -4
- package/dist/dts/internal/indexRefCounter.d.ts.map +1 -1
- package/dist/dts/internal/parser.d.ts +13 -0
- package/dist/dts/internal/parser.d.ts.map +1 -1
- package/dist/dts/internal/parser2.d.ts +12 -0
- package/dist/dts/internal/parser2.d.ts.map +1 -0
- package/dist/dts/internal/server-parts.d.ts +223 -0
- package/dist/dts/internal/server-parts.d.ts.map +1 -0
- package/dist/dts/internal/server.d.ts +2 -28
- package/dist/dts/internal/server.d.ts.map +1 -1
- package/dist/dts/internal/utils.d.ts +4 -1
- package/dist/dts/internal/utils.d.ts.map +1 -1
- package/dist/dts/internal/v2/SyncPart.d.ts +87 -0
- package/dist/dts/internal/v2/SyncPart.d.ts.map +1 -0
- package/dist/dts/internal/v2/helpers.d.ts +3 -0
- package/dist/dts/internal/v2/helpers.d.ts.map +1 -0
- package/dist/dts/internal/v2/hydrate.d.ts +7 -0
- package/dist/dts/internal/v2/hydrate.d.ts.map +1 -0
- package/dist/dts/internal/v2/hydration-template.d.ts +54 -0
- package/dist/dts/internal/v2/hydration-template.d.ts.map +1 -0
- package/dist/dts/internal/v2/parts.d.ts +245 -0
- package/dist/dts/internal/v2/parts.d.ts.map +1 -0
- package/dist/dts/internal/v2/render-entry.d.ts +6 -0
- package/dist/dts/internal/v2/render-entry.d.ts.map +1 -0
- package/dist/dts/internal/v2/render-sync-parts.d.ts +22 -0
- package/dist/dts/internal/v2/render-sync-parts.d.ts.map +1 -0
- package/dist/dts/internal/v2/render.d.ts +62 -0
- package/dist/dts/internal/v2/render.d.ts.map +1 -0
- package/dist/dts/internal/v2/sync-parts.d.ts +129 -0
- package/dist/dts/internal/v2/sync-parts.d.ts.map +1 -0
- package/dist/esm/ElementRef.js.map +1 -1
- package/dist/esm/EventHandler.js +14 -4
- package/dist/esm/EventHandler.js.map +1 -1
- package/dist/esm/Html.js +91 -50
- package/dist/esm/Html.js.map +1 -1
- package/dist/esm/HtmlChunk.js +75 -24
- package/dist/esm/HtmlChunk.js.map +1 -1
- package/dist/esm/Hydrate.js +5 -5
- package/dist/esm/Hydrate.js.map +1 -1
- package/dist/esm/Many.js +3 -3
- package/dist/esm/Many.js.map +1 -1
- package/dist/esm/Meta.js +7 -1
- package/dist/esm/Meta.js.map +1 -1
- package/dist/esm/Parser.js +1 -1
- package/dist/esm/Parser.js.map +1 -1
- package/dist/esm/Placeholder.js +4 -8
- package/dist/esm/Placeholder.js.map +1 -1
- package/dist/esm/Platform.js +3 -1
- package/dist/esm/Platform.js.map +1 -1
- package/dist/esm/Render.js +6 -5
- package/dist/esm/Render.js.map +1 -1
- package/dist/esm/RenderContext.js +5 -85
- package/dist/esm/RenderContext.js.map +1 -1
- package/dist/esm/RenderEvent.js +8 -1
- package/dist/esm/RenderEvent.js.map +1 -1
- package/dist/esm/RenderQueue.js +336 -0
- package/dist/esm/RenderQueue.js.map +1 -0
- package/dist/esm/RenderTemplate.js.map +1 -1
- package/dist/esm/Template.js +12 -0
- package/dist/esm/Template.js.map +1 -1
- package/dist/esm/Test.js +71 -30
- package/dist/esm/Test.js.map +1 -1
- package/dist/esm/Vitest.js +11 -8
- package/dist/esm/Vitest.js.map +1 -1
- package/dist/esm/index.js +4 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/internal/EventSource.js +12 -7
- package/dist/esm/internal/EventSource.js.map +1 -1
- package/dist/esm/internal/HydrateContext.js.map +1 -1
- package/dist/esm/internal/browser.js +10 -9
- package/dist/esm/internal/browser.js.map +1 -1
- package/dist/esm/internal/character-entities.js +2134 -0
- package/dist/esm/internal/character-entities.js.map +1 -0
- package/dist/esm/internal/errors.js +22 -2
- package/dist/esm/internal/errors.js.map +1 -1
- package/dist/esm/internal/indexRefCounter.js +36 -61
- package/dist/esm/internal/indexRefCounter.js.map +1 -1
- package/dist/esm/internal/parser.js +18 -18
- package/dist/esm/internal/parser.js.map +1 -1
- package/dist/esm/internal/parser2.js +393 -0
- package/dist/esm/internal/parser2.js.map +1 -0
- package/dist/esm/internal/server-parts.js +109 -0
- package/dist/esm/internal/server-parts.js.map +1 -0
- package/dist/esm/internal/server.js +12 -161
- package/dist/esm/internal/server.js.map +1 -1
- package/dist/esm/internal/utils.js +71 -7
- package/dist/esm/internal/utils.js.map +1 -1
- package/dist/esm/internal/v2/SyncPart.js +5 -0
- package/dist/esm/internal/v2/SyncPart.js.map +1 -0
- package/dist/esm/internal/v2/helpers.js +12 -0
- package/dist/esm/internal/v2/helpers.js.map +1 -0
- package/dist/esm/internal/v2/hydrate.js +195 -0
- package/dist/esm/internal/v2/hydrate.js.map +1 -0
- package/dist/esm/internal/v2/hydration-template.js +265 -0
- package/dist/esm/internal/v2/hydration-template.js.map +1 -0
- package/dist/esm/internal/v2/parts.js +150 -0
- package/dist/esm/internal/v2/parts.js.map +1 -0
- package/dist/esm/internal/v2/render-entry.js +102 -0
- package/dist/esm/internal/v2/render-entry.js.map +1 -0
- package/dist/esm/internal/v2/render-sync-parts.js +265 -0
- package/dist/esm/internal/v2/render-sync-parts.js.map +1 -0
- package/dist/esm/internal/v2/render.js +353 -0
- package/dist/esm/internal/v2/render.js.map +1 -0
- package/dist/esm/internal/v2/sync-parts.js +102 -0
- package/dist/esm/internal/v2/sync-parts.js.map +1 -0
- package/package.json +20 -13
- package/src/ElementRef.ts +1 -1
- package/src/ElementSource.ts +1 -1
- package/src/EventHandler.ts +29 -11
- package/src/Html.ts +199 -90
- package/src/HtmlChunk.ts +77 -30
- package/src/Hydrate.ts +20 -14
- package/src/Many.ts +17 -14
- package/src/Meta.ts +8 -1
- package/src/Parser.ts +1 -1
- package/src/Part.ts +22 -66
- package/src/Placeholder.ts +17 -15
- package/src/Platform.ts +5 -5
- package/src/Render.ts +23 -26
- package/src/RenderContext.ts +14 -142
- package/src/RenderEvent.ts +10 -1
- package/src/RenderQueue.ts +445 -0
- package/src/RenderTemplate.ts +7 -2
- package/src/Renderable.ts +1 -1
- package/src/Template.ts +15 -1
- package/src/Test.ts +122 -38
- package/src/Vitest.ts +20 -10
- package/src/index.ts +4 -0
- package/src/internal/EventSource.ts +14 -8
- package/src/internal/HydrateContext.ts +3 -4
- package/src/internal/browser.ts +26 -21
- package/src/internal/character-entities.ts +2136 -0
- package/src/internal/errors.ts +30 -3
- package/src/internal/indexRefCounter.ts +38 -70
- package/src/internal/parser.ts +19 -19
- package/src/internal/parser2.ts +468 -0
- package/src/internal/server-parts.ts +161 -0
- package/src/internal/server.ts +16 -272
- package/src/internal/utils.ts +83 -7
- package/src/internal/v2/SyncPart.ts +112 -0
- package/src/internal/v2/helpers.ts +13 -0
- package/src/internal/v2/hydrate.ts +289 -0
- package/src/internal/v2/hydration-template.ts +308 -0
- package/src/internal/v2/parts.ts +254 -0
- package/src/internal/v2/render-entry.ts +131 -0
- package/src/internal/v2/render-sync-parts.ts +440 -0
- package/src/internal/v2/render.ts +588 -0
- package/src/internal/v2/sync-parts.ts +133 -0
- package/dist/cjs/internal/hydrate.js +0 -274
- package/dist/cjs/internal/hydrate.js.map +0 -1
- package/dist/cjs/internal/parts.js +0 -451
- package/dist/cjs/internal/parts.js.map +0 -1
- package/dist/cjs/internal/render.js +0 -704
- package/dist/cjs/internal/render.js.map +0 -1
- package/dist/dts/internal/hydrate.d.ts +0 -33
- package/dist/dts/internal/hydrate.d.ts.map +0 -1
- package/dist/dts/internal/parts.d.ts +0 -314
- package/dist/dts/internal/parts.d.ts.map +0 -1
- package/dist/dts/internal/render.d.ts +0 -16
- package/dist/dts/internal/render.d.ts.map +0 -1
- package/dist/esm/internal/hydrate.js +0 -239
- package/dist/esm/internal/hydrate.js.map +0 -1
- package/dist/esm/internal/parts.js +0 -373
- package/dist/esm/internal/parts.js.map +0 -1
- package/dist/esm/internal/render.js +0 -689
- package/dist/esm/internal/render.js.map +0 -1
- package/src/internal/hydrate.ts +0 -366
- package/src/internal/parts.ts +0 -609
- package/src/internal/render.ts +0 -971
package/dist/esm/Html.js
CHANGED
|
@@ -4,29 +4,29 @@
|
|
|
4
4
|
import * as Fx from "@typed/fx/Fx";
|
|
5
5
|
import * as Sink from "@typed/fx/Sink";
|
|
6
6
|
import { TypeId } from "@typed/fx/TypeId";
|
|
7
|
+
import { join } from "effect/Array";
|
|
7
8
|
import * as Effect from "effect/Effect";
|
|
8
9
|
import * as Layer from "effect/Layer";
|
|
9
10
|
import * as Option from "effect/Option";
|
|
10
|
-
import { join } from "effect/ReadonlyArray";
|
|
11
11
|
import { isDirective } from "./Directive.js";
|
|
12
12
|
import { templateToHtmlChunks } from "./HtmlChunk.js";
|
|
13
|
-
import { parse } from "./internal/
|
|
13
|
+
import { parse } from "./internal/parser2.js";
|
|
14
14
|
import { partNodeToPart } from "./internal/server.js";
|
|
15
|
-
import {
|
|
15
|
+
import { isNullOrUndefined } from "./internal/v2/helpers.js";
|
|
16
|
+
import { TEXT_START, TYPED_HOLE_END, TYPED_HOLE_START } from "./Meta.js";
|
|
16
17
|
import * as RenderContext from "./RenderContext.js";
|
|
17
|
-
import { HtmlRenderEvent,
|
|
18
|
+
import { HtmlRenderEvent, isHtmlRenderEvent } from "./RenderEvent.js";
|
|
19
|
+
import * as RenderQueue from "./RenderQueue.js";
|
|
18
20
|
import { RenderTemplate } from "./RenderTemplate.js";
|
|
19
|
-
const toHtml = (r) => r.html;
|
|
21
|
+
const toHtml = (r) => r === null ? "" : r.html;
|
|
20
22
|
/**
|
|
21
23
|
* @since 1.0.0
|
|
22
24
|
*/
|
|
23
|
-
export const serverLayer = Layer
|
|
24
|
-
.provideMerge(RenderTemplate.layer(RenderContext.RenderContext.with(renderHtmlTemplate)), RenderContext.server);
|
|
25
|
+
export const serverLayer = Layer.provideMerge(RenderTemplate.layer(RenderContext.RenderContext.with(renderHtmlTemplate)), RenderContext.server).pipe(Layer.provideMerge(RenderQueue.sync));
|
|
25
26
|
/**
|
|
26
27
|
* @since 1.0.0
|
|
27
28
|
*/
|
|
28
|
-
export const staticLayer = Layer
|
|
29
|
-
.provideMerge(RenderTemplate.layer(RenderContext.RenderContext.with(renderHtmlTemplate)), RenderContext.static);
|
|
29
|
+
export const staticLayer = Layer.provideMerge(RenderTemplate.layer(RenderContext.RenderContext.with(renderHtmlTemplate)), RenderContext.static).pipe(Layer.provideMerge(RenderQueue.sync));
|
|
30
30
|
/**
|
|
31
31
|
* @since 1.0.0
|
|
32
32
|
*/
|
|
@@ -47,93 +47,120 @@ export function renderHtmlTemplate(ctx) {
|
|
|
47
47
|
const isStatic = ctx.environment === "static" || ctx.environment === "test:static";
|
|
48
48
|
const entry = getServerEntry(templateStrings, ctx.templateCache, isStatic);
|
|
49
49
|
if (values.length === 0) {
|
|
50
|
-
return Fx.succeed(HtmlRenderEvent(entry.chunks[0].value));
|
|
50
|
+
return Fx.succeed(HtmlRenderEvent(entry.chunks[0].value, true));
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
-
|
|
53
|
+
const lastIndex = entry.chunks.length - 1;
|
|
54
|
+
return Fx.filter(Fx.mergeOrdered(entry.chunks.map((chunk, i) => renderChunk(chunk, values, isStatic, i === lastIndex))), (x) => x.valueOf().length > 0);
|
|
54
55
|
}
|
|
55
56
|
};
|
|
56
57
|
}
|
|
57
|
-
function renderChunk(chunk, values, isStatic) {
|
|
58
|
+
function renderChunk(chunk, values, isStatic, done) {
|
|
58
59
|
if (chunk._tag === "text") {
|
|
59
|
-
return Fx.succeed(HtmlRenderEvent(chunk.value));
|
|
60
|
+
return Fx.succeed(HtmlRenderEvent(chunk.value, done));
|
|
60
61
|
}
|
|
61
62
|
else if (chunk._tag === "part") {
|
|
62
|
-
return renderPart(chunk, values, isStatic);
|
|
63
|
+
return renderPart(chunk, values, isStatic, done);
|
|
63
64
|
}
|
|
64
65
|
else {
|
|
65
|
-
return renderSparsePart(chunk, values);
|
|
66
|
+
return renderSparsePart(chunk, values, done);
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
|
-
function renderNode(renderable, isStatic) {
|
|
69
|
+
function renderNode(renderable, isStatic, done) {
|
|
69
70
|
switch (typeof renderable) {
|
|
70
71
|
case "string":
|
|
71
72
|
case "number":
|
|
72
73
|
case "boolean":
|
|
73
74
|
case "bigint":
|
|
74
|
-
return Fx.succeed(HtmlRenderEvent((isStatic ? "" : TEXT_START) + renderable.toString()));
|
|
75
|
+
return Fx.succeed(HtmlRenderEvent((isStatic ? "" : TEXT_START) + renderable.toString(), done));
|
|
75
76
|
case "undefined":
|
|
76
77
|
case "object":
|
|
77
|
-
return renderObject(renderable, isStatic);
|
|
78
|
+
return renderObject(renderable, isStatic, done);
|
|
78
79
|
default:
|
|
79
80
|
return Fx.empty;
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
|
-
function renderObject(renderable, isStatic) {
|
|
83
|
-
if (renderable
|
|
84
|
-
return isStatic ? Fx.empty : Fx.succeed(HtmlRenderEvent(TEXT_START));
|
|
83
|
+
function renderObject(renderable, isStatic, done) {
|
|
84
|
+
if (isNullOrUndefined(renderable)) {
|
|
85
|
+
return isStatic ? Fx.empty : Fx.succeed(HtmlRenderEvent(TEXT_START, done));
|
|
85
86
|
}
|
|
86
87
|
else if (Array.isArray(renderable)) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
else if (Fx.isFx(renderable)) {
|
|
90
|
-
// @ts-ignore Types are to deep to infer
|
|
91
|
-
return Fx.concatMap(takeOneIfNotRenderEvent(renderable), (r) => renderNode(r, isStatic));
|
|
88
|
+
const lastIndex = renderable.length - 1;
|
|
89
|
+
return Fx.mergeOrdered(renderable.map((r, i) => renderNode(r, isStatic, done && i === lastIndex)));
|
|
92
90
|
}
|
|
93
91
|
else if (Effect.isEffect(renderable)) {
|
|
94
|
-
return Fx.
|
|
92
|
+
return Fx.fromFxEffect(Effect.map(renderable, (r) => renderNode(r, isStatic, done)));
|
|
93
|
+
}
|
|
94
|
+
else if (Fx.isFx(renderable)) {
|
|
95
|
+
return takeOneIfNotRenderEvent(renderable, isStatic, done);
|
|
95
96
|
}
|
|
96
|
-
else if (
|
|
97
|
-
|
|
97
|
+
else if (isHtmlRenderEvent(renderable)) {
|
|
98
|
+
if (done) {
|
|
99
|
+
return Fx.succeed(renderable);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
return Fx.succeed(HtmlRenderEvent(renderable.html, done));
|
|
103
|
+
}
|
|
98
104
|
}
|
|
99
105
|
else {
|
|
100
106
|
return Fx.empty;
|
|
101
107
|
}
|
|
102
108
|
}
|
|
103
|
-
function renderPart(chunk, values, isStatic) {
|
|
109
|
+
function renderPart(chunk, values, isStatic, done) {
|
|
104
110
|
const { node, render } = chunk;
|
|
105
111
|
const renderable = values[node.index];
|
|
106
112
|
// Refs and events are not rendered into HTML
|
|
107
113
|
if (isDirective(renderable)) {
|
|
108
114
|
return Fx.make((sink) => {
|
|
109
|
-
const part = partNodeToPart(node, (value) => sink.onSuccess(HtmlRenderEvent(render(value))));
|
|
115
|
+
const part = partNodeToPart(node, (value) => sink.onSuccess(HtmlRenderEvent(render(value), done)));
|
|
110
116
|
return Effect.catchAllCause(renderable(part), sink.onFailure);
|
|
111
117
|
});
|
|
112
118
|
}
|
|
113
119
|
else if (node._tag === "node") {
|
|
114
120
|
if (isStatic)
|
|
115
|
-
return renderNode(renderable, isStatic);
|
|
116
|
-
|
|
121
|
+
return renderNode(renderable, isStatic, done);
|
|
122
|
+
let first = true;
|
|
123
|
+
return Fx.continueWith(Fx.map(renderNode(renderable, isStatic, true), (x) => {
|
|
124
|
+
if (x.done) {
|
|
125
|
+
const y = HtmlRenderEvent((first ? TYPED_HOLE_START(node.index) : "") +
|
|
126
|
+
x.html +
|
|
127
|
+
TYPED_HOLE_END(node.index), done);
|
|
128
|
+
first = false;
|
|
129
|
+
return y;
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
if (first) {
|
|
133
|
+
first = false;
|
|
134
|
+
return HtmlRenderEvent(TYPED_HOLE_START(node.index) + x.html, false);
|
|
135
|
+
}
|
|
136
|
+
return x;
|
|
137
|
+
}
|
|
138
|
+
}), () => first
|
|
139
|
+
? Fx.succeed(HtmlRenderEvent(TYPED_HOLE_START(node.index) + TYPED_HOLE_END(node.index), done))
|
|
140
|
+
: Fx.empty);
|
|
117
141
|
}
|
|
118
142
|
else if (node._tag === "properties") {
|
|
119
143
|
if (renderable == null)
|
|
120
144
|
return Fx.empty;
|
|
121
|
-
return Fx.
|
|
145
|
+
return Fx.mergeAll(Object.entries(renderable).map(([key, renderable]) => {
|
|
146
|
+
return Fx.filterMap(Fx.take(unwrapRenderable(renderable), 1), (value) => {
|
|
147
|
+
const s = render({ [key]: value });
|
|
148
|
+
return s ? Option.some(HtmlRenderEvent(s, done)) : Option.none();
|
|
149
|
+
});
|
|
150
|
+
}));
|
|
122
151
|
}
|
|
123
152
|
else {
|
|
124
|
-
if (renderable === null)
|
|
125
|
-
return Fx.succeed(HtmlRenderEvent(render(renderable)));
|
|
153
|
+
if (renderable === null) {
|
|
154
|
+
return Fx.succeed(HtmlRenderEvent(render(renderable), done));
|
|
155
|
+
}
|
|
126
156
|
const html = Fx.filterMap(Fx.take(unwrapRenderable(renderable), 1), (value) => {
|
|
127
157
|
const s = render(value);
|
|
128
|
-
return s ? Option.some(HtmlRenderEvent(s)) : Option.none();
|
|
158
|
+
return s ? Option.some(HtmlRenderEvent(s, done)) : Option.none();
|
|
129
159
|
});
|
|
130
|
-
if (isStatic === false && node._tag === "text-part") {
|
|
131
|
-
return Fx.append(Fx.prepend(html, HtmlRenderEvent(TEXT_START)), HtmlRenderEvent(TYPED_HOLE(node.index)));
|
|
132
|
-
}
|
|
133
160
|
return html;
|
|
134
161
|
}
|
|
135
162
|
}
|
|
136
|
-
function renderSparsePart(chunk, values) {
|
|
163
|
+
function renderSparsePart(chunk, values, done) {
|
|
137
164
|
const { node, render } = chunk;
|
|
138
165
|
return Fx.map(Fx.take(Fx.tuple(node.nodes.map((node) => {
|
|
139
166
|
if (node._tag === "text")
|
|
@@ -143,10 +170,23 @@ function renderSparsePart(chunk, values) {
|
|
|
143
170
|
return Fx.make((sink) => Effect.catchAllCause(renderable(partNodeToPart(node, (value) => sink.onSuccess(value))), sink.onFailure));
|
|
144
171
|
}
|
|
145
172
|
return unwrapRenderable(renderable);
|
|
146
|
-
})), 1), (value) => HtmlRenderEvent(render(value)));
|
|
173
|
+
})), 1), (value) => HtmlRenderEvent(render(value), done));
|
|
147
174
|
}
|
|
148
|
-
function takeOneIfNotRenderEvent(fx) {
|
|
149
|
-
return Fx.make((sink) => Sink.withEarlyExit(sink, (sink) => fx.run(Sink.make(sink.onFailure, (event) =>
|
|
175
|
+
function takeOneIfNotRenderEvent(fx, isStatic, done) {
|
|
176
|
+
return Fx.make((sink) => Sink.withEarlyExit(sink, (sink) => fx.run(Sink.make(sink.onFailure, (event) => {
|
|
177
|
+
if (isHtmlRenderEvent(event)) {
|
|
178
|
+
if (done) {
|
|
179
|
+
return sink.onSuccess(event);
|
|
180
|
+
}
|
|
181
|
+
else {
|
|
182
|
+
return sink.onSuccess(HtmlRenderEvent(event.html, false));
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
if (isNullOrUndefined(event)) {
|
|
186
|
+
return sink.earlyExit;
|
|
187
|
+
}
|
|
188
|
+
return Effect.zipRight(sink.onSuccess(HtmlRenderEvent((isStatic ? "" : TEXT_START) + String(event), done)), sink.earlyExit);
|
|
189
|
+
}))));
|
|
150
190
|
}
|
|
151
191
|
function getServerEntry(templateStrings, templateCache, isStatic) {
|
|
152
192
|
const cached = templateCache.get(templateStrings);
|
|
@@ -168,17 +208,18 @@ function unwrapRenderable(renderable) {
|
|
|
168
208
|
switch (typeof renderable) {
|
|
169
209
|
case "undefined":
|
|
170
210
|
case "object": {
|
|
171
|
-
if (renderable
|
|
172
|
-
return Fx.
|
|
173
|
-
else if (Array.isArray(renderable)) {
|
|
174
|
-
return Fx.tuple(renderable.map(unwrapRenderable));
|
|
211
|
+
if (isNullOrUndefined(renderable)) {
|
|
212
|
+
return Fx.null;
|
|
175
213
|
}
|
|
176
|
-
else if (
|
|
177
|
-
return renderable;
|
|
214
|
+
else if (Array.isArray(renderable)) {
|
|
215
|
+
return Fx.mergeOrdered(renderable.map((r) => takeOneIfNotRenderEvent(unwrapRenderable(r), true, false)));
|
|
178
216
|
}
|
|
179
217
|
else if (Effect.EffectTypeId in renderable) {
|
|
180
218
|
return Fx.fromFxEffect(Effect.map(renderable, (unwrapRenderable)));
|
|
181
219
|
}
|
|
220
|
+
else if (TypeId in renderable) {
|
|
221
|
+
return renderable;
|
|
222
|
+
}
|
|
182
223
|
else
|
|
183
224
|
return Fx.succeed(renderable);
|
|
184
225
|
}
|
package/dist/esm/Html.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Html.js","sourceRoot":"","sources":["../../src/Html.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"Html.js","sourceRoot":"","sources":["../../src/Html.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/HtmlChunk.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import {
|
|
4
|
+
import { keyToPartType } from "./internal/utils.js";
|
|
5
|
+
import { isNullOrUndefined } from "./internal/v2/helpers.js";
|
|
5
6
|
/**
|
|
6
7
|
* @since 1.0.0
|
|
7
8
|
*/
|
|
@@ -42,9 +43,22 @@ export class SparsePartChunk {
|
|
|
42
43
|
* @since 1.0.0
|
|
43
44
|
*/
|
|
44
45
|
export function templateToHtmlChunks({ hash, nodes }, isStatic) {
|
|
45
|
-
|
|
46
|
+
if (isStatic) {
|
|
47
|
+
return fuseTextChunks(nodes.flatMap((node) => nodeToHtmlChunk(node)));
|
|
48
|
+
}
|
|
49
|
+
const chunks = fuseTextChunks([
|
|
50
|
+
templateStart(hash),
|
|
51
|
+
...nodes.flatMap((node) => nodeToHtmlChunk(node, hash)),
|
|
52
|
+
templateEnd(hash)
|
|
53
|
+
]);
|
|
46
54
|
return chunks;
|
|
47
55
|
}
|
|
56
|
+
function templateStart(hash) {
|
|
57
|
+
return new TextChunk(`<!--typed-${hash}-->`);
|
|
58
|
+
}
|
|
59
|
+
function templateEnd(hash) {
|
|
60
|
+
return new TextChunk(`<!--/typed-${hash}-->`);
|
|
61
|
+
}
|
|
48
62
|
function fuseTextChunks(chunks) {
|
|
49
63
|
const output = [];
|
|
50
64
|
for (let i = 0; i < chunks.length; i++) {
|
|
@@ -92,16 +106,16 @@ const nodeMap = {
|
|
|
92
106
|
function nodeToHtmlChunk(node, hash) {
|
|
93
107
|
return nodeMap[node._tag](node, hash);
|
|
94
108
|
}
|
|
95
|
-
function elementToHtmlChunks({ attributes, children, tagName }
|
|
109
|
+
function elementToHtmlChunks({ attributes, children, tagName }) {
|
|
96
110
|
if (attributes.length === 0) {
|
|
97
111
|
return [
|
|
98
|
-
new TextChunk(openTag(tagName
|
|
112
|
+
new TextChunk(openTag(tagName) + ">"),
|
|
99
113
|
...children.flatMap((c) => nodeToHtmlChunk(c)),
|
|
100
114
|
new TextChunk(closeTag(tagName))
|
|
101
115
|
];
|
|
102
116
|
}
|
|
103
117
|
const chunks = [
|
|
104
|
-
new TextChunk(openTag(tagName
|
|
118
|
+
new TextChunk(openTag(tagName)),
|
|
105
119
|
...attributes.map((a) => attributeToHtmlChunk(a)),
|
|
106
120
|
new TextChunk(">"),
|
|
107
121
|
...children.flatMap((c) => nodeToHtmlChunk(c)),
|
|
@@ -109,12 +123,12 @@ function elementToHtmlChunks({ attributes, children, tagName }, hash) {
|
|
|
109
123
|
];
|
|
110
124
|
return chunks;
|
|
111
125
|
}
|
|
112
|
-
function selfClosingElementToHtmlChunks({ attributes, tagName }
|
|
126
|
+
function selfClosingElementToHtmlChunks({ attributes, tagName }) {
|
|
113
127
|
if (attributes.length === 0) {
|
|
114
|
-
return [new TextChunk(openTag(tagName
|
|
128
|
+
return [new TextChunk(openTag(tagName) + " />")];
|
|
115
129
|
}
|
|
116
130
|
const chunks = [
|
|
117
|
-
new TextChunk(openTag(tagName
|
|
131
|
+
new TextChunk(openTag(tagName)),
|
|
118
132
|
...attributes.map((a) => attributeToHtmlChunk(a)),
|
|
119
133
|
new TextChunk(`/>`)
|
|
120
134
|
];
|
|
@@ -123,16 +137,16 @@ function selfClosingElementToHtmlChunks({ attributes, tagName }, hash) {
|
|
|
123
137
|
function textToHtmlChunks(text) {
|
|
124
138
|
return text._tag === "text" ? new TextChunk(text.value) : new PartChunk(text, String);
|
|
125
139
|
}
|
|
126
|
-
function textOnlyElementToHtmlChunks({ attributes, children, tagName }
|
|
140
|
+
function textOnlyElementToHtmlChunks({ attributes, children, tagName }) {
|
|
127
141
|
if (attributes.length === 0) {
|
|
128
142
|
return [
|
|
129
|
-
new TextChunk(openTag(tagName
|
|
143
|
+
new TextChunk(openTag(tagName) + ">"),
|
|
130
144
|
...children.map((c) => textToHtmlChunks(c)),
|
|
131
145
|
new TextChunk(closeTag(tagName))
|
|
132
146
|
];
|
|
133
147
|
}
|
|
134
148
|
const chunks = [
|
|
135
|
-
new TextChunk(openTag(tagName
|
|
149
|
+
new TextChunk(openTag(tagName)),
|
|
136
150
|
...attributes.map((a) => attributeToHtmlChunk(a)),
|
|
137
151
|
new TextChunk(">"),
|
|
138
152
|
...children.map((c) => textToHtmlChunks(c)),
|
|
@@ -141,27 +155,48 @@ function textOnlyElementToHtmlChunks({ attributes, children, tagName }, hash) {
|
|
|
141
155
|
return chunks;
|
|
142
156
|
}
|
|
143
157
|
const attrMap = {
|
|
144
|
-
attribute: (attr) => new TextChunk(` ${attr.name}="${attr.value}"`),
|
|
145
|
-
attr: (attr) => new PartChunk(attr, (value) => (value == null ? `` : ` ${attr.name}="${value}"`)),
|
|
158
|
+
attribute: (attr) => new TextChunk(` ${attr.name}="${escape(attr.value)}"`),
|
|
159
|
+
attr: (attr) => new PartChunk(attr, (value) => (value == null ? `` : ` ${attr.name}="${escape(value)}"`)),
|
|
146
160
|
boolean: (attr) => new TextChunk(" " + attr.name),
|
|
147
161
|
"boolean-part": (attr) => new PartChunk(attr, (value) => (value ? ` ${attr.name}` : "")),
|
|
148
|
-
"className-part": (attr) => new PartChunk(attr, (value) => (value ? ` class="${value}"` : "")),
|
|
162
|
+
"className-part": (attr) => new PartChunk(attr, (value) => (value ? ` class="${escape(value)}"` : "")),
|
|
149
163
|
data: (attr) => new PartChunk(attr, (value) => value == null ? `` : datasetToString(value)),
|
|
150
164
|
event: () => new TextChunk(""),
|
|
151
165
|
property: (attr) => new PartChunk(attr, (value) => (value == null ? `` : ` ${attr.name}="${escape(value)}"`)),
|
|
152
|
-
properties: (attr) => new PartChunk(attr, (value) =>
|
|
153
|
-
|
|
154
|
-
|
|
166
|
+
properties: (attr) => new PartChunk(attr, (value) => {
|
|
167
|
+
if (value == null)
|
|
168
|
+
return "";
|
|
169
|
+
// Each call has only 1 key-value pair
|
|
170
|
+
const [k, v] = Object.entries(value)[0];
|
|
171
|
+
if (value == null)
|
|
172
|
+
return "";
|
|
173
|
+
const [type, key] = keyToPartType(k);
|
|
174
|
+
switch (type) {
|
|
175
|
+
case "attr":
|
|
176
|
+
case "property":
|
|
177
|
+
return v == null ? "" : ` ${key}="${escape(v)}"`;
|
|
178
|
+
case "boolean":
|
|
179
|
+
return v ? key : "";
|
|
180
|
+
case "class":
|
|
181
|
+
return ` class="${escape(v)}"`;
|
|
182
|
+
case "data": {
|
|
183
|
+
const d = datasetToString(v);
|
|
184
|
+
return d.length === 0 ? "" : ` ${d}`;
|
|
185
|
+
}
|
|
186
|
+
default:
|
|
187
|
+
return "";
|
|
188
|
+
}
|
|
189
|
+
}),
|
|
155
190
|
ref: () => new TextChunk(""),
|
|
156
191
|
"sparse-attr": (attr) => new SparsePartChunk(attr, (values) => {
|
|
157
192
|
return values == null
|
|
158
193
|
? ``
|
|
159
|
-
: ` ${attr.name}="${Array.isArray(values) ? values.filter(isString).join("") : values}"`;
|
|
194
|
+
: ` ${attr.name}="${Array.isArray(values) ? escape(values.filter(isString).join("")) : escape(values)}"`;
|
|
160
195
|
}),
|
|
161
196
|
"sparse-class-name": (attr) => new SparsePartChunk(attr, (values) => {
|
|
162
197
|
return values == null
|
|
163
198
|
? ``
|
|
164
|
-
: ` class="${Array.isArray(values) ? values.filter(isString).join("
|
|
199
|
+
: ` class="${Array.isArray(values) ? escape(values.filter(isString).join("")) : escape(values)}"`;
|
|
165
200
|
}),
|
|
166
201
|
text: (attr) => new TextChunk(attr.value)
|
|
167
202
|
};
|
|
@@ -173,14 +208,12 @@ function isString(value) {
|
|
|
173
208
|
}
|
|
174
209
|
function datasetToString(dataset) {
|
|
175
210
|
const s = Object.entries(dataset)
|
|
176
|
-
.map(([key, value]) => (value === undefined ? `data-${key}` : `data-${key}="${value}"`))
|
|
211
|
+
.map(([key, value]) => (value === undefined ? `data-${key}` : `data-${key}="${escape(value)}"`))
|
|
177
212
|
.join(" ");
|
|
178
213
|
return s.length === 0 ? "" : " " + s;
|
|
179
214
|
}
|
|
180
|
-
function openTag(tagName
|
|
181
|
-
|
|
182
|
-
return `<${tagName}`;
|
|
183
|
-
return `<${tagName} ${TYPED_HASH(hash)}`;
|
|
215
|
+
function openTag(tagName) {
|
|
216
|
+
return `<${tagName}`;
|
|
184
217
|
}
|
|
185
218
|
function closeTag(tagName) {
|
|
186
219
|
return `</${tagName}>`;
|
|
@@ -193,7 +226,25 @@ export function escape(s) {
|
|
|
193
226
|
case "string":
|
|
194
227
|
case "number":
|
|
195
228
|
case "boolean":
|
|
229
|
+
case "bigint":
|
|
196
230
|
return escapeHtml(String(s));
|
|
231
|
+
case "object": {
|
|
232
|
+
if (isNullOrUndefined(s)) {
|
|
233
|
+
return "";
|
|
234
|
+
}
|
|
235
|
+
else if (Array.isArray(s)) {
|
|
236
|
+
return s.map(escape).join("");
|
|
237
|
+
}
|
|
238
|
+
else if (s instanceof Date) {
|
|
239
|
+
return escapeHtml(s.toISOString());
|
|
240
|
+
}
|
|
241
|
+
else if (s instanceof RegExp) {
|
|
242
|
+
return escapeHtml(s.toString());
|
|
243
|
+
}
|
|
244
|
+
else {
|
|
245
|
+
return escapeHtml(JSON.stringify(s));
|
|
246
|
+
}
|
|
247
|
+
}
|
|
197
248
|
default:
|
|
198
249
|
return escapeHtml(JSON.stringify(s));
|
|
199
250
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlChunk.js","sourceRoot":"","sources":["../../src/HtmlChunk.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HtmlChunk.js","sourceRoot":"","sources":["../../src/HtmlChunk.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Hydrate.js
CHANGED
|
@@ -7,9 +7,10 @@ import { RootElement } from "@typed/dom/RootElement";
|
|
|
7
7
|
import * as Fx from "@typed/fx/Fx";
|
|
8
8
|
import * as Effect from "effect/Effect";
|
|
9
9
|
import * as Layer from "effect/Layer";
|
|
10
|
-
import { findRootParentChildNodes, hydrateTemplate } from "./internal/hydrate.js";
|
|
11
10
|
import { HydrateContext } from "./internal/HydrateContext.js";
|
|
12
|
-
import {
|
|
11
|
+
import { hydrateTemplate } from "./internal/v2/hydrate.js";
|
|
12
|
+
import { getHydrationRoot } from "./internal/v2/hydration-template.js";
|
|
13
|
+
import { attachRoot } from "./internal/v2/render.js";
|
|
13
14
|
import * as RenderContext from "./RenderContext.js";
|
|
14
15
|
import { RenderTemplate } from "./RenderTemplate.js";
|
|
15
16
|
/**
|
|
@@ -26,8 +27,7 @@ export function hydrate(rendered) {
|
|
|
26
27
|
return Fx.fromFxEffect(Effect.contextWith((context) => {
|
|
27
28
|
const [renderContext, { rootElement }] = Context.getMany(context, RenderContext.RenderContext, RootElement);
|
|
28
29
|
const ctx = {
|
|
29
|
-
where:
|
|
30
|
-
rootIndex: -1,
|
|
30
|
+
where: getHydrationRoot(rootElement),
|
|
31
31
|
parentTemplate: null,
|
|
32
32
|
hydrate: true
|
|
33
33
|
};
|
|
@@ -38,6 +38,6 @@ export function hydrate(rendered) {
|
|
|
38
38
|
* @since 1.0.0
|
|
39
39
|
*/
|
|
40
40
|
export function hydrateToLayer(rendered) {
|
|
41
|
-
return Fx.drainLayer(Fx.switchMapCause(hydrate(rendered), (cause) => Fx.fromEffect(Effect.logError(cause))));
|
|
41
|
+
return Fx.drainLayer(Fx.switchMapCause(hydrate(rendered), (cause) => Fx.fromEffect(Effect.logError(`Hydration Failure`, cause))));
|
|
42
42
|
}
|
|
43
43
|
//# sourceMappingURL=Hydrate.js.map
|
package/dist/esm/Hydrate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Hydrate.js","sourceRoot":"","sources":["../../src/Hydrate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAG9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Hydrate.js","sourceRoot":"","sources":["../../src/Hydrate.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAG9C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAA;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,MAA2B,EAC3B,OAAkC,EAMlC,EAAE,CACF,KAAK,CAAC,YAAY,CAChB,cAAc,CAAC,KAAK,CAClB,MAAM,CAAC,WAAW,CAChB,CAAC,OAAgE,EAAE,EAAE;IACnE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CACrC,OAAO,EACP,QAAQ,EACR,aAAa,CAAC,aAAa,CAC5B,CAAA;IAED,OAAO,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;AACvC,CAAC,CACF,CACF,EACD,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CACnC,CAAA;AAEH;;GAEG;AACH,MAAM,UAAU,OAAO,CACrB,QAAwB;IAExB,OAAO,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE;QACpD,MAAM,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CACtD,OAAO,EACP,aAAa,CAAC,aAAa,EAC3B,WAAW,CACZ,CAAA;QACD,MAAM,GAAG,GAAmB;YAC1B,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC;YACpC,cAAc,EAAE,IAAI;YACpB,OAAO,EAAE,IAAI;SACd,CAAA;QAED,OAAO,EAAE,CAAC,OAAO,CACf,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,EAC1F,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAC1B,CAAA;IACH,CAAC,CAAC,CAAC,CAAA;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,QAAwB;IAExB,OAAO,EAAE,CAAC,UAAU,CAClB,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,CAAC,CAC5G,CAAA;AACH,CAAC"}
|
package/dist/esm/Many.js
CHANGED
|
@@ -21,7 +21,7 @@ export function many(values, getKey, f) {
|
|
|
21
21
|
if (isSome(hydrateContext) && hydrateContext.value.hydrate) {
|
|
22
22
|
return Fx.keyed(values, {
|
|
23
23
|
getKey,
|
|
24
|
-
onValue: (ref, key) => Fx.provideService(f(ref, key), HydrateContext, { ...hydrateContext.value,
|
|
24
|
+
onValue: (ref, key) => Fx.provideService(f(ref, key), HydrateContext, { ...hydrateContext.value, manyKey: key.toString() })
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
// In other environments we just used Fx.keyed to allow indefinite subscriptions to RefSubjects
|
|
@@ -34,9 +34,9 @@ export function many(values, getKey, f) {
|
|
|
34
34
|
// as the templates are defined which is why we use mergeOrdered. We also want to ensure that
|
|
35
35
|
// our templates end, so we take only the first of our source values and also ensure that a subscription
|
|
36
36
|
// to our RefSubjects only include its first event.
|
|
37
|
-
return Fx.fromFxEffect(Effect.map(Fx.first(values), (values) => Fx.mergeOrdered(values.map((value) => Fx.fromFxEffect(Effect.map(RefSubject.of(value), (ref) => {
|
|
37
|
+
return Fx.fromFxEffect(Effect.map(Fx.first(values), (values) => Fx.mergeOrdered(values.map((value, i) => Fx.fromFxEffect(Effect.map(RefSubject.of(value), (ref) => {
|
|
38
38
|
const key = getKey(value);
|
|
39
|
-
return Fx.append(f(RefSubject.take(ref, 1), key), HtmlRenderEvent(MANY_HOLE(key)));
|
|
39
|
+
return Fx.append(Fx.map(f(RefSubject.take(ref, 1), key), (r) => HtmlRenderEvent(r.html, false)), HtmlRenderEvent(MANY_HOLE(key), i === values.length - 1));
|
|
40
40
|
}))))));
|
|
41
41
|
}));
|
|
42
42
|
}
|
package/dist/esm/Many.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Many.js","sourceRoot":"","sources":["../../src/Many.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,UAAU,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"Many.js","sourceRoot":"","sources":["../../src/Many.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/Meta.js
CHANGED
|
@@ -25,7 +25,13 @@ export const TEXT_START = "<!--text-->";
|
|
|
25
25
|
/**
|
|
26
26
|
* @since 1.0.0
|
|
27
27
|
*/
|
|
28
|
-
export const
|
|
28
|
+
export const TYPED_HOLE_START = (index) => `<!--hole${index}-->`;
|
|
29
|
+
// Used to mark where a NodePart is in the DOM. It can be found directly after the
|
|
30
|
+
// elements or text nodes it is managing.
|
|
31
|
+
/**
|
|
32
|
+
* @since 1.0.0
|
|
33
|
+
*/
|
|
34
|
+
export const TYPED_HOLE_END = (index) => `<!--/hole${index}-->`;
|
|
29
35
|
/**
|
|
30
36
|
* Used to mark separation between the start and end of a template.
|
|
31
37
|
* @since 1.0.0
|