pacc 4.9.1 → 4.11.0

package/package.json

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

package/src/attributes.mjs

@@ -15,12 +15,14 @@ const types = {
  * @param {Object|undefined} presentDefinitions optional merg in attributes
  * @return {Object} attributes
  */
-export function prepareAttributesDefinitions(newDefinitions, presentDefinitions) {
+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 {
+    } else {
       prepareAttributesDefinitions(d.attributes);
     }
   }
@@ -50,4 +52,23 @@ function mergeAttributeDefinitions(dest, atts) {
   }
 
   return dest;
-}
+}
+
+/**
+ * iterate over all attributes.
+ * @param {Object} definition
+ * @param {string[]} path
+ */
+export function* attributeIterator(definition, path = []) {
+  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/expression.mjs

@@ -50,6 +50,9 @@ export function parse(context) {
           case OPEN_BRACKET: {
             const node = expression(0);
             expect(CLOSE_BRACKET);
+            if (typeof node === "number") {
+              return { path: [node] };
+            }
             return node;
           }
         }
@@ -97,7 +100,7 @@ export function parse(context) {
         }
 
         if (right.token === EOF) {
-          error("unexpeced EOF");
+          error("unexpected EOF");
         }
         return {
           token,

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/settergetter.mjs

@@ -58,7 +58,27 @@ export function setAttribute(object, expression, value) {
  * @returns {any} value associated with the given property name
  */
 export function getAttribute(object, expression) {
-  return getAttributeAndOperator(object, expression)[0];
+  const { path } = parse({ tokens: tokens(expression) });
+
+  for (const key of path) {
+    if (object !== undefined) {
+      switch (typeof object[key]) {
+        case "function":
+          object = object[key]();
+          if (typeof object[Symbol.iterator] === "function") {
+            object = [...object];
+          }
+          break;
+        default:
+          object = object[key];
+          break;
+        case "undefined":
+          return undefined;
+      }
+    }
+  }
+
+  return object;
 }
 
 /**

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