pacc 4.11.0 → 4.12.0

package/README.md

@@ -31,6 +31,8 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
     *   [Parameters](#parameters)
 *   [mergeAttributeDefinitions](#mergeattributedefinitions)
     *   [Parameters](#parameters-1)
+*   [attributeIterator](#attributeiterator)
+    *   [Parameters](#parameters-2)
 *   [AttributeDefinition](#attributedefinition)
     *   [Properties](#properties)
 *   [default\_attribute](#default_attribute)
@@ -77,25 +79,25 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [timeout\_attribute](#timeout_attribute)
 *   [language\_attribute](#language_attribute)
 *   [filter](#filter)
-    *   [Parameters](#parameters-2)
-*   [setAttributes](#setattributes)
     *   [Parameters](#parameters-3)
-*   [getAttributes](#getattributes)
+*   [setAttributes](#setattributes)
     *   [Parameters](#parameters-4)
+*   [getAttributes](#getattributes)
+    *   [Parameters](#parameters-5)
 *   [tokens](#tokens)
 *   [tokens](#tokens-1)
-    *   [Parameters](#parameters-5)
-*   [setAttribute](#setattribute)
     *   [Parameters](#parameters-6)
-*   [getAttribute](#getattribute)
+*   [setAttribute](#setattribute)
     *   [Parameters](#parameters-7)
-*   [getAttributeAndOperator](#getattributeandoperator)
+*   [getAttribute](#getattribute)
     *   [Parameters](#parameters-8)
+*   [getAttributeAndOperator](#getattributeandoperator)
+    *   [Parameters](#parameters-9)
 *   [lookup](#lookup)
 *   [Token](#token)
     *   [Properties](#properties-1)
 *   [createToken](#createtoken)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-10)
 *   [PLUS](#plus)
 *   [MINUS](#minus)
 *   [STAR](#star)
@@ -146,6 +148,15 @@ Merge attribute definitions.
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** merged definitions (dest)
 
+## attributeIterator
+
+iterate over all attributes.
+
+### Parameters
+
+*   `definition` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+*   `path` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `[]`)
+
 ## AttributeDefinition
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -370,7 +381,6 @@ Copies attribute values from a source object into a destination object.
 *   `source` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** origin of the data to be copied
 *   `definitions` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** attribute definitions to be used
 *   `cb` **[function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** callback to be executed for each copied value
-*   `prefix` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** name parefix
 
 ## getAttributes
 
@@ -403,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)**&#x20;
 *   `expression` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `value` **any**&#x20;
+*   `definition` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** type def
 
 ## getAttribute
 

package/package.json

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

package/src/attributes.mjs

@@ -4,7 +4,10 @@ const types = {
   number: { name: "number" },
   integer: { name: "integer" },
   "unsigned-integer": { name: "unsigned-integer" },
-  boolean: { name: "boolean" },
+  boolean: {
+    name: "boolean",
+    convertValue: value => (!value || value === "0" ? false : true)
+  },
   url: { name: "url" },
   object: { name: "object" }
 };
@@ -19,12 +22,8 @@ export function prepareAttributesDefinitions(
   newDefinitions,
   presentDefinitions
 ) {
-  for (const [name, d] of Object.entries(newDefinitions)) {
-    if (d.attributes === undefined) {
-      d.type = types[d.type] || types.base;
-    } else {
-      prepareAttributesDefinitions(d.attributes);
-    }
+  for (const [path, def] of attributeIterator(newDefinitions)) {
+    def.type = types[def.type] || types.base;
   }
 
   return mergeAttributeDefinitions(newDefinitions, presentDefinitions);
@@ -60,15 +59,24 @@ function mergeAttributeDefinitions(dest, atts) {
  * @param {string[]} path
  */
 export function* attributeIterator(definition, path = []) {
-  for (const [name, def] of Object.entries(definition)) {
-    path.push(name);
+  if (definition) {
+    for (const [name, def] of Object.entries(definition)) {
+      path.push(name);
 
-    if (def.attributes) {
-      yield* attributeIterator(def.attributes, path);
-    }
+      if (def.attributes) {
+        yield* attributeIterator(def.attributes, path);
+      }
+
+      yield [path, def];
 
-    yield [path, def];
+      path.pop();
+    }
+  }
+}
 
-    path.pop();
+export function convertValue(value, definition) {
+  if (definition?.type?.convertValue) {
+    return definition.type.convertValue(value);
   }
+  return value;
 }

package/src/properties.mjs

@@ -0,0 +1,43 @@
+import { attributeIterator } from "./attributes.mjs";
+import { getAttribute, setAttribute } from "./settergetter.mjs";
+import { convertValue } from "./attributes.mjs";
+
+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, attribute);
+
+    if (value !== undefined && path.length === 1) {
+      const op = Object.getOwnPropertyDescriptor(
+        object.constructor.prototype,
+        name
+      );
+
+      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
+        );
+      }
+    } 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.
@@ -23,8 +24,9 @@ import { parse } from "./expression.mjs";
  * @param {Object} object
  * @param {string} expression
  * @param {any} value
+ * @param {Object} definition type def
  */
-export function setAttribute(object, expression, value) {
+export function setAttribute(object, expression, value, definition) {
   const { path } = parse({ tokens: tokens(expression) });
 
   let anchor, anchorKey;
@@ -46,7 +48,7 @@ export function setAttribute(object, expression, value) {
   }
 
   if (anchor) {
-    anchor[anchorKey] = value;
+    anchor[anchorKey] = convertValue(value, definition);
   }
 }
 
@@ -57,7 +59,7 @@ export function setAttribute(object, expression, value) {
  * @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) {
@@ -78,6 +80,10 @@ export function getAttribute(object, expression) {
     }
   }
 
+  if(object === undefined && definition) {
+    object = definition.default;
+  }
+
   return object;
 }
 

package/types/attributes.d.mts

@@ -11,3 +11,4 @@ export function prepareAttributesDefinitions(newDefinitions: any, presentDefinit
  * @param {string[]} path
  */
 export function attributeIterator(definition: any, path?: string[]): any;
+export function convertValue(value: any, definition: any): any;

package/types/properties.d.mts

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

package/types/settergetter.d.mts

@@ -4,8 +4,9 @@
  * @param {Object} object
  * @param {string} expression
  * @param {any} value
+ * @param {Object} definition type def
  */
-export function setAttribute(object: any, expression: string, value: any): void;
+export function setAttribute(object: any, expression: string, value: any, definition: any): void;
 /**
  * Deliver attribute value.
  * The name may be a property path like 'a.b.c' or a[2]
@@ -13,7 +14,7 @@ export function setAttribute(object: any, expression: string, value: any): void;
  * @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 <='.