ts-runtime-validation 1.6.7 → 1.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-runtime-validation",
-    "version": "1.6.7",
+    "version": "1.6.9",
     "author": "Matthew Duong <thegalah@gmail.com>",
     "license": "MIT",
     "dependencies": {

package/src/ICommandOptions.ts

@@ -0,0 +1,8 @@
+export interface ICommandOptions {
+    readonly glob: string;
+    readonly rootPath: string;
+    readonly output: string;
+    readonly helpers: boolean;
+    readonly additionalProperties: boolean;
+    readonly tsconfigPath: string;
+}

package/src/SchemaGenerator.test.ts

@@ -1,10 +1,10 @@
 import fs from "fs";
 import path from "path";
-import { ICommandOptions } from "./index";
+import { ICommandOptions } from "./ICommandOptions";
 import { SchemaGenerator } from "./SchemaGenerator";
 
 const cleanupTestOutput = () => {
-    const outputDir = path.resolve(__dirname, "./test/output");
+    const outputDir = path.posix.resolve(__dirname, "./test/output");
     const doesDirectoryExist = fs.existsSync(outputDir);
     if (doesDirectoryExist) {
         fs.rmSync(outputDir, { recursive: true });

package/src/SchemaGenerator.ts

@@ -1,5 +1,5 @@
 import { fdir } from "fdir";
-import { ICommandOptions } from "./index";
+import { ICommandOptions } from "./ICommandOptions";
 import fs from "fs";
 import picomatch from "picomatch";
 import path from "path";
@@ -18,6 +18,7 @@ import * as tsj from "ts-json-schema-generator";
 import { Config, Schema } from "ts-json-schema-generator";
 import assert from "assert";
 import { writeLine } from "./writeLine";
+import { getPosixPath } from "./getPosixPath";
 
 const defaultTsMorphProjectSettings: ProjectOptions = {
     manipulationSettings: {
@@ -74,7 +75,7 @@ export class SchemaGenerator {
 
     private getMatchingFiles = async () => {
         const { glob, rootPath } = this.options;
-        const api = new fdir().crawlWithOptions(rootPath, {
+        const api = new fdir({
             includeBasePath: true,
             includeDirs: false,
             filters: [
@@ -82,8 +83,8 @@ export class SchemaGenerator {
                     return picomatch.isMatch(path, glob, { contains: true });
                 },
             ],
-        });
-        return api.withPromise() as Promise<Array<string>>;
+        }).crawl(rootPath);
+        return api.withPromise();
     };
 
     private getJsonSchemasForFiles = async (filesList: Array<string>) => {
@@ -163,7 +164,7 @@ export class SchemaGenerator {
             const dir = path.dirname(filePath);
             const fileWithoutExtension = path.parse(filePath).name;
             const relativeFilePath = path.relative(this.outputPath, dir);
-            const importPath = `${relativeFilePath}/${fileWithoutExtension}`;
+            const relativeImportPath = `${relativeFilePath}/${fileWithoutExtension}`;
             const defs = schema.definitions ?? {};
 
             const readerSourceFile = readerProject.addSourceFileAtPath(filePath);
@@ -173,9 +174,9 @@ export class SchemaGenerator {
                 const typeInterface = readerSourceFile.getInterface(symbol);
                 const hasTypeOrInterface = (typeAlias ?? typeInterface) !== undefined;
                 if (hasTypeOrInterface) {
-                    const namedImports = importMap.get(importPath) ?? [];
+                    const namedImports = importMap.get(relativeImportPath) ?? [];
                     namedImports.push(symbol);
-                    importMap.set(importPath, namedImports);
+                    importMap.set(relativeImportPath, namedImports);
                     symbols.push(symbol);
                 }
             });
@@ -184,7 +185,7 @@ export class SchemaGenerator {
         const sourceFile = project.createSourceFile(this.tsSchemaDefinitionOutputFile, {}, defaultCreateFileOptions);
 
         importMap.forEach((namedImports, importPath) => {
-            sourceFile.addImportDeclaration({ namedImports, moduleSpecifier: importPath });
+            sourceFile.addImportDeclaration({ namedImports, moduleSpecifier: getPosixPath(importPath) });
         });
 
         sourceFile.addVariableStatement({

package/src/getPosixPath.ts

@@ -0,0 +1,6 @@
+import path from "path";
+
+export const getPosixPath = (rawPath: string) => {
+    const definitelyPosix = rawPath.split(path.sep).join(path.posix.sep);
+    return definitelyPosix;
+};

package/src/index.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import { ICommandOptions } from "./ICommandOptions";
 import { SchemaGenerator } from "./SchemaGenerator";
 import { program } from "commander";
 
@@ -9,15 +10,6 @@ const defaultRootPath = "./src";
 const defaultOutputFolder = "./.ts-runtime-validation";
 const defaultTsconfig = "";
 
-export interface ICommandOptions {
-    readonly glob: string;
-    readonly rootPath: string;
-    readonly output: string;
-    readonly helpers: boolean;
-    readonly additionalProperties: boolean;
-    readonly tsconfigPath: string;
-}
-
 program.option(
     "--glob",
     `Glob file path of typescript files to generate ts-interface -> json-schema validations - default: ${defaultGlobPattern}`,