Comparing version 1.2.1 to 1.2.2
import minimist from 'minimist'; | ||
export declare function run(): { | ||
declare type MenuData = Record<string, { | ||
short?: string; | ||
caption: string; | ||
paramCaption?: string; | ||
inverse?: boolean; | ||
}>; | ||
export declare const cliOptions: MenuData; | ||
export declare const cliCommands: MenuData; | ||
export declare function run(argStr?: string): { | ||
cmd: string | undefined; | ||
@@ -14,1 +22,2 @@ args: minimist.ParsedArgs; | ||
} | undefined; | ||
export {}; |
@@ -38,3 +38,3 @@ #!/usr/bin/env node | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.run = void 0; | ||
exports.run = exports.cliCommands = exports.cliOptions = void 0; | ||
var minimist_1 = __importDefault(require("minimist")); | ||
@@ -46,3 +46,3 @@ var chalk_1 = __importDefault(require("chalk")); | ||
var __1 = require(".."); | ||
var cliOptions = { | ||
exports.cliOptions = { | ||
silent: { short: 's', caption: 'Run silently' }, | ||
@@ -58,3 +58,3 @@ global: { short: 'g', caption: 'Target global TypeScript installation' }, | ||
}; | ||
var cliCommands = { | ||
exports.cliCommands = { | ||
install: { short: 'i', caption: "Installs ts-patch" }, | ||
@@ -91,3 +91,3 @@ uninstall: { short: 'u', caption: 'Restores original typescript files' }, | ||
Object | ||
.entries(cliCommands) | ||
.entries(exports.cliCommands) | ||
.map(function (_a) { | ||
@@ -101,3 +101,3 @@ var cmd = _a[0], _b = _a[1], short = _b.short, caption = _b.caption, paramCaption = _b.paramCaption; | ||
Object | ||
.entries(cliOptions) | ||
.entries(exports.cliOptions) | ||
.map(function (_a) { | ||
@@ -119,4 +119,4 @@ var long = _a[0], _b = _a[1], short = _b.short, inverse = _b.inverse, caption = _b.caption, paramCaption = _b.paramCaption; | ||
run(); | ||
function run() { | ||
var args = minimist_1.default(instanceIsCLI ? process.argv.slice(2) : arguments[0].split(' ')); | ||
function run(argStr) { | ||
var args = minimist_1.default(instanceIsCLI ? process.argv.slice(2) : argStr.split(' ')); | ||
var cmd = args._[0] ? args._[0].toLowerCase() : void 0; | ||
@@ -126,4 +126,4 @@ try { | ||
if (cmd) | ||
cmd = (Object.keys(cliCommands).includes(cmd)) ? cmd : | ||
(Object.entries(cliCommands).find(function (_a) { | ||
cmd = (Object.keys(exports.cliCommands).includes(cmd)) ? cmd : | ||
(Object.entries(exports.cliCommands).find(function (_a) { | ||
var n = _a[0], short = _a[1].short; | ||
@@ -134,3 +134,3 @@ return n && (short == cmd); | ||
var opts = Object | ||
.entries(cliOptions) | ||
.entries(exports.cliOptions) | ||
.reduce(function (p, _a) { | ||
@@ -165,5 +165,5 @@ var _b, _c; | ||
case 'patch': | ||
return actions.patch(args._.slice(1).join(' ')); | ||
return actions.patch(args._.slice(1).join(' '), { verbose: true }); | ||
case 'unpatch': | ||
return actions.unpatch(args._.slice(1).join(' ')); | ||
return actions.unpatch(args._.slice(1).join(' '), { verbose: true }); | ||
case 'check': | ||
@@ -191,2 +191,2 @@ return actions.check(); | ||
// endregion | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsc0RBQWdDO0FBQ2hDLGdEQUEwQjtBQUMxQiwwREFBbUM7QUFDbkMsc0RBQXlDO0FBQ3pDLHdDQUEwRjtBQUMxRix3QkFBa0M7QUFVbEMsSUFBTSxVQUFVLEdBQWE7SUFDM0IsTUFBTSxFQUFFLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFO0lBQy9DLE1BQU0sRUFBRSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLHVDQUF1QyxFQUFFO0lBQ3hFLE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRTtJQUM5QyxPQUFPLEVBQUUsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLHdDQUF3QyxFQUFFO0lBQ2pHLE9BQU8sRUFBRTtRQUNQLE9BQU8sRUFDTCxzR0FBc0c7S0FDekc7SUFDRCxZQUFZLEVBQUUsRUFBRSxPQUFPLEVBQUUsZ0NBQWdDLEVBQUU7SUFDM0QsS0FBSyxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsZ0NBQWdDLEVBQUU7Q0FDcEUsQ0FBQztBQUVGLElBQU0sV0FBVyxHQUFhO0lBQzVCLE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLG1CQUFtQixFQUFFO0lBQ3JELFNBQVMsRUFBRSxFQUFFLEtBQUssRUFBRSxHQUFHLEVBQUUsT0FBTyxFQUFFLG9DQUFvQyxFQUFFO0lBQ3hFLEtBQUssRUFBRTtRQUNMLEtBQUssRUFBRSxHQUFHO1FBQUUsT0FBTyxFQUNqQixrQ0FBZ0MsZUFBSyxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMs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 | ||
//# sourceMappingURL=cli.js.map |
@@ -28,2 +28,2 @@ #!/usr/bin/env node | ||
} | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVyc2lzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vcGVyc2lzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFFQSw4Q0FBd0I7QUFDeEIsMENBQW9CO0FBQ3BCLHdCQUF5QztBQUd6Qzs7d0hBRXdIO0FBRXhILHNCQUFzQjtBQUNoQixJQUFBLEtBQWlDLGdCQUFZLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQyxFQUFsRyxNQUFNLFlBQUEsRUFBRSxNQUFNLFlBQUEsRUFBRSxVQUFVLGdCQUF3RSxDQUFDO0FBRTNHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTztJQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUVwQyxxQ0FBcUM7QUFDckMsS0FBb0MsVUFBOEIsRUFBOUIsS0FBQSxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBOUIsY0FBOEIsRUFBOUIsSUFBOEIsRUFBRTtJQUEzRCxJQUFBLFdBQXVCLEVBQXJCLFFBQVEsUUFBQSxFQUFFLFNBQVMsUUFBQTtJQUM1QixJQUFNLElBQUksR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN6QyxJQUFZLFNBQVMsR0FBRyxZQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sRUFBRTtRQUNqRCxJQUFJO1lBQUUsU0FBSyxDQUFDLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUE7U0FBRTtRQUMxRCxPQUFPLENBQUMsRUFBRSxHQUFHO0tBQ2Q7Q0FDRiJ9 | ||
//# sourceMappingURL=persist.js.map |
@@ -7,2 +7,14 @@ # Changelog | ||
## [1.2.2] (05-23-2020) | ||
### Fixed | ||
- Possible recursion issue with program transformer | ||
- Older TS versions, tsc wasn't passing diagnostics array | ||
### Added | ||
- Added 'library' to TspExtras | ||
### Code | ||
- Substantial re-design of certain parts (see release commit message for more) | ||
## [1.2.0] (05-20-2020) | ||
@@ -53,4 +65,5 @@ | ||
[1.2.2]: https://github.com/nonara/ts-patch/compare/v1.1.0...v1.2.2 | ||
[1.2.0]: https://github.com/nonara/ts-patch/compare/v1.1.0...v1.2.0 | ||
[1.1.0]: https://github.com/nonara/ts-patch/compare/v1.0.10...v1.1.0 | ||
[1.0]: https://github.com/nonara/ts-patch/releases/tag/v1.0.0...v1.0.10 |
@@ -11,2 +11,2 @@ "use strict"; | ||
Object.defineProperty(exports, "setOptions", { enumerable: true, get: function () { return actions_1.setOptions; } }); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQ0FBa0Y7QUFBekUsMEdBQUEsWUFBWSxPQUFBO0FBQUUseUdBQUEsV0FBVyxPQUFBO0FBRWxDLHlDQUFxRTtBQUE1RCxrR0FBQSxPQUFPLE9BQUE7QUFBRSxvR0FBQSxTQUFTLE9BQUE7QUFBRSxnR0FBQSxLQUFLLE9BQUE7QUFBRSxxR0FBQSxVQUFVLE9BQUEifQ== | ||
//# sourceMappingURL=index.js.map |
@@ -12,4 +12,5 @@ import { TSModule } from './file-utils'; | ||
export declare function parseFiles(fileOrFilesOrGlob: string | string[], dir: string, includeSrc?: boolean): TSModule[] & { | ||
alreadyPatched: TSModule[]; | ||
patched: TSModule[]; | ||
unPatchable: TSModule[]; | ||
canUpdateOrPatch: TSModule[]; | ||
patchable: TSModule[]; | ||
@@ -33,4 +34,5 @@ }; | ||
export declare function check(fileOrFilesOrGlob?: string | string[], opts?: Partial<TSPOptions>): TSModule[] & { | ||
alreadyPatched: TSModule[]; | ||
patched: TSModule[]; | ||
unPatchable: TSModule[]; | ||
canUpdateOrPatch: TSModule[]; | ||
patchable: TSModule[]; | ||
@@ -37,0 +39,0 @@ }; |
@@ -71,5 +71,6 @@ "use strict"; | ||
return system_1.defineProperties(ret, { | ||
alreadyPatched: { get: function () { return ret.filter(function (f) { return f.patchVersion; }); } }, | ||
patched: { get: function () { return ret.filter(function (f) { return f.patchVersion; }); } }, | ||
unPatchable: { get: function () { return ret.filter(function (f) { return !f.canPatch; }); } }, | ||
patchable: { get: function () { return ret.filter(function (f) { return f.canPatch && !f.patchVersion; }); } }, | ||
canUpdateOrPatch: { get: function () { return ret.filter(function (f) { return f.canPatch && f.outOfDate; }); } }, | ||
patchable: { get: function () { return ret.filter(function (f) { return f.canPatch; }); } }, | ||
}); | ||
@@ -83,2 +84,4 @@ } | ||
var backupDir = path.join(tsPackage.packageDir, exports.BACKUP_DIRNAME); | ||
if (tsModule.patchVersion) | ||
throw new Error("Cannot backup an already patched module. You may need to reinstall typescript."); | ||
try { | ||
@@ -99,3 +102,6 @@ file_utils_1.mkdirIfNotExist(backupDir); | ||
*/ | ||
function restore(currentModule, tsPackage) { | ||
function restore(currentModule, tsPackage, noDelete) { | ||
var copyOrMove = function (fileName, dest) { | ||
return shell[noDelete ? 'cp' : 'mv'](fileName, dest); | ||
}; | ||
var backupDir = path.join(tsPackage.packageDir, exports.BACKUP_DIRNAME); | ||
@@ -107,8 +113,8 @@ var _a = file_utils_1.getTSModule(path.join(backupDir, currentModule.filename)), file = _a.file, filename = _a.filename, canPatch = _a.canPatch, patchVersion = _a.patchVersion, dir = _a.dir; | ||
if (patchVersion) | ||
throw new system_1.RestoreError(filename, "Backup file is not an unpatched ts module"); | ||
throw new system_1.RestoreError(filename, "Backup file is not an un-patched ts module"); | ||
/* Restore files */ | ||
if (shell.mv(file, tsPackage.libDir) && shell.error()) | ||
if (copyOrMove(file, tsPackage.libDir) && shell.error()) | ||
throw new system_1.RestoreError(filename, "Couldn't restore file - " + shell.error()); | ||
if (filename === 'typescript.js') | ||
if (shell.mv(path.join(dir, 'typescript.d.ts'), tsPackage.libDir) && shell.error()) | ||
if (copyOrMove(path.join(dir, 'typescript.d.ts'), tsPackage.libDir) && shell.error()) | ||
throw new system_1.RestoreError(filename, "Couldn't restore file - " + shell.error()); | ||
@@ -199,2 +205,4 @@ /* Verify restored file */ | ||
var _b = _a[_i], name = _b.name, version = _b.version; | ||
if (!pkgData.hasOwnProperty('dependencies')) | ||
pkgData.dependencies = {}; | ||
pkgData.dependencies[name] = "^" + version; | ||
@@ -248,5 +256,8 @@ } | ||
for (var _i = 0, modules_1 = modules; _i < modules_1.length; _i++) { | ||
var _b = modules_1[_i], filename = _b.filename, patchVersion = _b.patchVersion, canPatch = _b.canPatch; | ||
var module_1 = modules_1[_i]; | ||
var filename = module_1.filename, patchVersion = module_1.patchVersion, canPatch = module_1.canPatch, outOfDate = module_1.outOfDate; | ||
if (patchVersion) | ||
system_1.Log(['+', chalk_1.default.blueBright(filename) + " is patched with ts-patch version " + chalk_1.default.blueBright(patchVersion) + "."]); | ||
system_1.Log(['+', chalk_1.default.blueBright(filename) + " is patched with ts-patch version " + | ||
(chalk_1.default[outOfDate ? 'redBright' : 'blueBright'](patchVersion) + " " + (outOfDate ? '(out of date)' : '')) | ||
]); | ||
else if (canPatch) | ||
@@ -270,12 +281,19 @@ system_1.Log(['-', chalk_1.default.blueBright(filename) + " is not patched."]); | ||
var modules = parseFiles(fileOrFilesOrGlob, tsPackage.libDir, true); | ||
if (modules.alreadyPatched.length >= modules.length) { | ||
system_1.Log(['!', "Files already patched. For details, run: " + chalk_1.default.bgBlackBright('ts-patch check')]); | ||
return true; | ||
if (!modules.canUpdateOrPatch.length) { | ||
system_1.Log(['!', "File" + (modules.length - 1 ? 's' : '') + " already patched with the latest version. For details, run: " + | ||
chalk_1.default.bgBlackBright('ts-patch check') | ||
]); | ||
return false; | ||
} | ||
/* Patch files */ | ||
for (var _i = 0, _a = modules.patchable; _i < _a.length; _i++) { | ||
for (var _i = 0, _a = modules.canUpdateOrPatch; _i < _a.length; _i++) { | ||
var m = _a[_i]; | ||
var file = m.file, filename = m.filename; | ||
system_1.Log(['~', "Patching " + chalk_1.default.blueBright(filename) + " in " + chalk_1.default.blueBright(path.dirname(file))], system_1.Log.verbose); | ||
backup(m, tsPackage); | ||
// If already patched, load backup module source. Otherwise, backup un-patched | ||
if (m.patchVersion) | ||
m.moduleSrc = | ||
file_utils_1.getTSModule(path.join(tsPackage.packageDir, exports.BACKUP_DIRNAME, m.filename), /* includeSrc */ true).moduleSrc; | ||
else | ||
backup(m, tsPackage); | ||
patcher_1.patchTSModule(m, tsPackage); | ||
@@ -302,4 +320,4 @@ tsPackage.config.modules[filename] = fs.statSync(file).mtimeMs; | ||
var modules = parseFiles(fileOrFilesOrGlob, tsPackage.libDir, true); | ||
if (modules.alreadyPatched.length < 1) { | ||
system_1.Log(['!', "No patched files detected. For details, run: " + chalk_1.default.bgBlackBright('ts-patch check')]); | ||
if (modules.patched.length < 1) { | ||
system_1.Log(['!', "File" + (modules.length - 1 ? 's' : '') + " not patched. For details, run: " + chalk_1.default.bgBlackBright('ts-patch check')]); | ||
return false; | ||
@@ -309,3 +327,3 @@ } | ||
var errors = {}; | ||
for (var _i = 0, _b = modules.alreadyPatched; _i < _b.length; _i++) { | ||
for (var _i = 0, _b = modules.patched; _i < _b.length; _i++) { | ||
var tsModule = _b[_i]; | ||
@@ -401,2 +419,2 @@ var file = tsModule.file, filename = tsModule.filename; | ||
// endregion | ||
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../src/lib/actions.ts"],"names":[],"mappings":"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"} | ||
//# sourceMappingURL=actions.js.map |
@@ -9,3 +9,3 @@ /** | ||
export declare const getModuleAbsolutePath: (filename: string, libDir: string) => string; | ||
export declare const mkdirIfNotExist: (dir: string) => false | void; | ||
export declare const mkdirIfNotExist: (dir: string) => string | false; | ||
export interface TSPackage { | ||
@@ -29,2 +29,3 @@ version: string; | ||
moduleSrc?: string; | ||
outOfDate: boolean; | ||
} | ||
@@ -31,0 +32,0 @@ /** |
@@ -56,2 +56,9 @@ "use strict"; | ||
exports.mkdirIfNotExist = function (dir) { return !fs_1.default.existsSync(dir) && fs_1.default.mkdirSync(dir, { recursive: true }); }; | ||
var isOutOfDate = function (version) { | ||
var currentVer = system_1.tspPackageJSON.version.match(/(\d+)\.(\d+)\.(\d+)/); | ||
// noinspection JSUnusedLocalSymbols | ||
var _a = String(version).match(/(\d+)\.(\d+)\.(\d+)/) || [], f = _a[0], major = _a[1], minor = _a[2], patch = _a[3]; | ||
return (isNaN(+major) || isNaN(+minor) || isNaN(+patch)) || | ||
((currentVer === null || currentVer === void 0 ? void 0 : currentVer[1]) > major) || ((currentVer === null || currentVer === void 0 ? void 0 : currentVer[2]) > minor) || ((currentVer === null || currentVer === void 0 ? void 0 : currentVer[3]) > patch); | ||
}; | ||
/** | ||
@@ -96,3 +103,4 @@ * Get TypeScript package info - Resolve from basedir, throws if not cannot find TS package | ||
(fileData.match(/(?<=^\s*?var\stspVersion\s?=\s?['"`])(\S+?)(?=['"`])/m) || [])[0]; | ||
return __assign({ file: file, filename: filename, canPatch: canPatch, dir: dir, patchVersion: patchVersion }, (includeSrc && canPatch && { moduleSrc: fileData })); | ||
var outOfDate = isOutOfDate(patchVersion); | ||
return __assign({ file: file, filename: filename, canPatch: canPatch, dir: dir, patchVersion: patchVersion, outOfDate: outOfDate }, (includeSrc && canPatch && { moduleSrc: fileData })); | ||
} | ||
@@ -133,2 +141,2 @@ exports.getTSModule = getTSModule; | ||
// endregion | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZS11dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvZmlsZS11dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDhDQUF3QjtBQUN4QiwwQ0FBb0I7QUFDcEIsbUNBRWtCO0FBQ2xCLGlDQUFvQztBQUdwQzs7d0hBRXdIO0FBQ3hILGlCQUFpQjtBQUVqQjs7R0FFRztBQUNVLFFBQUEsY0FBYyxHQUFHO0lBQzVCLElBQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQztJQUNsQixJQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDekMsSUFBTSxLQUFLLEdBQUcsVUFBQyxHQUFXO1FBQ3hCLElBQUk7WUFBRSxPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtTQUFFO1FBQ2hDLE9BQU8sQ0FBQyxFQUFFO1lBQ1IsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNmLE9BQVksRUFBRSxDQUFDO1NBQ2hCO0lBQ0gsQ0FBQyxDQUFDO0lBRU0sSUFBQSxVQUFVLEdBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksS0FBSyxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsV0FBekQsQ0FBMEQ7SUFFNUUsSUFBSSxDQUFDLFVBQVU7UUFDYixNQUFNLElBQUkscUJBQVksQ0FBQyxzRkFBc0YsQ0FBQyxDQUFDO0lBRWpILE9BQU8sVUFBVSxDQUFDO0FBQ3BCLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ1UsUUFBQSxxQkFBcUIsR0FBRyxVQUFDLFFBQWdCLEVBQUUsTUFBYztJQUNwRSxJQUFJLElBQUksR0FBRyxtQkFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxD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 | ||
//# sourceMappingURL=file-utils.js.map |
@@ -30,7 +30,7 @@ "use strict"; | ||
if (tsModule) { | ||
var file = tsModule.file, filename = tsModule.filename, dir = tsModule.dir, patchVersion = tsModule.patchVersion, canPatch = tsModule.canPatch; | ||
var file = tsModule.file, filename = tsModule.filename, dir = tsModule.dir, patchVersion = tsModule.patchVersion, canPatch = tsModule.canPatch, outOfDate = tsModule.outOfDate; | ||
if (!fs_1.default.existsSync(file)) | ||
throw new system_1.FileNotFound("Could not find module " + filename + " in " + (dir + path_1.default.sep)); | ||
if (patchVersion) | ||
throw new system_1.PatchError("Module " + filename + " is already patched with ts-patch v" + patchVersion); | ||
if (patchVersion && !outOfDate) | ||
throw new system_1.PatchError("Module " + filename + " is already up-to-date with local version - v" + patchVersion); | ||
if (!canPatch) | ||
@@ -40,4 +40,3 @@ throw new system_1.PatchError("Module " + filename + " cannot be patched! No instance of TypeScript found."); | ||
if (tsPackage) { | ||
var version = tsPackage.version; | ||
var _a = version.split('.'), major = _a[0], minor = _a[1]; | ||
var _a = tsPackage.version.split('.'), major = _a[0], minor = _a[1]; | ||
if (+major < 3 && +minor < 7) | ||
@@ -48,3 +47,26 @@ throw new system_1.WrongTSVersion("ts-patch requires TypeScript v2.7 or higher."); | ||
} | ||
var patchModule = function (src) { return src.replace(/(function emitFilesAndReportErrors[\s\S]+?)(\s*)(var emitResult =)/, '$1\n$2ts.diagnosticMap.set(program, allDiagnostics);\n$2$3'); }; | ||
var patchModule = function (tsModule, source) { | ||
var src = source || tsModule.moduleSrc; | ||
var funcPos = src.search(/function emitFilesAndReportErrors\(/); | ||
if (funcPos < 0) | ||
throw new Error("Bad TS Code. Could not find function emitFilesAndReportErrors in " + tsModule.filename); | ||
var startCode = src.substr(0, funcPos); | ||
var restCode = src.substr(funcPos); | ||
/* Modern TS */ | ||
var pos = restCode.search(/^\s*?var emitResult =/m); | ||
if (pos >= 0) { | ||
return startCode + | ||
restCode.substr(0, pos) + | ||
"\nts.diagnosticMap.set(program, allDiagnostics);\n" + | ||
restCode.substr(pos); | ||
} | ||
/* TS 2.7 */ | ||
pos = restCode.search(/^\s*?var [_\w]+? = program.emit\(\)/m); | ||
if (pos < 0) | ||
throw new Error("Could not recognize diagnostics signature in emitFilesAndReportErrors(). Please open an issue with your TS version #."); | ||
return startCode + | ||
restCode.substr(0, pos) + | ||
"\nts.diagnosticMap.set(program, diagnostics);\n" + | ||
restCode.substr(pos); | ||
}; | ||
/* ******************************************************************************************************************** | ||
@@ -63,3 +85,3 @@ * Patch | ||
/* Add diagnostic modification support */ | ||
var moduleSrc = patchModule(tsModule.moduleSrc); | ||
var moduleSrc = patchModule(tsModule); | ||
try { | ||
@@ -75,3 +97,3 @@ if (isTSC) { | ||
fs_1.default.writeFileSync(file, Buffer.concat([ | ||
Buffer.from(patchModule(fs_1.default.readFileSync(tsFile, 'utf-8'))), | ||
Buffer.from(patchModule(tsModule, fs_1.default.readFileSync(tsFile, 'utf-8'))), | ||
Buffer.from(!file_utils_1.getTSModule(tsFile).patchVersion ? patchSrc : ''), | ||
@@ -100,2 +122,2 @@ Buffer.from(moduleSrc.replace(/^[\s\S]+(\(function \(ts\) {\s+function countLines[\s\S]+)$/, '$1')) | ||
exports.patchTSModule = patchTSModule; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0Y2hlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvcGF0Y2hlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwQ0FBb0I7QUFDcEIsOENBQXdCO0FBQ3hCLG1DQUE2RztBQUM3RywyQ0FBZ0U7QUFDaEUscUNBQTJDO0FBRzNDOzt3SEFFd0g7QUFFeEg7O0dBRUc7QUFDSCxJQUFNLGFBQWEsR0FBRyxVQUFDLEtBQWM7SUFDbkMsT0FBQSxZQUFFO1NBQ0MsWUFBWSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsZ0JBQU8sRUFBRSx1QkFBYyxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7U0FDckcsT0FBTyxDQUNOLGdFQUFnRSxFQUNoRSx1QkFBcUIsdUJBQWMsQ0FBQyxPQUFPLFdBQVE7U0FDbkQsaUJBQWUsS0FBSyxVQUFPLENBQUE7UUFDM0IsSUFBSSxDQUNMO0FBUEgsQ0FPRyxDQUFDO0FBRU47O0dBRUc7QUFDSCxTQUFTLFFBQVEsQ0FBQyxRQUFtQixFQUFFLFNBQXFCO0lBQzFELElBQUksUUFBUSxFQUFFO1FBQ0osSUFBQSxJQUFJLEdBQTRDLFFBQVEsS0FBcEQsRUFBRSxRQUFRLEdBQWtDLFFBQVEsU0FBMUMsRUFBRSxHQUFHLEdBQTZCLFFBQVEsSUFBckMsRUFBRSxZQUFZLEdBQWUsUUFBUSxhQUF2QixFQUFFLFFBQVEsR0FBSyxRQUFRLFNBQWIsQ0FBYztRQUVqRSxJQUFJLENBQUMsWUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUM7WUFBRSxNQUFNLElBQUkscUJBQVksQ0FBQywyQkFBeUIsUUFBUSxhQUFPLEdBQUcsR0FBRyxjQUFJLENBQUMsR0FBRyxDQUFFLENBQUMsQ0FBQztRQUUzRyxJQUFJLFlBQVk7WUFBRSxNQUFNLElBQUksbUJBQVUsQ0FBQyxZQUFVLFFBQVEsMkNBQXNDLFlBQWMsQ0FBQyxDQUFDO1FBQy9HLElBQUksQ0FB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 | ||
//# sourceMappingURL=patcher.js.map |
@@ -122,2 +122,2 @@ "use strict"; | ||
exports.FileWriteError = FileWriteError; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9zeXN0ZW0vZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7d0hBRXdIOzs7Ozs7Ozs7Ozs7Ozs7O0FBRXhIO0lBQW9DLGtDQUFLO0lBQXpDO1FBQUEscUVBQW1FO1FBQXhCLFVBQUksR0FBRyxnQkFBZ0IsQ0FBQTs7SUFBQSxDQUFDO0lBQUQscUJBQUM7QUFBRCxDQUFDLEFBQW5FLENBQW9DLEtBQUssR0FBMEI7QUFBdEQsd0NBQWM7QUFFM0I7SUFBa0MsZ0NBQUs7SUFBdkM7UUFBQSxxRUFBK0Q7UUFBdEIsVUFBSSxHQUFHLGNBQWMsQ0FBQTs7SUFBQSxDQUFDO0lBQUQsbUJBQUM7QUFBRCxDQUFDLEFBQS9ELENBQWtDLEtBQUssR0FBd0I7QUFBbEQsb0NBQVk7QUFFekI7SUFBa0MsZ0NBQUs7SUFBdkM7UUFBQSxxRUFBK0Q7UUFBdEIsVUFBSSxHQUFHLGNBQWMsQ0FBQTs7SUFBQSxDQUFDO0lBQUQsbUJBQUM7QUFBRCxDQUFDLEFBQS9ELENBQWtDLEtBQUssR0FBd0I7QUFBbEQsb0NBQVk7QUFFekI7SUFBZ0MsOEJBQUs7SUFBckM7UUFBQSxxRUFBMkQ7UUFBcEIsVUFBSSxHQUFHLFlBQVksQ0FBQTs7SUFBQSxDQUFDO0lBQUQsaUJBQUM7QUFBRCxDQUFDLEFBQTNELENBQWdDLEtBQUssR0FBc0I7QUFBOUMsZ0NBQVU7QUFFdkI7SUFBc0Msb0NBQUs7SUFBM0M7UUFBQSxxRUFBdUU7UUFBMUIsVUFBSSxHQUFHLGtCQUFrQixDQUFBOztJQUFBLENBQUM7SUFBRCx1QkFBQztBQUFELENBQUMsQUFBdkUsQ0FBc0MsS0FBSyxHQUE0QjtBQUExRCw0Q0FBZ0I7QUFFN0I7SUFBa0MsZ0NBQUs7SUFBdkM7UUFBQSxxRUFBK0Q7UUFBdEIsVUFBSSxHQUFHLGNBQWMsQ0FBQTs7SUFBQSxDQUFDO0lBQUQsbUJBQUM7QUFBRCxDQUFDLEFBQS9ELENBQWtDLEtBQUssR0FBd0I7QUFBbEQsb0NBQVk7QUFFekI7SUFBOEIsNEJBQUs7SUFBbkM7UUFBQSxxRUFBdUQ7UUFBbEIsVUFBSSxHQUFHLFVBQVUsQ0FBQTs7SUFBQSxDQUFDO0lBQUQsZUFBQztBQUFELENBQUMsQUFBdkQsQ0FBOEIsS0FBSyxHQUFvQjtBQUExQyw0QkFBUTtBQUVyQjtJQUFrQyxnQ0FBSztJQUNyQyxzQkFBbUIsUUFBZ0IsRUFBRSxPQUFlO1FBQXBELFlBQ0Usa0JBQU0sc0JBQW9CLFFBQVEsSUFBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBRSxDQUFDLFNBRXZFO1FBSGtCLGNBQVEsR0FBUixRQUFRLENBQVE7UUFFakMsS0FBSSxDQUFDLElBQUksR0FBRyxjQUFjLENBQUM7O0lBQzdCLENBQUM7SUFDSCxtQkFBQztBQUFELENBQUMsQUFMRCxDQUFrQyxLQUFLLEdBS3RDO0FBTFksb0NBQVk7QUFPekI7SUFBaUMsK0JBQUs7SUFDcEMscUJBQW1CLFFBQWdCLEVBQUUsT0FBZTtRQUFwRCxZQUNFLGtCQUFNLHNCQUFvQixRQUFRLElBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUUsQ0FBQyxTQUV2RTtRQUhrQixjQUFRLEdBQVIsUUFBUSxDQUFRO1FBRWpDLEtBQUksQ0FBQyxJQUFJLEdBQUcsYUFBYSxDQUFDOztJQUM1QixDQUFDO0lBQ0gsa0JBQUM7QUFBRCxDQUFDLEFBTEQsQ0FBaUMsS0FBSyxHQUtyQztBQUxZLGtDQUFXO0FBT3hCO0lBQW9DLGtDQUFLO0lBQ3ZDLHdCQUFtQixRQUFnQixFQUFFLE9BQWU7UUFBcEQsWUFDRSxrQkFBTSxvQ0FBa0MsUUFBUSxJQUFHLE9BQU8sSUFBSSxPQUFLLE9BQVMsQ0FBRSxDQUFDLFNBQ2hGO1FBRmtCLGNBQVEsR0FBUixRQUFRLENBQVE7O0lBRW5DLENBQUM7SUFDSCxxQkFBQztBQUFELENBQUMsQUFKRCxDQUFvQyxLQUFLLEdBSXhDO0FBSlksd0NBQWMifQ== | ||
//# sourceMappingURL=errors.js.map |
@@ -66,7 +66,7 @@ "use strict"; | ||
exports.appRoot = (function () { | ||
var moduleDir = path_1.default.join(path_1.default.dirname(module.filename), '../..'); | ||
var moduleDir = path_1.default.join(__dirname, '../..'); | ||
var chkFile = function (pkgFile) { | ||
return (fs_1.default.existsSync(pkgFile) && (require(pkgFile).name === 'ts-patch')) ? path_1.default.dirname(pkgFile) : void 0; | ||
}; | ||
var res = chkFile(path_1.default.join(moduleDir, 'package.json')) || chkFile(path_1.default.join(moduleDir, '..', 'package.json')); | ||
var res = chkFile(path_1.default.join(moduleDir, 'package.json')) || chkFile(path_1.default.join(moduleDir, '../..', 'package.json')); | ||
if (!res) | ||
@@ -80,2 +80,2 @@ throw new Error("Error getting app root. No valid ts-patch package file found."); | ||
exports.tspPackageJSON = require(path_1.default.resolve(exports.appRoot, 'package.json')); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvc3lzdGVtL2hlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw4Q0FBd0I7QUFDeEIsMENBQW9CO0FBR3BCOzt3SEFFd0g7QUFFeEg7O0dBRUc7QUFDVSxRQUFBLFVBQVUsR0FBRyxVQUFDLEtBQWE7SUFDdEMsT0FBQSxjQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLGNBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxjQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQztBQUFqRixDQUFpRixDQUFDO0FBRXBGOzs7Ozs7O0dBT0c7QUFDSCxTQUFnQixJQUFJLENBQXVCLEdBQU07SUFBRSxjQUFZO1NBQVosVUFBWSxFQUFaLHFCQUFZLEVBQVosSUFBWTtRQUFaLDZCQUFZOztJQUM3RCxPQUFPLGFBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFDLENBQUMsRUFBRSxHQUFHOztRQUFLLE9BQUEsdUJBQ3RCLENBQUMsR0FDRCxDQUFFLEdBQVcsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLGNBQU0sR0FBQyxHQUFHLElBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFFLENBQUMsRUFDNUQ7SUFIeUIsQ0FHekIsRUFBRSxFQUFFLENBQUMsQ0FDTSxDQUFDO0FBQ2xCLENBQUM7QUFQRCxvQkFPQztBQUVEOztHQUVHO0FBQ1UsUUFBQSxPQUFPLEdBQUcsVUFBSSxHQUFNLElBQXFCLE9BQUEsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQW1CLEVBQWxDLENBQWtDLENBQUM7QUFTekY7O0dBRUc7QUFDSCxTQUFnQixnQkFBZ0IsQ0FBK0QsR0FBUyxFQUFFLFVBQWtCO0lBRTFILE9BQU8sTUFBTSxDQUFDLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQztBQUNsRCxDQUFDO0FBSEQsNENBR0M7QUFHRDs7d0hBRXdIO0FBRXhIOztHQUVHO0FBQ1UsUUFBQSxPQUFPLEdBQUcsQ0FBQztJQUN0QixJQUFNLFNBQVMsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBRXBFLElBQU0sT0FBTyxHQUFHLFVBQUMsT0FBZTtRQUM5QixPQUFBLENBQUMsWUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0lBQW5HLENBQW1HLENBQUM7SUFFdEcsSUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxDQUFDLElBQUksT0FBTyxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO0lBRWpILElBQUksQ0FBQyxHQUFHO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQywrREFBK0QsQ0FBQyxDQUFDO0lBRTNGLE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUVMOztHQUVHO0FBQ1UsUUFBQSxjQUFjLEdBQUcsT0FBTyxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsZUFBTyxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMifQ== | ||
//# sourceMappingURL=helpers.js.map |
@@ -17,2 +17,2 @@ "use strict"; | ||
__exportStar(require("./logger"), exports); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbGliL3N5c3RlbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBeUI7QUFDekIsNENBQTBCO0FBQzFCLDRDQUEwQjtBQUMxQiwyQ0FBeUIifQ== | ||
//# sourceMappingURL=index.js.map |
@@ -50,2 +50,2 @@ "use strict"; | ||
})(Log = exports.Log || (exports.Log = {})); | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2xpYi9zeXN0ZW0vbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGdEQUEwQjtBQUMxQixxQ0FBdUM7QUFDdkMsMERBQW1DO0FBR25DOzt3SEFFd0g7QUFFeEg7O0dBRUc7QUFDSCxTQUFnQixHQUFHLENBQUMsR0FBZ0MsRUFBRSxRQUFtRDtJQUFuRCx5QkFBQSxFQUFBLFdBQXlDLEdBQUcsQ0FBQyxNQUFNO0lBQ3ZHLElBQUksUUFBUSxHQUFHLG9CQUFVLENBQUMsUUFBUTtRQUFFLE9BQU87SUFDbkMsSUFBQSxLQUFLLEdBQW9CLG9CQUFVLE1BQTlCLEVBQUUsYUFBYSxHQUFLLG9CQUFVLGNBQWYsQ0FBZ0I7SUFFNUMsaUJBQWlCO0lBQ2pCLElBQU0sU0FBUyxHQUFHLFVBQUMsSUFBWSxJQUFLLE9BQUEsZUFBSyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBSSxJQUFJLE9BQUksQ0FBQyxFQUFuQyxDQUFtQyxDQUFDO0lBRXhFLElBQUksSUFBSSxHQUFXLEVBQUUsQ0FBQztJQUN0QixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDdEIsSUFBSSxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNkLEdBQUcsR0FBRyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLGVBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsZUFBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzVFLENBQUMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsZUFBSyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDbEUsQ0FBQyxJQUFJLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxlQUFLLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNuRSxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLGVBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQzdELENBQUMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsZUFBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs0QkFDN0QsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2Q7SUFDRCxJQUFNLE9BQU8sR0FBRyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQztJQUUvQixtQkFBbUI7SUFDbkIsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxvQkFBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7SUFFcEMsSUFBSSxDQUFDLGFBQWE7UUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ2hDLElBQUksT0FBTztRQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsR0FBRyxNQUFNLENBQUMsQ0FBQzs7UUFDaEQsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxHQUFHLE1BQU0sQ0FBQyxDQUFDO0FBQzFDLENBQUM7QUF6QkQsa0JBeUJDO0FBRUQsa0JBQWtCO0FBQ2xCLFdBQWlCLEdBQUc7SUFDTCxVQUFNLEdBQUcsQ0FBQyxDQUFDO0lBQ1gsVUFBTSxHQUFHLENBQUMsQ0FBQztJQUNYLFdBQU8sR0FBRyxDQUFDLENBQUM7QUFDM0IsQ0FBQyxFQUpnQixHQUFHLEdBQUgsV0FBRyxLQUFILFdBQUcsUUFJbkIifQ== | ||
//# sourceMappingURL=logger.js.map |
@@ -61,2 +61,2 @@ "use strict"; | ||
exports.resetOptions = function (options) { return exports.parseOptions(__assign(__assign({}, exports.defaultOptions), options)); }; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9saWIvc3lzdGVtL29wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsbUNBQStCO0FBQy9CLG1DQUF3QztBQUN4QyxxQ0FBMEM7QUFDMUMsNENBQStDO0FBUWxDLFFBQUEsY0FBYyxHQUFHO0lBQzVCLFFBQVEsRUFBRSxZQUFHLENBQUMsTUFBTTtJQUNwQixLQUFLLEVBQUUsSUFBSTtJQUNYLE1BQU0sRUFBRSxLQUFLO0lBQ2IsT0FBTyxFQUFFLEtBQUs7SUFDZCxPQUFPLEVBQUUsT0FBTyxDQUFDLEdBQUcsRUFBRTtJQUN0QixhQUFhLEVBQUUsS0FBSztDQUNyQixDQUFDO0FBRUYsK0JBQStCO0FBQ3BCLFFBQUEsVUFBVSxnQkFBUSxzQkFBYyxFQUFHO0FBRzlDOzt3SEFFd0g7QUFFeEg7O0dBRUc7QUFDVSxRQUFBLFlBQVksR0FBRyxVQUFDLE9BQTZCO0lBQ3hELElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxPQUFPLEtBQUssa0JBQVUsQ0FBQztRQUFFLE9BQU8sa0JBQVUsQ0FBQztJQUM1RCxJQUFNLEdBQUcsR0FBRyxVQUFDLEdBQVcsSUFBSyxPQUFBLE9BQU8sQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQTNCLENBQTJCLENBQUM7SUFFekQsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDO1FBQUUsa0JBQVUsQ0FBQyxLQUFLLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBRSxDQUFDO0lBRXZELElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxTQUFTLENBQUM7UUFBRSxNQUFNLElBQUkscUJBQVksQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO0lBQzFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUFFLE9BQU8sQ0FBQyxPQUFPLEdBQUcsMkJBQWMsRUFBRSxDQUFDO0lBRXRELE1BQU0sQ0FBQyxNQUFNLENBQUMsa0JBQVUsRUFBRSxjQUFJLCtCQUFDLE9BQU8sR0FBSyxpQkFBTyxDQUFDLHNCQUFjLENBQUMsR0FBRSxDQUFDO0lBRXJFLGtCQUFVLENBQUMsUUFBUTtRQUNqQixDQUFDLGtCQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNsQyxDQUFDLGtCQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDcEMsQ0FBQyxrQkFBVSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ3pDLHNCQUFjLENBQUMsUUFBUSxDQUFDO0lBRTFCLE9BQU8sa0JBQVUsQ0FBQztBQUNwQixDQUFDLENBQUM7QUFFVyxRQUFBLFlBQVksR0FBRyxVQUFDLE9BQTZCLElBQUssT0FBQSxvQkFBWSx1QkFBTSxzQkFBYyxHQUFLLE9BQU8sRUFBRyxFQUEvQyxDQUErQyxDQUFDIn0= | ||
//# sourceMappingURL=options.js.map |
{ | ||
"name": "ts-patch", | ||
"version": "1.2.1", | ||
"version": "1.2.2", | ||
"description": "Patch typescript to support custom transformers in tsconfig.json", | ||
@@ -5,0 +5,0 @@ "main": "./index.js", |
[![npm version](https://badge.fury.io/js/ts-patch.svg)](https://badge.fury.io/js/ts-patch) | ||
[![Build Status](https://travis-ci.org/nonara/ts-patch.svg?branch=master)](https://travis-ci.org/nonara/ts-patch) | ||
![Build Status](https://github.com/nonara/ts-patch/workflows/Build%20(CI)/badge.svg) | ||
[![Coverage Status](https://coveralls.io/repos/github/nonara/ts-patch/badge.svg?branch=master)](https://coveralls.io/github/nonara/ts-patch?branch=master) | ||
@@ -78,6 +78,7 @@ | ||
{ | ||
ts: typeof ts; | ||
ts: typeof ts; // The typescript instance | ||
addDiagnostic: (diag: Diagnostic) => number, | ||
removeDiagnostic: (index: number) => void, | ||
diagnostics: readonly Diagnostic[] | ||
diagnostics: readonly Diagnostic[], | ||
library: string // Originating library ('tsc' | typescript' | 'tsserverlibrary' | 'tsserver') | ||
} | ||
@@ -233,7 +234,6 @@ ``` | ||
To alter diagnostics, use the [program type signature](#program-default), and use the following from the `TspExtras` parameter | ||
To alter diagnostics, use the [program type signature](#program-default), and use the following properties from the `TspExtras` parameter | ||
| property | description | | ||
| -------- |----------- | | ||
| ts | Reference to `ts` instance | ||
| diagnostics | Reference to `Diagnostic[]` created during `ts.emitFilesAndReportErrors()` (works with tsc also) | ||
@@ -240,0 +240,0 @@ | addDiagnostic() | Directly add `Diagnostic` to `diagnostics` array | |
@@ -47,5 +47,11 @@ declare namespace ts { | ||
} | ||
type ProgramTransformer = (program: Program, host?: CompilerHost, config?: PluginConfig) => Program; | ||
type TspExtras = { | ||
/** | ||
* Originating TypeScript instance | ||
*/ | ||
ts: typeof ts; | ||
/** | ||
* TypeScript library file event was triggered in (ie. 'tsserverlibrary' or 'typescript') | ||
*/ | ||
library: string; | ||
addDiagnostic: (diag: Diagnostic) => number; | ||
@@ -55,2 +61,5 @@ removeDiagnostic: (index: number) => void; | ||
}; | ||
type ProgramTransformer = (program: Program, host: CompilerHost | undefined, config: PluginConfig | undefined, extras: { | ||
ts: typeof ts; | ||
}) => Program; | ||
type LSPattern = (ls: LanguageService, config: {}) => TransformerPlugin; | ||
@@ -62,2 +71,3 @@ type CompilerOptionsPattern = (compilerOpts: CompilerOptions, config: {}) => TransformerPlugin; | ||
type RawPattern = (context: TransformationContext, program: Program, config: {}) => Transformer<SourceFile>; | ||
/** | ||
@@ -64,0 +74,0 @@ * @example |
@@ -76,10 +76,7 @@ (function () { | ||
/* | ||
* The logic in this file is based on TTypescript (https://github.com/cevek/ttypescript) | ||
* Credit & thanks go to cevek (https://github.com/cevek) for the incredible work! | ||
*/ | ||
/* ******************************************************************************************************************** | ||
* Constants | ||
* ********************************************************************************************************************/ | ||
/* ****************************************************************************************************************** */ | ||
// region: Constants | ||
/* ****************************************************************************************************************** */ | ||
var diagnosticMap = new WeakMap(); | ||
// endregion | ||
/* ******************************************************************************************************************** | ||
@@ -94,2 +91,3 @@ * Helpers | ||
} | ||
var getCurrentLibrary = function () { return require('path').basename(__filename, require('path').extname(__filename)); }; | ||
@@ -297,3 +295,6 @@ var _rollupPluginShim1 = require('fs'); | ||
fs: true, | ||
"fs/promises": ">= 10 && < 10.1", | ||
"fs/promises": [ | ||
">= 10 && < 10.1", | ||
">= 14" | ||
], | ||
_http_agent: ">= 0.11.1", | ||
@@ -441,2 +442,4 @@ _http_client: ">= 0.11.1", | ||
var realpathFS = fs.realpath && typeof fs.realpath.native === 'function' ? fs.realpath.native : fs.realpath; | ||
var defaultIsFile = function isFile(file, cb) { | ||
@@ -462,8 +465,12 @@ fs.stat(file, function (err, stat) { | ||
var maybeUnwrapSymlink = function maybeUnwrapSymlink(x, opts, cb) { | ||
var defaultRealpath = function realpath(x, cb) { | ||
realpathFS(x, function (realpathErr, realPath) { | ||
if (realpathErr && realpathErr.code !== 'ENOENT') cb(realpathErr); | ||
else cb(null, realpathErr ? x : realPath); | ||
}); | ||
}; | ||
var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) { | ||
if (opts && opts.preserveSymlinks === false) { | ||
fs.realpath(x, function (realPathErr, realPath) { | ||
if (realPathErr && realPathErr.code !== 'ENOENT') cb(realPathErr); | ||
else cb(null, realPathErr ? x : realPath); | ||
}); | ||
realpath(x, cb); | ||
} else { | ||
@@ -501,2 +508,3 @@ cb(null, x); | ||
var readFile = opts.readFile || fs.readFile; | ||
var realpath = opts.realpath || defaultRealpath; | ||
var packageIterator = opts.packageIterator; | ||
@@ -513,3 +521,4 @@ | ||
maybeUnwrapSymlink( | ||
maybeRealpath( | ||
realpath, | ||
absoluteStart, | ||
@@ -536,3 +545,3 @@ opts, | ||
else if (n) { | ||
return maybeUnwrapSymlink(n, opts, function (err, realN) { | ||
return maybeRealpath(realpath, n, opts, function (err, realN) { | ||
if (err) { | ||
@@ -558,3 +567,3 @@ cb(err); | ||
else if (d) { | ||
maybeUnwrapSymlink(d, opts, function (err, realD) { | ||
maybeRealpath(realpath, d, opts, function (err, realD) { | ||
if (err) { | ||
@@ -623,3 +632,3 @@ cb(err); | ||
maybeUnwrapSymlink(dir, opts, function (unwrapErr, pkgdir) { | ||
maybeRealpath(realpath, dir, opts, function (unwrapErr, pkgdir) { | ||
if (unwrapErr) return loadpkg(path.dirname(dir), cb); | ||
@@ -652,3 +661,3 @@ var pkgfile = path.join(pkgdir, 'package.json'); | ||
maybeUnwrapSymlink(x, opts, function (unwrapErr, pkgdir) { | ||
maybeRealpath(realpath, x, opts, function (unwrapErr, pkgdir) { | ||
if (unwrapErr) return cb(unwrapErr); | ||
@@ -733,2 +742,4 @@ var pkgfile = path.join(pkgdir, 'package.json'); | ||
var realpathFS$1 = fs.realpathSync && typeof fs.realpathSync.native === 'function' ? fs.realpathSync.native : fs.realpathSync; | ||
var defaultIsFile$1 = function isFile(file) { | ||
@@ -754,10 +765,8 @@ try { | ||
var maybeUnwrapSymlink$1 = function maybeUnwrapSymlink(x, opts) { | ||
if (opts && opts.preserveSymlinks === false) { | ||
try { | ||
return fs.realpathSync(x); | ||
} catch (realPathErr) { | ||
if (realPathErr.code !== 'ENOENT') { | ||
throw realPathErr; | ||
} | ||
var defaultRealpathSync = function realpathSync(x) { | ||
try { | ||
return realpathFS$1(x); | ||
} catch (realpathErr) { | ||
if (realpathErr.code !== 'ENOENT') { | ||
throw realpathErr; | ||
} | ||
@@ -768,2 +777,9 @@ } | ||
var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) { | ||
if (opts && opts.preserveSymlinks === false) { | ||
return realpathSync(x); | ||
} | ||
return x; | ||
}; | ||
var getPackageCandidates$1 = function getPackageCandidates(x, start, opts) { | ||
@@ -786,2 +802,3 @@ var dirs = nodeModulesPaths(start, opts, x); | ||
var isDirectory = opts.isDirectory || defaultIsDir$1; | ||
var realpathSync = opts.realpathSync || defaultRealpathSync; | ||
var packageIterator = opts.packageIterator; | ||
@@ -796,3 +813,3 @@ | ||
// ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory | ||
var absoluteStart = maybeUnwrapSymlink$1(path.resolve(basedir), opts); | ||
var absoluteStart = maybeRealpathSync(realpathSync, path.resolve(basedir), opts); | ||
@@ -803,3 +820,3 @@ if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) { | ||
var m = loadAsFileSync(res) || loadAsDirectorySync(res); | ||
if (m) return maybeUnwrapSymlink$1(m, opts); | ||
if (m) return maybeRealpathSync(realpathSync, m, opts); | ||
} else if (isCore(x)) { | ||
@@ -809,3 +826,3 @@ return x; | ||
var n = loadNodeModulesSync(x, absoluteStart); | ||
if (n) return maybeUnwrapSymlink$1(n, opts); | ||
if (n) return maybeRealpathSync(realpathSync, n, opts); | ||
} | ||
@@ -847,3 +864,3 @@ | ||
var pkgfile = path.join(maybeUnwrapSymlink$1(dir, opts), 'package.json'); | ||
var pkgfile = path.join(maybeRealpathSync(realpathSync, dir, opts), 'package.json'); | ||
@@ -869,3 +886,3 @@ if (!isFile(pkgfile)) { | ||
function loadAsDirectorySync(x) { | ||
var pkgfile = path.join(maybeUnwrapSymlink$1(x, opts), '/package.json'); | ||
var pkgfile = path.join(maybeRealpathSync(realpathSync, x, opts), '/package.json'); | ||
if (isFile(pkgfile)) { | ||
@@ -925,10 +942,11 @@ try { | ||
// endregion | ||
// endregion | ||
/* ******************************************************************************************************************** | ||
* PluginCreator | ||
* ********************************************************************************************************************/ | ||
// region PluginCreator | ||
/* ****************************************************************************************************************** */ | ||
// region: Module Vars & Ambients | ||
/* ****************************************************************************************************************** */ | ||
var tsNodeIncluded = false; | ||
var requireStack = []; | ||
// endregion | ||
/* ****************************************************************************************************************** */ | ||
// region: PluginCreator | ||
/* ****************************************************************************************************************** */ | ||
/** | ||
@@ -1110,3 +1128,4 @@ * @example | ||
removeDiagnostic: removeDiagnostic, | ||
diagnostics: diagnostics | ||
diagnostics: diagnostics, | ||
library: getCurrentLibrary() | ||
}); | ||
@@ -1134,7 +1153,11 @@ break; | ||
*/ | ||
/* ******************************************************************************************************************** | ||
* Helpers | ||
* ********************************************************************************************************************/ | ||
// region Helpers | ||
/* ****************************************************************************************************************** */ | ||
// region: Constants & Ambients | ||
/* ****************************************************************************************************************** */ | ||
var activeProgramTransformers = new Set(); | ||
var dirname = require('path').dirname; | ||
// endregion | ||
/* ****************************************************************************************************************** */ | ||
// region: Helpers | ||
/* ****************************************************************************************************************** */ | ||
function getConfig(compilerOptions, rootFileNames, defaultDir) { | ||
@@ -1164,4 +1187,4 @@ if (compilerOptions.configFilePath === undefined) { | ||
if ((plugins.length === 1) && plugins[0].customTransformers) { | ||
var _a = plugins[0].customTransformers, _b = _a.before, before_1 = _b === void 0 ? [] : _b, _c = _a.after, after_1 = _c === void 0 ? [] : _c; | ||
return __spread(before_1.map(function (item) { return ({ transform: item }); }), after_1.map(function (item) { return ({ transform: item, after: true }); })); | ||
var _a = plugins[0].customTransformers, _b = _a.before, before = _b === void 0 ? [] : _b, _c = _a.after, after = _c === void 0 ? [] : _c; | ||
return __spread(before.map(function (item) { return ({ transform: item }); }), after.map(function (item) { return ({ transform: item, after: true }); })); | ||
} | ||
@@ -1171,7 +1194,7 @@ return plugins; | ||
// endregion | ||
/* ******************************************************************************************************************** | ||
* createProgram (patched method) | ||
* ********************************************************************************************************************/ | ||
/* ****************************************************************************************************************** */ | ||
// region: createProgram - (patched method) | ||
/* ****************************************************************************************************************** */ | ||
function createProgram(rootNamesOrOptions, options, host, oldProgram, configFileParsingDiagnostics) { | ||
var e_1, _a; | ||
var e_1, _a, e_2, _b; | ||
var rootNames; | ||
@@ -1207,7 +1230,25 @@ var projectDir = process.cwd(); | ||
var pluginCreator = new PluginCreator(plugins, projectDir); | ||
/* Prevent recursion in Program transformers */ | ||
var programTransformers = new Map(pluginCreator.getProgramTransformers()); | ||
try { | ||
for (var _c = __values(pluginCreator.getProgramTransformers()), _d = _c.next(); !_d.done; _d = _c.next()) { | ||
var _e = __read(_d.value, 1), transformer = _e[0]; | ||
if (activeProgramTransformers.has(transformer)) | ||
programTransformers.delete(transformer); | ||
else | ||
activeProgramTransformers.add(transformer); | ||
} | ||
} | ||
catch (e_1_1) { e_1 = { error: e_1_1 }; } | ||
finally { | ||
try { | ||
if (_d && !_d.done && (_a = _c.return)) _a.call(_c); | ||
} | ||
finally { if (e_1) throw e_1.error; } | ||
} | ||
try { | ||
/* Transform Program */ | ||
for (var _b = __values(pluginCreator.getProgramTransformers()), _c = _b.next(); !_c.done; _c = _b.next()) { | ||
var _d = __read(_c.value, 2), programTransformer = _d[0], config = _d[1]; | ||
var newProgram = programTransformer(program, host, config); | ||
for (var programTransformers_1 = __values(programTransformers), programTransformers_1_1 = programTransformers_1.next(); !programTransformers_1_1.done; programTransformers_1_1 = programTransformers_1.next()) { | ||
var _f = __read(programTransformers_1_1.value, 2), programTransformer = _f[0], config = _f[1]; | ||
var newProgram = programTransformer(program, host, config, { ts: ts }); | ||
if (typeof (newProgram === null || newProgram === void 0 ? void 0 : newProgram['emit']) === 'function') | ||
@@ -1217,17 +1258,21 @@ program = newProgram; | ||
} | ||
catch (e_1_1) { e_1 = { error: e_1_1 }; } | ||
catch (e_2_1) { e_2 = { error: e_2_1 }; } | ||
finally { | ||
try { | ||
if (_c && !_c.done && (_a = _b.return)) _a.call(_b); | ||
if (programTransformers_1_1 && !programTransformers_1_1.done && (_b = programTransformers_1.return)) _b.call(programTransformers_1); | ||
} | ||
finally { if (e_1) throw e_1.error; } | ||
finally { if (e_2) throw e_2.error; } | ||
} | ||
/* Hook TypeScript emit method */ | ||
var originalEmit = program.emit; | ||
program.emit = function newEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) { | ||
var e_2, _a; | ||
programTransformers.forEach(function (c, transformer) { return activeProgramTransformers.delete(transformer); }); | ||
/* Hook emit method */ | ||
if (!program.originalEmit) { | ||
program.originalEmit = program.emit; | ||
program.emit = newEmit; | ||
} | ||
function newEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) { | ||
var e_3, _a; | ||
/* Merge in our transformers */ | ||
var transformers = pluginCreator.createTransformers({ program: program }, customTransformers); | ||
/* Invoke TS emit */ | ||
var result = originalEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, transformers); | ||
var result = program.originalEmit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, transformers); | ||
try { | ||
@@ -1241,3 +1286,3 @@ /* Merge in transformer diagnostics */ | ||
} | ||
catch (e_2_1) { e_2 = { error: e_2_1 }; } | ||
catch (e_3_1) { e_3 = { error: e_3_1 }; } | ||
finally { | ||
@@ -1247,8 +1292,9 @@ try { | ||
} | ||
finally { if (e_2) throw e_2.error; } | ||
finally { if (e_3) throw e_3.error; } | ||
} | ||
return result; | ||
}; | ||
} | ||
return program; | ||
} | ||
// endregion | ||
@@ -1255,0 +1301,0 @@ /* |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
328674
41
2695