neo.mjs 8.36.0 → 8.38.0

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='8.36.0'
+         * @member {String} version='8.38.0'
          */
-        version: '8.36.0'
+        version: '8.38.0'
     }
 
     /**

package/apps/portal/index.html

@@ -16,7 +16,7 @@
         "@type": "Organization",
         "name": "Neo.mjs"
       },
-      "datePublished": "2025-04-01",
+      "datePublished": "2025-04-03",
       "publisher": {
         "@type": "Organization",
         "name": "Neo.mjs"

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v8.36.0'
+                html  : 'v8.38.0'
             }]
         }],
         /**

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='8.36.0'
+         * @member {String} version='8.38.0'
          */
-        version: '8.36.0'
+        version: '8.38.0'
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "8.36.0",
+    "version": "8.38.0",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -62,7 +62,7 @@
         "neo-jsdoc": "1.0.1",
         "neo-jsdoc-x": "1.0.5",
         "postcss": "^8.5.3",
-        "sass": "^1.86.1",
+        "sass": "^1.86.3",
         "siesta-lite": "5.5.2",
         "url": "^0.11.4",
         "webpack": "^5.98.0",

package/resources/data/deck/learnneo/pages/tutorials/Earthquakes.md

@@ -684,15 +684,15 @@ class Table extends Base {
         columns: [{
             dataField: "timestamp",
             text: "Date",
-            renderer: (data) => data.value.toLocaleDateString(undefined, {weekday: "long", year: "numeric", month: "long", day: "numeric"}),
+            renderer: (data) => data.value.toLocaleDateString(undefined, {weekday: "long", year: "numeric", month: "long", day: "numeric"})
         }, {
             dataField: "location",
-            text: "Location",
+            text: "Location"
         }, {
             dataField: "magnitude",
             text: "Magnitude",
             align: "right",
-            renderer: (data) => data.value.toLocaleString(),
+            renderer: (data) => data.value.toLocaleString()
         }],
     }
 }

package/src/DefaultConfig.mjs

@@ -263,12 +263,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '8.36.0'
+     * @default '8.38.0'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '8.36.0'
+    version: '8.38.0'
 };
 
 Object.assign(DefaultConfig, {

package/src/data/Model.mjs

@@ -40,6 +40,13 @@ class Model extends Base {
     }
 
     /**
+     * Internally storing all fields, which have a calculate property
+     * @member {Map} calculatedFieldsMap=new Map()
+     * @protected
+     */
+    calculatedFieldsMap = new Map()
+    /**
+     * Internally storing all fields inside a flat map => nested fields included
      * @member {Map} fieldsMap=new Map()
      * @protected
      */
@@ -85,11 +92,12 @@ class Model extends Base {
      * @param {String} path=''
      */
     updateFieldsMap(fields, isRoot=true, path='') {
-        let me          = this,
-            {fieldsMap} = me,
+        let me = this,
+            {calculatedFieldsMap, fieldsMap} = me,
             fieldName;
 
         if (isRoot) {
+            calculatedFieldsMap.clear();
             fieldsMap.clear();
             me.hasNestedFields = false
         }
@@ -97,12 +105,15 @@ class Model extends Base {
         fields.forEach(field => {
             fieldName = path + field.name
 
-            // Assuming that nested fields contain the full path as the name, we do not need a prefix.
             if (field.fields) {
                 me.hasNestedFields = true;
                 me.updateFieldsMap(field.fields, false, field.name + '.')
             } else {
-                fieldsMap.set(fieldName, field)
+                fieldsMap.set(fieldName, field);
+
+                if (field.calculate) {
+                    calculatedFieldsMap.set(fieldName, field)
+                }
             }
         })
     }

package/src/data/RecordFactory.mjs

@@ -82,24 +82,11 @@ class RecordFactory extends Base {
                         return this[dataSymbol][fieldName]
                     },
                     set(value) {
-                        let me       = this,
-                            oldValue = me[dataSymbol][fieldName];
-
-                        value = instance.parseRecordValue(me, field, value);
-
-                        if (!Neo.isEqual(value, oldValue)) {
-                            instance.setRecordData({fieldName: fieldPath, model, record: me, value});
-
-                            if (!model.trackModifiedFields) {
-                                me[isModifiedSymbol] = true
-                            }
-
-                            instance.onRecordChange({
-                                fields: [{name: fieldPath, oldValue, value}],
-                                model,
-                                record: me
-                            })
-                        }
+                        instance.setRecordFields({
+                            fields: {[fieldPath]: instance.parseRecordValue({record: this, field, value})},
+                            model,
+                            record: this
+                        })
                     }
                 }
             };
@@ -165,10 +152,11 @@ class RecordFactory extends Base {
                         if (model.trackModifiedFields) {
                             me[originalDataSymbol] = {};
                             me.setOriginal(config)
+                        } else {
+                            me[isModifiedSymbol] = false
                         }
 
                         me.setSilent(config); // We do not want to fire change events when constructing
-                        me[isModifiedSymbol] = false
                     }
 
                     /**
@@ -285,16 +273,17 @@ class RecordFactory extends Base {
     }
 
     /**
-     * todo: parse value for more field types
-     * @param {Object} record
-     * @param {Object} field
-     * @param {*} value
-     * @param {Object} recordConfig=null
+     * @param {Object}  data
+     * @param {Object}  data.record
+     * @param {Object}  data.field
+     * @param {*}       [data.value=null]
+     * @param {Object}  [data.recordConfig=null]
+     * @param {Boolean} [data.useOriginalData=false]
      * @returns {*}
      */
-    parseRecordValue(record, field, value, recordConfig=null) {
+    parseRecordValue({record, field, value=null, recordConfig=null, useOriginalData=false}) {
         if (field.calculate) {
-            return field.calculate(record, field, recordConfig)
+            return field.calculate(record[useOriginalData ? originalDataSymbol : dataSymbol], field)
         }
 
         if (field.convert) {
@@ -400,8 +389,9 @@ class RecordFactory extends Base {
      * @param {Boolean}        data.useOriginalData=false true will apply changes to the originalData symbol
      */
     setRecordFields({changedFields=[], fields, model, record, silent=false, useOriginalData=false}) {
-        let {fieldsMap, trackModifiedFields} = model,
-            fieldExists, oldValue;
+        let me = this,
+            {calculatedFieldsMap, fieldsMap, trackModifiedFields} = model,
+            fieldExists, hasChangedFields, oldValue;
 
         if (!trackModifiedFields && useOriginalData) {
             return
@@ -412,7 +402,7 @@ class RecordFactory extends Base {
 
             if (Neo.isObject(value) && !fieldExists) {
                 Object.entries(value).forEach(([childKey, childValue]) => {
-                    this.setRecordFields({
+                    me.setRecordFields({
                         changedFields,
                         fields: {[`${key}.${childKey}`]: childValue},
                         model,
@@ -423,10 +413,10 @@ class RecordFactory extends Base {
                 })
             } else if (fieldExists) {
                 oldValue = record[key];
-                value    = instance.parseRecordValue(record, model.getField(key), value);
+                value    = me.parseRecordValue({record, field: model.getField(key), value});
 
                 if (!Neo.isEqual(oldValue, value)) {
-                    instance.setRecordData({fieldName: key, model, record, useOriginalData, value});
+                    me.setRecordData({fieldName: key, model, record, useOriginalData, value});
 
                     if (!trackModifiedFields && !useOriginalData) {
                         record[isModifiedSymbol] = true
@@ -437,8 +427,23 @@ class RecordFactory extends Base {
             }
         });
 
-        if (!silent && !useOriginalData && Object.keys(changedFields).length > 0) {
-            Neo.get(model.storeId)?.onRecordChange({fields: changedFields, model, record})
+        hasChangedFields = Object.keys(changedFields).length > 0;
+
+        if (hasChangedFields) {
+            calculatedFieldsMap.forEach((value, key) => {
+                oldValue = record[key];
+                value    = me.parseRecordValue({record, field: model.getField(key), useOriginalData});
+
+                if (!Neo.isEqual(oldValue, value)) {
+                    me.setRecordData({fieldName: key, model, record, useOriginalData, value});
+
+                    changedFields.push({name: key, oldValue, value})
+                }
+            })
+        }
+
+        if (!silent && !useOriginalData && hasChangedFields) {
+            me.onRecordChange({fields: changedFields, model, record})
         }
     }
 }