pacc 4.7.2 → 4.8.0

package/package.json

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

package/src/settergetter.mjs

@@ -1,4 +1,3 @@
-
 /**
  * @typedef {import('./tokens.mjs').Token} Token
  */
@@ -17,6 +16,16 @@ import {
   STAR
 } from "./tokens.mjs";
 
+function predicate(tokens, endToken) {
+  let predicate = [];
+  for (const token of tokens) {
+    if (token === endToken) break;
+    predicate.push(token);
+  }
+
+  return predicate;
+}
+
 /**
  * Set object attribute.
  * The name may be a property path like 'a.b.c'.
@@ -27,12 +36,14 @@ import {
 export function setAttribute(object, expression, value) {
   let anchor, anchorKey;
 
-  for (const token of tokens(expression)) {
+  const next = tokens(expression);
+
+  for (let token of next) {
     switch (token) {
       case DOT:
-      case OPEN_BRACKET:
-      case CLOSE_BRACKET:
         break;
+      case OPEN_BRACKET:
+        token = predicate(next, CLOSE_BRACKET)[0];
 
       default:
         if (anchor) {
@@ -40,13 +51,13 @@ export function setAttribute(object, expression, value) {
           anchor = undefined;
         }
 
-        const next = object[token];
+        const walk = object[token];
 
-        if (next === undefined || typeof next !== "object") {
+        if (walk === undefined || typeof walk !== "object") {
           anchor = object;
           anchorKey = token;
         } else {
-          object = next;
+          object = walk;
         }
     }
   }
@@ -91,7 +102,9 @@ export function getAttributeAndOperator(object, expression) {
   let predicateTokens;
   let op = EQUAL;
 
-  for (const token of tokens(expression)) {
+  const next = tokens(expression);
+
+  for (const token of next) {
     switch (token) {
       case GREATER_EQUAL:
       case LESS_EQUAL:

package/src/tokens.mjs

@@ -116,10 +116,6 @@ export function* tokens(string) {
       case '"':
       case "'":
         switch (state) {
-          case undefined:
-            value = "";
-            state = "string";
-            break;
           case "string":
             yield value;
             state = undefined;
@@ -133,8 +129,10 @@ export function* tokens(string) {
             break;
           default:
             yield lookup[state];
+          case undefined:
             value = "";
             state = "string";
+            break;
         }
         break;
       case "!":
@@ -211,9 +209,6 @@ export function* tokens(string) {
       case "{":
       case "}":
         switch (state) {
-          case undefined:
-            state = c;
-            break;
           case "string":
             value += c;
             break;
@@ -225,7 +220,9 @@ export function* tokens(string) {
             break;
           default:
             yield lookup[state];
+          case undefined:
             state = c;
+            break;
         }
         break;
       case "0":
@@ -245,10 +242,10 @@ export function* tokens(string) {
             value = c.charCodeAt(0) - 48;
             state = "number";
             break;
-          case '.':
-              state = "number-fraction";
-              value = 0;
-              divider = 10;
+          case ".":
+            state = "number-fraction";
+            value = 0;
+            divider = 10;
           case "number-fraction":
             value = value + (c.charCodeAt(0) - 48) / divider;
             divider *= 10;
@@ -266,18 +263,16 @@ export function* tokens(string) {
 
       default:
         switch (state) {
-          case undefined:
-            value = c;
-            state = "identifier";
-            break;
           case "string":
           case "identifier":
             value += c;
             break;
           default:
             yield lookup[state];
+          case undefined:
             state = "identifier";
             value = c;
+            break;
         }
     }
   }