@dualbox/editor 1.0.90 → 1.0.92

package/js/dist/GraphEditor.min.js

@@ -18065,31 +18065,21 @@ class History {
     }
 
     // execute the callback and save the history as 1 change
-    batch(cb) {
-        let ret = this.ignore(cb);
-        if (ret && ret.then) {
-            // its a promise
-            return Promise.resolve(ret).then(() => {
-                return this.save();
-            });
-        } else {
-            return this.save();
-        }
+    async batch(cb) {
+        await this.ignore(cb);
+        return this.save();
     }
 
     // ignore history saves during the time of the callback
     // if cb return a promise, wait until it's resolved and return a Promise
-    ignore(cb) {
+    async ignore(cb) {
         this.holdSaving(true);
         let ret = cb();
-        if (ret && ret.then) {
-            // its a promise
-            return Promise.resolve(ret).then(() => {
-                this.holdSaving(false);
-            });
-        } else {
-            this.holdSaving(false);
-        }
+
+        // if cb returns a promise, wait for it
+        let result = ret && ret.then ? await ret : ret;
+        this.holdSaving(false);
+        return result;
     }
 }
 
@@ -43719,20 +43709,12 @@ class GraphModel {
 
     // batch all changes in a function into one (for history save)
     // if cb returns a Promise, return a Promise that will be resolved once it's all done
-    batch(cb) {
-        var ret = this.history.batch(cb);
-        if (ret && ret.then) {
-            // it's a promise, wait for it
-            return Promise.resolve(ret).then((diff) => {
-                if (this.onChangeCb) {
-                    this.onChangeCb(diff);
-                }
-            });
-        } else {
-            // not a promise, ret is our diff
-            let diff = ret;
+    async batch(cb) {
+        let diffChange = await this.history.batch(cb);
+        if (diffChange && diffChange.diff && diffChange.hash) {
+            let { diff, hash } = diffChange;
             if (this.onChangeCb) {
-                this.onChangeCb(diff);
+                this.onChangeCb(diff, hash);
             }
         }
     }
@@ -43918,8 +43900,8 @@ class GraphModel {
     }
 
     // add pkg dependencies (lib, types, etc) to app graph
-    addDependencies(pkg) {
-        lodash.each(pkg.dependencies, async (dependencyVersion, dependencyName) => {
+    async addDependencies(pkg) {
+        for (const dependencyName of Object.keys(pkg.dependencies)) {
             if (utils.isLibrary(dependencyName) || utils.isType(dependencyName)) {
                 console.log('[*] Adding dependency: ' + dependencyName);
                 // await this.e.loadPackage(dependencyName, dependencyVersion); // Is this better ?
@@ -43928,10 +43910,10 @@ class GraphModel {
                 this.data.root.libs[pkg.name] = pkg.version;
                 await this.addDependencies(pkg);
             }
-        });
+        }
     }
 
-    addNode(id, pkg) {
+    async addNode(id, pkg) {
         console.log('adding node: ' + id);
 
         var desc = {
@@ -43946,7 +43928,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().modules[id] = desc;
-            this.addDependencies(pkg); // async but no pb
+            await this.addDependencies(pkg); // async but no pb
         } else if (utils.isUI(pkg.name)) {
             this.ensure('ui');
             if (this.getCurrentMetanode().ui[id]) {
@@ -43954,7 +43936,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().ui[id] = desc;
-            this.addDependencies(pkg); // async but no pb
+            await this.addDependencies(pkg); // async but no pb
         } else {
             // may be a metanode
             var nodeDef = idx_1(this.getCurrentMetanode(), o => o.metanodes[pkg.name]);
@@ -45788,8 +45770,6 @@ class GraphNode {
                 });
             }
         });
-
-        this.m.save();
     }
 }
 
@@ -90677,7 +90657,7 @@ class GraphController {
     }
 
     // Add a node from the search results
-    addNewBox(packageName, pos = null) {
+    async addNewBox(packageName, pos = null) {
         // first, make sure the package is loaded
         this.e.loadPackage(packageName).then(async () => {
             var id = this.createId(packageName);
@@ -90692,8 +90672,8 @@ class GraphController {
             if (pkg) {
                 // first, add node in the model
                 // batch it so add node + set position + register to UI is 1 history change only
-                this.m.batch(async () => {
-                    var nodeInfo = this.m.addNode(id, pkg);
+                await this.m.batch(async () => {
+                    var nodeInfo = await this.m.addNode(id, pkg);
                     if (nodeInfo) {
                         if (pos) {
                             var node = this.m.getNode(nodeInfo.id);
@@ -90717,7 +90697,7 @@ class GraphController {
     }
 
     // create a new metabox
-    addNewMetabox(name, json = {}, pos) {
+    async addNewMetabox(name, json = {}, pos) {
         if (this.m.hasMetanode(name)) {
             sweetalert2_all("Can't add metabox", "metabox with name '" + name + "' already exists.", "error");
         } else {
@@ -90727,7 +90707,7 @@ class GraphController {
             // add 1 node of this metabox on the graph
             var id = this.createId(name);
 
-            this.m.addNode(id, {
+            await this.m.addNode(id, {
                 "name": name,
                 "version": "*"
             });
@@ -91275,8 +91255,8 @@ class GraphController {
         return await navigator.clipboard.readText();
     }
 
-    deleteSelection() {
-        this.m.batch(() => {
+    async deleteSelection() {
+        await this.m.batch(() => {
             var selectedDivs = this.v.selector.getSelection();
             lodash.each(selectedDivs, (div) => {
                 this.m.getNode($(div).attr('id')).remove();

package/js/src/c/GraphController.js

@@ -78,7 +78,7 @@ class GraphController {
     }
 
     // Add a node from the search results
-    addNewBox(packageName, pos = null) {
+    async addNewBox(packageName, pos = null) {
         // first, make sure the package is loaded
         this.e.loadPackage(packageName).then(async () => {
             var id = this.createId(packageName);
@@ -93,8 +93,8 @@ class GraphController {
             if (pkg) {
                 // first, add node in the model
                 // batch it so add node + set position + register to UI is 1 history change only
-                this.m.batch(async () => {
-                    var nodeInfo = this.m.addNode(id, pkg);
+                await this.m.batch(async () => {
+                    var nodeInfo = await this.m.addNode(id, pkg);
                     if (nodeInfo) {
                         if (pos) {
                             var node = this.m.getNode(nodeInfo.id);
@@ -118,7 +118,7 @@ class GraphController {
     }
 
     // create a new metabox
-    addNewMetabox(name, json = {}, pos) {
+    async addNewMetabox(name, json = {}, pos) {
         if (this.m.hasMetanode(name)) {
             swal("Can't add metabox", "metabox with name '" + name + "' already exists.", "error");
         } else {
@@ -128,7 +128,7 @@ class GraphController {
             // add 1 node of this metabox on the graph
             var id = this.createId(name);
 
-            this.m.addNode(id, {
+            await this.m.addNode(id, {
                 "name": name,
                 "version": "*"
             });
@@ -676,8 +676,8 @@ class GraphController {
         return await navigator.clipboard.readText();
     }
 
-    deleteSelection() {
-        this.m.batch(() => {
+    async deleteSelection() {
+        await this.m.batch(() => {
             var selectedDivs = this.v.selector.getSelection();
             _.each(selectedDivs, (div) => {
                 this.m.getNode($(div).attr('id')).remove();

package/js/src/m/GraphModel.js

@@ -217,20 +217,12 @@ class GraphModel {
 
     // batch all changes in a function into one (for history save)
     // if cb returns a Promise, return a Promise that will be resolved once it's all done
-    batch(cb) {
-        var ret = this.history.batch(cb);
-        if (ret && ret.then) {
-            // it's a promise, wait for it
-            return Promise.resolve(ret).then((diff) => {
-                if (this.onChangeCb) {
-                    this.onChangeCb(diff);
-                }
-            });
-        } else {
-            // not a promise, ret is our diff
-            let diff = ret;
+    async batch(cb) {
+        let diffChange = await this.history.batch(cb);
+        if (diffChange && diffChange.diff && diffChange.hash) {
+            let { diff, hash } = diffChange;
             if (this.onChangeCb) {
-                this.onChangeCb(diff);
+                this.onChangeCb(diff, hash);
             }
         }
     }
@@ -416,8 +408,8 @@ class GraphModel {
     }
 
     // add pkg dependencies (lib, types, etc) to app graph
-    addDependencies(pkg) {
-        _.each(pkg.dependencies, async (dependencyVersion, dependencyName) => {
+    async addDependencies(pkg) {
+        for (const dependencyName of Object.keys(pkg.dependencies)) {
             if (utils.isLibrary(dependencyName) || utils.isType(dependencyName)) {
                 console.log('[*] Adding dependency: ' + dependencyName);
                 // await this.e.loadPackage(dependencyName, dependencyVersion); // Is this better ?
@@ -426,10 +418,10 @@ class GraphModel {
                 this.data.root.libs[pkg.name] = pkg.version;
                 await this.addDependencies(pkg);
             }
-        });
+        }
     }
 
-    addNode(id, pkg) {
+    async addNode(id, pkg) {
         console.log('adding node: ' + id);
 
         var desc = {
@@ -444,7 +436,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().modules[id] = desc;
-            this.addDependencies(pkg); // async but no pb
+            await this.addDependencies(pkg); // async but no pb
         } else if (utils.isUI(pkg.name)) {
             this.ensure('ui');
             if (this.getCurrentMetanode().ui[id]) {
@@ -452,7 +444,7 @@ class GraphModel {
                 return false;
             }
             var node = this.getCurrentMetanode().ui[id] = desc;
-            this.addDependencies(pkg); // async but no pb
+            await this.addDependencies(pkg); // async but no pb
         } else {
             // may be a metanode
             var nodeDef = idx(this.getCurrentMetanode(), o => o.metanodes[pkg.name]);
@@ -2286,8 +2278,6 @@ class GraphNode {
                 });
             }
         });
-
-        this.m.save();
     }
 }
 

package/js/src/m/History.js

@@ -141,31 +141,21 @@ class History {
     }
 
     // execute the callback and save the history as 1 change
-    batch(cb) {
-        let ret = this.ignore(cb);
-        if (ret && ret.then) {
-            // its a promise
-            return Promise.resolve(ret).then(() => {
-                return this.save();
-            });
-        } else {
-            return this.save();
-        }
+    async batch(cb) {
+        await this.ignore(cb);
+        return this.save();
     }
 
     // ignore history saves during the time of the callback
     // if cb return a promise, wait until it's resolved and return a Promise
-    ignore(cb) {
+    async ignore(cb) {
         this.holdSaving(true);
         let ret = cb();
-        if (ret && ret.then) {
-            // its a promise
-            return Promise.resolve(ret).then(() => {
-                this.holdSaving(false);
-            });
-        } else {
-            this.holdSaving(false);
-        }
+
+        // if cb returns a promise, wait for it
+        let result = ret && ret.then ? await ret : ret;
+        this.holdSaving(false);
+        return result;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dualbox/editor",
-    "version": "1.0.90",
+    "version": "1.0.92",
     "description": "Editor of Dualbox apps",
     "browser": "js/dist/GraphEditor.js",
     "main": "js/dist/GraphEditor.js",