SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 13:55:41 +01:00
Code Issues Projects Releases Packages Activity

Simplify code

Browse source
This commit is contained in:
Alexandru Dima 2019-12-18 17:50:58 +01:00
parent 0bd24b523b
commit 33b130172d
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/index.ts
View file

@ -109,9 +109,17 @@ class MonacoEditorWebpackPlugin implements webpack.Plugin {
const { languages, features, filename, publicPath } = this.options;
const compilationPublicPath = getCompilationPublicPath(compiler);
const modules = [EDITOR_MODULE].concat(languages).concat(features);
const workers: ILabeledWorkerDefinition[] = coalesce(modules.map(
({ label, worker }) => worker && (mixin({ label }, worker))
));
const workers: ILabeledWorkerDefinition[] = [];
modules.forEach((module) => {
if (module.worker) {
workers.push({
label: module.label,
id: module.worker.id,
entry: module.worker.entry,
fallback: module.worker.fallback
});
}
});
const rules = createLoaderRules(languages, features, workers, filename, publicPath, compilationPublicPath);
const plugins = createPlugins(workers, filename);
addCompilerRules(compiler, rules);
@ -148,8 +156,8 @@ function createLoaderRules(languages: IFeatureDefinition[], features: IFeatureDe
if (!languages.length && !features.length) {
return [];
}
const languagePaths = flatArr(coalesce(languages.map(({ entry }) => entry)));
const featurePaths = flatArr(coalesce(features.map(({ entry }) => entry)));
const languagePaths = flatArr(coalesce(languages.map(language => language.entry)));
const featurePaths = flatArr(coalesce(features.map(feature => feature.entry)));
const workerPaths = fromPairs(workers.map(({ label, entry }) => [label, getWorkerFilename(filename, entry)]));
if (workerPaths['typescript']) {
// javascript shares the same worker
@ -208,7 +216,7 @@ function createLoaderRules(languages: IFeatureDefinition[], features: IFeatureDe
function createPlugins(workers: ILabeledWorkerDefinition[], filename: string): AddWorkerEntryPointPlugin[] {
return (
(<AddWorkerEntryPointPlugin[]>[])
.concat(uniqBy(workers, ({ id }) => id).map(({ id, entry }) =>
.concat(workers.map(({ id, entry }) =>
new AddWorkerEntryPointPlugin({
id,
entry: resolveMonacoPath(entry),
@ -234,26 +242,6 @@ function fromPairs<T>(values: [string, T][]): { [key: string]: T; } {
return values.reduce((acc, [key, value]) => Object.assign(acc, { [key]: value }), <{ [key: string]: T; }>{});
}
function uniqBy<T>(items: T[], iteratee: (item: T) => string): T[] {
const keys: { [key: string]: boolean; } = {};
return items.reduce((acc, item) => {
const key = iteratee(item);
if (key in keys) { return acc; }
keys[key] = true;
acc.push(item);
return acc;
}, <T[]>[]);
}
function mixin<DEST, SRC>(dest: DEST, src: SRC): DEST & SRC {
for (let prop in src) {
if (Object.hasOwnProperty.call(src, prop)) {
(<any>dest)[prop] = src[prop];
}
}
return <any>dest;
}
function coalesce<T>(array: ReadonlyArray<T | undefined | null>): T[] {
return <T[]>array.filter(Boolean);
}