From 3971df8ad8d064f49eb57e6d084231e04597f8b5 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 25 Jun 2018 10:23:15 +0200 Subject: [PATCH] fix(core): fix argument parsing --- dist/index.js | 8 ++++++-- package-lock.json | 5 +++-- package.json | 2 +- ts/index.ts | 7 ++++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index b7f7c1a..9b157b5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -8,7 +8,11 @@ tsNode.register({ } }); if (process.env.CLI_CALL) { - const pathToLoad = path.join(process.cwd(), process.argv.pop()); + // contents of argv array + // process.argv[0] -> node Executable + // process.argv[1] -> tsrun executable + const pathToTsFile = process.argv[2]; + const pathToLoad = path.join(process.cwd(), pathToTsFile); Promise.resolve().then(() => require(pathToLoad)); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtDQUFrQztBQUNsQyw2QkFBNkI7QUFFN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQztJQUNkLGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSxDQUFFLFFBQVEsRUFBRSxRQUFRLENBQUU7S0FDNUI7Q0FDRixDQUFDLENBQUM7QUFFSCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFO0lBQ3hCLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUNoRSxxQ0FBTyxVQUFVLEdBQUU7Q0FDcEIifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtDQUFrQztBQUNsQyw2QkFBNkI7QUFFN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQztJQUNkLGVBQWUsRUFBRTtRQUNmLEdBQUcsRUFBRSxDQUFFLFFBQVEsRUFBRSxRQUFRLENBQUU7S0FDNUI7Q0FDRixDQUFDLENBQUM7QUFFSCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFO0lBQ3hCLHlCQUF5QjtJQUN6QixxQ0FBcUM7SUFDckMsc0NBQXNDO0lBQ3RDLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFcEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFDMUQscUNBQU8sVUFBVSxHQUFFO0NBQ3BCIn0= \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 94d27aa..77816ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "tsrun", + "name": "@gitzone/tsrun", "version": "1.0.5", "lockfileVersion": 1, "requires": true, @@ -7,7 +7,8 @@ "@types/node": { "version": "10.3.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.3.0.tgz", - "integrity": "sha512-hWzNviaVFIr1TqcRA8ou49JaSHp+Rfabmnqg2kNvusKqLhPU0rIsGPUj5WJJ7ld4Bb7qdgLmIhLfCD1qS08IVA==" + "integrity": "sha512-hWzNviaVFIr1TqcRA8ou49JaSHp+Rfabmnqg2kNvusKqLhPU0rIsGPUj5WJJ7ld4Bb7qdgLmIhLfCD1qS08IVA==", + "dev": true }, "arrify": { "version": "1.0.1", diff --git a/package.json b/package.json index 493c187..1d43d17 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "tsrun": "dist/cli.js" }, "scripts": { - "test": "(npmts --notest && node dist/cli.js -d test/test.ts)", + "test": "(npmts --notest && node dist/cli.js test/test.ts)", "format": "(gitzone format)", "build": "echo \"Not needed for now\"" }, diff --git a/ts/index.ts b/ts/index.ts index 54c01ad..3cd2178 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -8,6 +8,11 @@ tsNode.register({ }); if (process.env.CLI_CALL) { - const pathToLoad = path.join(process.cwd(), process.argv.pop()); + // contents of argv array + // process.argv[0] -> node Executable + // process.argv[1] -> tsrun executable + const pathToTsFile = process.argv[2] + + const pathToLoad = path.join(process.cwd(), pathToTsFile); import(pathToLoad); }