refactor: remove trailing semicolons from cli.js

Author: php-coder

src/cli.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 
-const yaml = require('js-yaml');
-const ejs = require('ejs');
-const fs = require('fs');
-const path = require('path');
+const yaml = require('js-yaml')
+const ejs = require('ejs')
+const fs = require('fs')
+const path = require('path')
 
-const parseArgs = require('minimist');
+const parseArgs = require('minimist')
 
-const { Parser } = require('node-sql-parser');
+const { Parser } = require('node-sql-parser')
 
-const endpointsFile = 'endpoints.yaml';
+const endpointsFile = 'endpoints.yaml'
 
 const parseCommandLineArgs = (args) => {
     const opts = {
@@ -22,10 +22,10 @@ const parseCommandLineArgs = (args) => {
             'dest-dir': '.',
             'overwrite': false,
         }
-    };
-    const argv = parseArgs(args, opts);
-    //console.debug('argv:', argv);
-    return argv;
+    }
+    const argv = parseArgs(args, opts)
+    //console.debug('argv:', argv)
+    return argv
 }
 
 // Restructure YAML configuration to simplify downstream code.
@@ -44,34 +44,34 @@ const parseCommandLineArgs = (args) => {
 //   }
 const restructureConfiguration = (config) => {
     for (const endpoint of config) {
-        endpoint.methods = [];
+        endpoint.methods = []; // this semicolon is really needed
         [ 'get', 'get_list', 'post', 'put', 'delete' ].forEach(method => {
             if (!endpoint.hasOwnProperty(method)) {
-                return;
+                return
             }
             endpoint.methods.push({
                 'name': method,
                 'verb': method !== 'get_list' ? method : 'get',
                 ...endpoint[method],
-            });
-            delete endpoint[method];
-        });
+            })
+            delete endpoint[method]
+        })
     }
-};
+}
 
 const loadConfig = (endpointsFile) => {
-    console.log('Read', endpointsFile);
+    console.log('Read', endpointsFile)
     try {
-        const content = fs.readFileSync(endpointsFile, 'utf8');
-        const config = yaml.safeLoad(content);
-        restructureConfiguration(config);
-        //console.debug(config);
-        return config;
+        const content = fs.readFileSync(endpointsFile, 'utf8')
+        const config = yaml.safeLoad(content)
+        restructureConfiguration(config)
+        //console.debug(config)
+        return config
     } catch (ex) {
-        console.error(`Failed to parse ${endpointsFile}: ${ex.message}`);
-        throw ex;
+        console.error(`Failed to parse ${endpointsFile}: ${ex.message}`)
+        throw ex
     }
-};
+}
 
 const lang2extension = (lang) => {
     switch (lang) {
@@ -115,8 +115,8 @@ const fileExistsHandler = (err) => {
 const createApp = async (destDir, { lang, overwrite }) => {
     const ext = lang2extension(lang)
     const fileName = `app.${ext}`
-    console.log('Generate', fileName);
-    const resultFile = path.join(destDir, fileName);
+    console.log('Generate', fileName)
+    const resultFile = path.join(destDir, fileName)
     const customRouters = findFileNamesEndWith(destDir, `_routes.${ext}`)
     if (customRouters.length > 0) {
         customRouters.forEach(filename => console.log(`Include a custom router from ${filename}`))
@@ -133,44 +133,44 @@ const createApp = async (destDir, { lang, overwrite }) => {
 
     const fsFlags = overwrite ? 'w' : 'wx'
     await fs.writeFile(resultFile, resultedCode, { 'flag': fsFlags }, fileExistsHandler)
-};
+}
 
 const createDb = async (destDir, { lang, overwrite }) => {
     if (lang !== 'python') {
         return
     }
     const fileName = 'db.py'
-    console.log('Generate', fileName);
-    const resultFile = path.join(destDir, fileName);
+    console.log('Generate', fileName)
+    const resultFile = path.join(destDir, fileName)
 
     const mode = overwrite ? 0 : fs.constants.COPYFILE_EXCL
     await fs.copyFile(`${__dirname}/templates/${fileName}`, resultFile, mode, fileExistsHandler)
 }
 
 // "-- comment\nSELECT * FROM foo" => "SELECT * FROM foo"
-const removeComments = (query) => query.replace(/--.*\n/g, '');
+const removeComments = (query) => query.replace(/--.*\n/g, '')
 
 // "SELECT *\n   FROM foo" => "SELECT * FROM foo"
-const flattenQuery = (query) => query.replace(/\n[ ]*/g, ' ');
+const flattenQuery = (query) => query.replace(/\n[ ]*/g, ' ')
 
 // "WHERE id = :p.categoryId OR id = :b.id LIMIT :q.limit" => "WHERE id = :categoryId OR id = :id LIMIT :limit"
-const removePlaceholders = (query) => query.replace(/(?<=:)[pbq]\./g, '');
+const removePlaceholders = (query) => query.replace(/(?<=:)[pbq]\./g, '')
 
 // "/categories/:id" => "/categories/{id}"
 // (used only with Golang's go-chi)
-const convertPathPlaceholders = (path) => path.replace(/:([^\/]+)/g, '{$1}');
+const convertPathPlaceholders = (path) => path.replace(/:([^\/]+)/g, '{$1}')
 
 // "name_ru" => "nameRu"
 // (used only with Golang's go-chi)
-const snake2camelCase = (str) => str.replace(/_([a-z])/g, (match, group) => group.toUpperCase());
+const snake2camelCase = (str) => str.replace(/_([a-z])/g, (match, group) => group.toUpperCase())
 
 // "categoryId" => "category_id"
 // (used only with Python's FastAPI)
-const camel2snakeCase = (str) => str.replace(/([A-Z])/g, (match, group) => '_' + group.toLowerCase());
+const camel2snakeCase = (str) => str.replace(/([A-Z])/g, (match, group) => '_' + group.toLowerCase())
 
 // "nameRu" => "NameRu"
 // (used only with Golang's go-chi)
-const capitalize = (str) => str[0].toUpperCase() + str.slice(1);
+const capitalize = (str) => str[0].toUpperCase() + str.slice(1)
 
 // ["a", "bb", "ccc"] => 3
 // (used only with Golang's go-chi)
@@ -179,22 +179,22 @@ const lengthOfLongestString = (arr) => arr
 		.reduce(
 			(acc, val) => val > acc ? val : acc,
 			0 /* initial value */
-		);
+		)
 
 const createEndpoints = async (destDir, { lang, overwrite }, config) => {
     const ext = lang2extension(lang)
     const fileName = `routes.${ext}`
-    console.log('Generate', fileName);
-    const resultFile = path.join(destDir, fileName);
+    console.log('Generate', fileName)
+    const resultFile = path.join(destDir, fileName)
 
     for (let endpoint of config) {
-        let path = endpoint.path;
+        let path = endpoint.path
         if (lang === 'go') {
             path = convertPathPlaceholders(path)
         }
         endpoint.methods.forEach(method => {
-            const verb = method.verb.toUpperCase();
-            console.log(`${verb} ${path}`);
+            const verb = method.verb.toUpperCase()
+            console.log(`${verb} ${path}`)
 
             let queries = []
             if (method.query) {
@@ -203,10 +203,10 @@ const createEndpoints = async (destDir, { lang, overwrite }, config) => {
                 queries = Object.values(method.aggregated_queries)
             }
             queries.forEach(query => {
-                const sql = removePlaceholders(flattenQuery(removeComments(query)));
-                console.log(`\t${sql}`);
+                const sql = removePlaceholders(flattenQuery(removeComments(query)))
+                console.log(`\t${sql}`)
             })
-        });
+        })
     }
 
     const placeholdersMap = {
@@ -220,15 +220,15 @@ const createEndpoints = async (destDir, { lang, overwrite }, config) => {
                 return `chi.URLParam(r, "${param}")`
             },
             'b': function(param) {
-                return 'dto.' + capitalize(snake2camelCase(param));
+                return 'dto.' + capitalize(snake2camelCase(param))
             },
             'q': function(param) {
                 return `r.URL.Query().Get("${param}")`
             },
         }
     }
 
-    const parser = new Parser();
+    const parser = new Parser()
 
     const resultedCode = await ejs.renderFile(
         `${__dirname}/templates/routes.${ext}.ejs`,
@@ -250,22 +250,22 @@ const createEndpoints = async (destDir, { lang, overwrite }, config) => {
             // (used only with Express)
             "formatParamsAsJavaScriptObject": (params) => {
                 if (params.length === 0) {
-                    return params;
+                    return params
                 }
                 return Array.from(
                         new Set(params),
                         p => {
-                            const bindTarget = p.substring(0, 1);
-                            const paramName = p.substring(2);
-                            const prefix = placeholdersMap['js'][bindTarget];
+                            const bindTarget = p.substring(0, 1)
+                            const paramName = p.substring(2)
+                            const prefix = placeholdersMap['js'][bindTarget]
                             return `"${paramName}": ${prefix}.${paramName}`
                         }
-                    ).join(', ');
+                    ).join(', ')
             },
 
             // "SELECT *\n   FROM foo WHERE id = :p.id" => "SELECT * FROM foo WHERE id = :id"
             "formatQuery": (query) => {
-                return removePlaceholders(flattenQuery(removeComments(query)));
+                return removePlaceholders(flattenQuery(removeComments(query)))
             },
 
             // (used only with Golang)
@@ -283,34 +283,34 @@ const createEndpoints = async (destDir, { lang, overwrite }, config) => {
             // (used only with Golang's go-chi)
             "formatParamsAsGolangMap": (params) => {
                 if (params.length === 0) {
-                    return params;
+                    return params
                 }
-                const maxParamNameLength = lengthOfLongestString(params);
+                const maxParamNameLength = lengthOfLongestString(params)
                 return Array.from(
                         new Set(params),
                         p => {
-                            const bindTarget = p.substring(0, 1);
-                            const paramName = p.substring(2);
-                            const formatFunc = placeholdersMap['go'][bindTarget];
-                            const quotedParam = '"' + paramName + '":';
+                            const bindTarget = p.substring(0, 1)
+                            const paramName = p.substring(2)
+                            const formatFunc = placeholdersMap['go'][bindTarget]
+                            const quotedParam = '"' + paramName + '":'
                             // We don't count quotes and colon because they are compensated by "p." prefix.
                             // We do +1 because the longest parameter will also have an extra space as a delimiter.
                             return `${quotedParam.padEnd(maxParamNameLength+1)} ${formatFunc(paramName)},`
                         }
-                    ).join('\n\t\t\t');
+                    ).join('\n\t\t\t')
             },
 
             "placeholdersMap": placeholdersMap,
             "removeComments": removeComments,
         }
-    );
+    )
 
     const fsFlags = overwrite ? 'w' : 'wx'
     await fs.writeFile(resultFile, resultedCode, { 'flag': fsFlags }, fileExistsHandler)
-};
+}
 
 const createDependenciesDescriptor = async (destDir, { lang, overwrite }) => {
-    let fileName;
+    let fileName
     if (lang === 'js') {
         fileName = 'package.json'
 
@@ -321,16 +321,16 @@ const createDependenciesDescriptor = async (destDir, { lang, overwrite }) => {
         fileName = 'requirements.txt'
 
     } else {
-        return;
+        return
     }
 
-    console.log('Generate', fileName);
+    console.log('Generate', fileName)
 
-    const resultFile = path.join(destDir, fileName);
+    const resultFile = path.join(destDir, fileName)
     // @todo #24 [js] Possibly incorrect project name with --dest-dir option
-    const projectName = path.basename(destDir);
+    const projectName = path.basename(destDir)
     if (lang === 'js') {
-        console.log('Project name:', projectName);
+        console.log('Project name:', projectName)
     }
 
     const minimalPackageJson = await ejs.renderFile(
@@ -339,11 +339,11 @@ const createDependenciesDescriptor = async (destDir, { lang, overwrite }) => {
             // project name is being used only for package.json
             projectName
         }
-    );
+    )
 
     const fsFlags = overwrite ? 'w' : 'wx'
     await fs.writeFile(resultFile, minimalPackageJson, { 'flag': fsFlags }, fileExistsHandler)
-};
+}
 
 const showInstructions = (lang) => {
     console.info('The application has been generated!')
@@ -353,7 +353,7 @@ const showInstructions = (lang) => {
 to install its dependencies and
   export DB_NAME=db DB_USER=user DB_PASSWORD=secret
   npm start
-afteward to run`);
+afteward to run`)
     } else if (lang === 'go') {
         console.info(`Use
   export DB_NAME=db DB_USER=user DB_PASSWORD=secret
@@ -371,27 +371,27 @@ to install its dependencies and
   uvicorn app:app
 afteward to run`)
     }
-};
+}
 
 const absolutePathToDestDir = (argv) => {
     const relativeDestDir = argv._.length > 0 ? argv._[0] : argv['dest-dir']
     return path.resolve(process.cwd(), relativeDestDir)
 }
 
-const argv = parseCommandLineArgs(process.argv.slice(2));
+const argv = parseCommandLineArgs(process.argv.slice(2))
 
-const config = loadConfig(endpointsFile);
+const config = loadConfig(endpointsFile)
 
 const destDir = absolutePathToDestDir(argv)
 console.log('Destination directory:', destDir)
 
 if (!fs.existsSync(destDir)) {
     console.log('Create', destDir)
-    fs.mkdirSync(destDir, {recursive: true});
+    fs.mkdirSync(destDir, {recursive: true})
 }
 
-createApp(destDir, argv);
+createApp(destDir, argv)
 createDb(destDir, argv)
-createEndpoints(destDir, argv, config);
-createDependenciesDescriptor(destDir, argv);
-showInstructions(argv.lang);
+createEndpoints(destDir, argv, config)
+createDependenciesDescriptor(destDir, argv)
+showInstructions(argv.lang)