Skip to content
This repository was archived by the owner on Nov 5, 2021. It is now read-only.

Let TypeScript resolve deps in lib files + allow external tools to extend the lib support #64

Merged
alexdima merged 15 commits into from
Aug 28, 2020
Merged

Let TypeScript resolve deps in lib files + allow external tools to extend the lib support #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1d6f5a0
Let TypeScript resolve deps in lib files + allow external tools to ex…
orta Jun 26, 2020
7a46ec2
Adds monaco models for the lib d.ts files
orta Jul 8, 2020
86f6d76
Use JavaScript for the language to get syntax highlighting, but not t…
orta Jul 8, 2020
0dbccde
Update src/workerManager.ts
Jul 9, 2020
ca76528
Revert the lib files coming through as monaco models
orta Jul 15, 2020
577f254
NOOP
orta Jul 15, 2020
a213b30
Create monaco lib models on demand
orta Jul 15, 2020
7b2cebe
Merge branch 'master' of https://github.com/microsoft/monaco-typescri…
orta Aug 6, 2020
fede24e
Add all lib dts files
orta Aug 6, 2020
151b807
run import, minor edits
alexdima Aug 28, 2020
a7f23c2
Simplify import typescript script
alexdima Aug 28, 2020
6a18fe6
Introduce LibFiles and adopt in DefinitionAdapter
alexdima Aug 28, 2020
ea9ddb0
Adopt LibFiles in ReferenceAdapter
alexdima Aug 28, 2020
1272e92
Do not ship mixed line endings for .d.ts files
alexdima Aug 28, 2020
5577502
Do not load lib.d.ts files on the UI thread
alexdima Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions scripts/importTypescript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ function importLibs() {
};

enqueue('');
enqueue('es6');
enqueue('es2015');
Copy link
Contributor Author

@orta orta Jun 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding the ES6 means that we can use the TS lib routing pattern 1-to-1, it adds 3-4 LOC (and then the copyright banner)


var result = [];
Expand All @@ -149,10 +150,9 @@ function importLibs() {
for (let i = 0; i < lines.length; i++) {
let m = lines[i].match(/\/\/\/\s*<reference\s*lib="([^"]+)"/);
if (m) {
flushOutputLines();
writeOutput(getVariableName(m[1]));
deps.push(getVariableName(m[1]));
enqueue(m[1]);
outputLines.push(lines[i]);
continue;
}
outputLines.push(lines[i]);
Expand All @@ -161,6 +161,7 @@ function importLibs() {

result.push({
name: getVariableName(name),
filepath: getFileName(name),
deps: deps,
output: output
});
Expand All @@ -170,14 +171,19 @@ function importLibs() {
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
${generatedNote}`;
${generatedNote}

/** Contains all the lib files */
export const libFileMap: Record<string, string> = {}
`
;
// Do a topological sort
while (result.length > 0) {
for (let i = result.length - 1; i >= 0; i--) {
if (result[i].deps.length === 0) {
// emit this node
strResult += `\nexport const ${result[i].name}: string = ${result[i].output};\n`;

strResult += `\libFileMap['${result[i].filepath}'] = ${result[i].name};\n`;
// mark dep as resolved
for (let j = 0; j < result.length; j++) {
for (let k = 0; k < result[j].deps.length; k++) {
Expand All @@ -195,14 +201,6 @@ ${generatedNote}`;
}
}

strResult += `
/** This is the DTS which is used when the target is ES6 or below */
export const lib_es5_bundled_dts = lib_dts;

/** This is the DTS which is used by default in monaco-typescript, and when the target is 2015 or above */
export const lib_es2015_bundled_dts = lib_es2015_dts + "" + lib_dom_dts + "" + lib_webworker_importscripts_dts + "" + lib_scripthost_dts + "";
`

var dstPath = path.join(TYPESCRIPT_LIB_DESTINATION, 'lib.ts');
fs.writeFileSync(dstPath, strResult);
}
Expand Down
Loading