Skip to content

Commit

Permalink
Bump version to 4.0.2 and LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
@typescript-bot
typescript-bot committed Aug 15, 2020
1 parent 5f5dac0 commit c9c6cd2
Show file tree
Hide file tree
Showing 8 changed files with 472 additions and 412 deletions.
140 changes: 73 additions & 67 deletions lib/tsc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
var ts;
(function (ts) {
ts.versionMajorMinor = "4.0";
ts.version = ts.versionMajorMinor + ".1-rc";
ts.version = "4.0.2";
var NativeCollections;
(function (NativeCollections) {
function tryGetNativeMap() {
Expand Down Expand Up @@ -29791,51 +29791,46 @@ var ts;
configFileSpecs: spec
};
function getFileNames() {
var filesSpecs;
if (ts.hasProperty(raw, "files") && !isNullOrUndefined(raw.files)) {
if (ts.isArray(raw.files)) {
filesSpecs = raw.files;
var hasReferences = ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references);
var hasZeroOrNoReferences = !hasReferences || raw.references.length === 0;
var hasExtends = ts.hasProperty(raw, "extends");
if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) {
if (sourceFile) {
var fileName = configFileName || "tsconfig.json";
var diagnosticMessage = ts.Diagnostics.The_files_list_in_config_file_0_is_empty;
var nodeValue = ts.firstDefined(ts.getTsConfigPropArray(sourceFile, "files"), function (property) { return property.initializer; });
var error = nodeValue
? ts.createDiagnosticForNodeInSourceFile(sourceFile, nodeValue, diagnosticMessage, fileName)
: ts.createCompilerDiagnostic(diagnosticMessage, fileName);
errors.push(error);
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json");
}
var referencesOfRaw = getPropFromRaw("references", function (element) { return typeof element === "object"; }, "object");
if (ts.isArray(referencesOfRaw)) {
for (var _i = 0, referencesOfRaw_1 = referencesOfRaw; _i < referencesOfRaw_1.length; _i++) {
var ref = referencesOfRaw_1[_i];
if (typeof ref.path !== "string") {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "reference.path", "string");
}
else {
(projectReferences || (projectReferences = [])).push({
path: ts.getNormalizedAbsolutePath(ref.path, basePath),
originalPath: ref.path,
prepend: ref.prepend,
circular: ref.circular
});
}
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array");
}
}
var includeSpecs;
if (ts.hasProperty(raw, "include") && !isNullOrUndefined(raw.include)) {
if (ts.isArray(raw.include)) {
includeSpecs = raw.include;
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array");
}
}
var excludeSpecs;
if (ts.hasProperty(raw, "exclude") && !isNullOrUndefined(raw.exclude)) {
if (ts.isArray(raw.exclude)) {
excludeSpecs = raw.exclude;
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array");
var filesSpecs = toPropValue(getSpecsFromRaw("files"));
if (filesSpecs) {
var hasZeroOrNoReferences = referencesOfRaw === "no-prop" || ts.isArray(referencesOfRaw) && referencesOfRaw.length === 0;
var hasExtends = ts.hasProperty(raw, "extends");
if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) {
if (sourceFile) {
var fileName = configFileName || "tsconfig.json";
var diagnosticMessage = ts.Diagnostics.The_files_list_in_config_file_0_is_empty;
var nodeValue = ts.firstDefined(ts.getTsConfigPropArray(sourceFile, "files"), function (property) { return property.initializer; });
var error = nodeValue
? ts.createDiagnosticForNodeInSourceFile(sourceFile, nodeValue, diagnosticMessage, fileName)
: ts.createCompilerDiagnostic(diagnosticMessage, fileName);
errors.push(error);
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json");
}
}
}
else if (raw.compilerOptions) {
var includeSpecs = toPropValue(getSpecsFromRaw("include"));
var excludeOfRaw = getSpecsFromRaw("exclude");
var excludeSpecs = toPropValue(excludeOfRaw);
if (excludeOfRaw === "no-prop" && raw.compilerOptions) {
var outDir = raw.compilerOptions.outDir;
var declarationDir = raw.compilerOptions.declarationDir;
if (outDir || declarationDir) {
Expand All @@ -29849,28 +29844,29 @@ var ts;
if (shouldReportNoInputFiles(result, canJsonReportNoInputFiles(raw), resolutionStack)) {
errors.push(getErrorForNoInputFiles(result.spec, configFileName));
}
if (ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references)) {
if (ts.isArray(raw.references)) {
for (var _i = 0, _a = raw.references; _i < _a.length; _i++) {
var ref = _a[_i];
if (typeof ref.path !== "string") {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "reference.path", "string");
}
else {
(projectReferences || (projectReferences = [])).push({
path: ts.getNormalizedAbsolutePath(ref.path, basePath),
originalPath: ref.path,
prepend: ref.prepend,
circular: ref.circular
});
}
return result;
}
function toPropValue(specResult) {
return ts.isArray(specResult) ? specResult : undefined;
}
function getSpecsFromRaw(prop) {
return getPropFromRaw(prop, ts.isString, "string");
}
function getPropFromRaw(prop, validateElement, elementTypeName) {
if (ts.hasProperty(raw, prop) && !isNullOrUndefined(raw[prop])) {
if (ts.isArray(raw[prop])) {
var result = raw[prop];
if (!sourceFile && !ts.every(result, validateElement)) {
errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, elementTypeName));
}
return result;
}
else {
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "references", "Array");
createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, "Array");
return "not-array";
}
}
return result;
return "no-prop";
}
function createCompilerDiagnosticOnlyIfJson(message, arg0, arg1) {
if (!sourceFile) {
Expand Down Expand Up @@ -30216,7 +30212,15 @@ var ts;
validatedExcludeSpecs = validateSpecs(excludeSpecs, errors, true, jsonSourceFile, "exclude");
}
var wildcardDirectories = getWildcardDirectories(validatedIncludeSpecs, validatedExcludeSpecs, basePath, host.useCaseSensitiveFileNames);
var spec = { filesSpecs: filesSpecs, includeSpecs: includeSpecs, excludeSpecs: excludeSpecs, validatedIncludeSpecs: validatedIncludeSpecs, validatedExcludeSpecs: validatedExcludeSpecs, wildcardDirectories: wildcardDirectories };
var spec = {
filesSpecs: filesSpecs,
includeSpecs: includeSpecs,
excludeSpecs: excludeSpecs,
validatedFilesSpec: ts.filter(filesSpecs, ts.isString),
validatedIncludeSpecs: validatedIncludeSpecs,
validatedExcludeSpecs: validatedExcludeSpecs,
wildcardDirectories: wildcardDirectories
};
return getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions);
}
function getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions) {
Expand All @@ -30226,12 +30230,12 @@ var ts;
var literalFileMap = new ts.Map();
var wildcardFileMap = new ts.Map();
var wildCardJsonFileMap = new ts.Map();
var filesSpecs = spec.filesSpecs, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs, wildcardDirectories = spec.wildcardDirectories;
var validatedFilesSpec = spec.validatedFilesSpec, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs, wildcardDirectories = spec.wildcardDirectories;
var supportedExtensions = ts.getSupportedExtensions(options, extraFileExtensions);
var supportedExtensionsWithJsonIfResolveJsonModule = ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions);
if (filesSpecs) {
for (var _i = 0, filesSpecs_1 = filesSpecs; _i < filesSpecs_1.length; _i++) {
var fileName = filesSpecs_1[_i];
if (validatedFilesSpec) {
for (var _i = 0, validatedFilesSpec_1 = validatedFilesSpec; _i < validatedFilesSpec_1.length; _i++) {
var fileName = validatedFilesSpec_1[_i];
var file = ts.getNormalizedAbsolutePath(fileName, basePath);
literalFileMap.set(keyMapper(file), file);
}
Expand Down Expand Up @@ -30278,14 +30282,14 @@ var ts;
}
ts.getFileNamesFromConfigSpecs = getFileNamesFromConfigSpecs;
function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames, currentDirectory) {
var filesSpecs = spec.filesSpecs, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs;
var validatedFilesSpec = spec.validatedFilesSpec, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs;
if (!ts.length(validatedIncludeSpecs) || !ts.length(validatedExcludeSpecs))
return false;
basePath = ts.normalizePath(basePath);
var keyMapper = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
if (filesSpecs) {
for (var _i = 0, filesSpecs_2 = filesSpecs; _i < filesSpecs_2.length; _i++) {
var fileName = filesSpecs_2[_i];
if (validatedFilesSpec) {
for (var _i = 0, validatedFilesSpec_2 = validatedFilesSpec; _i < validatedFilesSpec_2.length; _i++) {
var fileName = validatedFilesSpec_2[_i];
if (keyMapper(ts.getNormalizedAbsolutePath(fileName, basePath)) === pathToCheck)
return false;
}
Expand All @@ -30301,6 +30305,8 @@ var ts;
ts.isExcludedFile = isExcludedFile;
function validateSpecs(specs, errors, allowTrailingRecursion, jsonSourceFile, specKey) {
return specs.filter(function (spec) {
if (!ts.isString(spec))
return false;
var diag = specToDiagnostic(spec, allowTrailingRecursion);
if (diag !== undefined) {
errors.push(createDiagnostic(diag, spec));
Expand Down

0 comments on commit c9c6cd2

Please sign in to comment.