pacc 4.10.0 → 4.11.1

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
 

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "pacc",
-  "version": "4.10.0",
+  "version": "4.11.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
+  "packageManager": "npm@11.6.0+sha512.77f3fb0dbbd881835d7bd1217deabdf7ed77fc4ec4f363df64fc3cb986404abf6c437661041080f5c5d225103508e7c9ea30cb2742b7e942675d05a10af2d7b9",
   "types": "./types/module.d.mts",
   "exports": {
     ".": {

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",
+    from: value => (!value || value === "0" ? false : true)
+  },
   url: { name: "url" },
   object: { name: "object" }
 };
@@ -15,14 +18,12 @@ const types = {
  * @param {Object|undefined} presentDefinitions optional merg in attributes
  * @return {Object} attributes
  */
-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);
-    }
+export function prepareAttributesDefinitions(
+  newDefinitions,
+  presentDefinitions
+) {
+  for (const [path, def] of attributeIterator(newDefinitions)) {
+    def.type = types[def.type] || types.base;
   }
 
   return mergeAttributeDefinitions(newDefinitions, presentDefinitions);
@@ -50,4 +51,25 @@ function mergeAttributeDefinitions(dest, atts) {
   }
 
   return dest;
-}
+}
+
+/**
+ * iterate over all attributes.
+ * @param {Object} definition
+ * @param {string[]} path
+ */
+export function* attributeIterator(definition, path = []) {
+  if (definition) {
+    for (const [name, def] of Object.entries(definition)) {
+      path.push(name);
+
+      if (def.attributes) {
+        yield* attributeIterator(def.attributes, path);
+      }
+
+      yield [path, def];
+
+      path.pop();
+    }
+  }
+}

package/src/multiple.mjs

@@ -1,4 +1,5 @@
 import { setAttribute, getAttribute } from "./settergetter.mjs";
+import { attributeIterator } from "./attributes.mjs";
 
 /**
  * Copies attribute values from a source object into a destination object.
@@ -6,18 +7,10 @@ import { setAttribute, getAttribute } from "./settergetter.mjs";
  * @param {Object} source origin of the data to be copied
  * @param {Object} definitions attribute definitions to be used
  * @param {function?} cb callback to be executed for each copied value
- * @param {string?} prefix name parefix
  */
-export function setAttributes(object, source, definitions, cb, prefix) {
-  for (let [name, def] of Object.entries(definitions)) {
-    if (prefix !== undefined) {
-      name = prefix + name;
-    }
-
-    if (def.attributes) {
-      setAttributes(object, source, def.attributes, cb, name + ".");
-      continue;
-    }
+export function setAttributes(object, source, definitions, cb) {
+  for (const [path, def] of attributeIterator(definitions)) {
+    const name = path.join(".");
 
     let value = getAttribute(source, name);
 
@@ -52,12 +45,13 @@ export function setAttributes(object, source, definitions, cb, prefix) {
 export function getAttributes(object, definitions) {
   const result = {};
 
-  Object.keys(definitions).forEach(name => {
+  for (const [path, def] of attributeIterator(definitions)) {
+    const name = path.join(".");
+
     const value = getAttribute(object, name);
     if (value !== undefined) {
       result[name] = value;
     }
-  });
-
+  }
   return result;
 }

package/src/properties.mjs

@@ -0,0 +1,10 @@
+import { attributeIterator } from "./attributes.mjs";
+import { getAttribute } from "./settergetter.mjs";
+
+export function createPropertiesFromAttributes(object, attributes, values) {
+  for (const [path, def] of attributeIterator(attributes)) {
+    const name = path.join(".");
+
+    let value = getAttribute(values, name, def);
+  }
+}

package/src/settergetter.mjs

@@ -23,8 +23,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;

package/types/attributes.d.mts

@@ -5,3 +5,9 @@
  * @return {Object} attributes
  */
 export function prepareAttributesDefinitions(newDefinitions: any, presentDefinitions: any | undefined): any;
+/**
+ * iterate over all attributes.
+ * @param {Object} definition
+ * @param {string[]} path
+ */
+export function attributeIterator(definition: any, path?: string[]): any;

package/types/multiple.d.mts

@@ -4,9 +4,8 @@
  * @param {Object} source origin of the data to be copied
  * @param {Object} definitions attribute definitions to be used
  * @param {function?} cb callback to be executed for each copied value
- * @param {string?} prefix name parefix
  */
-export function setAttributes(object: any, source: any, definitions: any, cb: Function | null, prefix: string | null): void;
+export function setAttributes(object: any, source: any, definitions: any, cb: Function | null): void;
 /**
  * Retrive attribute values from an object.
  * @param {Object} object attribute value source

package/types/properties.d.mts

@@ -0,0 +1 @@
+export function createPropertiesFromAttributes(object: any, attributes: any, values: 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]