v2.0

Author: manuel-lohmus

README.html

@@ -437,7 +437,7 @@ <h3 id="reviver"><em>Reviver</em></h3>
 or <a href="#createdatacontextdata-propertyname-parent"><code>createDataContext</code></a> or <code>null</code></p>
 <h2 id="license">License</h2>
 <p>This project is licensed under the MIT License.</p>
-<p>Copyright © 2024 Manuel Lõhmus</p>
+<p>Copyright © Manuel Lõhmus</p>
 <p><a href="https://www.paypal.com/donate?hosted_button_id=TMZURGNWWYUBW"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif" alt="Donate" /></a></p>
 <p>Donations are welcome and will go towards further development of this project.</p>
 <br>

README.md

@@ -423,7 +423,7 @@ or [`createDataContext`](#createdatacontextdata-propertyname-parent) or `null`
 
 This project is licensed under the MIT License.
 
-Copyright © 2024 Manuel Lõhmus
+Copyright © Manuel Lõhmus
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/donate?hosted_button_id=TMZURGNWWYUBW)
 

index.js

@@ -1,4 +1,3 @@
-
 /**  Copyright (c) Manuel Lõhmus (MIT License). */
 
 "use strict";
@@ -211,7 +210,7 @@
                                 delete emitToParent.timeout;
 
                                 _this.emit("-change", { eventName: "-change", target: _this });
-                            }, 0, this);
+                            }, 10, this);
                         }
 
                         if ((eventName === '-' || eventName === '-change') &&
@@ -469,10 +468,10 @@
                     }
 
                     target.emitToParent("-", { eventName, target, propertyPath: [property], oldValue, newValue });
+                    target.emit(property, { eventName, target, propertyPath: [property], oldValue, newValue });
 
                     setModified(target, property);
 
-                    target.emit(property, { eventName, target, propertyPath: [property], oldValue, newValue });
                     target.emitToParent("-change", { eventName: "-change", target });
 
                     return ret;
@@ -674,12 +673,21 @@
 
                 if (it.current === '\r' && it.following === '\r') {
 
-                    if (!def._isDataContext) { def = createDataContext(def); }
+                    if (!def._isDataContext) {
+
+                        def = createDataContext(def);
+                        def._isModified = true;
+                    }
+                    if (_typeof(val) === 'array') {
+
+                        val.length = 0;
+                    }
                     if (val?._events) { def._events = val._events; }
                     if (val?._propertyName && val._parent) {
 
                         def._parent = val._parent;
                         def._propertyName = val._propertyName;
+                        val._parent[val._propertyName] = def;
                     }
 
                     it.next();
@@ -960,7 +968,7 @@
                                 obj[k] = v;
 
                                 if (!v?._isDataContext && obj !== val && obj[k] === val?.[k]
-                                    || v?._isDataContext && !v._modified.length) {
+                                    || v?._isDataContext && !v.isChanged) {
 
                                     if (obj?._isDataContext) {
 
@@ -1402,6 +1410,8 @@
                             ? Object.values(value._modified).sort()
                             : Object.keys(value);
 
+                        if (type === "array") { keys = keys.filter(function (k) { return Number.isInteger(Number(k)) }); }
+
                         // write emty object
                         if (!keys.length) {
 
@@ -1657,12 +1667,18 @@
 
                 var isInitData = !fs.existsSync(filePath),
                     isFileProcessing = false,
-                    writeTimeout;
+                    writeTimeout,
+                    lastModifiedTime = Date.now();
 
                 if (!data) { data = createDataContext({}); }
                 if (!data._isDataContext) { data = createDataContext(data); }
 
-                fs.watchFile(filePath, (curr, prev) => { readFileSync(); });
+                fs.watchFile(filePath, (curr, prev) => {
+
+                    if (lastModifiedTime > curr.mtimeMs) { return; }
+                    
+                    readFileSync();
+                });
 
                 data.on('-change', (event) => {
 
@@ -1738,7 +1754,7 @@
                     writeTimeout = setTimeout(function () {
 
                         wait(write);
-                    }, 500);
+                    }, 5000);
 
 
                     function write() {
@@ -1755,6 +1771,7 @@
                         fs.writeFileSync(filePath, strJson, { encoding: 'utf8', flag: 'w', flush: true });
 
                         //data.resetChanges();
+                        lastModifiedTime = Date.now();
                         isFileProcessing = false;
 
                         if (onDataChange) {

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "data-context",
   "description": "Watch data changes in the browser and node.js",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "license": "MIT",
   "keywords": [
     "on",