Browse Source

Fix lint issues

Lutz Roeder 6 years ago
parent
commit
05761e1a62
23 changed files with 159 additions and 192 deletions
  1. 6 1
      .eslintrc.json
  2. 81 85
      src/app.js
  3. 8 4
      src/base.js
  4. 16 32
      src/cntk.js
  5. 1 2
      src/coreml.js
  6. 1 2
      src/darknet.js
  7. 7 5
      src/index.js
  8. 1 2
      src/keras.js
  9. 3 6
      src/mlnet.js
  10. 2 4
      src/mxnet.js
  11. 2 4
      src/ncnn.js
  12. 1 2
      src/numpy.js
  13. 3 6
      src/onnx.js
  14. 4 2
      src/openvino.js
  15. 10 5
      src/python.js
  16. 3 6
      src/pytorch.js
  17. 1 2
      src/sklearn.js
  18. 2 4
      src/tf.js
  19. 0 1
      src/tflite-schema.js
  20. 2 4
      src/tflite.js
  21. 2 4
      src/torchscript.js
  22. 2 4
      src/view-grapher.js
  23. 1 5
      tools/tflite

+ 6 - 1
.eslintrc.json

@@ -11,8 +11,13 @@
     },
     "rules": {
         "indent": [ "error", 4 ],
-        "linebreak-style": [ "error", "unix" ]
+        "linebreak-style": [ "error", "unix" ],
+        "brace-style": [ "error", "stroustrup", { "allowSingleLine": true } ]
     },
+    "overrides": [
+      { "files": ["src/*-proto.js"], "rules": { "brace-style": "off" } },
+      { "files": ["src/*-schema.js"], "rules": { "indent": "off" } }
+    ],
     "globals": {
         "protobuf": "readonly"
     }

+ 81 - 85
src/app.js

@@ -24,13 +24,13 @@ class Application {
         }
 
         electron.app.on('second-instance', (event, commandLine, workingDirectory) => {
-            var currentDirectory = process.cwd();
+            let currentDirectory = process.cwd();
             process.chdir(workingDirectory);
-            var open = this._parseCommandLine(commandLine);
+            let open = this._parseCommandLine(commandLine);
             process.chdir(currentDirectory);
             if (!open) {
                 if (this._views.count > 0) {
-                    var view = this._views.item(0);
+                    let view = this._views.item(0);
                     if (view) {
                         view.restore();
                     }
@@ -43,7 +43,7 @@ class Application {
         });
 
         electron.ipcMain.on('drop-files', (e, data) => {
-            var files = data.files.filter((file) => fs.statSync(file).isFile());
+            let files = data.files.filter((file) => fs.statSync(file).isFile());
             this._dropFiles(e.sender, files);
         });
 
@@ -72,11 +72,11 @@ class Application {
     }
 
     _parseCommandLine(argv) {
-        var open = false;
+        let open = false;
         if (argv.length > 1) {
-            for (var arg of argv.slice(1)) {
+            for (let arg of argv.slice(1)) {
                 if (!arg.startsWith('-')) {
-                    var extension = arg.split('.').pop().toLowerCase();
+                    let extension = arg.split('.').pop().toLowerCase();
                     if (extension != '' && extension != 'js' && fs.existsSync(arg) && fs.statSync(arg).isFile()) {
                         this._openFile(arg);
                         open = true;
@@ -94,10 +94,10 @@ class Application {
         }
         global.userId = this._configuration.get('userId');
         if (this._openFileQueue) {
-            var openFileQueue = this._openFileQueue;
+            let openFileQueue = this._openFileQueue;
             this._openFileQueue = null;
             while (openFileQueue.length > 0) {
-                var file = openFileQueue.shift();
+                let file = openFileQueue.shift();
                 this._openFile(file);
             }
         }
@@ -114,7 +114,7 @@ class Application {
     }
 
     _openFileDialog() {
-        var showOpenDialogOptions = { 
+        let showOpenDialogOptions = { 
             properties: [ 'openFile' ], 
             filters: [
                 { name: 'All Model Files',  extensions: [ 
@@ -136,7 +136,7 @@ class Application {
         };
         electron.dialog.showOpenDialog(showOpenDialogOptions, (selectedFiles) => {
             if (selectedFiles) {
-                for (var selectedFile of selectedFiles) {
+                for (let selectedFile of selectedFiles) {
                     this._openFile(selectedFile);
                 }
             }
@@ -150,7 +150,7 @@ class Application {
         }
         if (file && file.length > 0 && fs.existsSync(file) && fs.statSync(file).isFile()) {
             // find existing view for this file
-            var view = this._views.find(file);
+            let view = this._views.find(file);
             // find empty welcome window
             if (view == null) {
                 view = this._views.find(null);
@@ -164,7 +164,7 @@ class Application {
     }
 
     _loadFile(file, view) {
-        var recents = this._configuration.get('recents');
+        let recents = this._configuration.get('recents');
         recents = recents.filter(recent => file != recent.path);
         view.open(file);
         recents.unshift({ path: file });
@@ -176,8 +176,8 @@ class Application {
     }
 
     _dropFiles(sender, files) {
-        var view = this._views.from(sender);
-        for (var file of files) {
+        let view = this._views.from(sender);
+        for (let file of files) {
             if (view) {
                 this._loadFile(file, view);
                 view = null;
@@ -189,16 +189,16 @@ class Application {
     }
 
     _export() {
-        var view = this._views.activeView;
+        let view = this._views.activeView;
         if (view && view.path) {
-            var defaultPath = 'Untitled';
-            var file = view.path;
-            var lastIndex = file.lastIndexOf('.');
+            let defaultPath = 'Untitled';
+            let file = view.path;
+            let lastIndex = file.lastIndexOf('.');
             if (lastIndex != -1) {
                 defaultPath = file.substring(0, lastIndex);
             }
-            var owner = electron.BrowserWindow.getFocusedWindow();
-            var showSaveDialogOptions = {
+            let owner = electron.BrowserWindow.getFocusedWindow();
+            let showSaveDialogOptions = {
                 title: 'Export',
                 defaultPath: defaultPath,
                 buttonLabel: 'Export',
@@ -216,7 +216,7 @@ class Application {
     }
 
     execute(command, data) {
-        var view = this._views.activeView;
+        let view = this._views.activeView;
         if (view) {
             view.execute(command, data || {});
         }
@@ -224,7 +224,7 @@ class Application {
     }
 
     _reload() {
-        var view = this._views.activeView;
+        let view = this._views.activeView;
         if (view && view.path) {
             this._loadFile(view.path, view);
         }
@@ -234,8 +234,8 @@ class Application {
         if (!electron.app.isPackaged) {
             return;
         }
-        var autoUpdater = updater.autoUpdater;
-        var promise = autoUpdater.checkForUpdates();
+        let autoUpdater = updater.autoUpdater;
+        let promise = autoUpdater.checkForUpdates();
         if (promise) {
             promise.catch((error) => {
                 console.log(error.message);
@@ -245,9 +245,9 @@ class Application {
 
     get package() { 
         if (!this._package) {
-            var appPath = electron.app.getAppPath();
-            var file = appPath + '/package.json'; 
-            var data = fs.readFileSync(file);
+            let appPath = electron.app.getAppPath();
+            let file = appPath + '/package.json'; 
+            let data = fs.readFileSync(file);
             this._package = JSON.parse(data);
             this._package.date = new Date(fs.statSync(file).mtime);
         }
@@ -255,16 +255,16 @@ class Application {
     }
 
     _about() {
-        var owner = electron.BrowserWindow.getFocusedWindow();
-        var author = this.package.author;
-        var date = this.package.date;
-        var details = [];
+        let owner = electron.BrowserWindow.getFocusedWindow();
+        let author = this.package.author;
+        let date = this.package.date;
+        let details = [];
         details.push('Version ' + electron.app.getVersion());
         if (author && author.name && date) {
             details.push('');
             details.push('Copyright \u00A9 ' + date.getFullYear().toString() + ' ' + author.name);
         }
-        var aboutDialogOptions = {
+        let aboutDialogOptions = {
             icon: path.join(__dirname, 'icon.png'),
             title: ' ',
             message: electron.app.getName(),
@@ -274,7 +274,7 @@ class Application {
     }
 
     _updateMenu() {
-        var context = {};
+        let context = {};
         context.window = electron.BrowserWindow.getFocusedWindow();
         context.webContents = context.window ? context.window.webContents : null; 
         context.view = this._views.activeView;
@@ -283,16 +283,16 @@ class Application {
 
     _resetMenu() {
 
-        var menuRecentsTemplate = [];
+        let menuRecentsTemplate = [];
         if (this._configuration.has('recents')) {
-            var recents = this._configuration.get('recents');
+            let recents = this._configuration.get('recents');
             recents = recents.filter(recent => fs.existsSync(recent.path) && fs.statSync(recent.path).isFile());
             if (recents.length > 9) {
                 recents.splice(9);
             }
             this._configuration.set('recents', recents);
-            for (var i = 0; i < recents.length; i++) {
-                var recent = recents[i];
+            for (let i = 0; i < recents.length; i++) {
+                let recent = recents[i];
                 menuRecentsTemplate.push({
                     file: recent.path,
                     label: Application.minimizePath(recent.path),
@@ -302,7 +302,7 @@ class Application {
             }
         }
 
-        var menuTemplate = [];
+        let menuTemplate = [];
         
         if (process.platform === 'darwin') {
             menuTemplate.unshift({
@@ -392,7 +392,7 @@ class Application {
             ]
         });
     
-        var viewTemplate = {
+        let viewTemplate = {
             label: '&View',
             submenu: [
                 {
@@ -463,7 +463,7 @@ class Application {
             });
         }
 
-        var helpSubmenu = [
+        let helpSubmenu = [
             {
                 label: '&Search Feature Requests',
                 click: () => { electron.shell.openExternal('https://www.github.com/' + this.package.repository + '/issues'); }
@@ -487,7 +487,7 @@ class Application {
             submenu: helpSubmenu
         });
 
-        var commandTable = new Map();
+        let commandTable = new Map();
         commandTable.set('file.export', {
             enabled: (context) => { return context.view && context.view.path ? true : false; }
         });
@@ -540,9 +540,8 @@ class Application {
 
     static minimizePath(file) {
         if (process.platform != 'win32') {
-            var home = os.homedir();
-            if (file.startsWith(home))
-            {
+            let home = os.homedir();
+            if (file.startsWith(home)) {
                 return '~' + file.substring(home.length);
             }
         }
@@ -560,7 +559,7 @@ class View {
         this._properties = {};
 
         const size = electron.screen.getPrimaryDisplay().workAreaSize;
-        var options = {};
+        let options = {};
         options.title = electron.app.getName(); 
         options.backgroundColor = electron.systemPreferences.isDarkMode() ? '#1d1d1d' : '#e6e6e6';
         options.icon = electron.nativeImage.createFromPath(path.join(__dirname, 'icon.png'));
@@ -613,7 +612,7 @@ class View {
                 electron.shell.openExternal(url);
             }
         });
-        var location = url.format({
+        let location = url.format({
             pathname: path.join(__dirname, 'electron.html'),
             protocol: 'file:',
             slashes: true
@@ -638,7 +637,7 @@ class View {
             this._window.webContents.on('dom-ready', () => {
                 this._window.webContents.send("open", { file: file });
             });
-            var location = url.format({
+            let location = url.format({
                 pathname: path.join(__dirname, 'electron.html'),
                 protocol: 'file:',
                 slashes: true
@@ -675,23 +674,20 @@ class View {
     }
 
     update(name, value) {
-        switch (name) {
-            case 'path':
-                if (value) {
-                    this._path = value;
-                    var title = Application.minimizePath(this._path);
-                    if (process.platform !== 'darwin') {
-                        title = title + ' - ' + electron.app.getName();
-                    }
-                    this._window.setTitle(title);
-                    this._window.focus();
+        if (name === 'path') {
+            if (value) {
+                this._path = value;
+                let title = Application.minimizePath(this._path);
+                if (process.platform !== 'darwin') {
+                    title = title + ' - ' + electron.app.getName();
                 }
-                this._openPath = null;
-                break;
-            default:
-                this._properties[name] = value;
-                break;
+                this._window.setTitle(title);
+                this._window.focus();
+            }
+            this._openPath = null;
+            return;
         }
+        this._properties[name] = value;
     }
 
     get(name) {
@@ -706,7 +702,7 @@ class View {
 
     _raise(event, data) {
         if (this._events && this._events[event]) {
-            for (var callback of this._events[event]) {
+            for (let callback of this._events[event]) {
                 callback(this, data);
             }
         }
@@ -727,7 +723,7 @@ class ViewCollection {
     }
 
     openView() {
-        var view = new View(this);
+        let view = new View(this);
         view.on('activated', (sender) => {
             this._activeView = sender;
             this._raise('active-view-changed', { activeView: this._activeView });
@@ -745,7 +741,7 @@ class ViewCollection {
     }
 
     closeView(view) {
-        for (var i = this._views.length - 1; i >= 0; i--) {
+        for (let i = this._views.length - 1; i >= 0; i--) {
             if (this._views[i] == view) {
                 this._views.splice(i, 1);
             }
@@ -773,15 +769,15 @@ class ViewCollection {
 
     _raise(event, data) {
         if (this._events && this._events[event]) {
-            for (var callback of this._events[event]) {
+            for (let callback of this._events[event]) {
                 callback(this, data);
             }
         }
     }
 
     _updateActiveView() {
-        var window = electron.BrowserWindow.getFocusedWindow();
-        var view = this._views.find(view => view.window == window) || null;
+        let window = electron.BrowserWindow.getFocusedWindow();
+        let view = this._views.find(view => view.window == window) || null;
         if (view != this._activeView) {
             this._activeView = view;
             this._raise('active-view-changed', { activeView: this._activeView });
@@ -793,11 +789,11 @@ class ConfigurationService {
 
     load() {
         this._data = { 'recents': [] };
-        var dir = electron.app.getPath('userData');
+        let dir = electron.app.getPath('userData');
         if (dir && dir.length > 0) {
-            var file = path.join(dir, 'configuration.json'); 
+            let file = path.join(dir, 'configuration.json'); 
             if (fs.existsSync(file)) {
-                var data = fs.readFileSync(file);
+                let data = fs.readFileSync(file);
                 if (data) {
                     try {
                         this._data = JSON.parse(data);
@@ -812,11 +808,11 @@ class ConfigurationService {
 
     save() {
         if (this._data) {
-            var data = JSON.stringify(this._data);
+            let data = JSON.stringify(this._data);
             if (data) {
-                var dir = electron.app.getPath('userData');
+                let dir = electron.app.getPath('userData');
                 if (dir && dir.length > 0) {
-                    var file = path.join(dir, 'configuration.json'); 
+                    let file = path.join(dir, 'configuration.json'); 
                     fs.writeFileSync(file, data);
                 }
             }
@@ -843,8 +839,8 @@ class MenuService {
         this._menuTemplate = menuTemplate;
         this._commandTable = commandTable;
         this._itemTable = new Map();
-        for (var menu of menuTemplate) {
-            for (var item of menu.submenu) {
+        for (let menu of menuTemplate) {
+            for (let item of menu.submenu) {
                 if (item.id) {
                     if (!item.label) {
                         item.label = '';
@@ -872,12 +868,12 @@ class MenuService {
     }
 
     _updateLabel(context) {
-        var rebuild = false;
-        for (var entry of this._commandTable.entries()) {
-            var menuItem = this._menu.getMenuItemById(entry[0]);
-            var command = entry[1];
+        let rebuild = false;
+        for (let entry of this._commandTable.entries()) {
+            let menuItem = this._menu.getMenuItemById(entry[0]);
+            let command = entry[1];
             if (command && command.label) {
-                var label = command.label(context);
+                let label = command.label(context);
                 if (label != menuItem.label) {
                     if (this._itemTable.has(entry[0])) {
                         this._itemTable.get(entry[0]).label = label;
@@ -890,10 +886,10 @@ class MenuService {
     }
 
     _updateEnabled(context) {
-        for (var entry of this._commandTable.entries()) {
-            var menuItem = this._menu.getMenuItemById(entry[0]);
+        for (let entry of this._commandTable.entries()) {
+            let menuItem = this._menu.getMenuItemById(entry[0]);
             if (menuItem) {
-                var command = entry[1];
+                let command = entry[1];
                 if (command.enabled) {
                     menuItem.enabled = command.enabled(context);
                 }

+ 8 - 4
src/base.js

@@ -49,16 +49,20 @@ if (!DataView.prototype.setFloat16) {
         if (e < -27) {
             DataView.__float16_base[i] = 0x0000;
             DataView.__float16_shift[i] = 24;
-        } else if (e < -14) {
+        }
+        else if (e < -14) {
             DataView.__float16_base[i] = 0x0400 >> -e - 14;
             DataView.__float16_shift[i] = -e - 1;
-        } else if (e <= 15) {
+        }
+        else if (e <= 15) {
             DataView.__float16_base[i] = e + 15 << 10;
             DataView.__float16_shift[i] = 13;
-        } else if (e < 128) {
+        }
+        else if (e < 128) {
             DataView.__float16_base[i] = 0x7c00;
             DataView.__float16_shift[i] = 24;
-        } else {
+        }
+        else {
             DataView.__float16_base[i] = 0x7c00;
             DataView.__float16_shift[i] = 13;
         }

+ 16 - 32
src/cntk.js

@@ -801,8 +801,7 @@ cntk.Metadata = class {
             let items = JSON.parse(data);
             if (items) {
                 for (let item of items) {
-                    if (item.name && item.schema)
-                    {
+                    if (item.name && item.schema) {
                         let name = item.name;
                         let schema = item.schema;
                         this._map[name] = schema;
@@ -908,8 +907,7 @@ cntk_v1.ComputationNetwork = class {
             }
         };
         op.ConvolutionBase = function(reader) {
-            if (reader.version >= 5)
-            {
+            if (reader.version >= 5) {
                 this.kernelShape = new cntk_v1.TensorShape(reader);
                 this.mapCount = new cntk_v1.TensorShape(reader);
                 this.strides = new cntk_v1.TensorShape(reader);
@@ -988,8 +986,7 @@ cntk_v1.ComputationNetwork = class {
                 num_axes = reader.uint32();
             }
             this.axes = [];
-            for (let i = 0; i < num_axes; i++)
-            {
+            for (let i = 0; i < num_axes; i++) {
                 this.axes.push(reader.uint32());
             }
             this.operation = reader.string();
@@ -999,19 +996,16 @@ cntk_v1.ComputationNetwork = class {
         };
         op.BatchNormalization = function(reader) {
             let mbCount = 0;
-            if (reader.version >= 6)
-            {
+            if (reader.version >= 6) {
                 this.spatial = reader.bool();
                 this.normalizationTimeConstant = reader.float64();
                 this.blendTimeConstant = reader.float64();
                 this.imageLayoutKind = reader.enum();
-                if (reader.version >= 13)
-                {
+                if (reader.version >= 13) {
                     if (reader.version != 19) {
                         this.runCountUntied = reader.uint64();
                     }
-                    else
-                    {
+                    else {
                         this.runCountUntied = reader.bool() ? 0 : 'SIZE_MAX'; // TODO
                     }
                 }
@@ -1021,8 +1015,7 @@ cntk_v1.ComputationNetwork = class {
                 this.epsilon = reader.float64();
                 this.useCntkEngine = reader.bool();
             }
-            else
-            {
+            else {
                 let verWritten = reader.int32();
                 let verReadable = reader.int32();
                 if (verReadable > verWritten || verWritten < 0x00010001 || verReadable > 0x00010004) {
@@ -1045,8 +1038,7 @@ cntk_v1.ComputationNetwork = class {
                     this.useCntkEngine = reader.bool();
                 }
             }
-            if (reader.version < 13)
-            {
+            if (reader.version < 13) {
                 this.runCountUntied = 16 * mbCount;
                 this.convertRunningVariancePending = true;
             }
@@ -1079,45 +1071,37 @@ cntk_v1.ComputationNetwork = class {
         };
         op.PastValue = function(reader) {
             this.timeStep = reader.int32();
-            if (reader.version > 3)
-            {
+            if (reader.version > 3) {
                 this.sampleLayout = new cntk_v1.TensorShape(reader, false);
             }
-            else
-            {
+            else {
                 let rows = reader.uint64();
                 reader.uint64();
                 this.sampleLayout = new cntk_v1.TensorShape([ rows ], true);
             }
-            if (reader.version >= 2)
-            {
+            if (reader.version >= 2) {
                 this.initialStateValue = reader.int32();
             }
         };
         op.FutureValue = function(reader) {
             this.timeStep = reader.int32();
-            if (reader.version > 3)
-            {
+            if (reader.version > 3) {
                 this.sampleLayout = new cntk_v1.TensorShape(reader, false);
             }
-            else
-            {
+            else {
                 let rows = reader.uint64();
                 reader.uint64();
                 this.sampleLayout = new cntk_v1.TensorShape([ rows ], true);
             }
-            if (reader.version >= 2)
-            {
+            if (reader.version >= 2) {
                 this.initialStateValue = reader.int32();
             }
         };
         op.TransposeDimensions = function(reader) {
-            if (reader.version >= 3) 
-            {
+            if (reader.version >= 3) {
                 this.axis1 = reader.int32();
                 this.axis2 = reader.int32();
-                if (reader.version >= 25 && this.axis1 == 0 && this.axis2 == 0)
-                {
+                if (reader.version >= 25 && this.axis1 == 0 && this.axis2 == 0) {
                     let size = reader.uint64();
                     this.perm = [];
                     for (let i = 0; i < size; i++) {

+ 1 - 2
src/coreml.js

@@ -92,8 +92,7 @@ coreml.Model = class {
 
 coreml.Graph = class {
 
-    constructor(metadata, model)
-    {
+    constructor(metadata, model) {
         this._metadata = metadata;
         this._description = model.description;
         this._groups = false; 

+ 1 - 2
src/darknet.js

@@ -338,8 +338,7 @@ darknet.Attribute = class {
             if (Object.prototype.hasOwnProperty.call(schema, 'visible') && !schema.visible) {
                 this._visible = false;
             }
-            else if (Object.prototype.hasOwnProperty.call(schema, 'default'))
-            {
+            else if (Object.prototype.hasOwnProperty.call(schema, 'default')) {
                 if (this._value == schema.default) {
                     this._visible = false;
                 }

+ 7 - 5
src/index.js

@@ -428,8 +428,7 @@ if (typeof TextDecoder === "undefined") {
             case 'utf-8':
                 while (i < length) {
                     var c = buffer[i++];
-                    switch(c >> 4)
-                    { 
+                    switch(c >> 4) {
                         case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
                             result += String.fromCharCode(c);
                             break;
@@ -481,17 +480,20 @@ if (typeof TextEncoder === "undefined") {
                         resArr[resPos += 1] = (0x2<<6) | (point&0x3f);
                         continue;
                     }
-                } else {
+                }
+                else {
                     resArr[resPos += 1] = 0xef; resArr[resPos += 1] = 0xbf;
                     resArr[resPos += 1] = 0xbd; continue;
                 }
             }
             if (point <= 0x007f) {
                 resArr[resPos += 1] = (0x0<<7) | point;
-            } else if (point <= 0x07ff) {
+            }
+            else if (point <= 0x07ff) {
                 resArr[resPos += 1] = (0x6<<5) | (point>>>6);
                 resArr[resPos += 1] = (0x2<<6) | (point&0x3f);
-            } else {
+            }
+            else {
                 resArr[resPos += 1] = (0xe<<4) | (point>>>12);
                 resArr[resPos += 1] = (0x2<<6) | ((point>>>6)&0x3f);
                 resArr[resPos += 1] = (0x2<<6) | (point&0x3f);

+ 1 - 2
src/keras.js

@@ -557,8 +557,7 @@ keras.Node = class {
             let inputCount = 1;
             let inputName = null;
             let visible = true;
-            if (!innerSchema || inputIndex == 0)
-            {
+            if (!innerSchema || inputIndex == 0) {
                 if (schema && schema.inputs && inputIndex < schema.inputs.length) {
                     let input = schema.inputs[inputIndex];
                     inputName = input.name;

+ 3 - 6
src/mlnet.js

@@ -282,8 +282,7 @@ mlnet.Node = class {
 
 mlnet.Attribute = class {
 
-    constructor(metadata, name, value)
-    {
+    constructor(metadata, name, value) {
         this._name = name;
         this._value = value;
     }
@@ -1252,16 +1251,14 @@ mlnet.ValueToKeyMappingTransformer = class extends mlnet.OneToOneTransformerBase
         let reader = context.reader;
         let cmap = reader.int32();
         this.termMap = [];
-        if (context.modelVersionWritten >= 0x00010002)
-        {
+        if (context.modelVersionWritten >= 0x00010002) {
             for (let i = 0; i < cmap; ++i) {
                 this.termMap.push(new mlnet.TermMap(context));
                 // debugger;
                 // termMap[i] = TermMap.Load(c, host, CodecFactory);
             }
         }
-        else
-        {
+        else {
             throw new mlnet.Error('');
             // for (let i = 0; i < cmap; ++i) {
             //    debugger;

+ 2 - 4
src/mxnet.js

@@ -390,8 +390,7 @@ mxnet.Model = class {
 
 mxnet.Graph = class {
 
-    constructor(metadata, manifest, symbol, signature, params)
-    {
+    constructor(metadata, manifest, symbol, signature, params) {
         this._metadata = metadata;
         this._nodes = [];
         this._inputs = [];
@@ -984,8 +983,7 @@ mxnet.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (context.dataType)
-                {
+                switch (context.dataType) {
                     case 'float32':
                         results.push(context.data.getFloat32(context.index, true));
                         context.index += 4;

+ 2 - 4
src/ncnn.js

@@ -650,8 +650,7 @@ ncnn.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (this._type.dataType)
-                {
+                switch (this._type.dataType) {
                     case 'float32':
                         results.push(context.data.getFloat32(context.index, true));
                         context.index += 4;
@@ -693,8 +692,7 @@ ncnn.TensorType = class {
         return this._dataType;
     }
 
-    get shape()
-    {
+    get shape() {
         return this._shape;
     }
 

+ 1 - 2
src/numpy.js

@@ -113,8 +113,7 @@ numpy.Array = class {
         var size = context.shape[dimension];
         if (dimension == context.shape.length - 1) {
             for (var i = 0; i < size; i++) {
-                switch (context.descr)
-                {
+                switch (context.descr) {
                     case '<f2':
                         context.dataView.setFloat16(context.position, data[i], true);
                         break;

+ 3 - 6
src/onnx.js

@@ -140,8 +140,7 @@ onnx.Model = class {
             imports['ai.onnx.ml'] = 1;
         }
 
-        if (model.metadata_props)
-        {
+        if (model.metadata_props) {
             var imageMetadata = {};
             for (var metadata_prop of model.metadata_props) {
                 switch (metadata_prop.key) {
@@ -859,8 +858,7 @@ onnx.Tensor = class {
                 }
                 if (context.data) {
                     var value = context.data[context.index++];
-                    switch (this._tensor.data_type)
-                    {   
+                    switch (this._tensor.data_type) {
                         case onnx.proto.TensorProto.DataType.BOOL:
                             value = value === 0 ? false : true;
                             break;
@@ -869,8 +867,7 @@ onnx.Tensor = class {
                     context.count++;
                 }
                 else if (context.rawData) {
-                    switch (this._tensor.data_type)
-                    {
+                    switch (this._tensor.data_type) {
                         case onnx.proto.TensorProto.DataType.FLOAT16:
                             results.push(context.rawData.getFloat16(context.index, true));
                             context.index += 2;

+ 4 - 2
src/openvino.js

@@ -33,7 +33,8 @@ openvino.ModelFactory = class {
                     throw new openvino.Error("File format is not OpenVINO IR.");
                 }
                 return new openvino.Model(metadata, net);
-            } catch (error) {
+            }
+            catch (error) {
                 host.exception(error, false);
                 var message = error && error.message ? error.message : error.toString();
                 message = message.endsWith('.') ? message.substring(0, message.length - 1) : message;
@@ -239,7 +240,8 @@ openvino.Graph = class {
                         if (argumentWithoutId){
                             argumentWithoutId._id = newId;
                         } 
-                    } else {
+                    }
+                    else {
                         // TODO: no tensor information in the new argument - passed as null for now
                         nestedNode._inputs.push(new openvino.Parameter((nestedNode._inputs.length+1).toString(), [
                             new openvino.Argument(newId, null, null)

+ 10 - 5
src/python.js

@@ -1444,30 +1444,35 @@ python.Tokenizer = class {
             case '*':
                 if (c1 === '*') {
                     length = c2 === '=' ? 3 : 2;
-                } else {
+                }
+                else {
                     length = c1 === '=' ? 2 : 1;
                 }
                 break;
             case '/':
                 if (c1 === '/') {
                     length = c2 === '=' ? 3 : 2;
-                } else {
+                }
+                else {
                     length = c1 === '=' ? 2 : 1;
                 }
                 break;
             case '<':
                 if (c1 === '>') {
                     length = 2;
-                } else if (c1 === '<') {
+                }
+                else if (c1 === '<') {
                     length = c2 === '=' ? 3 : 2;
-                } else {
+                }
+                else {
                     length = c1 === '=' ? 2 : 1;
                 }
                 break;
             case '>':
                 if (c1 === '>') {
                     length = c2 === '=' ? 3 : 2;
-                } else {
+                }
+                else {
                     length = c1 === '=' ? 2 : 1;
                 }
                 break;

+ 3 - 6
src/pytorch.js

@@ -454,8 +454,7 @@ pytorch.ModelFactory = class {
                     throw new pytorch.Error("Unknown persistent load type '" + typename + "'.");
                 };
 
-                if (Array.isArray(magic_number) && signature.length == magic_number.length && signature.every((value, index) => value == magic_number[index])) 
-                {
+                if (Array.isArray(magic_number) && signature.length == magic_number.length && signature.every((value, index) => value == magic_number[index])) {
                     let protocol_version = unpickler.load();
                     if (protocol_version != 1001) {
                         throw new pytorch.Error("Unsupported protocol version '" + protocol_version + "'.");
@@ -554,8 +553,7 @@ pytorch.ModelFactory = class {
                 if (sys_info.type_sizes &&
                     ((sys_info.type_sizes.int && sys_info.type_sizes.int != 4) ||
                     (sys_info.type_sizes.long && sys_info.type_sizes.long != 4) ||
-                    (sys_info.type_sizes.short && sys_info.type_sizes.short != 2)))
-                {
+                    (sys_info.type_sizes.short && sys_info.type_sizes.short != 2))) {
                     throw new pytorch.Error('Unsupported type sizes.');
                 }
             }
@@ -1252,8 +1250,7 @@ pytorch.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (context.dataType)
-                {
+                switch (context.dataType) {
                     case 'uint8':
                         results.push(context.dataView.getUint8(context.index, this._littleEndian));
                         context.index++;

+ 1 - 2
src/sklearn.js

@@ -873,8 +873,7 @@ sklearn.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (context.dataType)
-                {
+                switch (context.dataType) {
                     case 'float32':
                         results.push(context.rawData.getFloat32(context.index, true));
                         context.index += 4;

+ 2 - 4
src/tf.js

@@ -1149,8 +1149,7 @@ tf.Tensor = class {
                 }
                 else {
                     if (context.rawData) {
-                        switch (this._tensor.dtype)
-                        {
+                        switch (this._tensor.dtype) {
                             case tf.proto.DataType.DT_FLOAT:
                                 results.push(context.rawData.getFloat32(context.index, true));
                                 context.index += 4;
@@ -1205,8 +1204,7 @@ tf.Tensor = class {
     }
 
     static formatDataType(type) {
-        if (!tf.Tensor.dataType)
-        {
+        if (!tf.Tensor.dataType) {
             tf.Tensor.dataType = {};
             for (var key of Object.keys(tf.proto.DataType)) {
                 var value = tf.proto.DataType[key];

+ 0 - 1
src/tflite-schema.js

@@ -1,4 +1,3 @@
-/* eslint 'indent': [ 'error', 2 ] */
 // automatically generated by the FlatBuffers compiler, do not modify
 
 /**

+ 2 - 4
src/tflite.js

@@ -31,8 +31,7 @@ tflite.ModelFactory = class {
                 var buffer = context.buffer;
                 var byteBuffer = new flatbuffers.ByteBuffer(buffer);
                 tflite.schema = tflite_schema;
-                if (!tflite.schema.Model.bufferHasIdentifier(byteBuffer))
-                {
+                if (!tflite.schema.Model.bufferHasIdentifier(byteBuffer)) {
                     var signature = Array.from(buffer.subarray(0, Math.min(8, buffer.length))).map((c) => (c < 16 ? '0' : '') + c.toString(16)).join('');
                     throw new tflite.Error("File format is not tflite.Model (" + signature + ").");
                 }
@@ -580,8 +579,7 @@ tflite.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (context.dataType)
-                {
+                switch (context.dataType) {
                     case 'uint8':
                         results.push(context.data.getUint8(context.index));
                         context.index += 1;

+ 2 - 4
src/torchscript.js

@@ -906,8 +906,7 @@ torchscript.Tensor = class {
                     results.push('...');
                     return results;
                 }
-                switch (context.dataType)
-                {
+                switch (context.dataType) {
                     case 'uint8':
                         results.push(context.dataView.getUint8(context.index, this._littleEndian));
                         context.index++;
@@ -1360,8 +1359,7 @@ torchscript.GraphContext = class {
         if (expression.type == 'call' && 
             expression.target.type == 'identifier' &&
             expression.target.value == 'int' &&
-            expression.arguments.length == 1) 
-        {
+            expression.arguments.length == 1) {
             let replace = this._attributeExpression(expression.arguments[0]);
             if (replace) {
                 return replace;

+ 2 - 4
src/view-grapher.js

@@ -413,8 +413,7 @@ grapher.NodeElement.Header = class {
             }
         }
 
-        if (!first) 
-        {
+        if (!first) {
             lineElement = this.createElement('line');
             lineElement.setAttribute('class', 'node');
             lineElement.setAttribute('x1', 0);
@@ -521,8 +520,7 @@ grapher.NodeElement.List = class {
         var r4 = last;
         this._backgroundElement.setAttribute('d', grapher.NodeElement.roundedRect(0, 0, width, this._height, r1, r2, r3, r4));
 
-        if (!first) 
-        {
+        if (!first) {
             var lineElement = this.createElement('line');
             lineElement.setAttribute('class', 'node');
             lineElement.setAttribute('x1', 0);

+ 1 - 5
tools/tflite

@@ -61,16 +61,12 @@ schema() {
     ${third_party}/flatbuffers/flatc --no-js-exports --js ${tools}/tflite.schema.fbs
     rm ${tools}/tflite.schema.fbs
     rm ${src}/tflite-schema.js
-    cat <<EOT >> ${src}/tflite-schema.js
-/* eslint 'indent': [ 'error', 2 ] */
-EOT
-    cat ./tflite.schema_generated.js >> ${src}/tflite-schema.js
+    mv ./tflite.schema_generated.js ${src}/tflite-schema.js
     cat <<EOT >> ${src}/tflite-schema.js
 if (typeof module !== 'undefined' && typeof module.exports === 'object') {
   module.exports = tflite_schema;
 }
 EOT
-    rm ./tflite.schema_generated.js
 }
 
 visualize() {