Update lint and fix code (#53)

DevExpress · Nov 9, 2018 · b6fa2a3 · b6fa2a3
1 parent 6dba80b
commit b6fa2a3
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 220 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -4,7 +4,7 @@
         "node": true
     },
     "parserOptions": {
-        "ecmaVersion": 6,
+        "ecmaVersion": 2018,
         "sourceType": "module",
         "ecmaFeatures": {
             "globalReturn": true
@@ -40,6 +40,7 @@
                 }
             }
         ],
+        "linebreak-style": ["error", "unix"],
         "no-multiple-empty-lines": [ "error", { "max": 2 } ],
         "no-irregular-whitespace": "error",
         "no-multi-spaces": "error",

diff --git a/commands/application.angular.js b/commands/application.angular.js
@@ -38,7 +38,7 @@ function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
 }
 
 function localPackageExists(packageName) {
-    const nodeModulesPath = path.join(process.cwd(), `node_modules`);
+    const nodeModulesPath = path.join(process.cwd(), 'node_modules');
     if(!fs.existsSync(nodeModulesPath)) {
         return;
     }
@@ -49,22 +49,22 @@ function localPackageExists(packageName) {
 
 function optimizeNgCommandArguments(args) {
     return new Promise((resolve, reject) => {
-      hasSutableNgCli().then(() => resolve(args), () => resolve(['-p', '@angular/cli', ...args]));
+        hasSutableNgCli().then(() => resolve(args), () => resolve(['-p', '@angular/cli', ...args]));
     });
 }
 
 function hasSutableNgCli() {
     return new Promise((resolve, reject) => {
         exec('ng v', (err, stdout, stderr) => {
             stderr || parseNgCliVersion(stdout).compare(minNgCliVersion) < 0
-              ? reject()
-              : resolve();
+                ? reject()
+                : resolve();
         });
     });
 }
 
 function parseNgCliVersion(stdout) {
-    return new semver(stdout.toString().match(/(?<=angular.cli: )(\S+)/ig)[0]);
+    return new semver(/angular.cli:\s*(\S+)/ig.exec(stdout.toString())[1]);
 }
 
 const install = (options) => {
@@ -84,7 +84,7 @@ const create = (appName, options) => {
 };
 
 const addTemplate = (appName, options, evaluatingOptions) => {
-    const schematicOptions = {...(appName && {project: appName}), ...options};
+    const schematicOptions = { ...(appName && { project: appName }), ...options };
     runSchematicCommand('add-app-template', schematicOptions, evaluatingOptions);
 };
 

diff --git a/commands/application.js b/commands/application.js
@@ -1,51 +1,52 @@
-const angularApplication = require('./application.angular');
-const printHelp = require('./help').printHelp;
-
-const isApplicationCommand = (command) => {
-    return [ 'new', 'add' ].indexOf(command) > -1;
-};
-
-const run = (commands, options, devextremeConfig) => {
-    if(!commands[1]) {
-        console.error('No parameters found.');
-        printHelp(commands[0]);
-        return;
-    }
-
-    if(commands[0] === 'new') {
-        if(commands[1] === 'angular-app') {
-            angularApplication.create(commands[2] || 'my-app', options);
-        } else {
-            console.error(`The '${commands[1]}' application type is not valid`);
-            printHelp(commands[0]);
-        }
-    } else {
-        if(commands[0] === 'add') {
-            if(commands[1] === 'devextreme-angular') {
-                angularApplication.install(options);
-                return;
-            }
-
-            if(commands[1] === 'angular-template') {
-                angularApplication.addTemplate(commands[2], options);
-                return;
-            }
-
-            if(devextremeConfig.applicationEngine === 'angular') {
-                if(commands[1] === 'view') {
-                    angularApplication.addView(commands[2], options);
-                } else {
-                    console.error('Invalid command');
-                    printHelp(commands[0]);
-                }
-            } else {
-                console.log('The DevExtreme application cannot be found');
-            }
-        }
-    }
-};
-
-module.exports = {
-    isApplicationCommand,
-    run
-};
+const angularApplication = require('./application.angular');
+const printHelp = require('./help').printHelp;
+
+const isApplicationCommand = (command) => {
+    return [ 'new', 'add' ].indexOf(command) > -1;
+};
+
+const run = (commands, options, devextremeConfig) => {
+    if(!commands[1]) {
+        console.error('No parameters found.');
+        printHelp(commands[0]);
+        return;
+    }
+
+    if(commands[0] === 'new') {
+        if(commands[1] === 'angular-app') {
+            angularApplication.create(commands[2] || 'my-app', options);
+            return;
+        }
+
+        console.error(`The '${commands[1]}' application type is not valid`);
+        printHelp(commands[0]);
+    } else {
+        if(commands[0] === 'add') {
+            if(commands[1] === 'devextreme-angular') {
+                angularApplication.install(options);
+                return;
+            }
+
+            if(commands[1] === 'angular-template') {
+                angularApplication.addTemplate(commands[2], options);
+                return;
+            }
+
+            if(devextremeConfig.applicationEngine === 'angular') {
+                if(commands[1] === 'view') {
+                    angularApplication.addView(commands[2], options);
+                } else {
+                    console.error('Invalid command');
+                    printHelp(commands[0]);
+                }
+            } else {
+                console.log('The DevExtreme application cannot be found');
+            }
+        }
+    }
+};
+
+module.exports = {
+    isApplicationCommand,
+    run
+};
diff --git a/commands/help.js b/commands/help.js
@@ -1,5 +1,4 @@
 const commands = require('./commands.json').commands;
-
 const textColor = '\x1b[36m%s\x1b[0m';
 
 const findCommand = (commandName) => {