Merge pull request #99 from G-Rath/add-prettier-to-eslint

Add prettier to eslint

Author: epoberezkin

.eslintrc.js

@@ -2,6 +2,7 @@ const jsConfig = require("@ajv-validator/config/.eslintrc_js")
 const tsConfig = require("@ajv-validator/config/.eslintrc")
 
 module.exports = {
+  extends: ["plugin:prettier/recommended"],
   env: {
     es6: true,
     node: true,

package.json

@@ -57,11 +57,11 @@
     "cross-env": "^7.0.3",
     "eslint": "^7.1.0",
     "eslint-config-prettier": "^6.15.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "husky": "^4.3.0",
     "lint-staged": "^10.5.2",
     "mocha": "^8.1.3",
     "nyc": "^15.0.1",
-    "pre-commit": "^1.2.0",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
     "ts-node": "^9.1.0",

src/commands/ajv.ts

@@ -31,7 +31,11 @@ export default function (argv: ParsedArgs): AjvCore {
   if (invalid) process.exit(1)
   return ajv
 
-  function addSchemas(args: string | string[] | undefined, method: AjvMethod, fileType: string): void {
+  function addSchemas(
+    args: string | string[] | undefined,
+    method: AjvMethod,
+    fileType: string
+  ): void {
     if (!args) return
     const files = util.getFiles(args)
     files.forEach((file) => {

src/commands/compile.ts

@@ -50,7 +50,7 @@ function execute(argv: ParsedArgs): boolean {
     const sch = openFile(file, `schema ${file}`)
     try {
       const id = sch?.$id
-      ajv.addSchema(sch, id ? undefined : file )
+      ajv.addSchema(sch, id ? undefined : file)
       const validate = ajv.getSchema(id || file)
       if (argv.o !== true) console.log(`schema ${file} is valid`)
       return validate
@@ -61,7 +61,7 @@ function execute(argv: ParsedArgs): boolean {
     }
   }
 
-  function getRefs(validators: AnyValidateFunction[], files: string[]): {[K in string]?: string}  {
+  function getRefs(validators: AnyValidateFunction[], files: string[]): {[K in string]?: string} {
     const refs: {[K in string]?: string} = {}
     validators.forEach((v, i) => {
       const ref = typeof v.schema == "object" ? v.schema.$id || files[i] : files[i]

src/commands/test.ts

@@ -33,7 +33,9 @@ function execute(argv: ParsedArgs): boolean {
   const ajv = getAjv(argv)
   const validate = compile(ajv, argv.s)
   const shouldBeValid = !!argv.valid && argv.valid !== "false"
-  return getFiles(argv.d).map(testDataFile).every((x) => x)
+  return getFiles(argv.d)
+    .map(testDataFile)
+    .every((x) => x)
 
   function testDataFile(file: string): boolean {
     const data = openFile(file, `data file ${file}`)

src/commands/util.ts

@@ -4,7 +4,7 @@ import path = require("path")
 import fs = require("fs")
 import yaml = require("js-yaml")
 import JSON5 = require("json5")
-import { AnyValidateFunction } from "ajv/dist/core"
+import {AnyValidateFunction} from "ajv/dist/core"
 
 export function getFiles(args: string | string[]): string[] {
   let files: string[] = []

src/commands/validate.ts

@@ -31,7 +31,9 @@ export default cmd
 function execute(argv: ParsedArgs): boolean {
   const ajv = getAjv(argv)
   const validate = compile(ajv, argv.s)
-  return getFiles(argv.d).map(validateDataFile).every((x) => x)
+  return getFiles(argv.d)
+    .map(validateDataFile)
+    .every((x) => x)
 
   function validateDataFile(file: string): boolean {
     const data = openFile(file, `data file ${file}`)

test/migrate/schema_invalid.json

@@ -1,4 +1,4 @@
 {
   "type": "invalid",
   "$schema": "http://json-schema.org/draft-07/schema"
-}
+}

test/valid_data.json5

@@ -1,32 +1,32 @@
 [
-    // todo: we're missing item 1
-    {
-        id: 2,
-        name: 'An ice sculpture',
-        price: 12.50,
-        tags: ['cold', 'ice'],
-        dimensions: {
-            length: 7.0,
-            width: 12.0,
-            height: 9.5
-        },
-        warehouseLocation: {
-            latitude: -78.75,
-            longitude: 20.4
-        }
+  // todo: we're missing item 1
+  {
+    id: 2,
+    name: "An ice sculpture",
+    price: 12.5,
+    tags: ["cold", "ice"],
+    dimensions: {
+      length: 7.0,
+      width: 12.0,
+      height: 9.5,
     },
-    {
-        id: 3,
-        name: 'A blue mouse',
-        price: 25.50,
-        dimensions: {
-            length: 3.1,
-            width: 1.0,
-            height: 1.0
-        },
-        warehouseLocation: {
-            latitude: 54.4,
-            longitude: -32.7
-        }
-    }
+    warehouseLocation: {
+      latitude: -78.75,
+      longitude: 20.4,
+    },
+  },
+  {
+    id: 3,
+    name: "A blue mouse",
+    price: 25.5,
+    dimensions: {
+      length: 3.1,
+      width: 1.0,
+      height: 1.0,
+    },
+    warehouseLocation: {
+      latitude: 54.4,
+      longitude: -32.7,
+    },
+  },
 ]