Skip to content

Commit

Permalink
Update LKG.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanielRosenwasser
DanielRosenwasser committed Aug 13, 2019
1 parent dd1f20e commit 0652f34
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 6 deletions.
8 changes: 7 additions & 1 deletion lib/tsc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68828,6 +68828,11 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
fileName = fileName.substring(2);
Expand Down Expand Up @@ -70620,6 +70625,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost, undefined, ts.getTransformers(config.options, customTransformers));
return outputFiles;
Expand Down Expand Up @@ -75500,7 +75506,7 @@ var ts;
if (ts.contains(missingFilePaths, path))
return false;
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down
12 changes: 11 additions & 1 deletion lib/tsserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84562,6 +84562,15 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(),
/*preferences*/ undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
// If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
// via a non-relative name, emit a type reference directive to that non-relative name, rather than
// a relative path to the declaration file
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName,
/*isAbsolutePathAnUrl*/ false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
Expand Down Expand Up @@ -86614,6 +86623,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost,
/*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
Expand Down Expand Up @@ -92041,7 +92051,7 @@ var ts;
return false;
// Before falling back to the host
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down
12 changes: 11 additions & 1 deletion lib/tsserverlibrary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84561,6 +84561,15 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(),
/*preferences*/ undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
// If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
// via a non-relative name, emit a type reference directive to that non-relative name, rather than
// a relative path to the declaration file
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName,
/*isAbsolutePathAnUrl*/ false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
Expand Down Expand Up @@ -86613,6 +86622,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost,
/*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
Expand Down Expand Up @@ -92040,7 +92050,7 @@ var ts;
return false;
// Before falling back to the host
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down
12 changes: 11 additions & 1 deletion lib/typescript.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84550,6 +84550,15 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(),
/*preferences*/ undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
// If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
// via a non-relative name, emit a type reference directive to that non-relative name, rather than
// a relative path to the declaration file
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName,
/*isAbsolutePathAnUrl*/ false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
Expand Down Expand Up @@ -86602,6 +86611,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost,
/*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
Expand Down Expand Up @@ -92029,7 +92039,7 @@ var ts;
return false;
// Before falling back to the host
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down
12 changes: 11 additions & 1 deletion lib/typescriptServices.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84550,6 +84550,15 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(),
/*preferences*/ undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
// If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
// via a non-relative name, emit a type reference directive to that non-relative name, rather than
// a relative path to the declaration file
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName,
/*isAbsolutePathAnUrl*/ false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
Expand Down Expand Up @@ -86602,6 +86611,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost,
/*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
Expand Down Expand Up @@ -92029,7 +92039,7 @@ var ts;
return false;
// Before falling back to the host
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down
12 changes: 11 additions & 1 deletion lib/typingsInstaller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84551,6 +84551,15 @@ var ts;
declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
}
if (declFileName) {
var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(),
/*preferences*/ undefined, host.redirectTargetsMap);
if (!ts.pathIsRelative(specifier)) {
// If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
// via a non-relative name, emit a type reference directive to that non-relative name, rather than
// a relative path to the declaration file
recordTypeReferenceDirectivesIfNecessary([specifier]);
return;
}
var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName,
/*isAbsolutePathAnUrl*/ false);
if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
Expand Down Expand Up @@ -86603,6 +86612,7 @@ var ts;
useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
getProgramBuildInfo: ts.returnUndefined,
getSourceFileFromReference: ts.returnUndefined,
redirectTargetsMap: ts.createMultiMap()
};
emitFiles(ts.notImplementedResolver, emitHost,
/*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
Expand Down Expand Up @@ -92030,7 +92040,7 @@ var ts;
return false;
// Before falling back to the host
return host.fileExists(f);
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); } });
} }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
}
function emitBuildInfo(writeFileCallback) {
ts.Debug.assert(!options.out && !options.outFile);
Expand Down

0 comments on commit 0652f34

Please sign in to comment.