pacc 4.9.0 → 4.10.0

package/README.md

@@ -122,6 +122,7 @@ const result = getAttribute({ a: [0,{ b: 4 }]}, "a[1].b");
 *   [DOUBLE\_AMPERSAND](#double_ampersand)
 *   [BAR](#bar)
 *   [DOUBLE\_BAR](#double_bar)
+*   [EOF](#eof)
 
 ## prepareAttributesDefinitions
 
@@ -444,6 +445,8 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 ### Parameters
 
 *   `str` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `precedence`   (optional, default `0`)
+*   `type`  
 
 Returns **[Token](#token)** 
 
@@ -551,6 +554,10 @@ Type: [Token](#token)
 
 Type: [Token](#token)
 
+## EOF
+
+Type: [Token](#token)
+
 # install
 
 With [npm](http://npmjs.org) do:

package/package.json

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

package/src/expression.mjs

@@ -21,6 +21,11 @@ import {
 export function parse(context) {
   let node, token;
 
+  function error(message) {
+    const error = new Error(message);
+    throw error;
+  }
+
   const advance = () => {
     const { value, done } = context.tokens.next();
     token = done ? EOF : value;
@@ -28,10 +33,7 @@ export function parse(context) {
 
   const expect = expected => {
     if (token !== expected) {
-      const error = new Error(
-        `unexpected '${token.str}' expecting '${expected.str}'`
-      );
-      throw error;
+      error(`unexpected '${token.str}' expecting '${expected.str}'`);
     }
     advance();
   };
@@ -48,10 +50,15 @@ export function parse(context) {
           case OPEN_BRACKET: {
             const node = expression(0);
             expect(CLOSE_BRACKET);
+            if (typeof node === "number") {
+              return { path: [node] };
+            }
             return node;
           }
         }
         return { token, left, right: expression(token.precedence) };
+      case "eof":
+        error("unexpected EOF");
     }
 
     switch (typeof token) {
@@ -85,9 +92,16 @@ export function parse(context) {
             left.path.push(...right.path);
             return left;
           }
+          if (typeof left === "number") {
+            right.path.unshift(left);
+            return right;
+          }
           return { path: [left.token, right.token] };
         }
 
+        if (right.token === EOF) {
+          error("unexpected EOF");
+        }
         return {
           token,
           left,

package/src/settergetter.mjs

@@ -58,7 +58,27 @@ export function setAttribute(object, expression, value) {
  * @returns {any} value associated with the given property name
  */
 export function getAttribute(object, expression) {
-  return getAttributeAndOperator(object, expression)[0];
+  const { path } = parse({ tokens: tokens(expression) });
+
+  for (const key of path) {
+    if (object !== undefined) {
+      switch (typeof object[key]) {
+        case "function":
+          object = object[key]();
+          if (typeof object[Symbol.iterator] === "function") {
+            object = [...object];
+          }
+          break;
+        default:
+          object = object[key];
+          break;
+        case "undefined":
+          return undefined;
+      }
+    }
+  }
+
+  return object;
 }
 
 /**

package/src/tokens.mjs

@@ -53,7 +53,7 @@ export /** @type {Token} */ const DOUBLE_AMPERSAND = createToken(
 );
 export /** @type {Token} */ const BAR = createToken("|");
 export /** @type {Token} */ const DOUBLE_BAR = createToken("||", 30, "infixr");
-export /** @type {Token} */ const EOF = createToken("EOF", -1);
+export /** @type {Token} */ const EOF = createToken("EOF", -1, "eof");
 
 /**
  * Split property path into tokens