pacc 4.12.1 → 4.12.2
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 +1 -1
- package/package.json +1 -1
- package/src/attributes.mjs +6 -4
- package/src/properties.mjs +3 -6
package/README.md
CHANGED
|
@@ -133,7 +133,7 @@ Create attributes from its definition.
|
|
|
133
133
|
### Parameters
|
|
134
134
|
|
|
135
135
|
* `newDefinitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
|
|
136
|
-
* `presentDefinitions` **
|
|
136
|
+
* `presentDefinitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** optional merg in attributes
|
|
137
137
|
|
|
138
138
|
Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** attributes
|
|
139
139
|
|
package/package.json
CHANGED
package/src/attributes.mjs
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
const types = {
|
|
2
2
|
base: { name: "base" },
|
|
3
|
-
string: { name: "string" },
|
|
4
|
-
number: { name: "number" },
|
|
3
|
+
string: { name: "string", extends: "base" },
|
|
4
|
+
number: { name: "number", extends: "base" },
|
|
5
5
|
integer: {
|
|
6
6
|
name: "integer",
|
|
7
|
+
extends: "base",
|
|
7
8
|
convertValue: value => (typeof value === "string" ? parseInt(value) : value)
|
|
8
9
|
},
|
|
9
10
|
"unsigned-integer": { name: "unsigned-integer", extends: "integer" },
|
|
10
11
|
boolean: {
|
|
11
12
|
name: "boolean",
|
|
13
|
+
extends: "base",
|
|
12
14
|
convertValue: value => (!value || value === "0" ? false : true)
|
|
13
15
|
},
|
|
14
|
-
url: { name: "url" },
|
|
15
|
-
object: { name: "object" }
|
|
16
|
+
url: { name: "url", extends: "string" },
|
|
17
|
+
object: { name: "object", extends: "base" }
|
|
16
18
|
};
|
|
17
19
|
|
|
18
20
|
/**
|
package/src/properties.mjs
CHANGED
|
@@ -6,14 +6,14 @@ export function definePropertiesFromAttributes(
|
|
|
6
6
|
object,
|
|
7
7
|
attributes,
|
|
8
8
|
values,
|
|
9
|
-
properties={}
|
|
9
|
+
properties = {}
|
|
10
10
|
) {
|
|
11
11
|
const applyLater = {};
|
|
12
12
|
|
|
13
13
|
for (const [path, attribute] of attributeIterator(attributes)) {
|
|
14
14
|
const name = path.join(".");
|
|
15
15
|
|
|
16
|
-
let value = getAttribute(values, name, attribute);
|
|
16
|
+
let value = getAttribute(values, name, attribute) ?? values?.[name];
|
|
17
17
|
|
|
18
18
|
if (value !== undefined && path.length === 1) {
|
|
19
19
|
const op = Object.getOwnPropertyDescriptor(
|
|
@@ -27,10 +27,7 @@ export function definePropertiesFromAttributes(
|
|
|
27
27
|
if (op?.set || property?.set) {
|
|
28
28
|
applyLater[name] = value;
|
|
29
29
|
} else {
|
|
30
|
-
properties[name] = Object.assign(
|
|
31
|
-
{ value, writable: attribute.writable },
|
|
32
|
-
property
|
|
33
|
-
);
|
|
30
|
+
properties[name] = Object.assign({ ...attribute, value }, property);
|
|
34
31
|
}
|
|
35
32
|
} else {
|
|
36
33
|
setAttribute(object, name, value, attribute);
|