@typed/template 0.3.1 → 0.3.3
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/internal/EventSource.js +46 -19
- package/dist/cjs/internal/EventSource.js.map +1 -1
- package/dist/cjs/internal/chunks.js +13 -2
- package/dist/cjs/internal/chunks.js.map +1 -1
- package/dist/dts/internal/EventSource.d.ts.map +1 -1
- package/dist/dts/internal/chunks.d.ts.map +1 -1
- package/dist/esm/internal/EventSource.js +51 -21
- package/dist/esm/internal/EventSource.js.map +1 -1
- package/dist/esm/internal/chunks.js +13 -2
- package/dist/esm/internal/chunks.js.map +1 -1
- package/package.json +2 -2
- package/src/internal/EventSource.ts +63 -34
- package/src/internal/chunks.ts +14 -2
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.makeEventSource = makeEventSource;
|
|
7
7
|
var _effect = /*#__PURE__*/require("effect");
|
|
8
|
+
var Fiber = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Fiber"));
|
|
8
9
|
var Runtime = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Runtime"));
|
|
9
10
|
var _ElementSource = /*#__PURE__*/require("../ElementSource");
|
|
10
11
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
@@ -12,17 +13,29 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
12
13
|
const disposable = f => ({
|
|
13
14
|
[Symbol.dispose]: f
|
|
14
15
|
});
|
|
16
|
+
const dispose = d => d[Symbol.dispose]();
|
|
15
17
|
function makeEventSource() {
|
|
16
18
|
const bubbleListeners = new Map();
|
|
17
19
|
const captureListeners = new Map();
|
|
18
20
|
function addListener(listeners, event, entry) {
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
const sets = listeners.get(event);
|
|
22
|
+
const isOnce = entry[1].options?.once === true;
|
|
23
|
+
if (sets === undefined) {
|
|
24
|
+
const normal = new Set();
|
|
25
|
+
const once = new Set();
|
|
26
|
+
if (isOnce) {
|
|
27
|
+
once.add(entry);
|
|
28
|
+
} else {
|
|
29
|
+
normal.add(entry);
|
|
30
|
+
}
|
|
31
|
+
listeners.set(event, [normal, once]);
|
|
24
32
|
} else {
|
|
25
|
-
|
|
33
|
+
const [normal, once] = sets;
|
|
34
|
+
if (isOnce) {
|
|
35
|
+
once.add(entry);
|
|
36
|
+
} else {
|
|
37
|
+
normal.add(entry);
|
|
38
|
+
}
|
|
26
39
|
}
|
|
27
40
|
}
|
|
28
41
|
function addEventListener(element, event, handler) {
|
|
@@ -34,33 +47,43 @@ function makeEventSource() {
|
|
|
34
47
|
}
|
|
35
48
|
function setupBubbleListeners(element, run) {
|
|
36
49
|
const disposables = [];
|
|
37
|
-
for (const [event,
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
50
|
+
for (const [event, sets] of bubbleListeners) {
|
|
51
|
+
for (const handlers of sets) {
|
|
52
|
+
const listener = ev => run(_effect.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : _effect.Effect.unit));
|
|
53
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
|
|
54
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)));
|
|
55
|
+
}
|
|
41
56
|
}
|
|
42
57
|
return disposables;
|
|
43
58
|
}
|
|
44
59
|
function setupCaptureListeners(element, run) {
|
|
45
60
|
const disposables = [];
|
|
46
|
-
for (const [event,
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
61
|
+
for (const [event, sets] of captureListeners) {
|
|
62
|
+
for (const handlers of sets) {
|
|
63
|
+
const listener = ev => run(_effect.Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el)) : _effect.Effect.unit));
|
|
64
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
|
|
65
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)));
|
|
66
|
+
}
|
|
50
67
|
}
|
|
51
68
|
return disposables;
|
|
52
69
|
}
|
|
53
70
|
function setup(rendered, scope) {
|
|
54
71
|
const hasBubbleListeners = bubbleListeners.size > 0;
|
|
55
72
|
const hasCaptureListeners = captureListeners.size > 0;
|
|
56
|
-
|
|
73
|
+
const elements = (0, _ElementSource.getElements)(rendered);
|
|
74
|
+
if (elements.length === 0 || !hasBubbleListeners && !hasCaptureListeners) {
|
|
57
75
|
return _effect.Effect.unit;
|
|
58
76
|
}
|
|
59
77
|
return _effect.Effect.flatMap(_effect.Effect.runtime(), runtime => {
|
|
60
|
-
const elements = (0, _ElementSource.getElements)(rendered);
|
|
61
78
|
const disposables = [];
|
|
79
|
+
const fibers = new Map();
|
|
62
80
|
const runFork = Runtime.runFork(runtime);
|
|
63
|
-
const run = effect =>
|
|
81
|
+
const run = effect => {
|
|
82
|
+
const id = Symbol();
|
|
83
|
+
const fiber = runFork(_effect.Effect.onExit(effect, () => _effect.Effect.sync(() => fibers.delete(id))));
|
|
84
|
+
fibers.set(id, fiber);
|
|
85
|
+
return fiber;
|
|
86
|
+
};
|
|
64
87
|
for (const element of elements) {
|
|
65
88
|
if (hasBubbleListeners) {
|
|
66
89
|
disposables.push(...setupBubbleListeners(element, run));
|
|
@@ -69,7 +92,11 @@ function makeEventSource() {
|
|
|
69
92
|
disposables.push(...setupCaptureListeners(element, run));
|
|
70
93
|
}
|
|
71
94
|
}
|
|
72
|
-
return _effect.Scope.addFinalizer(scope, _effect.Effect.
|
|
95
|
+
return _effect.Scope.addFinalizer(scope, _effect.Effect.suspend(() => {
|
|
96
|
+
disposables.forEach(dispose);
|
|
97
|
+
if (fibers.size === 0) return _effect.Effect.unit;
|
|
98
|
+
return Fiber.interruptAll(fibers.values());
|
|
99
|
+
}));
|
|
73
100
|
});
|
|
74
101
|
}
|
|
75
102
|
return {
|
|
@@ -88,7 +115,7 @@ function proxyCurrentTargetForCaptureEvents(event, currentTarget) {
|
|
|
88
115
|
function getDerivedAddEventListenerOptions(entries) {
|
|
89
116
|
const hs = Array.from(entries);
|
|
90
117
|
return {
|
|
91
|
-
once: hs.
|
|
118
|
+
once: hs.every(h => h[1].options?.once === true),
|
|
92
119
|
passive: hs.every(h => h[1].options?.passive === true)
|
|
93
120
|
};
|
|
94
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventSource.js","names":["_effect","require","
|
|
1
|
+
{"version":3,"file":"EventSource.js","names":["_effect","require","Fiber","_interopRequireWildcard","Runtime","_ElementSource","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","disposable","f","Symbol","dispose","d","makeEventSource","bubbleListeners","Map","captureListeners","addListener","listeners","event","entry","sets","isOnce","options","once","undefined","normal","Set","add","addEventListener","element","handler","capture","setupBubbleListeners","run","disposables","handlers","listener","ev","Effect","forEach","el","target","contains","unit","getDerivedAddEventListenerOptions","push","removeEventListener","setupCaptureListeners","proxyCurrentTargetForCaptureEvents","setup","rendered","scope","hasBubbleListeners","size","hasCaptureListeners","elements","getElements","length","flatMap","runtime","fibers","runFork","effect","id","fiber","onExit","sync","delete","Scope","addFinalizer","suspend","interruptAll","values","EVENT_PROPERTY_TO_REPLACE","currentTarget","Proxy","property","entries","hs","Array","from","every","h","passive"],"sources":["../../../src/internal/EventSource.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -36,8 +36,19 @@ const getAllTextUntilElementClose = tagName => {
|
|
|
36
36
|
};
|
|
37
37
|
exports.getAllTextUntilElementClose = getAllTextUntilElementClose;
|
|
38
38
|
const getWhitespace = exports.getWhitespace = /*#__PURE__*/chunker(/(\s+)/g);
|
|
39
|
-
const
|
|
40
|
-
const
|
|
39
|
+
const tagNameRegexCache = /*#__PURE__*/new Map();
|
|
40
|
+
const tagNameRegex = tagName => {
|
|
41
|
+
return `(<\\/\\s*${tagName}\\s*>)`;
|
|
42
|
+
};
|
|
43
|
+
const getClosingTagName = tagName => {
|
|
44
|
+
const current = tagNameRegexCache.get(tagName);
|
|
45
|
+
if (current !== undefined) {
|
|
46
|
+
return current;
|
|
47
|
+
}
|
|
48
|
+
const matcher = chunker(new RegExp(tagNameRegex(tagName), "gi"));
|
|
49
|
+
tagNameRegexCache.set(tagName, matcher);
|
|
50
|
+
return matcher;
|
|
51
|
+
};
|
|
41
52
|
exports.getClosingTagName = getClosingTagName;
|
|
42
53
|
function chunker(regex) {
|
|
43
54
|
return (str, pos) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunks.js","names":["PART_STRING","i","exports","PART_REGEX","getPart","chunker","STRICT_PART_REGEX","getStrictPart","getOpeningTag","getOpeningTagEnd","getClosingTag","getSelfClosingTagEnd","getComment","getTextUntilPart","getTextUntilCloseBrace","getAttributeWithQuotes","getAttributeWithoutQuotes","getBooleanAttribute","getAllTextUntilElementClose","tagName","RegExp","getWhitespace","tagNameRegex","getClosingTagName","regex","str","pos","lastIndex","match","exec","index","length"],"sources":["../../../src/internal/chunks.ts"],"sourcesContent":[null],"mappings":";;;;;;AAKO,MAAMA,WAAW,GAAIC,CAAS,IAAK,WAAWA,CAAC,MAAM;AAAAC,OAAA,CAAAF,WAAA,GAAAA,WAAA;AAErD,MAAMG,UAAU,GAAAD,OAAA,CAAAC,UAAA,GAAG,0BAA0B;AAE7C,MAAMC,OAAO,GAAAF,OAAA,CAAAE,OAAA,gBAAGC,OAAO,CAACF,UAAU,CAAC;AAEnC,MAAMG,iBAAiB,GAAAJ,OAAA,CAAAI,iBAAA,GAAG,4BAA4B;AAEtD,MAAMC,aAAa,GAAAL,OAAA,CAAAK,aAAA,gBAAGF,OAAO,CAACC,iBAAiB,CAAC;AAEhD,MAAME,aAAa,GAAAN,OAAA,CAAAM,aAAA,gBAAGH,OAAO,CAAC,uCAAuC,CAAC;AAEtE,MAAMI,gBAAgB,GAAAP,OAAA,CAAAO,gBAAA,gBAAGJ,OAAO,CAAC,aAAa,CAAC;AAEtD;AACA;AACA;AACO,MAAMK,aAAa,GAAAR,OAAA,CAAAQ,aAAA,gBAAGL,OAAO,CAAC,mDAAmD,CAAC;AAElF,MAAMM,oBAAoB,GAAAT,OAAA,CAAAS,oBAAA,gBAAGN,OAAO,CAAC,YAAY,CAAC;AAElD,MAAMO,UAAU,GAAAV,OAAA,CAAAU,UAAA,gBAAGP,OAAO,CAAC,iBAAiB,CAAC;AAEpD;AACA;AACO,MAAMQ,gBAAgB,GAAAX,OAAA,CAAAW,gBAAA,gBAAGR,OAAO,CAAC,+BAA+B,CAAC;AAExE;AACA;AACO,MAAMS,sBAAsB,GAAAZ,OAAA,CAAAY,sBAAA,gBAAGT,OAAO,CAAC,iBAAiB,CAAC;AAEhE;AACO,MAAMU,sBAAsB,GAAAb,OAAA,CAAAa,sBAAA,gBAAGV,OAAO,CAC3C,uDAAuD,CACxD;AAED;AACO,MAAMW,yBAAyB,GAAAd,OAAA,CAAAc,yBAAA,gBAAGX,OAAO,CAC9C,uDAAuD,CACxD;AAED;AAEO,MAAMY,mBAAmB,GAAAf,OAAA,CAAAe,mBAAA,gBAAGZ,OAAO,CAAC,sDAAsD,CAAC;AAElG;AACO,MAAMa,2BAA2B,GAAIC,OAAe,IAAI;EAC7D,OAAOd,OAAO,CAAC,IAAIe,MAAM,CAAC,mBAAmBD,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC;AACtE,CAAC;AAAAjB,OAAA,CAAAgB,2BAAA,GAAAA,2BAAA;AAEM,MAAMG,aAAa,GAAAnB,OAAA,CAAAmB,aAAA,gBAAGhB,OAAO,CAAC,QAAQ,CAAC;AAE9C,MAAMiB,YAAY,
|
|
1
|
+
{"version":3,"file":"chunks.js","names":["PART_STRING","i","exports","PART_REGEX","getPart","chunker","STRICT_PART_REGEX","getStrictPart","getOpeningTag","getOpeningTagEnd","getClosingTag","getSelfClosingTagEnd","getComment","getTextUntilPart","getTextUntilCloseBrace","getAttributeWithQuotes","getAttributeWithoutQuotes","getBooleanAttribute","getAllTextUntilElementClose","tagName","RegExp","getWhitespace","tagNameRegexCache","Map","tagNameRegex","getClosingTagName","current","get","undefined","matcher","set","regex","str","pos","lastIndex","match","exec","index","length"],"sources":["../../../src/internal/chunks.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventSource.d.ts","sourceRoot":"","sources":["../../../src/internal/EventSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAItC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAEnD,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB,KAAK,OAAO,CAAC,EAAE,SAAS,KAAK,IAAI,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;AAE/D,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,SAAS,KAAK,EAC1C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,KACjB,IAAI,CAAA;IAET,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAC9F;
|
|
1
|
+
{"version":3,"file":"EventSource.d.ts","sourceRoot":"","sources":["../../../src/internal/EventSource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAItC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAEnD,KAAK,SAAS,GAAG,MAAM,CAAA;AAEvB,KAAK,OAAO,CAAC,EAAE,SAAS,KAAK,IAAI,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;AAE/D,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,SAAS,KAAK,EAC1C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,KACjB,IAAI,CAAA;IAET,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAC9F;AAWD,wBAAgB,eAAe,IAAI,WAAW,CAqI7C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunks.d.ts","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,WAAW,MAAO,MAAM,WAAuB,CAAA;AAE5D,eAAO,MAAM,UAAU,QAA6B,CAAA;AAEpD,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"chunks.d.ts","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,WAAW,MAAO,MAAM,WAAuB,CAAA;AAE5D,eAAO,MAAM,UAAU,QAA6B,CAAA;AAEpD,eAAO,MAAM,OAAO,QAiEL,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAjEhB,CAAA;AAE1C,eAAO,MAAM,iBAAiB,QAA+B,CAAA;AAE7D,eAAO,MAAM,aAAa,QA6DX,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AA7DH,CAAA;AAEvD,eAAO,MAAM,aAAa,QA2DX,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AA3DmB,CAAA;AAE7E,eAAO,MAAM,gBAAgB,QAyDd,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAzDJ,CAAA;AAKtD,eAAO,MAAM,aAAa,QAoDX,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AApD+B,CAAA;AAEzF,eAAO,MAAM,oBAAoB,QAkDlB,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAlDD,CAAA;AAEzD,eAAO,MAAM,UAAU,QAgDR,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAhDN,CAAA;AAIpD,eAAO,MAAM,gBAAgB,QA4Cd,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AA5Cc,CAAA;AAIxE,eAAO,MAAM,sBAAsB,QAwCpB,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAxCM,CAAA;AAGhE,eAAO,MAAM,sBAAsB,QAqCpB,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAnCzD,CAAA;AAGD,eAAO,MAAM,yBAAyB,QAgCvB,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AA9BzD,CAAA;AAID,eAAO,MAAM,mBAAmB,QA0BjB,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AA1BwC,CAAA;AAGlG,eAAO,MAAM,2BAA2B,YAAa,MAAM,WAuB5C,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AArBzD,CAAA;AAED,eAAO,MAAM,aAAa,QAmBX,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAnBZ,CAAA;AAQ9C,eAAO,MAAM,iBAAiB,YAAa,MAAM,WAWlC,MAAM,OAAO,MAAM,KAAG,SAAS,GAAG,SAAS,AAHzD,CAAA"}
|
|
@@ -1,21 +1,36 @@
|
|
|
1
1
|
import { Effect, Scope } from "effect";
|
|
2
|
+
import * as Fiber from "effect/Fiber";
|
|
2
3
|
import * as Runtime from "effect/Runtime";
|
|
3
4
|
import { getElements } from "../ElementSource";
|
|
4
5
|
const disposable = (f) => ({
|
|
5
6
|
[Symbol.dispose]: f
|
|
6
7
|
});
|
|
8
|
+
const dispose = (d) => d[Symbol.dispose]();
|
|
7
9
|
export function makeEventSource() {
|
|
8
10
|
const bubbleListeners = new Map();
|
|
9
11
|
const captureListeners = new Map();
|
|
10
12
|
function addListener(listeners, event, entry) {
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
const sets = listeners.get(event);
|
|
14
|
+
const isOnce = entry[1].options?.once === true;
|
|
15
|
+
if (sets === undefined) {
|
|
16
|
+
const normal = new Set();
|
|
17
|
+
const once = new Set();
|
|
18
|
+
if (isOnce) {
|
|
19
|
+
once.add(entry);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
normal.add(entry);
|
|
23
|
+
}
|
|
24
|
+
listeners.set(event, [normal, once]);
|
|
16
25
|
}
|
|
17
26
|
else {
|
|
18
|
-
|
|
27
|
+
const [normal, once] = sets;
|
|
28
|
+
if (isOnce) {
|
|
29
|
+
once.add(entry);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
normal.add(entry);
|
|
33
|
+
}
|
|
19
34
|
}
|
|
20
35
|
}
|
|
21
36
|
function addEventListener(element, event, handler) {
|
|
@@ -28,35 +43,45 @@ export function makeEventSource() {
|
|
|
28
43
|
}
|
|
29
44
|
function setupBubbleListeners(element, run) {
|
|
30
45
|
const disposables = [];
|
|
31
|
-
for (const [event,
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
46
|
+
for (const [event, sets] of bubbleListeners) {
|
|
47
|
+
for (const handlers of sets) {
|
|
48
|
+
const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target) ? handler.handler(ev) : Effect.unit));
|
|
49
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
|
|
50
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)));
|
|
51
|
+
}
|
|
35
52
|
}
|
|
36
53
|
return disposables;
|
|
37
54
|
}
|
|
38
55
|
function setupCaptureListeners(element, run) {
|
|
39
56
|
const disposables = [];
|
|
40
|
-
for (const [event,
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
57
|
+
for (const [event, sets] of captureListeners) {
|
|
58
|
+
for (const handlers of sets) {
|
|
59
|
+
const listener = (ev) => run(Effect.forEach(handlers, ([el, handler]) => ev.target === el || el.contains(ev.target)
|
|
60
|
+
? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el))
|
|
61
|
+
: Effect.unit));
|
|
62
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers));
|
|
63
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)));
|
|
64
|
+
}
|
|
46
65
|
}
|
|
47
66
|
return disposables;
|
|
48
67
|
}
|
|
49
68
|
function setup(rendered, scope) {
|
|
50
69
|
const hasBubbleListeners = bubbleListeners.size > 0;
|
|
51
70
|
const hasCaptureListeners = captureListeners.size > 0;
|
|
52
|
-
|
|
71
|
+
const elements = getElements(rendered);
|
|
72
|
+
if (elements.length === 0 || (!hasBubbleListeners && !hasCaptureListeners)) {
|
|
53
73
|
return Effect.unit;
|
|
54
74
|
}
|
|
55
75
|
return Effect.flatMap(Effect.runtime(), (runtime) => {
|
|
56
|
-
const elements = getElements(rendered);
|
|
57
76
|
const disposables = [];
|
|
77
|
+
const fibers = new Map();
|
|
58
78
|
const runFork = Runtime.runFork(runtime);
|
|
59
|
-
const run = (effect) =>
|
|
79
|
+
const run = (effect) => {
|
|
80
|
+
const id = Symbol();
|
|
81
|
+
const fiber = runFork(Effect.onExit(effect, () => Effect.sync(() => fibers.delete(id))));
|
|
82
|
+
fibers.set(id, fiber);
|
|
83
|
+
return fiber;
|
|
84
|
+
};
|
|
60
85
|
for (const element of elements) {
|
|
61
86
|
if (hasBubbleListeners) {
|
|
62
87
|
disposables.push(...setupBubbleListeners(element, run));
|
|
@@ -65,7 +90,12 @@ export function makeEventSource() {
|
|
|
65
90
|
disposables.push(...setupCaptureListeners(element, run));
|
|
66
91
|
}
|
|
67
92
|
}
|
|
68
|
-
return Scope.addFinalizer(scope, Effect.
|
|
93
|
+
return Scope.addFinalizer(scope, Effect.suspend(() => {
|
|
94
|
+
disposables.forEach(dispose);
|
|
95
|
+
if (fibers.size === 0)
|
|
96
|
+
return Effect.unit;
|
|
97
|
+
return Fiber.interruptAll(fibers.values());
|
|
98
|
+
}));
|
|
69
99
|
});
|
|
70
100
|
}
|
|
71
101
|
return {
|
|
@@ -84,7 +114,7 @@ function proxyCurrentTargetForCaptureEvents(event, currentTarget) {
|
|
|
84
114
|
function getDerivedAddEventListenerOptions(entries) {
|
|
85
115
|
const hs = Array.from(entries);
|
|
86
116
|
return {
|
|
87
|
-
once: hs.
|
|
117
|
+
once: hs.every((h) => h[1].options?.once === true),
|
|
88
118
|
passive: hs.every((h) => h[1].options?.passive === true)
|
|
89
119
|
};
|
|
90
120
|
}
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"EventSource.js","sourceRoot":"","sources":["../../../src/internal/EventSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,19 @@ export const getAllTextUntilElementClose = (tagName) => {
|
|
|
28
28
|
return chunker(new RegExp(`([^<]+)(\\s*<\\/${tagName}\\s*>)`, "gi"));
|
|
29
29
|
};
|
|
30
30
|
export const getWhitespace = chunker(/(\s+)/g);
|
|
31
|
-
const
|
|
32
|
-
|
|
31
|
+
const tagNameRegexCache = new Map();
|
|
32
|
+
const tagNameRegex = (tagName) => {
|
|
33
|
+
return `(<\\/\\s*${tagName}\\s*>)`;
|
|
34
|
+
};
|
|
35
|
+
export const getClosingTagName = (tagName) => {
|
|
36
|
+
const current = tagNameRegexCache.get(tagName);
|
|
37
|
+
if (current !== undefined) {
|
|
38
|
+
return current;
|
|
39
|
+
}
|
|
40
|
+
const matcher = chunker(new RegExp(tagNameRegex(tagName), "gi"));
|
|
41
|
+
tagNameRegexCache.set(tagName, matcher);
|
|
42
|
+
return matcher;
|
|
43
|
+
};
|
|
33
44
|
function chunker(regex) {
|
|
34
45
|
return (str, pos) => {
|
|
35
46
|
regex.lastIndex = pos;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunks.js","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,CAAA;AAE5D,MAAM,CAAC,MAAM,UAAU,GAAG,0BAA0B,CAAA;AAEpD,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAE1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,4BAA4B,CAAA;AAE7D,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAEtD,+BAA+B;AAC/B,sEAAsE;AACtE,6BAA6B;AAC7B,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAEzF,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEpD,gDAAgD;AAChD,qFAAqF;AACrF,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAExE,gDAAgD;AAChD,sFAAsF;AACtF,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;AAEhE,+CAA+C;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAC3C,uDAAuD,CACxD,CAAA;AAED,0EAA0E;AAC1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,OAAO,CAC9C,uDAAuD,CACxD,CAAA;AAED,oDAAoD;AAEpD,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC,sDAAsD,CAAC,CAAA;AAElG,qEAAqE;AACrE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,OAAe,EAAE,EAAE;IAC7D,OAAO,OAAO,CAAC,IAAI,MAAM,CAAC,mBAAmB,OAAO,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;AACtE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAE9C,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"chunks.js","sourceRoot":"","sources":["../../../src/internal/chunks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typed/template",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@typed/context": "0.21.0",
|
|
19
19
|
"@typed/dom": "9.0.0",
|
|
20
20
|
"@typed/environment": "0.3.0",
|
|
21
|
-
"@typed/fx": "1.20.
|
|
21
|
+
"@typed/fx": "1.20.1",
|
|
22
22
|
"@typed/wire": "0.3.0"
|
|
23
23
|
},
|
|
24
24
|
"peerDependencies": {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Rendered } from "@typed/wire"
|
|
2
2
|
import { Effect, Scope } from "effect"
|
|
3
|
-
import
|
|
3
|
+
import * as Fiber from "effect/Fiber"
|
|
4
4
|
import * as Runtime from "effect/Runtime"
|
|
5
5
|
import { getElements } from "../ElementSource"
|
|
6
6
|
import type { EventHandler } from "../EventHandler"
|
|
@@ -26,31 +26,44 @@ const disposable = (f: () => void): Disposable => ({
|
|
|
26
26
|
[Symbol.dispose]: f
|
|
27
27
|
})
|
|
28
28
|
|
|
29
|
+
const dispose = (d: Disposable): void => d[Symbol.dispose]()
|
|
30
|
+
|
|
29
31
|
export function makeEventSource(): EventSource {
|
|
30
32
|
const bubbleListeners = new Map<
|
|
31
33
|
EventName,
|
|
32
|
-
Set<Entry>
|
|
34
|
+
readonly [normal: Set<Entry>, once: Set<Entry>]
|
|
33
35
|
>()
|
|
34
36
|
const captureListeners = new Map<
|
|
35
37
|
EventName,
|
|
36
|
-
Set<Entry>
|
|
38
|
+
readonly [normal: Set<Entry>, once: Set<Entry>]
|
|
37
39
|
>()
|
|
38
40
|
|
|
39
41
|
function addListener(
|
|
40
42
|
listeners: Map<
|
|
41
43
|
EventName,
|
|
42
|
-
Set<Entry>
|
|
44
|
+
readonly [normal: Set<Entry>, once: Set<Entry>]
|
|
43
45
|
>,
|
|
44
46
|
event: EventName,
|
|
45
47
|
entry: Entry
|
|
46
48
|
): void {
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
const sets = listeners.get(event)
|
|
50
|
+
const isOnce = entry[1].options?.once === true
|
|
51
|
+
if (sets === undefined) {
|
|
52
|
+
const normal = new Set<Entry>()
|
|
53
|
+
const once = new Set<Entry>()
|
|
54
|
+
if (isOnce) {
|
|
55
|
+
once.add(entry)
|
|
56
|
+
} else {
|
|
57
|
+
normal.add(entry)
|
|
58
|
+
}
|
|
59
|
+
listeners.set(event, [normal, once])
|
|
52
60
|
} else {
|
|
53
|
-
|
|
61
|
+
const [normal, once] = sets
|
|
62
|
+
if (isOnce) {
|
|
63
|
+
once.add(entry)
|
|
64
|
+
} else {
|
|
65
|
+
normal.add(entry)
|
|
66
|
+
}
|
|
54
67
|
}
|
|
55
68
|
}
|
|
56
69
|
|
|
@@ -69,14 +82,16 @@ export function makeEventSource(): EventSource {
|
|
|
69
82
|
function setupBubbleListeners(element: Element, run: Run) {
|
|
70
83
|
const disposables: Array<Disposable> = []
|
|
71
84
|
|
|
72
|
-
for (const [event,
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
85
|
+
for (const [event, sets] of bubbleListeners) {
|
|
86
|
+
for (const handlers of sets) {
|
|
87
|
+
const listener = (ev: Event) =>
|
|
88
|
+
run(
|
|
89
|
+
Effect.forEach(handlers, ([el, handler]) =>
|
|
90
|
+
ev.target === el || el.contains(ev.target as Node) ? handler.handler(ev) : Effect.unit)
|
|
91
|
+
)
|
|
92
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers))
|
|
93
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)))
|
|
94
|
+
}
|
|
80
95
|
}
|
|
81
96
|
|
|
82
97
|
return disposables
|
|
@@ -85,16 +100,18 @@ export function makeEventSource(): EventSource {
|
|
|
85
100
|
function setupCaptureListeners(element: Element, run: Run) {
|
|
86
101
|
const disposables: Array<Disposable> = []
|
|
87
102
|
|
|
88
|
-
for (const [event,
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
103
|
+
for (const [event, sets] of captureListeners) {
|
|
104
|
+
for (const handlers of sets) {
|
|
105
|
+
const listener = (ev: Event) =>
|
|
106
|
+
run(
|
|
107
|
+
Effect.forEach(handlers, ([el, handler]) =>
|
|
108
|
+
ev.target === el || el.contains(ev.target as Node)
|
|
109
|
+
? handler.handler(proxyCurrentTargetForCaptureEvents(ev, el))
|
|
110
|
+
: Effect.unit)
|
|
111
|
+
)
|
|
112
|
+
element.addEventListener(event, listener, getDerivedAddEventListenerOptions(handlers))
|
|
113
|
+
disposables.push(disposable(() => element.removeEventListener(event, listener)))
|
|
114
|
+
}
|
|
98
115
|
}
|
|
99
116
|
|
|
100
117
|
return disposables
|
|
@@ -103,17 +120,22 @@ export function makeEventSource(): EventSource {
|
|
|
103
120
|
function setup(rendered: Rendered, scope: Scope.Scope) {
|
|
104
121
|
const hasBubbleListeners = bubbleListeners.size > 0
|
|
105
122
|
const hasCaptureListeners = captureListeners.size > 0
|
|
123
|
+
const elements = getElements(rendered)
|
|
106
124
|
|
|
107
|
-
if (!hasBubbleListeners && !hasCaptureListeners) {
|
|
125
|
+
if (elements.length === 0 || (!hasBubbleListeners && !hasCaptureListeners)) {
|
|
108
126
|
return Effect.unit
|
|
109
127
|
}
|
|
110
128
|
|
|
111
129
|
return Effect.flatMap(Effect.runtime<never>(), (runtime) => {
|
|
112
|
-
const elements = getElements(rendered)
|
|
113
130
|
const disposables: Array<Disposable> = []
|
|
131
|
+
const fibers = new Map<symbol, Fiber.RuntimeFiber<any, any>>()
|
|
114
132
|
const runFork = Runtime.runFork(runtime)
|
|
115
|
-
const run: Run = <E, A>(effect: Effect.Effect<never, E, A>) =>
|
|
116
|
-
|
|
133
|
+
const run: Run = <E, A>(effect: Effect.Effect<never, E, A>) => {
|
|
134
|
+
const id = Symbol()
|
|
135
|
+
const fiber = runFork(Effect.onExit(effect, () => Effect.sync(() => fibers.delete(id))))
|
|
136
|
+
fibers.set(id, fiber)
|
|
137
|
+
return fiber
|
|
138
|
+
}
|
|
117
139
|
|
|
118
140
|
for (const element of elements) {
|
|
119
141
|
if (hasBubbleListeners) {
|
|
@@ -124,7 +146,14 @@ export function makeEventSource(): EventSource {
|
|
|
124
146
|
}
|
|
125
147
|
}
|
|
126
148
|
|
|
127
|
-
return Scope.addFinalizer(
|
|
149
|
+
return Scope.addFinalizer(
|
|
150
|
+
scope,
|
|
151
|
+
Effect.suspend(() => {
|
|
152
|
+
disposables.forEach(dispose)
|
|
153
|
+
if (fibers.size === 0) return Effect.unit
|
|
154
|
+
return Fiber.interruptAll(fibers.values())
|
|
155
|
+
})
|
|
156
|
+
)
|
|
128
157
|
})
|
|
129
158
|
}
|
|
130
159
|
|
|
@@ -147,7 +176,7 @@ function proxyCurrentTargetForCaptureEvents<E extends Event>(event: E, currentTa
|
|
|
147
176
|
function getDerivedAddEventListenerOptions(entries: Set<Entry>): AddEventListenerOptions {
|
|
148
177
|
const hs = Array.from(entries)
|
|
149
178
|
return {
|
|
150
|
-
once: hs.
|
|
179
|
+
once: hs.every((h) => h[1].options?.once === true),
|
|
151
180
|
passive: hs.every((h) => h[1].options?.passive === true)
|
|
152
181
|
}
|
|
153
182
|
}
|
package/src/internal/chunks.ts
CHANGED
|
@@ -55,9 +55,21 @@ export const getAllTextUntilElementClose = (tagName: string) => {
|
|
|
55
55
|
|
|
56
56
|
export const getWhitespace = chunker(/(\s+)/g)
|
|
57
57
|
|
|
58
|
-
const
|
|
58
|
+
const tagNameRegexCache = new Map<string, ReturnType<typeof chunker>>()
|
|
59
59
|
|
|
60
|
-
|
|
60
|
+
const tagNameRegex = (tagName: string) => {
|
|
61
|
+
return `(<\\/\\s*${tagName}\\s*>)`
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export const getClosingTagName = (tagName: string) => {
|
|
65
|
+
const current = tagNameRegexCache.get(tagName)
|
|
66
|
+
if (current !== undefined) {
|
|
67
|
+
return current
|
|
68
|
+
}
|
|
69
|
+
const matcher = chunker(new RegExp(tagNameRegex(tagName), "gi"))
|
|
70
|
+
tagNameRegexCache.set(tagName, matcher)
|
|
71
|
+
return matcher
|
|
72
|
+
}
|
|
61
73
|
|
|
62
74
|
function chunker(regex: RegExp) {
|
|
63
75
|
return (str: string, pos: number): TextChunk | undefined => {
|