feature(package) load.js v3.0.2

Author: coderaiser

client/_set-emmet.js

@@ -23,18 +23,18 @@ module.exports = function() {
 
     exec.if(this._Emmet, () => {
         this.setOption('enableEmmet', true);
-    }, (callback) => {
+    }, async (callback) => {
         const url = _PREFIX + join([
             dirVendor + 'emmet.js',
             dir + 'ext-emmet.js',
         ]);
 
-        load.js(url, () => {
-            this._Emmet = ace.require('ace/ext/emmet');
-            this._Emmet.setCore(window.emmet);
-            
-            callback();
-        });
+        await load.js(url);
+        
+        this._Emmet = ace.require('ace/ext/emmet');
+        this._Emmet.setCore(window.emmet);
+        
+        callback();
     });
 };
 

client/edward.js

@@ -15,12 +15,11 @@ const smalltalk = require('smalltalk');
 const {promisify} = require('es6-promisify');
 const jssha = require('jssha');
 const restafary = require('restafary/client');
+const tryToCatch = require('try-to-catch');
 
 window.load = window.load || load;
 window.exec = window.exec || exec;
 
-const loadJSON = promisify(load.json);
-
 const Story = require('./story');
 const _clipboard = require('./_clipboard');
 const _setEmmet = require('./_set-emmet');
@@ -121,7 +120,7 @@ Edward.prototype._init = function(fn) {
                 callback();
             });
         },
-        () => {
+        async () => {
             this._Emitter = Emitify();
             this._Ace = ace.edit(this._Element);
             this._Modelist = ace.require('ace/ext/modelist');
@@ -135,23 +134,24 @@ Edward.prototype._init = function(fn) {
             this._addCommands();
             this._Ace.$blockScrolling = Infinity;
 
-            load.json(this._PREFIX + '/edit.json', (error, config) => {
-                const {
-                    options = {},
-                } = config;
-                const preventOverwrite = () => {
-                    for (const name of Object.keys(this._Config.options)) {
-                        options[name] = this._Config.options[name];
-                    }
-                };
-                
-                fn();
-                preventOverwrite();
-                
-                this._Config = config;
-                
-                edward.setOptions(options);
-            });
+            const config = await load.json(this._PREFIX + '/edit.json');
+            
+            const {
+                options = {},
+            } = config;
+            
+            const preventOverwrite = () => {
+                for (const name of Object.keys(this._Config.options)) {
+                    options[name] = this._Config.options[name];
+                }
+            };
+            
+            fn();
+            preventOverwrite();
+            
+            this._Config = config;
+            
+            edward.setOptions(options);
         },
     ]);
 };
@@ -461,7 +461,7 @@ Edward.prototype._loadOptions = async function() {
     if (this._Options)
         return this._Options;
 
-    const data = await loadJSON(url);
+    const data = await load.json(url);
 
     this._Options = data;
 
@@ -495,14 +495,14 @@ Edward.prototype._diff = function(newValue) {
 
 Edward.prototype._setEmmet = _setEmmet;
 
-Edward.prototype._addExt = function(name, fn) {
+Edward.prototype._addExt = async function (name, fn) {
     if (this._Ext)
         return add(null, this._Ext);
 
-    load.json(this._PREFIX + '/json/ext.json', (error, data) => {
-        this._Ext = data;
-        add(error, this._Ext);
-    });
+    const [error, data] = await tryToCatch(load.json, this._PREFIX + '/json/ext.json');
+    this._Ext = data;
+    
+    add(error, this._Ext);
 
     function add(error, exts) {
         if (error)

package.json

@@ -74,7 +74,7 @@
     "eslint-plugin-putout": "^2.0.0",
     "execon": "^1.2.9",
     "jssha": "^2.3.1",
-    "load.js": "^2.0.0",
+    "load.js": "^3.0.2",
     "madrun": "^3.0.1",
     "nodemon": "^1.11.0",
     "once": "^1.4.0",