@nymphjs/tilmeld-setup 1.0.0-beta.132 → 1.0.0-beta.134

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.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
+
 # [1.0.0-beta.132](https://forge.sciactive.com/sciactive/nymphjs/compare/v1.0.0-beta.131...v1.0.0-beta.132) (2026-10-26)
 
 **Note:** Version bump only for package @nymphjs/tilmeld-setup

package/dist/app/index.js

@@ -22766,7 +22766,9 @@
 	        Array.prototype.slice.call(params));
 	    }
 	    toJSON() {
-	        this.$check();
+	        if (this.$isASleepingReference && this.$sleepingReference) {
+	            return this.$sleepingReference;
+	        }
 	        const obj = {
 	            class: entityConstructorsToClassNames(this.constructor),
 	            guid: this.guid,
@@ -22780,30 +22782,52 @@
 	        }
 	        return obj;
 	    }
-	    $init(entityJson) {
+	    $init(entityJson, isFromSave) {
 	        if (entityJson == null) {
-	            return this.$proxy();
+	            return this;
 	        }
 	        this.$isASleepingReference = false;
 	        this.$sleepingReference = null;
 	        this.guid = entityJson.guid;
 	        this.cdate = entityJson.cdate;
 	        this.mdate = entityJson.mdate;
-	        this.tags = entityJson.tags;
+	        if (
+	        // The instance is new.
+	        !this.$originalTags.length ||
+	            // The data is coming from a save.
+	            isFromSave ||
+	            // The tags haven't been modified.
+	            JSON.stringify([...this.tags].sort()) ===
+	                JSON.stringify([...this.$originalTags].sort())) {
+	            this.tags = entityJson.tags;
+	        }
 	        this.$originalTags = entityJson.tags.slice(0);
-	        this.$dirty = {};
-	        this.$dataStore = Object.entries(entityJson.data)
-	            .map(([key, value]) => {
-	            this.$dirty[key] = false;
-	            return {
-	                key,
-	                value: classNamesToEntityConstructors(this.$nymph, referencesToEntities(value, this.$nymph)),
-	            };
-	        })
-	            .reduce((obj, { key, value }) => Object.assign(obj, { [key]: value }), {});
-	        this.$data = new Proxy(this.$dataStore, this.$dataHandler);
+	        if (!this.$nymph.weakCache || !this.$nymph.weakCacheKeepDirtyData) {
+	            // Clear dirty data tracker.
+	            for (let name in this.$dirty) {
+	                delete this.$dirty[name];
+	            }
+	        }
+	        for (let name in this.$dataStore) {
+	            if (!this.$dirty[name]) {
+	                if (name in entityJson.data) {
+	                    this.$dataStore[name] = classNamesToEntityConstructors(this.$nymph, referencesToEntities(entityJson.data[name], this.$nymph));
+	                    this.$dirty[name] = false;
+	                }
+	                else {
+	                    delete this.$dataStore[name];
+	                    delete this.$dirty[name];
+	                }
+	            }
+	        }
+	        for (let name in entityJson.data) {
+	            if (!(name in this.$dataStore)) {
+	                this.$dataStore[name] = classNamesToEntityConstructors(this.$nymph, referencesToEntities(entityJson.data[name], this.$nymph));
+	                this.$dirty[name] = false;
+	            }
+	        }
 	        this.$nymph.setEntityToCache(this.constructor, this);
-	        return this.$proxy();
+	        return this;
 	    }
 	    $addTag(...tags) {
 	        this.$check();
@@ -22849,10 +22873,14 @@
 	            return false;
 	        }
 	        const obData = sortObj(object.toJSON());
-	        obData.tags?.sort();
+	        if ('tags' in obData) {
+	            obData.tags?.sort();
+	        }
 	        // obData.data = sortObj(obData.data);
 	        const myData = sortObj(this.toJSON());
-	        myData.tags?.sort();
+	        if ('tags' in myData) {
+	            myData.tags?.sort();
+	        }
 	        // myData.data = sortObj(myData.data);
 	        return isEqual(obData, myData);
 	    }
@@ -22913,10 +22941,14 @@
 	        }
 	        else {
 	            const obData = sortObj(object.toJSON());
-	            obData.tags?.sort();
+	            if ('tags' in obData) {
+	                obData.tags?.sort();
+	            }
 	            // obData.data = sortObj(obData.data);
 	            const myData = sortObj(this.toJSON());
-	            myData.tags?.sort();
+	            if ('tags' in myData) {
+	                myData.tags?.sort();
+	            }
 	            // myData.data = sortObj(myData.data);
 	            return isEqual(obData, myData);
 	        }
@@ -22949,7 +22981,7 @@
 	    $wake() {
 	        if (!this.$asleep()) {
 	            this.$wakePromise = null;
-	            return Promise.resolve(this.$proxy());
+	            return Promise.resolve(this);
 	        }
 	        if (this.$sleepingReference?.[1] == null) {
 	            throw new InvalidStateError('Tried to wake a sleeping reference with no GUID.');
@@ -22962,7 +22994,7 @@
 	                    const errObj = { data, textStatus: 'No data returned.' };
 	                    return Promise.reject(errObj);
 	                }
-	                return this.$init(data);
+	                return this.$init(data, false);
 	            })
 	                .finally(() => {
 	                this.$wakePromise = null;
@@ -22981,7 +23013,7 @@
 	                    newLevel = level - 1;
 	                }
 	                if (newLevel !== undefined && newLevel < 0) {
-	                    resolve(this.$proxy());
+	                    resolve(this);
 	                    return;
 	                }
 	                const promises = [];
@@ -23016,10 +23048,10 @@
 	                };
 	                walkData(this.$data);
 	                if (promises.length) {
-	                    Promise.all(promises).then(() => resolve(this.$proxy()), (errObj) => reject(errObj));
+	                    Promise.all(promises).then(() => resolve(this), (errObj) => reject(errObj));
 	                }
 	                else {
-	                    resolve(this.$proxy());
+	                    resolve(this);
 	                }
 	            };
 	            if (this.$asleep()) {
@@ -23052,7 +23084,7 @@
 	        if (data == null) {
 	            throw new Error("The entity's data could not be refreshed.");
 	        }
-	        this.$init(data);
+	        this.$init(data, false);
 	        return true;
 	    }
 	    $removeTag(...tags) {
@@ -23073,7 +23105,7 @@
 	        const paramArray = Array.prototype.slice.call(params);
 	        const data = await this.$nymph.serverCall(this, method, paramArray, stateless);
 	        if (!stateless && data.entity) {
-	            this.$init(data.entity);
+	            this.$init(data.entity, false);
 	        }
 	        return data.return;
 	    }
@@ -23082,7 +23114,7 @@
 	            return this.$sleepingReference;
 	        }
 	        if (this.guid == null) {
-	            return this.$proxy();
+	            return this;
 	        }
 	        return [
 	            'nymph_entity_reference',
@@ -23727,6 +23759,37 @@
 	    }
 	}
 
+	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 {
 	    /**
@@ -23745,6 +23808,7 @@
 	    responseCallbacks = [];
 	    restUrl = '';
 	    weakCache = false;
+	    weakCacheKeepDirtyData = false;
 	    /**
 	     * Headers that will be sent with every request.
 	     *
@@ -23754,7 +23818,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.
 	     */
@@ -23763,6 +23831,7 @@
 	        this.restUrl = NymphOptions.restUrl;
 	        // @ts-ignore TS doesn't know about WeakRef.
 	        this.weakCache = !!NymphOptions.weakCache && typeof WeakRef !== 'undefined';
+	        this.weakCacheKeepDirtyData = !!NymphOptions.weakCacheKeepDirtyData;
 	        if ('returnNullOnNotFound' in NymphOptions &&
 	            NymphOptions.returnNullOnNotFound != null) {
 	            this.returnNullOnNotFound = NymphOptions.returnNullOnNotFound;
@@ -23836,12 +23905,24 @@
 	        });
 	    }
 	    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 = 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) {
@@ -23904,11 +23985,11 @@
 	            return entity.map((e, i) => response[i] &&
 	                response[i].guid != null &&
 	                (e.guid == null || e.guid === response[i].guid)
-	                ? e.$init(response[i])
+	                ? e.$init(response[i], method !== 'GET')
 	                : e);
 	        }
 	        else if (!Array.isArray(entity) && response.guid != null) {
-	            return entity.$init(response);
+	            return entity.$init(response, method !== 'GET');
 	        }
 	        throw new Error('Server error');
 	    }
@@ -23936,7 +24017,7 @@
 	                return data;
 	            }
 	            else {
-	                return this.initEntity(data);
+	                return this.initEntity(data, false);
 	            }
 	        }
 	        return null;
@@ -23949,18 +24030,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 = 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;
 	        }
@@ -23969,18 +24062,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 = 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 &&
@@ -24001,9 +24106,9 @@
 	        if (options.return && options.return === 'guid') {
 	            return data;
 	        }
-	        return data.map((e) => this.initEntity(e));
+	        return data.map((e) => this.initEntity(e, false));
 	    }
-	    initEntity(entityJSON) {
+	    initEntity(entityJSON, isFromSave) {
 	        const EntityClass = classNamesToEntityConstructors(this, entityJSON.class);
 	        if (!EntityClass) {
 	            throw new ClassNotAvailableError(entityJSON.class + ' class cannot be found.');
@@ -24011,29 +24116,29 @@
 	        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;
 	            }
 	        }
-	        return entity.$init(entityJSON);
+	        return entity.$init(entityJSON, isFromSave);
 	    }
 	    getEntityFromCache(EntityClass, guid) {
 	        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) {
+	    initEntitiesFromData(item, isFromSave) {
 	        if (Array.isArray(item)) {
 	            // Recurse into lower arrays.
-	            return item.map((entry) => this.initEntitiesFromData(entry));
+	            return item.map((entry) => this.initEntitiesFromData(entry, isFromSave));
 	        }
 	        else if (item instanceof Object && !(item instanceof Entity)) {
 	            if (item.hasOwnProperty('class') &&
@@ -24043,12 +24148,12 @@
 	                item.hasOwnProperty('tags') &&
 	                item.hasOwnProperty('data') &&
 	                classNamesToEntityConstructors(this, item.class) != null) {
-	                return this.initEntity(item);
+	                return this.initEntity(item, isFromSave);
 	            }
 	            else {
 	                for (let [key, value] of Object.entries(item)) {
 	                    // @ts-ignore: Key comes from the object. It's fine.
-	                    item[key] = this.initEntitiesFromData(value);
+	                    item[key] = this.initEntitiesFromData(value, isFromSave);
 	                }
 	            }
 	        }
@@ -24094,7 +24199,7 @@
 	        });
 	        return {
 	            ...data,
-	            return: this.initEntitiesFromData(data.return),
+	            return: this.initEntitiesFromData(data.return, false),
 	        };
 	    }
 	    async serverCallStatic(className, method, params) {
@@ -24112,7 +24217,7 @@
 	                },
 	            },
 	        });
-	        return this.initEntitiesFromData(data);
+	        return this.initEntitiesFromData(data, false);
 	    }
 	    async serverCallStaticIterator(className, method, params) {
 	        const iterable = await requester.POST_ITERATOR({
@@ -24139,7 +24244,7 @@
 	                        yield response;
 	                    }
 	                    else {
-	                        yield that.initEntitiesFromData(response);
+	                        yield that.initEntitiesFromData(response, false);
 	                    }
 	                }
 	            },
@@ -24247,8 +24352,8 @@
 	    }
 	    constructor() {
 	        super();
-	        this.$data.enabled = true;
-	        this.$data.abilities = [];
+	        this.enabled = true;
+	        this.abilities = [];
 	    }
 	    async $checkGroupname() {
 	        return await this.$serverCall('$checkGroupname', [], true);
@@ -24426,10 +24531,10 @@
 	    }
 	    constructor() {
 	        super();
-	        this.$data.enabled = true;
-	        this.$data.abilities = [];
-	        this.$data.groups = [];
-	        this.$data.inheritAbilities = true;
+	        this.enabled = true;
+	        this.abilities = [];
+	        this.groups = [];
+	        this.inheritAbilities = true;
 	    }
 	    async $checkUsername() {
 	        return await this.$serverCall('$checkUsername', [], true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld-setup",
-  "version": "1.0.0-beta.132",
+  "version": "1.0.0-beta.134",
   "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.132",
-    "@nymphjs/tilmeld": "^1.0.0-beta.132",
+    "@nymphjs/nymph": "^1.0.0-beta.134",
+    "@nymphjs/tilmeld": "^1.0.0-beta.134",
     "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.132",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.132",
-    "@nymphjs/query-parser": "^1.0.0-beta.132",
-    "@nymphjs/server": "^1.0.0-beta.132",
-    "@nymphjs/tilmeld-client": "^1.0.0-beta.132",
-    "@nymphjs/tilmeld-components": "^1.0.0-beta.132",
+    "@nymphjs/client": "^1.0.0-beta.134",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.134",
+    "@nymphjs/query-parser": "^1.0.0-beta.134",
+    "@nymphjs/server": "^1.0.0-beta.134",
+    "@nymphjs/tilmeld-client": "^1.0.0-beta.134",
+    "@nymphjs/tilmeld-components": "^1.0.0-beta.134",
     "@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": "d421575ba555d6c9025ec4b3d9f6ce0f498adbf2"
+  "gitHead": "31b045084100c2267c2eac7ad457d52983b0b895"
 }