pacc 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "publishConfig": {
     "access": "public"
   },

package/src/attribute.mjs

@@ -36,8 +36,7 @@ export * from "./tokens.mjs";
  * @param {any} value
  */
 export function setAttribute(object, expression, value) {
-  let lastObject = object;
-  let lastKey;
+  let anchor, anchorKey;
 
   for (const token of tokens(expression)) {
     switch (token) {
@@ -47,19 +46,32 @@ export function setAttribute(object, expression, value) {
         break;
 
       default:
-        if (object[token] === undefined || typeof object[token] !== "object") {
-          object[token] = {};
+        if (anchor) {
+          switch (typeof token) {
+            case "number":
+              object = [];
+              break;
+            case "string":
+              object = {};
+              break;
+          }
+          anchor[anchorKey] = object;
+          anchor = undefined;
         }
 
-        lastObject = object;
-        lastKey = token;
+        const next = object[token];
 
-        object = object[token];
+        if (next === undefined || typeof next !== "object") {
+          anchor = object;
+          anchorKey = token;
+        } else {
+          object = next;
+        }
     }
   }
 
-  if (lastKey) {
-    lastObject[lastKey] = value;
+  if (anchor) {
+    anchor[anchorKey] = value;
   }
 }
 

package/src/tokens.mjs

@@ -241,13 +241,9 @@ export function* tokens(string) {
             buffer += c;
             break;
           default:
-            if ((c >= "a" && c <= "z") || (c >= "A" && c <= "Z") || c === "_") {
-              yield lookup[state];
-              state = "identifier";
-              buffer = c;
-            } else {
-              state += c;
-            }
+            yield lookup[state];
+            state = "identifier";
+            buffer = c;
         }
     }
   }