pacc 4.31.0 → 4.32.0

package/README.md

@@ -183,6 +183,7 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `default` **any?** the default value
 *   `set` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** set the value
 *   `get` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** get the value can be used to calculate default values
+*   `prepareValue` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
 *   `values` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<any>?** allowed values
 *   `externalName` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** attrubute name used by external system
 *   `env` **([Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)> | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))?** environment variable(s) used to provide the value
@@ -383,8 +384,8 @@ Extract values from environment.
 
 ### Parameters
 
-*   `attributes` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** as from process.env
 *   `env` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** as from process.env
+*   `attributes` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** as from process.env
 *   `instanceIdentifier` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** part of variable name.
 
 Returns **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [undefined](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/undefined))** undefined if no suitable environment variables have been found

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "4.31.0",
+  "version": "4.32.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -42,7 +42,7 @@
     "browser-ava": "^2.3.32",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.8",
+    "semantic-release": "^24.2.9",
     "typescript": "^5.9.2"
   },
   "engines": {

package/src/attributes.mjs

@@ -1,4 +1,4 @@
-import {getAttribute} from "./settergetter.mjs";
+import { getAttribute } from "./settergetter.mjs";
 
 export const baseTypes = new Set(["string", "number", "bigint", "boolean"]);
 
@@ -86,14 +86,13 @@ function mergeAttributeDefinitions(dest, atts) {
 export function* attributeIterator(definition, filter, path = []) {
   if (definition) {
     for (const [name, def] of Object.entries(definition)) {
+      const path2 = [...path, name];
       if (!filter || filter(name, def)) {
-        const path2 = [...path, name];
-
         yield [path2, def];
+      }
 
-        if (def.attributes) {
-          yield* attributeIterator(def.attributes, filter, path2);
-        }
+      if (def.attributes) {
+        yield* attributeIterator(def.attributes, filter, path2);
       }
     }
   }

package/src/environment.mjs

@@ -12,7 +12,7 @@ export function environmentValues(env, attributes, instanceIdentifier) {
 
   for (const [path, attribute] of attributeIterator(
     attributes,
-    (name, attribute) => attribute.env || attribute.attributes
+    (name, attribute) => attribute.env
   )) {
     const name = path.join(".");
 

package/src/multiple.mjs

@@ -18,7 +18,7 @@ export function setAttributes(object, source, definitions, cb) {
       if (def.default === undefined) {
         continue;
       } else {
-        if (getAttribute(object, name) !== undefined) {
+        if (getAttribute(object, name, def) !== undefined) {
           continue;
         }
         value = def.default;
@@ -28,7 +28,7 @@ export function setAttributes(object, source, definitions, cb) {
     if (def.set) {
       def.set.call(object, value, def);
     } else {
-      setAttribute(object, name, value);
+      setAttribute(object, name, value, def);
     }
     if (cb) {
       cb(def, name, value);
@@ -48,9 +48,32 @@ export function getAttributes(object, definitions) {
   for (const [path, def] of attributeIterator(definitions)) {
     const name = path.join(".");
 
-    const value = getAttribute(object, name);
+    const value = getAttribute(object, name, def);
     if (value !== undefined) {
-      result[name] = value;
+      setAttribute(result, name, value, def);
+    }
+  }
+  return result;
+}
+
+/**
+ * Retrive attribute values from an object.
+ * @param {Object} object attribute value source
+ * @param {Object} definitions
+ * @return {Object} values
+ */
+export function getAttributesJSON(object, definitions) {
+  const result = {};
+
+  for (const [path, def] of attributeIterator(definitions)) {
+    const name = path.join(".");
+
+    let value = getAttribute(object, name, def);
+    if (value !== undefined) {
+      if(value instanceof Set) {
+        value = [...value];
+      }
+      setAttribute(result, def.externalName ?? name, value, def);
     }
   }
   return result;

package/types/multiple.d.mts

@@ -13,3 +13,10 @@ export function setAttributes(object: any, source: any, definitions: any, cb: Fu
  * @return {Object} values
  */
 export function getAttributes(object: any, definitions: any): any;
+/**
+ * Retrive attribute values from an object.
+ * @param {Object} object attribute value source
+ * @param {Object} definitions
+ * @return {Object} values
+ */
+export function getAttributesJSON(object: any, definitions: any): any;