fix util test

Author: Ethan-Arrowood

src/cli.ts

@@ -10,6 +10,7 @@ import {promisify} from 'util'
 import {join, resolve, dirname, basename} from 'path'
 import stdin = require('stdin')
 import {compile, Options} from './index'
+import {pathTransform} from './utils'
 
 // Promisify mkdirp & glob
 const mkdirp = (path: string): Promise<_mkdirp.Made> =>
@@ -91,29 +92,6 @@ async function processGlob(argIn: string, argOut: string | undefined, argv: Part
   )
 }
 
-/*
-the following logic determines the out path by comparing the in path to the users specified out path.
-For example, if input directory MultiSchema looks like:
-  MultiSchema/foo/a.json
-  MultiSchema/bar/fuzz/c.json
-  MultiSchema/bar/d.json
-And the user wants the outputs to be in MultiSchema/Out, then this code will be able to map the inner directories foo, bar, and fuzz into the intended Out directory like so:
-  MultiSchema/Out/foo/a.json
-  MultiSchema/Out/bar/fuzz/c.json
-  MultiSchema/Out/bar/d.json
-*/
-export function pathTransform(o: string, i: string): string {
-  const outPathList = o.split('/')
-  const inPathList = i.split('/')
-
-  const intersection = outPathList.filter(x => inPathList.includes(x))
-  const difference = outPathList
-    .filter(x => !inPathList.includes(x))
-    .concat(inPathList.filter(x => !outPathList.includes(x)))
-
-  return join(...intersection, ...difference)
-}
-
 async function processDir(argIn: string, argOut: string | undefined, argv: Partial<Options>): Promise<void[]> {
   const files = getPaths(argIn)
 

src/utils.ts

@@ -1,6 +1,6 @@
 import {whiteBright} from 'cli-color'
 import {deburr, isPlainObject, mapValues, trim, upperFirst} from 'lodash'
-import {basename, extname} from 'path'
+import {basename, extname, join} from 'path'
 import {JSONSchema} from './types/JSONSchema'
 
 // TODO: pull out into a separate package
@@ -221,3 +221,26 @@ export function escapeBlockComment(schema: JSONSchema) {
     }
   }
 }
+
+/*
+the following logic determines the out path by comparing the in path to the users specified out path.
+For example, if input directory MultiSchema looks like:
+  MultiSchema/foo/a.json
+  MultiSchema/bar/fuzz/c.json
+  MultiSchema/bar/d.json
+And the user wants the outputs to be in MultiSchema/Out, then this code will be able to map the inner directories foo, bar, and fuzz into the intended Out directory like so:
+  MultiSchema/Out/foo/a.json
+  MultiSchema/Out/bar/fuzz/c.json
+  MultiSchema/Out/bar/d.json
+*/
+export function pathTransform(o: string, i: string): string {
+  const outPathList = o.split('/')
+  const inPathList = i.split('/')
+
+  const intersection = outPathList.filter(x => inPathList.includes(x))
+  const symmetricDifference = outPathList
+    .filter(x => !inPathList.includes(x))
+    .concat(inPathList.filter(x => !outPathList.includes(x)))
+
+  return join(...intersection, ...symmetricDifference)
+}

test/test.ts

@@ -2,11 +2,13 @@ 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 runUtilsTests} from './testUtils'
 
 runE2ETests()
 
 if (!hasOnly()) {
   runCompileFromFileTests()
   runCLITests()
   runNormalizerTests()
+  runUtilsTests()
 }

test/testCLI.ts

@@ -2,7 +2,6 @@ import {serial as test} from 'ava'
 import {execSync} from 'child_process'
 import {readFileSync, unlinkSync, readdirSync, rmdirSync, existsSync, lstatSync} from 'fs'
 import {resolve, join} from 'path'
-import {pathTransform} from '../src/cli'
 
 export function run() {
   test('pipe in, pipe out', t => {
@@ -114,15 +113,6 @@ export function run() {
     })
     rmdirSync('./test/resources/MultiSchema2/out', {recursive: true})
   })
-
-  test('validate pathTransform function', t => {
-    const inputPaths = ['MultiSchema/foo/a.json', 'MultiSchema/bar/fuzz/c.json', 'MultiSchema/bar/d.json']
-    const outputPath = 'MultiSchema/Out'
-
-    t.is(pathTransform(outputPath, inputPaths[0]), 'MultiSchema/Out/foo/a.json')
-    t.is(pathTransform(outputPath, inputPaths[1]), 'MultiSchema/Out/bar/d.json')
-    t.is(pathTransform(outputPath, inputPaths[2]), 'MultiSchema/Out/bar/fuzz/c.json')
-  })
 }
 
 function getPaths(path: string, paths: string[] = []) {

test/testUtils.ts

@@ -0,0 +1,13 @@
+import {serial as test} from 'ava'
+import {pathTransform} from '../src/utils'
+
+export function run() {
+  test('validate pathTransform function', t => {
+    const inputPaths = ['MultiSchema/foo/a.json', 'MultiSchema/bar/fuzz/c.json', 'MultiSchema/bar/d.json']
+    const outputPath = 'MultiSchema/Out'
+
+    t.is(pathTransform(outputPath, inputPaths[0]), 'MultiSchema/Out/foo/a.json')
+    t.is(pathTransform(outputPath, inputPaths[1]), 'MultiSchema/Out/bar/fuzz/c.json')
+    t.is(pathTransform(outputPath, inputPaths[2]), 'MultiSchema/Out/bar/d.json')
+  })
+}