pacc 7.2.1 → 8.0.1

package/README.md

@@ -543,6 +543,7 @@ Split property path into tokens
 ### Parameters
 
 *   `string` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `options`   (optional, default `{}`)
 
 ## setAttribute
 

package/package.json

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

package/src/common-attributes.mjs

@@ -59,6 +59,7 @@ export { default_attribute_writable as string_attribute_writable };
 
 export const string_collection_attribute = {
   ...default_attribute,
+  separator: " ",
   collection: true
 };
 

package/src/expression.mjs

@@ -71,8 +71,9 @@ function binopError(op, left, right) {
   error(`Unexpected '${op.str || op}'`);
 }
 
-export function parse(input, context = { globals }) {
-  input = tokens(input);
+export function parse(input, context = {}) {
+  const getGlobal = context?.getGlobal ?? (a => globals[a]);
+  input = tokens(input, context);
 
   let node, token, value;
 
@@ -101,12 +102,12 @@ export function parse(input, context = { globals }) {
             result = r;
           } else {
             if (result === undefined) {
-              result = context.globals?.[p];
+              result = getGlobal(p);
             } else {
               if (result instanceof Map) {
                 result = result.get(p);
               } else {
-                result = result[p] ?? context.globals?.[p];
+                result = result[p] ?? getGlobal(p);
               }
             }
           }
@@ -283,7 +284,7 @@ export function parse(input, context = { globals }) {
                 const args = node.path[1].map(a =>
                   typeof a === "object" ? a.eval(a, current) : a
                 );
-                return context.globals[node.path[0]](...args);
+                return getGlobal(node.path[0])(...args);
               };
 
               advance();

package/src/tokens.mjs

@@ -56,7 +56,7 @@ export /** @type {Token} */ const DOUBLE_BAR = createToken("||", 30, "infixr");
 export /** @type {Token} */ const IDENTIFIER = createToken("IDENTIFIER", 0);
 export /** @type {Token} */ const EOF = createToken("EOF", -1, "eof");
 
-const keywords = {
+export const keywords = {
   true: [true],
   false: [false]
 };
@@ -76,10 +76,14 @@ const esc = {
  * @param {string} string
  * @yields {Token}
  */
-export function* tokens(string) {
+export function* tokens(string, options = {}) {
+  options.keywords ||= keywords;
+  options.parseFloat ||= parseFloat;
+
   let state, value, hex, quote;
 
-  const keywordOrIdentifier = () => keywords[value] || [IDENTIFIER, value];
+  const keywordOrIdentifier = () =>
+    options.keywords[value] || [IDENTIFIER, value];
   const startString = c => {
     value = "";
     state = "string";
@@ -116,7 +120,7 @@ export function* tokens(string) {
       case " ":
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
             state = undefined;
           case undefined:
             break;
@@ -145,7 +149,7 @@ export function* tokens(string) {
       case "'":
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
           case undefined:
             startString(c);
             break;
@@ -173,7 +177,7 @@ export function* tokens(string) {
       case "|":
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -204,7 +208,7 @@ export function* tokens(string) {
       case "=":
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -222,12 +226,11 @@ export function* tokens(string) {
 
       case ".":
         if (state === "number") {
-          value += '.';
+          value += ".";
           break;
-        }
-        else if (state === "-") {
-          value = '-.';
-          state="number";
+        } else if (state === "-") {
+          value = "-.";
+          state = "number";
           break;
         }
 
@@ -246,7 +249,7 @@ export function* tokens(string) {
       case "}":
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -282,7 +285,7 @@ export function* tokens(string) {
           case "-":
             state = "number";
             value = "-" + c;
-          break;
+            break;
           case ".":
             state = "number";
             value = ".";
@@ -297,7 +300,7 @@ export function* tokens(string) {
       default:
         switch (state) {
           case "number":
-            yield [parseFloat(value)];
+            yield [options.parseFloat(value)];
           case undefined:
             state = "identifier";
             value = c;
@@ -320,7 +323,7 @@ export function* tokens(string) {
     case "string":
       throw new Error("unterminated string", { cause: string });
     case "number":
-      yield [parseFloat(value)];
+      yield [options.parseFloat(value)];
       break;
     case "identifier":
       yield keywordOrIdentifier();

package/src/types.mjs

@@ -13,7 +13,26 @@ const emptyStringIsUndefined = value =>
   typeof value === "string" && value.length === 0 ? undefined : value;
 
 export const types = {
-  string: { name: "string", primitive: true },
+  string: {
+    name: "string",
+    primitive: true,
+    toInternal: (value, attribute) => {
+      if (value !== undefined) {
+        if (attribute.collection) {
+          return value.split(attribute.separator);
+        }
+      }
+      return value;
+    },
+    toExternal: (value, attribute) => {
+      if (value !== undefined) {
+        if (attribute.collection) {
+          return (Array.isArray(value) ? value : [...value]).join(attribute.separator);
+        }
+      }
+      return value;
+    }
+  },
   number: {
     name: "number",
     primitive: true,
@@ -55,7 +74,8 @@ export const types = {
     name: "duration",
     primitive: true,
     toInternal: value => parseDuration(value),
-    toExternal: value => value === undefined ? undefined : formatDuration(value)
+    toExternal: value =>
+      value === undefined ? undefined : formatDuration(value)
   },
   duration_ms: {
     name: "duration_ms",

package/types/common-attributes.d.mts

@@ -31,6 +31,7 @@ export const default_attribute: AttributeDefinition;
  */
 export const default_attribute_writable: AttributeDefinition;
 export namespace string_collection_attribute {
+    export let separator: string;
     export let collection: boolean;
     export let type: object;
     export let isKey: boolean;

package/types/expression.d.mts

@@ -1,18 +1,5 @@
 export function binop(op: any, left: any, right: any, fallback: any): any;
-export function parse(input: any, context?: {
-    globals: {
-        in: (a: any, b: any) => boolean;
-        ceil: (x: number) => number;
-        floor: (x: number) => number;
-        abs: (x: number) => number;
-        min: (...values: number[]) => number;
-        max: (...values: number[]) => number;
-        uppercase: (a: any) => any;
-        lowercase: (a: any) => any;
-        substring: (s: any, a: any, b: any) => any;
-        length: (s: any) => any;
-    };
-}): any;
+export function parse(input: any, context?: {}): any;
 export namespace globals {
     export function _in(a: any, b: any): boolean;
     export { _in as in };

package/types/tokens.d.mts

@@ -4,7 +4,7 @@
  * @param {string} string
  * @yields {Token}
  */
-export function tokens(string: string): Generator<any, void, unknown>;
+export function tokens(string: string, options?: {}): Generator<any, void, unknown>;
 export namespace PLUS {
     let str: string;
 }
@@ -35,6 +35,12 @@ export namespace BAR { }
 export namespace DOUBLE_BAR { }
 export namespace IDENTIFIER { }
 export namespace EOF { }
+export namespace keywords {
+    let _true: boolean[];
+    export { _true as true };
+    let _false: boolean[];
+    export { _false as false };
+}
 export type Token = {
     str: string;
 };

package/types/types.d.mts

@@ -6,6 +6,8 @@ export const types: {
     string: {
         name: string;
         primitive: boolean;
+        toInternal: (value: any, attribute: any) => any;
+        toExternal: (value: any, attribute: any) => any;
     };
     number: {
         name: string;