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

update deps & TS version

Browse source
This commit is contained in:
Alex Dima 2020-02-10 23:25:04 +01:00
parent e623bb9f76
commit a9bc75441d
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
5 changed files with 117 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

38
package-lock.json generated
View file

@ -10,16 +10,22 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"dev": true "dev": true
}, },
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.19.0", "version": "0.20.0",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.19.0.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz",
"integrity": "sha512-wD60zpYDhsuJbzzLQigAteK2cA5fkuaDn+4c7NLwm/526OX5eL6MMvLhfvRgrDvLO00SYhFf6vz1y1C8M1hTpQ==", "integrity": "sha512-4mdmfEejTvRZzrEIn70jqqNl3g15vnkRdTkJ8uMK4jiljntlwhiSc5vknZOLt1QM8za16C3tDrSl2mTL9ma2Sg==",
"dev": true "dev": true
}, },
"monaco-languages": { "monaco-languages": {
"version": "1.8.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.8.0.tgz", "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.10.0.tgz",
"integrity": "sha512-vC/lqNgSslQT3vSlNOpyT34ELK0eoNbA/rHUvTUjQemIiR1GpRMKhuwB21BqzWk+0MjZuJydGSCQMCebBge7jg==", "integrity": "sha512-ARAws17Xh0K4WsZYkJY6CqHn9EYdYN8CjzK6w/jgXIwU0owzCdUWxzu+FNJ/LeDLcKxL/YK3phcwGFj9IqX2yw==",
"dev": true "dev": true
}, },
"monaco-plugin-helpers": { "monaco-plugin-helpers": {
@ -62,28 +68,20 @@
} }
}, },
"terser": { "terser": {
"version": "4.4.3", "version": "4.6.3",
"resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
"integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==", "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
"source-map": "~0.6.1", "source-map": "~0.6.1",
"source-map-support": "~0.5.12" "source-map-support": "~0.5.12"
},
"dependencies": {
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
}
} }
}, },
"typescript": { "typescript": {
"version": "3.7.3", "version": "3.7.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
"integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==", "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
"dev": true "dev": true
} }
} }

8
package.json
View file

@ -20,11 +20,11 @@
"url": "https://github.com/Microsoft/monaco-typescript/issues" "url": "https://github.com/Microsoft/monaco-typescript/issues"
}, },
"devDependencies": { "devDependencies": {
"monaco-editor-core": "^0.19.0", "monaco-editor-core": "^0.20.0",
"monaco-languages": "^1.8.0", "monaco-languages": "^1.10.0",
"monaco-plugin-helpers": "^1.0.2", "monaco-plugin-helpers": "^1.0.2",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"terser": "^4.4.3", "terser": "^4.6.3",
"typescript": "^3.7.3" "typescript": "^3.7.5"
} }
} }

63
src/lib/typescriptServices-amd.js
View file

@ -233,7 +233,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too. // If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "3.7"; ts.versionMajorMinor = "3.7";
/** The version of the TypeScript compiler release */ /** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".3"; ts.version = ts.versionMajorMinor + ".5";
})(ts || (ts = {})); })(ts || (ts = {}));
(function (ts) { (function (ts) {
/* @internal */ /* @internal */
@ -10760,6 +10760,10 @@ var ts;
return !!node && !!(node.flags & 33554432 /* JsonFile */); return !!node && !!(node.flags & 33554432 /* JsonFile */);
} }
ts.isInJsonFile = isInJsonFile; ts.isInJsonFile = isInJsonFile;
function isSourceFileNotJson(file) {
return !isJsonSourceFile(file);
}
ts.isSourceFileNotJson = isSourceFileNotJson;
function isInJSDoc(node) { function isInJSDoc(node) {
return !!node && !!(node.flags & 4194304 /* JSDoc */); return !!node && !!(node.flags & 4194304 /* JSDoc */);
} }
@ -30798,7 +30802,10 @@ var ts;
break; break;
case 288 /* SourceFile */: case 288 /* SourceFile */:
// this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
if (thisContainer.commonJsModuleIndicator) { if (ts.hasDynamicName(node)) {
break;
}
else if (thisContainer.commonJsModuleIndicator) {
declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */); declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
} }
else { else {
@ -59863,7 +59870,9 @@ var ts;
if (node.kind === 241 /* VariableDeclaration */ || node.kind === 190 /* BindingElement */) { if (node.kind === 241 /* VariableDeclaration */ || node.kind === 190 /* BindingElement */) {
checkVarDeclaredNamesNotShadowed(node); checkVarDeclaredNamesNotShadowed(node);
} }
// eslint-disable-next-line
checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
// eslint-disable-next-line
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
} }
} }
@ -64522,9 +64531,11 @@ var ts;
node.kind === 200 /* FunctionExpression */ || node.kind === 200 /* FunctionExpression */ ||
node.kind === 160 /* MethodDeclaration */); node.kind === 160 /* MethodDeclaration */);
if (node.flags & 8388608 /* Ambient */) { if (node.flags & 8388608 /* Ambient */) {
// eslint-disable-next-line
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context); return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
} }
if (!node.body) { if (!node.body) {
// eslint-disable-next-line
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator); return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
} }
} }
@ -87152,8 +87163,11 @@ var ts;
var ts; var ts;
(function (ts) { (function (ts) {
function getDeclarationDiagnostics(host, resolver, file) { function getDeclarationDiagnostics(host, resolver, file) {
if (file && ts.isJsonSourceFile(file)) {
return []; // No declaration diagnostics for json for now
}
var compilerOptions = host.getCompilerOptions(); var compilerOptions = host.getCompilerOptions();
var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : host.getSourceFiles(), [transformDeclarations], /*allowDtsFiles*/ false); var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], /*allowDtsFiles*/ false);
return result.diagnostics; return result.diagnostics;
} }
ts.getDeclarationDiagnostics = getDeclarationDiagnostics; ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
@ -88900,12 +88914,13 @@ var ts;
} }
else { else {
var ownOutputFilePath = ts.getOwnEmitOutputFilePath(sourceFile.fileName, host, getOutputExtension(sourceFile, options)); var ownOutputFilePath = ts.getOwnEmitOutputFilePath(sourceFile.fileName, host, getOutputExtension(sourceFile, options));
var isJsonFile = ts.isJsonSourceFile(sourceFile);
// If json file emits to the same location skip writing it, if emitDeclarationOnly skip writing it // If json file emits to the same location skip writing it, if emitDeclarationOnly skip writing it
var isJsonEmittedToSameLocation = ts.isJsonSourceFile(sourceFile) && var isJsonEmittedToSameLocation = isJsonFile &&
ts.comparePaths(sourceFile.fileName, ownOutputFilePath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */; ts.comparePaths(sourceFile.fileName, ownOutputFilePath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
var jsFilePath = options.emitDeclarationOnly || isJsonEmittedToSameLocation ? undefined : ownOutputFilePath; var jsFilePath = options.emitDeclarationOnly || isJsonEmittedToSameLocation ? undefined : ownOutputFilePath;
var sourceMapFilePath = !jsFilePath || ts.isJsonSourceFile(sourceFile) ? undefined : getSourceMapFilePath(jsFilePath, options); var sourceMapFilePath = !jsFilePath || ts.isJsonSourceFile(sourceFile) ? undefined : getSourceMapFilePath(jsFilePath, options);
var declarationFilePath = (forceDtsPaths || ts.getEmitDeclarations(options)) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined; var declarationFilePath = (forceDtsPaths || (ts.getEmitDeclarations(options) && !isJsonFile)) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined;
var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined; var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: undefined }; return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: undefined };
} }
@ -88946,7 +88961,7 @@ var ts;
} }
/* @internal */ /* @internal */
function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) { function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)); ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */));
return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */); return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
} }
ts.getOutputDeclarationFileName = getOutputDeclarationFileName; ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
@ -89175,12 +89190,13 @@ var ts;
return; return;
} }
var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles; var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
var filesForEmit = forceDtsEmit ? sourceFiles : ts.filter(sourceFiles, ts.isSourceFileNotJson);
// Setup and perform the transformation to retrieve declarations from the input files // Setup and perform the transformation to retrieve declarations from the input files
var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(sourceFiles, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : sourceFiles; var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit;
if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) { if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
// Checker wont collect the linked aliases since thats only done when declaration is enabled. // Checker wont collect the linked aliases since thats only done when declaration is enabled.
// Do that here when emitting only dts files // Do that here when emitting only dts files
sourceFiles.forEach(collectLinkedAliases); filesForEmit.forEach(collectLinkedAliases);
} }
var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false); var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
if (ts.length(declarationTransform.diagnostics)) { if (ts.length(declarationTransform.diagnostics)) {
@ -94436,7 +94452,7 @@ var ts;
else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) { else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) { for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
var fileName = _d[_c]; var fileName = _d[_c];
if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined); processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
} }
} }
@ -95816,8 +95832,8 @@ var ts;
return referencedProject && getProjectReferenceOutputName(referencedProject, fileName); return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
} }
function getProjectReferenceRedirectProject(fileName) { function getProjectReferenceRedirectProject(fileName) {
// Ignore dts // Ignore dts or any json files
if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || ts.fileExtensionIs(fileName, ".json" /* Json */)) {
return undefined; return undefined;
} }
// If this file is produced by a referenced project, we need to rewrite it to // If this file is produced by a referenced project, we need to rewrite it to
@ -95871,7 +95887,7 @@ var ts;
} }
else { else {
ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) { ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames()); var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames());
mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName); mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
} }
@ -98831,7 +98847,7 @@ var ts;
var match = str.match(/\//g); var match = str.match(/\//g);
return match ? match.length : 0; return match ? match.length : 0;
} }
function comparePathsByNumberOfDirectrorySeparators(a, b) { function comparePathsByNumberOfDirectorySeparators(a, b) {
return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b)); return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
} }
/** /**
@ -98878,13 +98894,28 @@ var ts;
}); });
if (pathsInDirectory) { if (pathsInDirectory) {
if (pathsInDirectory.length > 1) { if (pathsInDirectory.length > 1) {
pathsInDirectory.sort(comparePathsByNumberOfDirectrorySeparators); pathsInDirectory.sort(comparePathsByNumberOfDirectorySeparators);
} }
sortedPaths.push.apply(sortedPaths, pathsInDirectory); sortedPaths.push.apply(sortedPaths, pathsInDirectory);
} }
var newDirectory = ts.getDirectoryPath(directory);
if (newDirectory === directory)
return out_directory_1 = directory, "break";
directory = newDirectory;
out_directory_1 = directory;
}; };
for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0; directory = ts.getDirectoryPath(directory)) { var out_directory_1;
_loop_17(directory); for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
var state_7 = _loop_17(directory);
directory = out_directory_1;
if (state_7 === "break")
break;
}
if (allFileNames.size) {
var remainingPaths = ts.arrayFrom(allFileNames.values());
if (remainingPaths.length > 1)
remainingPaths.sort(comparePathsByNumberOfDirectorySeparators);
sortedPaths.push.apply(sortedPaths, remainingPaths);
} }
return sortedPaths; return sortedPaths;
} }

63
src/lib/typescriptServices.js
View file

@ -233,7 +233,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too. // If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "3.7"; ts.versionMajorMinor = "3.7";
/** The version of the TypeScript compiler release */ /** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".3"; ts.version = ts.versionMajorMinor + ".5";
})(ts || (ts = {})); })(ts || (ts = {}));
(function (ts) { (function (ts) {
/* @internal */ /* @internal */
@ -10760,6 +10760,10 @@ var ts;
return !!node && !!(node.flags & 33554432 /* JsonFile */); return !!node && !!(node.flags & 33554432 /* JsonFile */);
} }
ts.isInJsonFile = isInJsonFile; ts.isInJsonFile = isInJsonFile;
function isSourceFileNotJson(file) {
return !isJsonSourceFile(file);
}
ts.isSourceFileNotJson = isSourceFileNotJson;
function isInJSDoc(node) { function isInJSDoc(node) {
return !!node && !!(node.flags & 4194304 /* JSDoc */); return !!node && !!(node.flags & 4194304 /* JSDoc */);
} }
@ -30798,7 +30802,10 @@ var ts;
break; break;
case 288 /* SourceFile */: case 288 /* SourceFile */:
// this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
if (thisContainer.commonJsModuleIndicator) { if (ts.hasDynamicName(node)) {
break;
}
else if (thisContainer.commonJsModuleIndicator) {
declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */); declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
} }
else { else {
@ -59863,7 +59870,9 @@ var ts;
if (node.kind === 241 /* VariableDeclaration */ || node.kind === 190 /* BindingElement */) { if (node.kind === 241 /* VariableDeclaration */ || node.kind === 190 /* BindingElement */) {
checkVarDeclaredNamesNotShadowed(node); checkVarDeclaredNamesNotShadowed(node);
} }
// eslint-disable-next-line
checkCollisionWithRequireExportsInGeneratedCode(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
// eslint-disable-next-line
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
} }
} }
@ -64522,9 +64531,11 @@ var ts;
node.kind === 200 /* FunctionExpression */ || node.kind === 200 /* FunctionExpression */ ||
node.kind === 160 /* MethodDeclaration */); node.kind === 160 /* MethodDeclaration */);
if (node.flags & 8388608 /* Ambient */) { if (node.flags & 8388608 /* Ambient */) {
// eslint-disable-next-line
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context); return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
} }
if (!node.body) { if (!node.body) {
// eslint-disable-next-line
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator); return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
} }
} }
@ -87152,8 +87163,11 @@ var ts;
var ts; var ts;
(function (ts) { (function (ts) {
function getDeclarationDiagnostics(host, resolver, file) { function getDeclarationDiagnostics(host, resolver, file) {
if (file && ts.isJsonSourceFile(file)) {
return []; // No declaration diagnostics for json for now
}
var compilerOptions = host.getCompilerOptions(); var compilerOptions = host.getCompilerOptions();
var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : host.getSourceFiles(), [transformDeclarations], /*allowDtsFiles*/ false); var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], /*allowDtsFiles*/ false);
return result.diagnostics; return result.diagnostics;
} }
ts.getDeclarationDiagnostics = getDeclarationDiagnostics; ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
@ -88900,12 +88914,13 @@ var ts;
} }
else { else {
var ownOutputFilePath = ts.getOwnEmitOutputFilePath(sourceFile.fileName, host, getOutputExtension(sourceFile, options)); var ownOutputFilePath = ts.getOwnEmitOutputFilePath(sourceFile.fileName, host, getOutputExtension(sourceFile, options));
var isJsonFile = ts.isJsonSourceFile(sourceFile);
// If json file emits to the same location skip writing it, if emitDeclarationOnly skip writing it // If json file emits to the same location skip writing it, if emitDeclarationOnly skip writing it
var isJsonEmittedToSameLocation = ts.isJsonSourceFile(sourceFile) && var isJsonEmittedToSameLocation = isJsonFile &&
ts.comparePaths(sourceFile.fileName, ownOutputFilePath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */; ts.comparePaths(sourceFile.fileName, ownOutputFilePath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
var jsFilePath = options.emitDeclarationOnly || isJsonEmittedToSameLocation ? undefined : ownOutputFilePath; var jsFilePath = options.emitDeclarationOnly || isJsonEmittedToSameLocation ? undefined : ownOutputFilePath;
var sourceMapFilePath = !jsFilePath || ts.isJsonSourceFile(sourceFile) ? undefined : getSourceMapFilePath(jsFilePath, options); var sourceMapFilePath = !jsFilePath || ts.isJsonSourceFile(sourceFile) ? undefined : getSourceMapFilePath(jsFilePath, options);
var declarationFilePath = (forceDtsPaths || ts.getEmitDeclarations(options)) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined; var declarationFilePath = (forceDtsPaths || (ts.getEmitDeclarations(options) && !isJsonFile)) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined;
var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined; var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: undefined }; return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: undefined };
} }
@ -88946,7 +88961,7 @@ var ts;
} }
/* @internal */ /* @internal */
function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) { function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)); ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */));
return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */); return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
} }
ts.getOutputDeclarationFileName = getOutputDeclarationFileName; ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
@ -89175,12 +89190,13 @@ var ts;
return; return;
} }
var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles; var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
var filesForEmit = forceDtsEmit ? sourceFiles : ts.filter(sourceFiles, ts.isSourceFileNotJson);
// Setup and perform the transformation to retrieve declarations from the input files // Setup and perform the transformation to retrieve declarations from the input files
var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(sourceFiles, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : sourceFiles; var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit;
if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) { if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
// Checker wont collect the linked aliases since thats only done when declaration is enabled. // Checker wont collect the linked aliases since thats only done when declaration is enabled.
// Do that here when emitting only dts files // Do that here when emitting only dts files
sourceFiles.forEach(collectLinkedAliases); filesForEmit.forEach(collectLinkedAliases);
} }
var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false); var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
if (ts.length(declarationTransform.diagnostics)) { if (ts.length(declarationTransform.diagnostics)) {
@ -94436,7 +94452,7 @@ var ts;
else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) { else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) { for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
var fileName = _d[_c]; var fileName = _d[_c];
if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined); processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
} }
} }
@ -95816,8 +95832,8 @@ var ts;
return referencedProject && getProjectReferenceOutputName(referencedProject, fileName); return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
} }
function getProjectReferenceRedirectProject(fileName) { function getProjectReferenceRedirectProject(fileName) {
// Ignore dts // Ignore dts or any json files
if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || ts.fileExtensionIs(fileName, ".json" /* Json */)) {
return undefined; return undefined;
} }
// If this file is produced by a referenced project, we need to rewrite it to // If this file is produced by a referenced project, we need to rewrite it to
@ -95871,7 +95887,7 @@ var ts;
} }
else { else {
ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) { ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) { if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames()); var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, host.useCaseSensitiveFileNames());
mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName); mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
} }
@ -98831,7 +98847,7 @@ var ts;
var match = str.match(/\//g); var match = str.match(/\//g);
return match ? match.length : 0; return match ? match.length : 0;
} }
function comparePathsByNumberOfDirectrorySeparators(a, b) { function comparePathsByNumberOfDirectorySeparators(a, b) {
return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b)); return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
} }
/** /**
@ -98878,13 +98894,28 @@ var ts;
}); });
if (pathsInDirectory) { if (pathsInDirectory) {
if (pathsInDirectory.length > 1) { if (pathsInDirectory.length > 1) {
pathsInDirectory.sort(comparePathsByNumberOfDirectrorySeparators); pathsInDirectory.sort(comparePathsByNumberOfDirectorySeparators);
} }
sortedPaths.push.apply(sortedPaths, pathsInDirectory); sortedPaths.push.apply(sortedPaths, pathsInDirectory);
} }
var newDirectory = ts.getDirectoryPath(directory);
if (newDirectory === directory)
return out_directory_1 = directory, "break";
directory = newDirectory;
out_directory_1 = directory;
}; };
for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0; directory = ts.getDirectoryPath(directory)) { var out_directory_1;
_loop_17(directory); for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
var state_7 = _loop_17(directory);
directory = out_directory_1;
if (state_7 === "break")
break;
}
if (allFileNames.size) {
var remainingPaths = ts.arrayFrom(allFileNames.values());
if (remainingPaths.length > 1)
remainingPaths.sort(comparePathsByNumberOfDirectorySeparators);
sortedPaths.push.apply(sortedPaths, remainingPaths);
} }
return sortedPaths; return sortedPaths;
} }

2
src/lib/typescriptServicesMetadata.ts
View file

@ -1 +1 @@
export const typescriptVersion = "3.7.3"; export const typescriptVersion = "3.7.5";