Move into monaco-typescript folder

monaco-typescript/scripts/bundle.js

@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const requirejs = require('requirejs');
+const path = require('path');
+const fs = require('fs');
+const terser = require('terser');
+const helpers = require('monaco-plugin-helpers');
+
+const REPO_ROOT = path.resolve(__dirname, '..');
+
+const sha1 = helpers.getGitVersion(REPO_ROOT);
+const semver = require('../package.json').version;
+const headerVersion = semver + '(' + sha1 + ')';
+
+const BUNDLED_FILE_HEADER = [
+	'/*!-----------------------------------------------------------------------------',
+	' * Copyright (c) Microsoft Corporation. All rights reserved.',
+	' * monaco-typescript version: ' + headerVersion,
+	' * Released under the MIT license',
+	' * https://github.com/Microsoft/monaco-typescript/blob/master/LICENSE.md',
+	' *-----------------------------------------------------------------------------*/',
+	''
+].join('\n');
+
+bundleOne('monaco.contribution');
+bundleOne('tsMode', ['vs/language/typescript/monaco.contribution']);
+bundleOne('tsWorker');
+
+function bundleOne(moduleId, exclude) {
+	requirejs.optimize(
+		{
+			baseUrl: 'out/amd/',
+			name: 'vs/language/typescript/' + moduleId,
+			out: 'release/dev/' + moduleId + '.js',
+			exclude: exclude,
+			paths: {
+				'vs/language/typescript': REPO_ROOT + '/out/amd',
+				'vs/language/typescript/fillers/monaco-editor-core':
+					REPO_ROOT + '/out/amd/fillers/monaco-editor-core-amd'
+			},
+			optimize: 'none'
+		},
+		async function (buildResponse) {
+			const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js');
+			const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js');
+			const fileContents = fs.readFileSync(devFilePath).toString();
+			console.log();
+			console.log(`Minifying ${devFilePath}...`);
+			const result = await terser.minify(fileContents, {
+				output: {
+					comments: 'some'
+				}
+			});
+			console.log(`Done minifying ${devFilePath}.`);
+			try {
+				fs.mkdirSync(path.join(REPO_ROOT, 'release/min'));
+			} catch (err) {}
+			fs.writeFileSync(minFilePath, BUNDLED_FILE_HEADER + result.code);
+		}
+	);
+}

monaco-typescript/scripts/dts.js

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const fs = require('fs');
+
+const REPO_ROOT = path.join(__dirname, '../');
+const SRC_PATH = path.join(REPO_ROOT, 'out/amd/monaco.contribution.d.ts');
+const DST_PATH = path.join(REPO_ROOT, 'monaco.d.ts');
+
+const lines = fs
+	.readFileSync(SRC_PATH)
+	.toString()
+	.split(/\r\n|\r|\n/);
+let result = [
+	`/*---------------------------------------------------------------------------------------------`,
+	` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
+	` *  Licensed under the MIT License. See License.txt in the project root for license information.`,
+	` *--------------------------------------------------------------------------------------------*/`,
+	``,
+	`/// <reference path="node_modules/monaco-editor-core/monaco.d.ts" />`,
+	``,
+	`declare namespace monaco.languages.typescript {`
+];
+for (let line of lines) {
+	if (/^import/.test(line)) {
+		continue;
+	}
+	if (line === 'export {};') {
+		continue;
+	}
+	line = line.replace(/    /g, '\t');
+	line = line.replace(/declare /g, '');
+	if (line.length > 0) {
+		line = `\t${line}`;
+		result.push(line);
+	}
+}
+result.push(`}`);
+result.push(``);
+
+fs.writeFileSync(DST_PATH, result.join('\n'));

monaco-typescript/scripts/importTypescript.js

@@ -0,0 +1,247 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const fs = require('fs');
+const child_process = require('child_process');
+
+const generatedNote = `//
+// **NOTE**: Do not edit directly! This file is generated using \`npm run import-typescript\`
+//
+`;
+
+const TYPESCRIPT_LIB_SOURCE = path.join(__dirname, '../node_modules/typescript/lib');
+const TYPESCRIPT_LIB_DESTINATION = path.join(__dirname, '../src/lib');
+
+(function () {
+	try {
+		fs.statSync(TYPESCRIPT_LIB_DESTINATION);
+	} catch (err) {
+		fs.mkdirSync(TYPESCRIPT_LIB_DESTINATION);
+	}
+	importLibs();
+
+	const npmLsOutput = JSON.parse(
+		child_process.execSync('npm ls typescript --depth=0 --json=true').toString()
+	);
+	const typeScriptDependencyVersion = npmLsOutput.dependencies.typescript.version;
+
+	fs.writeFileSync(
+		path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServicesMetadata.ts'),
+		`${generatedNote}
+export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
+	);
+
+	let tsServices = fs
+		.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js'))
+		.toString();
+
+	// Ensure we never run into the node system...
+	// (this also removes require calls that trick webpack into shimming those modules...)
+	tsServices = tsServices.replace(
+		/\n    ts\.sys =([^]*)\n    \}\)\(\);/m,
+		`\n    // MONACOCHANGE\n    ts.sys = undefined;\n    // END MONACOCHANGE`
+	);
+
+	// Eliminate more require() calls...
+	tsServices = tsServices.replace(
+		/^( +)etwModule = require\(.*$/m,
+		'$1// MONACOCHANGE\n$1etwModule = undefined;\n$1// END MONACOCHANGE'
+	);
+	tsServices = tsServices.replace(
+		/^( +)var result = ts\.sys\.require\(.*$/m,
+		'$1// MONACOCHANGE\n$1var result = undefined;\n$1// END MONACOCHANGE'
+	);
+	tsServices = tsServices.replace(
+		/^( +)fs = require\("fs"\);$/m,
+		'$1// MONACOCHANGE\n$1fs = undefined;\n$1// END MONACOCHANGE'
+	);
+	tsServices = tsServices.replace(
+		/^( +)debugger;$/m,
+		'$1// MONACOCHANGE\n$1// debugger;\n$1// END MONACOCHANGE'
+	);
+	tsServices = tsServices.replace(
+		/= require\("perf_hooks"\)/m,
+		'/* MONACOCHANGE */= {}/* END MONACOCHANGE */'
+	);
+
+	// Flag any new require calls (outside comments) so they can be corrected preemptively.
+	// To avoid missing cases (or using an even more complex regex), temporarily remove comments
+	// about require() and then check for lines actually calling require().
+	// \/[*/] matches the start of a comment (single or multi-line).
+	// ^\s+\*[^/] matches (presumably) a later line of a multi-line comment.
+	const tsServicesNoCommentedRequire = tsServices.replace(
+		/(\/[*/]|^\s+\*[^/]).*\brequire\(.*/gm,
+		''
+	);
+	const linesWithRequire = tsServicesNoCommentedRequire.match(/^.*?\brequire\(.*$/gm);
+
+	// Allow error messages to include references to require() in their strings
+	const runtimeRequires =
+		linesWithRequire &&
+		linesWithRequire.filter((l) => !l.includes(': diag(') && !l.includes('ts.DiagnosticCategory'));
+
+	if (runtimeRequires && runtimeRequires.length && linesWithRequire) {
+		console.error(
+			'Found new require() calls on the following lines. These should be removed to avoid breaking webpack builds.\n'
+		);
+		console.error(
+			runtimeRequires.map((r) => `${r} (${tsServicesNoCommentedRequire.indexOf(r)})`).join('\n')
+		);
+		process.exit(1);
+	}
+
+	const tsServices_amd =
+		generatedNote +
+		tsServices +
+		`
+// MONACOCHANGE
+// Defining the entire module name because r.js has an issue and cannot bundle this file
+// correctly with an anonymous define call
+define("vs/language/typescript/lib/typescriptServices", [], function() { return ts; });
+// END MONACOCHANGE
+`;
+	fs.writeFileSync(
+		path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServices-amd.js'),
+		stripSourceMaps(tsServices_amd)
+	);
+
+	const tsServices_esm =
+		generatedNote +
+		tsServices +
+		`
+// MONACOCHANGE
+export var createClassifier = ts.createClassifier;
+export var createLanguageService = ts.createLanguageService;
+export var displayPartsToString = ts.displayPartsToString;
+export var EndOfLineState = ts.EndOfLineState;
+export var flattenDiagnosticMessageText = ts.flattenDiagnosticMessageText;
+export var IndentStyle = ts.IndentStyle;
+export var ScriptKind = ts.ScriptKind;
+export var ScriptTarget = ts.ScriptTarget;
+export var TokenClass = ts.TokenClass;
+// END MONACOCHANGE
+`;
+	fs.writeFileSync(
+		path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServices.js'),
+		stripSourceMaps(tsServices_esm)
+	);
+
+	let dtsServices = fs
+		.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.d.ts'))
+		.toString();
+	dtsServices += `
+// MONACOCHANGE
+export = ts;
+// END MONACOCHANGE
+`;
+	fs.writeFileSync(
+		path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServices.d.ts'),
+		generatedNote + dtsServices
+	);
+})();
+
+function importLibs() {
+	function readLibFile(name) {
+		const srcPath = path.join(TYPESCRIPT_LIB_SOURCE, name);
+		return fs.readFileSync(srcPath).toString();
+	}
+
+	let strLibResult = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+${generatedNote}
+
+/** Contains all the lib files */
+export const libFileMap: Record<string, string> = {}
+`;
+	let strIndexResult = `/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+${generatedNote}
+
+/** Contains all the lib files */
+export const libFileSet: Record<string, boolean> = {}
+`;
+	const dtsFiles = fs.readdirSync(TYPESCRIPT_LIB_SOURCE).filter((f) => f.includes('lib.'));
+	while (dtsFiles.length > 0) {
+		const name = dtsFiles.shift();
+		const output = readLibFile(name).replace(/\r\n/g, '\n');
+		strLibResult += `libFileMap['${name}'] = "${escapeText(output)}";\n`;
+		strIndexResult += `libFileSet['${name}'] = true;\n`;
+	}
+
+	fs.writeFileSync(path.join(TYPESCRIPT_LIB_DESTINATION, 'lib.ts'), strLibResult);
+	fs.writeFileSync(path.join(TYPESCRIPT_LIB_DESTINATION, 'lib.index.ts'), strIndexResult);
+}
+
+/**
+ * Escape text such that it can be used in a javascript string enclosed by double quotes (")
+ */
+function escapeText(text) {
+	// See http://www.javascriptkit.com/jsref/escapesequence.shtml
+	const _backspace = '\b'.charCodeAt(0);
+	const _formFeed = '\f'.charCodeAt(0);
+	const _newLine = '\n'.charCodeAt(0);
+	const _nullChar = 0;
+	const _carriageReturn = '\r'.charCodeAt(0);
+	const _tab = '\t'.charCodeAt(0);
+	const _verticalTab = '\v'.charCodeAt(0);
+	const _backslash = '\\'.charCodeAt(0);
+	const _doubleQuote = '"'.charCodeAt(0);
+
+	const len = text.length;
+	let startPos = 0;
+	let chrCode;
+	let replaceWith = null;
+	let resultPieces = [];
+
+	for (let i = 0; i < len; i++) {
+		chrCode = text.charCodeAt(i);
+		switch (chrCode) {
+			case _backspace:
+				replaceWith = '\\b';
+				break;
+			case _formFeed:
+				replaceWith = '\\f';
+				break;
+			case _newLine:
+				replaceWith = '\\n';
+				break;
+			case _nullChar:
+				replaceWith = '\\0';
+				break;
+			case _carriageReturn:
+				replaceWith = '\\r';
+				break;
+			case _tab:
+				replaceWith = '\\t';
+				break;
+			case _verticalTab:
+				replaceWith = '\\v';
+				break;
+			case _backslash:
+				replaceWith = '\\\\';
+				break;
+			case _doubleQuote:
+				replaceWith = '\\"';
+				break;
+		}
+		if (replaceWith !== null) {
+			resultPieces.push(text.substring(startPos, i));
+			resultPieces.push(replaceWith);
+			startPos = i + 1;
+			replaceWith = null;
+		}
+	}
+	resultPieces.push(text.substring(startPos, len));
+	return resultPieces.join('');
+}
+
+function stripSourceMaps(str) {
+	return str.replace(/\/\/# sourceMappingURL[^\n]+/gm, '');
+}

monaco-typescript/scripts/release.js

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const helpers = require('monaco-plugin-helpers');
+
+const REPO_ROOT = path.join(__dirname, '../');
+
+helpers.packageESM({
+	repoRoot: REPO_ROOT,
+	esmSource: 'out/esm',
+	esmDestination: 'release/esm',
+	entryPoints: ['monaco.contribution.js', 'tsMode.js', 'ts.worker.js'],
+	resolveSkip: ['monaco-editor-core']
+});