svelte-common 4.22.7 → 4.22.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.22.7",
+  "version": "4.22.9",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "c8": "^7.12.0",
     "documentation": "^14.0.1",
     "mf-styling": "^1.7.43",
-    "npm-pkgbuild": "^11.2.7",
+    "npm-pkgbuild": "^11.2.8",
     "semantic-release": "^20.1.0",
     "stylelint": "^14.16.1",
     "stylelint-config-standard": "^29.0.0",

package/src/attribute.mjs

@@ -14,25 +14,40 @@ export function* tokens(string) {
         if (identifier.length) {
           yield identifier;
           identifier = "";
-        }      
+        }
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         break;
 
       case "!":
       case ">":
-      case "<": last = c;
-      break;
+      case "<":
+        if (last) {
+          yield last;
+        }
+        last = c;
+        break;
 
       case "=":
-        if(last) {
+        if (last) {
           yield last + c;
           last = undefined;
-//          delete last;
           break;
         }
 
+      case "+":
+      case "-":
       case ".":
+      case "(":
+      case ")":
       case "[":
       case "]":
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         if (identifier.length) {
           yield identifier;
           identifier = "";
@@ -40,19 +55,20 @@ export function* tokens(string) {
         yield c;
         break;
       default:
+        if (last) {
+          yield last;
+          last = undefined;
+        }
         identifier += c;
     }
-
-    if(last) {
-      yield last;
-      last = undefined;
-//      delete last;
-    }
   }
 
   if (identifier.length) {
     yield identifier;
   }
+  if (last) {
+    yield last;
+  }
 }
 
 /**
@@ -124,16 +140,16 @@ export function getAttribute(object, name) {
 }
 
 /**
- * Deliver attribute value.
- * The name may be a property path like 'a.b.c'.
+ * Deliver attribute value and operator.
+ * The name may be a property path like 'a.b.c <='.
  * @param {Object} object
- * @param {string} name
- * @returns {any} value associated with the given property name
+ * @param {string} expression
+ * @returns {[any,string]} value associated with the given property name
  */
-export function getAttributeAndOperator(object, name) {
+export function getAttributeAndOperator(object, expression, getters = {}) {
   let op = "=";
 
-  for (const token of tokens(name)) {
+  for (const token of tokens(expression)) {
     switch (token) {
       case ">=":
       case "<=":
@@ -152,8 +168,11 @@ export function getAttributeAndOperator(object, name) {
         if (object === undefined) {
           break;
         }
-
-        object = object[token];
+        if (object[token] !== undefined) {
+          object = object[token];
+        } else {
+          object = getters[token];
+        }
     }
   }
 

package/src/filter.mjs

@@ -27,13 +27,11 @@ function numberOp(a, b, op) {
  * @param {Object} getters
  * @returns {Function}
  */
-export function filter(filterBy, getters = {}) {
+export function filter(filterBy, getters) {
   if (filterBy) {
     const filters = Object.entries(filterBy).map(([key, value]) => {
-      const getter = () => [getters[key], "="] || getAttributeAndOperator;
-
       return a => {
-        const [av, op] = getAttributeAndOperator(a, key);
+        const [av, op] = getAttributeAndOperator(a, key, getters);
 
         // console.log("KEY", key, op, value, av);