pacc 4.21.1 → 4.23.0

package/package.json

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

package/src/attributes.mjs

@@ -9,19 +9,19 @@ export const types = {
   number: {
     name: "number",
     extends: "base",
-    convertValue: (value, attribute) =>
+    prepareValue: (value, attribute) =>
       typeof value === "string" ? parseFloat(value) : value
   },
   boolean: {
     name: "boolean",
     extends: "base",
-    convertValue: (value, attribute) => (!value || value === "0" ? false : true)
+    prepareValue: (value, attribute) => (!value || value === "0" ? false : true)
   },
 
   integer: {
     name: "integer",
     extends: "base",
-    convertValue: (value, attribute) =>
+    prepareValue: (value, attribute) =>
       typeof value === "string" ? parseInt(value) : value
   },
   "unsigned-integer": { name: "unsigned-integer", extends: "integer" },
@@ -91,9 +91,9 @@ export function* attributeIterator(definition, path = []) {
   }
 }
 
-export function convertValue(value, attribute) {
-  if (attribute?.type?.convertValue) {
-    return attribute.type.convertValue(value, attribute);
+export function prepareValue(value, attribute) {
+  if (attribute?.type?.prepareValue) {
+    return attribute.type.prepareValue(value, attribute);
   }
   return value;
 }

package/src/expand.mjs

@@ -116,6 +116,10 @@ export function expand(object, context) {
       return array;
     }
 
+    if(object instanceof context.stopClass) {
+      return object;
+    }
+
     let newObject = {};
 
     for (let [key, value] of Object.entries(object)) {

package/src/properties.mjs

@@ -1,6 +1,6 @@
 import { attributeIterator } from "./attributes.mjs";
 import { getAttribute, setAttribute } from "./settergetter.mjs";
-import { convertValue } from "./attributes.mjs";
+import { prepareValue } from "./attributes.mjs";
 
 export function definePropertiesFromAttributes(
   object,
@@ -22,7 +22,7 @@ export function definePropertiesFromAttributes(
           name
         );
 
-        value = convertValue(value, attribute);
+        value = prepareValue(value, attribute);
 
         const property = properties[name];
 

package/src/settergetter.mjs

@@ -16,7 +16,7 @@ import {
   STAR
 } from "./tokens.mjs";
 import { parse } from "./expression.mjs";
-import { convertValue } from "./attributes.mjs";
+import { prepareValue } from "./attributes.mjs";
 
 /**
  * Set object attribute.
@@ -48,7 +48,7 @@ export function setAttribute(object, expression, value, definition) {
   }
 
   if (anchor) {
-    anchor[anchorKey] = convertValue(value, definition);
+    anchor[anchorKey] = prepareValue(value, definition);
   }
 }
 

package/types/attributes.d.mts

@@ -11,7 +11,7 @@ export function prepareAttributesDefinitions(newDefinitions: any, presentDefinit
  * @param {string[]} path
  */
 export function attributeIterator(definition: any, path?: string[]): any;
-export function convertValue(value: any, attribute: any): any;
+export function prepareValue(value: any, attribute: any): any;
 export const baseTypes: Set<string>;
 export const types: {
     base: {
@@ -24,17 +24,17 @@ export const types: {
     number: {
         name: string;
         extends: string;
-        convertValue: (value: any, attribute: any) => any;
+        prepareValue: (value: any, attribute: any) => any;
     };
     boolean: {
         name: string;
         extends: string;
-        convertValue: (value: any, attribute: any) => boolean;
+        prepareValue: (value: any, attribute: any) => boolean;
     };
     integer: {
         name: string;
         extends: string;
-        convertValue: (value: any, attribute: any) => any;
+        prepareValue: (value: any, attribute: any) => any;
     };
     "unsigned-integer": {
         name: string;