archive-gh-me/rollup-plugin-typescript2
1
0
Fork 0
mirror of https://github.com/ezolenko/rollup-plugin-typescript2.git synced 2025-12-08 19:06:16 +00:00
Code Issues Projects Releases Wiki Activity

- allowjs in tsconfig makes plugin process js files as well

Browse Source
This commit is contained in:
Eugene Zolenko 2019-11-13 18:35:55 -07:00
parent 7e9f5c8c9f
commit a9d07dcc3e
9 changed files with 159 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -140,7 +140,7 @@ See [#108](https://github.com/ezolenko/rollup-plugin-typescript2/issues/108)
* `include`: `[ "*.ts+(|x)", "**/*.ts+(|x)" ]`
By default passes all .ts files through typescript compiler.
By default passes all .ts files through typescript compiler. If `allowJs: true` is set in tsconfig, `"*.js+(|x)", "**/*.js+(|x)"` are added automatically.
* `exclude`: `[ "*.d.ts", "**/*.d.ts" ]`

2
dist/get-options-overrides.d.ts.map vendored
View File

@ -1 +1 @@
{"version":3,"file":"get-options-overrides.d.ts","sourceRoot":"","sources":["src/get-options-overrides.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,wBAAgB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,CA+B9J;AAiBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,iBAAiB,OAoB/G"}
{"version":3,"file":"get-options-overrides.d.ts","sourceRoot":"","sources":["src/get-options-overrides.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,wBAAgB,mBAAmB,CAAC,EAAE,yBAAyB,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,eAAe,CA+B9J;AAyBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,iBAAiB,OAuB/G"}

131
dist/rollup-plugin-typescript2.cjs.js vendored
View File

@ -17115,23 +17115,24 @@ var lodash = createCommonjsModule(function (module, exports) {
}
}.call(commonjsGlobal));
});
var lodash_1 = lodash.compact;
var lodash_2 = lodash.get;
var lodash_3 = lodash.each;
var lodash_4 = lodash.isEqual;
var lodash_5 = lodash.some;
var lodash_6 = lodash.filter;
var lodash_7 = lodash.endsWith;
var lodash_8 = lodash.map;
var lodash_9 = lodash.has;
var lodash_10 = lodash.isFunction;
var lodash_11 = lodash.concat;
var lodash_12 = lodash.find;
var lodash_13 = lodash.defaults;
var lodash_14 = lodash.assign;
var lodash_15 = lodash.merge;
var lodash_16 = lodash.flatMap;
var lodash_17 = lodash.chain;
var lodash_1 = lodash.union;
var lodash_2 = lodash.compact;
var lodash_3 = lodash.get;
var lodash_4 = lodash.each;
var lodash_5 = lodash.isEqual;
var lodash_6 = lodash.some;
var lodash_7 = lodash.filter;
var lodash_8 = lodash.endsWith;
var lodash_9 = lodash.map;
var lodash_10 = lodash.has;
var lodash_11 = lodash.isFunction;
var lodash_12 = lodash.concat;
var lodash_13 = lodash.find;
var lodash_14 = lodash.defaults;
var lodash_15 = lodash.assign;
var lodash_16 = lodash.merge;
var lodash_17 = lodash.flatMap;
var lodash_18 = lodash.chain;
var VerbosityLevel;
(function (VerbosityLevel) {
@ -17148,22 +17149,22 @@ class ConsoleContext {
warn(message) {
if (this.verbosity < VerbosityLevel.Warning)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
error(message) {
if (this.verbosity < VerbosityLevel.Error)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
info(message) {
if (this.verbosity < VerbosityLevel.Info)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
debug(message) {
if (this.verbosity < VerbosityLevel.Debug)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
}
@ -17174,12 +17175,12 @@ class RollupContext {
this.context = context;
this.prefix = prefix;
this.hasContext = true;
this.hasContext = lodash_10(this.context.warn) && lodash_10(this.context.error);
this.hasContext = lodash_11(this.context.warn) && lodash_11(this.context.error);
}
warn(message) {
if (this.verbosity < VerbosityLevel.Warning)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
if (this.hasContext)
this.context.warn(`${text}`);
else
@ -17188,7 +17189,7 @@ class RollupContext {
error(message) {
if (this.verbosity < VerbosityLevel.Error)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
if (this.hasContext) {
if (this.bail)
this.context.error(`${text}`);
@ -17201,13 +17202,13 @@ class RollupContext {
info(message) {
if (this.verbosity < VerbosityLevel.Info)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
console.log(`${this.prefix}${text}`);
}
debug(message) {
if (this.verbosity < VerbosityLevel.Debug)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
console.log(`${this.prefix}${text}`);
}
}
@ -17247,7 +17248,7 @@ class LanguageServiceHost {
}
getScriptSnapshot(fileName) {
fileName = normalize(fileName);
if (lodash_9(this.snapshots, fileName))
if (lodash_10(this.snapshots, fileName))
return this.snapshots[fileName];
const source = tsModule.sys.readFile(fileName);
if (source) {
@ -17305,11 +17306,11 @@ class LanguageServiceHost {
for (const creator of this.transformers) {
const factory = creator(this.service);
if (factory.before)
transformer.before = lodash_11(transformer.before, factory.before);
transformer.before = lodash_12(transformer.before, factory.before);
if (factory.after)
transformer.after = lodash_11(transformer.after, factory.after);
transformer.after = lodash_12(transformer.after, factory.after);
if (factory.afterDeclarations)
transformer.afterDeclarations = lodash_11(transformer.afterDeclarations, factory.afterDeclarations);
transformer.afterDeclarations = lodash_12(transformer.afterDeclarations, factory.afterDeclarations);
}
return transformer;
}
@ -23963,7 +23964,7 @@ class RollingCache {
return false;
if (!fs.existsSync(this.oldCacheRoot))
return names.length === 0; // empty folder matches
return lodash_4(fs.readdirSync(this.oldCacheRoot).sort(), names.sort());
return lodash_5(fs.readdirSync(this.oldCacheRoot).sort(), names.sort());
}
/**
* @returns data for name, must exist in old cache (or either old of new cache if checkNewCache is true)
@ -24704,11 +24705,11 @@ class NoCache {
function convertEmitOutput(output, references) {
const out = { code: "", references };
output.outputFiles.forEach((e) => {
if (lodash_7(e.name, ".d.ts"))
if (lodash_8(e.name, ".d.ts"))
out.dts = e;
else if (lodash_7(e.name, ".d.ts.map"))
else if (lodash_8(e.name, ".d.ts.map"))
out.dtsmap = e;
else if (lodash_7(e.name, ".map"))
else if (lodash_8(e.name, ".map"))
out.map = e.text;
else
out.code = e.text;
@ -24719,13 +24720,13 @@ function getAllReferences(importer, snapshot, options) {
if (!snapshot)
return [];
const info = tsModule.preProcessFile(snapshot.getText(0, snapshot.getLength()), true, true);
return lodash_1(lodash_11(info.referencedFiles, info.importedFiles).map((reference) => {
return lodash_2(lodash_12(info.referencedFiles, info.importedFiles).map((reference) => {
const resolved = tsModule.nodeModuleNameResolver(reference.fileName, importer, options, tsModule.sys);
return resolved.resolvedModule ? resolved.resolvedModule.resolvedFileName : undefined;
}));
}
function convertDiagnostic(type, data) {
return lodash_8(data, (diagnostic) => {
return lodash_9(data, (diagnostic) => {
const entry = {
flatMessage: tsModule.flattenDiagnosticMessageText(diagnostic.messageText, "\n"),
formatted: tsModule.formatDiagnosticsWithColorAndContext(data, formatHost),
@ -24764,10 +24765,10 @@ class TsCache {
}
this.dependencyTree = new graphlib_1({ directed: true });
this.dependencyTree.setDefaultNodeLabel((_node) => ({ dirty: false }));
const automaticTypes = lodash_8(tsModule.getAutomaticTypeDirectiveNames(options, tsModule.sys), (entry) => tsModule.resolveTypeReferenceDirective(entry, undefined, options, tsModule.sys))
const automaticTypes = lodash_9(tsModule.getAutomaticTypeDirectiveNames(options, tsModule.sys), (entry) => tsModule.resolveTypeReferenceDirective(entry, undefined, options, tsModule.sys))
.filter((entry) => entry.resolvedTypeReferenceDirective && entry.resolvedTypeReferenceDirective.resolvedFileName)
.map((entry) => entry.resolvedTypeReferenceDirective.resolvedFileName);
this.ambientTypes = lodash_6(rootFilenames, (file) => lodash_7(file, ".d.ts"))
this.ambientTypes = lodash_7(rootFilenames, (file) => lodash_8(file, ".d.ts"))
.concat(automaticTypes)
.map((id) => ({ id, snapshot: this.host.getScriptSnapshot(id) }));
this.init();
@ -24798,11 +24799,11 @@ class TsCache {
walkTree(cb) {
const acyclic = graphlib_3.isAcyclic(this.dependencyTree);
if (acyclic) {
lodash_3(graphlib_3.topsort(this.dependencyTree), (id) => cb(id));
lodash_4(graphlib_3.topsort(this.dependencyTree), (id) => cb(id));
return;
}
this.context.info(safe_4("import tree has cycles"));
lodash_3(this.dependencyTree.nodes(), (id) => cb(id));
lodash_4(this.dependencyTree.nodes(), (id) => cb(id));
}
done() {
this.context.info(safe_5("rolling caches"));
@ -24848,7 +24849,7 @@ class TsCache {
return;
}
this.context.debug(safe_5("Ambient types:"));
const typeNames = lodash_6(this.ambientTypes, (snapshot) => snapshot.snapshot !== undefined)
const typeNames = lodash_7(this.ambientTypes, (snapshot) => snapshot.snapshot !== undefined)
.map((snapshot) => {
this.context.debug(` ${snapshot.id}`);
return this.makeName(snapshot.id, snapshot.snapshot);
@ -24857,7 +24858,7 @@ class TsCache {
this.ambientTypesDirty = !this.typesCache.match(typeNames);
if (this.ambientTypesDirty)
this.context.info(safe_4("ambient types changed, redoing all semantic diagnostics"));
lodash_3(typeNames, (name) => this.typesCache.touch(name));
lodash_4(typeNames, (name) => this.typesCache.touch(name));
}
getDiagnostics(type, cache, id, snapshot, check) {
if (this.noCache) {
@ -24911,7 +24912,7 @@ class TsCache {
if (this.ambientTypesDirty)
return true;
const dependencies = graphlib_3.dijkstra(this.dependencyTree, id);
return lodash_5(dependencies, (dependency, node) => {
return lodash_6(dependencies, (dependency, node) => {
if (!node || dependency.distance === Infinity)
return false;
const l = this.dependencyTree.node(node);
@ -24928,7 +24929,7 @@ class TsCache {
}
function printDiagnostics(context, diagnostics, pretty) {
lodash_3(diagnostics, (diagnostic) => {
lodash_4(diagnostics, (diagnostic) => {
let print;
let color;
let category;
@ -24990,8 +24991,14 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
}
return overrides;
}
function includeToArray(include) {
if (include instanceof Array)
return include;
else
return [include];
}
function expandIncludeWithDirs(include, dirs) {
return lodash_17(dirs)
return lodash_18(dirs)
.flatMap((root) => {
if (include instanceof Array)
return include.map((x) => path.join(root, x));
@ -25002,15 +25009,17 @@ function expandIncludeWithDirs(include, dirs) {
.value();
}
function createFilter(context, pluginOptions, parsedConfig) {
let included = pluginOptions.include;
let excluded = pluginOptions.exclude;
let included = includeToArray(pluginOptions.include);
let excluded = includeToArray(pluginOptions.exclude);
if (parsedConfig.options.allowJs)
included = lodash_1(included, ["*.js+(|x)", "**/*.js+(|x)"]);
if (parsedConfig.options.rootDirs) {
included = expandIncludeWithDirs(included, parsedConfig.options.rootDirs);
excluded = expandIncludeWithDirs(excluded, parsedConfig.options.rootDirs);
}
if (parsedConfig.projectReferences) {
included = lodash_11(included, expandIncludeWithDirs(included, parsedConfig.projectReferences.map((x) => x.path)));
excluded = lodash_11(excluded, expandIncludeWithDirs(excluded, parsedConfig.projectReferences.map((x) => x.path)));
included = lodash_12(included, expandIncludeWithDirs(included, parsedConfig.projectReferences.map((x) => x.path)));
excluded = lodash_12(excluded, expandIncludeWithDirs(excluded, parsedConfig.projectReferences.map((x) => x.path)));
}
context.debug(() => `included:\n${JSON.stringify(included, undefined, 4)}`);
context.debug(() => `excluded:\n${JSON.stringify(excluded, undefined, 4)}`);
@ -25037,7 +25046,7 @@ function parseTsConfig(context, pluginOptions) {
if (text === undefined)
throw new Error(`failed to read '${fileName}'`);
const result = tsModule.parseConfigFileTextToJson(fileName, text);
pretty = lodash_2(result.config, "pretty", pretty);
pretty = lodash_3(result.config, "pretty", pretty);
if (result.error !== undefined) {
printDiagnostics(context, convertDiagnostic("config", [result.error]), pretty);
throw new Error(`failed to parse '${fileName}'`);
@ -25047,7 +25056,7 @@ function parseTsConfig(context, pluginOptions) {
configFileName = fileName;
}
const mergedConfig = {};
lodash_15(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
lodash_16(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
const preParsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, getOptionsOverrides(pluginOptions), configFileName);
const compilerOptionsOverride = getOptionsOverrides(pluginOptions, preParsedTsConfig);
const parsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, compilerOptionsOverride, configFileName);
@ -27248,7 +27257,7 @@ const typescript = (options) => {
return _cache;
};
const pluginOptions = Object.assign({}, options);
lodash_13(pluginOptions, {
lodash_14(pluginOptions, {
check: true,
verbosity: VerbosityLevel.Warning,
clean: false,
@ -27283,7 +27292,7 @@ const typescript = (options) => {
context.info(`rollup version: ${this.meta.rollupVersion}`);
if (!semver_32(tsModule.version, ">=2.4.0", { includePrerelease: true }))
throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
context.info(`rollup-plugin-typescript2 version: 0.25.3`);
context.info(`rollup-plugin-typescript2 version: 0.26.0`);
context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
context.debug(() => `tsconfig path: ${tsConfigPath}`);
@ -27319,7 +27328,7 @@ const typescript = (options) => {
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {
if (filter(result.resolvedModule.resolvedFileName))
cache().setDependency(result.resolvedModule.resolvedFileName, importer);
if (lodash_7(result.resolvedModule.resolvedFileName, ".d.ts"))
if (lodash_8(result.resolvedModule.resolvedFileName, ".d.ts"))
return;
const resolved = pluginOptions.rollupCommonJSResolveHack
? resolve.sync(result.resolvedModule.resolvedFileName)
@ -27348,7 +27357,7 @@ const typescript = (options) => {
if (output.emitSkipped) {
noErrors = false;
// always checking on fatal errors, even if options.check is set to false
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27356,14 +27365,14 @@ const typescript = (options) => {
printDiagnostics(contextWrapper, diagnostics, parsedConfig.options.pretty === true);
// since no output was generated, aborting compilation
cache().done();
if (lodash_10(this.error))
if (lodash_11(this.error))
this.error(safe_3(`failed to transpile '${id}'`));
}
const references = getAllReferences(id, servicesHost.getScriptSnapshot(id), parsedConfig.options);
return convertEmitOutput(output, references);
});
if (pluginOptions.check) {
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27409,7 +27418,7 @@ const typescript = (options) => {
const snapshot = servicesHost.getScriptSnapshot(id);
if (!snapshot)
return;
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27425,9 +27434,9 @@ const typescript = (options) => {
_onwrite(_output) {
if (!parsedConfig.options.declaration)
return;
lodash_3(parsedConfig.fileNames, (name) => {
lodash_4(parsedConfig.fileNames, (name) => {
const key = normalize(name);
if (lodash_9(declarations, key))
if (lodash_10(declarations, key))
return;
if (!allImportedFiles.has(key)) {
context.debug(() => `skipping declarations for unused '${key}'`);
@ -27464,7 +27473,7 @@ const typescript = (options) => {
});
}
};
lodash_3(declarations, ({ type, map }, key) => {
lodash_4(declarations, ({ type, map }, key) => {
emitDeclaration(key, ".d.ts", type);
emitDeclaration(key, ".d.ts.map", map);
});

2
dist/rollup-plugin-typescript2.cjs.js.map vendored
View File

File diff suppressed because one or more lines are too long

131
dist/rollup-plugin-typescript2.es.js vendored
View File

@ -17109,23 +17109,24 @@ var lodash = createCommonjsModule(function (module, exports) {
}
}.call(commonjsGlobal));
});
var lodash_1 = lodash.compact;
var lodash_2 = lodash.get;
var lodash_3 = lodash.each;
var lodash_4 = lodash.isEqual;
var lodash_5 = lodash.some;
var lodash_6 = lodash.filter;
var lodash_7 = lodash.endsWith;
var lodash_8 = lodash.map;
var lodash_9 = lodash.has;
var lodash_10 = lodash.isFunction;
var lodash_11 = lodash.concat;
var lodash_12 = lodash.find;
var lodash_13 = lodash.defaults;
var lodash_14 = lodash.assign;
var lodash_15 = lodash.merge;
var lodash_16 = lodash.flatMap;
var lodash_17 = lodash.chain;
var lodash_1 = lodash.union;
var lodash_2 = lodash.compact;
var lodash_3 = lodash.get;
var lodash_4 = lodash.each;
var lodash_5 = lodash.isEqual;
var lodash_6 = lodash.some;
var lodash_7 = lodash.filter;
var lodash_8 = lodash.endsWith;
var lodash_9 = lodash.map;
var lodash_10 = lodash.has;
var lodash_11 = lodash.isFunction;
var lodash_12 = lodash.concat;
var lodash_13 = lodash.find;
var lodash_14 = lodash.defaults;
var lodash_15 = lodash.assign;
var lodash_16 = lodash.merge;
var lodash_17 = lodash.flatMap;
var lodash_18 = lodash.chain;
var VerbosityLevel;
(function (VerbosityLevel) {
@ -17142,22 +17143,22 @@ class ConsoleContext {
warn(message) {
if (this.verbosity < VerbosityLevel.Warning)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
error(message) {
if (this.verbosity < VerbosityLevel.Error)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
info(message) {
if (this.verbosity < VerbosityLevel.Info)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
debug(message) {
if (this.verbosity < VerbosityLevel.Debug)
return;
console.log(`${this.prefix}${lodash_10(message) ? message() : message}`);
console.log(`${this.prefix}${lodash_11(message) ? message() : message}`);
}
}
@ -17168,12 +17169,12 @@ class RollupContext {
this.context = context;
this.prefix = prefix;
this.hasContext = true;
this.hasContext = lodash_10(this.context.warn) && lodash_10(this.context.error);
this.hasContext = lodash_11(this.context.warn) && lodash_11(this.context.error);
}
warn(message) {
if (this.verbosity < VerbosityLevel.Warning)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
if (this.hasContext)
this.context.warn(`${text}`);
else
@ -17182,7 +17183,7 @@ class RollupContext {
error(message) {
if (this.verbosity < VerbosityLevel.Error)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
if (this.hasContext) {
if (this.bail)
this.context.error(`${text}`);
@ -17195,13 +17196,13 @@ class RollupContext {
info(message) {
if (this.verbosity < VerbosityLevel.Info)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
console.log(`${this.prefix}${text}`);
}
debug(message) {
if (this.verbosity < VerbosityLevel.Debug)
return;
const text = lodash_10(message) ? message() : message;
const text = lodash_11(message) ? message() : message;
console.log(`${this.prefix}${text}`);
}
}
@ -17241,7 +17242,7 @@ class LanguageServiceHost {
}
getScriptSnapshot(fileName) {
fileName = normalize(fileName);
if (lodash_9(this.snapshots, fileName))
if (lodash_10(this.snapshots, fileName))
return this.snapshots[fileName];
const source = tsModule.sys.readFile(fileName);
if (source) {
@ -17299,11 +17300,11 @@ class LanguageServiceHost {
for (const creator of this.transformers) {
const factory = creator(this.service);
if (factory.before)
transformer.before = lodash_11(transformer.before, factory.before);
transformer.before = lodash_12(transformer.before, factory.before);
if (factory.after)
transformer.after = lodash_11(transformer.after, factory.after);
transformer.after = lodash_12(transformer.after, factory.after);
if (factory.afterDeclarations)
transformer.afterDeclarations = lodash_11(transformer.afterDeclarations, factory.afterDeclarations);
transformer.afterDeclarations = lodash_12(transformer.afterDeclarations, factory.afterDeclarations);
}
return transformer;
}
@ -23957,7 +23958,7 @@ class RollingCache {
return false;
if (!existsSync(this.oldCacheRoot))
return names.length === 0; // empty folder matches
return lodash_4(readdirSync(this.oldCacheRoot).sort(), names.sort());
return lodash_5(readdirSync(this.oldCacheRoot).sort(), names.sort());
}
/**
* @returns data for name, must exist in old cache (or either old of new cache if checkNewCache is true)
@ -24698,11 +24699,11 @@ class NoCache {
function convertEmitOutput(output, references) {
const out = { code: "", references };
output.outputFiles.forEach((e) => {
if (lodash_7(e.name, ".d.ts"))
if (lodash_8(e.name, ".d.ts"))
out.dts = e;
else if (lodash_7(e.name, ".d.ts.map"))
else if (lodash_8(e.name, ".d.ts.map"))
out.dtsmap = e;
else if (lodash_7(e.name, ".map"))
else if (lodash_8(e.name, ".map"))
out.map = e.text;
else
out.code = e.text;
@ -24713,13 +24714,13 @@ function getAllReferences(importer, snapshot, options) {
if (!snapshot)
return [];
const info = tsModule.preProcessFile(snapshot.getText(0, snapshot.getLength()), true, true);
return lodash_1(lodash_11(info.referencedFiles, info.importedFiles).map((reference) => {
return lodash_2(lodash_12(info.referencedFiles, info.importedFiles).map((reference) => {
const resolved = tsModule.nodeModuleNameResolver(reference.fileName, importer, options, tsModule.sys);
return resolved.resolvedModule ? resolved.resolvedModule.resolvedFileName : undefined;
}));
}
function convertDiagnostic(type, data) {
return lodash_8(data, (diagnostic) => {
return lodash_9(data, (diagnostic) => {
const entry = {
flatMessage: tsModule.flattenDiagnosticMessageText(diagnostic.messageText, "\n"),
formatted: tsModule.formatDiagnosticsWithColorAndContext(data, formatHost),
@ -24758,10 +24759,10 @@ class TsCache {
}
this.dependencyTree = new graphlib_1({ directed: true });
this.dependencyTree.setDefaultNodeLabel((_node) => ({ dirty: false }));
const automaticTypes = lodash_8(tsModule.getAutomaticTypeDirectiveNames(options, tsModule.sys), (entry) => tsModule.resolveTypeReferenceDirective(entry, undefined, options, tsModule.sys))
const automaticTypes = lodash_9(tsModule.getAutomaticTypeDirectiveNames(options, tsModule.sys), (entry) => tsModule.resolveTypeReferenceDirective(entry, undefined, options, tsModule.sys))
.filter((entry) => entry.resolvedTypeReferenceDirective && entry.resolvedTypeReferenceDirective.resolvedFileName)
.map((entry) => entry.resolvedTypeReferenceDirective.resolvedFileName);
this.ambientTypes = lodash_6(rootFilenames, (file) => lodash_7(file, ".d.ts"))
this.ambientTypes = lodash_7(rootFilenames, (file) => lodash_8(file, ".d.ts"))
.concat(automaticTypes)
.map((id) => ({ id, snapshot: this.host.getScriptSnapshot(id) }));
this.init();
@ -24792,11 +24793,11 @@ class TsCache {
walkTree(cb) {
const acyclic = graphlib_3.isAcyclic(this.dependencyTree);
if (acyclic) {
lodash_3(graphlib_3.topsort(this.dependencyTree), (id) => cb(id));
lodash_4(graphlib_3.topsort(this.dependencyTree), (id) => cb(id));
return;
}
this.context.info(safe_4("import tree has cycles"));
lodash_3(this.dependencyTree.nodes(), (id) => cb(id));
lodash_4(this.dependencyTree.nodes(), (id) => cb(id));
}
done() {
this.context.info(safe_5("rolling caches"));
@ -24842,7 +24843,7 @@ class TsCache {
return;
}
this.context.debug(safe_5("Ambient types:"));
const typeNames = lodash_6(this.ambientTypes, (snapshot) => snapshot.snapshot !== undefined)
const typeNames = lodash_7(this.ambientTypes, (snapshot) => snapshot.snapshot !== undefined)
.map((snapshot) => {
this.context.debug(` ${snapshot.id}`);
return this.makeName(snapshot.id, snapshot.snapshot);
@ -24851,7 +24852,7 @@ class TsCache {
this.ambientTypesDirty = !this.typesCache.match(typeNames);
if (this.ambientTypesDirty)
this.context.info(safe_4("ambient types changed, redoing all semantic diagnostics"));
lodash_3(typeNames, (name) => this.typesCache.touch(name));
lodash_4(typeNames, (name) => this.typesCache.touch(name));
}
getDiagnostics(type, cache, id, snapshot, check) {
if (this.noCache) {
@ -24905,7 +24906,7 @@ class TsCache {
if (this.ambientTypesDirty)
return true;
const dependencies = graphlib_3.dijkstra(this.dependencyTree, id);
return lodash_5(dependencies, (dependency, node) => {
return lodash_6(dependencies, (dependency, node) => {
if (!node || dependency.distance === Infinity)
return false;
const l = this.dependencyTree.node(node);
@ -24922,7 +24923,7 @@ class TsCache {
}
function printDiagnostics(context, diagnostics, pretty) {
lodash_3(diagnostics, (diagnostic) => {
lodash_4(diagnostics, (diagnostic) => {
let print;
let color;
let category;
@ -24984,8 +24985,14 @@ function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }, preParsed
}
return overrides;
}
function includeToArray(include) {
if (include instanceof Array)
return include;
else
return [include];
}
function expandIncludeWithDirs(include, dirs) {
return lodash_17(dirs)
return lodash_18(dirs)
.flatMap((root) => {
if (include instanceof Array)
return include.map((x) => join(root, x));
@ -24996,15 +25003,17 @@ function expandIncludeWithDirs(include, dirs) {
.value();
}
function createFilter(context, pluginOptions, parsedConfig) {
let included = pluginOptions.include;
let excluded = pluginOptions.exclude;
let included = includeToArray(pluginOptions.include);
let excluded = includeToArray(pluginOptions.exclude);
if (parsedConfig.options.allowJs)
included = lodash_1(included, ["*.js+(|x)", "**/*.js+(|x)"]);
if (parsedConfig.options.rootDirs) {
included = expandIncludeWithDirs(included, parsedConfig.options.rootDirs);
excluded = expandIncludeWithDirs(excluded, parsedConfig.options.rootDirs);
}
if (parsedConfig.projectReferences) {
included = lodash_11(included, expandIncludeWithDirs(included, parsedConfig.projectReferences.map((x) => x.path)));
excluded = lodash_11(excluded, expandIncludeWithDirs(excluded, parsedConfig.projectReferences.map((x) => x.path)));
included = lodash_12(included, expandIncludeWithDirs(included, parsedConfig.projectReferences.map((x) => x.path)));
excluded = lodash_12(excluded, expandIncludeWithDirs(excluded, parsedConfig.projectReferences.map((x) => x.path)));
}
context.debug(() => `included:\n${JSON.stringify(included, undefined, 4)}`);
context.debug(() => `excluded:\n${JSON.stringify(excluded, undefined, 4)}`);
@ -25031,7 +25040,7 @@ function parseTsConfig(context, pluginOptions) {
if (text === undefined)
throw new Error(`failed to read '${fileName}'`);
const result = tsModule.parseConfigFileTextToJson(fileName, text);
pretty = lodash_2(result.config, "pretty", pretty);
pretty = lodash_3(result.config, "pretty", pretty);
if (result.error !== undefined) {
printDiagnostics(context, convertDiagnostic("config", [result.error]), pretty);
throw new Error(`failed to parse '${fileName}'`);
@ -25041,7 +25050,7 @@ function parseTsConfig(context, pluginOptions) {
configFileName = fileName;
}
const mergedConfig = {};
lodash_15(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
lodash_16(mergedConfig, pluginOptions.tsconfigDefaults, loadedConfig, pluginOptions.tsconfigOverride);
const preParsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, getOptionsOverrides(pluginOptions), configFileName);
const compilerOptionsOverride = getOptionsOverrides(pluginOptions, preParsedTsConfig);
const parsedTsConfig = tsModule.parseJsonConfigFileContent(mergedConfig, tsModule.sys, baseDir, compilerOptionsOverride, configFileName);
@ -27242,7 +27251,7 @@ const typescript = (options) => {
return _cache;
};
const pluginOptions = Object.assign({}, options);
lodash_13(pluginOptions, {
lodash_14(pluginOptions, {
check: true,
verbosity: VerbosityLevel.Warning,
clean: false,
@ -27277,7 +27286,7 @@ const typescript = (options) => {
context.info(`rollup version: ${this.meta.rollupVersion}`);
if (!semver_32(tsModule.version, ">=2.4.0", { includePrerelease: true }))
throw new Error(`Installed typescript version '${tsModule.version}' is outside of supported range '>=2.4.0'`);
context.info(`rollup-plugin-typescript2 version: 0.25.3`);
context.info(`rollup-plugin-typescript2 version: 0.26.0`);
context.debug(() => `plugin options:\n${JSON.stringify(pluginOptions, (key, value) => key === "typescript" ? `version ${value.version}` : value, 4)}`);
context.debug(() => `rollup config:\n${JSON.stringify(rollupOptions, undefined, 4)}`);
context.debug(() => `tsconfig path: ${tsConfigPath}`);
@ -27313,7 +27322,7 @@ const typescript = (options) => {
if (result.resolvedModule && result.resolvedModule.resolvedFileName) {
if (filter(result.resolvedModule.resolvedFileName))
cache().setDependency(result.resolvedModule.resolvedFileName, importer);
if (lodash_7(result.resolvedModule.resolvedFileName, ".d.ts"))
if (lodash_8(result.resolvedModule.resolvedFileName, ".d.ts"))
return;
const resolved = pluginOptions.rollupCommonJSResolveHack
? sync$4(result.resolvedModule.resolvedFileName)
@ -27342,7 +27351,7 @@ const typescript = (options) => {
if (output.emitSkipped) {
noErrors = false;
// always checking on fatal errors, even if options.check is set to false
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27350,14 +27359,14 @@ const typescript = (options) => {
printDiagnostics(contextWrapper, diagnostics, parsedConfig.options.pretty === true);
// since no output was generated, aborting compilation
cache().done();
if (lodash_10(this.error))
if (lodash_11(this.error))
this.error(safe_3(`failed to transpile '${id}'`));
}
const references = getAllReferences(id, servicesHost.getScriptSnapshot(id), parsedConfig.options);
return convertEmitOutput(output, references);
});
if (pluginOptions.check) {
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27403,7 +27412,7 @@ const typescript = (options) => {
const snapshot = servicesHost.getScriptSnapshot(id);
if (!snapshot)
return;
const diagnostics = lodash_11(cache().getSyntacticDiagnostics(id, snapshot, () => {
const diagnostics = lodash_12(cache().getSyntacticDiagnostics(id, snapshot, () => {
return service.getSyntacticDiagnostics(id);
}), cache().getSemanticDiagnostics(id, snapshot, () => {
return service.getSemanticDiagnostics(id);
@ -27419,9 +27428,9 @@ const typescript = (options) => {
_onwrite(_output) {
if (!parsedConfig.options.declaration)
return;
lodash_3(parsedConfig.fileNames, (name) => {
lodash_4(parsedConfig.fileNames, (name) => {
const key = normalize(name);
if (lodash_9(declarations, key))
if (lodash_10(declarations, key))
return;
if (!allImportedFiles.has(key)) {
context.debug(() => `skipping declarations for unused '${key}'`);
@ -27458,7 +27467,7 @@ const typescript = (options) => {
});
}
};
lodash_3(declarations, ({ type, map }, key) => {
lodash_4(declarations, ({ type, map }, key) => {
emitDeclaration(key, ".d.ts", type);
emitDeclaration(key, ".d.ts.map", map);
});

2
dist/rollup-plugin-typescript2.es.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "rollup-plugin-typescript2",
"version": "0.25.3",
"version": "0.26.0",
"description": "Seamless integration between Rollup and TypeScript. Now with errors.",
"main": "dist/rollup-plugin-typescript2.cjs.js",
"module": "dist/rollup-plugin-typescript2.es.js",

2
rollup.config.base.js
View File

@ -36,7 +36,7 @@ export default {
namedExports:
{
"colors/safe": [ "green", "white", "red", "yellow", "blue" ],
"lodash": [ "compact", "get", "each", "isEqual", "some", "filter", "endsWith", "map", "has", "isFunction", "concat", "find", "defaults", "assign", "merge", "flatMap", "chain" ],
"lodash": [ "union", "compact", "get", "each", "isEqual", "some", "filter", "endsWith", "map", "has", "isFunction", "concat", "find", "defaults", "assign", "merge", "flatMap", "chain" ],
// "fs-extra": [ "renameSync", "removeSync", "ensureFileSync", "writeJsonSync", "readJsonSync", "existsSync", "readdirSync", "emptyDirSync" ],
},
}),

15
src/get-options-overrides.ts
View File

@ -41,6 +41,14 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir, cacheRoot }: IO
return overrides;
}
function includeToArray(include: string | string[])
{
if (include instanceof Array)
return include;
else
return [ include ];
}
function expandIncludeWithDirs(include: string | string[], dirs: string[])
{
return _
@ -58,8 +66,11 @@ function expandIncludeWithDirs(include: string | string[], dirs: string[])
export function createFilter(context: IContext, pluginOptions: IOptions, parsedConfig: tsTypes.ParsedCommandLine)
{
let included = pluginOptions.include;
let excluded = pluginOptions.exclude;
let included = includeToArray(pluginOptions.include);
let excluded = includeToArray(pluginOptions.exclude);
if (parsedConfig.options.allowJs)
included = _.union(included, ["*.js+(|x)", "**/*.js+(|x)"]);
if (parsedConfig.options.rootDirs)
{