pacc 10.3.0 → 10.4.1

package/README.md

@@ -83,6 +83,7 @@ tokens "abc" "
     *   [Properties](#properties-1)
 *   [default\_attribute](#default_attribute)
 *   [default\_attribute\_writable](#default_attribute_writable)
+*   [default\_collection\_attribute](#default_collection_attribute)
 *   [default\_collection\_attribute\_writable](#default_collection_attribute_writable)
 *   [string\_attribute](#string_attribute)
 *   [string\_attribute\_writable](#string_attribute_writable)
@@ -299,6 +300,7 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `get` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** get the value can be used to calculate default values
 *   `toInternal` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
 *   `toExternal` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
+*   `asMapEntry` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** deliver key and value for Map insertion
 *   `externalName` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** attribute name used by external system
 *   `values` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)\<any>?** allowed values
 *   `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
@@ -315,6 +317,10 @@ Type: [AttributeDefinition](#attributedefinition)
 
 Type: [AttributeDefinition](#attributedefinition)
 
+## default\_collection\_attribute
+
+Type: [AttributeDefinition](#attributedefinition)
+
 ## default\_collection\_attribute\_writable
 
 Type: [AttributeDefinition](#attributedefinition)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pacc",
-  "version": "10.3.0",
+  "version": "10.4.1",
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
-  "packageManager": "npm@11.16.0",
+  "packageManager": "npm@11.18.0",
   "types": "./types/module.d.mts",
   "exports": {
     ".": {
@@ -43,9 +43,9 @@
   },
   "devDependencies": {
     "@mitata/counters": "^0.0.8",
-    "aggregated-map": "^1.0.6",
+    "aggregated-map": "^1.0.7",
     "ava": "^8.0.1",
-    "browser-ava": "^2.3.63",
+    "browser-ava": "^2.3.65",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
     "mitata": "^1.0.34",
@@ -58,7 +58,7 @@
     }
   },
   "engines": {
-    "node": ">=26.3.1"
+    "node": ">=26.4.0"
   },
   "repository": {
     "type": "git",

package/src/common-attributes.mjs

@@ -21,6 +21,7 @@ import { types } from "./types.mjs";
  * @property {Function} [get] get the value can be used to calculate default values
  * @property {Function} [toInternal]
  * @property {Function} [toExternal]
+ * @property {Function} [asMapEntry] deliver key and value for Map insertion
  * @property {string} [externalName] attribute name used by external system
  * @property {Set<any>} [values] allowed values
  * @property {string[]|string} [env] environment variable(s) used to provide the value
@@ -51,6 +52,14 @@ export const default_attribute_writable = {
   writable: true
 };
 
+/**
+ * @type {AttributeDefinition}
+ */
+export const default_collection_attribute = {
+  ...default_attribute,
+  collection: true
+};
+
 /**
  * @type {AttributeDefinition}
  */

package/src/expand.mjs

@@ -2,6 +2,8 @@ import { parse } from "./parser.mjs";
 
 const maxNestingLevel = 8;
 
+class _Dummy {}
+
 /**
  * Default expand context
  * using '§{' and '}' as lead in/out
@@ -9,7 +11,8 @@ const maxNestingLevel = 8;
 export const expandContextDefault = {
   root: {},
   leadIn: "${",
-  leadOut: "}"
+  leadOut: "}",
+  stopClass: _Dummy
 };
 
 /**
@@ -26,7 +29,7 @@ export const expandContextDoubbleCurly = {
  * @param {any} object
  * @param {Object} context
  * @param {any} [context.root] actual replacement values
- * @param {function} [context.stopClass]
+ * @param {function} [context.stopClass] do not expand instancif
  * @param {string} [context.leadIn] starting separator
  * @param {string} [context.leadOut] ending separator
  * @returns {any|Promise<any>}
@@ -140,6 +143,7 @@ export function expand(object, context) {
 
     if (typeof object.entries === "function") {
       const copy = new object.constructor[Symbol.species]();
+
       for (const [key, value] of object.entries()) {
         const path2 = [
           ...path,
@@ -155,11 +159,11 @@ export function expand(object, context) {
       return copy;
     }
 
-    if (context.stopClass && object instanceof context.stopClass) {
+    if (object instanceof context.stopClass) {
       return object;
     }
 
-    if(Object.prototype.toString.call(object) !== '[object Object]') {
+    if (Object.prototype.toString.call(object) !== "[object Object]") {
       return object;
     }
 

package/src/extract.mjs

@@ -19,19 +19,18 @@ export function extract(object, type = object.constructor) {
           result[name] = value;
         }
       } else {
-        const key = value.constructor.key;
-
         if (attribute.backpointer) {
           if (attribute.collection) {
             if ((value.size ?? value.length) > 0) {
               result[name] = Object.fromEntries(
-                [...value.values()].map(v => [v[key], v])
+                [...value.values()].map(v => [v[v.constructor.key], extract(v)])
               );
             }
           } else {
             result[name] = extract(value);
           }
         } else {
+          const key = value.constructor.key;
           result[name] = { [key]: value[key], type: value.constructor.name };
         }
       }

package/types/common-attributes.d.mts

@@ -19,6 +19,7 @@
  * @property {Function} [get] get the value can be used to calculate default values
  * @property {Function} [toInternal]
  * @property {Function} [toExternal]
+ * @property {Function} [asMapEntry] deliver key and value for Map insertion
  * @property {string} [externalName] attribute name used by external system
  * @property {Set<any>} [values] allowed values
  * @property {string[]|string} [env] environment variable(s) used to provide the value
@@ -34,6 +35,10 @@ export const default_attribute: AttributeDefinition;
  * @type {AttributeDefinition}
  */
 export const default_attribute_writable: AttributeDefinition;
+/**
+ * @type {AttributeDefinition}
+ */
+export const default_collection_attribute: AttributeDefinition;
 /**
  * @type {AttributeDefinition}
  */
@@ -144,6 +149,7 @@ export namespace yesno_attribute_writable {
     export let get: Function | undefined;
     export let toInternal: Function | undefined;
     export let toExternal: Function | undefined;
+    export let asMapEntry: Function | undefined;
     export let externalName: string | undefined;
     export let values: Set<any> | undefined;
     export let env: string | string[] | undefined;
@@ -339,6 +345,10 @@ export type AttributeDefinition = {
     get?: Function | undefined;
     toInternal?: Function | undefined;
     toExternal?: Function | undefined;
+    /**
+     * deliver key and value for Map insertion
+     */
+    asMapEntry?: Function | undefined;
     /**
      * attribute name used by external system
      */

package/types/expand.d.mts

@@ -3,7 +3,7 @@
  * @param {any} object
  * @param {Object} context
  * @param {any} [context.root] actual replacement values
- * @param {function} [context.stopClass]
+ * @param {function} [context.stopClass] do not expand instancif
  * @param {string} [context.leadIn] starting separator
  * @param {string} [context.leadOut] ending separator
  * @returns {any|Promise<any>}
@@ -15,9 +15,10 @@ export function expand(object: any, context: {
     leadOut?: string | undefined;
 }): any | Promise<any>;
 export namespace expandContextDefault {
-    let root: {};
-    let leadIn: string;
-    let leadOut: string;
+    export let root: {};
+    export let leadIn: string;
+    export let leadOut: string;
+    export { _Dummy as stopClass };
 }
 export namespace expandContextDoubbleCurly {
     let leadIn_1: string;
@@ -25,3 +26,6 @@ export namespace expandContextDoubbleCurly {
     let leadOut_1: string;
     export { leadOut_1 as leadOut };
 }
+declare class _Dummy {
+}
+export {};