CmdName type, use tempate literals

Author: epoberezkin

src/commands/ajv.ts

@@ -30,8 +30,8 @@ export default function (argv: ParsedArgs): AjvCore {
       try {
         ajv[method](schema)
       } catch (err) {
-        console.error(fileType, file, "is invalid")
-        console.error("error:", (err as Error).message)
+        console.error(`${fileType} ${file} is invalid`)
+        console.error(`error: ${(err as Error).message}`)
         invalid = true
       }
     })
@@ -45,8 +45,8 @@ export default function (argv: ParsedArgs): AjvCore {
       try {
         require(file)(ajv)
       } catch (err) {
-        console.error("module", file, "is invalid; it should export function")
-        console.error("error:", (err as Error).message)
+        console.error(`module ${file} is invalid; it should export function`)
+        console.error(`error: ${(err as Error).message}`)
         invalid = true
       }
     })

src/commands/compile.ts

@@ -34,7 +34,7 @@ function execute(argv: ParsedArgs): boolean {
   function compileMultiExportModule(files: string[]): boolean {
     const allValid = all(files, (file) => !!compileSchema(file))
     if (allValid) return saveStandaloneCode()
-    console.error("module not generated")
+    console.error("module not saved")
     return false
   }
 

src/commands/help.ts

@@ -1,4 +1,4 @@
-import type {Command} from "./types"
+import type {Command, CmdName} from "./types"
 import type {ParsedArgs} from "minimist"
 import usage from "./usage"
 
@@ -14,23 +14,23 @@ const cmd: Command = {
 
 export default cmd
 
-const commands: {[Name in string]?: () => void} = {
-  validate: helpValidate,
+const commands: {[Name in CmdName]: () => void} = {
+  help: mainHelp,
   compile: helpCompile,
+  validate: helpValidate,
   migrate: helpMigrate,
   test: helpTest,
 }
 
 function execute(argv: ParsedArgs): boolean {
   const command = argv._[1]
-  if (!command || command === "help") {
+  if (!command) {
     mainHelp()
     return true
   }
 
-  const cmdHelp = commands[command]
-  if (cmdHelp) {
-    cmdHelp()
+  if (command in commands) {
+    commands[command as CmdName]()
     return true
   }
 

src/commands/index.ts

@@ -1,13 +1,13 @@
-import type {Command} from "./types"
+import type {Command, CmdName} from "./types"
 import compile from "./compile"
 import help from "./help"
 import validate from "./validate"
 import migrate from "./migrate"
 import test from "./test"
 
-const commands: {[Cmd in string]?: Command} = {
-  compile,
+const commands: {[Name in CmdName]: Command} = {
   help,
+  compile,
   validate,
   migrate,
   test,

src/commands/test.ts

@@ -36,17 +36,17 @@ function execute(argv: ParsedArgs): boolean {
   return all(getFiles(argv.d), testDataFile)
 
   function testDataFile(file: string): boolean {
-    const data = openFile(file, "data file " + file)
+    const data = openFile(file, `data file ${file}`)
     const validData = validate(data)
     let errors
     if (!validData) errors = logJSON(argv.errors, validate.errors, ajv)
 
     if (validData === shouldBeValid) {
-      console.log(file, "passed test")
+      console.log(`${file} passed test`)
       if (errors) console.log(errors)
       return true
     }
-    console.error(file, "failed test")
+    console.error(`${file} failed test`)
     if (errors) console.error(errors)
     return false
   }

src/commands/types.ts

@@ -1,6 +1,8 @@
 import type {SchemaObject} from "ajv"
 import type {ParsedArgs} from "minimist"
 
+export type CmdName = "compile" | "help" | "validate" | "migrate" | "test"
+
 export interface Command {
   execute: (argv: ParsedArgs) => boolean
   schema: SchemaObject

src/commands/util.ts

@@ -38,7 +38,7 @@ function decodeFile(contents: string, format: string): any {
     case "yaml":
       return yaml.safeLoad(contents)
     default:
-      throw new Error("unsupported format " + format)
+      throw new Error(`unsupported file format ${format}`)
   }
 }
 
@@ -82,8 +82,8 @@ export function compile(ajv: Ajv, schemaFile: string): AnyValidateFunction {
   try {
     return ajv.compile(schema)
   } catch (err) {
-    console.error("schema", schemaFile, "is invalid")
-    console.error("error:", err.message)
+    console.error(`schema ${schemaFile} is invalid`)
+    console.error(`error: ${err.message}`)
     process.exit(1)
   }
 }
@@ -92,6 +92,7 @@ export function getSpec(argv: ParsedArgs): SchemaSpec {
   return argv.spec === "draft2019" ? "draft2019" : "draft7"
 }
 
-export function all(xs: string[], f: (x: string) => boolean): boolean {
-  return xs.reduce((res: boolean, x: string) => f(x) && res, true)
+// Like Array.prototype.every but without short-circuiting (for side-effects)
+export function all<T>(xs: T[], f: (x: T) => boolean): boolean {
+  return xs.reduce((res: boolean, x: T) => f(x) && res, true)
 }

src/commands/validate.ts

@@ -34,7 +34,7 @@ function execute(argv: ParsedArgs): boolean {
   return all(getFiles(argv.d), validateDataFile)
 
   function validateDataFile(file: string): boolean {
-    const data = openFile(file, "data file " + file)
+    const data = openFile(file, `data file ${file}`)
     let original
     if (argv.changes) original = JSON.parse(JSON.stringify(data))
     const validData = validate(data) as boolean

src/index.ts

@@ -4,12 +4,12 @@ import minimist = require("minimist")
 import commands from "./commands"
 import {checkOptions} from "./commands/options"
 import usage from "./commands/usage"
+import type {CmdName} from "./commands/types"
 
 const argv = minimist(process.argv.slice(2))
 const command = argv._[0] || "validate"
-const cmd = commands[command]
-
-if (cmd) {
+if (command in commands) {
+  const cmd = commands[command as CmdName]
   const errors = checkOptions(cmd.schema, argv)
   if (errors) {
     console.error(errors)
@@ -20,7 +20,7 @@ if (cmd) {
     process.exit(ok ? 0 : 1)
   }
 } else {
-  console.error("Unknown command", command)
+  console.error(`Unknown command ${command}`)
   usage()
   process.exit(2)
 }

test/migrate.spec.ts

@@ -96,7 +96,6 @@ describe("migrate", function () {
 
   it("should fail on invalid schema", (done) => {
     cli("migrate -s test/migrate/schema_invalid.json", (error, stdout, stderr) => {
-      console.log(error, stdout, stderr)
       assert(error instanceof Error)
       assert.strictEqual(stdout, "")
       assertError(stderr)