pacc 4.12.0 → 4.12.2

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
 
@@ -424,6 +424,7 @@ The name may be a property path like 'a.b.c' or a\[2]
 
 *   `object` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 *   `expression` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `definition`  
 
 Returns **any** value associated with the given property name
 

package/package.json

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

package/src/attributes.mjs

@@ -1,21 +1,26 @@
 const types = {
   base: { name: "base" },
-  string: { name: "string" },
-  number: { name: "number" },
-  integer: { name: "integer" },
-  "unsigned-integer": { name: "unsigned-integer" },
+  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" }
 };
 
 /**
  * Create attributes from its definition.
  * @param {Object} newDefinitions
- * @param {Object|undefined} presentDefinitions optional merg in attributes
+ * @param {Object} [presentDefinitions] optional merg in attributes
  * @return {Object} attributes
  */
 export function prepareAttributesDefinitions(

package/src/module.mjs

@@ -3,6 +3,7 @@ export * from "./filter.mjs";
 export * from "./multiple.mjs";
 export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
+export * from "./properties.mjs";
 export {
   setAttribute,
   getAttribute,

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(
@@ -24,14 +24,10 @@ export function definePropertiesFromAttributes(
       value = convertValue(value, attribute);
       const property = properties[name];
 
-      console.log(name, value);
       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/attributes.d.mts

@@ -1,10 +1,10 @@
 /**
  * Create attributes from its definition.
  * @param {Object} newDefinitions
- * @param {Object|undefined} presentDefinitions optional merg in attributes
+ * @param {Object} [presentDefinitions] optional merg in attributes
  * @return {Object} attributes
  */
-export function prepareAttributesDefinitions(newDefinitions: any, presentDefinitions: any | undefined): any;
+export function prepareAttributesDefinitions(newDefinitions: any, presentDefinitions?: any): any;
 /**
  * iterate over all attributes.
  * @param {Object} definition

package/types/module.d.mts

@@ -3,4 +3,5 @@ export * from "./filter.mjs";
 export * from "./multiple.mjs";
 export * from "./attributes.mjs";
 export * from "./common-attributes.mjs";
+export * from "./properties.mjs";
 export { setAttribute, getAttribute, getAttributeAndOperator } from "./settergetter.mjs";

package/types/properties.d.mts

@@ -1 +1 @@
-export function definePropertiesFromAttributes(object: any, attributes: any, values: any, properties: any): void;
+export function definePropertiesFromAttributes(object: any, attributes: any, values: any, properties?: {}): void;