@nymphjs/tilmeld-setup 1.0.0-beta.133 → 1.0.0-beta.135

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.135](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.134...v1.0.0-beta.135) (2026-10-31)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
+# [1.0.0-beta.134](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.133...v1.0.0-beta.134) (2026-10-29)
+
+**Note:** Version bump only for package @nymphjs/tilmeld-setup
+
 # [1.0.0-beta.133](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.132...v1.0.0-beta.133) (2026-10-28)
 
 **Note:** Version bump only for package @nymphjs/tilmeld-setup

package/dist/app/index.js

@@ -22788,12 +22788,13 @@
 	        }
 	        this.$isASleepingReference = false;
 	        this.$sleepingReference = null;
+	        const instanceIsNew = !this.$originalTags.length;
 	        this.guid = entityJson.guid;
 	        this.cdate = entityJson.cdate;
 	        this.mdate = entityJson.mdate;
 	        if (
 	        // The instance is new.
-	        !this.$originalTags.length ||
+	        instanceIsNew ||
 	            // The data is coming from a save.
 	            isFromSave ||
 	            // The tags haven't been modified.
@@ -22802,11 +22803,17 @@
 	            this.tags = entityJson.tags;
 	        }
 	        this.$originalTags = entityJson.tags.slice(0);
-	        if (!this.$nymph.weakCache || !this.$nymph.weakCacheKeepDirtyData) {
+	        if (
+	        // The instance is new.
+	        instanceIsNew ||
+	            // Weak cache is not enabled.
+	            !this.$nymph.weakCache ||
+	            // Weak cache doesn't keep dirty data.
+	            !this.$nymph.weakCacheKeepDirtyData ||
+	            // This data is coming from a save.
+	            isFromSave) {
 	            // Clear dirty data tracker.
-	            for (let name in this.$dirty) {
-	                delete this.$dirty[name];
-	            }
+	            this.$dirty = {};
 	        }
 	        for (let name in this.$dataStore) {
 	            if (!this.$dirty[name]) {
@@ -22821,7 +22828,7 @@
 	            }
 	        }
 	        for (let name in entityJson.data) {
-	            if (!(name in this.$dataStore)) {
+	            if (!(name in this.$dataStore) && !this.$dirty[name]) {
 	                this.$dataStore[name] = classNamesToEntityConstructors(this.$nymph, referencesToEntities(entityJson.data[name], this.$nymph));
 	                this.$dirty[name] = false;
 	            }
@@ -23750,16 +23757,53 @@
 	    }
 	    set(EntityClass, entity) {
 	        if (!entity.guid) {
-	            return;
+	            return entity;
 	        }
 	        const weakRef = new WeakRef(entity);
 	        const classMap = this.references.get(EntityClass) || {};
+	        if (entity.guid in classMap) {
+	            const deref = classMap[entity.guid] && classMap[entity.guid].deref();
+	            if (deref != null) {
+	                return deref;
+	            }
+	        }
 	        this.references.set(EntityClass, classMap);
 	        classMap[entity.guid] = weakRef;
+	        return entity;
+	    }
+	}
+
+	class QueryWeakCache {
+	    queries = new Map();
+	    get(queryJSON) {
+	        const weakRef = this.queries.get(queryJSON);
+	        const deref = weakRef && weakRef.deref();
+	        if (deref != null) {
+	            return deref;
+	        }
+	        else {
+	            this.queries.delete(queryJSON);
+	        }
+	        return null;
+	    }
+	    set(queryJSON, promise) {
+	        this.clean();
+	        if (!(promise instanceof Promise)) {
+	            return;
+	        }
+	        const weakRef = new WeakRef(promise);
+	        this.queries.set(queryJSON, weakRef);
+	    }
+	    clean() {
+	        this.queries.forEach((value, key) => {
+	            const deref = value && value.deref();
+	            if (deref == null) {
+	                this.queries.delete(key);
+	            }
+	        });
 	    }
 	}
 
-	let requester;
 	class Nymph {
 	    /**
 	     * And optional PubSub client instance.
@@ -23773,6 +23817,10 @@
 	     * The entity class for this instance of Nymph.
 	     */
 	    Entity;
+	    /**
+	     * This instance's requester.
+	     */
+	    requester;
 	    requestCallbacks = [];
 	    responseCallbacks = [];
 	    restUrl = '';
@@ -23787,7 +23835,11 @@
 	    /**
 	     * The entity cache.
 	     */
-	    cache = new EntityWeakCache();
+	    entityCache = new EntityWeakCache();
+	    /**
+	     * The query cache.
+	     */
+	    queryCache = new QueryWeakCache();
 	    /**
 	     * Return `null` or empty array instead of error when entity/ies not found.
 	     */
@@ -23802,21 +23854,28 @@
 	            this.returnNullOnNotFound = NymphOptions.returnNullOnNotFound;
 	        }
 	        this.Entity = this.addEntityClass(Entity);
-	        requester = new HttpRequester('fetch' in NymphOptions ? NymphOptions.fetch : undefined);
+	        this.requester = new HttpRequester('fetch' in NymphOptions ? NymphOptions.fetch : undefined);
 	        if ('renewTokens' in NymphOptions && !NymphOptions.renewTokens) {
 	            this.headers['X-Tilmeld-Token-Renewal'] = 'off';
 	        }
-	        requester.on('request', (_requester, url, options) => {
+	        this.requester.on('request', (_requester, url, options) => {
 	            for (let i = 0; i < this.requestCallbacks.length; i++) {
 	                this.requestCallbacks[i] && this.requestCallbacks[i](url, options);
 	            }
 	        });
-	        requester.on('response', (_requester, response, text) => {
+	        this.requester.on('response', (_requester, response, text) => {
 	            for (let i = 0; i < this.responseCallbacks.length; i++) {
 	                this.responseCallbacks[i] && this.responseCallbacks[i](response, text);
 	            }
 	        });
 	    }
+	    /**
+	     * Clear both the entity and the query caches.
+	     */
+	    clearCaches() {
+	        this.entityCache = new EntityWeakCache();
+	        this.queryCache = new QueryWeakCache();
+	    }
 	    /**
 	     * Add your class to this instance.
 	     *
@@ -23853,7 +23912,7 @@
 	        throw new ClassNotAvailableError('Tried to use class: ' + key);
 	    }
 	    async newUID(name) {
-	        const data = await requester.POST({
+	        const data = await this.requester.POST({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'text',
@@ -23862,7 +23921,7 @@
 	        return Number(data);
 	    }
 	    async setUID(name, value) {
-	        return await requester.PUT({
+	        return await this.requester.PUT({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -23870,16 +23929,28 @@
 	        });
 	    }
 	    async getUID(name) {
-	        const data = await requester.GET({
-	            url: this.restUrl,
-	            headers: { ...this.headers },
-	            dataType: 'text',
-	            data: { action: 'uid', data: name },
-	        });
+	        const query = { action: 'uid', data: name };
+	        let promise = null;
+	        const queryJSON = JSON.stringify(query);
+	        if (this.weakCache) {
+	            promise = this.queryCache.get(queryJSON);
+	        }
+	        if (promise == null) {
+	            promise = this.requester.GET({
+	                url: this.restUrl,
+	                headers: { ...this.headers },
+	                dataType: 'text',
+	                data: query,
+	            });
+	            if (this.weakCache) {
+	                this.queryCache.set(queryJSON, promise);
+	            }
+	        }
+	        const data = await promise;
 	        return Number(data);
 	    }
 	    async deleteUID(name) {
-	        return await requester.DELETE({
+	        return await this.requester.DELETE({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'text',
@@ -23925,7 +23996,7 @@
 	        return await this.requestWithMethod(entities, 'PATCH', patch, true);
 	    }
 	    async requestWithMethod(entity, method, data, plural) {
-	        const response = await requester[method]({
+	        const response = await this.requester[method]({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -23983,18 +24054,30 @@
 	        if (typeof selectors[0] === 'string') {
 	            selectors = [{ type: '&', guid: selectors[0] }];
 	        }
-	        const data = await requester.GET({
-	            url: this.restUrl,
-	            headers: { ...this.headers },
-	            dataType: 'json',
-	            data: {
-	                action: 'entity',
-	                data: [
-	                    entityConstructorsToClassNames(options),
-	                    ...entityConstructorsToClassNames(entitiesToReferences(selectors)),
-	                ],
-	            },
-	        });
+	        const query = {
+	            action: 'entity',
+	            data: [
+	                entityConstructorsToClassNames(options),
+	                ...entityConstructorsToClassNames(entitiesToReferences(selectors)),
+	            ],
+	        };
+	        let promise = null;
+	        const queryJSON = JSON.stringify(query);
+	        if (this.weakCache) {
+	            promise = this.queryCache.get(queryJSON);
+	        }
+	        if (promise == null) {
+	            promise = this.requester.GET({
+	                url: this.restUrl,
+	                headers: { ...this.headers },
+	                dataType: 'json',
+	                data: query,
+	            });
+	            if (this.weakCache) {
+	                this.queryCache.set(queryJSON, promise);
+	            }
+	        }
+	        const data = await promise;
 	        if (options.return === 'count' || typeof data.guid !== 'undefined') {
 	            return data;
 	        }
@@ -24003,18 +24086,30 @@
 	    async getEntities(options, ...selectors) {
 	        let data = null;
 	        try {
-	            data = await requester.GET({
-	                url: this.restUrl,
-	                headers: { ...this.headers },
-	                dataType: 'json',
-	                data: {
-	                    action: 'entities',
-	                    data: [
-	                        entityConstructorsToClassNames(options),
-	                        ...entityConstructorsToClassNames(entitiesToReferences(selectors)),
-	                    ],
-	                },
-	            });
+	            const query = {
+	                action: 'entities',
+	                data: [
+	                    entityConstructorsToClassNames(options),
+	                    ...entityConstructorsToClassNames(entitiesToReferences(selectors)),
+	                ],
+	            };
+	            let promise = null;
+	            const queryJSON = JSON.stringify(query);
+	            if (this.weakCache) {
+	                promise = this.queryCache.get(queryJSON);
+	            }
+	            if (promise == null) {
+	                promise = this.requester.GET({
+	                    url: this.restUrl,
+	                    headers: { ...this.headers },
+	                    dataType: 'json',
+	                    data: query,
+	                });
+	                if (this.weakCache) {
+	                    this.queryCache.set(queryJSON, promise);
+	                }
+	            }
+	            data = await promise;
 	        }
 	        catch (e) {
 	            if (this.returnNullOnNotFound &&
@@ -24045,7 +24140,7 @@
 	        let entity = EntityClass.factorySync();
 	        if (this.weakCache) {
 	            // Try to get it from cache.
-	            const entityFromCache = this.cache.get(EntityClass, entityJSON.guid || '');
+	            const entityFromCache = this.entityCache.get(EntityClass, entityJSON.guid || '');
 	            if (entityFromCache != null) {
 	                entity = entityFromCache;
 	            }
@@ -24056,13 +24151,13 @@
 	        if (!this.weakCache) {
 	            return null;
 	        }
-	        return this.cache.get(EntityClass, guid);
+	        return this.entityCache.get(EntityClass, guid);
 	    }
 	    setEntityToCache(EntityClass, entity) {
 	        if (!this.weakCache) {
 	            return;
 	        }
-	        return this.cache.set(EntityClass, entity);
+	        return this.entityCache.set(EntityClass, entity);
 	    }
 	    initEntitiesFromData(item, isFromSave) {
 	        if (Array.isArray(item)) {
@@ -24090,7 +24185,7 @@
 	        return item;
 	    }
 	    async deleteEntity(entity, _plural = false) {
-	        return await requester.DELETE({
+	        return await this.requester.DELETE({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -24112,7 +24207,7 @@
 	        return await this.deleteEntity(entities, true);
 	    }
 	    async serverCall(entity, method, params, stateless = false) {
-	        const data = await requester.POST({
+	        const data = await this.requester.POST({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -24132,7 +24227,7 @@
 	        };
 	    }
 	    async serverCallStatic(className, method, params) {
-	        const data = await requester.POST({
+	        const data = await this.requester.POST({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -24149,7 +24244,7 @@
 	        return this.initEntitiesFromData(data, false);
 	    }
 	    async serverCallStaticIterator(className, method, params) {
-	        const iterable = await requester.POST_ITERATOR({
+	        const iterable = await this.requester.POST_ITERATOR({
 	            url: this.restUrl,
 	            headers: { ...this.headers },
 	            dataType: 'json',
@@ -24622,6 +24717,8 @@
 	                    if (this.nymph.pubsub) {
 	                        this.nymph.pubsub.authenticate(null);
 	                    }
+	                    // Make sure entities requested under a previous user are not reused.
+	                    this.nymph.clearCaches();
 	                    delete store.currentToken;
 	                }
 	            }
@@ -24643,6 +24740,8 @@
 	                if (this.nymph.pubsub) {
 	                    this.nymph.pubsub.authenticate(token, switchToken);
 	                }
+	                // Make sure entities requested under a previous user are not reused.
+	                this.nymph.clearCaches();
 	                store.currentToken = token;
 	            }
 	        }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld-setup",
-  "version": "1.0.0-beta.133",
+  "version": "1.0.0-beta.135",
   "description": "Nymph.js - Tilmeld Setup App",
   "type": "module",
   "main": "dist/index.js",
@@ -41,8 +41,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-beta.133",
-    "@nymphjs/tilmeld": "^1.0.0-beta.133",
+    "@nymphjs/nymph": "^1.0.0-beta.135",
+    "@nymphjs/tilmeld": "^1.0.0-beta.135",
     "express": "^5.2.1",
     "locutus": "^3.0.36"
   },
@@ -50,12 +50,12 @@
     "@material/elevation": "^14.0.0",
     "@material/typography": "^14.0.0",
     "@mdi/js": "^7.4.47",
-    "@nymphjs/client": "^1.0.0-beta.133",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.133",
-    "@nymphjs/query-parser": "^1.0.0-beta.133",
-    "@nymphjs/server": "^1.0.0-beta.133",
-    "@nymphjs/tilmeld-client": "^1.0.0-beta.133",
-    "@nymphjs/tilmeld-components": "^1.0.0-beta.133",
+    "@nymphjs/client": "^1.0.0-beta.135",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.135",
+    "@nymphjs/query-parser": "^1.0.0-beta.135",
+    "@nymphjs/server": "^1.0.0-beta.135",
+    "@nymphjs/tilmeld-client": "^1.0.0-beta.135",
+    "@nymphjs/tilmeld-components": "^1.0.0-beta.135",
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-sucrase": "^5.1.0",
@@ -98,5 +98,5 @@
     "tslib": "^2.8.1",
     "typescript": "^7.0.2"
   },
-  "gitHead": "4edb32e721ba78f0be8d43d675578168f166b8b5"
+  "gitHead": "ee05b44026f1408b76aaf56afb5b7172ee745632"
 }