@bodil/dom 0.1.2 → 0.1.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/decorators/attribute.js +18 -14
- package/dist/decorators/attribute.js.map +1 -1
- package/dist/decorators/attribute.test.js +15 -6
- package/dist/decorators/attribute.test.js.map +1 -1
- package/package.json +1 -1
- package/src/decorators/attribute.test.ts +14 -5
- package/src/decorators/attribute.ts +18 -15
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/unified-signatures */
|
|
2
|
-
import { isDeepEqual, isNullish,
|
|
2
|
+
import { isDeepEqual, isNullish, unreachable } from "@bodil/core/assert";
|
|
3
3
|
import { None, Some } from "@bodil/opt";
|
|
4
4
|
import { Signal } from "@bodil/signal";
|
|
5
5
|
import { signalForObject } from "./reactive";
|
|
@@ -61,7 +61,7 @@ export function attribute(valueOrOptions, context) {
|
|
|
61
61
|
type: String,
|
|
62
62
|
property: context.name,
|
|
63
63
|
reactive: context.kind === "accessor",
|
|
64
|
-
reflect:
|
|
64
|
+
reflect: false,
|
|
65
65
|
name: toKebabCase(context.name),
|
|
66
66
|
},
|
|
67
67
|
...(valueOrOptions ?? {}),
|
|
@@ -90,22 +90,15 @@ export function attribute(valueOrOptions, context) {
|
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
function syncAttribute(target, options, value, force = false) {
|
|
93
|
-
const key =
|
|
94
|
-
const attributeValue = toAttribute(value,
|
|
93
|
+
const key = options.name;
|
|
94
|
+
const attributeValue = toAttribute(value, options.type);
|
|
95
95
|
if (force || attributeValue !== target.getAttribute(key)) {
|
|
96
96
|
target.setAttributeQuietly(key, attributeValue);
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
function accessor(options, context, value) {
|
|
100
|
-
let initValue = None;
|
|
101
|
-
const init = function init(value) {
|
|
102
|
-
initValue = Some(value);
|
|
103
|
-
if (options.reflect) {
|
|
104
|
-
syncAttribute(this, options, value, true);
|
|
105
|
-
}
|
|
106
|
-
return value;
|
|
107
|
-
};
|
|
108
100
|
if (options.reactive) {
|
|
101
|
+
let initValue = None;
|
|
109
102
|
const getSig = (obj) => signalForObject(obj, context.name, () => Signal(initValue.unwrapExact(), {
|
|
110
103
|
equals: Object.is,
|
|
111
104
|
}));
|
|
@@ -119,7 +112,13 @@ function accessor(options, context, value) {
|
|
|
119
112
|
syncAttribute(this, options, newValue);
|
|
120
113
|
}
|
|
121
114
|
},
|
|
122
|
-
init
|
|
115
|
+
init(value) {
|
|
116
|
+
initValue = Some(value);
|
|
117
|
+
if (options.reflect) {
|
|
118
|
+
syncAttribute(this, options, value, true);
|
|
119
|
+
}
|
|
120
|
+
return value;
|
|
121
|
+
},
|
|
123
122
|
};
|
|
124
123
|
}
|
|
125
124
|
return {
|
|
@@ -132,7 +131,12 @@ function accessor(options, context, value) {
|
|
|
132
131
|
syncAttribute(this, options, newValue);
|
|
133
132
|
}
|
|
134
133
|
},
|
|
135
|
-
init
|
|
134
|
+
init(value) {
|
|
135
|
+
if (options.reflect) {
|
|
136
|
+
syncAttribute(this, options, value, true);
|
|
137
|
+
}
|
|
138
|
+
return value;
|
|
139
|
+
},
|
|
136
140
|
};
|
|
137
141
|
}
|
|
138
142
|
//# sourceMappingURL=attribute.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/decorators/attribute.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAE1D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"attribute.js","sourceRoot":"","sources":["../../src/decorators/attribute.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,11 +63,11 @@ test("@attribute", async () => {
|
|
|
63
63
|
static { _classThis = this; }
|
|
64
64
|
static {
|
|
65
65
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
66
|
-
_wibble_decorators = [attribute];
|
|
67
|
-
_wobble_decorators = [attribute({ type: Number })];
|
|
68
|
-
_noMeansNo_decorators = [attribute({ type: Boolean })];
|
|
69
|
-
_welp_decorators = [attribute({ name: "wolp", reactive: false })];
|
|
70
|
-
_hide_decorators = [attribute
|
|
66
|
+
_wibble_decorators = [attribute({ reflect: true })];
|
|
67
|
+
_wobble_decorators = [attribute({ type: Number, reflect: true })];
|
|
68
|
+
_noMeansNo_decorators = [attribute({ type: Boolean, reflect: true })];
|
|
69
|
+
_welp_decorators = [attribute({ name: "wolp", reactive: false, reflect: true })];
|
|
70
|
+
_hide_decorators = [attribute];
|
|
71
71
|
__esDecorate(this, null, _wibble_decorators, { kind: "accessor", name: "wibble", static: false, private: false, access: { has: obj => "wibble" in obj, get: obj => obj.wibble, set: (obj, value) => { obj.wibble = value; } }, metadata: _metadata }, _wibble_initializers, _wibble_extraInitializers);
|
|
72
72
|
__esDecorate(this, null, _wobble_decorators, { kind: "accessor", name: "wobble", static: false, private: false, access: { has: obj => "wobble" in obj, get: obj => obj.wobble, set: (obj, value) => { obj.wobble = value; } }, metadata: _metadata }, _wobble_initializers, _wobble_extraInitializers);
|
|
73
73
|
__esDecorate(this, null, _noMeansNo_decorators, { kind: "accessor", name: "noMeansNo", static: false, private: false, access: { has: obj => "noMeansNo" in obj, get: obj => obj.noMeansNo, set: (obj, value) => { obj.noMeansNo = value; } }, metadata: _metadata }, _noMeansNo_initializers, _noMeansNo_extraInitializers);
|
|
@@ -224,6 +224,9 @@ test("@attribute init ordering", async () => {
|
|
|
224
224
|
let _movieStar_decorators;
|
|
225
225
|
let _movieStar_initializers = [];
|
|
226
226
|
let _movieStar_extraInitializers = [];
|
|
227
|
+
let _foo_decorators;
|
|
228
|
+
let _foo_initializers = [];
|
|
229
|
+
let _foo_extraInitializers = [];
|
|
227
230
|
let _get_wibble_decorators;
|
|
228
231
|
let _set_wibble_decorators;
|
|
229
232
|
var AttributeInitTestClass = class extends _classSuper {
|
|
@@ -231,9 +234,11 @@ test("@attribute init ordering", async () => {
|
|
|
231
234
|
static {
|
|
232
235
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
233
236
|
_movieStar_decorators = [attribute];
|
|
237
|
+
_foo_decorators = [attribute];
|
|
234
238
|
_get_wibble_decorators = [attributeGetter];
|
|
235
239
|
_set_wibble_decorators = [attributeSetter];
|
|
236
240
|
__esDecorate(this, null, _movieStar_decorators, { kind: "accessor", name: "movieStar", static: false, private: false, access: { has: obj => "movieStar" in obj, get: obj => obj.movieStar, set: (obj, value) => { obj.movieStar = value; } }, metadata: _metadata }, _movieStar_initializers, _movieStar_extraInitializers);
|
|
241
|
+
__esDecorate(this, null, _foo_decorators, { kind: "accessor", name: "foo", static: false, private: false, access: { has: obj => "foo" in obj, get: obj => obj.foo, set: (obj, value) => { obj.foo = value; } }, metadata: _metadata }, _foo_initializers, _foo_extraInitializers);
|
|
237
242
|
__esDecorate(this, null, _get_wibble_decorators, { kind: "getter", name: "wibble", static: false, private: false, access: { has: obj => "wibble" in obj, get: obj => obj.wibble }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
238
243
|
__esDecorate(this, null, _set_wibble_decorators, { kind: "setter", name: "wibble", static: false, private: false, access: { has: obj => "wibble" in obj, set: (obj, value) => { obj.wibble = value; } }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
239
244
|
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
@@ -242,7 +247,8 @@ test("@attribute init ordering", async () => {
|
|
|
242
247
|
__runInitializers(_classThis, _classExtraInitializers);
|
|
243
248
|
}
|
|
244
249
|
accessor movieStar = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _movieStar_initializers, "Joe"));
|
|
245
|
-
|
|
250
|
+
accessor foo = (__runInitializers(this, _movieStar_extraInitializers), __runInitializers(this, _foo_initializers, void 0));
|
|
251
|
+
#wibble = (__runInitializers(this, _foo_extraInitializers), "Joe");
|
|
246
252
|
get wibble() {
|
|
247
253
|
return this.#wibble;
|
|
248
254
|
}
|
|
@@ -254,11 +260,14 @@ test("@attribute init ordering", async () => {
|
|
|
254
260
|
})();
|
|
255
261
|
const t = document.createElement("attribute-init-test-class");
|
|
256
262
|
t.setAttribute("movie-star", "Mike");
|
|
263
|
+
t.setAttribute("foo", "bar");
|
|
257
264
|
t.setAttribute("wibble", "Robert");
|
|
258
265
|
document.body.append(t);
|
|
259
266
|
await t.updateComplete;
|
|
260
267
|
expect(t.movieStar).toBe("Mike");
|
|
261
268
|
expect(t.getAttribute("movie-star")).toBe("Mike");
|
|
269
|
+
expect(t.foo).toBe("bar");
|
|
270
|
+
expect(t.getAttribute("foo")).toBe("bar");
|
|
262
271
|
expect(t.wibble).toBe("Robert");
|
|
263
272
|
expect(t.getAttribute("wibble")).toBe("Robert");
|
|
264
273
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribute.test.js","sourceRoot":"","sources":["../../src/decorators/attribute.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE/D,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAEpB,kBAAkB;gCADvB,aAAa,CAAC,sBAAsB,CAAC;;;;0BACL,SAAS;;;;;;;;;;;;;;;;sCAAjB,SAAQ,WAAS;;;;sCACrC,SAAS
|
|
1
|
+
{"version":3,"file":"attribute.test.js","sourceRoot":"","sources":["../../src/decorators/attribute.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,11 +8,14 @@ import { attributeGetter, attributeSetter } from "./attribute";
|
|
|
8
8
|
test("@attribute", async () => {
|
|
9
9
|
@customElement("attribute-test-class")
|
|
10
10
|
class AttributeTestClass extends Component {
|
|
11
|
-
@attribute accessor wibble: string | undefined = "Joe";
|
|
12
|
-
@attribute({ type: Number }) accessor wobble: number | undefined = 1;
|
|
13
|
-
@attribute({ type: Boolean }) accessor noMeansNo: boolean | undefined =
|
|
14
|
-
|
|
15
|
-
@attribute({
|
|
11
|
+
@attribute({ reflect: true }) accessor wibble: string | undefined = "Joe";
|
|
12
|
+
@attribute({ type: Number, reflect: true }) accessor wobble: number | undefined = 1;
|
|
13
|
+
@attribute({ type: Boolean, reflect: true }) accessor noMeansNo: boolean | undefined =
|
|
14
|
+
false;
|
|
15
|
+
@attribute({ name: "wolp", reactive: false, reflect: true }) accessor welp:
|
|
16
|
+
| string
|
|
17
|
+
| undefined = "Joe";
|
|
18
|
+
@attribute accessor hide: string | undefined = "no";
|
|
16
19
|
}
|
|
17
20
|
|
|
18
21
|
const t = document.createElement("attribute-test-class") as AttributeTestClass;
|
|
@@ -130,6 +133,8 @@ test("@attribute init ordering", async () => {
|
|
|
130
133
|
class AttributeInitTestClass extends Component {
|
|
131
134
|
@attribute accessor movieStar = "Joe";
|
|
132
135
|
|
|
136
|
+
@attribute accessor foo: string | undefined;
|
|
137
|
+
|
|
133
138
|
#wibble = "Joe";
|
|
134
139
|
@attributeGetter get wibble(): string {
|
|
135
140
|
return this.#wibble;
|
|
@@ -141,6 +146,7 @@ test("@attribute init ordering", async () => {
|
|
|
141
146
|
|
|
142
147
|
const t = document.createElement("attribute-init-test-class") as AttributeInitTestClass;
|
|
143
148
|
t.setAttribute("movie-star", "Mike");
|
|
149
|
+
t.setAttribute("foo", "bar");
|
|
144
150
|
t.setAttribute("wibble", "Robert");
|
|
145
151
|
document.body.append(t);
|
|
146
152
|
await t.updateComplete;
|
|
@@ -148,6 +154,9 @@ test("@attribute init ordering", async () => {
|
|
|
148
154
|
expect(t.movieStar).toBe("Mike");
|
|
149
155
|
expect(t.getAttribute("movie-star")).toBe("Mike");
|
|
150
156
|
|
|
157
|
+
expect(t.foo).toBe("bar");
|
|
158
|
+
expect(t.getAttribute("foo")).toBe("bar");
|
|
159
|
+
|
|
151
160
|
expect(t.wibble).toBe("Robert");
|
|
152
161
|
expect(t.getAttribute("wibble")).toBe("Robert");
|
|
153
162
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/unified-signatures */
|
|
2
2
|
|
|
3
|
-
import { isDeepEqual, isNullish,
|
|
3
|
+
import { isDeepEqual, isNullish, unreachable } from "@bodil/core/assert";
|
|
4
4
|
import { None, Some, type Option } from "@bodil/opt";
|
|
5
5
|
import { Signal } from "@bodil/signal";
|
|
6
6
|
|
|
@@ -211,7 +211,7 @@ export function attribute<C extends Component, T extends string | number | boole
|
|
|
211
211
|
type: String,
|
|
212
212
|
property: context.name,
|
|
213
213
|
reactive: context.kind === "accessor",
|
|
214
|
-
reflect:
|
|
214
|
+
reflect: false,
|
|
215
215
|
name: toKebabCase(context.name),
|
|
216
216
|
},
|
|
217
217
|
...((valueOrOptions as AttributeOptions) ?? {}),
|
|
@@ -255,8 +255,8 @@ function syncAttribute<C extends Component, T>(
|
|
|
255
255
|
value: T,
|
|
256
256
|
force: boolean = false,
|
|
257
257
|
) {
|
|
258
|
-
const key =
|
|
259
|
-
const attributeValue = toAttribute(value,
|
|
258
|
+
const key = options.name;
|
|
259
|
+
const attributeValue = toAttribute(value, options.type);
|
|
260
260
|
if (force || attributeValue !== target.getAttribute(key)) {
|
|
261
261
|
target.setAttributeQuietly(key, attributeValue);
|
|
262
262
|
}
|
|
@@ -267,16 +267,8 @@ function accessor<C extends Component, T>(
|
|
|
267
267
|
context: ClassAccessorDecoratorContext<C, T>,
|
|
268
268
|
value: ClassAccessorDecoratorTarget<C, T>,
|
|
269
269
|
): ClassAccessorDecoratorResult<C, T> {
|
|
270
|
-
let initValue: Option<T> = None;
|
|
271
|
-
const init = function init(this: C, value: T): T {
|
|
272
|
-
initValue = Some(value);
|
|
273
|
-
if (options.reflect) {
|
|
274
|
-
syncAttribute(this, options, value, true);
|
|
275
|
-
}
|
|
276
|
-
return value;
|
|
277
|
-
};
|
|
278
|
-
|
|
279
270
|
if (options.reactive) {
|
|
271
|
+
let initValue: Option<T> = None;
|
|
280
272
|
const getSig = (obj: object) =>
|
|
281
273
|
signalForObject(obj, context.name, () =>
|
|
282
274
|
Signal(initValue.unwrapExact(), {
|
|
@@ -293,7 +285,13 @@ function accessor<C extends Component, T>(
|
|
|
293
285
|
syncAttribute(this, options, newValue);
|
|
294
286
|
}
|
|
295
287
|
},
|
|
296
|
-
init,
|
|
288
|
+
init(this: C, value: T): T {
|
|
289
|
+
initValue = Some(value);
|
|
290
|
+
if (options.reflect) {
|
|
291
|
+
syncAttribute(this, options, value, true);
|
|
292
|
+
}
|
|
293
|
+
return value;
|
|
294
|
+
},
|
|
297
295
|
};
|
|
298
296
|
}
|
|
299
297
|
return {
|
|
@@ -306,6 +304,11 @@ function accessor<C extends Component, T>(
|
|
|
306
304
|
syncAttribute(this, options, newValue);
|
|
307
305
|
}
|
|
308
306
|
},
|
|
309
|
-
init,
|
|
307
|
+
init(this: C, value: T): T {
|
|
308
|
+
if (options.reflect) {
|
|
309
|
+
syncAttribute(this, options, value, true);
|
|
310
|
+
}
|
|
311
|
+
return value;
|
|
312
|
+
},
|
|
310
313
|
};
|
|
311
314
|
}
|