Merge pull request bcherny#464 from s-weigand/cross-platform-tests-rebased

🧪 Cross platform tests (follow up)

Author: bcherny

src/utils.ts

@@ -1,5 +1,5 @@
 import {deburr, isPlainObject, trim, upperFirst} from 'lodash'
-import {basename, dirname, extname, join, normalize, sep} from 'path'
+import {basename, dirname, extname, normalize, sep, posix} from 'path'
 import {JSONSchema, LinkedJSONSchema, Parent} from './types/JSONSchema'
 
 // TODO: pull out into a separate package
@@ -274,7 +274,7 @@ export function pathTransform(outputPath: string, inputPath: string, filePath: s
   const filePathList = dirname(normalize(filePath)).split(sep)
   const filePathRel = filePathList.filter((f, i) => f !== inPathList[i])
 
-  return join(normalize(outputPath), ...filePathRel)
+  return posix.join(posix.normalize(outputPath), ...filePathRel)
 }
 
 /**

test/__snapshots__/test/test.ts.md

@@ -12044,7 +12044,7 @@ Generated by [AVA](https://avajs.dev).
 
 > Snapshot 1
 
-    'test/resources/MultiSchema2/out/bar/SameDirName/MultiSchema2/e.d.ts'
+    'test/resources/MultiSchema2/out/bar/b.d.ts'
 
 > Snapshot 2
 
@@ -12055,12 +12055,16 @@ Generated by [AVA](https://avajs.dev).
      * and run json-schema-to-typescript to regenerate this file.␊
      */␊
     ␊
-    export type ESchema = string;␊
+    export interface BSchema {␊
+      x?: string;␊
+      y: number;␊
+      [k: string]: unknown;␊
+    }␊
     `
 
 > Snapshot 3
 
-    'test/resources/MultiSchema2/out/bar/b.d.ts'
+    'test/resources/MultiSchema2/out/bar/SameDirName/MultiSchema2/e.d.ts'
 
 > Snapshot 4
 
@@ -12071,11 +12075,7 @@ Generated by [AVA](https://avajs.dev).
      * and run json-schema-to-typescript to regenerate this file.␊
      */␊
     ␊
-    export interface BSchema {␊
-      x?: string;␊
-      y: number;␊
-      [k: string]: unknown;␊
-    }␊
+    export type ESchema = string;␊
     `
 
 > Snapshot 5

test/__snapshots__/test/test.ts.snap

@@ -1,7 +1,7 @@
 import test from 'ava'
 import {execSync} from 'child_process'
 import {readFileSync, unlinkSync, readdirSync, existsSync, lstatSync} from 'fs'
-import {resolve, join} from 'path'
+import {resolve, posix} from 'path'
 import rimraf = require('rimraf')
 
 export function run() {
@@ -84,7 +84,7 @@ export function run() {
   })
 
   test('files in (-i), files out (-o)', t => {
-    execSync("node dist/src/cli.js -i './test/resources/MultiSchema/**/*.json' -o ./test/resources/MultiSchema/out")
+    execSync(`node dist/src/cli.js -i "./test/resources/MultiSchema/**/*.json" -o ./test/resources/MultiSchema/out`)
 
     readdirSync('./test/resources/MultiSchema/out').forEach(f => {
       const path = `./test/resources/MultiSchema/out/${f}`
@@ -96,12 +96,12 @@ export function run() {
   })
 
   test('files in (-i), pipe out', t => {
-    t.snapshot(execSync("node dist/src/cli.js -i './test/resources/MultiSchema/**/*.json'").toString())
+    t.snapshot(execSync(`node dist/src/cli.js -i "./test/resources/MultiSchema/**/*.json"`).toString())
   })
 
   test('files in (-i), files out (-o) nested dir does not exist', t => {
     execSync(
-      "node dist/src/cli.js -i './test/resources/MultiSchema/**/*.json' -o ./test/resources/MultiSchema/foo/bar/out"
+      `node dist/src/cli.js -i "./test/resources/MultiSchema/**/*.json" -o ./test/resources/MultiSchema/foo/bar/out`
     )
     readdirSync('./test/resources/MultiSchema/foo/bar/out').forEach(f => {
       const path = `./test/resources/MultiSchema/foo/bar/out/${f}`
@@ -114,7 +114,7 @@ export function run() {
 
   test('files in (-i), files out (-o) matching nested dir', t => {
     execSync(
-      "node dist/src/cli.js -i './test/resources/../../test/resources/MultiSchema2/' -o ./test/resources/MultiSchema2/out"
+      `node dist/src/cli.js -i "./test/resources/../../test/resources/MultiSchema2/" -o ./test/resources/MultiSchema2/out`
     )
     getPaths('./test/resources/MultiSchema2/out').forEach(file => {
       t.snapshot(file)
@@ -127,10 +127,11 @@ export function run() {
 
 function getPaths(path: string, paths: string[] = []) {
   if (existsSync(path) && lstatSync(path).isDirectory()) {
-    readdirSync(resolve(path)).forEach(item => getPaths(join(path, item), paths))
+    readdirSync(resolve(path)).forEach(item => getPaths(posix.join(posix.normalize(path), item), paths))
   } else {
     paths.push(path)
   }
 
-  return paths
+  // sort paths to ensure a stable order across environments
+  return paths.sort((a, b) => a.localeCompare(b))
 }