@nymphjs/tilmeld-setup 1.0.0-beta.96 → 1.0.0-beta.98

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.98](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.97...v1.0.0-beta.98) (2025-10-24)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.97](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.96...v1.0.0-beta.97) (2025-10-04)
+
+### Bug Fixes
+
+- password verify on user edit page when password is empty ([bf797f7](https://github.com/sciactive/nymphjs/commit/bf797f77cc08f73731b9e20e413be6e7c0cec213))
+
 # [1.0.0-beta.96](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.95...v1.0.0-beta.96) (2025-09-01)
 
 **Note:** Version bump only for package @nymphjs/tilmeld-setup

package/app/src/routes/UserEdit.svelte

@@ -1067,8 +1067,9 @@
       passwordVerify === ''
     ) {
       passwordVerified = undefined;
+    } else {
+      passwordVerified = $entity.passwordTemp === passwordVerify;
     }
-    passwordVerified = $entity.passwordTemp === passwordVerify;
   }
 
   function addAbility() {

package/dist/app/index.js

@@ -28334,7 +28334,7 @@
 	function selectorParser({ query, selector, qrefMap, bareHandler, }) {
 	    let curQuery = query;
 	    // eg. user<{User name="Hunter"}> or user!<{User name="Hunter"}>
-	    const qrefRegex = /(?: |^)(\w+)!?<\{(\w+) (.*?[^\\])\}>(?= |$)/g;
+	    const qrefRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?<\{(\w+) (.*?[^\\])\}>(?= |$)/g;
 	    const qrefMatch = curQuery.match(qrefRegex);
 	    if (qrefMatch) {
 	        selector.qref = [];
@@ -28374,18 +28374,72 @@
 	        }
 	    }
 	    curQuery = curQuery.replace(qrefRegex, '');
-	    // eg. name=Marty or name="Marty McFly" or enabled=true or someArray=[1,2]
-	    const equalRegex = /(?: |^)(\w+)!?=(""|".*?[^\\]"|[^ ]+)(?= |$)/g;
+	    // eg. someArray=[1,2] or someObject={"prop":"some value"}
+	    const equalJsonRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?=(\{|\[)/g;
+	    const equalJsonMatch = [...curQuery.matchAll(equalJsonRegex)];
+	    {
+	        if (!('equal' in selector)) {
+	            selector.equal = [];
+	        }
+	        if (!('!equal' in selector)) {
+	            selector['!equal'] = [];
+	        }
+	        // Work backward to find all long JSON values.
+	        for (let i = equalJsonMatch.length - 1; i >= 0; i--) {
+	            const match = equalJsonMatch[i];
+	            let [name, opener] = splitn(match[0].trim(), '=', 2);
+	            let start = match.index + match[0].length - 1;
+	            let nextEndToken = curQuery.indexOf(opener === '{' ? '}' : ']', start);
+	            while (nextEndToken !== -1) {
+	                try {
+	                    if (name.endsWith('!')) {
+	                        selector['!equal'].unshift([
+	                            name.slice(0, -1),
+	                            JSON.parse(curQuery.substring(start, nextEndToken + 1)),
+	                        ]);
+	                    }
+	                    else {
+	                        selector.equal.unshift([
+	                            name,
+	                            JSON.parse(curQuery.substring(start, nextEndToken + 1)),
+	                        ]);
+	                    }
+	                    curQuery =
+	                        curQuery.substring(0, match.index) +
+	                            curQuery.substring(nextEndToken + 1);
+	                    break;
+	                }
+	                catch (e) {
+	                    nextEndToken = curQuery.indexOf(opener === '{' ? '}' : ']', nextEndToken + 1);
+	                }
+	            }
+	        }
+	        if (selector.equal == null || !selector.equal.length) {
+	            delete selector.equal;
+	        }
+	        if (selector['!equal'] == null || !selector['!equal'].length) {
+	            delete selector['!equal'];
+	        }
+	    }
+	    // eg. name=Marty or name="Marty McFly" or enabled=true
+	    const equalRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?=(""|".*?[^\\]"|[^ ]+)(?= |$)/g;
 	    const equalMatch = curQuery.match(equalRegex);
 	    if (equalMatch) {
-	        selector.equal = [];
-	        selector['!equal'] = [];
+	        if (!('equal' in selector)) {
+	            selector.equal = [];
+	        }
+	        if (!('!equal' in selector)) {
+	            selector['!equal'] = [];
+	        }
 	        for (let match of equalMatch) {
 	            try {
 	                let [name, value] = splitn(match.trim(), '=', 2);
 	                try {
 	                    if (name.endsWith('!')) {
-	                        selector['!equal'].push([name.slice(0, -1), JSON.parse(value)]);
+	                        selector['!equal'].push([
+	                            name.slice(0, -1),
+	                            JSON.parse(value),
+	                        ]);
 	                    }
 	                    else {
 	                        selector.equal.push([name, JSON.parse(value)]);
@@ -28393,10 +28447,16 @@
 	                }
 	                catch (e) {
 	                    if (name.endsWith('!')) {
-	                        selector['!equal'].push([name.slice(0, -1), unQuoteString(value)]);
+	                        selector['!equal'].push([
+	                            name.slice(0, -1),
+	                            unQuoteString(value),
+	                        ]);
 	                    }
 	                    else {
-	                        selector.equal.push([name, unQuoteString(value)]);
+	                        selector.equal.push([
+	                            name,
+	                            unQuoteString(value),
+	                        ]);
 	                    }
 	                }
 	            }
@@ -28404,16 +28464,16 @@
 	                continue;
 	            }
 	        }
-	        if (!selector.equal.length) {
+	        if (selector.equal == null || !selector.equal.length) {
 	            delete selector.equal;
 	        }
-	        if (!selector['!equal'].length) {
+	        if (selector['!equal'] == null || !selector['!equal'].length) {
 	            delete selector['!equal'];
 	        }
 	    }
 	    curQuery = curQuery.replace(equalRegex, '');
 	    // eg. user<{790274347f9b3a018c2cedee}> or user!<{790274347f9b3a018c2cedee}>
-	    const refRegex = /(?: |^)(\w+)!?<\{([0-9a-f]{24})\}>(?= |$)/g;
+	    const refRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?<\{([0-9a-f]{24})\}>(?= |$)/g;
 	    const refMatch = curQuery.match(refRegex);
 	    if (refMatch) {
 	        selector.ref = [];
@@ -28441,7 +28501,7 @@
 	    }
 	    curQuery = curQuery.replace(refRegex, '');
 	    // eg. someArrayOfNumbers<10> or someObject!<"some string">
-	    const containRegex = /(?: |^)(\w+)!?(<.*?[^\\]>)(?= |$)/g;
+	    const containRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?(<(?:[^"][^>]*?|".*?[^\\]"))>(?= |$)/g;
 	    const containMatch = curQuery.match(containRegex);
 	    if (containMatch) {
 	        selector.contain = [];
@@ -28453,22 +28513,22 @@
 	                    if (name.endsWith('!')) {
 	                        selector['!contain'].push([
 	                            name.slice(0, -1),
-	                            JSON.parse(unQuoteAngles(value)),
+	                            JSON.parse(unQuoteString(value)),
 	                        ]);
 	                    }
 	                    else {
-	                        selector.contain.push([name, JSON.parse(unQuoteAngles(value))]);
+	                        selector.contain.push([name, JSON.parse(unQuoteString(value))]);
 	                    }
 	                }
 	                catch (e) {
 	                    if (name.endsWith('!')) {
 	                        selector['!contain'].push([
 	                            name.slice(0, -1),
-	                            unQuoteAngles(value),
+	                            unQuoteString(value),
 	                        ]);
 	                    }
 	                    else {
-	                        selector.contain.push([name, unQuoteAngles(value)]);
+	                        selector.contain.push([name, unQuoteString(value)]);
 	                    }
 	                }
 	            }
@@ -28485,7 +28545,7 @@
 	    }
 	    curQuery = curQuery.replace(containRegex, '');
 	    // eg. name~/Hunter/ or name!~/hunter/i
-	    const posixRegex = /(?: |^)(\w+)!?~(\/\/|\/.*?[^\\]\/)i?(?= |$)/g;
+	    const posixRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?~(\/\/|\/.*?[^\\]\/)i?(?= |$)/g;
 	    const posixMatch = curQuery.match(posixRegex);
 	    if (posixMatch) {
 	        selector.match = [];
@@ -28537,7 +28597,7 @@
 	    }
 	    curQuery = curQuery.replace(posixRegex, '');
 	    // eg. name~Hunter or name!~"hunter"i
-	    const likeRegex = /(?: |^)(\w+)!?~(""i?|".*?[^\\]"i?|[^ ]+)(?= |$)/g;
+	    const likeRegex = /(?: |^)([^\s=\[\]<>{}]+?)!?~(""i?|".*?[^\\]"i?|[^ ]+)(?= |$)/g;
 	    const likeMatch = curQuery.match(likeRegex);
 	    if (likeMatch) {
 	        selector.like = [];
@@ -28614,7 +28674,7 @@
 	    }
 	    curQuery = curQuery.replace(guidRegex, '');
 	    // eg. [enabled] or [!defaultPrimaryGroup]
-	    const truthyRegex = /(?: |^)\[(!?\w+)\](?= |$)/g;
+	    const truthyRegex = /(?: |^)\[(!?[^\s=\[\]<>{}]+?)\](?= |$)/g;
 	    const truthyMatch = curQuery.match(truthyRegex);
 	    if (truthyMatch) {
 	        selector.truthy = [];
@@ -28670,7 +28730,7 @@
 	    }
 	    curQuery = curQuery.replace(tagRegex, '');
 	    // eg. cdate>15
-	    const gtRegex = /(?: |^)(\w+)>(-?\d+(?:\.\d+)?)(?= |$)/g;
+	    const gtRegex = /(?: |^)([^\s=\[\]<>{}]+?)>(-?\d+(?:\.\d+)?)(?= |$)/g;
 	    const gtMatch = curQuery.match(gtRegex);
 	    if (gtMatch) {
 	        selector.gt = [];
@@ -28689,7 +28749,7 @@
 	    }
 	    curQuery = curQuery.replace(gtRegex, '');
 	    // eg. cdate>yesterday or cdate>"2 days ago"
-	    const gtRelativeRegex = /(?: |^)(\w+)>(\w+|"[^"]+")(?= |$)/g;
+	    const gtRelativeRegex = /(?: |^)([^\s=\[\]<>{}]+?)>(\w+|"[^"]+")(?= |$)/g;
 	    const gtRelativeMatch = curQuery.match(gtRelativeRegex);
 	    if (gtRelativeMatch) {
 	        if (selector.gt == null) {
@@ -28714,7 +28774,7 @@
 	    }
 	    curQuery = curQuery.replace(gtRelativeRegex, '');
 	    // eg. cdate>=15
-	    const gteRegex = /(?: |^)(\w+)>=(-?\d+(?:\.\d+)?)(?= |$)/g;
+	    const gteRegex = /(?: |^)([^\s=\[\]<>{}]+?)>=(-?\d+(?:\.\d+)?)(?= |$)/g;
 	    const gteMatch = curQuery.match(gteRegex);
 	    if (gteMatch) {
 	        selector.gte = [];
@@ -28733,7 +28793,7 @@
 	    }
 	    curQuery = curQuery.replace(gteRegex, '');
 	    // eg. cdate>=yesterday or cdate>="2 days ago"
-	    const gteRelativeRegex = /(?: |^)(\w+)>=(\w+|"[^"]+")(?= |$)/g;
+	    const gteRelativeRegex = /(?: |^)([^\s=\[\]<>{}]+?)>=(\w+|"[^"]+")(?= |$)/g;
 	    const gteRelativeMatch = curQuery.match(gteRelativeRegex);
 	    if (gteRelativeMatch) {
 	        if (selector.gte == null) {
@@ -28758,7 +28818,7 @@
 	    }
 	    curQuery = curQuery.replace(gteRelativeRegex, '');
 	    // eg. cdate<15
-	    const ltRegex = /(?: |^)(\w+)<(-?\d+(?:\.\d+)?)(?= |$)/g;
+	    const ltRegex = /(?: |^)([^\s=\[\]<>{}]+?)<(-?\d+(?:\.\d+)?)(?= |$)/g;
 	    const ltMatch = curQuery.match(ltRegex);
 	    if (ltMatch) {
 	        selector.lt = [];
@@ -28777,7 +28837,7 @@
 	    }
 	    curQuery = curQuery.replace(ltRegex, '');
 	    // eg. cdate<yesterday or cdate<"2 days ago"
-	    const ltRelativeRegex = /(?: |^)(\w+)<(\w+|"[^"]+")(?= |$)/g;
+	    const ltRelativeRegex = /(?: |^)([^\s=\[\]<>{}]+?)<(\w+|"[^"]+")(?= |$)/g;
 	    const ltRelativeMatch = curQuery.match(ltRelativeRegex);
 	    if (ltRelativeMatch) {
 	        if (selector.lt == null) {
@@ -28802,7 +28862,7 @@
 	    }
 	    curQuery = curQuery.replace(ltRelativeRegex, '');
 	    // eg. cdate<=15
-	    const lteRegex = /(?: |^)(\w+)<=(-?\d+(?:\.\d+)?)(?= |$)/g;
+	    const lteRegex = /(?: |^)([^\s=\[\]<>{}]+?)<=(-?\d+(?:\.\d+)?)(?= |$)/g;
 	    const lteMatch = curQuery.match(lteRegex);
 	    if (lteMatch) {
 	        selector.lte = [];
@@ -28821,7 +28881,7 @@
 	    }
 	    curQuery = curQuery.replace(lteRegex, '');
 	    // eg. cdate<=yesterday or cdate<="2 days ago"
-	    const lteRelativeRegex = /(?: |^)(\w+)<=(\w+|"[^"]+")(?= |$)/g;
+	    const lteRelativeRegex = /(?: |^)([^\s=\[\]<>{}]+?)<=(\w+|"[^"]+")(?= |$)/g;
 	    const lteRelativeMatch = curQuery.match(lteRelativeRegex);
 	    if (lteRelativeMatch) {
 	        if (selector.lte == null) {
@@ -28853,9 +28913,6 @@
 	    }
 	    return input;
 	}
-	function unQuoteAngles(input) {
-	    return input.replace(/\\</g, '<').replace(/\\>/g, '>').replace(/\\\\/g, '\\');
-	}
 	function unQuoteCurlies(input) {
 	    return input
 	        .replace(/\\\{/g, '{')
@@ -33926,9 +33983,9 @@
 		function doVerifyPassword() {
 			if (($entity().passwordTemp == null || $entity().passwordTemp === '') && get(passwordVerify) === '') {
 				set(passwordVerified, undefined);
+			} else {
+				set(passwordVerified, $entity().passwordTemp === get(passwordVerify));
 			}
-
-			set(passwordVerified, $entity().passwordTemp === get(passwordVerify));
 		}
 
 		function addAbility() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld-setup",
-  "version": "1.0.0-beta.96",
+  "version": "1.0.0-beta.98",
   "description": "Nymph.js - Tilmeld Setup App",
   "type": "module",
   "main": "dist/index.js",
@@ -35,8 +35,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-beta.96",
-    "@nymphjs/tilmeld": "^1.0.0-beta.96",
+    "@nymphjs/nymph": "^1.0.0-beta.98",
+    "@nymphjs/tilmeld": "^1.0.0-beta.98",
     "express": "^4.21.2",
     "locutus": "^2.0.32"
   },
@@ -44,12 +44,12 @@
     "@material/elevation": "^14.0.0",
     "@material/typography": "^14.0.0",
     "@mdi/js": "^7.4.47",
-    "@nymphjs/client": "^1.0.0-beta.96",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.96",
-    "@nymphjs/query-parser": "^1.0.0-beta.96",
-    "@nymphjs/server": "^1.0.0-beta.96",
-    "@nymphjs/tilmeld-client": "^1.0.0-beta.96",
-    "@nymphjs/tilmeld-components": "^1.0.0-beta.96",
+    "@nymphjs/client": "^1.0.0-beta.98",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.98",
+    "@nymphjs/query-parser": "^1.0.0-beta.98",
+    "@nymphjs/server": "^1.0.0-beta.98",
+    "@nymphjs/tilmeld-client": "^1.0.0-beta.98",
+    "@nymphjs/tilmeld-components": "^1.0.0-beta.98",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-typescript": "^12.1.1",
@@ -91,5 +91,5 @@
     "tslib": "^2.8.1",
     "typescript": "^5.7.2"
   },
-  "gitHead": "bf1d0ded836084ae1cecae2efe0a45501f90f6d0"
+  "gitHead": "4d73463289302e50262f8a6aa31ae1825a3b3d6e"
 }