svelte-common 4.21.30 → 4.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-common",
-  "version": "4.21.30",
+  "version": "4.22.1",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,7 @@
     "prepare": "vite build",
     "start": "vite",
     "test": "npm run test:ava && npm run test:cafe",
-    "test:cafe": "testcafe $BROWSER:headless tests/cafe/*.js -s build/test --page-request-timeout 6000 --app-init-delay 10000 --app \"vite\"",
+    "test:cafe": "testcafe $BROWSER:headless tests/cafe/*.js -s build/test --page-request-timeout 5000 --app-init-delay 9000 --app \"vite\"",
     "test:ava": "ava --timeout 2m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 2m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
     "docs": "documentation readme --section=API ./src/**/*.mjs",
@@ -33,8 +33,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "svelte-command": "^1.1.35",
-    "svelte-entitlement": "^1.2.47"
+    "svelte-command": "^1.1.37",
+    "svelte-entitlement": "^1.2.48"
   },
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^9.0.2",
@@ -44,14 +44,14 @@
     "ava": "^5.1.1",
     "c8": "^7.12.0",
     "documentation": "^14.0.1",
-    "mf-styling": "^1.7.42",
+    "mf-styling": "^1.7.43",
     "npm-pkgbuild": "^11.1.14",
     "semantic-release": "^20.1.0",
     "stylelint": "^14.16.1",
     "stylelint-config-standard": "^29.0.0",
     "svelte": "^3.55.1",
     "testcafe": "^2.3.0",
-    "vite": "^4.0.4"
+    "vite": "^4.1.1"
   },
   "optionalDependencies": {
     "mf-hosting-cloudflare": "^1.0.5",

package/src/attribute.mjs

@@ -1,4 +1,3 @@
-
 /**
  * Split property path into tokens
  * @param {string} string
@@ -102,3 +101,36 @@ export function getAttribute(object, name) {
 
   return object;
 }
+
+/**
+ * Deliver attribute value.
+ * 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
+ */
+export function getAttributeAndOperator(object, name) {
+  let op = "=";
+
+  for (const token of tokens(name)) {
+    switch (token) {
+      case ">":
+      case "<":
+        op = token;
+        break;
+      case ".":
+      case "[":
+      case "]":
+        break;
+
+      default:
+        if (object === undefined) {
+          break;
+        }
+
+        object = object[token];
+    }
+  }
+
+  return [object, op];
+}

package/src/filter.mjs

@@ -1,4 +1,4 @@
-import { getAttribute } from "./attribute.mjs";
+import { getAttributeAndOperator } from "./attribute.mjs";
 
 /**
  * Generate filter function.
@@ -9,23 +9,45 @@ import { getAttribute } from "./attribute.mjs";
 export function filter(filterBy, getters = {}) {
   if (filterBy) {
     const filters = Object.entries(filterBy).map(([key, value]) => {
-      const getter = getters[key] || getAttribute;
+      const getter = () => [getters[key], "="] || getAttributeAndOperator;
+
       return a => {
-        const av = getter(a, key);
+        const [av, op] = getAttributeAndOperator(a, key);
 
-        if (value instanceof RegExp) {
-          return value.test(av);
-        }
-        if (value instanceof Date) {
-          switch (typeof av) {
-            case "object":
-              if (av instanceof Date) {
-                return av.getTime() == value.getTime();
+       // console.log("KEY", key, op, value, av);
+
+        switch (typeof value) {
+          case "number":
+            switch (op) {
+              case "=":
+                return av == value;
+              case ">":
+                return av > value;
+              case "<":
+                return av < value;
+            }
+          case "object":
+            if (value instanceof RegExp) {
+              return value.test(av);
+            }
+            if (value instanceof Date) {
+              switch (typeof av) {
+                case "object":
+                  if (av instanceof Date) {
+                    switch (op) {
+                      case "=":
+                        return av.getTime() == value.getTime();
+                      case ">":
+                        return av.getTime() > value.getTime();
+                      case "<":
+                        return av.getTime() < value.getTime();
+                    }
+                  }
+                  break;
+                case "string":
+                  return value.toString().match(av);
               }
-              break;
-            case "string":
-              return value.toString().match(av);
-          }
+            }
         }
 
         switch (typeof av) {
@@ -35,6 +57,14 @@ export function filter(filterBy, getters = {}) {
             return av.match(value);
           case "bigint":
           case "number":
+            switch (op) {
+              case "=":
+                return av == value;
+              case ">":
+                return av > value;
+              case "<":
+                return av < value;
+            }
           case "boolean":
             return av == value;
         }