pacc 6.9.0 → 7.0.0

package/README.md

@@ -90,34 +90,38 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [expand](#expand)
     *   [Parameters](#parameters-5)
 *   [promises](#promises)
-*   [filter](#filter)
+*   [error](#error)
     *   [Parameters](#parameters-6)
-*   [setAttributes](#setattributes)
+*   [binopError](#binoperror)
     *   [Parameters](#parameters-7)
-*   [getAttributes](#getattributes)
+*   [filter](#filter)
     *   [Parameters](#parameters-8)
-*   [getAttributesJSON](#getattributesjson)
+*   [setAttributes](#setattributes)
     *   [Parameters](#parameters-9)
+*   [getAttributes](#getattributes)
+    *   [Parameters](#parameters-10)
+*   [getAttributesJSON](#getattributesjson)
+    *   [Parameters](#parameters-11)
 *   [tokens](#tokens)
 *   [tokens](#tokens-1)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-12)
 *   [setAttribute](#setattribute)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-13)
 *   [getAttribute](#getattribute)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-14)
 *   [getAttributeAndOperator](#getattributeandoperator)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-15)
 *   [parseDuration](#parseduration)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-16)
 *   [formatDuration](#formatduration)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-17)
 *   [formatDurationISO](#formatdurationiso)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-18)
 *   [lookup](#lookup)
 *   [Token](#token)
     *   [Properties](#properties-1)
 *   [createToken](#createtoken)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-19)
 *   [PLUS](#plus)
 *   [MINUS](#minus)
 *   [STAR](#star)
@@ -149,7 +153,7 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [Type](#type)
     *   [Properties](#properties-2)
 *   [raiseOnUnknownType](#raiseonunknowntype)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-20)
 
 ## prepareAttributesDefinitions
 
@@ -461,6 +465,20 @@ Returns **any** 
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<any>>
 
+## error
+
+### Parameters
+
+*   `message` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
+
+## binopError
+
+### Parameters
+
+*   `op` **[Token](#token)**&#x20;
+*   `left` **AST**&#x20;
+*   `right` **AST**&#x20;
+
 ## filter
 
 Generate filter function.

package/package.json

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

package/src/attributes.mjs

@@ -70,11 +70,23 @@ export function* writableAttributeIterator(definition) {
   yield* attributeIterator(definition, filterWritable);
 }
 
-export function prepareValue(value, attribute) {
+export function toInternal(value, attribute) {
   if (attribute) {
-    const prepareValue = attribute.prepareValue ?? attribute.type?.prepareValue;
-    if (prepareValue) {
-      return prepareValue(value, attribute);
+    const toInternal = attribute.toInternal ?? attribute.type?.toInternal;
+    if (toInternal) {
+      return toInternal(value, attribute);
+    }
+  }
+  return value;
+}
+
+export { toInternal as prepareValue }; // DEPRECATED
+
+export function toExternal(value, attribute) {
+  if (attribute) {
+    const toExternal = attribute.toExternal ?? attribute.type?.toExternal;
+    if (toExternal) {
+      return toExternal(value, attribute);
     }
   }
   return value;

package/src/common-attributes.mjs

@@ -16,7 +16,8 @@ import { types } from "./types.mjs";
  * @property {any} [default] the default value
  * @property {Function} [set] set the value
  * @property {Function} [get] get the value can be used to calculate default values
- * @property {Function} [prepareValue]
+ * @property {Function} [toInternal]
+ * @property {Function} [toExternal]
  * @property {Set<any>} [values] allowed values
  * @property {string} [externalName] attribute name used by external system
  * @property {string[]|string} [env] environment variable(s) used to provide the value
@@ -178,11 +179,21 @@ export { boolean_attribute_writable_true as active_attribute };
 /**
  * @type {AttributeDefinition}
  */
-export const empty_attribute = {
-  ...default_attribute,
-  type: types.boolean
+export const yesno_attribute = {
+  ...boolean_attribute,
+  type: types.yesno
+};
+
+export const yesno_attribute_writable = {
+  ...yesno_attribute,
+  writable: true
 };
 
+/**
+ * @type {AttributeDefinition}
+ */
+export { boolean_attribute as empty_attribute };
+
 /**
  * @type {AttributeDefinition}
  */

package/src/expression.mjs

@@ -53,19 +53,39 @@ export function binop(op, left, right, fallback) {
   return fallback(op, left, right);
 }
 
+/**
+ *
+ * @param {string} message
+ */
+function error(message) {
+  const error = new Error(message);
+  throw error;
+}
+/**
+ *
+ * @param {Token} op
+ * @param {AST} left
+ * @param {AST} right
+ */
+function binopError(op, left, right) {
+  error(`Unexpected '${op.str || op}'`);
+}
+
 export function parse(input, context = { globals }) {
   input = tokens(input);
 
   let node, token, value;
 
-  function error(message) {
-    const error = new Error(message);
-    throw error;
-  }
-  function binopError(op, left, right) {
-    error(`Unexpected '${op.str || op}'`);
-  }
-
+  const predicateIteratorEval = (node, current) => {
+    if (current instanceof Set) {
+      current = [...current];
+    } else if (current instanceof Map) {
+      current = [...current.values()];
+    }
+    return current
+      .filter(item => node.predicate(node, item))
+      .map(item => node.right.eval(node.right, item));
+  };
   const pathEval = (node, current) => {
     let result = current;
 
@@ -207,15 +227,26 @@ export function parse(input, context = { globals }) {
           }
         }
         if (last === DOT) {
-          if (left.path) {
-            left.path.push(...right.path);
-            return left;
-          }
           switch (typeof left) {
             case "number":
               right.path.unshift(left);
               return right;
           }
+
+          if (left.path) {
+            left.path.push(...right.path);
+            return left;
+          }
+
+          if (left.eval) {
+            return {
+              eval: predicateIteratorEval,
+              predicate: left.eval,
+              right
+              // path: right.path
+            };
+          }
+
           return { eval: pathEval, path: [left.token, right.token] };
         }
 

package/src/properties.mjs

@@ -1,6 +1,6 @@
 import { attributeIterator } from "./attributes.mjs";
 import { getAttribute, setAttribute } from "./settergetter.mjs";
-import { prepareValue } from "./attributes.mjs";
+import { toInternal } from "./attributes.mjs";
 
 function findPropertyDescriptor(obj, name) {
   let descriptor;
@@ -29,7 +29,7 @@ export function definePropertiesFromAttributes(
       attribute.default;
 
     if (value !== undefined) {
-      value = prepareValue(value, attribute);
+      value = toInternal(value, attribute);
 
       if (path.length === 1) {
         const property = properties[name];

package/src/settergetter.mjs

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

package/src/types.mjs

@@ -6,7 +6,7 @@ import { parseBytes } from "./bytes.mjs";
  * @typedef {Object} Type
  * @property {string} name
  * @property {boolean} [primitive]
- * @property {Function} [prepareValue]
+ * @property {Function} [toInternal]
  */
 
 const emptyStringIsUndefined = value =>
@@ -17,45 +17,54 @@ export const types = {
   number: {
     name: "number",
     primitive: true,
-    prepareValue: value =>
+    toInternal: value =>
       typeof value === "string" ? parseFloat(value) : value
   },
   boolean: {
     name: "boolean",
     primitive: true,
-    prepareValue: value =>
+    toInternal: value =>
       !value || value === "0" || value === "false" || value === "no"
         ? false
         : true
   },
+  yesno: {
+    name: "yesno",
+    primitive: true,
+    toInternal: value =>
+      !value || value === "0" || value === "false" || value === "no"
+        ? false
+        : true,
+    toExternal: value => value ? "yes" : "no"
+  },
   integer: {
     name: "integer",
     primitive: true,
-    prepareValue: value => (typeof value === "string" ? parseInt(value) : value)
+    toInternal: value => (typeof value === "string" ? parseInt(value) : value)
   },
   "unsigned-integer": {
     name: "unsigned-integer",
     primitive: true,
-    prepareValue: value => (typeof value === "string" ? parseInt(value) : value)
+    toInternal: value => (typeof value === "string" ? parseInt(value) : value)
   },
   duration: {
     name: "duration",
     primitive: true,
-    prepareValue: value => parseDuration(value)
+    toInternal: value => parseDuration(value)
   },
   duration_ms: {
     name: "duration_ms",
     primitive: true,
-    prepareValue: value => parseDuration(value) * 1000
+    toInternal: value => parseDuration(value) * 1000
   },
   byte_size: {
     name: "byte_size",
     primitive: true,
-    prepareValue: parseBytes
+    toInternal: parseBytes
   },
   url: {
     name: "url",
-    prepareValue: emptyStringIsUndefined,
+    toInternal: emptyStringIsUndefined,
     primitive: true
   },
   object: { name: "object", primitive: false }

package/types/attributes.d.mts

@@ -14,6 +14,8 @@ export function prepareAttributesDefinitions(newDefinitions: any, presentDefinit
  */
 export function attributeIterator(definition: any, filter?: Function, path?: string[]): Iterable<[string[], object]>;
 export function writableAttributeIterator(definition: any): Generator<[string[], any], void, any>;
-export function prepareValue(value: any, attribute: any): any;
+export function toInternal(value: any, attribute: any): any;
+export function toExternal(value: any, attribute: any): any;
 export function mandatoryAttributesPresent(object: any, attributes: any): boolean;
 export function filterWritable(name: any, attribute: any): any;
+export { toInternal as prepareValue };

package/types/common-attributes.d.mts

@@ -14,7 +14,8 @@
  * @property {any} [default] the default value
  * @property {Function} [set] set the value
  * @property {Function} [get] get the value can be used to calculate default values
- * @property {Function} [prepareValue]
+ * @property {Function} [toInternal]
+ * @property {Function} [toExternal]
  * @property {Set<any>} [values] allowed values
  * @property {string} [externalName] attribute name used by external system
  * @property {string[]|string} [env] environment variable(s) used to provide the value
@@ -45,7 +46,8 @@ export namespace string_collection_attribute {
     export { _default as default };
     export let set: Function;
     export let get: Function;
-    export let prepareValue: Function;
+    export let toInternal: Function;
+    export let toExternal: Function;
     export let values: Set<any>;
     export let externalName: string;
     export let env: string[] | string;
@@ -103,7 +105,13 @@ export const boolean_attribute_false: AttributeDefinition;
 /**
  * @type {AttributeDefinition}
  */
-export const empty_attribute: AttributeDefinition;
+export const yesno_attribute: AttributeDefinition;
+export namespace yesno_attribute_writable {
+    let writable_1: boolean;
+    export { writable_1 as writable };
+    let collection_1: boolean;
+    export { collection_1 as collection };
+}
 /**
  * @type {AttributeDefinition}
  */
@@ -140,11 +148,9 @@ export namespace bytes_size_attribute {
     let type_1: {
         name: string;
         primitive: boolean;
-        prepareValue: typeof import("./bytes.mjs").parseBytes;
+        toInternal: typeof import("./bytes.mjs").parseBytes;
     };
     export { type_1 as type };
-    let collection_1: boolean;
-    export { collection_1 as collection };
 }
 /**
  * @type {AttributeDefinition}
@@ -240,7 +246,8 @@ export type AttributeDefinition = {
      * get the value can be used to calculate default values
      */
     get?: Function;
-    prepareValue?: Function;
+    toInternal?: Function;
+    toExternal?: Function;
     /**
      * allowed values
      */
@@ -258,4 +265,4 @@ export type AttributeDefinition = {
      */
     additionalValues?: object;
 };
-export { default_attribute as string_attribute, default_attribute_writable as string_attribute_writable, description_attribute as description_attribute_writable, default_attribute as type_attribute, default_attribute_writable as state_attribute_writable, boolean_attribute_writable_true as active_attribute, secret_attribute as username_attribute, secret_attribute as password_attribute, secret_attribute as token_attribute, secret_attribute as certificate_attribute, integer_attribute as count_attribute, integer_attribute_writable as count_attribute_writable, integer_attribute as size_attribute, default_attribute_writable as body_attribute_writable };
+export { default_attribute as string_attribute, default_attribute_writable as string_attribute_writable, description_attribute as description_attribute_writable, default_attribute as type_attribute, default_attribute_writable as state_attribute_writable, boolean_attribute_writable_true as active_attribute, boolean_attribute as empty_attribute, secret_attribute as username_attribute, secret_attribute as password_attribute, secret_attribute as token_attribute, secret_attribute as certificate_attribute, integer_attribute as count_attribute, integer_attribute_writable as count_attribute_writable, integer_attribute as size_attribute, default_attribute_writable as body_attribute_writable };

package/types/types.d.mts

@@ -10,41 +10,47 @@ export const types: {
     number: {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => any;
+        toInternal: (value: any) => any;
     };
     boolean: {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => boolean;
+        toInternal: (value: any) => boolean;
+    };
+    yesno: {
+        name: string;
+        primitive: boolean;
+        toInternal: (value: any) => boolean;
+        toExternal: (value: any) => "no" | "yes";
     };
     integer: {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => any;
+        toInternal: (value: any) => any;
     };
     "unsigned-integer": {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => any;
+        toInternal: (value: any) => any;
     };
     duration: {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => number;
+        toInternal: (value: any) => number;
     };
     duration_ms: {
         name: string;
         primitive: boolean;
-        prepareValue: (value: any) => number;
+        toInternal: (value: any) => number;
     };
     byte_size: {
         name: string;
         primitive: boolean;
-        prepareValue: typeof parseBytes;
+        toInternal: typeof parseBytes;
     };
     url: {
         name: string;
-        prepareValue: (value: any) => any;
+        toInternal: (value: any) => any;
         primitive: boolean;
     };
     object: {
@@ -55,6 +61,6 @@ export const types: {
 export type Type = {
     name: string;
     primitive?: boolean;
-    prepareValue?: Function;
+    toInternal?: Function;
 };
 import { parseBytes } from "./bytes.mjs";