neo.mjs 5.10.10 → 5.10.11

package/apps/ServiceWorker.mjs

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

package/examples/ServiceWorker.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.10.10",
+    "version": "5.10.11",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -49,15 +49,15 @@
         "clean-webpack-plugin": "^4.0.0",
         "commander": "^11.0.0",
         "cssnano": "^6.0.1",
-        "envinfo": "^7.8.1",
+        "envinfo": "^7.10.0",
         "fs-extra": "^11.1.1",
         "highlightjs-line-numbers.js": "^2.8.0",
         "inquirer": "^9.2.7",
         "neo-jsdoc": "^1.0.1",
         "neo-jsdoc-x": "^1.0.5",
         "postcss": "^8.4.24",
-        "sass": "^1.63.4",
-        "webpack": "^5.87.0",
+        "sass": "^1.63.6",
+        "webpack": "^5.88.0",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "4.15.1",
         "webpack-hook-plugin": "^1.0.7",

package/src/DefaultConfig.mjs

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

package/src/core/Base.mjs

@@ -27,7 +27,6 @@ class Base {
      * @type {Object}
      */
     static overwrittenMethods = {}
-
     /**
      * Set this one to false in case you don't want to stick
      * to the "anti-pattern" to apply classes to the global Neo or App namespace
@@ -36,7 +35,6 @@ class Base {
      * @static
      */
     static registerToGlobalNs = true
-
     /**
      * Configs will get merged throughout the class hierarchy
      * @returns {Object} config
@@ -229,7 +227,7 @@ class Base {
      * @param {String} id
      */
     createId(id) {
-        this.id = id || IdGenerator.getId(this.getIdKey());
+        this.id = id || IdGenerator.getId(this.getIdKey())
     }
 
     /**
@@ -249,7 +247,7 @@ class Base {
             if (Object.getOwnPropertyDescriptor(me, key).writable) {
                 delete me[key];
             }
-        });
+        })
     }
 
     /**
@@ -258,7 +256,7 @@ class Base {
      * @returns {String}
      */
     getIdKey() {
-        return this.ntype;
+        return this.ntype
     }
 
     /**
@@ -267,7 +265,7 @@ class Base {
      * @returns {*}
      */
     getStaticConfig(key) {
-        return this.constructor[key];
+        return this.constructor[key]
     }
 
     /**
@@ -286,7 +284,7 @@ class Base {
         let me = this;
 
         Object.assign(me[configSymbol], me.mergeConfig(config, preventOriginalConfig));
-        me.processConfigs();
+        me.processConfigs()
     }
 
     /**
@@ -308,10 +306,10 @@ class Base {
             if (Neo.workerId !== 'main' && currentWorker.isSharedWorker && !currentWorker.isConnected) {
                 listenerId = currentWorker.on('connected', () => {
                     currentWorker.un('connected', listenerId);
-                    Base.sendRemotes(className, remote);
+                    Base.sendRemotes(className, remote)
                 });
             } else {
-                Base.sendRemotes(className, remote);
+                Base.sendRemotes(className, remote)
             }
         }
     }
@@ -334,7 +332,7 @@ class Base {
             me.originalConfig = Neo.clone(config, true, true);
         }
 
-        return {...ctor.config, ...config};
+        return {...ctor.config, ...config}
     }
 
     /**
@@ -346,7 +344,7 @@ class Base {
         me.isConstructed = true;
 
         // We can only fire the event in case the Observable mixin is included.
-        me.getStaticConfig('observable') && me.fire('constructed', me);
+        me.getStaticConfig('observable') && me.fire('constructed', me)
     }
 
     /**
@@ -392,8 +390,8 @@ class Base {
                             }
                         }
                     }
-                });
-            });
+                })
+            })
         }
     }
 
@@ -420,7 +418,7 @@ class Base {
             // we need to keep this one for configs, which do not use getters (no trailing underscore)
             delete me[configSymbol][keys[0]];
 
-            me.processConfigs(forceAssign);
+            me.processConfigs(forceAssign)
         }
     }
 
@@ -439,7 +437,7 @@ class Base {
                     action: 'registerRemote',
                     className,
                     methods
-                });
+                })
             }
         });
     }
@@ -462,7 +460,7 @@ class Base {
 
         Object.assign(me[configSymbol], values);
 
-        me.processConfigs(true);
+        me.processConfigs(true)
     }
 
     /**
@@ -480,7 +478,7 @@ class Base {
                 me[key] = value;
                 delete config[key];
             }
-        });
+        })
 
         return config;
     }
@@ -496,10 +494,10 @@ class Base {
 
         if (staticConfig.hasOwnProperty(key)) {
             staticConfig[key] = value;
-            return true;
+            return true
         }
 
-        return false;
+        return false
     }
 
     /**
@@ -508,7 +506,7 @@ class Base {
      * @returns {String}
      */
     get [Symbol.toStringTag]() {
-        return `${this.className} (id: ${this.id})`;
+        return `${this.className} (id: ${this.id})`
     }
 
     /**
@@ -521,10 +519,10 @@ class Base {
      */
     static [Symbol.hasInstance](instance) {
         if (!instance) {
-            return false;
+            return false
         }
 
-        return instance[isInstance] === true ? super[Symbol.hasInstance](instance) : false;
+        return instance[isInstance] === true ? super[Symbol.hasInstance](instance) : false
     }
 }
 

package/src/form/Container.mjs

@@ -30,6 +30,21 @@ class Container extends BaseContainer {
         {tag: 'form', cn: [], onsubmit: 'return false;'}
     }
 
+    /**
+     * Helper function used by setValues() which wraps the leaves of a tree structure into a new property
+     * @param {Object} values
+     * @param {String} configName
+     */
+    static adjustTreeLeaves(values={}, configName) {
+        Object.entries(values).forEach(([key, value]) => {
+            if (Neo.typeOf(value) === 'Object') {
+                this.adjustTreeLeaves(value, configName)
+            } else {
+                values[key] = {[configName]: value}
+            }
+        })
+    }
+
     /**
      * @param {Neo.container.Base} parent
      * @param {Object[]} modules
@@ -250,9 +265,7 @@ class Container extends BaseContainer {
      * @param {Boolean} suspendEvents=false
      */
     async setValues(values={}, suspendEvents=false) {
-        Object.entries(values).forEach(([key, value]) => {
-            values[key] = {value}
-        })
+        Container.adjustTreeLeaves(values, 'value');
 
         await this.setConfigs(values, suspendEvents)
     }

package/src/util/String.mjs

@@ -1,36 +1,69 @@
 import Base from '../core/Base.mjs';
 
 /**
- * @class Neo.util.StringUtil
+ * @class Neo.util.String
  * @extends Neo.core.Base
  */
 class StringUtil extends Base {
+    /**
+     * @member {Object} charEntityMap
+     * @static
+     */
+    static charEntityMap = {
+        '&' : '&',
+        '<' : '&lt;',
+        '>' : '&gt;',
+        '"' : '&quot;',
+        '\'': '&#039;'
+    }
+    /**
+     * @member {RegExp} charPattern
+     * @static
+     */
+    static charPattern = /[&<>"']/g
+    /**
+     * @member {RegExp} entityPattern
+     * @static
+     */
+    static entityPattern = /(&amp;)|(&lt;)|(&gt;)|(&quot;)|(&#039;)/g
+
     static config = {
         /**
-         * @member {String} className='Neo.util.StringUtil'
+         * @member {String} className='Neo.util.String'
          * @protected
          */
-        className: 'Neo.util.StringUtil'
+        className: 'Neo.util.String'
     }
-    
-     static escapedChars = {
-        '&': '&amp;',
-        '<': '&lt;',
-        '>': '&gt;',
-        '"': '&quot;',
-        '\'': '&#039;'
-     }
 
     /**
      * Escape HTML special characters
      * @param {String} value
      */
     static escapeHtml(value) {
+        let me = this; // inside a static method, we are pointing to the class prototype
+
         if (Neo.typeOf(value) !== 'String') {
             return value;
         }
 
-        return value.replace(/[&<>"']/g, (char) => this.escapedChars[char] || char);
+        return value.replace(me.charPattern, me.getEntityFromChar.bind(me));
+    }
+
+    /**
+     * Get char equivalent of a mapped entity
+     * @param {String} entity
+     */
+    static getCharFromEntity(entity) {
+        const mappedChar = Object.keys(this.charEntityMap).find(key => this.charEntityMap[key] === entity);
+        return mappedChar || entity;
+    }
+
+    /**
+     * Get entity equivalent of a mapped char
+     * @param {String} char
+     */
+    static getEntityFromChar(char) {
+        return this.charEntityMap[char] || char;
     }
 
     /**
@@ -38,19 +71,16 @@ class StringUtil extends Base {
      * @param {String} value
      */
     static unescapeHtml(value) {
+        let me = this; // inside a static method, we are pointing to the class prototype
+
         if (Neo.typeOf(value) !== 'String') {
             return value;
         }
 
-        return value.replace(/(&amp;)|(&lt;)|(&gt;)|(&quot;)|(&#039;)/g, (entity) => this.getKeyByValue(entity) || entity);
+        return value.replace(me.entityPattern, me.getCharFromEntity.bind(me));
     }
-
-    static getKeyByValue(value) {
-        return Object.keys(this.escapedChars).find(key => this.escapedChars[key] === value);
-      }
 }
 
-
 Neo.applyClassConfig(StringUtil);
 
 export default StringUtil;