pacc 4.11.1 → 4.12.1

package/README.md

@@ -413,6 +413,7 @@ The name may be a property path like 'a.b.c'.
 *   `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)** 
 *   `value` **any** 
+*   `definition` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** type def
 
 ## getAttribute
 
@@ -423,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.11.1",
+  "version": "4.12.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/attributes.mjs

@@ -2,11 +2,14 @@ const types = {
   base: { name: "base" },
   string: { name: "string" },
   number: { name: "number" },
-  integer: { name: "integer" },
-  "unsigned-integer": { name: "unsigned-integer" },
+  integer: {
+    name: "integer",
+    convertValue: value => (typeof value === "string" ? parseInt(value) : value)
+  },
+  "unsigned-integer": { name: "unsigned-integer", extends: "integer" },
   boolean: {
     name: "boolean",
-    from: value => (!value || value === "0" ? false : true)
+    convertValue: value => (!value || value === "0" ? false : true)
   },
   url: { name: "url" },
   object: { name: "object" }
@@ -15,7 +18,7 @@ const types = {
 /**
  * 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(
@@ -73,3 +76,10 @@ export function* attributeIterator(definition, path = []) {
     }
   }
 }
+
+export function convertValue(value, definition) {
+  if (definition?.type?.convertValue) {
+    return definition.type.convertValue(value);
+  }
+  return value;
+}

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

@@ -1,10 +1,42 @@
 import { attributeIterator } from "./attributes.mjs";
-import { getAttribute } from "./settergetter.mjs";
+import { getAttribute, setAttribute } from "./settergetter.mjs";
+import { convertValue } from "./attributes.mjs";
 
-export function createPropertiesFromAttributes(object, attributes, values) {
-  for (const [path, def] of attributeIterator(attributes)) {
+export function definePropertiesFromAttributes(
+  object,
+  attributes,
+  values,
+  properties={}
+) {
+  const applyLater = {};
+
+  for (const [path, attribute] of attributeIterator(attributes)) {
     const name = path.join(".");
 
-    let value = getAttribute(values, name, def);
+    let value = getAttribute(values, name, attribute);
+
+    if (value !== undefined && path.length === 1) {
+      const op = Object.getOwnPropertyDescriptor(
+        object.constructor.prototype,
+        name
+      );
+
+      value = convertValue(value, attribute);
+      const property = properties[name];
+
+      if (op?.set || property?.set) {
+        applyLater[name] = value;
+      } else {
+        properties[name] = Object.assign(
+          { value, writable: attribute.writable },
+          property
+        );
+      }
+    } else {
+      setAttribute(object, name, value, attribute);
+    }
   }
+
+  Object.defineProperties(object, properties);
+  Object.assign(object, applyLater);
 }

package/src/settergetter.mjs

@@ -16,6 +16,7 @@ import {
   STAR
 } from "./tokens.mjs";
 import { parse } from "./expression.mjs";
+import { convertValue } from "./attributes.mjs";
 
 /**
  * Set object attribute.
@@ -47,7 +48,7 @@ export function setAttribute(object, expression, value, definition) {
   }
 
   if (anchor) {
-    anchor[anchorKey] = value;
+    anchor[anchorKey] = convertValue(value, definition);
   }
 }
 
@@ -58,7 +59,7 @@ export function setAttribute(object, expression, value, definition) {
  * @param {string} expression
  * @returns {any} value associated with the given property name
  */
-export function getAttribute(object, expression) {
+export function getAttribute(object, expression, definition) {
   const { path } = parse({ tokens: tokens(expression) });
 
   for (const key of path) {
@@ -79,6 +80,10 @@ export function getAttribute(object, expression) {
     }
   }
 
+  if(object === undefined && definition) {
+    object = definition.default;
+  }
+
   return object;
 }
 

package/types/attributes.d.mts

@@ -1,13 +1,14 @@
 /**
  * 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
  * @param {string[]} path
  */
 export function attributeIterator(definition: any, path?: string[]): any;
+export function convertValue(value: any, definition: any): any;

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 createPropertiesFromAttributes(object: any, attributes: any, values: any): void;
+export function definePropertiesFromAttributes(object: any, attributes: any, values: any, properties?: {}): void;

package/types/settergetter.d.mts

@@ -14,7 +14,7 @@ export function setAttribute(object: any, expression: string, value: any, defini
  * @param {string} expression
  * @returns {any} value associated with the given property name
  */
-export function getAttribute(object: any, expression: string): any;
+export function getAttribute(object: any, expression: string, definition: any): any;
 /**
  * Deliver attribute value and operator.
  * The name may be a property path like 'a.b.c <='.