Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update LKG

Browse Source
This commit is contained in:
Mohamed Hegazy
2018-02-12 13:40:57 -08:00
parent 6c1c21fc10
commit 90e6f4984a
13 changed files with 2135 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/enu/diagnosticMessages.generated.json.lcg
+6
View File
@@ -3297,6 +3297,12 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Only_emit_d_ts_declaration_files_6014" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Only emit '.d.ts' declaration files.]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause.]]></Val>
lib/lib.d.ts
Vendored
+11 -4
View File
@@ -1012,12 +1012,12 @@ interface ReadonlyArray<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1107,6 +1107,13 @@ interface ReadonlyArray<T> {
readonly [n: number]: T;
}
interface ConcatArray<T> {
readonly length: number;
readonly [n: number]: T;
join(separator?: string): string;
slice(start?: number, end?: number): T[];
}
interface Array<T> {
/**
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -1133,12 +1140,12 @@ interface Array<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
lib/lib.es5.d.ts
Vendored
+11 -4
View File
@@ -1012,12 +1012,12 @@ interface ReadonlyArray<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1107,6 +1107,13 @@ interface ReadonlyArray<T> {
readonly [n: number]: T;
}
interface ConcatArray<T> {
readonly length: number;
readonly [n: number]: T;
join(separator?: string): string;
slice(start?: number, end?: number): T[];
}
interface Array<T> {
/**
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -1133,12 +1140,12 @@ interface Array<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
lib/lib.es6.d.ts
Vendored
+11 -4
View File
@@ -1012,12 +1012,12 @@ interface ReadonlyArray<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
@@ -1107,6 +1107,13 @@ interface ReadonlyArray<T> {
readonly [n: number]: T;
}
interface ConcatArray<T> {
readonly length: number;
readonly [n: number]: T;
join(separator?: string): string;
slice(start?: number, end?: number): T[];
}
interface Array<T> {
/**
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
@@ -1133,12 +1140,12 @@ interface Array<T> {
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T[] | ReadonlyArray<T>)[]): T[];
concat(...items: ConcatArray<T>[]): T[];
/**
* Combines two or more arrays.
* @param items Additional items to add to the end of array1.
*/
concat(...items: (T | T[] | ReadonlyArray<T>)[]): T[];
concat(...items: (T | ConcatArray<T>)[]): T[];
/**
* Adds all the elements of an array separated by the specified separator string.
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
lib/tsc.js
+322 -188
View File
@@ -132,7 +132,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.7";
ts.version = ts.versionMajorMinor + ".1";
ts.version = ts.versionMajorMinor + ".2";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
@@ -2537,7 +2537,7 @@ var ts;
}
ts.getNodeMajorVersion = getNodeMajorVersion;
ts.sys = (function () {
var utf8ByteOrderMark = "\u00EF\u00BB\u00BF";
var byteOrderMarkIndicator = "\uFEFF";
function getNodeSystem() {
var _fs = require("fs");
var _path = require("path");
@@ -2701,7 +2701,7 @@ var ts;
}
function writeFile(fileName, data, writeByteOrderMark) {
if (writeByteOrderMark) {
data = utf8ByteOrderMark + data;
data = byteOrderMarkIndicator + data;
}
var fd;
try {
@@ -2883,7 +2883,7 @@ var ts;
},
writeFile: function (path, data, writeByteOrderMark) {
if (writeByteOrderMark) {
data = utf8ByteOrderMark + data;
data = byteOrderMarkIndicator + data;
}
ChakraHost.writeFile(path, data);
},
@@ -3648,6 +3648,7 @@ var ts;
Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: diag(6011, ts.DiagnosticCategory.Message, "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", "Allow default imports from modules with no default export. This does not affect code emit, just typechecking."),
Skip_type_checking_of_declaration_files: diag(6012, ts.DiagnosticCategory.Message, "Skip_type_checking_of_declaration_files_6012", "Skip type checking of declaration files."),
Do_not_resolve_the_real_path_of_symlinks: diag(6013, ts.DiagnosticCategory.Message, "Do_not_resolve_the_real_path_of_symlinks_6013", "Do not resolve the real path of symlinks."),
Only_emit_d_ts_declaration_files: diag(6014, ts.DiagnosticCategory.Message, "Only_emit_d_ts_declaration_files_6014", "Only emit '.d.ts' declaration files."),
Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'."),
Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext: diag(6016, ts.DiagnosticCategory.Message, "Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext_6016", "Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'."),
Print_this_message: diag(6017, ts.DiagnosticCategory.Message, "Print_this_message_6017", "Print this message."),
@@ -20117,10 +20118,8 @@ var ts;
}
return _jsxNamespace;
}
function getEmitResolver(sourceFile, cancellationToken, ignoreDiagnostics) {
if (!ignoreDiagnostics) {
getDiagnostics(sourceFile, cancellationToken);
}
function getEmitResolver(sourceFile, cancellationToken) {
getDiagnostics(sourceFile, cancellationToken);
return emitResolver;
}
function error(location, message, arg0, arg1, arg2, arg3) {
@@ -21599,6 +21598,9 @@ var ts;
if (flags & 1) {
nodeFlags |= 512;
}
if (flags & 8) {
nodeFlags |= 16384;
}
var builder = flags & 4 ? nodeBuilder.symbolToExpression : nodeBuilder.symbolToEntityName;
return writer ? symbolToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(symbolToStringWorker);
function symbolToStringWorker(writer) {
@@ -21642,7 +21644,7 @@ var ts;
return result;
}
function toNodeBuilderFlags(flags) {
return flags & 9469295;
return flags & 9469291;
}
function createNodeBuilder() {
return {
@@ -22258,7 +22260,13 @@ var ts;
function createEntityNameFromSymbolChain(chain, index) {
var typeParameterNodes = lookupTypeParameterNodes(chain, index, context);
var symbol = chain[index];
if (index === 0) {
context.flags |= 16777216;
}
var symbolName = getNameOfSymbolAsWritten(symbol, context);
if (index === 0) {
context.flags ^= 16777216;
}
var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216);
identifier.symbol = symbol;
return index > 0 ? ts.createQualifiedName(createEntityNameFromSymbolChain(chain, index - 1), identifier) : identifier;
@@ -22270,7 +22278,13 @@ var ts;
function createExpressionFromSymbolChain(chain, index) {
var typeParameterNodes = lookupTypeParameterNodes(chain, index, context);
var symbol = chain[index];
if (index === 0) {
context.flags |= 16777216;
}
var symbolName = getNameOfSymbolAsWritten(symbol, context);
if (index === 0) {
context.flags ^= 16777216;
}
var firstChar = symbolName.charCodeAt(0);
var canUsePropertyAccess = ts.isIdentifierStart(firstChar, languageVersion);
if (index === 0 || canUsePropertyAccess) {
@@ -22363,8 +22377,14 @@ var ts;
function literalTypeToString(type) {
return type.flags & 32 ? '"' + ts.escapeString(type.value) + '"' : "" + type.value;
}
function isDefaultBindingContext(location) {
return location.kind === 269 || ts.isAmbientModule(location);
}
function getNameOfSymbolAsWritten(symbol, context) {
if (context && context.flags & 4 && symbol.escapedName === "default") {
if (context && symbol.escapedName === "default" && !(context.flags & 16384) &&
(!(context.flags & 16777216) ||
!symbol.declarations ||
(context.enclosingDeclaration && ts.findAncestor(symbol.declarations[0], isDefaultBindingContext) !== ts.findAncestor(context.enclosingDeclaration, isDefaultBindingContext)))) {
return "default";
}
if (symbol.declarations && symbol.declarations.length) {
@@ -26075,7 +26095,7 @@ var ts;
if (ts.isValidESSymbolDeclaration(node)) {
var symbol = getSymbolOfNode(node);
var links = getSymbolLinks(symbol);
return links.type || (links.type = createUniqueESSymbolType(symbol));
return links.uniqueESSymbolType || (links.uniqueESSymbolType = createUniqueESSymbolType(symbol));
}
return esSymbolType;
}
@@ -30576,40 +30596,29 @@ var ts;
var conditional = node.parent;
return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
}
function getContextualTypeForChildJsxExpression(node) {
var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
var jsxChildrenPropertyName = getJsxElementChildrenPropertyName();
return attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "" ? getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName) : undefined;
}
function getContextualTypeForJsxExpression(node) {
var jsxAttributes = ts.isJsxAttributeLike(node.parent) ?
node.parent.parent :
ts.isJsxElement(node.parent) ?
node.parent.openingElement.attributes :
undefined;
if (!jsxAttributes) {
return undefined;
}
var attributesType = getContextualType(jsxAttributes);
if (!attributesType || isTypeAny(attributesType)) {
return undefined;
}
if (ts.isJsxAttribute(node.parent)) {
return getTypeOfPropertyOfContextualType(attributesType, node.parent.name.escapedText);
}
else if (node.parent.kind === 250) {
var jsxChildrenPropertyName = getJsxElementChildrenPropertyname();
return jsxChildrenPropertyName && jsxChildrenPropertyName !== "" ? getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName) : anyType;
}
else {
return attributesType;
}
var exprParent = node.parent;
return ts.isJsxAttributeLike(exprParent)
? getContextualType(node)
: ts.isJsxElement(exprParent)
? getContextualTypeForChildJsxExpression(exprParent)
: undefined;
}
function getContextualTypeForJsxAttribute(attribute) {
var attributesType = getContextualType(attribute.parent);
if (ts.isJsxAttribute(attribute)) {
var attributesType = getApparentTypeOfContextualType(attribute.parent);
if (!attributesType || isTypeAny(attributesType)) {
return undefined;
}
return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
}
else {
return attributesType;
return getContextualType(attribute.parent);
}
}
function getApparentTypeOfContextualType(node) {
@@ -30698,7 +30707,7 @@ var ts;
return getContextualTypeForJsxAttribute(parent);
case 252:
case 251:
return getAttributesTypeFromJsxOpeningLikeElement(parent);
return getContextualJsxElementAttributesType(parent);
}
return undefined;
}
@@ -30706,6 +30715,110 @@ var ts;
node = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
return node ? node.contextualMapper : identityMapper;
}
function getContextualJsxElementAttributesType(node) {
if (isJsxIntrinsicIdentifier(node.tagName)) {
return getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
}
var valueType = checkExpression(node.tagName);
if (isTypeAny(valueType)) {
return anyType;
}
var isJs = ts.isInJavaScriptFile(node);
return mapType(valueType, isJs ? getJsxSignaturesParameterTypesJs : getJsxSignaturesParameterTypes);
}
function getJsxSignaturesParameterTypes(valueType) {
return getJsxSignaturesParameterTypesInternal(valueType, false);
}
function getJsxSignaturesParameterTypesJs(valueType) {
return getJsxSignaturesParameterTypesInternal(valueType, true);
}
function getJsxSignaturesParameterTypesInternal(valueType, isJs) {
if (valueType.flags & 2) {
return anyType;
}
else if (valueType.flags & 32) {
var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
if (intrinsicElementsType !== unknownType) {
var stringLiteralTypeName = valueType.value;
var intrinsicProp = getPropertyOfType(intrinsicElementsType, ts.escapeLeadingUnderscores(stringLiteralTypeName));
if (intrinsicProp) {
return getTypeOfSymbol(intrinsicProp);
}
var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0);
if (indexSignatureType) {
return indexSignatureType;
}
}
return anyType;
}
var signatures = getSignaturesOfType(valueType, 1);
var ctor = true;
if (signatures.length === 0) {
signatures = getSignaturesOfType(valueType, 0);
ctor = false;
if (signatures.length === 0) {
return unknownType;
}
}
return getUnionType(ts.map(signatures, ctor ? isJs ? getJsxPropsTypeFromConstructSignatureJs : getJsxPropsTypeFromConstructSignature : getJsxPropsTypeFromCallSignature), 0);
}
function getJsxPropsTypeFromCallSignature(sig) {
var propsType = getTypeOfFirstParameterOfSignature(sig);
var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes);
if (intrinsicAttribs !== unknownType) {
propsType = intersectTypes(intrinsicAttribs, propsType);
}
return propsType;
}
function getJsxPropsTypeFromClassType(hostClassType, isJs) {
if (isTypeAny(hostClassType)) {
return hostClassType;
}
var propsName = getJsxElementPropertiesName();
if (propsName === undefined) {
return anyType;
}
else if (propsName === "") {
return hostClassType;
}
else {
var attributesType = getTypeOfPropertyOfType(hostClassType, propsName);
if (!attributesType) {
return emptyObjectType;
}
else if (isTypeAny(attributesType)) {
return attributesType;
}
else {
var apparentAttributesType = attributesType;
var intrinsicClassAttribs = getJsxType(JsxNames.IntrinsicClassAttributes);
if (intrinsicClassAttribs !== unknownType) {
var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
apparentAttributesType = intersectTypes(typeParams
? createTypeReference(intrinsicClassAttribs, fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), isJs))
: intrinsicClassAttribs, apparentAttributesType);
}
var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes);
if (intrinsicAttribs !== unknownType) {
apparentAttributesType = intersectTypes(intrinsicAttribs, apparentAttributesType);
}
return apparentAttributesType;
}
}
}
function getJsxPropsTypeFromConstructSignatureJs(sig) {
return getJsxPropsTypeFromConstructSignatureInternal(sig, true);
}
function getJsxPropsTypeFromConstructSignature(sig) {
return getJsxPropsTypeFromConstructSignatureInternal(sig, false);
}
function getJsxPropsTypeFromConstructSignatureInternal(sig, isJs) {
var hostClassType = getReturnTypeOfSignature(sig);
if (hostClassType) {
return getJsxPropsTypeFromClassType(hostClassType, isJs);
}
return getJsxPropsTypeFromCallSignature(sig);
}
function getContextualCallSignature(type, node) {
var signatures = getSignaturesOfType(type, 0);
if (signatures.length === 1) {
@@ -31099,7 +31212,7 @@ var ts;
var hasSpreadAnyType = false;
var typeToIntersect;
var explicitlySpecifyChildrenAttribute = false;
var jsxChildrenPropertyName = getJsxElementChildrenPropertyname();
var jsxChildrenPropertyName = getJsxElementChildrenPropertyName();
for (var _i = 0, _a = attributes.properties; _i < _a.length; _i++) {
var attributeDecl = _a[_i];
var member = attributeDecl.symbol;
@@ -31178,7 +31291,7 @@ var ts;
}
}
else {
childrenTypes.push(checkExpression(child, checkMode));
childrenTypes.push(checkExpressionForMutableLocation(child, checkMode));
}
}
return childrenTypes;
@@ -31222,7 +31335,7 @@ var ts;
}
return links.resolvedSymbol;
}
function getJsxElementInstanceType(node, valueType, sourceAttributesType) {
function getJsxElementInstanceType(node, valueType) {
ts.Debug.assert(!(valueType.flags & 131072));
if (isTypeAny(valueType)) {
return anyType;
@@ -31235,25 +31348,20 @@ var ts;
return unknownType;
}
}
if (sourceAttributesType) {
var instantiatedSignatures = [];
for (var _i = 0, signatures_3 = signatures; _i < signatures_3.length; _i++) {
var signature = signatures_3[_i];
if (signature.typeParameters) {
var isJavascript = ts.isInJavaScriptFile(node);
var inferenceContext = createInferenceContext(signature, isJavascript ? 4 : 0);
var typeArguments = inferJsxTypeArguments(signature, sourceAttributesType, inferenceContext);
instantiatedSignatures.push(getSignatureInstantiation(signature, typeArguments, isJavascript));
}
else {
instantiatedSignatures.push(signature);
}
var instantiatedSignatures = [];
for (var _i = 0, signatures_3 = signatures; _i < signatures_3.length; _i++) {
var signature = signatures_3[_i];
if (signature.typeParameters) {
var isJavascript = ts.isInJavaScriptFile(node);
var inferenceContext = createInferenceContext(signature, isJavascript ? 4 : 0);
var typeArguments = inferJsxTypeArguments(signature, node, inferenceContext);
instantiatedSignatures.push(getSignatureInstantiation(signature, typeArguments, isJavascript));
}
else {
instantiatedSignatures.push(signature);
}
return getUnionType(ts.map(instantiatedSignatures, getReturnTypeOfSignature), 2);
}
else {
return getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2);
}
return getUnionType(ts.map(instantiatedSignatures, getReturnTypeOfSignature), 2);
}
function getNameFromJsxElementAttributesContainer(nameOfAttribPropContainer) {
var jsxNamespace = getGlobalSymbol(JsxNames.JSX, 1920, undefined);
@@ -31280,7 +31388,7 @@ var ts;
}
return _jsxElementPropertiesName;
}
function getJsxElementChildrenPropertyname() {
function getJsxElementChildrenPropertyName() {
if (!_hasComputedJsxElementChildrenPropertyName) {
_hasComputedJsxElementChildrenPropertyName = true;
_jsxElementChildrenPropertyName = getNameFromJsxElementAttributesContainer(JsxNames.ElementChildrenAttributeNameContainer);
@@ -31366,11 +31474,11 @@ var ts;
}
return undefined;
}
function resolveCustomJsxElementAttributesType(openingLikeElement, shouldIncludeAllStatelessAttributesType, sourceAttributesType, elementType, elementClassType) {
function resolveCustomJsxElementAttributesType(openingLikeElement, shouldIncludeAllStatelessAttributesType, elementType, elementClassType) {
if (elementType.flags & 131072) {
var types = elementType.types;
return getUnionType(types.map(function (type) {
return resolveCustomJsxElementAttributesType(openingLikeElement, shouldIncludeAllStatelessAttributesType, sourceAttributesType, type, elementClassType);
return resolveCustomJsxElementAttributesType(openingLikeElement, shouldIncludeAllStatelessAttributesType, type, elementClassType);
}), 2);
}
if (elementType.flags & 2) {
@@ -31392,55 +31500,17 @@ var ts;
}
return anyType;
}
var elemInstanceType = getJsxElementInstanceType(openingLikeElement, elementType, sourceAttributesType);
var elemInstanceType = getJsxElementInstanceType(openingLikeElement, elementType);
var statelessAttributesType = shouldIncludeAllStatelessAttributesType ?
tryGetAllJsxStatelessFunctionAttributesType(openingLikeElement, elementType, elemInstanceType, elementClassType) :
defaultTryGetJsxStatelessFunctionAttributesType(openingLikeElement, elementType, elemInstanceType, elementClassType);
if (statelessAttributesType) {
return statelessAttributesType;
}
if (elementClassType && sourceAttributesType) {
if (elementClassType) {
checkTypeRelatedTo(elemInstanceType, elementClassType, assignableRelation, openingLikeElement, ts.Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
}
if (isTypeAny(elemInstanceType)) {
return elemInstanceType;
}
var propsName = getJsxElementPropertiesName();
if (propsName === undefined) {
return anyType;
}
else if (propsName === "") {
return elemInstanceType;
}
else {
var attributesType = getTypeOfPropertyOfType(elemInstanceType, propsName);
if (!attributesType) {
return emptyObjectType;
}
else if (isTypeAny(attributesType) || (attributesType === unknownType)) {
return attributesType;
}
else {
var apparentAttributesType = attributesType;
var intrinsicClassAttribs = getJsxType(JsxNames.IntrinsicClassAttributes);
if (intrinsicClassAttribs !== unknownType) {
var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
if (typeParams) {
if (typeParams.length === 1) {
apparentAttributesType = intersectTypes(createTypeReference(intrinsicClassAttribs, [elemInstanceType]), apparentAttributesType);
}
}
else {
apparentAttributesType = intersectTypes(attributesType, intrinsicClassAttribs);
}
}
var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes);
if (intrinsicAttribs !== unknownType) {
apparentAttributesType = intersectTypes(intrinsicAttribs, apparentAttributesType);
}
return apparentAttributesType;
}
}
return getJsxPropsTypeFromClassType(elemInstanceType, ts.isInJavaScriptFile(openingLikeElement));
}
function getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node) {
ts.Debug.assert(isJsxIntrinsicIdentifier(node.tagName));
@@ -31459,26 +31529,15 @@ var ts;
}
return links.resolvedJsxElementAttributesType;
}
function getCustomJsxElementAttributesType(node, sourceAttributesType, shouldIncludeAllStatelessAttributesType) {
if (!sourceAttributesType) {
var links = getNodeLinks(node);
var linkLocation = shouldIncludeAllStatelessAttributesType ? "resolvedJsxElementAllAttributesType" : "resolvedJsxElementAttributesType";
if (!links[linkLocation]) {
var elemClassType = getJsxGlobalElementClassType();
return links[linkLocation] = resolveCustomJsxElementAttributesType(node, shouldIncludeAllStatelessAttributesType, sourceAttributesType, checkExpression(node.tagName), elemClassType);
}
return links[linkLocation];
}
else {
return resolveCustomJsxElementAttributesType(node, shouldIncludeAllStatelessAttributesType, sourceAttributesType, checkExpression(node.tagName), getJsxGlobalElementClassType());
}
function getCustomJsxElementAttributesType(node, shouldIncludeAllStatelessAttributesType) {
return resolveCustomJsxElementAttributesType(node, shouldIncludeAllStatelessAttributesType, checkExpression(node.tagName), getJsxGlobalElementClassType());
}
function getAllAttributesTypeFromJsxOpeningLikeElement(node) {
if (isJsxIntrinsicIdentifier(node.tagName)) {
return getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
}
else {
return getCustomJsxElementAttributesType(node, undefined, true);
return getCustomJsxElementAttributesType(node, true);
}
}
function getAttributesTypeFromJsxOpeningLikeElement(node) {
@@ -31486,7 +31545,7 @@ var ts;
return getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
}
else {
return getCustomJsxElementAttributesType(node, undefined, false);
return getCustomJsxElementAttributesType(node, false);
}
}
function getJsxAttributePropertySymbol(attrib) {
@@ -31573,10 +31632,10 @@ var ts;
return false;
}
function checkJsxAttributesAssignableToTagNameAttributes(openingLikeElement, checkMode) {
var sourceAttributesType = createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode);
var targetAttributesType = isJsxIntrinsicIdentifier(openingLikeElement.tagName) ?
getIntrinsicAttributesTypeFromJsxOpeningLikeElement(openingLikeElement) :
getCustomJsxElementAttributesType(openingLikeElement, sourceAttributesType, false);
getCustomJsxElementAttributesType(openingLikeElement, false);
var sourceAttributesType = createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode);
if (targetAttributesType === emptyObjectType && (isTypeAny(sourceAttributesType) || sourceAttributesType.properties.length > 0)) {
error(openingLikeElement, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(getJsxElementPropertiesName()));
}
@@ -32225,9 +32284,13 @@ var ts;
}
return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJavaScriptFile(contextualSignature.declaration));
}
function inferJsxTypeArguments(signature, sourceAttributesType, context) {
function inferJsxTypeArguments(signature, node, context) {
var skipContextParamType = getTypeAtPosition(signature, 0);
var checkAttrTypeSkipContextSensitive = checkExpressionWithContextualType(node.attributes, skipContextParamType, identityMapper);
inferTypes(context.inferences, checkAttrTypeSkipContextSensitive, skipContextParamType);
var paramType = getTypeAtPosition(signature, 0);
inferTypes(context.inferences, sourceAttributesType, paramType);
var checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, context);
inferTypes(context.inferences, checkAttrType, paramType);
return getInferredTypes(context);
}
function inferTypeArguments(node, signature, args, excludeArgument, context) {
@@ -33097,7 +33160,7 @@ var ts;
var anonymousSymbol = createSymbol(2048, "__type");
var defaultContainingObject = createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, undefined, undefined);
anonymousSymbol.type = defaultContainingObject;
synthType.syntheticType = (type.flags & 458752 && type.symbol.flags & (1536 | 3)) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, 0) : defaultContainingObject;
synthType.syntheticType = isValidSpreadType(type) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, 0) : defaultContainingObject;
}
else {
synthType.syntheticType = type;
@@ -34188,16 +34251,23 @@ var ts;
});
return stringType;
}
function getContextNode(node) {
if (node.kind === 258) {
return node.parent.parent;
}
return node;
}
function checkExpressionWithContextualType(node, contextualType, contextualMapper) {
var saveContextualType = node.contextualType;
var saveContextualMapper = node.contextualMapper;
node.contextualType = contextualType;
node.contextualMapper = contextualMapper;
var context = getContextNode(node);
var saveContextualType = context.contextualType;
var saveContextualMapper = context.contextualMapper;
context.contextualType = contextualType;
context.contextualMapper = contextualMapper;
var checkMode = contextualMapper === identityMapper ? 1 :
contextualMapper ? 2 : 3;
var result = checkExpression(node, checkMode);
node.contextualType = saveContextualType;
node.contextualMapper = saveContextualMapper;
context.contextualType = saveContextualType;
context.contextualMapper = saveContextualMapper;
return result;
}
function checkExpressionCached(node, checkMode) {
@@ -34225,12 +34295,9 @@ var ts;
}
function isLiteralOfContextualType(candidateType, contextualType) {
if (contextualType) {
if (contextualType.flags & 393216 && !(contextualType.flags & 8)) {
var types_18 = contextualType.types;
return ts.some(types_18, function (t) {
return !(t.flags & 128 && containsType(types_18, trueType) && containsType(types_18, falseType)) &&
isLiteralOfContextualType(candidateType, t);
});
if (contextualType.flags & 393216) {
var types = contextualType.types;
return ts.some(types, function (t) { return isLiteralOfContextualType(candidateType, t); });
}
if (contextualType.flags & 1081344) {
var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
@@ -35752,6 +35819,7 @@ var ts;
}
break;
case 158:
case 207:
break;
default:
ts.Debug.fail();
@@ -38441,7 +38509,7 @@ var ts;
if (symbol) {
if (symbol.flags & 1048576) {
var exportSymbol = getMergedSymbol(symbol.exportSymbol);
if (!prefixLocals && exportSymbol.flags & 944) {
if (!prefixLocals && exportSymbol.flags & 944 && !(exportSymbol.flags & 3)) {
return undefined;
}
symbol = exportSymbol;
@@ -38905,6 +38973,8 @@ var ts;
var list = augmentations_1[_d];
for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
var augmentation = list_1[_e];
if (!ts.isGlobalScopeAugmentation(augmentation.parent))
continue;
mergeModuleAugmentation(augmentation);
}
}
@@ -38928,6 +38998,17 @@ var ts;
globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1);
anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
globalThisType = getGlobalTypeOrUndefined("ThisType", 1);
if (augmentations) {
for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
var list = augmentations_2[_f];
for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
var augmentation = list_2[_g];
if (ts.isGlobalScopeAugmentation(augmentation.parent))
continue;
mergeModuleAugmentation(augmentation);
}
}
}
}
function checkExternalEmitHelpers(location, helpers) {
if ((requestedExternalEmitHelpers & helpers) !== helpers && compilerOptions.importHelpers) {
@@ -43388,14 +43469,14 @@ var ts;
return emitNode && emitNode.externalHelpersModuleName;
}
ts.getExternalHelpersModuleName = getExternalHelpersModuleName;
function getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions, hasExportStarsToExportValues) {
function getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault) {
if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(node, compilerOptions)) {
var externalHelpersModuleName = getExternalHelpersModuleName(node);
if (externalHelpersModuleName) {
return externalHelpersModuleName;
}
var moduleKind = ts.getEmitModuleKind(compilerOptions);
var create = hasExportStarsToExportValues
var create = (hasExportStarsToExportValues || (compilerOptions.esModuleInterop && hasImportStarOrImportDefault))
&& moduleKind !== ts.ModuleKind.System
&& moduleKind !== ts.ModuleKind.ES2015
&& moduleKind !== ts.ModuleKind.ESNext;
@@ -44518,6 +44599,34 @@ var ts;
return node ? ts.getNodeId(node) : 0;
}
ts.getOriginalNodeId = getOriginalNodeId;
function getNamedImportCount(node) {
if (!(node.importClause && node.importClause.namedBindings))
return 0;
var names = node.importClause.namedBindings;
if (!names)
return 0;
if (!ts.isNamedImports(names))
return 0;
return names.elements.length;
}
function containsDefaultReference(node) {
if (!node)
return false;
if (!ts.isNamedImports(node))
return false;
return ts.some(node.elements, isNamedDefaultReference);
}
function isNamedDefaultReference(e) {
return e.propertyName && e.propertyName.escapedText === "default";
}
function getImportNeedsImportStarHelper(node) {
return !!ts.getNamespaceDeclarationNode(node) || (getNamedImportCount(node) > 1 && containsDefaultReference(node.importClause.namedBindings));
}
ts.getImportNeedsImportStarHelper = getImportNeedsImportStarHelper;
function getImportNeedsImportDefaultHelper(node) {
return ts.isDefaultImport(node) || (getNamedImportCount(node) === 1 && containsDefaultReference(node.importClause.namedBindings));
}
ts.getImportNeedsImportDefaultHelper = getImportNeedsImportDefaultHelper;
function collectExternalModuleInfo(sourceFile, resolver, compilerOptions) {
var externalImports = [];
var exportSpecifiers = ts.createMultiMap();
@@ -44527,11 +44636,13 @@ var ts;
var hasExportDefault = false;
var exportEquals = undefined;
var hasExportStarsToExportValues = false;
var hasImportStarOrImportDefault = false;
for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
var node = _a[_i];
switch (node.kind) {
case 239:
externalImports.push(node);
hasImportStarOrImportDefault = getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
break;
case 238:
if (node.moduleReference.kind === 249) {
@@ -44616,7 +44727,7 @@ var ts;
break;
}
}
var externalHelpersModuleName = ts.getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues);
var externalHelpersModuleName = ts.getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault);
var externalHelpersImportDeclaration = externalHelpersModuleName && ts.createImportDeclaration(undefined, undefined, ts.createImportClause(undefined, ts.createNamespaceImport(externalHelpersModuleName)), ts.createLiteral(ts.externalHelpersModuleNameText));
if (externalHelpersImportDeclaration) {
ts.addEmitFlags(externalHelpersImportDeclaration, 67108864);
@@ -47207,7 +47318,7 @@ var ts;
if (statement.kind === 217 && statement.awaitModifier) {
return visitForOfStatement(statement, node);
}
return ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), node);
return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
}
return ts.visitEachChild(node, visitor, context);
}
@@ -49735,26 +49846,31 @@ var ts;
return visitCallExpressionWithPotentialCapturedThisAssignment(node, false);
}
function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
if (node.expression.kind === 97) {
ts.setEmitFlags(thisArg, 4);
if (node.transformFlags & 524288 ||
node.expression.kind === 97 ||
ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
if (node.expression.kind === 97) {
ts.setEmitFlags(thisArg, 4);
}
var resultingCall = void 0;
if (node.transformFlags & 524288) {
resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
}
else {
resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), node);
}
if (node.expression.kind === 97) {
var actualThis = ts.createThis();
ts.setEmitFlags(actualThis, 4);
var initializer = ts.createLogicalOr(resultingCall, actualThis);
resultingCall = assignToCapturedThis
? ts.createAssignment(ts.createIdentifier("_this"), initializer)
: initializer;
}
return ts.setOriginalNode(resultingCall, node);
}
var resultingCall;
if (node.transformFlags & 524288) {
resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, false, false, false));
}
else {
resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), node);
}
if (node.expression.kind === 97) {
var actualThis = ts.createThis();
ts.setEmitFlags(actualThis, 4);
var initializer = ts.createLogicalOr(resultingCall, actualThis);
resultingCall = assignToCapturedThis
? ts.createAssignment(ts.createIdentifier("_this"), initializer)
: initializer;
}
return ts.setOriginalNode(resultingCall, node);
return ts.visitEachChild(node, visitor, context);
}
function visitNewExpression(node) {
if (node.transformFlags & 524288) {
@@ -52089,11 +52205,11 @@ var ts;
if (!compilerOptions.esModuleInterop || ts.getEmitFlags(node) & 67108864) {
return innerExpr;
}
if (ts.getNamespaceDeclarationNode(node)) {
if (ts.getImportNeedsImportStarHelper(node)) {
context.requestEmitHelper(importStarHelper);
return ts.createCall(ts.getHelperName("__importStar"), undefined, [innerExpr]);
}
if (ts.isDefaultImport(node)) {
if (ts.getImportNeedsImportDefaultHelper(node)) {
context.requestEmitHelper(importDefaultHelper);
return ts.createCall(ts.getHelperName("__importDefault"), undefined, [innerExpr]);
}
@@ -54622,7 +54738,7 @@ var ts;
}
else {
errorNameNode = declaration.name;
var format = 4096 | 8 | 4 |
var format = 4096 | 8 |
2048 |
(shouldUseResolverType ? 131072 : 0);
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, format, writer);
@@ -54637,7 +54753,7 @@ var ts;
}
else {
errorNameNode = signature.name;
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 4096 | 8 | 2048 | 4, writer);
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 4096 | 8 | 2048, writer);
errorNameNode = undefined;
}
}
@@ -54867,7 +54983,7 @@ var ts;
write(tempVarName);
write(": ");
writer.getSymbolAccessibilityDiagnostic = function () { return diagnostic; };
resolver.writeTypeOfExpression(expr, enclosingDeclaration, 4096 | 8 | 2048 | 4, writer);
resolver.writeTypeOfExpression(expr, enclosingDeclaration, 4096 | 8 | 2048, writer);
write(";");
writeLine();
return tempVarName;
@@ -56122,7 +56238,7 @@ var ts;
};
function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath;
if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {
if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit && !compilerOptions.emitDeclarationOnly) {
if (!emitOnlyDtsFiles) {
printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle);
}
@@ -59780,7 +59896,7 @@ var ts;
}
}
}
var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken, emitOnlyDtsFiles);
var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
ts.performance.mark("beforeEmit");
var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers);
@@ -60574,6 +60690,14 @@ var ts;
if (options.checkJs && !options.allowJs) {
programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));
}
if (options.emitDeclarationOnly) {
if (!options.declaration) {
createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDeclarationOnly", "declarations");
}
if (options.noEmit) {
createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "emitDeclarationOnly", "noEmit");
}
}
if (options.emitDecoratorMetadata &&
!options.experimentalDecorators) {
createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators");
@@ -60593,7 +60717,9 @@ var ts;
var emitHost = getEmitHost();
var emitFilesSeen_1 = ts.createMap();
ts.forEachEmittedFile(emitHost, function (emitFileNames) {
verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
if (!options.emitDeclarationOnly) {
verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
}
verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
});
}
@@ -61724,21 +61850,24 @@ var ts;
};
}
ts.createDiagnosticReporter = createDiagnosticReporter;
function clearScreenIfNotWatchingForFileChanges(system, diagnostic) {
if (system.clearScreen && diagnostic.code !== ts.Diagnostics.Compilation_complete_Watching_for_file_changes.code) {
function clearScreenIfNotWatchingForFileChanges(system, diagnostic, options) {
if (system.clearScreen &&
diagnostic.code !== ts.Diagnostics.Compilation_complete_Watching_for_file_changes.code &&
!options.extendedDiagnostics &&
!options.diagnostics) {
system.clearScreen();
}
}
function createWatchStatusReporter(system, pretty) {
return pretty ?
function (diagnostic, newLine) {
clearScreenIfNotWatchingForFileChanges(system, diagnostic);
function (diagnostic, newLine, options) {
clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
var output = "[" + ts.formatColorAndReset(new Date().toLocaleTimeString(), ts.ForegroundColorEscapeSequences.Grey) + "] ";
output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine + newLine);
system.write(output);
} :
function (diagnostic, newLine) {
clearScreenIfNotWatchingForFileChanges(system, diagnostic);
function (diagnostic, newLine, options) {
clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
var output = new Date().toLocaleTimeString() + " - ";
output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine + newLine);
system.write(output);
@@ -62134,7 +62263,7 @@ var ts;
}
function reportWatchDiagnostic(message) {
if (host.onWatchStatusChange) {
host.onWatchStatusChange(ts.createCompilerDiagnostic(message), newLine);
host.onWatchStatusChange(ts.createCompilerDiagnostic(message), newLine, compilerOptions);
}
}
function scheduleProgramUpdate() {
@@ -62461,6 +62590,12 @@ var ts;
category: ts.Diagnostics.Basic_Options,
description: ts.Diagnostics.Generates_corresponding_d_ts_file,
},
{
name: "emitDeclarationOnly",
type: "boolean",
category: ts.Diagnostics.Advanced_Options,
description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
},
{
name: "sourceMap",
type: "boolean",
@@ -63501,7 +63636,7 @@ var ts;
return x === undefined || x === null;
}
function directoryOfCombinedPath(fileName, basePath) {
return ts.getDirectoryPath(ts.toPath(fileName, basePath, ts.identity));
return ts.getDirectoryPath(ts.getNormalizedAbsolutePath(fileName, basePath));
}
function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
if (existingOptions === void 0) { existingOptions = {}; }
@@ -63509,8 +63644,7 @@ var ts;
if (extraFileExtensions === void 0) { extraFileExtensions = []; }
ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
var errors = [];
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, getCanonicalFileName, resolutionStack, errors);
var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
var raw = parsedConfig.raw;
var options = ts.extend(existingOptions, parsedConfig.options || {});
options.configFilePath = configFileName;
@@ -63590,19 +63724,19 @@ var ts;
function isSuccessfulParsedTsconfig(value) {
return !!value.options;
}
function parseConfig(json, sourceFile, host, basePath, configFileName, getCanonicalFileName, resolutionStack, errors) {
function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
basePath = ts.normalizeSlashes(basePath);
var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
if (resolutionStack.indexOf(resolvedPath) >= 0) {
errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> ")));
return { raw: json || convertToObject(sourceFile, errors) };
}
var ownConfig = json ?
parseOwnConfigOfJson(json, host, basePath, getCanonicalFileName, configFileName, errors) :
parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, getCanonicalFileName, configFileName, errors);
parseOwnConfigOfJson(json, host, basePath, configFileName, errors) :
parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors);
if (ownConfig.extendedConfigPath) {
resolutionStack = resolutionStack.concat([resolvedPath]);
var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, getCanonicalFileName, resolutionStack, errors);
var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
var baseRaw_1 = extendedConfig.raw;
var raw_1 = ownConfig.raw;
@@ -63623,7 +63757,7 @@ var ts;
}
return ownConfig;
}
function parseOwnConfigOfJson(json, host, basePath, getCanonicalFileName, configFileName, errors) {
function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
if (ts.hasProperty(json, "excludes")) {
errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
}
@@ -63637,12 +63771,12 @@ var ts;
}
else {
var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, getCanonicalFileName, errors, ts.createCompilerDiagnostic);
extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, errors, ts.createCompilerDiagnostic);
}
}
return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
}
function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, getCanonicalFileName, configFileName, errors) {
function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors) {
var options = getDefaultCompilerOptions(configFileName);
var typeAcquisition, typingOptionstypeAcquisition;
var extendedConfigPath;
@@ -63660,7 +63794,7 @@ var ts;
switch (key) {
case "extends":
var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
extendedConfigPath = getExtendsConfigPath(value, host, newBase, getCanonicalFileName, errors, function (message, arg0) {
extendedConfigPath = getExtendsConfigPath(value, host, newBase, errors, function (message, arg0) {
return ts.createDiagnosticForNodeInSourceFile(sourceFile, valueNode, message, arg0);
});
return;
@@ -63694,13 +63828,13 @@ var ts;
}
return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
}
function getExtendsConfigPath(extendedConfig, host, basePath, getCanonicalFileName, errors, createDiagnostic) {
function getExtendsConfigPath(extendedConfig, host, basePath, errors, createDiagnostic) {
extendedConfig = ts.normalizeSlashes(extendedConfig);
if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../"))) {
errors.push(createDiagnostic(ts.Diagnostics.A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not, extendedConfig));
return undefined;
}
var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
extendedConfigPath = extendedConfigPath + ".json";
if (!host.fileExists(extendedConfigPath)) {
@@ -63710,7 +63844,7 @@ var ts;
}
return extendedConfigPath;
}
function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, getCanonicalFileName, resolutionStack, errors) {
function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
if (sourceFile) {
(sourceFile.extendedSourceFiles || (sourceFile.extendedSourceFiles = [])).push(extendedResult.fileName);
@@ -63720,12 +63854,12 @@ var ts;
return undefined;
}
var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
var extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), getCanonicalFileName, resolutionStack, errors);
var extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
if (sourceFile) {
(_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
}
if (isSuccessfulParsedTsconfig(extendedConfig)) {
var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
var mapPropertiesInRawIfNotUndefined = function (propertyName) {
if (raw_2[propertyName]) {
lib/tsserver.js
+376 -216
View File
File diff suppressed because it is too large Load Diff
lib/tsserverlibrary.d.ts
Vendored
+5 -3
View File
@@ -1799,7 +1799,6 @@ declare namespace ts {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1821,12 +1820,12 @@ declare namespace ts {
IgnoreErrors = 3112960,
InObjectTypeLiteral = 4194304,
InTypeAlias = 8388608,
InInitialEntityName = 16777216,
}
enum TypeFormatFlags {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1844,13 +1843,14 @@ declare namespace ts {
InFirstTypeArgument = 4194304,
InTypeAlias = 8388608,
/** @deprecated */ WriteOwnNameForAnyLike = 0,
NodeBuilderFlagsMask = 9469295,
NodeBuilderFlagsMask = 9469291,
}
enum SymbolFormatFlags {
None = 0,
WriteTypeParametersOrArguments = 1,
UseOnlyExternalAliasing = 2,
AllowAnyNodeKind = 4,
UseAliasDefinedOutsideCurrentScope = 8,
}
/**
* @deprecated
@@ -2192,6 +2192,7 @@ declare namespace ts {
isFixed: boolean;
}
enum InferenceFlags {
None = 0,
InferUnionTypes = 1,
NoDefault = 2,
AnyDefault = 4,
@@ -2266,6 +2267,7 @@ declare namespace ts {
charset?: string;
checkJs?: boolean;
declaration?: boolean;
emitDeclarationOnly?: boolean;
declarationDir?: string;
disableSizeLimit?: boolean;
downlevelIteration?: boolean;
lib/tsserverlibrary.js
+444 -262
View File
File diff suppressed because it is too large Load Diff
lib/typescript.d.ts
Vendored
+7 -5
View File
@@ -1799,7 +1799,6 @@ declare namespace ts {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1821,12 +1820,12 @@ declare namespace ts {
IgnoreErrors = 3112960,
InObjectTypeLiteral = 4194304,
InTypeAlias = 8388608,
InInitialEntityName = 16777216,
}
enum TypeFormatFlags {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1844,13 +1843,14 @@ declare namespace ts {
InFirstTypeArgument = 4194304,
InTypeAlias = 8388608,
/** @deprecated */ WriteOwnNameForAnyLike = 0,
NodeBuilderFlagsMask = 9469295,
NodeBuilderFlagsMask = 9469291,
}
enum SymbolFormatFlags {
None = 0,
WriteTypeParametersOrArguments = 1,
UseOnlyExternalAliasing = 2,
AllowAnyNodeKind = 4,
UseAliasDefinedOutsideCurrentScope = 8,
}
/**
* @deprecated
@@ -2192,6 +2192,7 @@ declare namespace ts {
isFixed: boolean;
}
enum InferenceFlags {
None = 0,
InferUnionTypes = 1,
NoDefault = 2,
AnyDefault = 4,
@@ -2266,6 +2267,7 @@ declare namespace ts {
charset?: string;
checkJs?: boolean;
declaration?: boolean;
emitDeclarationOnly?: boolean;
declarationDir?: string;
disableSizeLimit?: boolean;
downlevelIteration?: boolean;
@@ -3976,7 +3978,7 @@ declare namespace ts {
}
declare namespace ts {
type DiagnosticReporter = (diagnostic: Diagnostic) => void;
type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string) => void;
type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: T) => T;
interface WatchCompilerHost<T extends BuilderProgram> {
/**
@@ -3986,7 +3988,7 @@ declare namespace ts {
/** If provided, callback to invoke after every new program creation */
afterProgramCreate?(program: T): void;
/** If provided, called with Diagnostic message that informs about change in watch status */
onWatchStatusChange?(diagnostic: Diagnostic, newLine: string): void;
onWatchStatusChange?(diagnostic: Diagnostic, newLine: string, options: CompilerOptions): void;
useCaseSensitiveFileNames(): boolean;
getNewLine(): string;
getCurrentDirectory(): string;
lib/typescript.js
+454 -269
View File
File diff suppressed because it is too large Load Diff
lib/typescriptServices.d.ts
Vendored
+7 -5
View File
@@ -1799,7 +1799,6 @@ declare namespace ts {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1821,12 +1820,12 @@ declare namespace ts {
IgnoreErrors = 3112960,
InObjectTypeLiteral = 4194304,
InTypeAlias = 8388608,
InInitialEntityName = 16777216,
}
enum TypeFormatFlags {
None = 0,
NoTruncation = 1,
WriteArrayAsGenericType = 2,
WriteDefaultSymbolWithoutName = 4,
UseStructuralFallback = 8,
WriteTypeArgumentsOfSignature = 32,
UseFullyQualifiedType = 64,
@@ -1844,13 +1843,14 @@ declare namespace ts {
InFirstTypeArgument = 4194304,
InTypeAlias = 8388608,
/** @deprecated */ WriteOwnNameForAnyLike = 0,
NodeBuilderFlagsMask = 9469295,
NodeBuilderFlagsMask = 9469291,
}
enum SymbolFormatFlags {
None = 0,
WriteTypeParametersOrArguments = 1,
UseOnlyExternalAliasing = 2,
AllowAnyNodeKind = 4,
UseAliasDefinedOutsideCurrentScope = 8,
}
/**
* @deprecated
@@ -2192,6 +2192,7 @@ declare namespace ts {
isFixed: boolean;
}
enum InferenceFlags {
None = 0,
InferUnionTypes = 1,
NoDefault = 2,
AnyDefault = 4,
@@ -2266,6 +2267,7 @@ declare namespace ts {
charset?: string;
checkJs?: boolean;
declaration?: boolean;
emitDeclarationOnly?: boolean;
declarationDir?: string;
disableSizeLimit?: boolean;
downlevelIteration?: boolean;
@@ -3976,7 +3978,7 @@ declare namespace ts {
}
declare namespace ts {
type DiagnosticReporter = (diagnostic: Diagnostic) => void;
type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string) => void;
type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: T) => T;
interface WatchCompilerHost<T extends BuilderProgram> {
/**
@@ -3986,7 +3988,7 @@ declare namespace ts {
/** If provided, callback to invoke after every new program creation */
afterProgramCreate?(program: T): void;
/** If provided, called with Diagnostic message that informs about change in watch status */
onWatchStatusChange?(diagnostic: Diagnostic, newLine: string): void;
onWatchStatusChange?(diagnostic: Diagnostic, newLine: string, options: CompilerOptions): void;
useCaseSensitiveFileNames(): boolean;
getNewLine(): string;
getCurrentDirectory(): string;
lib/typescriptServices.js
+454 -269
View File
File diff suppressed because it is too large Load Diff
lib/typingsInstaller.js
+27 -21
View File
@@ -142,7 +142,7 @@ var ts;
var ts;
(function (ts) {
ts.versionMajorMinor = "2.7";
ts.version = ts.versionMajorMinor + ".1";
ts.version = ts.versionMajorMinor + ".2";
})(ts || (ts = {}));
(function (ts) {
function isExternalModuleNameRelative(moduleName) {
@@ -2547,7 +2547,7 @@ var ts;
}
ts.getNodeMajorVersion = getNodeMajorVersion;
ts.sys = (function () {
var utf8ByteOrderMark = "\u00EF\u00BB\u00BF";
var byteOrderMarkIndicator = "\uFEFF";
function getNodeSystem() {
var _fs = require("fs");
var _path = require("path");
@@ -2711,7 +2711,7 @@ var ts;
}
function writeFile(fileName, data, writeByteOrderMark) {
if (writeByteOrderMark) {
data = utf8ByteOrderMark + data;
data = byteOrderMarkIndicator + data;
}
var fd;
try {
@@ -2893,7 +2893,7 @@ var ts;
},
writeFile: function (path, data, writeByteOrderMark) {
if (writeByteOrderMark) {
data = utf8ByteOrderMark + data;
data = byteOrderMarkIndicator + data;
}
ChakraHost.writeFile(path, data);
},
@@ -3658,6 +3658,7 @@ var ts;
Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: diag(6011, ts.DiagnosticCategory.Message, "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", "Allow default imports from modules with no default export. This does not affect code emit, just typechecking."),
Skip_type_checking_of_declaration_files: diag(6012, ts.DiagnosticCategory.Message, "Skip_type_checking_of_declaration_files_6012", "Skip type checking of declaration files."),
Do_not_resolve_the_real_path_of_symlinks: diag(6013, ts.DiagnosticCategory.Message, "Do_not_resolve_the_real_path_of_symlinks_6013", "Do not resolve the real path of symlinks."),
Only_emit_d_ts_declaration_files: diag(6014, ts.DiagnosticCategory.Message, "Only_emit_d_ts_declaration_files_6014", "Only emit '.d.ts' declaration files."),
Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'."),
Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext: diag(6016, ts.DiagnosticCategory.Message, "Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext_6016", "Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'."),
Print_this_message: diag(6017, ts.DiagnosticCategory.Message, "Print_this_message_6017", "Print this message."),
@@ -15991,6 +15992,12 @@ var ts;
category: ts.Diagnostics.Basic_Options,
description: ts.Diagnostics.Generates_corresponding_d_ts_file,
},
{
name: "emitDeclarationOnly",
type: "boolean",
category: ts.Diagnostics.Advanced_Options,
description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
},
{
name: "sourceMap",
type: "boolean",
@@ -17031,7 +17038,7 @@ var ts;
return x === undefined || x === null;
}
function directoryOfCombinedPath(fileName, basePath) {
return ts.getDirectoryPath(ts.toPath(fileName, basePath, ts.identity));
return ts.getDirectoryPath(ts.getNormalizedAbsolutePath(fileName, basePath));
}
function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
if (existingOptions === void 0) { existingOptions = {}; }
@@ -17039,8 +17046,7 @@ var ts;
if (extraFileExtensions === void 0) { extraFileExtensions = []; }
ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
var errors = [];
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, getCanonicalFileName, resolutionStack, errors);
var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
var raw = parsedConfig.raw;
var options = ts.extend(existingOptions, parsedConfig.options || {});
options.configFilePath = configFileName;
@@ -17120,19 +17126,19 @@ var ts;
function isSuccessfulParsedTsconfig(value) {
return !!value.options;
}
function parseConfig(json, sourceFile, host, basePath, configFileName, getCanonicalFileName, resolutionStack, errors) {
function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
basePath = ts.normalizeSlashes(basePath);
var resolvedPath = ts.toPath(configFileName || "", basePath, getCanonicalFileName);
var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
if (resolutionStack.indexOf(resolvedPath) >= 0) {
errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> ")));
return { raw: json || convertToObject(sourceFile, errors) };
}
var ownConfig = json ?
parseOwnConfigOfJson(json, host, basePath, getCanonicalFileName, configFileName, errors) :
parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, getCanonicalFileName, configFileName, errors);
parseOwnConfigOfJson(json, host, basePath, configFileName, errors) :
parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors);
if (ownConfig.extendedConfigPath) {
resolutionStack = resolutionStack.concat([resolvedPath]);
var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, getCanonicalFileName, resolutionStack, errors);
var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
var baseRaw_1 = extendedConfig.raw;
var raw_1 = ownConfig.raw;
@@ -17153,7 +17159,7 @@ var ts;
}
return ownConfig;
}
function parseOwnConfigOfJson(json, host, basePath, getCanonicalFileName, configFileName, errors) {
function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
if (ts.hasProperty(json, "excludes")) {
errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
}
@@ -17167,12 +17173,12 @@ var ts;
}
else {
var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, getCanonicalFileName, errors, ts.createCompilerDiagnostic);
extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, errors, ts.createCompilerDiagnostic);
}
}
return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
}
function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, getCanonicalFileName, configFileName, errors) {
function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors) {
var options = getDefaultCompilerOptions(configFileName);
var typeAcquisition, typingOptionstypeAcquisition;
var extendedConfigPath;
@@ -17190,7 +17196,7 @@ var ts;
switch (key) {
case "extends":
var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
extendedConfigPath = getExtendsConfigPath(value, host, newBase, getCanonicalFileName, errors, function (message, arg0) {
extendedConfigPath = getExtendsConfigPath(value, host, newBase, errors, function (message, arg0) {
return ts.createDiagnosticForNodeInSourceFile(sourceFile, valueNode, message, arg0);
});
return;
@@ -17224,13 +17230,13 @@ var ts;
}
return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
}
function getExtendsConfigPath(extendedConfig, host, basePath, getCanonicalFileName, errors, createDiagnostic) {
function getExtendsConfigPath(extendedConfig, host, basePath, errors, createDiagnostic) {
extendedConfig = ts.normalizeSlashes(extendedConfig);
if (!(ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../"))) {
errors.push(createDiagnostic(ts.Diagnostics.A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not, extendedConfig));
return undefined;
}
var extendedConfigPath = ts.toPath(extendedConfig, basePath, getCanonicalFileName);
var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json")) {
extendedConfigPath = extendedConfigPath + ".json";
if (!host.fileExists(extendedConfigPath)) {
@@ -17240,7 +17246,7 @@ var ts;
}
return extendedConfigPath;
}
function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, getCanonicalFileName, resolutionStack, errors) {
function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
if (sourceFile) {
(sourceFile.extendedSourceFiles || (sourceFile.extendedSourceFiles = [])).push(extendedResult.fileName);
@@ -17250,12 +17256,12 @@ var ts;
return undefined;
}
var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
var extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), getCanonicalFileName, resolutionStack, errors);
var extendedConfig = parseConfig(undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
if (sourceFile) {
(_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
}
if (isSuccessfulParsedTsconfig(extendedConfig)) {
var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, getCanonicalFileName);
var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
var mapPropertiesInRawIfNotUndefined = function (propertyName) {
if (raw_2[propertyName]) {