diff --git a/dist/index.js b/dist/index.js index 85669d0..bb09f85 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2,17 +2,27 @@ Object.defineProperty(exports, "__esModule", { value: true }); const path = require("path"); const tsNode = require("ts-node"); +const tsCacheDir = path.join(__dirname, "../tscache"); const defaultTsNodeOptions = { compilerOptions: { - lib: ['es2016', 'es2017'], - target: 'es2015', + lib: ["es2016", "es2017"], + target: "es2015" }, skipIgnore: true, - cacheDirectory: path.join(__dirname, '../tscache') + cacheDirectory: tsCacheDir }; -if (process.argv.includes('--nocache')) { +// check wether a cache is feasible +if (process.argv.includes("--nocache")) { defaultTsNodeOptions.cache = false; } +else { + var fs = require('fs'); + fs.access(tsCacheDir, fs.constants.W_OK, function (err) { + if (err) { + defaultTsNodeOptions.cache = false; + } + }); +} tsNode.register(defaultTsNodeOptions); if (process.env.CLI_CALL_TSRUN) { // contents of argv array @@ -22,4 +32,4 @@ if (process.env.CLI_CALL_TSRUN) { const pathToLoad = path.join(process.cwd(), pathToTsFile); Promise.resolve().then(() => require(pathToLoad)); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE2QjtBQUM3QixrQ0FBa0M7QUFFbEMsTUFBTSxvQkFBb0IsR0FBbUI7SUFDM0MsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLENBQUMsUUFBUSxFQUFDLFFBQVEsQ0FBQztRQUN4QixNQUFNLEVBQUUsUUFBUTtLQUNqQjtJQUNELFVBQVUsRUFBRSxJQUFJO0lBQ2hCLGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUM7Q0FDbkQsQ0FBQTtBQUVELElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEVBQUU7SUFDdEMsb0JBQW9CLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztDQUNwQztBQUVELE1BQU0sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUV0QyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFO0lBQzlCLHlCQUF5QjtJQUN6QixxQ0FBcUM7SUFDckMsc0NBQXNDO0lBQ3RDLE1BQU0sWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFcEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsWUFBWSxDQUFDLENBQUM7SUFDMUQscUNBQU8sVUFBVSxHQUFFO0NBQ3BCIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZCQUE2QjtBQUM3QixrQ0FBa0M7QUFFbEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsWUFBWSxDQUFDLENBQUM7QUFFdEQsTUFBTSxvQkFBb0IsR0FBbUI7SUFDM0MsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQztRQUN6QixNQUFNLEVBQUUsUUFBUTtLQUNqQjtJQUNELFVBQVUsRUFBRSxJQUFJO0lBQ2hCLGNBQWMsRUFBRSxVQUFVO0NBQzNCLENBQUM7QUFFRixtQ0FBbUM7QUFDbkMsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsRUFBRTtJQUN0QyxvQkFBb0IsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO0NBQ3BDO0tBQU07SUFDTCxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkIsRUFBRSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsVUFBUyxHQUFHO1FBQ25ELElBQUksR0FBRyxFQUFFO1lBQ1Asb0JBQW9CLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztTQUNwQztJQUNILENBQUMsQ0FBQyxDQUFDO0NBQ0o7QUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFFdEMsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRTtJQUM5Qix5QkFBeUI7SUFDekIscUNBQXFDO0lBQ3JDLHNDQUFzQztJQUN0QyxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRXJDLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLFlBQVksQ0FBQyxDQUFDO0lBQzFELHFDQUFPLFVBQVUsR0FBRTtDQUNwQiJ9 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 22db89a..1e39f66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,18 +4,59 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg==", + "@pushrocks/smartfile": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.3.tgz", + "integrity": "sha512-oYnLQzY/R6kVNerbWY4WwnPvdxXldrzMPWcB9j0aAdSDSqGwBEO1/ZFTQuNzN5MmPopoYmJrc06ZmI6dm4OJmw==", "requires": { - "@types/node": "*" + "@pushrocks/smartpromise": "^2.0.5", + "@pushrocks/smartrequest": "^1.0.15", + "@types/fs-extra": "^5.0.3", + "@types/vinyl": "^2.0.2", + "fs-extra": "^6.0.1", + "glob": "^7.1.2", + "js-yaml": "^3.10.0", + "smartpath": "^3.2.8", + "vinyl-file": "^3.0.0" + }, + "dependencies": { + "@types/fs-extra": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.4.tgz", + "integrity": "sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==", + "requires": { + "@types/node": "*" + } + }, + "fs-extra": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", + "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, + "@pushrocks/smartpromise": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz", + "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==" + }, + "@pushrocks/smartrequest": { + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.0.15.tgz", + "integrity": "sha512-nM+ctwMOs3gPJvw3cGouBimKQxCM93bnmv2+Jk9cbT29/UVVI/UjIdAU3OnUYFpzq496/QUAQD0kNsmYNkqmhQ==", + "requires": { + "smartq": "^1.1.1" } }, "@types/node": { - "version": "10.5.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.1.tgz", - "integrity": "sha512-AFLl1IALIuyt6oK4AYZsgWVJ/5rnyzQWud7IebaZWWV3YmgtPZkQmYio9R5Ze/2pdd7XfqF5bP+hWS11mAKoOQ==" + "version": "10.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz", + "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q==" }, "@types/vinyl": { "version": "2.0.2", @@ -146,16 +187,6 @@ "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" }, - "fs-extra": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", - "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -356,33 +387,11 @@ "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=" }, - "require-reload": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/require-reload/-/require-reload-0.2.2.tgz", - "integrity": "sha1-KadZGEbK+RtuijzamRaD+V+NfUI=" - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, - "smartfile": { - "version": "4.2.28", - "resolved": "https://registry.npmjs.org/smartfile/-/smartfile-4.2.28.tgz", - "integrity": "sha512-zUeAOLYftz8xLfKTs9U1NOuNPTA9jlvTQNr7lDIv84kXnr1AEpDb2Xwy1MdK1w733sBil/RkxtezrkvgRVAnNg==", - "requires": { - "@types/fs-extra": "5.0.0", - "@types/vinyl": "^2.0.2", - "fs-extra": "^5.0.0", - "glob": "^7.1.2", - "js-yaml": "^3.10.0", - "require-reload": "0.2.2", - "smartpath": "^3.2.8", - "smartq": "^1.1.6", - "smartrequest": "^1.0.8", - "vinyl-file": "^3.0.0" - } - }, "smartpath": { "version": "3.2.8", "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz", @@ -400,14 +409,6 @@ "util.promisify": "^1.0.0" } }, - "smartrequest": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/smartrequest/-/smartrequest-1.0.13.tgz", - "integrity": "sha512-OHrvzaxaA8Z8bJr33yxnyJF35nrWyaumsajqXm2Zkv0/2hfWO1NQAj02VVV51rLQfmtU0Hex7Nk19SoC8nOmYg==", - "requires": { - "smartq": "^1.1.1" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -483,9 +484,9 @@ } }, "typescript": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz", - "integrity": "sha512-h6pM2f/GDchCFlldnriOhs1QHuwbnmj6/v7499eMHqPeW4V2G0elua2eIc2nu8v2NdHV0Gm+tzX83Hr6nUFjQA==" + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==" }, "typings-global": { "version": "1.0.28", diff --git a/package.json b/package.json index a6d85cd..fbc9514 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "postinstall": "(node ./cli.js scripts/postinstall.ts)" }, "devDependencies": { - "@types/node": "^10.5.1" + "@types/node": "^10.5.2" }, "dependencies": { - "smartfile": "^4.2.28", + "@pushrocks/smartfile": "^6.0.3", "ts-node": "^7.0.0", - "typescript": "^2.9.1" + "typescript": "^2.9.2" }, "private": false } diff --git a/scripts/postinstall.ts b/scripts/postinstall.ts index a772939..45c32a0 100644 --- a/scripts/postinstall.ts +++ b/scripts/postinstall.ts @@ -1,5 +1,5 @@ // This file takes care of some postinstall actions like clearing the TypeScript cache. -import * as smartfile from 'smartfile'; +import * as smartfile from '@pushrocks/smartfile'; import * as path from 'path'; const run = async () => { diff --git a/ts/index.ts b/ts/index.ts index e9fc6c6..9b61a98 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,17 +1,27 @@ -import * as path from 'path'; -import * as tsNode from 'ts-node'; +import * as path from "path"; +import * as tsNode from "ts-node"; + +const tsCacheDir = path.join(__dirname, "../tscache"); const defaultTsNodeOptions: tsNode.Options = { compilerOptions: { - lib: ['es2016', 'es2017'], - target: 'es2015' + lib: ["es2016", "es2017"], + target: "es2015" }, skipIgnore: true, - cacheDirectory: path.join(__dirname, '../tscache') + cacheDirectory: tsCacheDir }; -if (process.argv.includes('--nocache')) { +// check wether a cache is feasible +if (process.argv.includes("--nocache")) { defaultTsNodeOptions.cache = false; +} else { + var fs = require('fs'); + fs.access(tsCacheDir, fs.constants.W_OK, function(err) { + if (err) { + defaultTsNodeOptions.cache = false; + } + }); } tsNode.register(defaultTsNodeOptions);