pacc 4.12.1 → 4.13.0

package/README.md

@@ -133,7 +133,7 @@ Create attributes from its definition.
 ### Parameters
 
 *   `newDefinitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-*   `presentDefinitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** optional merg in attributes
+*   `presentDefinitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** optional merg in attributes
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** attributes
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.12.1",
+  "version": "4.13.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/attributes.mjs

@@ -1,18 +1,20 @@
 const types = {
   base: { name: "base" },
-  string: { name: "string" },
-  number: { name: "number" },
+  string: { name: "string", extends: "base" },
+  number: { name: "number", extends: "base" },
   integer: {
     name: "integer",
+    extends: "base",
     convertValue: value => (typeof value === "string" ? parseInt(value) : value)
   },
   "unsigned-integer": { name: "unsigned-integer", extends: "integer" },
   boolean: {
     name: "boolean",
+    extends: "base",
     convertValue: value => (!value || value === "0" ? false : true)
   },
-  url: { name: "url" },
-  object: { name: "object" }
+  url: { name: "url", extends: "string" },
+  object: { name: "object", extends: "base" }
 };
 
 /**

package/src/common-attributes.mjs

@@ -67,6 +67,14 @@ export const name_attribute = {
   isKey: true
 };
 
+/**
+ * @type {AttributeDefinition}
+ */
+export const name_attribute_writable = {
+  ...name_attribute,
+  writable: true
+};
+
 /**
  * @type {AttributeDefinition}
  */
@@ -176,7 +184,6 @@ export { secret_attribute as username_attribute };
  */
 export { secret_attribute as password_attribute };
 
-
 /**
  * @type {AttributeDefinition}
  */

package/src/properties.mjs

@@ -6,14 +6,14 @@ export function definePropertiesFromAttributes(
   object,
   attributes,
   values,
-  properties={}
+  properties = {}
 ) {
   const applyLater = {};
 
   for (const [path, attribute] of attributeIterator(attributes)) {
     const name = path.join(".");
 
-    let value = getAttribute(values, name, attribute);
+    let value = getAttribute(values, name, attribute) ?? values?.[name];
 
     if (value !== undefined && path.length === 1) {
       const op = Object.getOwnPropertyDescriptor(
@@ -27,10 +27,7 @@ export function definePropertiesFromAttributes(
       if (op?.set || property?.set) {
         applyLater[name] = value;
       } else {
-        properties[name] = Object.assign(
-          { value, writable: attribute.writable },
-          property
-        );
+        properties[name] = Object.assign({ ...attribute, value }, property);
       }
     } else {
       setAttribute(object, name, value, attribute);

package/types/common-attributes.d.mts

@@ -47,6 +47,10 @@ export const string_collection_attribute_writable: AttributeDefinition;
  * @type {AttributeDefinition}
  */
 export const name_attribute: AttributeDefinition;
+/**
+ * @type {AttributeDefinition}
+ */
+export const name_attribute_writable: AttributeDefinition;
 /**
  * @type {AttributeDefinition}
  */