pacc 8.10.0 → 8.11.1

package/README.md

@@ -32,16 +32,14 @@ const result = expand("${a + 1}",{ root: { a: 2 }});
 
 *   [AST](#ast)
     *   [Properties](#properties)
-*   [binopError](#binoperror)
-    *   [Parameters](#parameters)
 *   [prepareAttributesDefinitions](#prepareattributesdefinitions)
-    *   [Parameters](#parameters-1)
+    *   [Parameters](#parameters)
 *   [mergeAttributeDefinitions](#mergeattributedefinitions)
-    *   [Parameters](#parameters-2)
+    *   [Parameters](#parameters-1)
 *   [attributeIterator](#attributeiterator)
-    *   [Parameters](#parameters-3)
+    *   [Parameters](#parameters-2)
 *   [parseBytes](#parsebytes)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-3)
 *   [AttributeDefinition](#attributedefinition)
     *   [Properties](#properties-1)
 *   [default\_attribute](#default_attribute)
@@ -99,40 +97,40 @@ const result = expand("${a + 1}",{ root: { a: 2 }});
 *   [timeout\_attribute](#timeout_attribute)
 *   [language\_attribute](#language_attribute)
 *   [environmentValues](#environmentvalues)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-4)
 *   [expandContextDefault](#expandcontextdefault)
 *   [expandContextDoubbleCurly](#expandcontextdoubblecurly)
 *   [expand](#expand)
-    *   [Parameters](#parameters-6)
+    *   [Parameters](#parameters-5)
 *   [promises](#promises)
 *   [filter](#filter)
-    *   [Parameters](#parameters-7)
+    *   [Parameters](#parameters-6)
 *   [setAttributes](#setattributes)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-7)
 *   [getAttributes](#getattributes)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-8)
 *   [getAttributesJSON](#getattributesjson)
-    *   [Parameters](#parameters-10)
+    *   [Parameters](#parameters-9)
 *   [tokens](#tokens)
 *   [tokens](#tokens-1)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-10)
 *   [setAttribute](#setattribute)
-    *   [Parameters](#parameters-12)
+    *   [Parameters](#parameters-11)
 *   [getAttribute](#getattribute)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-12)
 *   [getAttributeAndOperator](#getattributeandoperator)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-13)
 *   [parseDuration](#parseduration)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-14)
 *   [formatDuration](#formatduration)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [formatDurationISO](#formatdurationiso)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-16)
 *   [lookup](#lookup)
 *   [Token](#token)
     *   [Properties](#properties-2)
 *   [createToken](#createtoken)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-17)
 *   [PLUS](#plus)
 *   [MINUS](#minus)
 *   [STAR](#star)
@@ -160,11 +158,14 @@ const result = expand("${a + 1}",{ root: { a: 2 }});
 *   [BAR](#bar)
 *   [DOUBLE\_BAR](#double_bar)
 *   [IDENTIFIER](#identifier)
+*   [STRING](#string)
+*   [NUMBER](#number)
+*   [BOOLEAN](#boolean)
 *   [EOF](#eof)
 *   [Type](#type)
     *   [Properties](#properties-3)
 *   [raiseOnUnknownType](#raiseonunknowntype)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
 
 ## AST
 
@@ -174,14 +175,6 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 *   `eval` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
 
-## binopError
-
-### Parameters
-
-*   `token` **[Token](#token)** 
-*   `left` **[AST](#ast)** 
-*   `right` **[AST](#ast)** 
-
 ## prepareAttributesDefinitions
 
 Create attributes from its definition.
@@ -661,7 +654,8 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `str` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 *   `precedence` **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?**  (optional, default `0`)
 *   `type` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** 
-*   `led` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?** 
+*   `led` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?**  (optional, default `()=>{}`)
+*   `nud`   (optional, default `()=>{}`)
 
 Returns **[Token](#token)** 
 
@@ -773,6 +767,18 @@ Type: [Token](#token)
 
 Type: [Token](#token)
 
+## STRING
+
+Type: [Token](#token)
+
+## NUMBER
+
+Type: [Token](#token)
+
+## BOOLEAN
+
+Type: [Token](#token)
+
 ## EOF
 
 Type: [Token](#token)

package/package.json

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

package/src/ast.mjs

@@ -1,24 +1,9 @@
-import {
-  DOUBLE_BAR,
-  DOUBLE_AMPERSAND,
-  EQUAL,
-  NOT_EQUAL,
-  LESS,
-  LESS_EQUAL,
-  GREATER,
-  GREATER_EQUAL,
-  STAR,
-  DIVIDE,
-  PLUS,
-  MINUS
-} from "./tokens.mjs";
 
 /**
  * @typedef {Object} AST
  * @property {Function} [eval]
  */
 
-
 export function pathEval(node, current, context) {
   let collection = false;
   let first = true;

package/src/settergetter.mjs

@@ -14,7 +14,10 @@ import {
   GREATER,
   GREATER_EQUAL,
   STAR,
-  IDENTIFIER
+  IDENTIFIER,
+  STRING,
+  NUMBER,
+  BOOLEAN
 } from "./tokens.mjs";
 import { parseOnly } from "./expression.mjs";
 import { toInternal } from "./attributes.mjs";
@@ -146,6 +149,9 @@ export function getAttributeAndOperator(object, expression) {
         predicateTokens.push(token[0]);
         break;
 
+      case STRING:
+      case NUMBER:
+      case BOOLEAN:
       case IDENTIFIER:
         if (object !== undefined) {
           switch (typeof object[token[1]]) {
@@ -163,22 +169,6 @@ export function getAttributeAndOperator(object, expression) {
           }
         }
         break;
-      default:
-        if (object !== undefined) {
-          switch (typeof object[token[0]]) {
-            case "function":
-              object = object[token[0]]();
-              if (typeof object[Symbol.iterator] === "function") {
-                object = [...object];
-              }
-              break;
-            default:
-              object = object[token[0]];
-              break;
-            case "undefined":
-              return [undefined, op];
-          }
-        }
     }
   }
 

package/src/tokens.mjs

@@ -10,8 +10,6 @@ const lookup = {};
  * @property {string} str
  */
 
-function infix() {}
-
 /**
  *
  * @param {string} str
@@ -94,6 +92,9 @@ export /** @type {Token} */ const MINUS = createBinopToken(
   "infix",
   (left, right) => left - right
 );
+
+MINUS.nud = (parser) => - parser.value;
+
 export /** @type {Token} */ const STAR = createBinopToken(
   "*",
   60,
@@ -257,6 +258,29 @@ export /** @type {Token} */ const IDENTIFIER = createToken(
   }
 );
 
+export /** @type {Token} */ const STRING = createToken(
+  "STRING",
+  0,
+  undefined,
+  undefined,
+  parser => parser.value
+);
+
+export /** @type {Token} */ const NUMBER = createToken(
+  "NUMBER",
+  0,
+  undefined,
+  undefined,
+  parser => parser.value
+);
+export /** @type {Token} */ const BOOLEAN = createToken(
+  "BOOLEAN",
+  0,
+  undefined,
+  undefined,
+  parser => parser.value
+);
+
 export /** @type {Token} */ const EOF = createToken(
   "EOF",
   -1,
@@ -268,8 +292,8 @@ export /** @type {Token} */ const EOF = createToken(
 );
 
 export const keywords = {
-  true: [true],
-  false: [false]
+  true: [BOOLEAN, true],
+  false: [BOOLEAN, false]
 };
 
 const esc = {
@@ -331,7 +355,7 @@ export function* tokens(string, options = {}) {
       case " ":
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER, options.parseFloat(value)];
             state = undefined;
           case undefined:
             break;
@@ -360,13 +384,13 @@ export function* tokens(string, options = {}) {
       case "'":
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER,options.parseFloat(value)];
           case undefined:
             startString(c);
             break;
           case "string":
             if (c === quote) {
-              yield [value];
+              yield [STRING, value];
               state = undefined;
             } else {
               value += c;
@@ -388,7 +412,7 @@ export function* tokens(string, options = {}) {
       case "|":
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER, options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -419,7 +443,7 @@ export function* tokens(string, options = {}) {
       case "=":
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER, options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -460,7 +484,7 @@ export function* tokens(string, options = {}) {
       case "}":
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER, options.parseFloat(value)];
           case undefined:
             state = c;
             break;
@@ -511,7 +535,7 @@ export function* tokens(string, options = {}) {
       default:
         switch (state) {
           case "number":
-            yield [options.parseFloat(value)];
+            yield [NUMBER, options.parseFloat(value)];
           case undefined:
             state = "identifier";
             value = c;
@@ -534,7 +558,7 @@ export function* tokens(string, options = {}) {
     case "string":
       throw new Error("unterminated string", { cause: string });
     case "number":
-      yield [options.parseFloat(value)];
+      yield [NUMBER, options.parseFloat(value)];
       break;
     case "identifier":
       yield keywordOrIdentifier();

package/types/tokens.d.mts

@@ -8,7 +8,9 @@ export function tokens(string: string, options?: {}): Generator<any, void, unkno
 export namespace PLUS {
     let str: string;
 }
-export namespace MINUS { }
+export namespace MINUS {
+    function nud(parser: any): number;
+}
 export namespace STAR { }
 export namespace DIVIDE { }
 export namespace NOT { }
@@ -34,11 +36,14 @@ export namespace DOUBLE_AMPERSAND { }
 export namespace BAR { }
 export namespace DOUBLE_BAR { }
 export namespace IDENTIFIER { }
+export namespace STRING { }
+export namespace NUMBER { }
+export namespace BOOLEAN { }
 export namespace EOF { }
 export namespace keywords {
-    let _true: boolean[];
+    let _true: (boolean | Token)[];
     export { _true as true };
-    let _false: boolean[];
+    let _false: (boolean | Token)[];
     export { _false as false };
 }
 export type Token = {