8.0.0, auto-format tests

Author: bcherny

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.0.0
+
+- e144890 Improve generated output when mixing nulls and unions (#261)
+
 ## 7.1.0
 
 - ddbd627 Add `strictIndexSignatures` CLI option, defaulting to false (#252)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-schema-to-typescript",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "description": "compile json schema to typescript typings",
   "main": "dist/src/index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "build:browser": "browserify src/index.ts -s jstt -p tsify > dist/bundle.js",
     "build:server": "tsc -d",
     "clean": "shx rm -rf dist",
-    "lint": "eslint src/*.ts",
+    "lint": "eslint src/*.ts test/*.ts",
     "tdd": "concurrently -r -p '' -k 'npm run watch' 'npm run watch:test'",
     "test": "ava --serial --verbose",
     "prepublishOnly": "npm test",

test/test.ts

@@ -1,7 +1,7 @@
-import { run as runCLITests } from './testCLI'
-import { run as runCompileFromFileTests } from './testCompileFromFile'
-import { hasOnly, run as runE2ETests } from './testE2E'
-import { run as runNormalizerTests } from './testNormalizer'
+import {run as runCLITests} from './testCLI'
+import {run as runCompileFromFileTests} from './testCompileFromFile'
+import {hasOnly, run as runE2ETests} from './testE2E'
+import {run as runNormalizerTests} from './testNormalizer'
 
 runE2ETests()
 

test/testCLI.ts

@@ -1,37 +1,32 @@
 import test from 'ava'
-import { execSync } from 'child_process'
-import { readFileSync, unlinkSync } from 'fs'
+import {execSync} from 'child_process'
+import {readFileSync, unlinkSync} from 'fs'
 
 export function run() {
-
   test('pipe in, pipe out', t => {
     t.snapshot(
-      execSync('shx cat ./test/resources/ReferencedType.json | node dist/src/cli.js', { encoding: 'utf-8' }).toString()
+      execSync('shx cat ./test/resources/ReferencedType.json | node dist/src/cli.js', {encoding: 'utf-8'}).toString()
     )
   })
 
   test('pipe in (schema without ID), pipe out', t => {
     t.snapshot(
-      execSync('shx cat ./test/resources/ReferencedTypeWithoutID.json | node dist/src/cli.js', { encoding: 'utf-8' }).toString()
+      execSync('shx cat ./test/resources/ReferencedTypeWithoutID.json | node dist/src/cli.js', {
+        encoding: 'utf-8'
+      }).toString()
     )
   })
 
   test('file in (no flags), pipe out', t => {
-    t.snapshot(
-      execSync('node dist/src/cli.js ./test/resources/ReferencedType.json').toString()
-    )
+    t.snapshot(execSync('node dist/src/cli.js ./test/resources/ReferencedType.json').toString())
   })
 
   test('file in (--input), pipe out', t => {
-    t.snapshot(
-      execSync('node dist/src/cli.js --input ./test/resources/ReferencedType.json').toString()
-    )
+    t.snapshot(execSync('node dist/src/cli.js --input ./test/resources/ReferencedType.json').toString())
   })
 
   test('file in (-i), pipe out', t => {
-    t.snapshot(
-      execSync('node dist/src/cli.js -i ./test/resources/ReferencedType.json').toString()
-    )
+    t.snapshot(execSync('node dist/src/cli.js -i ./test/resources/ReferencedType.json').toString())
   })
 
   test('file in (-i), unreachable definitions flag, pipe out', t => {
@@ -47,13 +42,13 @@ export function run() {
   })
 
   test('file in (-i), pipe out (absolute path)', t => {
-    t.snapshot(
-      execSync(`node dist/src/cli.js -i ${__dirname}/../../test/resources/ReferencedType.json`).toString()
-    )
+    t.snapshot(execSync(`node dist/src/cli.js -i ${__dirname}/../../test/resources/ReferencedType.json`).toString())
   })
 
   test('pipe in, file out (--output)', t => {
-    execSync('shx cat ./test/resources/ReferencedType.json | node dist/src/cli.js --output ./ReferencedType.d.ts').toString()
+    execSync(
+      'shx cat ./test/resources/ReferencedType.json | node dist/src/cli.js --output ./ReferencedType.d.ts'
+    ).toString()
     t.snapshot(readFileSync('./ReferencedType.d.ts', 'utf-8'))
     unlinkSync('./ReferencedType.d.ts')
   })
@@ -77,9 +72,10 @@ export function run() {
   })
 
   test('file in (--input), file out (--output)', t => {
-    execSync('node dist/src/cli.js --input ./test/resources/ReferencedType.json --output ./ReferencedType.d.ts').toString()
+    execSync(
+      'node dist/src/cli.js --input ./test/resources/ReferencedType.json --output ./ReferencedType.d.ts'
+    ).toString()
     t.snapshot(readFileSync('./ReferencedType.d.ts', 'utf-8'))
     unlinkSync('./ReferencedType.d.ts')
   })
-
 }

test/testCompileFromFile.ts

@@ -1,10 +1,7 @@
 import test from 'ava'
-import { compileFromFile } from '../src'
+import {compileFromFile} from '../src'
 
 export function run() {
-
   test('compileFromFile should resolve refs from cwd option', async t =>
-    t.snapshot(await compileFromFile('./test/resources/other/ReferencingType.json', {cwd: './test/resources'}))
-  )
-
+    t.snapshot(await compileFromFile('./test/resources/other/ReferencingType.json', {cwd: './test/resources'})))
 }

test/testE2E.ts

@@ -1,9 +1,9 @@
 import test from 'ava'
-import { readdirSync } from 'fs'
-import { find } from 'lodash'
-import { join } from 'path'
-import { compile, JSONSchema, Options } from '../src'
-import { log, stripExtension } from '../src/utils'
+import {readdirSync} from 'fs'
+import {find} from 'lodash'
+import {join} from 'path'
+import {compile, JSONSchema, Options} from '../src'
+import {log, stripExtension} from '../src/utils'
 
 const dir = __dirname + '/e2e'
 
@@ -23,7 +23,6 @@ export function hasOnly() {
 }
 
 export function run() {
-
   // [filename, absolute dirname, contents][]
   const modules = readdirSync(dir)
     .filter(_ => /^.*\.js$/.test(_))
@@ -35,9 +34,7 @@ export function run() {
   if (only) {
     runOne(only[1], only[0])
   } else {
-    modules
-      .filter(_ => !_[1].exclude)
-      .forEach(_ => runOne(_[1], _[0]))
+    modules.filter(_ => !_[1].exclude).forEach(_ => runOne(_[1], _[0]))
   }
 }
 

test/testNormalizer.ts

@@ -1,9 +1,9 @@
 import test from 'ava'
-import { readdirSync } from 'fs'
-import { template } from 'lodash'
-import { join } from 'path'
-import { JSONSchema } from '../src'
-import { normalize } from '../src/normalizer'
+import {readdirSync} from 'fs'
+import {template} from 'lodash'
+import {join} from 'path'
+import {JSONSchema} from '../src'
+import {normalize} from '../src/normalizer'
 
 interface JSONTestCase {
   name: string
@@ -19,15 +19,15 @@ export function run() {
     .map(_ => join(normalizerDir, _))
     .map(_ => [_, require(_)] as [string, JSONTestCase])
     .forEach(([filename, json]: [string, JSONTestCase]) => {
-      const params = { filename }
+      const params = {filename}
       test(json.name, t => {
-        const normalised = normalize(json.in, filename);
+        const normalised = normalize(json.in, filename)
         t.snapshot(template(toString(normalised))(params))
-        t.deepEqual(json.out, normalised);
+        t.deepEqual(json.out, normalised)
       })
     })
 }
 
-function toString(json: Object): string {
+function toString(json: Record<string, any>): string {
   return JSON.stringify(json, null, 2)
 }