@joist/templating 4.2.4-next.4 → 4.2.4-next.7
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/README.md +0 -9
- package/package.json +1 -1
- package/src/lib/bind.test.ts +72 -0
- package/src/lib/bind.ts +7 -4
- package/src/lib/elements/async.element.ts +2 -2
- package/src/lib/elements/bind.element.test.ts +2 -2
- package/src/lib/elements/bind.element.ts +4 -4
- package/src/lib/elements/for.element.ts +16 -9
- package/src/lib/elements/if.element.test.ts +272 -238
- package/src/lib/elements/if.element.ts +5 -5
- package/src/lib/elements/scope.ts +1 -1
- package/src/lib/elements/value.element.test.ts +28 -0
- package/src/lib/elements/value.element.ts +9 -5
- package/src/lib/events.ts +5 -4
- package/src/lib/{token.test.ts → expression.test.ts} +51 -51
- package/src/lib/{token.ts → expression.ts} +20 -11
- package/target/lib/bind.js +6 -4
- package/target/lib/bind.js.map +1 -1
- package/target/lib/bind.test.js +76 -0
- package/target/lib/bind.test.js.map +1 -0
- package/target/lib/elements/async.element.js +2 -2
- package/target/lib/elements/async.element.js.map +1 -1
- package/target/lib/elements/bind.element.d.ts +2 -2
- package/target/lib/elements/bind.element.js +3 -3
- package/target/lib/elements/bind.element.js.map +1 -1
- package/target/lib/elements/bind.element.test.js +2 -2
- package/target/lib/elements/bind.element.test.js.map +1 -1
- package/target/lib/elements/for.element.d.ts +1 -1
- package/target/lib/elements/for.element.js +13 -7
- package/target/lib/elements/for.element.js.map +1 -1
- package/target/lib/elements/if.element.js +5 -5
- package/target/lib/elements/if.element.js.map +1 -1
- package/target/lib/elements/if.element.test.js +12 -210
- package/target/lib/elements/if.element.test.js.map +1 -1
- package/target/lib/elements/scope.js +1 -1
- package/target/lib/elements/scope.js.map +1 -1
- package/target/lib/elements/value.element.js +7 -5
- package/target/lib/elements/value.element.js.map +1 -1
- package/target/lib/elements/value.element.test.js +24 -0
- package/target/lib/elements/value.element.test.js.map +1 -1
- package/target/lib/events.d.ts +4 -3
- package/target/lib/events.js +3 -3
- package/target/lib/events.js.map +1 -1
- package/target/lib/{token.d.ts → expression.d.ts} +2 -2
- package/target/lib/{token.js → expression.js} +6 -3
- package/target/lib/expression.js.map +1 -0
- package/target/lib/expression.test.d.ts +1 -0
- package/target/lib/{token.test.js → expression.test.js} +52 -52
- package/target/lib/expression.test.js.map +1 -0
- package/target/lib/token.js.map +0 -1
- package/target/lib/token.test.js.map +0 -1
- /package/target/lib/{token.test.d.ts → bind.test.d.ts} +0 -0
|
@@ -2,7 +2,7 @@ import { __esDecorate, __runInitializers } from "tslib";
|
|
|
2
2
|
import { attr, element, query, css, html } from "@joist/element";
|
|
3
3
|
import { bind } from "../bind.js";
|
|
4
4
|
import { JoistValueEvent } from "../events.js";
|
|
5
|
-
import {
|
|
5
|
+
import { JExpression } from "../expression.js";
|
|
6
6
|
let JForScope = (() => {
|
|
7
7
|
let _classDecorators = [element({
|
|
8
8
|
tagName: "j-for-scope",
|
|
@@ -38,7 +38,7 @@ let JForScope = (() => {
|
|
|
38
38
|
});
|
|
39
39
|
get each() { return this.#each_accessor_storage; }
|
|
40
40
|
set each(value) { this.#each_accessor_storage = value; }
|
|
41
|
-
#key_accessor_storage = (__runInitializers(this, _each_extraInitializers), __runInitializers(this, _key_initializers,
|
|
41
|
+
#key_accessor_storage = (__runInitializers(this, _each_extraInitializers), __runInitializers(this, _key_initializers, void 0));
|
|
42
42
|
get key() { return this.#key_accessor_storage; }
|
|
43
43
|
set key(value) { this.#key_accessor_storage = value; }
|
|
44
44
|
constructor() {
|
|
@@ -96,7 +96,7 @@ let JositForElement = (() => {
|
|
|
96
96
|
this.#scopes.set(currentScope.key, currentScope);
|
|
97
97
|
currentScope = currentScope.nextElementSibling;
|
|
98
98
|
}
|
|
99
|
-
const token = new
|
|
99
|
+
const token = new JExpression(this.bind);
|
|
100
100
|
this.dispatchEvent(new JoistValueEvent(token, ({ newValue, oldValue }) => {
|
|
101
101
|
if (newValue !== oldValue) {
|
|
102
102
|
if (isIterable(newValue)) {
|
|
@@ -121,10 +121,13 @@ let JositForElement = (() => {
|
|
|
121
121
|
const fragment = document.createDocumentFragment();
|
|
122
122
|
let index = 0;
|
|
123
123
|
for (const value of this.#items) {
|
|
124
|
-
|
|
124
|
+
let key = index;
|
|
125
|
+
if (keyProperty && hasProperty(value, keyProperty)) {
|
|
126
|
+
key = value[keyProperty];
|
|
127
|
+
}
|
|
125
128
|
const scope = new JForScope();
|
|
126
129
|
scope.append(document.importNode(templateContent, true));
|
|
127
|
-
scope.key =
|
|
130
|
+
scope.key = key;
|
|
128
131
|
scope.each = { position: index + 1, index, value };
|
|
129
132
|
fragment.appendChild(scope);
|
|
130
133
|
this.#scopes.set(key, scope);
|
|
@@ -138,7 +141,10 @@ let JositForElement = (() => {
|
|
|
138
141
|
const keyProperty = this.key;
|
|
139
142
|
let index = 0;
|
|
140
143
|
for (const value of this.#items) {
|
|
141
|
-
|
|
144
|
+
let key = index;
|
|
145
|
+
if (keyProperty && hasProperty(value, keyProperty)) {
|
|
146
|
+
key = value[keyProperty];
|
|
147
|
+
}
|
|
142
148
|
let scope = leftoverScopes.get(key);
|
|
143
149
|
if (!scope) {
|
|
144
150
|
scope = new JForScope();
|
|
@@ -149,7 +155,7 @@ let JositForElement = (() => {
|
|
|
149
155
|
leftoverScopes.delete(key);
|
|
150
156
|
}
|
|
151
157
|
if (scope.key !== key || scope.each.value !== value) {
|
|
152
|
-
scope.key =
|
|
158
|
+
scope.key = key;
|
|
153
159
|
scope.each = { position: index + 1, index, value };
|
|
154
160
|
}
|
|
155
161
|
const child = this.children[index + 1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"for.element.js","sourceRoot":"","sources":["../../../src/lib/elements/for.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"for.element.js","sourceRoot":"","sources":["../../../src/lib/elements/for.element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
2
|
import { attr, element, queryAll, css, html } from "@joist/element";
|
|
3
3
|
import { JoistValueEvent } from "../events.js";
|
|
4
|
-
import {
|
|
4
|
+
import { JExpression } from "../expression.js";
|
|
5
5
|
let JoistIfElement = (() => {
|
|
6
6
|
let _classDecorators = [element({
|
|
7
7
|
tagName: "j-if",
|
|
@@ -44,10 +44,10 @@ let JoistIfElement = (() => {
|
|
|
44
44
|
[templates[0], templates[1]] = [templates[1], templates[0]];
|
|
45
45
|
}
|
|
46
46
|
this.#clean();
|
|
47
|
-
const token = new
|
|
48
|
-
this.dispatchEvent(new JoistValueEvent(token, ({ newValue, oldValue }) => {
|
|
49
|
-
if (newValue !== oldValue) {
|
|
50
|
-
this.apply(token.
|
|
47
|
+
const token = new JExpression(this.bind);
|
|
48
|
+
this.dispatchEvent(new JoistValueEvent(token, ({ newValue, oldValue, firstChange }) => {
|
|
49
|
+
if (firstChange || newValue !== oldValue) {
|
|
50
|
+
this.apply(token.evaluate(newValue), token.isNegated);
|
|
51
51
|
}
|
|
52
52
|
}));
|
|
53
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"if.element.js","sourceRoot":"","sources":["../../../src/lib/elements/if.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"if.element.js","sourceRoot":"","sources":["../../../src/lib/elements/if.element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,232 +1,34 @@
|
|
|
1
1
|
import "./if.element.js";
|
|
2
2
|
import { fixtureSync, html } from "@open-wc/testing";
|
|
3
3
|
import { assert } from "chai";
|
|
4
|
-
it("should
|
|
4
|
+
it("should handle array length", () => {
|
|
5
5
|
const element = fixtureSync(html `
|
|
6
6
|
<div
|
|
7
7
|
@joist::value=${(e) => {
|
|
8
|
-
e.update({ oldValue: null, newValue:
|
|
8
|
+
e.update({ oldValue: null, newValue: [0, 1, 2] });
|
|
9
9
|
}}
|
|
10
10
|
>
|
|
11
|
-
<j-if bind="
|
|
12
|
-
<template>
|
|
11
|
+
<j-if bind="example.length">
|
|
12
|
+
<template>Array has length</template>
|
|
13
|
+
<template else>Array has no length</template>
|
|
13
14
|
</j-if>
|
|
14
15
|
</div>
|
|
15
16
|
`);
|
|
16
|
-
assert.equal(element.textContent?.trim(), "
|
|
17
|
+
assert.equal(element.textContent?.trim(), "Array has length");
|
|
17
18
|
});
|
|
18
|
-
it("should
|
|
19
|
+
it("should handle a first change even if the value is the same", () => {
|
|
19
20
|
const element = fixtureSync(html `
|
|
20
21
|
<div
|
|
21
22
|
@joist::value=${(e) => {
|
|
22
|
-
e.update({ oldValue: null, newValue: true });
|
|
23
|
-
e.update({ oldValue: null, newValue: false });
|
|
23
|
+
e.update({ oldValue: null, newValue: null, firstChange: true });
|
|
24
24
|
}}
|
|
25
25
|
>
|
|
26
|
-
<j-if bind="
|
|
27
|
-
<template>
|
|
26
|
+
<j-if bind="example.length">
|
|
27
|
+
<template>Array has length</template>
|
|
28
|
+
<template else>Array has no length</template>
|
|
28
29
|
</j-if>
|
|
29
30
|
</div>
|
|
30
31
|
`);
|
|
31
|
-
assert.equal(element.textContent?.trim(), "");
|
|
32
|
-
});
|
|
33
|
-
it("should handle negated tokens correctly", () => {
|
|
34
|
-
const element = fixtureSync(html `
|
|
35
|
-
<div
|
|
36
|
-
@joist::value=${(e) => {
|
|
37
|
-
e.update({ oldValue: null, newValue: false });
|
|
38
|
-
}}
|
|
39
|
-
>
|
|
40
|
-
<j-if bind="!test">
|
|
41
|
-
<template>Visible Content</template>
|
|
42
|
-
</j-if>
|
|
43
|
-
</div>
|
|
44
|
-
`);
|
|
45
|
-
assert.equal(element.textContent?.trim(), "Visible Content");
|
|
46
|
-
});
|
|
47
|
-
it("should render else template when condition is falsy", () => {
|
|
48
|
-
const element = fixtureSync(html `
|
|
49
|
-
<div
|
|
50
|
-
@joist::value=${(e) => {
|
|
51
|
-
e.update({ oldValue: null, newValue: false });
|
|
52
|
-
}}
|
|
53
|
-
>
|
|
54
|
-
<j-if bind="test">
|
|
55
|
-
<template>If Content</template>
|
|
56
|
-
<template else>Else Content</template>
|
|
57
|
-
</j-if>
|
|
58
|
-
</div>
|
|
59
|
-
`);
|
|
60
|
-
assert.equal(element.textContent?.trim(), "Else Content");
|
|
61
|
-
});
|
|
62
|
-
it("should switch between if and else templates", () => {
|
|
63
|
-
const element = fixtureSync(html `
|
|
64
|
-
<div
|
|
65
|
-
@joist::value=${(e) => {
|
|
66
|
-
e.update({ oldValue: null, newValue: false });
|
|
67
|
-
e.update({ oldValue: false, newValue: true });
|
|
68
|
-
}}
|
|
69
|
-
>
|
|
70
|
-
<j-if bind="test">
|
|
71
|
-
<template>If Content</template>
|
|
72
|
-
<template else>Else Content</template>
|
|
73
|
-
</j-if>
|
|
74
|
-
</div>
|
|
75
|
-
`);
|
|
76
|
-
assert.equal(element.textContent?.trim(), "If Content");
|
|
77
|
-
});
|
|
78
|
-
it("should handle equality comparison", () => {
|
|
79
|
-
const element = fixtureSync(html `
|
|
80
|
-
<div
|
|
81
|
-
@joist::value=${(e) => {
|
|
82
|
-
e.update({ oldValue: null, newValue: { status: "active" } });
|
|
83
|
-
}}
|
|
84
|
-
>
|
|
85
|
-
<j-if bind="example.status == active">
|
|
86
|
-
<template>Status is Active</template>
|
|
87
|
-
</j-if>
|
|
88
|
-
</div>
|
|
89
|
-
`);
|
|
90
|
-
assert.equal(element.textContent?.trim(), "Status is Active");
|
|
91
|
-
});
|
|
92
|
-
it("should handle greater than comparison", () => {
|
|
93
|
-
const element = fixtureSync(html `
|
|
94
|
-
<div
|
|
95
|
-
@joist::value=${(e) => {
|
|
96
|
-
e.update({ oldValue: null, newValue: { count: 10 } });
|
|
97
|
-
}}
|
|
98
|
-
>
|
|
99
|
-
<j-if bind="example.count > 5">
|
|
100
|
-
<template>Count is Greater Than 5</template>
|
|
101
|
-
</j-if>
|
|
102
|
-
</div>
|
|
103
|
-
`);
|
|
104
|
-
assert.equal(element.textContent?.trim(), "Count is Greater Than 5");
|
|
105
|
-
});
|
|
106
|
-
it("should handle less than comparison", () => {
|
|
107
|
-
const element = fixtureSync(html `
|
|
108
|
-
<div
|
|
109
|
-
@joist::value=${(e) => {
|
|
110
|
-
e.update({ oldValue: null, newValue: { score: 75 } });
|
|
111
|
-
}}
|
|
112
|
-
>
|
|
113
|
-
<j-if bind="example.score < 100">
|
|
114
|
-
<template>Score is Less Than 100</template>
|
|
115
|
-
</j-if>
|
|
116
|
-
</div>
|
|
117
|
-
`);
|
|
118
|
-
assert.equal(element.textContent?.trim(), "Score is Less Than 100");
|
|
119
|
-
});
|
|
120
|
-
it("should handle nested path comparisons", () => {
|
|
121
|
-
const element = fixtureSync(html `
|
|
122
|
-
<div
|
|
123
|
-
@joist::value=${(e) => {
|
|
124
|
-
e.update({ oldValue: null, newValue: { user: { score: 150 } } });
|
|
125
|
-
}}
|
|
126
|
-
>
|
|
127
|
-
<j-if bind="example.user.score > 100">
|
|
128
|
-
<template>User Score is Above 100</template>
|
|
129
|
-
</j-if>
|
|
130
|
-
</div>
|
|
131
|
-
`);
|
|
132
|
-
assert.equal(element.textContent?.trim(), "User Score is Above 100");
|
|
133
|
-
});
|
|
134
|
-
it("should handle negated comparisons", () => {
|
|
135
|
-
const element = fixtureSync(html `
|
|
136
|
-
<div
|
|
137
|
-
@joist::value=${(e) => {
|
|
138
|
-
e.update({ oldValue: null, newValue: { status: "inactive" } });
|
|
139
|
-
}}
|
|
140
|
-
>
|
|
141
|
-
<j-if bind="!example.status == active">
|
|
142
|
-
<template>Status is Not Active</template>
|
|
143
|
-
</j-if>
|
|
144
|
-
</div>
|
|
145
|
-
`);
|
|
146
|
-
assert.equal(element.textContent?.trim(), "Status is Not Active");
|
|
147
|
-
});
|
|
148
|
-
it("should handle string number comparisons", () => {
|
|
149
|
-
const element = fixtureSync(html `
|
|
150
|
-
<div
|
|
151
|
-
@joist::value=${(e) => {
|
|
152
|
-
e.update({ oldValue: null, newValue: { count: "10" } });
|
|
153
|
-
}}
|
|
154
|
-
>
|
|
155
|
-
<j-if bind="example.count > 5">
|
|
156
|
-
<template>String Count is Greater Than 5</template>
|
|
157
|
-
</j-if>
|
|
158
|
-
</div>
|
|
159
|
-
`);
|
|
160
|
-
assert.equal(element.textContent?.trim(), "String Count is Greater Than 5");
|
|
161
|
-
});
|
|
162
|
-
it("should handle undefined values in comparisons", () => {
|
|
163
|
-
const element = fixtureSync(html `
|
|
164
|
-
<div
|
|
165
|
-
@joist::value=${(e) => {
|
|
166
|
-
e.update({ oldValue: null, newValue: { count: undefined } });
|
|
167
|
-
}}
|
|
168
|
-
>
|
|
169
|
-
<j-if bind="example.count > 5">
|
|
170
|
-
<template>Count is Greater Than 5</template>
|
|
171
|
-
</j-if>
|
|
172
|
-
</div>
|
|
173
|
-
`);
|
|
174
|
-
assert.equal(element.textContent?.trim(), "");
|
|
175
|
-
});
|
|
176
|
-
it("should handle not equal comparison", () => {
|
|
177
|
-
const element = fixtureSync(html `
|
|
178
|
-
<div
|
|
179
|
-
@joist::value=${(e) => {
|
|
180
|
-
e.update({ oldValue: null, newValue: { status: "inactive" } });
|
|
181
|
-
}}
|
|
182
|
-
>
|
|
183
|
-
<j-if bind="example.status != active">
|
|
184
|
-
<template>Status is Not Active</template>
|
|
185
|
-
</j-if>
|
|
186
|
-
</div>
|
|
187
|
-
`);
|
|
188
|
-
assert.equal(element.textContent?.trim(), "Status is Not Active");
|
|
189
|
-
});
|
|
190
|
-
it("should handle not equal comparison with matching value", () => {
|
|
191
|
-
const element = fixtureSync(html `
|
|
192
|
-
<div
|
|
193
|
-
@joist::value=${(e) => {
|
|
194
|
-
e.update({ oldValue: null, newValue: { status: "active" } });
|
|
195
|
-
}}
|
|
196
|
-
>
|
|
197
|
-
<j-if bind="example.status != active">
|
|
198
|
-
<template>Status is Not Active</template>
|
|
199
|
-
</j-if>
|
|
200
|
-
</div>
|
|
201
|
-
`);
|
|
202
|
-
assert.equal(element.textContent?.trim(), "");
|
|
203
|
-
});
|
|
204
|
-
it("should handle not equal comparison with string numbers", () => {
|
|
205
|
-
const element = fixtureSync(html `
|
|
206
|
-
<div
|
|
207
|
-
@joist::value=${(e) => {
|
|
208
|
-
e.update({ oldValue: null, newValue: { count: "10" } });
|
|
209
|
-
}}
|
|
210
|
-
>
|
|
211
|
-
<j-if bind="example.count != 5">
|
|
212
|
-
<template>Count is Not 5</template>
|
|
213
|
-
</j-if>
|
|
214
|
-
</div>
|
|
215
|
-
`);
|
|
216
|
-
assert.equal(element.textContent?.trim(), "Count is Not 5");
|
|
217
|
-
});
|
|
218
|
-
it("should handle not equal comparison with undefined", () => {
|
|
219
|
-
const element = fixtureSync(html `
|
|
220
|
-
<div
|
|
221
|
-
@joist::value=${(e) => {
|
|
222
|
-
e.update({ oldValue: null, newValue: { status: undefined } });
|
|
223
|
-
}}
|
|
224
|
-
>
|
|
225
|
-
<j-if bind="example.status != active">
|
|
226
|
-
<template>Status is Not Active</template>
|
|
227
|
-
</j-if>
|
|
228
|
-
</div>
|
|
229
|
-
`);
|
|
230
|
-
assert.equal(element.textContent?.trim(), "Status is Not Active");
|
|
32
|
+
assert.equal(element.textContent?.trim(), "Array has no length");
|
|
231
33
|
});
|
|
232
34
|
//# sourceMappingURL=if.element.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"if.element.test.js","sourceRoot":"","sources":["../../../src/lib/elements/if.element.test.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAEzB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"if.element.test.js","sourceRoot":"","sources":["../../../src/lib/elements/if.element.test.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,CAAC;AAEzB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAwQ9B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACpC,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;;;;;;;GAOJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,kBAAkB,CAAC,CAAC;AAChE,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;IACpE,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC;;;;;;;GAOJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,qBAAqB,CAAC,CAAC;AACnE,CAAC,CAAC,CAAC"}
|
|
@@ -40,7 +40,7 @@ let JoistScopeElement = (() => {
|
|
|
40
40
|
set value(value) { this.#value_accessor_storage = value; }
|
|
41
41
|
#binding = (__runInitializers(this, _value_extraInitializers), null);
|
|
42
42
|
onJoistValueFound(e) {
|
|
43
|
-
if (e.
|
|
43
|
+
if (e.expression.bindTo === this.name) {
|
|
44
44
|
e.stopPropagation();
|
|
45
45
|
this.#binding = e;
|
|
46
46
|
this.#binding.update({ oldValue: null, newValue: this.value });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../src/lib/elements/scope.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;IAerD,iBAAiB;4BAL7B,OAAO,CAAC;YACP,OAAO,EAAE,OAAO;YAEhB,SAAS,EAAE,CAAC,GAAG,CAAA,2BAA2B,EAAE,IAAI,CAAA,eAAe,CAAC;SACjE,CAAC;;;;sBACqC,WAAW;;;;;;;;;iCAAnB,SAAQ,WAAW;;;;gCAC/C,IAAI,EAAE;iCAGN,IAAI,EAAE;6CAKN,MAAM,CAAC,cAAc,CAAC;YAPvB,iKAAS,IAAI,6BAAJ,IAAI,mFAAM;YAGnB,oKAAS,KAAK,6BAAL,KAAK,qFAAM;YAKpB,sMAAA,iBAAiB,6DAQhB;YAlBH,6KAuBC;;;YAvBY,uDAAiB;;QAE5B,0BAFW,mDAAiB,8CAEZ,EAAE,GAAC;QAAnB,IAAS,IAAI,0CAAM;QAAnB,IAAS,IAAI,gDAAM;QAGnB,0HAAiB,EAAE,GAAC;QAApB,IAAS,KAAK,2CAAM;QAApB,IAAS,KAAK,iDAAM;QAEpB,QAAQ,uDAA2B,IAAI,EAAC;QAGxC,iBAAiB,CAAC,CAAkB;YAClC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../src/lib/elements/scope.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;IAerD,iBAAiB;4BAL7B,OAAO,CAAC;YACP,OAAO,EAAE,OAAO;YAEhB,SAAS,EAAE,CAAC,GAAG,CAAA,2BAA2B,EAAE,IAAI,CAAA,eAAe,CAAC;SACjE,CAAC;;;;sBACqC,WAAW;;;;;;;;;iCAAnB,SAAQ,WAAW;;;;gCAC/C,IAAI,EAAE;iCAGN,IAAI,EAAE;6CAKN,MAAM,CAAC,cAAc,CAAC;YAPvB,iKAAS,IAAI,6BAAJ,IAAI,mFAAM;YAGnB,oKAAS,KAAK,6BAAL,KAAK,qFAAM;YAKpB,sMAAA,iBAAiB,6DAQhB;YAlBH,6KAuBC;;;YAvBY,uDAAiB;;QAE5B,0BAFW,mDAAiB,8CAEZ,EAAE,GAAC;QAAnB,IAAS,IAAI,0CAAM;QAAnB,IAAS,IAAI,gDAAM;QAGnB,0HAAiB,EAAE,GAAC;QAApB,IAAS,KAAK,2CAAM;QAApB,IAAS,KAAK,iDAAM;QAEpB,QAAQ,uDAA2B,IAAI,EAAC;QAGxC,iBAAiB,CAAC,CAAkB;YAClC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtC,CAAC,CAAC,eAAe,EAAE,CAAC;gBAEpB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;gBAElB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,wBAAwB,CAAC,CAAS,EAAE,QAAgB,EAAE,QAAgB;YACpE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChD,CAAC;;;;SAtBU,iBAAiB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __esDecorate, __runInitializers } from "tslib";
|
|
2
2
|
import { attr, element, css, html } from "@joist/element";
|
|
3
3
|
import { JoistValueEvent } from "../events.js";
|
|
4
|
-
import {
|
|
4
|
+
import { JExpression } from "../expression.js";
|
|
5
5
|
let JoistValueElement = (() => {
|
|
6
6
|
let _classDecorators = [element({
|
|
7
7
|
tagName: "j-val",
|
|
@@ -29,11 +29,13 @@ let JoistValueElement = (() => {
|
|
|
29
29
|
get bind() { return this.#bind_accessor_storage; }
|
|
30
30
|
set bind(value) { this.#bind_accessor_storage = value; }
|
|
31
31
|
connectedCallback() {
|
|
32
|
-
const token = new
|
|
32
|
+
const token = new JExpression(this.bind);
|
|
33
33
|
this.dispatchEvent(new JoistValueEvent(token, (value) => {
|
|
34
|
-
const valueToWrite =
|
|
35
|
-
if (
|
|
36
|
-
|
|
34
|
+
const valueToWrite = token.evaluate(value.newValue);
|
|
35
|
+
if (valueToWrite !== null &&
|
|
36
|
+
valueToWrite !== undefined &&
|
|
37
|
+
this.textContent !== valueToWrite) {
|
|
38
|
+
this.textContent = String(valueToWrite);
|
|
37
39
|
}
|
|
38
40
|
}));
|
|
39
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value.element.js","sourceRoot":"","sources":["../../../src/lib/elements/value.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"value.element.js","sourceRoot":"","sources":["../../../src/lib/elements/value.element.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;IAalC,iBAAiB;4BAL7B,OAAO,CAAC;YACP,OAAO,EAAE,OAAO;YAEhB,SAAS,EAAE,CAAC,GAAG,CAAA,2BAA2B,EAAE,IAAI,CAAA,eAAe,CAAC;SACjE,CAAC;;;;sBACqC,WAAW;;;;iCAAnB,SAAQ,WAAW;;;;gCAC/C,IAAI,EAAE;YACP,iKAAS,IAAI,6BAAJ,IAAI,mFAAM;YAFrB,6KAqBC;;;YArBY,uDAAiB;;QAE5B,qEAAgB,EAAE,EAAC;QAAnB,IAAS,IAAI,0CAAM;QAAnB,IAAS,IAAI,gDAAM;QAEnB,iBAAiB;YACf,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzC,IAAI,CAAC,aAAa,CAChB,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;gBACnC,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAEpD,IACE,YAAY,KAAK,IAAI;oBACrB,YAAY,KAAK,SAAS;oBAC1B,IAAI,CAAC,WAAW,KAAK,YAAY,EACjC,CAAC;oBACD,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;;;;;;;;SApBU,iBAAiB"}
|
|
@@ -13,4 +13,28 @@ it("should render content when the bind value is truthy", () => {
|
|
|
13
13
|
`);
|
|
14
14
|
assert.equal(element.textContent?.trim(), "Hello World");
|
|
15
15
|
});
|
|
16
|
+
it("should not write null values to textContent", () => {
|
|
17
|
+
const element = fixtureSync(html `
|
|
18
|
+
<div
|
|
19
|
+
@joist::value=${(e) => {
|
|
20
|
+
e.update({ oldValue: "Hello", newValue: null });
|
|
21
|
+
}}
|
|
22
|
+
>
|
|
23
|
+
<j-val bind="test">Hello World</j-val>
|
|
24
|
+
</div>
|
|
25
|
+
`);
|
|
26
|
+
assert.equal(element.textContent?.trim(), "Hello World");
|
|
27
|
+
});
|
|
28
|
+
it("should not write undefined values to textContent", () => {
|
|
29
|
+
const element = fixtureSync(html `
|
|
30
|
+
<div
|
|
31
|
+
@joist::value=${(e) => {
|
|
32
|
+
e.update({ oldValue: "Hello", newValue: undefined });
|
|
33
|
+
}}
|
|
34
|
+
>
|
|
35
|
+
<j-val bind="test">Hello World</j-val>
|
|
36
|
+
</div>
|
|
37
|
+
`);
|
|
38
|
+
assert.equal(element.textContent?.trim(), "Hello World");
|
|
39
|
+
});
|
|
16
40
|
//# sourceMappingURL=value.element.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value.element.test.js","sourceRoot":"","sources":["../../../src/lib/elements/value.element.test.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;IACxD,CAAC;;;;GAIJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"value.element.test.js","sourceRoot":"","sources":["../../../src/lib/elements/value.element.test.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;IAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;IACxD,CAAC;;;;GAIJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACrD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;;;;GAIJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC1D,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAA;;sBAEZ,CAAC,CAAkB,EAAE,EAAE;QACrC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;IACvD,CAAC;;;;GAIJ,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC"}
|
package/target/lib/events.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Change } from "@joist/observable";
|
|
2
|
-
import type {
|
|
2
|
+
import type { JExpression } from "./expression.js";
|
|
3
3
|
declare global {
|
|
4
4
|
interface HTMLElementEventMap {
|
|
5
5
|
"joist::value": JoistValueEvent;
|
|
@@ -7,9 +7,10 @@ declare global {
|
|
|
7
7
|
}
|
|
8
8
|
export interface BindChange<T> extends Change<T> {
|
|
9
9
|
alwaysUpdate?: boolean;
|
|
10
|
+
firstChange?: boolean;
|
|
10
11
|
}
|
|
11
12
|
export declare class JoistValueEvent extends Event {
|
|
12
|
-
readonly
|
|
13
|
+
readonly expression: JExpression;
|
|
13
14
|
readonly update: (value: BindChange<unknown>) => void;
|
|
14
|
-
constructor(
|
|
15
|
+
constructor(expression: JExpression, update: (value: BindChange<unknown>) => void);
|
|
15
16
|
}
|
package/target/lib/events.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export class JoistValueEvent extends Event {
|
|
2
|
-
|
|
2
|
+
expression;
|
|
3
3
|
update;
|
|
4
|
-
constructor(
|
|
4
|
+
constructor(expression, update) {
|
|
5
5
|
super("joist::value", { bubbles: true, composed: true });
|
|
6
|
-
this.
|
|
6
|
+
this.expression = expression;
|
|
7
7
|
this.update = update;
|
|
8
8
|
}
|
|
9
9
|
}
|
package/target/lib/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/lib/events.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/lib/events.ts"],"names":[],"mappings":"AAeA,MAAM,OAAO,eAAgB,SAAQ,KAAK;IAC/B,UAAU,CAAc;IACxB,MAAM,CAAuC;IAEtD,YAAY,UAAuB,EAAE,MAA4C;QAC/E,KAAK,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare class
|
|
1
|
+
export declare class JExpression {
|
|
2
2
|
#private;
|
|
3
3
|
rawToken: string;
|
|
4
4
|
isNegated: boolean;
|
|
@@ -9,5 +9,5 @@ export declare class JToken {
|
|
|
9
9
|
gtValue: string | undefined;
|
|
10
10
|
ltValue: string | undefined;
|
|
11
11
|
constructor(rawToken: string);
|
|
12
|
-
|
|
12
|
+
evaluate<T = unknown>(value: unknown): T;
|
|
13
13
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export class
|
|
1
|
+
export class JExpression {
|
|
2
2
|
rawToken;
|
|
3
3
|
isNegated = false;
|
|
4
4
|
bindTo;
|
|
@@ -29,7 +29,7 @@ export class JToken {
|
|
|
29
29
|
break;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
evaluate(value) {
|
|
33
33
|
if (typeof value !== "object" && typeof value !== "string") {
|
|
34
34
|
return value;
|
|
35
35
|
}
|
|
@@ -53,6 +53,9 @@ export class JToken {
|
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
55
|
#getValueAtPath(value) {
|
|
56
|
+
if (value === null || value === undefined) {
|
|
57
|
+
return value;
|
|
58
|
+
}
|
|
56
59
|
if (!this.path.length) {
|
|
57
60
|
return value;
|
|
58
61
|
}
|
|
@@ -81,4 +84,4 @@ export class JToken {
|
|
|
81
84
|
return value;
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
|
-
//# sourceMappingURL=
|
|
87
|
+
//# sourceMappingURL=expression.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../src/lib/expression.ts"],"names":[],"mappings":"AAyCA,MAAM,OAAO,WAAW;IAEtB,QAAQ,CAAS;IAEjB,SAAS,GAAG,KAAK,CAAC;IAElB,MAAM,CAAS;IAEf,IAAI,GAAa,EAAE,CAAC;IAEpB,WAAW,CAAqB;IAEhC,cAAc,CAAqB;IAEnC,OAAO,CAAqB;IAE5B,OAAO,CAAqB;IAM5B,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAE/C,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACrD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAG9C,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,IAAI;gBACP,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,MAAM;YACR,KAAK,IAAI;gBACP,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC5B,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,MAAM;QACV,CAAC;IACH,CAAC;IAQD,QAAQ,CAAc,KAAc;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC3D,OAAO,KAAU,CAAC;QACpB,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAM,CAAC;IACjD,CAAC;IAMD,WAAW;QACT,MAAM,SAAS,GAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAE/D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACpF,OAAO;oBACL,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;oBAC1B,KAAK;oBACL,QAAQ;iBACT,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;SAC/B,CAAC;IACJ,CAAC;IAOD,eAAe,CAAC,KAAc;QAC5B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,OAAO,GAAQ,KAAK,CAAC;QAEzB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7B,OAAO,GAAG,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM;YACR,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAOD,kBAAkB,CAAC,KAAc;QAC/B,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,WAAW,CAAC;QAC5C,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC;QAC/C,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|