pacc 1.0.3 → 2.0.0

package/package.json

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

package/src/attribute.mjs

@@ -13,9 +13,20 @@
  * @property {string[]|string} [env] environment variable use to provide the value
  */
 
-import { tokens } from "./tokens.mjs";
-
-export { tokens };
+import {
+  tokens,
+  EQUAL,
+  NOT_EQUAL,
+  DOT,
+  OPEN_BRACKET,
+  CLOSE_BRACKET,
+  LESS,
+  LESS_EQUAL,
+  GREATER,
+  GREATER_EQUAL,
+  STAR
+} from "./tokens.mjs";
+export * from "./tokens.mjs";
 
 /**
  * Set Object attribute.
@@ -30,9 +41,9 @@ export function setAttribute(object, expression, value) {
 
   for (const token of tokens(expression)) {
     switch (token) {
-      case ".":
-      case "[":
-      case "]":
+      case DOT:
+      case OPEN_BRACKET:
+      case CLOSE_BRACKET:
         break;
 
       default:
@@ -75,24 +86,24 @@ export function getAttribute(object, expression) {
  * @returns {[any,string]} value associated with the given property name
  */
 export function getAttributeAndOperator(object, expression, getters = {}) {
-  let op = "=";
+  let op = EQUAL;
   let predicateTokens;
 
   for (const token of tokens(expression)) {
     switch (token) {
-      case ">=":
-      case "<=":
-      case ">":
-      case "<":
-      case "=":
-      case "!=":
+      case GREATER_EQUAL:
+      case LESS_EQUAL:
+      case GREATER:
+      case LESS:
+      case EQUAL:
+      case NOT_EQUAL:
         op = token;
         break;
-      case ".":
-      case "[":
+      case DOT:
+      case OPEN_BRACKET:
         predicateTokens = [];
         break;
-      case "]":
+      case CLOSE_BRACKET:
         // TODO: should loop over array actually getAttribute api should deliver iterators
         if (object[Symbol.iterator]) {
           object = [...object][0];
@@ -100,7 +111,7 @@ export function getAttributeAndOperator(object, expression, getters = {}) {
 
         predicateTokens = undefined;
         break;
-      case "*":
+      case STAR:
         predicateTokens.push(token);
         break;
 

package/src/tokens.mjs

@@ -1,3 +1,41 @@
+
+
+const lookup = {};
+
+function createToken(str)
+{
+  const token = {str};
+  lookup[str] = token;
+  return token;
+}
+
+export const PLUS = createToken("+");
+export const MINUS = createToken("-");
+export const STAR =createToken("*");
+export const DIVIDE = createToken("/");
+export const NOT = createToken("!");
+export const NOT_EQUAL = createToken("!=");
+export const GREATER = createToken(">");
+export const GREATER_EQUAL = createToken(">=");
+export const LESS = createToken("<");
+export const LESS_EQUAL = createToken("<=");
+export const EQUAL = createToken("=");
+export const OPEN_ROUND = createToken("(");
+export const CLOSE_ROUND = createToken(")");
+export const OPEN_BRACKET = createToken("[");
+export const CLOSE_BRACKET = createToken("]");
+export const OPEN_CURLY = createToken("{");
+export const CLOSE_CURLY = createToken("}");
+export const QUESTION = createToken("?");
+export const COLON = createToken(":");
+export const SEMICOLON = createToken(";");
+export const COMMA = createToken(",");
+export const DOT = createToken(".");
+export const AMPERSAND = createToken('&');
+export const DOUBBLE_AMPERSAND = createToken('&&');
+export const BAR = createToken("|");
+export const DOUBBLE_BAR = createToken('||');
+
 /**
  * Split property path into tokens
  * @generator
@@ -5,21 +43,32 @@
  * @yields {string}
  */
 export function* tokens(string) {
-  let state, buffer;
+  let state, buffer, hex;
 
   for (const c of string) {
     switch (state) {
+      case "string-escaping-hex":
+        hex += c;
+        if (hex.length === 4) {
+          buffer += String.fromCharCode(parseInt(hex, 16));
+          state = "string";
+        }
+        continue;
       case "string-escaping":
-        const esc = {
-          "\\": "\\",
-          b: "\b",
-          f: "\f",
-          n: "\n",
-          r: "\r",
-          t: "\t"
-        };
-        buffer += esc[c];
-        state = "string";
+        if (c === "u") {
+          state = "string-escaping-hex";
+          hex = "";
+        } else {
+          const esc = {
+            b: "\b",
+            f: "\f",
+            n: "\n",
+            r: "\r",
+            t: "\t"
+          };
+          buffer += esc[c] || c;
+          state = "string";
+        }
         continue;
     }
 
@@ -38,7 +87,7 @@ export function* tokens(string) {
             state = undefined;
             break;
           default:
-            yield state;
+            yield lookup[state] || state;
             state = undefined;
         }
         break;
@@ -67,7 +116,7 @@ export function* tokens(string) {
             state = "string";
             break;
           default:
-            yield state;
+            yield lookup[state] || state;
             buffer = "";
             state = "string";
         }
@@ -81,10 +130,11 @@ export function* tokens(string) {
           case "&":
           case "|":
             if (state === c) {
-              yield state + c;
+              state += c;
+              yield lookup[state] || state;
               state = undefined;
             } else {
-              yield state;
+              yield lookup[state] || state;
               state = c;
             }
             break;
@@ -99,7 +149,7 @@ export function* tokens(string) {
             state = c;
             break;
           default:
-            yield state;
+            yield lookup[state] || state;
             state = c;
         }
         break;
@@ -146,7 +196,7 @@ export function* tokens(string) {
             state = c;
             break;
           default:
-            yield state;
+            yield lookup[state] || state;
             state = c;
         }
         break;
@@ -167,7 +217,7 @@ export function* tokens(string) {
               (c >= "0" && c <= "9") ||
               c === "_"
             ) {
-              yield state;
+              yield lookup[state] || state;
               state = "identifier";
               buffer = c;
             } else {
@@ -186,6 +236,6 @@ export function* tokens(string) {
       yield buffer;
       break;
     default:
-      yield state;
+      yield lookup[state] || state;
   }
 }