Fix extracting CLI args when running as script

juusaw · Oct 6, 2019 · 856a9c3 · 856a9c3
1 parent f4d77dd
commit 856a9c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/cli.js b/cli.js
@@ -2,4 +2,4 @@
 
 var tsToIo = require("./build/index.js");
 
-console.log(tsToIo.getValidatorsFromFileNames([process.argv[2]]));
+console.log(tsToIo.getValidatorsFromFileNames());
diff --git a/src/index.ts b/src/index.ts
@@ -215,7 +215,11 @@ export function getValidatorsFromString(
   return result.join("\n\n");
 }
 
-export function getValidatorsFromFileNames(config: TsToIoConfig) {
+export function getValidatorsFromFileNames() {
+  const config = getCliConfig();
+  if (!config.fileNames.length) {
+    return displayHelp();
+  }
   const program = ts.createProgram(config.fileNames, compilerOptions);
   const checker = program.getTypeChecker();
   const result = config.includeHeader ? [getImports()] : [];
@@ -226,16 +230,3 @@ export function getValidatorsFromFileNames(config: TsToIoConfig) {
   }
   return result.join("\n\n");
 }
-
-function isEntryPoint() {
-  return require.main === module;
-}
-
-if (isEntryPoint()) {
-  const config = getCliConfig();
-  if (!config.fileNames.length) {
-    displayHelp();
-  } else {
-    console.log(getValidatorsFromFileNames(config));
-  }
-}