From d2fd6437d76b842ef64df8038659df634e67083c Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 18 Nov 2015 21:46:45 -0800 Subject: [PATCH 001/160] initial implementation of path mapping based module resolution --- src/compiler/commandLineParser.ts | 81 ++++-- src/compiler/diagnosticMessages.json | 31 +- src/compiler/program.ts | 273 +++++++++++++++++- src/compiler/tsc.ts | 6 +- src/compiler/types.ts | 24 +- src/harness/compilerRunner.ts | 21 +- src/harness/harness.ts | 31 +- .../pathMappingBasedModuleResolution1.js | 27 ++ .../pathMappingBasedModuleResolution1.symbols | 25 ++ .../pathMappingBasedModuleResolution1.types | 28 ++ .../pathMappingBasedModuleResolution10.js | 34 +++ ...pathMappingBasedModuleResolution10.symbols | 29 ++ .../pathMappingBasedModuleResolution10.types | 32 ++ .../pathMappingBasedModuleResolution10_1.js | 34 +++ ...thMappingBasedModuleResolution10_1.symbols | 29 ++ ...pathMappingBasedModuleResolution10_1.types | 32 ++ .../pathMappingBasedModuleResolution10_2.js | 34 +++ ...thMappingBasedModuleResolution10_2.symbols | 29 ++ ...pathMappingBasedModuleResolution10_2.types | 32 ++ .../pathMappingBasedModuleResolution1_1.js | 27 ++ ...athMappingBasedModuleResolution1_1.symbols | 25 ++ .../pathMappingBasedModuleResolution1_1.types | 28 ++ .../pathMappingBasedModuleResolution2.js | 23 ++ .../pathMappingBasedModuleResolution2.symbols | 22 ++ .../pathMappingBasedModuleResolution2.types | 25 ++ .../pathMappingBasedModuleResolution2_1.js | 23 ++ ...athMappingBasedModuleResolution2_1.symbols | 22 ++ .../pathMappingBasedModuleResolution2_1.types | 25 ++ .../pathMappingBasedModuleResolution3.js | 23 ++ .../pathMappingBasedModuleResolution3.symbols | 22 ++ .../pathMappingBasedModuleResolution3.types | 25 ++ .../pathMappingBasedModuleResolution3_1.js | 23 ++ ...athMappingBasedModuleResolution3_1.symbols | 22 ++ .../pathMappingBasedModuleResolution3_1.types | 25 ++ .../pathMappingBasedModuleResolution4.js | 27 ++ .../pathMappingBasedModuleResolution4.symbols | 22 ++ .../pathMappingBasedModuleResolution4.types | 25 ++ .../pathMappingBasedModuleResolution4_1.js | 27 ++ ...athMappingBasedModuleResolution4_1.symbols | 22 ++ .../pathMappingBasedModuleResolution4_1.types | 25 ++ ...thMappingBasedModuleResolution5.errors.txt | 6 + .../pathMappingBasedModuleResolution5.js | 5 + ...thMappingBasedModuleResolution6.errors.txt | 8 + .../pathMappingBasedModuleResolution6.js | 7 + .../pathMappingBasedModuleResolution7.js | 40 +++ .../pathMappingBasedModuleResolution7.symbols | 44 +++ .../pathMappingBasedModuleResolution7.types | 53 ++++ .../pathMappingBasedModuleResolution7_1.js | 40 +++ ...athMappingBasedModuleResolution7_1.symbols | 44 +++ .../pathMappingBasedModuleResolution7_1.types | 53 ++++ .../pathMappingBasedModuleResolution7_2.js | 50 ++++ ...athMappingBasedModuleResolution7_2.symbols | 57 ++++ .../pathMappingBasedModuleResolution7_2.types | 69 +++++ .../pathMappingBasedModuleResolution8.js | 40 +++ .../pathMappingBasedModuleResolution8.symbols | 44 +++ .../pathMappingBasedModuleResolution8.types | 53 ++++ .../pathMappingBasedModuleResolution8_1.js | 50 ++++ ...athMappingBasedModuleResolution8_1.symbols | 57 ++++ .../pathMappingBasedModuleResolution8_1.types | 69 +++++ .../pathMappingBasedModuleResolution9.js | 47 +++ .../pathMappingBasedModuleResolution9.symbols | 48 +++ .../pathMappingBasedModuleResolution9.types | 57 ++++ .../pathMappingBasedModuleResolution9_1.js | 57 ++++ ...athMappingBasedModuleResolution9_1.symbols | 61 ++++ .../pathMappingBasedModuleResolution9_1.types | 73 +++++ .../pathMappingBasedModuleResolution9_2.js | 57 ++++ ...athMappingBasedModuleResolution9_2.symbols | 61 ++++ .../pathMappingBasedModuleResolution9_2.types | 73 +++++ .../pathMappingBasedModuleResolution1.ts | 18 ++ .../pathMappingBasedModuleResolution10.ts | 34 +++ .../pathMappingBasedModuleResolution10_1.ts | 35 +++ .../pathMappingBasedModuleResolution10_2.ts | 36 +++ .../pathMappingBasedModuleResolution1_1.ts | 18 ++ .../pathMappingBasedModuleResolution2.ts | 22 ++ .../pathMappingBasedModuleResolution2_1.ts | 22 ++ .../pathMappingBasedModuleResolution3.ts | 23 ++ .../pathMappingBasedModuleResolution3_1.ts | 23 ++ .../pathMappingBasedModuleResolution4.ts | 23 ++ .../pathMappingBasedModuleResolution4_1.ts | 23 ++ .../pathMappingBasedModuleResolution5.ts | 13 + .../pathMappingBasedModuleResolution6.ts | 17 ++ .../pathMappingBasedModuleResolution7.ts | 38 +++ .../pathMappingBasedModuleResolution7_1.ts | 38 +++ .../pathMappingBasedModuleResolution7_2.ts | 44 +++ .../pathMappingBasedModuleResolution8.ts | 39 +++ .../pathMappingBasedModuleResolution8_1.ts | 45 +++ .../pathMappingBasedModuleResolution9.ts | 42 +++ .../pathMappingBasedModuleResolution9_1.ts | 48 +++ .../pathMappingBasedModuleResolution9_2.ts | 48 +++ tests/cases/unittests/moduleResolution.ts | 128 ++++++++ 90 files changed, 3391 insertions(+), 49 deletions(-) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_2.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_2.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.types create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution2.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution5.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution6.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution8.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 3fca97c0450..70513219000 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -250,10 +250,12 @@ namespace ts { name: "moduleResolution", type: { "node": ModuleResolutionKind.NodeJs, - "classic": ModuleResolutionKind.Classic + "classic": ModuleResolutionKind.Classic, + // name is lowercased so we can still use hasProperty(userValue.toLower()) to check if user has entered the right value + "baseurl": ModuleResolutionKind.BaseUrl, }, description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6, - error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic, + error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl, }, { name: "allowUnusedLabels", @@ -279,6 +281,26 @@ namespace ts { name: "forceConsistentCasingInFileNames", type: "boolean", description: Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file + }, + { + name: "baseUrl", + type: "string", + isFilePath: true, + description: Diagnostics.Base_directory_to_resolve_relative_module_names + }, + { + // this option can only be specified in tsconfig.json + // use type = object to copy the value as-is + name: "paths", + type: "object", + isTSConfigOnly: true + }, + { + // this option can only be specified in tsconfig.json + // use type = object to copy the value as-is + name: "rootDirs", + type: "object", + isTSConfigOnly: true } ]; @@ -339,31 +361,36 @@ namespace ts { if (hasProperty(optionNameMap, s)) { const opt = optionNameMap[s]; - // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). - if (!args[i] && opt.type !== "boolean") { - errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); + if (opt.isTSConfigOnly) { + errors.push(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name)); } + else { + // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument). + if (!args[i] && opt.type !== "boolean") { + errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_expects_an_argument, opt.name)); + } - switch (opt.type) { - case "number": - options[opt.name] = parseInt(args[i++]); - break; - case "boolean": - options[opt.name] = true; - break; - case "string": - options[opt.name] = args[i++] || ""; - break; - // If not a primitive, the possible types are specified in what is effectively a map of options. - default: - let map = >opt.type; - let key = (args[i++] || "").toLowerCase(); - if (hasProperty(map, key)) { - options[opt.name] = map[key]; - } - else { - errors.push(createCompilerDiagnostic((opt).error)); - } + switch (opt.type) { + case "number": + options[opt.name] = parseInt(args[i++]); + break; + case "boolean": + options[opt.name] = true; + break; + case "string": + options[opt.name] = args[i++] || ""; + break; + // If not a primitive, the possible types are specified in what is effectively a map of options. + default: + let map = >opt.type; + let key = (args[i++] || "").toLowerCase(); + if (hasProperty(map, key)) { + options[opt.name] = map[key]; + } + else { + errors.push(createCompilerDiagnostic((opt).error)); + } + } } } else { @@ -466,7 +493,6 @@ namespace ts { return output; } - /** * Parse the contents of a config file (tsconfig.json). * @param json The contents of the config file to parse @@ -477,6 +503,9 @@ namespace ts { export function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine { const { options, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath); + // set basePath as inferredBaseUrl so baseUrl module resolution strategy can still work even if user have not specified baseUrl explicity + options.inferredBaseUrl = basePath; + return { options, fileNames: getFileNames(), diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index ad71d646b7b..39b7fad4a49 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2060,7 +2060,26 @@ "category": "Error", "code": 5054 }, - + "Option '{0}' can only be used when option 'moduleResolution' is 'baseUrl'.": { + "category": "Error", + "code": 5055 + }, + "Pattern '{0}' can have at most one '*' character": { + "category": "Error", + "code": 5056 + }, + "Substitution '{0}' in pattern '{1}' in can have at most one '*' character": { + "category": "Error", + "code": 5057 + }, + "'moduleResolution' kind 'baseUrl' cannot be used without specifying '--baseUrl' option.": { + "category": "Error", + "code": 5058 + }, + "Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option.": { + "category": "Error", + "code": 5059 + }, "Concatenate and emit output to single file.": { "category": "Message", "code": 6001 @@ -2253,10 +2272,14 @@ "category": "Error", "code": 6062 }, - "Argument for '--moduleResolution' option must be 'node' or 'classic'.": { + "Argument for '--moduleResolution' option must be 'node', 'classic' or 'baseUrl'.": { "category": "Error", "code": 6063 }, + "Option '{0}' can only be specified in 'tsconfig.json' file.": { + "category": "Error", + "code": 6064 + }, "Enables experimental support for ES7 decorators.": { "category": "Message", @@ -2322,6 +2345,10 @@ "category": "Error", "code": 6082 }, + "Base directory to resolve relative module names.": { + "category": "Message", + "code": 6083 + }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", "code": 7005 diff --git a/src/compiler/program.ts b/src/compiler/program.ts index dc31dfb5213..36f01e77ece 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -37,23 +37,221 @@ namespace ts { } export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { - const moduleResolution = compilerOptions.moduleResolution !== undefined - ? compilerOptions.moduleResolution - : compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic; + let moduleResolution = compilerOptions.moduleResolution; + if (moduleResolution === undefined) { + if (compilerOptions.module === ModuleKind.CommonJS) { + moduleResolution = ModuleResolutionKind.NodeJs; + } + else if (compilerOptions.baseUrl !== undefined || compilerOptions.paths || compilerOptions.rootDirs) { + moduleResolution = ModuleResolutionKind.BaseUrl; + } + else { + moduleResolution = ModuleResolutionKind.Classic; + } + } switch (moduleResolution) { case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, host); case ModuleResolutionKind.Classic: return classicNameResolver(moduleName, containingFile, compilerOptions, host); + case ModuleResolutionKind.BaseUrl: return baseUrlModuleNameResolver(moduleName, containingFile, compilerOptions, host); } } + // Path mapping based module resolution strategy uses base url to resolve relative file names. This resolution strategy can be enabled + // by setting 'moduleResolution' option to 'baseUrl' and as it implied by the name it uses base url to resolve module names. + // Base url can be specified: + // - explicitly via command line option 'baseUrl'. If this value is relative it will be computed relative to current directory. + // - explicitly in 'tsconfig.json' via 'baseUrl' compiler option. If this value is relative it will be computed relative to the location + // of 'tsconfig.json'. + // - if value is not provided explicitly but project uses tsconfig.json then 'baseUrl' will be set of folder that contains 'tsconfig.json' + // If baseUrl is the only provided option then non-relative module names will be resolved relative to baseUrl. Relative module names + // will still be resolved relative to the folder that contains file with import. + // User can specify additional options in tsconfig.json to tweak module resolution. + // - 'paths' option allows to tune how non-relative module names will be resolved based on the content of the module name. + // Structure of 'paths' compiler options + // 'paths': { + // pattern-1: list of substitutions 1, + // pattern-2: list of substitutions 2, + // ... + // pattern-n: list of substitutions-n + // } + // Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against + // all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case. + // If pattern contains '*' then to match pattern "*" module name must start with the and end with . + // denotes part of the module name between and . + // If module name can be matches with multiple patterns then pattern with the longest prefix will be picked. + // After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module from the candidate location. + // Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every substitution in the list + // and replace '*' with string. If candidate location is not rooted it will be converted to absolute using baseUrl. + // For example: + // baseUrl: /a/b/c + // "paths": { + // // match all module names + // "*": [ + // "*", // use matched name as is, + // // will be looked as /a/b/c/ + // + // "folder1/*" // substitution will convert matched name to 'folder1/', + // // since it is not rooted then final candidate location will be /a/b/c/folder1/ + // ], + // // match module names that start with 'components/' + // "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/ to '/root/components/folder1/', + // // it is rooted so it will be final candidate location + // } + // 'paths' allows to remap locations of non-relative module names. Relative module names usually are resolved relative to the folder + // that contains import. However sometimes it might be useful to apply mappings to relative module names as well. + // Since the there might be different relative file names that refer to the same file we need to convert relative module name to non-relative + // so we can just apply path mapping to it. This conversion can be performed using 'rootDirs' compiler option - this options stores list of root directories + // for the project (if root directory is not absolute it will be converted to absolute using baseUrl as a base path). + // First - we convert relative module name to absolute using location of file that contains import. + // Then we try to find what element is rootDirs is the longest prefix for this absolute file name (respecting case): + // = + // Once it is done - value of is a be non-relative name for initially relative module name. + // Note that if element in rootDirs should always end with '/' so it will be appended automatically if value in configuration does not have it. + // For example: + // baseUrl: /a/b/c + // "paths": { + // "*": [ "*", "generated/*" ] // try to resolve module name as '/a/b/c/' then look it in '/a/b/c/generated/' + // } + // "rootDirs": [ + // "./src", // root dir is project baseUrl/src + // "./generated" // root dir is baseUrl/generated + // "/e/f" // root dir is /e/f + // ] + // @file: /a/b/c/src/form1.ts + // import {x} from "./form.content.ts" + // @file: /a/b/c/generated/form1.content.ts + // export var x = ... + // first './form.content.ts' needs to be converted to non-relative name. + // 1. convert it to absolute name '/a/b/c/src/form1.content.ts' -> + // find longest prefix in rootDirs that match this path, it will be './src' (after expansion '/a/b/c/src/') -> + // suffix is form1.content.ts + // 2. apply path mappings to 'form1.content.ts' -> + // '*' pattern will be matched -> + // '*' substitution yields '/a/b/c/form1.content.ts' - file does not exists + // 'generated/*' substitution yields '/a/b/c/generated/form1.content' - file exists - OK + export function baseUrlModuleNameResolver(moduleName: string, containingFile: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + const baseUrl = options.baseUrl !== undefined ? options.baseUrl : options.inferredBaseUrl; + Debug.assert(baseUrl !== undefined); + + if (isRootedDiskPath(moduleName)) { + return { resolvedModule: { resolvedFileName: moduleName }, failedLookupLocations: emptyArray }; + } + + if (nameStartsWithDotSlashOrDotDotSlash(moduleName)) { + // relative name + return baseUrlResolveRelativeModuleName(moduleName, containingFile, baseUrl, options, host); + } + else { + // non-relative name + return baseUrlResolveNonRelativeModuleName(moduleName, baseUrl, options, host); + } + } + + export function baseUrlResolveRelativeModuleName(moduleName: string, containingFile: string, baseUrl: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + const failedLookupLocations: string[] = []; + + const containingDirectory = getDirectoryPath(containingFile); + const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); + + if (options.rootDirs) { + let matchedPrefix: string; + for (const rootDir of options.rootDirs) { + let normalizedRoot = getNormalizedAbsolutePath(rootDir, baseUrl); + if (!endsWith(normalizedRoot, directorySeparator)) { + normalizedRoot += directorySeparator; + } + if (startsWith(candidate, normalizedRoot) && (matchedPrefix === undefined || matchedPrefix.length < normalizedRoot.length)) { + matchedPrefix = normalizedRoot; + } + } + if (matchedPrefix) { + const suffix = candidate.substr(matchedPrefix.length); + return baseUrlResolveNonRelativeModuleName(suffix, baseUrl, options, host); + } + return { resolvedModule: undefined, failedLookupLocations }; + } + else { + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + return { + resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, + failedLookupLocations + }; + } + } + + export function baseUrlResolveNonRelativeModuleName(moduleName: string, baseUrl: string, options: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + let longestMatchPrefixLength = -1; + let matchedPattern: string; + let matchedStar: string; + + const failedLookupLocations: string[] = []; + if (options.paths) { + for (const key in options.paths) { + const pattern: string = key; + const indexOfStar = pattern.indexOf("*"); + if (indexOfStar !== -1) { + const prefix = pattern.substr(0, indexOfStar); + const suffix = pattern.substr(indexOfStar + 1); + if (moduleName.length >= prefix.length + suffix.length && + startsWith(moduleName, prefix) && + endsWith(moduleName, suffix)) { + + // use length of prefix as betterness criteria + if (prefix.length > longestMatchPrefixLength) { + longestMatchPrefixLength = prefix.length; + matchedPattern = pattern; + matchedStar = moduleName.substr(prefix.length, moduleName.length - suffix.length); + } + } + } + else if (pattern === moduleName) { + // pattern was matched as is - no need to seatch further + matchedPattern = pattern; + matchedStar = undefined; + break; + } + } + } + + if (matchedPattern) { + for (const subst of options.paths[matchedPattern]) { + const path = matchedStar ? subst.replace("\*", matchedStar) : subst; + const candidate = normalizePath(combinePaths(baseUrl, path)); + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + if (resolvedFileName) { + return { resolvedModule: { resolvedFileName }, failedLookupLocations }; + } + } + + return { resolvedModule: undefined, failedLookupLocations }; + } + else { + const candidate = normalizePath(combinePaths(baseUrl, moduleName)); + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + return { + resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, + failedLookupLocations + }; + } + } + + function startsWith(str: string, prefix: string): boolean { + return str.lastIndexOf(prefix, 0) === 0; + } + + function endsWith(str: string, suffix: string): boolean { + const expectedPos = str.length - suffix.length; + return str.indexOf(suffix, expectedPos) === expectedPos; + } + export function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const containingDirectory = getDirectoryPath(containingFile); - if (getRootLength(moduleName) !== 0 || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { + if (isRootedDiskPath(moduleName) || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { const failedLookupLocations: string[] = []; const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - let resolvedFileName = loadNodeModuleFromFile(supportedJsExtensions, candidate, failedLookupLocations, host); + let resolvedFileName = loadModuleFromFile(supportedJsExtensions, candidate, failedLookupLocations, host); if (resolvedFileName) { return { resolvedModule: { resolvedFileName }, failedLookupLocations }; @@ -69,7 +267,7 @@ namespace ts { } } - function loadNodeModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string { + function loadModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string { return forEach(extensions, tryLoad); function tryLoad(ext: string): string { @@ -100,7 +298,7 @@ namespace ts { } if (jsonContent.typings) { - const result = loadNodeModuleFromFile(extensions, normalizePath(combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + const result = loadModuleFromFile(extensions, normalizePath(combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); if (result) { return result; } @@ -111,7 +309,7 @@ namespace ts { failedLookupLocation.push(packageJsonPath); } - return loadNodeModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host); + return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host); } function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { @@ -122,7 +320,7 @@ namespace ts { if (baseName !== "node_modules") { const nodeModulesFolder = combinePaths(directory, "node_modules"); const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName)); - let result = loadNodeModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + let result = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } @@ -149,6 +347,22 @@ namespace ts { return i === 0 || (i === 1 && name.charCodeAt(0) === CharacterCodes.dot); } + function hasZeroOrOneAsteriskCharacter(str: string): boolean { + let seenAsterisk = false; + for (let i = 0; i < str.length; ++i) { + if (str.charCodeAt(i) === CharacterCodes.asterisk) { + if (!seenAsterisk) { + seenAsterisk = true; + } + else { + // have already seen asterisk + return false; + } + } + } + return true; + } + export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { // module names that contain '!' are used to reference resources and are not resolved to actual files on disk @@ -997,6 +1211,47 @@ namespace ts { } } + if (options.moduleResolution === ModuleResolutionKind.BaseUrl) { + if (options.baseUrl === undefined && options.inferredBaseUrl === undefined) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.moduleResolution_kind_baseUrl_cannot_be_used_without_specifying_baseUrl_option)); + } + } + else if (options.moduleResolution === undefined) { + // if module resolution kind is not specified it is an error to have baseUrl\paths\rootDirs and module === CommonJs + // since the former one implies moduleResolutionKind to be BaseUrl and the latter one - Node + if (options.module === ModuleKind.CommonJS && (options.baseUrl || options.paths || options.rootDirs)) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Module_resolution_kind_cannot_be_determined_automatically_Please_specify_module_resolution_explicitly_via_moduleResolution_option)); + } + } + else { + // here it is known that moduleResolution is not baseurl and is not undefined + if (options.baseUrl !== undefined) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "baseUrl")); + } + if (options.paths) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "paths")); + } + if (options.rootDirs) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "rootDirs")); + } + } + + if (options.paths) { + for (const key in options.paths) { + if (!hasProperty(options.paths, key)) { + continue; + } + if (!hasZeroOrOneAsteriskCharacter(key)) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key)); + } + for (const subst of options.paths[key]) { + if (!hasZeroOrOneAsteriskCharacter(subst)) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key)); + } + } + } + } + if (options.inlineSources) { if (!options.sourceMap && !options.inlineSourceMap) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_inlineSources_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided)); diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index f560a15dfb9..12a538156f4 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -360,7 +360,7 @@ namespace ts { sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); return; } - const configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName)); + const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory())); if (configParseResult.errors.length > 0) { reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined); sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); @@ -723,7 +723,9 @@ namespace ts { for (const name in options) { if (hasProperty(options, name)) { - const value = options[name]; + // tsconfig only options cannot be specified via command line, + // so we can assume that only types that can appear here string | number | boolean + const value = options[name]; switch (name) { case "init": case "watch": diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 34be02c5ba5..3cedb9b4123 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2310,9 +2310,14 @@ namespace ts { export const enum ModuleResolutionKind { Classic = 1, - NodeJs = 2 + NodeJs = 2, + BaseUrl = 3 } + export type RootPaths = string[]; + export type PathSubstitutions = Map; + export type TsConfigOnlyOptions = RootPaths | PathSubstitutions; + export interface CompilerOptions { allowNonTsExtensions?: boolean; charset?: string; @@ -2360,12 +2365,17 @@ namespace ts { noImplicitReturns?: boolean; noFallthroughCasesInSwitch?: boolean; forceConsistentCasingInFileNames?: boolean; + baseUrl?: string; + paths?: PathSubstitutions; + rootDirs?: RootPaths; /* @internal */ stripInternal?: boolean; // Skip checking lib.d.ts to help speed up tests. /* @internal */ skipDefaultLibCheck?: boolean; + // inferred baseUrl - currently this will be set in 'parseJsonConfigFileContent' to 'baseDir' + /* @internal */ inferredBaseUrl?: string; - [option: string]: string | number | boolean; + [option: string]: string | number | boolean | TsConfigOnlyOptions; } export const enum ModuleKind { @@ -2425,12 +2435,13 @@ namespace ts { /* @internal */ export interface CommandLineOptionBase { name: string; - type: "string" | "number" | "boolean" | Map; // a value of a primitive type, or an object literal mapping named values to actual values + type: "string" | "number" | "boolean" | "object" | Map; // a value of a primitive type, or an object literal mapping named values to actual values isFilePath?: boolean; // True if option value is a path or fileName shortName?: string; // A short mnemonic for convenience - for instance, 'h' can be used in place of 'help' description?: DiagnosticMessage; // The message describing what the command line switch does paramType?: DiagnosticMessage; // The name to be used for a non-boolean option's parameter experimental?: boolean; + isTSConfigOnly?: boolean; // True if option can only be specified via tsconfig.json file } /* @internal */ @@ -2445,7 +2456,12 @@ namespace ts { } /* @internal */ - export type CommandLineOption = CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType; + export interface TsConfigOnlyOption extends CommandLineOptionBase { + type: "object"; + } + + /* @internal */ + export type CommandLineOption = CommandLineOptionOfCustomType | CommandLineOptionOfPrimitiveType | TsConfigOnlyOption; /* @internal */ export const enum CharacterCodes { diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 425fa888013..53e740db336 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -49,7 +49,6 @@ class CompilerBaselineRunner extends RunnerBase { // Mocha holds onto the closure environment of the describe callback even after the test is done. // Everything declared here should be cleared out in the "after" callback. let justName: string; - let lastUnit: Harness.TestCaseParser.TestUnitData; let harnessSettings: Harness.TestCaseParser.CompilerSettings; @@ -63,16 +62,30 @@ class CompilerBaselineRunner extends RunnerBase { before(() => { justName = fileName.replace(/^.*[\\\/]/, ""); // strips the fileName from the path. const content = Harness.IO.readFile(fileName); - const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName); + const rootDir = fileName.indexOf("conformance") === -1 ? "tests/cases/compiler/" : ts.getDirectoryPath(fileName) + "/"; + const testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName, rootDir); const units = testCaseContent.testUnitData; harnessSettings = testCaseContent.settings; + let tsConfigOptions: ts.CompilerOptions; + if (testCaseContent.tsConfig) { + assert.equal(testCaseContent.tsConfig.fileNames.length, 0, `list of files in tsconfig is not currently supported`); + + tsConfigOptions = ts.clone(testCaseContent.tsConfig.options); + } + else { + const baseUrl = harnessSettings["baseUrl"]; + if (baseUrl !== undefined && !ts.isRootedDiskPath(baseUrl)) { + harnessSettings["baseUrl"] = ts.getNormalizedAbsolutePath(baseUrl, rootDir); + } + } + lastUnit = units[units.length - 1]; - const rootDir = lastUnit.originalFilePath.indexOf("conformance") === -1 ? "tests/cases/compiler/" : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf("/")) + "/"; // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test) // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references, // otherwise, assume all files are just meant to be in the same compilation session without explicit references to one another. toBeCompiled = []; otherFiles = []; + if (/require\(/.test(lastUnit.content) || /reference\spath/.test(lastUnit.content)) { toBeCompiled.push({ unitName: this.makeUnitName(lastUnit.name, rootDir), content: lastUnit.content }); units.forEach(unit => { @@ -88,7 +101,7 @@ class CompilerBaselineRunner extends RunnerBase { } const output = Harness.Compiler.compileFiles( - toBeCompiled, otherFiles, harnessSettings, /* options */ undefined, /* currentDirectory */ undefined); + toBeCompiled, otherFiles, harnessSettings, /*options*/ tsConfigOptions, /*currentDirectory*/ undefined); options = output.options; result = output.result; diff --git a/src/harness/harness.ts b/src/harness/harness.ts index ef0f2678e29..183852ad516 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1000,6 +1000,9 @@ namespace Harness { if (options.useCaseSensitiveFileNames !== undefined) { useCaseSensitiveFileNames = options.useCaseSensitiveFileNames; } + if (options.inferredBaseUrl) { + options.inferredBaseUrl = ts.getNormalizedAbsolutePath(options.inferredBaseUrl, currentDirectory); + } const programFiles: TestFile[] = inputFiles.slice(); // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. @@ -1372,7 +1375,7 @@ namespace Harness { } /** Given a test file containing // @FileName directives, return an array of named units of code to be added to an existing compiler instance */ - export function makeUnitsFromTest(code: string, fileName: string): { settings: CompilerSettings; testUnitData: TestUnitData[]; } { + export function makeUnitsFromTest(code: string, fileName: string, rootDir?: string): { settings: CompilerSettings; testUnitData: TestUnitData[]; tsConfig: ts.ParsedCommandLine } { const settings = extractCompilerSettings(code); // List of all the subfiles we've parsed out @@ -1450,7 +1453,31 @@ namespace Harness { }; testUnitData.push(newTestFile2); - return { settings, testUnitData }; + // unit tests always list files explicitly + const parseConfigHost: ts.ParseConfigHost = { + readDirectory: (name) => [] + }; + + // check if project has tsconfig.json in the list of files + let tsConfig: ts.ParsedCommandLine; + for (let i = 0; i < testUnitData.length; ++i) { + const data = testUnitData[i]; + if (ts.getBaseFileName(data.name).toLowerCase() === "tsconfig.json") { + const configJson = ts.parseConfigFileTextToJson(data.name, data.content); + assert.isTrue(configJson.config !== undefined); + let baseDir = ts.normalizePath(ts.getDirectoryPath(data.name)); + if (rootDir) { + baseDir = ts.getNormalizedAbsolutePath(baseDir, rootDir); + } + tsConfig = ts.parseJsonConfigFileContent(configJson.config, parseConfigHost, baseDir); + + // delete entry from the list + testUnitData.splice(i, 1); + + break; + } + } + return { settings, testUnitData, tsConfig }; } } diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.js b/tests/baselines/reference/pathMappingBasedModuleResolution1.js new file mode 100644 index 00000000000..3a30893b5d1 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution1.ts] //// + +//// [file1.ts] + +// user defined base url + +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +// user defined base url +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols new file mode 100644 index 00000000000..377cd6a86dc --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/root/folder1/file1.ts === + +// user defined base url + +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== tests/cases/compiler/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.types b/tests/baselines/reference/pathMappingBasedModuleResolution1.types new file mode 100644 index 00000000000..68fc42a28f2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1.types @@ -0,0 +1,28 @@ +=== tests/cases/compiler/root/folder1/file1.ts === + +// user defined base url + +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== tests/cases/compiler/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.js b/tests/baselines/reference/pathMappingBasedModuleResolution10.js new file mode 100644 index 00000000000..0961ff87048 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution10.ts] //// + +//// [file1.ts] +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); + +//// [file2.ts] +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +//// [file3.ts] +export var x = 1; + +//// [file3.ts] +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { + exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' +}); +//// [file1.js] +define(["require", "exports", "./file2"], function (require, exports, file2_1) { + exports.z = file2_1.x.toExponential(); +}); +//// [file3.js] +define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { + var z = file1_1.z.toLowerCase(); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols new file mode 100644 index 00000000000..e01d12fc7e3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +export var z = x.toExponential(); +>z : Symbol(z, Decl(file1.ts, 2, 10)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== tests/cases/compiler/root/folder1/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== tests/cases/compiler/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : Symbol(y, Decl(file3.ts, 0, 8)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) + +let z = y.toLowerCase(); +>z : Symbol(z, Decl(file3.ts, 1, 3)) +>y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) +>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.types b/tests/baselines/reference/pathMappingBasedModuleResolution10.types new file mode 100644 index 00000000000..ac3caa8b532 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10.types @@ -0,0 +1,32 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : number + +export var z = x.toExponential(); +>z : string +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : number + +=== tests/cases/compiler/root/folder1/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : string +>y : string + +let z = y.toLowerCase(); +>z : string +>y.toLowerCase() : string +>y.toLowerCase : () => string +>y : string +>toLowerCase : () => string + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js new file mode 100644 index 00000000000..a7aa19bc304 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts] //// + +//// [file2.ts] +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +//// [file3.ts] +export var x = 1; + +//// [file3.ts] +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + +//// [file1.ts] +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); + + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { + exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' +}); +//// [file1.js] +define(["require", "exports", "./file2"], function (require, exports, file2_1) { + exports.z = file2_1.x.toExponential(); +}); +//// [file3.js] +define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { + var z = file1_1.z.toLowerCase(); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols new file mode 100644 index 00000000000..dbc1fc792d4 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols @@ -0,0 +1,29 @@ +=== c:/root/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/folder1/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== c:/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : Symbol(y, Decl(file3.ts, 0, 8)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) + +let z = y.toLowerCase(); +>z : Symbol(z, Decl(file3.ts, 1, 3)) +>y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) +>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) + +=== c:/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +export var z = x.toExponential(); +>z : Symbol(z, Decl(file1.ts, 2, 10)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types new file mode 100644 index 00000000000..bf617b2b1a3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types @@ -0,0 +1,32 @@ +=== c:/root/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : number + +=== c:/root/folder1/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : string +>y : string + +let z = y.toLowerCase(); +>z : string +>y.toLowerCase() : string +>y.toLowerCase : () => string +>y : string +>toLowerCase : () => string + +=== c:/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : number + +export var z = x.toExponential(); +>z : string +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js new file mode 100644 index 00000000000..b1e7af6d834 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts] //// + +//// [file2.ts] +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +//// [file3.ts] +export var x = 1; + +//// [file3.ts] +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + +//// [file1.ts] +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); + + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { + exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' +}); +//// [file1.js] +define(["require", "exports", "./file2"], function (require, exports, file2_1) { + exports.z = file2_1.x.toExponential(); +}); +//// [file3.js] +define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { + var z = file1_1.z.toLowerCase(); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols new file mode 100644 index 00000000000..64a308338c9 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols @@ -0,0 +1,29 @@ +=== c:/root/src/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/src/folder1/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== c:/root/src/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : Symbol(y, Decl(file3.ts, 0, 8)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) + +let z = y.toLowerCase(); +>z : Symbol(z, Decl(file3.ts, 1, 3)) +>y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) +>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) + +=== c:/root/src/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +export var z = x.toExponential(); +>z : Symbol(z, Decl(file1.ts, 2, 10)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types new file mode 100644 index 00000000000..0fc9270c667 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types @@ -0,0 +1,32 @@ +=== c:/root/src/generated/folder1/file2.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : number + +=== c:/root/src/folder1/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/src/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : string +>y : string + +let z = y.toLowerCase(); +>z : string +>y.toLowerCase() : string +>y.toLowerCase : () => string +>y : string +>toLowerCase : () => string + +=== c:/root/src/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' +>x : number + +export var z = x.toExponential(); +>z : string +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js new file mode 100644 index 00000000000..889eacfca51 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts] //// + +//// [file1.ts] + +// user defined base url + +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +// user defined base url +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols new file mode 100644 index 00000000000..20f69963c76 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols @@ -0,0 +1,25 @@ +=== c:/root/folder1/file1.ts === + +// user defined base url + +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.types new file mode 100644 index 00000000000..5b0727157ac --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.types @@ -0,0 +1,28 @@ +=== c:/root/folder1/file1.ts === + +// user defined base url + +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.js b/tests/baselines/reference/pathMappingBasedModuleResolution2.js new file mode 100644 index 00000000000..0d32bf187fe --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution2.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols new file mode 100644 index 00000000000..94f458ff1d3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== tests/cases/compiler/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.types b/tests/baselines/reference/pathMappingBasedModuleResolution2.types new file mode 100644 index 00000000000..ff6ef52f321 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== tests/cases/compiler/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js new file mode 100644 index 00000000000..5e3e3820e5c --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols new file mode 100644 index 00000000000..aa84fbf8cf9 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols @@ -0,0 +1,22 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.types new file mode 100644 index 00000000000..de76a17e406 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.types @@ -0,0 +1,25 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.js b/tests/baselines/reference/pathMappingBasedModuleResolution3.js new file mode 100644 index 00000000000..0c14be68978 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution3.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols new file mode 100644 index 00000000000..b071ecec087 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== tests/cases/compiler/root/src/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.types b/tests/baselines/reference/pathMappingBasedModuleResolution3.types new file mode 100644 index 00000000000..15428de5560 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== tests/cases/compiler/root/src/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js new file mode 100644 index 00000000000..ee827d8fa7d --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +exports.x = 1; +//// [file2.js] +var file3_1 = require("./file3"); +exports.x = file3_1.x; +//// [file1.js] +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols new file mode 100644 index 00000000000..835d16d46f4 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols @@ -0,0 +1,22 @@ +=== c:/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/src/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types new file mode 100644 index 00000000000..8db89ab12b7 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types @@ -0,0 +1,25 @@ +=== c:/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== c:/root/src/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.js b/tests/baselines/reference/pathMappingBasedModuleResolution4.js new file mode 100644 index 00000000000..5e66fabcd92 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution4.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "./file3"], function (require, exports, file3_1) { + exports.x = file3_1.x; +}); +//// [file1.js] +define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { + use(file2_1.x.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols new file mode 100644 index 00000000000..b071ecec087 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== tests/cases/compiler/root/src/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.types b/tests/baselines/reference/pathMappingBasedModuleResolution4.types new file mode 100644 index 00000000000..15428de5560 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== tests/cases/compiler/root/src/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js new file mode 100644 index 00000000000..ca2afc5bc59 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +//// [file2.ts] +export {x} from "./file3" + +//// [file3.ts] +export var x = 1; + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports", "./file3"], function (require, exports, file3_1) { + exports.x = file3_1.x; +}); +//// [file1.js] +define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { + use(file2_1.x.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols new file mode 100644 index 00000000000..835d16d46f4 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols @@ -0,0 +1,22 @@ +=== c:/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 2, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : Symbol(x, Decl(file2.ts, 0, 8)) + +=== c:/root/src/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types new file mode 100644 index 00000000000..8db89ab12b7 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types @@ -0,0 +1,25 @@ +=== c:/root/src/folder1/file1.ts === +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/src/folder2/file2.ts === +export {x} from "./file3" +>x : number + +=== c:/root/src/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt new file mode 100644 index 00000000000..71dd19b48f2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt @@ -0,0 +1,6 @@ +error TS5059: Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option. + + +!!! error TS5059: Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option. +==== tests/cases/compiler/root/src/folder1/file1.ts (0 errors) ==== + export var x = 1; \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5.js b/tests/baselines/reference/pathMappingBasedModuleResolution5.js new file mode 100644 index 00000000000..66783980a0a --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5.js @@ -0,0 +1,5 @@ +//// [file1.ts] +export var x = 1; + +//// [file1.js] +exports.x = 1; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt new file mode 100644 index 00000000000..8b5760eaf60 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt @@ -0,0 +1,8 @@ +error TS5056: Pattern '*1*' can have at most one '*' character +error TS5057: Substitution '*2*' in pattern '*1*' in can have at most one '*' character + + +!!! error TS5056: Pattern '*1*' can have at most one '*' character +!!! error TS5057: Substitution '*2*' in pattern '*1*' in can have at most one '*' character +==== tests/cases/compiler/root/src/folder1/file1.ts (0 errors) ==== + export var x = 1; \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6.js b/tests/baselines/reference/pathMappingBasedModuleResolution6.js new file mode 100644 index 00000000000..871b60535f1 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6.js @@ -0,0 +1,7 @@ +//// [file1.ts] +export var x = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.js b/tests/baselines/reference/pathMappingBasedModuleResolution7.js new file mode 100644 index 00000000000..292d0854fe3 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution7.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export var z = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols new file mode 100644 index 00000000000..4b7b9c15739 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols @@ -0,0 +1,44 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== tests/cases/compiler/root/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== tests/cases/compiler/root/shared/components/file3.ts === +export var z = 1; +>z : Symbol(z, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.types b/tests/baselines/reference/pathMappingBasedModuleResolution7.types new file mode 100644 index 00000000000..1bc1622b19f --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7.types @@ -0,0 +1,53 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/root/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== tests/cases/compiler/root/shared/components/file3.ts === +export var z = 1; +>z : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js new file mode 100644 index 00000000000..6a384e27c43 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export var z = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols new file mode 100644 index 00000000000..097f0747b47 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols @@ -0,0 +1,44 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== c:/root/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== c:/root/shared/components/file3.ts === +export var z = 1; +>z : Symbol(z, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types new file mode 100644 index 00000000000..9cc451eaa3b --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types @@ -0,0 +1,53 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== c:/root/shared/components/file3.ts === +export var z = 1; +>z : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.js new file mode 100644 index 00000000000..123fc1f9658 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.js @@ -0,0 +1,50 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export var z = 1; + +//// [file4.ts] +export var z1 = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z1 = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); + use(file4_1.z1.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols new file mode 100644 index 00000000000..a974a238200 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols @@ -0,0 +1,57 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +import {z1} from "file4" +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z1.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== c:/root/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== c:/root/shared/components/file3.ts === +export var z = 1; +>z : Symbol(z, Decl(file3.ts, 0, 10)) + +=== c:/sharedrepo/file4.ts === +export var z1 = 1; +>z1 : Symbol(z1, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.types new file mode 100644 index 00000000000..9a88412b623 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_2.types @@ -0,0 +1,69 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +import {z1} from "file4" +>z1 : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +use(z1.toExponential()); +>use(z1.toExponential()) : void +>use : (a: any) => void +>z1.toExponential() : string +>z1.toExponential : (fractionDigits?: number) => string +>z1 : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== c:/root/shared/components/file3.ts === +export var z = 1; +>z : number +>1 : number + +=== c:/sharedrepo/file4.ts === +export var z1 = 1; +>z1 : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.js b/tests/baselines/reference/pathMappingBasedModuleResolution8.js new file mode 100644 index 00000000000..99c3a4932c7 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution8.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export var z = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols new file mode 100644 index 00000000000..214b1d30ba8 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols @@ -0,0 +1,44 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/src/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== tests/cases/compiler/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== tests/cases/compiler/root/src/shared/components/file3.ts === +export var z = 1; +>z : Symbol(z, Decl(file3.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.types b/tests/baselines/reference/pathMappingBasedModuleResolution8.types new file mode 100644 index 00000000000..5938d95ee03 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8.types @@ -0,0 +1,53 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/src/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== tests/cases/compiler/root/src/shared/components/file3.ts === +export var z = 1; +>z : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js new file mode 100644 index 00000000000..ca3a1f8c388 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js @@ -0,0 +1,50 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export var z = 1; + +//// [file4.ts] +export var z1 = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file3.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z1 = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); + use(file4_1.z1.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols new file mode 100644 index 00000000000..553112dde95 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols @@ -0,0 +1,57 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +import {z1} from "file4" +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z1.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 24)) +>z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/src/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== c:/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== c:/root/src/shared/components/file3.ts === +export var z = 1; +>z : Symbol(z, Decl(file3.ts, 0, 10)) + +=== c:/sharedrepo/file4.ts === +export var z1 = 1; +>z1 : Symbol(z1, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.types new file mode 100644 index 00000000000..61da62d4ee6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.types @@ -0,0 +1,69 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +import {z1} from "file4" +>z1 : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +use(z1.toExponential()); +>use(z1.toExponential()) : void +>use : (a: any) => void +>z1.toExponential() : string +>z1.toExponential : (fractionDigits?: number) => string +>z1 : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/src/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== c:/root/src/shared/components/file3.ts === +export var z = 1; +>z : number +>1 : number + +=== c:/sharedrepo/file4.ts === +export var z1 = 1; +>z1 : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.js b/tests/baselines/reference/pathMappingBasedModuleResolution9.js new file mode 100644 index 00000000000..8611ed02a90 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9.js @@ -0,0 +1,47 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution9.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export {z} from "./file4" + +//// [file4.ts] +export var z = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file3.js] +define(["require", "exports", "./file4"], function (require, exports, file4_1) { + exports.z = file4_1.z; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols new file mode 100644 index 00000000000..764f878b293 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols @@ -0,0 +1,48 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 2, 34)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/src/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== tests/cases/compiler/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== tests/cases/compiler/root/src/shared/components/file3.ts === +export {z} from "./file4" +>z : Symbol(z, Decl(file3.ts, 0, 8)) + +=== tests/cases/compiler/root/src/shared/components/file4.ts === +export var z = 1; +>z : Symbol(z, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.types b/tests/baselines/reference/pathMappingBasedModuleResolution9.types new file mode 100644 index 00000000000..789e8d050b1 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9.types @@ -0,0 +1,57 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/src/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== tests/cases/compiler/root/src/shared/components/file3.ts === +export {z} from "./file4" +>z : number + +=== tests/cases/compiler/root/src/shared/components/file4.ts === +export var z = 1; +>z : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js new file mode 100644 index 00000000000..a7b6dbc0ec2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js @@ -0,0 +1,57 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "my/file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export {z} from "./file4" + +//// [file4.ts] +export var z = 1; + +//// [file4.ts] +export var z1 = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file3.js] +define(["require", "exports", "./file4"], function (require, exports, file4_1) { + exports.z = file4_1.z; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z1 = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "my/file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); + use(file4_1.z1.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols new file mode 100644 index 00000000000..6f244cf026e --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols @@ -0,0 +1,61 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +import {z1} from "my/file4" +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z1.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/src/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== c:/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== c:/root/src/shared/components/file3.ts === +export {z} from "./file4" +>z : Symbol(z, Decl(file3.ts, 0, 8)) + +=== c:/root/src/shared/components/file4.ts === +export var z = 1; +>z : Symbol(z, Decl(file4.ts, 0, 10)) + +=== c:/sharedrepo/my/file4.ts === +export var z1 = 1; +>z1 : Symbol(z1, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types new file mode 100644 index 00000000000..24e70346d2a --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types @@ -0,0 +1,73 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +import {z1} from "my/file4" +>z1 : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +use(z1.toExponential()); +>use(z1.toExponential()) : void +>use : (a: any) => void +>z1.toExponential() : string +>z1.toExponential : (fractionDigits?: number) => string +>z1 : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/src/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/root/src/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== c:/root/src/shared/components/file3.ts === +export {z} from "./file4" +>z : number + +=== c:/root/src/shared/components/file4.ts === +export var z = 1; +>z : number +>1 : number + +=== c:/sharedrepo/my/file4.ts === +export var z1 = 1; +>z1 : number +>1 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js new file mode 100644 index 00000000000..375c151f3e2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js @@ -0,0 +1,57 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "my/file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [file3.ts] +export {z} from "./file4" + +//// [file4.ts] +export var z = 1; + +//// [file4.ts] +export var z1 = 1; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + exports.x = 1; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + exports.y = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z = 1; +}); +//// [file3.js] +define(["require", "exports", "./file4"], function (require, exports, file4_1) { + exports.z = file4_1.z; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + exports.z1 = 1; +}); +//// [file1.js] +define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "my/file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { + use(file1_1.x.toExponential()); + use(file2_1.y.toExponential()); + use(file3_1.z.toExponential()); + use(file4_1.z1.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols new file mode 100644 index 00000000000..f9f5bc671ab --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols @@ -0,0 +1,61 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "folder3/file2" +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +import {z} from "components/file3" +>z : Symbol(z, Decl(file1.ts, 2, 8)) + +import {z1} from "my/file4" +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>a : Symbol(a, Decl(file1.ts, 5, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(y.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z : Symbol(z, Decl(file1.ts, 2, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +use(z1.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 27)) +>z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>z1 : Symbol(z1, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/base/folder2/file1.ts === +export var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + +=== c:/base/generated/folder3/file2.ts === +export var y = 1; +>y : Symbol(y, Decl(file2.ts, 0, 10)) + +=== c:/base/shared/components/file3.ts === +export {z} from "./file4" +>z : Symbol(z, Decl(file3.ts, 0, 8)) + +=== c:/base/shared/components/file4.ts === +export var z = 1; +>z : Symbol(z, Decl(file4.ts, 0, 10)) + +=== c:/sharedrepo/my/file4.ts === +export var z1 = 1; +>z1 : Symbol(z1, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types new file mode 100644 index 00000000000..e84babf0a79 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types @@ -0,0 +1,73 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file1" +>x : number + +import {y} from "folder3/file2" +>y : number + +import {z} from "components/file3" +>z : number + +import {z1} from "my/file4" +>z1 : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +use(y.toExponential()); +>use(y.toExponential()) : void +>use : (a: any) => void +>y.toExponential() : string +>y.toExponential : (fractionDigits?: number) => string +>y : number +>toExponential : (fractionDigits?: number) => string + +use(z.toExponential()); +>use(z.toExponential()) : void +>use : (a: any) => void +>z.toExponential() : string +>z.toExponential : (fractionDigits?: number) => string +>z : number +>toExponential : (fractionDigits?: number) => string + +use(z1.toExponential()); +>use(z1.toExponential()) : void +>use : (a: any) => void +>z1.toExponential() : string +>z1.toExponential : (fractionDigits?: number) => string +>z1 : number +>toExponential : (fractionDigits?: number) => string + +=== c:/base/folder2/file1.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/base/generated/folder3/file2.ts === +export var y = 1; +>y : number +>1 : number + +=== c:/base/shared/components/file3.ts === +export {z} from "./file4" +>z : number + +=== c:/base/shared/components/file4.ts === +export var z = 1; +>z : number +>1 : number + +=== c:/sharedrepo/my/file4.ts === +export var z1 = 1; +>z1 : number +>1 : number + diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1.ts new file mode 100644 index 00000000000..d6c24d75f96 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution1.ts @@ -0,0 +1,18 @@ +// @moduleResolution: baseUrl +// @module: commonjs +// @baseUrl: root + +// user defined base url + +// @filename: root/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: root/folder2/file2.ts +export {x} from "./file3" + +// @filename: root/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10.ts new file mode 100644 index 00000000000..2f32cf3e7cd --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution10.ts @@ -0,0 +1,34 @@ +// @module: amd + +// paths\rootDirs is defined in tsconfig.json +// baseUrl is inferred from tsconfig.json + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ] + }, + "rootDirs": [ + ".", + "./generated" + ] + } +} +// @filename: root/folder1/file1.ts +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); + +// @filename: root/generated/folder1/file2.ts +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +// @filename: root/folder1/file3.ts +export var x = 1; + +// @filename: root/generated/folder2/file3.ts +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts new file mode 100644 index 00000000000..6cc6f8e32d9 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts @@ -0,0 +1,35 @@ +// @module: amd + +// paths\rootDirs is defined in tsconfig.json +// baseUrl is inferred from tsconfig.json + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ] + }, + "rootDirs": [ + ".", + "./generated" + ] + } +} + +// @filename: c:/root/generated/folder1/file2.ts +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +// @filename: c:/root/folder1/file3.ts +export var x = 1; + +// @filename: c:/root/generated/folder2/file3.ts +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + +// @filename: c:/root/folder1/file1.ts +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts new file mode 100644 index 00000000000..bd8942e1df1 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts @@ -0,0 +1,36 @@ +// @module: amd + +// paths\rootDirs is defined in tsconfig.json +// baseUrl is defined in tsconfig.json + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*": [ + "*", + "generated/*" + ] + }, + "rootDirs": [ + ".", + "./generated" + ] + } +} + +// @filename: c:/root/src/generated/folder1/file2.ts +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +// @filename: c:/root/src/folder1/file3.ts +export var x = 1; + +// @filename: c:/root/src/generated/folder2/file3.ts +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + +// @filename: c:/root/src/folder1/file1.ts +import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' + +export var z = x.toExponential(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts new file mode 100644 index 00000000000..fa987961cd2 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts @@ -0,0 +1,18 @@ +// @moduleResolution: baseUrl +// @module: commonjs +// @baseUrl: c:/root + +// user defined base url + +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +export {x} from "./file3" + +// @filename: c:/root/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2.ts new file mode 100644 index 00000000000..84bfc36b8d1 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution2.ts @@ -0,0 +1,22 @@ +// @module: commonjs + +// location of tsconfig.json as baseurl + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "moduleResolution": "baseUrl" + } +} +// @filename: root/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: root/folder2/file2.ts +export {x} from "./file3" + +// @filename: root/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts new file mode 100644 index 00000000000..4b94e352879 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts @@ -0,0 +1,22 @@ +// @module: commonjs + +// location of tsconfig.json as baseurl + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "moduleResolution": "baseUrl" + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +export {x} from "./file3" + +// @filename: c:/root/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3.ts new file mode 100644 index 00000000000..466e8c90d77 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3.ts @@ -0,0 +1,23 @@ +// @module: commonjs + +// baseurl is defined in tsconfig.json + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "moduleResolution": "baseUrl", + "baseUrl": "./src" + } +} +// @filename: root/src/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: root/src/folder2/file2.ts +export {x} from "./file3" + +// @filename: root/src/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts new file mode 100644 index 00000000000..f3a8ccaf0a8 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts @@ -0,0 +1,23 @@ +// @module: commonjs + +// baseurl is defined in tsconfig.json + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "moduleResolution": "baseUrl", + "baseUrl": "./src" + } +} +// @filename: c:/root/src/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: c:/root/src/folder2/file2.ts +export {x} from "./file3" + +// @filename: c:/root/src/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4.ts new file mode 100644 index 00000000000..17f8258e763 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution4.ts @@ -0,0 +1,23 @@ +// @module: amd + +// baseurl is defined in tsconfig.json +// module resolution kind is inferred from settings (baseurl is specified) + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src" + } +} +// @filename: root/src/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: root/src/folder2/file2.ts +export {x} from "./file3" + +// @filename: root/src/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts new file mode 100644 index 00000000000..df6f267da65 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts @@ -0,0 +1,23 @@ +// @module: amd + +// baseurl is defined in tsconfig.json +// module resolution kind is inferred from settings (baseurl is specified) + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src" + } +} +// @filename: c:/root/src/folder1/file1.ts +import {x} from "folder2/file2" + +declare function use(a: any): void; + +use(x.toExponential()); + +// @filename: c:/root/src/folder2/file2.ts +export {x} from "./file3" + +// @filename: c:/root/src/folder2/file3.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution5.ts b/tests/cases/compiler/pathMappingBasedModuleResolution5.ts new file mode 100644 index 00000000000..305f7aa9c3f --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution5.ts @@ -0,0 +1,13 @@ +// @module: commonjs + +// baseurl is defined in tsconfig.json +// module resolution kind is ambiguous - error should be reported + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src" + } +} +// @filename: root/src/folder1/file1.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6.ts new file mode 100644 index 00000000000..f1e51afc805 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution6.ts @@ -0,0 +1,17 @@ +// @module: amd + +// baseurl is defined in tsconfig.json +// paths has errors + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*1*": [ "*2*" ] + } + } +} + +// @filename: root/src/folder1/file1.ts +export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7.ts new file mode 100644 index 00000000000..f59f0701a33 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution7.ts @@ -0,0 +1,38 @@ +// @module: amd + +// paths is defined in tsconfig.json +// module resolution kind is inferred from the presence of 'paths' + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +// @filename: root/folder2/file1.ts +export var x = 1; + +// @filename: root/generated/folder3/file2.ts +export var y = 1; + +// @filename: root/shared/components/file3.ts +export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts new file mode 100644 index 00000000000..c64eb687764 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts @@ -0,0 +1,38 @@ +// @module: amd + +// paths is defined in tsconfig.json +// module resolution kind is inferred from the presence of 'paths' + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +// @filename: c:/root/folder2/file1.ts +export var x = 1; + +// @filename: c:/root/generated/folder3/file2.ts +export var y = 1; + +// @filename: c:/root/shared/components/file3.ts +export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts new file mode 100644 index 00000000000..16284349643 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts @@ -0,0 +1,44 @@ +// @module: amd + +// paths is defined in tsconfig.json +// module resolution kind is inferred from the presence of 'paths' + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*", + "c:/sharedrepo/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +// @filename: c:/root/folder2/file1.ts +export var x = 1; + +// @filename: c:/root/generated/folder3/file2.ts +export var y = 1; + +// @filename: c:/root/shared/components/file3.ts +export var z = 1; + +// @filename: c:/sharedrepo/file4.ts +export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution8.ts b/tests/cases/compiler/pathMappingBasedModuleResolution8.ts new file mode 100644 index 00000000000..dc2be22c4ca --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution8.ts @@ -0,0 +1,39 @@ +// @module: amd + +// paths is defined in tsconfig.json +// baseUrl is specified in tsconfig.json + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*": [ + "*", + "generated/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +// @filename: root/src/folder2/file1.ts +export var x = 1; + +// @filename: root/src/generated/folder3/file2.ts +export var y = 1; + +// @filename: root/src/shared/components/file3.ts +export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts new file mode 100644 index 00000000000..b858be9455d --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts @@ -0,0 +1,45 @@ +// @module: amd + +// paths is defined in tsconfig.json +// baseUrl is specified in tsconfig.json + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*": [ + "*", + "generated/*", + "c:/sharedrepo/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +// @filename: c:/root/src/folder2/file1.ts +export var x = 1; + +// @filename: c:/root/src/generated/folder3/file2.ts +export var y = 1; + +// @filename: c:/root/src/shared/components/file3.ts +export var z = 1; + +// @filename: c:/sharedrepo/file4.ts +export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9.ts new file mode 100644 index 00000000000..1b104a27251 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution9.ts @@ -0,0 +1,42 @@ +// @module: amd + +// paths is defined in tsconfig.json +// baseUrl is specified in tsconfig.json + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*": [ + "*", + "generated/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); + +// @filename: root/src/folder2/file1.ts +export var x = 1; + +// @filename: root/src/generated/folder3/file2.ts +export var y = 1; + +// @filename: root/src/shared/components/file3.ts +export {z} from "./file4" + +// @filename: root/src/shared/components/file4.ts +export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts new file mode 100644 index 00000000000..68a0898229c --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts @@ -0,0 +1,48 @@ +// @module: amd + +// paths is defined in tsconfig.json +// baseUrl is specified in tsconfig.json + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*": [ + "*", + "generated/*", + "c:/sharedrepo/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "my/file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +// @filename: c:/root/src/folder2/file1.ts +export var x = 1; + +// @filename: c:/root/src/generated/folder3/file2.ts +export var y = 1; + +// @filename: c:/root/src/shared/components/file3.ts +export {z} from "./file4" + +// @filename: c:/root/src/shared/components/file4.ts +export var z = 1; + +// @filename: c:/sharedrepo/my/file4.ts +export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts new file mode 100644 index 00000000000..83990d3c5ad --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts @@ -0,0 +1,48 @@ +// @module: amd + +// paths is defined in tsconfig.json +// baseUrl is specified in tsconfig.json and it is absolute + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "c:/base", + "paths": { + "*": [ + "*", + "generated/*", + "c:/sharedrepo/*" + ], + "components/*": [ + "shared/components/*" + ] + } + } +} +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "my/file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +// @filename: c:/base/folder2/file1.ts +export var x = 1; + +// @filename: c:/base/generated/folder3/file2.ts +export var y = 1; + +// @filename: c:/base/shared/components/file3.ts +export {z} from "./file4" + +// @filename: c:/base/shared/components/file4.ts +export var z = 1; + +// @filename: c:/sharedrepo/my/file4.ts +export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 9e316266bf6..277d71dca0e 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -381,4 +381,132 @@ import b = require("./moduleB.ts"); test(files, { module: ts.ModuleKind.CommonJS, forceConsistentCasingInFileNames: true }, "/a/B/c", /* useCaseSensitiveFileNames */ false, ["moduleD.ts"], []); }) }); + + describe("baseUrl module resolution", () => { + it("module resolution without path mappings/rootDirs", () => { + const file1: File = { name: "/root/folder1/file1.ts" }; + const file2: File = { name: "/root/folder2/file2.ts" }; + const file3: File = { name: "/root/folder2/file3.ts" }; + const host = createModuleResolutionHost(file1, file2, file3); + const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.BaseUrl, baseUrl: "/root" }; + { + const result = baseUrlModuleNameResolver("folder2/file2", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file2.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = baseUrlModuleNameResolver("./file3", file2.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file3.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = baseUrlModuleNameResolver(file1.name, file2.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file1.name); + assert.deepEqual(result.failedLookupLocations, []); + } + // add failure tests + }); + + it("module resolution with path mappings", () => { + const file1: File = { name: "/root/folder1/file1.ts" }; + const file2: File = { name: "/root/folder1/file2.ts" } + const file3: File = { name: "/root/generated/folder1/file3.ts" } + const file4: File = { name: "/root/generated/folder2/file4.ts" } + const file5: File = { name: "/root/someanotherfolder/file5.ts" } + const host = createModuleResolutionHost(file1, file2, file3, file4, file5); + const options: CompilerOptions = { + moduleResolution: ModuleResolutionKind.BaseUrl, + baseUrl: "/root", + paths: { + "*": [ + "*", + "generated/*" + ], + "somefolder/*": [ + "someanotherfolder/*" + ] + } + }; + { + const result = baseUrlModuleNameResolver("folder1/file2", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file2.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = baseUrlModuleNameResolver("./file2", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file2.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = baseUrlModuleNameResolver("folder1/file3", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file3.name); + // non-empty because it tries to use '*' match first + assert.deepEqual(result.failedLookupLocations, [ + "/root/folder1/file3.ts", + "/root/folder1/file3.tsx", + "/root/folder1/file3.d.ts", + ]); + } + { + const result = baseUrlModuleNameResolver("folder2/file4", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file4.name); + assert.deepEqual(result.failedLookupLocations, [ + "/root/folder2/file4.ts", + "/root/folder2/file4.tsx", + "/root/folder2/file4.d.ts", + ]); + } + { + const result = baseUrlModuleNameResolver("somefolder/file5", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file5.name); + assert.deepEqual(result.failedLookupLocations, []); + } + // add failure tests + }); + + it ("module resolution with path mappings and root dirs", () => { + let file1: File = { name: "/root/folder1/file1.ts" }; + let file2: File = { name: "/root/generated/folder1/file2.ts" }; + let file3: File = { name: "/root/generated/folder2/file3.ts" }; + const host = createModuleResolutionHost(file1, file2, file3); + const options: CompilerOptions = { + moduleResolution: ModuleResolutionKind.BaseUrl, + baseUrl: "/root", + paths: { + "*": [ + "*", + "generated/*" + ] + }, + rootDirs: [ + ".", + "./generated/" + ] + }; + { + const result = baseUrlModuleNameResolver("./file2", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file2.name); + assert.deepEqual(result.failedLookupLocations, [ + "/root/folder1/file2.ts", + "/root/folder1/file2.tsx", + "/root/folder1/file2.d.ts", + ]); + } + { + const result = baseUrlModuleNameResolver("../folder1/file1", file3.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file1.name); + assert.deepEqual(result.failedLookupLocations, []); + } + }); + }) } \ No newline at end of file From 6844285782edca96d9591678580aeb8a4423205e Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Thu, 19 Nov 2015 21:33:33 -0800 Subject: [PATCH 002/160] verbose module resolution --- src/compiler/commandLineParser.ts | 5 + src/compiler/core.ts | 13 +- src/compiler/diagnosticMessages.json | 114 +++++++++++++++- src/compiler/program.ts | 189 +++++++++++++++++++++++---- src/compiler/types.ts | 6 +- src/services/shims.ts | 2 + 6 files changed, 292 insertions(+), 37 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 4fd29de142d..f462c7c1e91 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -302,6 +302,11 @@ namespace ts { type: "object", isTSConfigOnly: true }, + { + name: "traceModuleResolution", + type: "boolean", + description: Diagnostics.Enable_tracing_of_the_module_resolution_process + }, { name: "allowJs", type: "boolean", diff --git a/src/compiler/core.ts b/src/compiler/core.ts index c93f3aebc2d..50b10ac5a90 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -410,6 +410,17 @@ namespace ts { }; } + /* internal */ + export function formatMessage(dummy: any, message: DiagnosticMessage): string { + let text = getLocaleSpecificMessage(message); + + if (arguments.length > 2) { + text = formatStringFromArgs(text, arguments, 2); + } + + return text; + } + export function createCompilerDiagnostic(message: DiagnosticMessage, ...args: any[]): Diagnostic; export function createCompilerDiagnostic(message: DiagnosticMessage): Diagnostic { let text = getLocaleSpecificMessage(message); @@ -860,4 +871,4 @@ namespace ts { } return copiedList; } -} +} diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 96e48766f71..3d696ff8172 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2220,10 +2220,10 @@ "category": "Error", "code": 6046 }, - "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": { - "category": "Error", - "code": 6047 - }, + "Argument for '--target' option must be 'ES3', 'ES5', or 'ES2015'.": { + "category": "Error", + "code": 6047 + }, "Locale must be of the form or -. For example '{0}' or '{1}'.": { "category": "Error", "code": 6048 @@ -2353,14 +2353,114 @@ "category": "Error", "code": 6082 }, - "Allow javascript files to be compiled.": { + "Base directory to resolve relative module names.": { "category": "Message", "code": 6083 }, - "Base directory to resolve relative module names.": { + "Enable tracing of the module resolution process.": { "category": "Message", "code": 6084 - }, + }, + "======== Resolving module '{0}' from '{1}'. ========": { + "category": "Message", + "code": 6085 + }, + "Explicitly specified module resolution kind: '{0}'.": { + "category": "Message", + "code": 6086 + }, + "Module resolution kind is not specified, using '{0}'.": { + "category": "Message", + "code": 6087 + }, + "======== Module name '{0}' was successfully resolved to '{1}'. ========": { + "category": "Message", + "code": 6088 + }, + "======== Module name '{0}' was not resolved. ========": { + "category": "Message", + "code": 6089 + }, + "Resolving rooted module name '{0}' - use it as a candidate location.": { + "category": "Message", + "code": 6090 + }, + "Resolving relative module name '{0}'.": { + "category": "Message", + "code": 6091 + }, + "Resolving non-relative module name '{0}'.": { + "category": "Message", + "code": 6092 + }, + "Converting relative module name '{0}' to absolute using '{1}' as a base directory => '{2}'.": { + "category": "Message", + "code": 6093 + }, + "'rootDirs' option is specified, searching for a longest matching prefix...": { + "category": "Message", + "code": 6094 + }, + "Found longest matching rootDir '{0}', 'converted relative path '{1}', to non-relative path '{2}'": { + "category": "Message", + "code": 6095 + }, + "'rootDirs' option is not specified, using '{0}' as candidate location.": { + "category": "Message", + "code": 6096 + }, + "'paths' option is specified, looking for a pattern to match module name '{0}'.": { + "category": "Message", + "code": 6097 + }, + "Module name '{0}', matched pattern '{1}'.": { + "category": "Message", + "code": 6098 + }, + "Trying substitution '{0}', candidate module location: '{1}'.": { + "category": "Message", + "code": 6099 + }, + "Resolving module name '{0}' relative to base url '{1}' - '{2}'.": { + "category": "Message", + "code": 6100 + }, + "Loading module '{0}' as file / folder, candidate module location '{1}'.": { + "category": "Message", + "code": 6101 + }, + "File '{0}' does not exist.": { + "category": "Message", + "code": 6102 + }, + "File '{0}' exist - use it as a module resolution result.": { + "category": "Message", + "code": 6103 + }, + "Loading module '{0}' from 'node_modules' folder.": { + "category": "Message", + "code": 6104 + }, + "Found 'package.json' at '{0}'.": { + "category": "Message", + "code": 6105 + }, + "'package.json' does not have 'typings' field.": { + "category": "Message", + "code": 6106 + }, + "'package.json' has 'typings' field '{0}' that references '{1}'.": { + "category": "Message", + "code": 6107 + }, + "Module name '{0}' contains '!' character.": { + "category": "Message", + "code": 6108 + }, + "Allow javascript files to be compiled.": { + "category": "Message", + "code": 6109 + }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", "code": 7005 diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 6d99b6e1dda..b9ebef7c27f 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -36,7 +36,21 @@ namespace ts { return normalizePath(referencedFileName); } + function trace(host: ModuleResolutionHost, message: DiagnosticMessage, ...args: any[]): void; + function trace(host: ModuleResolutionHost, message: DiagnosticMessage): void { + host.trace(formatMessage.apply(undefined, arguments)); + } + + function isTraceEnabled(compilerOptions: CompilerOptions, host: ModuleResolutionHost): boolean { + return compilerOptions.traceModuleResolution && host.trace !== undefined; + } + export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + const traceEnabled = isTraceEnabled(compilerOptions, host); + if (traceEnabled) { + trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile); + } + let moduleResolution = compilerOptions.moduleResolution; if (moduleResolution === undefined) { if (compilerOptions.module === ModuleKind.CommonJS) { @@ -48,13 +62,40 @@ namespace ts { else { moduleResolution = ModuleResolutionKind.Classic; } + + if (traceEnabled) { + trace(host, Diagnostics.Module_resolution_kind_is_not_specified_using_0, ModuleResolutionKind[moduleResolution]); + } + } + else { + if (traceEnabled) { + trace(host, Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ModuleResolutionKind[moduleResolution]); + } } + let result: ResolvedModuleWithFailedLookupLocations; switch (moduleResolution) { - case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host); - case ModuleResolutionKind.Classic: return classicNameResolver(moduleName, containingFile, compilerOptions, host); - case ModuleResolutionKind.BaseUrl: return baseUrlModuleNameResolver(moduleName, containingFile, compilerOptions, host); + case ModuleResolutionKind.NodeJs: + result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host); + break; + case ModuleResolutionKind.Classic: + result = classicNameResolver(moduleName, containingFile, compilerOptions, host); + break; + case ModuleResolutionKind.BaseUrl: + result = baseUrlModuleNameResolver(moduleName, containingFile, compilerOptions, host); + break; } + + if (traceEnabled) { + if (result.resolvedModule) { + trace(host, Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName); + } + else { + trace(host, Diagnostics.Module_name_0_was_not_resolved, moduleName); + } + } + + return result; } // Path mapping based module resolution strategy uses base url to resolve relative file names. This resolution strategy can be enabled @@ -135,28 +176,52 @@ namespace ts { Debug.assert(baseUrl !== undefined); const supportedExtensions = getSupportedExtensions(compilerOptions); + const traceEnabled = isTraceEnabled(compilerOptions, host); + if (isRootedDiskPath(moduleName)) { - return { resolvedModule: { resolvedFileName: moduleName }, failedLookupLocations: emptyArray }; + if (traceEnabled) { + trace(host, Diagnostics.Resolving_rooted_module_name_0_use_it_as_a_candidate_location, moduleName); + } + + const failedLookupLocations: string[] = []; + const resolvedFileName = loadModuleFromFile(supportedExtensions, moduleName, failedLookupLocations, host, traceEnabled); + return { + resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, + failedLookupLocations + }; } if (nameStartsWithDotSlashOrDotDotSlash(moduleName)) { // relative name - return baseUrlResolveRelativeModuleName(moduleName, containingFile, baseUrl, compilerOptions, host); + if (traceEnabled) { + trace(host, Diagnostics.Resolving_relative_module_name_0, moduleName); + } + return baseUrlResolveRelativeModuleName(moduleName, containingFile, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); } else { // non-relative name - return baseUrlResolveNonRelativeModuleName(moduleName, baseUrl, supportedExtensions, compilerOptions, host); + if (traceEnabled) { + trace(host, Diagnostics.Resolving_non_relative_module_name_0, moduleName); + } + return baseUrlResolveNonRelativeModuleName(moduleName, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); } } - export function baseUrlResolveRelativeModuleName(moduleName: string, containingFile: string, baseUrl: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + function baseUrlResolveRelativeModuleName(moduleName: string, containingFile: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { const failedLookupLocations: string[] = []; const containingDirectory = getDirectoryPath(containingFile); const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - const supportedExtensions = getSupportedExtensions(compilerOptions); + + if (traceEnabled) { + trace(host, Diagnostics.Converting_relative_module_name_0_to_absolute_using_1_as_a_base_directory_2, moduleName, containingDirectory, candidate); + } if (compilerOptions.rootDirs) { + if (traceEnabled) { + trace(host, Diagnostics.rootDirs_option_is_specified_searching_for_a_longest_matching_prefix); + } + let matchedPrefix: string; for (const rootDir of compilerOptions.rootDirs) { let normalizedRoot = getNormalizedAbsolutePath(rootDir, baseUrl); @@ -169,12 +234,20 @@ namespace ts { } if (matchedPrefix) { const suffix = candidate.substr(matchedPrefix.length); - return baseUrlResolveNonRelativeModuleName(suffix, baseUrl, supportedExtensions, compilerOptions, host); + if (traceEnabled) { + trace(host, Diagnostics.Found_longest_matching_rootDir_0_converted_relative_path_1_to_non_relative_path_2, matchedPrefix, moduleName, suffix); + } + + return baseUrlResolveNonRelativeModuleName(suffix, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); } return { resolvedModule: undefined, failedLookupLocations }; } else { - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + if (traceEnabled) { + trace(host, Diagnostics.rootDirs_option_is_not_specified_using_0_as_candidate_location, candidate); + } + + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); return { resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, failedLookupLocations @@ -182,14 +255,18 @@ namespace ts { } } - export function baseUrlResolveNonRelativeModuleName(moduleName: string, baseUrl: string, supportedExtensions: string[], options: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + function baseUrlResolveNonRelativeModuleName(moduleName: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { let longestMatchPrefixLength = -1; let matchedPattern: string; let matchedStar: string; const failedLookupLocations: string[] = []; - if (options.paths) { - for (const key in options.paths) { + if (compilerOptions.paths) { + if (traceEnabled) { + trace(host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName); + } + + for (const key in compilerOptions.paths) { const pattern: string = key; const indexOfStar = pattern.indexOf("*"); if (indexOfStar !== -1) { @@ -217,10 +294,19 @@ namespace ts { } if (matchedPattern) { - for (const subst of options.paths[matchedPattern]) { + if (traceEnabled) { + trace(host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern); + } + + for (const subst of compilerOptions.paths[matchedPattern]) { const path = matchedStar ? subst.replace("\*", matchedStar) : subst; const candidate = normalizePath(combinePaths(baseUrl, path)); - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + + if (traceEnabled) { + trace(host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path); + } + + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); if (resolvedFileName) { return { resolvedModule: { resolvedFileName }, failedLookupLocations }; } @@ -230,7 +316,12 @@ namespace ts { } else { const candidate = normalizePath(combinePaths(baseUrl, moduleName)); - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + + if (traceEnabled) { + trace(host, Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, baseUrl, candidate); + } + + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); return { resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, failedLookupLocations @@ -250,44 +341,64 @@ namespace ts { export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const containingDirectory = getDirectoryPath(containingFile); const supportedExtensions = getSupportedExtensions(compilerOptions); + const traceEnabled = isTraceEnabled(compilerOptions, host); if (isRootedDiskPath(moduleName) || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { const failedLookupLocations: string[] = []; const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - let resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host); + + if (traceEnabled) { + trace(host, Diagnostics.Loading_module_0_as_file_Slash_folder_candidate_module_location_1, moduleName, candidate); + } + + let resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); if (resolvedFileName) { return { resolvedModule: { resolvedFileName }, failedLookupLocations }; } - resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, host); + resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); return resolvedFileName ? { resolvedModule: { resolvedFileName }, failedLookupLocations } : { resolvedModule: undefined, failedLookupLocations }; } else { - return loadModuleFromNodeModules(moduleName, containingDirectory, host); + if (traceEnabled) { + trace(host, Diagnostics.Loading_module_0_from_node_modules_folder, moduleName); + } + + return loadModuleFromNodeModules(moduleName, containingDirectory, host, traceEnabled); } } - function loadModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string { + function loadModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost, traceEnabled: boolean): string { return forEach(extensions, tryLoad); function tryLoad(ext: string): string { const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext; + if (host.fileExists(fileName)) { + if (traceEnabled) { + trace(host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, fileName); + } return fileName; } else { + if (traceEnabled) { + trace(host, Diagnostics.File_0_does_not_exist, fileName); + } failedLookupLocation.push(fileName); return undefined; } } } - function loadNodeModuleFromDirectory(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost): string { + function loadNodeModuleFromDirectory(extensions: string[], candidate: string, failedLookupLocation: string[], host: ModuleResolutionHost, traceEnabled: boolean): string { const packageJsonPath = combinePaths(candidate, "package.json"); if (host.fileExists(packageJsonPath)) { + if (traceEnabled) { + trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath); + } let jsonContent: { typings?: string }; @@ -301,21 +412,33 @@ namespace ts { } if (jsonContent.typings) { - const result = loadModuleFromFile(extensions, normalizePath(combinePaths(candidate, jsonContent.typings)), failedLookupLocation, host); + const typingsFile = normalizePath(combinePaths(candidate, jsonContent.typings)); + if (traceEnabled) { + trace(host, Diagnostics.package_json_has_typings_field_0_that_references_1, jsonContent.typings, typingsFile); + } + const result = loadModuleFromFile(extensions, typingsFile , failedLookupLocation, host, traceEnabled); if (result) { return result; } } + else { + if (traceEnabled) { + trace(host, Diagnostics.package_json_does_not_have_typings_field); + } + } } else { + if (traceEnabled) { + trace(host, Diagnostics.package_json_does_not_have_typings_field); + } // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results failedLookupLocation.push(packageJsonPath); } - return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host); + return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, host, traceEnabled); } - function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { const failedLookupLocations: string[] = []; directory = normalizeSlashes(directory); while (true) { @@ -324,12 +447,12 @@ namespace ts { const nodeModulesFolder = combinePaths(directory, "node_modules"); const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName)); // Load only typescript files irrespective of allowJs option if loading from node modules - let result = loadModuleFromFile(supportedTypeScriptExtensions, candidate, failedLookupLocations, host); + let result = loadModuleFromFile(supportedTypeScriptExtensions, candidate, failedLookupLocations, host, traceEnabled); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } - result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, host); + result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, host, traceEnabled); if (result) { return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; } @@ -369,8 +492,13 @@ namespace ts { export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { + const traceEnabled = isTraceEnabled(compilerOptions, host); + // module names that contain '!' are used to reference resources and are not resolved to actual files on disk if (moduleName.indexOf("!") != -1) { + if (traceEnabled) { + trace(host, Diagnostics.Module_name_0_contains_character, moduleName); + } return { resolvedModule: undefined, failedLookupLocations: [] }; } @@ -392,9 +520,15 @@ namespace ts { const candidate = searchName + extension; if (host.fileExists(candidate)) { + if (traceEnabled) { + trace(host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, candidate); + } return candidate; } else { + if (traceEnabled) { + trace(host, Diagnostics.File_0_does_not_exist, candidate); + } failedLookupLocations.push(candidate); } }); @@ -498,7 +632,8 @@ namespace ts { getCanonicalFileName, getNewLine: () => newLine, fileExists: fileName => sys.fileExists(fileName), - readFile: fileName => sys.readFile(fileName) + readFile: fileName => sys.readFile(fileName), + trace: (s: string) => sys.write(s + newLine) }; } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 8dc0b48e781..288532c27e6 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2308,7 +2308,7 @@ namespace ts { Message, } - export const enum ModuleResolutionKind { + export enum ModuleResolutionKind { Classic = 1, NodeJs = 2, BaseUrl = 3 @@ -2368,6 +2368,7 @@ namespace ts { baseUrl?: string; paths?: PathSubstitutions; rootDirs?: RootPaths; + traceModuleResolution?: boolean; allowJs?: boolean; /* @internal */ stripInternal?: boolean; @@ -2379,7 +2380,7 @@ namespace ts { [option: string]: string | number | boolean | TsConfigOnlyOptions; } - export const enum ModuleKind { + export enum ModuleKind { None = 0, CommonJS = 1, AMD = 2, @@ -2606,6 +2607,7 @@ namespace ts { // readFile function is used to read arbitrary text files on disk, i.e. when resolution procedure needs the content of 'package.json' // to determine location of bundled typings for node module readFile(fileName: string): string; + trace?(s: string): void; } export interface ResolvedModule { diff --git a/src/services/shims.ts b/src/services/shims.ts index 6b656ea2738..2f0f0de3e5d 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -73,6 +73,8 @@ namespace ts { * when enumerating the directory. */ readDirectory(rootDir: string, extension: string, exclude?: string): string; + + trace(s: string): void; } /// From 25cc97bb755d973b047dd258838505a993a573bc Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 24 Nov 2015 16:41:41 -0800 Subject: [PATCH 003/160] addressed PR feedback --- src/compiler/commandLineParser.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- src/compiler/program.ts | 9 +++-- .../pathMappingBasedModuleResolution11.js | 38 +++++++++++++++++++ ...pathMappingBasedModuleResolution11.symbols | 29 ++++++++++++++ .../pathMappingBasedModuleResolution11.types | 32 ++++++++++++++++ .../pathMappingBasedModuleResolution11.ts | 34 +++++++++++++++++ 7 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.types create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution11.ts diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index f462c7c1e91..249e2f30c29 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -286,7 +286,7 @@ namespace ts { name: "baseUrl", type: "string", isFilePath: true, - description: Diagnostics.Base_directory_to_resolve_relative_module_names + description: Diagnostics.Base_directory_to_resolve_non_absolute_module_names }, { // this option can only be specified in tsconfig.json diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 3fd364f0fa5..e8fd0d2a069 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2361,7 +2361,7 @@ "category": "Error", "code": 6082 }, - "Base directory to resolve relative module names.": { + "Base directory to resolve non-absolute module names.": { "category": "Message", "code": 6083 }, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index b9ebef7c27f..66944354c40 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -98,7 +98,7 @@ namespace ts { return result; } - // Path mapping based module resolution strategy uses base url to resolve relative file names. This resolution strategy can be enabled + // Path mapping based module resolution strategy uses base url to resolve non-absolute file names. This resolution strategy can be enabled // by setting 'moduleResolution' option to 'baseUrl' and as it implied by the name it uses base url to resolve module names. // Base url can be specified: // - explicitly via command line option 'baseUrl'. If this value is relative it will be computed relative to current directory. @@ -161,12 +161,12 @@ namespace ts { // ] // @file: /a/b/c/src/form1.ts // import {x} from "./form.content.ts" - // @file: /a/b/c/generated/form1.content.ts + // @file: /a/b/c/generated/form.content.ts // export var x = ... // first './form.content.ts' needs to be converted to non-relative name. - // 1. convert it to absolute name '/a/b/c/src/form1.content.ts' -> + // 1. convert it to absolute name '/a/b/c/src/form.content.ts' -> // find longest prefix in rootDirs that match this path, it will be './src' (after expansion '/a/b/c/src/') -> - // suffix is form1.content.ts + // suffix is form.content.ts // 2. apply path mappings to 'form1.content.ts' -> // '*' pattern will be matched -> // '*' substitution yields '/a/b/c/form1.content.ts' - file does not exists @@ -176,6 +176,7 @@ namespace ts { Debug.assert(baseUrl !== undefined); const supportedExtensions = getSupportedExtensions(compilerOptions); + // NOTE: traceEnabled check is delibirately no inside the 'trace' at evert callside to avoid runtime impact of calling vararg function const traceEnabled = isTraceEnabled(compilerOptions, host); if (isRootedDiskPath(moduleName)) { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.js b/tests/baselines/reference/pathMappingBasedModuleResolution11.js new file mode 100644 index 00000000000..614357ec53f --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution11.js @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution11.ts] //// + +//// [file1.ts] +import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' + +export var z = x.toExponential(); + +//// [file.ts] +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +//// [file3.ts] +export var x = 1; + +//// [file3.ts] +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); + + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.x = 1; +}); +//// [file.js] +define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { + "use strict"; + exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' +}); +//// [file1.js] +define(["require", "exports", "./file2"], function (require, exports, file2_1) { + "use strict"; + exports.z = file2_1.x.toExponential(); +}); +//// [file3.js] +define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { + "use strict"; + var z = file1_1.z.toLowerCase(); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols new file mode 100644 index 00000000000..f453dafe2a2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols @@ -0,0 +1,29 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +export var z = x.toExponential(); +>z : Symbol(z, Decl(file1.ts, 2, 10)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== tests/cases/compiler/root/generated/folder1/file2/file.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : Symbol(x, Decl(file.ts, 0, 8)) + +=== tests/cases/compiler/root/folder1/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== tests/cases/compiler/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : Symbol(y, Decl(file3.ts, 0, 8)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) + +let z = y.toLowerCase(); +>z : Symbol(z, Decl(file3.ts, 1, 3)) +>y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file3.ts, 0, 8)) +>toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.types b/tests/baselines/reference/pathMappingBasedModuleResolution11.types new file mode 100644 index 00000000000..45717088577 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution11.types @@ -0,0 +1,32 @@ +=== tests/cases/compiler/root/folder1/file1.ts === +import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' +>x : number + +export var z = x.toExponential(); +>z : string +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== tests/cases/compiler/root/generated/folder1/file2/file.ts === +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' +>x : number + +=== tests/cases/compiler/root/folder1/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== tests/cases/compiler/root/generated/folder2/file3.ts === +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +>z : string +>y : string + +let z = y.toLowerCase(); +>z : string +>y.toLowerCase() : string +>y.toLowerCase : () => string +>y : string +>toLowerCase : () => string + diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution11.ts b/tests/cases/compiler/pathMappingBasedModuleResolution11.ts new file mode 100644 index 00000000000..e0504126ca1 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution11.ts @@ -0,0 +1,34 @@ +// @module: amd + +// paths\rootDirs is defined in tsconfig.json +// baseUrl is inferred from tsconfig.json + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*/file" + ] + }, + "rootDirs": [ + ".", + "./generated" + ] + } +} +// @filename: root/folder1/file1.ts +import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' + +export var z = x.toExponential(); + +// @filename: root/generated/folder1/file2/file.ts +export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' + +// @filename: root/folder1/file3.ts +export var x = 1; + +// @filename: root/generated/folder2/file3.ts +import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' +let z = y.toLowerCase(); From 62370a0d08a6c20c2250d0f808fbfaec4c12a663 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 25 Nov 2015 16:41:09 -0800 Subject: [PATCH 004/160] addressed PR feedback --- src/compiler/commandLineParser.ts | 34 +++++++++++++++++-- src/compiler/core.ts | 5 ++- src/compiler/diagnosticMessages.json | 13 ++++++- src/compiler/program.ts | 34 ++++++++++++++----- src/harness/harness.ts | 3 ++ .../pathMappingBasedModuleResolution10_2.ts | 4 +-- tests/cases/unittests/moduleResolution.ts | 4 +-- 7 files changed, 80 insertions(+), 17 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 249e2f30c29..6ed27aeb3bf 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -300,7 +300,8 @@ namespace ts { // use type = object to copy the value as-is name: "rootDirs", type: "object", - isTSConfigOnly: true + isTSConfigOnly: true, + isFilePath: true }, { name: "traceModuleResolution", @@ -595,7 +596,36 @@ namespace ts { } } if (opt.isFilePath) { - value = normalizePath(combinePaths(basePath, value)); + switch (typeof value) { + case "string": + value = normalizePath(combinePaths(basePath, value)); + break; + case "object": + // "object" options with 'isFilePath' = true expected to be string arrays + let paths: string[] = []; + let invalidOptionType = false; + if (!isArray(value)) { + invalidOptionType = true; + } + else { + for (const element of value) { + if (typeof element === "string") { + paths.push(normalizePath(combinePaths(basePath, element))); + } + else { + invalidOptionType = true; + break; + } + } + } + if (invalidOptionType) { + errors.push(createCompilerDiagnostic(Diagnostics.Option_0_should_have_array_of_strings_as_a_value, opt.name)); + } + else { + value = paths; + } + break; + } if (value === "") { value = "."; } diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 50b10ac5a90..df6158b9887 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -74,7 +74,10 @@ namespace ts { GreaterThan = 1 } - export interface StringSet extends Map { } + /* @internal */ + export function isArray(obj: any): boolean { + return Array.isArray ? Array.isArray(obj) : typeof obj === "object" && obj instanceof Array; + } /** * Iterates through 'array' by index and performs the callback on each element of array until the callback diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index e8fd0d2a069..331ada0cbe0 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2296,7 +2296,6 @@ "category": "Error", "code": 6064 }, - "Enables experimental support for ES7 decorators.": { "category": "Message", "code": 6065 @@ -2469,6 +2468,18 @@ "category": "Message", "code": 6109 }, + "Base url: '{0}'.": { + "category": "Message", + "code": 6110 + }, + "Option '{0}' should have array of strings as a value.": { + "category": "Error", + "code": 6111 + }, + "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'.": { + "category": "Message", + "code": 6112 + }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", "code": 7005 diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 66944354c40..50c6b05963d 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -179,6 +179,10 @@ namespace ts { // NOTE: traceEnabled check is delibirately no inside the 'trace' at evert callside to avoid runtime impact of calling vararg function const traceEnabled = isTraceEnabled(compilerOptions, host); + if (traceEnabled) { + trace(host, Diagnostics.Base_url_Colon_0, baseUrl); + } + if (isRootedDiskPath(moduleName)) { if (traceEnabled) { trace(host, Diagnostics.Resolving_rooted_module_name_0_use_it_as_a_candidate_location, moduleName); @@ -211,6 +215,7 @@ namespace ts { function baseUrlResolveRelativeModuleName(moduleName: string, containingFile: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { const failedLookupLocations: string[] = []; + // we always pass absolute path to containing file so candidate location is also absolute const containingDirectory = getDirectoryPath(containingFile); const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); @@ -225,14 +230,24 @@ namespace ts { let matchedPrefix: string; for (const rootDir of compilerOptions.rootDirs) { - let normalizedRoot = getNormalizedAbsolutePath(rootDir, baseUrl); + // rootDirs are expected to be absolute + let normalizedRoot = normalizePath(rootDir); if (!endsWith(normalizedRoot, directorySeparator)) { normalizedRoot += directorySeparator; } - if (startsWith(candidate, normalizedRoot) && (matchedPrefix === undefined || matchedPrefix.length < normalizedRoot.length)) { + const isLongestMatchingPrefix = + startsWith(candidate, normalizedRoot) && + (matchedPrefix === undefined || matchedPrefix.length < normalizedRoot.length); + + if (traceEnabled) { + trace(host, Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix); + } + + if (isLongestMatchingPrefix) { matchedPrefix = normalizedRoot; } } + if (matchedPrefix) { const suffix = candidate.substr(matchedPrefix.length); if (traceEnabled) { @@ -241,19 +256,20 @@ namespace ts { return baseUrlResolveNonRelativeModuleName(suffix, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); } - return { resolvedModule: undefined, failedLookupLocations }; + + // rootDirs does not contain prefix for candidate - fallthrough to load file from candidate location. } else { if (traceEnabled) { trace(host, Diagnostics.rootDirs_option_is_not_specified_using_0_as_candidate_location, candidate); } - - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); - return { - resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, - failedLookupLocations - }; } + + const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, host, traceEnabled); + return { + resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, + failedLookupLocations + }; } function baseUrlResolveNonRelativeModuleName(moduleName: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 97344f4242e..7167d1e8f9a 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -1005,6 +1005,9 @@ namespace Harness { if (options.inferredBaseUrl) { options.inferredBaseUrl = ts.getNormalizedAbsolutePath(options.inferredBaseUrl, currentDirectory); } + if (options.rootDirs) { + options.rootDirs = ts.map(options.rootDirs, d => ts.getNormalizedAbsolutePath(d, currentDirectory)); + } const programFiles: TestFile[] = inputFiles.slice(); // Files from built\local that are requested by test "@includeBuiltFiles" to be in the context. diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts index bd8942e1df1..754df23f4bf 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts @@ -14,8 +14,8 @@ ] }, "rootDirs": [ - ".", - "./generated" + "./src/", + "./src/generated" ] } } diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 4bb076108eb..b6ee19f6de2 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -485,8 +485,8 @@ import b = require("./moduleB.ts"); ] }, rootDirs: [ - ".", - "./generated/" + "/root", + "/root/generated/" ] }; { From e15eab9d9961cbd978389e2e0504e366e648f020 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Sep 2015 15:11:04 -0700 Subject: [PATCH 005/160] Add basic check for use super before this Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/types.ts --- src/compiler/checker.ts | 13 +++++++++++++ src/compiler/diagnosticMessages.json | 4 ++++ src/compiler/types.ts | 1 + 3 files changed, 18 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7f20c542128..5238a4780e2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6866,6 +6866,11 @@ namespace ts { // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks break; case SyntaxKind.Constructor: + // TODO(yuisu): Comments + if ((container).hasSeenSuperBeforeThis === undefined) { + (container).hasSeenSuperBeforeThis = false; + } + if (isInConstructorArgumentInitializer(node, container)) { error(node, Diagnostics.this_cannot_be_referenced_in_constructor_arguments); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks @@ -9588,6 +9593,10 @@ namespace ts { const signature = getResolvedSignature(node); if (node.expression.kind === SyntaxKind.SuperKeyword) { + let containgFunction = getContainingFunction(node.expression); + if (containgFunction && containgFunction.kind === SyntaxKind.Constructor && (containgFunction).hasSeenSuperBeforeThis === undefined) { + (containgFunction).hasSeenSuperBeforeThis = true; + } return voidType; } if (node.kind === SyntaxKind.NewExpression) { @@ -11182,6 +11191,10 @@ namespace ts { markThisReferencesAsErrors(superCallStatement.expression); } } + else if (!node.hasSeenSuperBeforeThis) { + // TODO: comment + error(node, Diagnostics.super_has_to_be_called_before_this_accessing); + } } else if (baseConstructorType !== nullType) { error(node, Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 62661706373..51a4e2c6c8f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2539,5 +2539,9 @@ "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.": { "category": "Error", "code": 17007 + }, + "'super' has to be called before 'this' accessing.": { + "category": "Error", + "code": 17006 } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f8b26ddaa6d..5a216f8bbcd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -695,6 +695,7 @@ namespace ts { // @kind(SyntaxKind.Constructor) export interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement { body?: FunctionBody; + hasSeenSuperBeforeThis: boolean; // TODDO (yuisu): comment } // For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. From 653deaa2e207b7f4f3e996483a1b6ab61a3fcb65 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Sep 2015 16:42:04 -0700 Subject: [PATCH 006/160] Fix where to report on error. Move from constructor node to just super node Conflicts: src/compiler/checker.ts --- src/compiler/checker.ts | 59 ++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5238a4780e2..b328a4c8366 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6848,6 +6848,22 @@ namespace ts { let container = getThisContainer(node, /* includeArrowFunctions */ true); let needToCaptureLexicalThis = false; + + if (container.kind === SyntaxKind.Constructor) { + // Keep track of whether we have seen "super" before encounter "this" so that + // we can report appropriate error later in checkConstructorDeclaration + // We have to do the check here to make sure we won't give false error when + // "this" is used in arrow functions + // For example: + // constructor() { + // (()=>this); // No Error + // super(); + // } + if ((container).hasSeenSuperBeforeThis === undefined) { + (container).hasSeenSuperBeforeThis = false; + } + } + // Now skip arrow functions to get the "real" owner of 'this'. if (container.kind === SyntaxKind.ArrowFunction) { container = getThisContainer(container, /* includeArrowFunctions */ false); @@ -6866,11 +6882,6 @@ namespace ts { // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks break; case SyntaxKind.Constructor: - // TODO(yuisu): Comments - if ((container).hasSeenSuperBeforeThis === undefined) { - (container).hasSeenSuperBeforeThis = false; - } - if (isInConstructorArgumentInitializer(node, container)) { error(node, Diagnostics.this_cannot_be_referenced_in_constructor_arguments); // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks @@ -11154,8 +11165,25 @@ namespace ts { const containingClassSymbol = getSymbolOfNode(containingClassDecl); const containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol); const baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType); + const statements = (node.body).statements; + let superCallStatement: ExpressionStatement; + let isSuperCallFirstStatment: boolean; - if (containsSuperCall(node.body)) { + for (const statement of statements) { + if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((statement).expression)) { + superCallStatement = statement; + if (isSuperCallFirstStatment === undefined) { + isSuperCallFirstStatment = true; + } + } + else if (isSuperCallFirstStatment === undefined && !isPrologueDirective(statement)) { + isSuperCallFirstStatment = false; + } + } + + // The main different between looping through each statement in constructor and calling containsSuperCall is that, + // containsSuperCall will consider "super" inside computed-property for inner class declaration + if (superCallStatement || containsSuperCall(node.body)) { if (baseConstructorType === nullType) { error(node, Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null); } @@ -11172,19 +11200,8 @@ namespace ts { // Skip past any prologue directives to find the first statement // to ensure that it was a super call. if (superCallShouldBeFirst) { - const statements = (node.body).statements; - let superCallStatement: ExpressionStatement; - for (const statement of statements) { - if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((statement).expression)) { - superCallStatement = statement; - break; - } - if (!isPrologueDirective(statement)) { - break; - } - } - if (!superCallStatement) { - error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); + if (!isSuperCallFirstStatment) { + error(superCallStatement, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); } else { // In such a required super call, it is a compile-time error for argument expressions to reference this. @@ -11192,8 +11209,8 @@ namespace ts { } } else if (!node.hasSeenSuperBeforeThis) { - // TODO: comment - error(node, Diagnostics.super_has_to_be_called_before_this_accessing); + // In ES6, super inside constructor of class-declaration has to precede "this" accessing + error(superCallStatement, Diagnostics.super_has_to_be_called_before_this_accessing); } } else if (baseConstructorType !== nullType) { From eaa2846348c82d69caf78a50b2efa58e660bdea9 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Sep 2015 17:17:30 -0700 Subject: [PATCH 007/160] Add tests --- .../checkSuperCallBeforeThisAccessing1.ts | 10 ++++++++++ .../checkSuperCallBeforeThisAccessing2.ts | 10 ++++++++++ .../checkSuperCallBeforeThisAccessing3.ts | 15 +++++++++++++++ .../checkSuperCallBeforeThisAccessing4.ts | 19 +++++++++++++++++++ .../checkSuperCallBeforeThisAccessing5.ts | 7 +++++++ .../checkSuperCallBeforeThisAccessing6.ts | 10 ++++++++++ .../checkSuperCallBeforeThisAccessing7.ts | 9 +++++++++ 7 files changed, 80 insertions(+) create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts new file mode 100644 index 00000000000..e8dd78ef546 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts @@ -0,0 +1,10 @@ +class Based { } +class Derived extends Based { + public x: number; + constructor() { + super(); + this; + this.x = 10; + var that = this; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts new file mode 100644 index 00000000000..e6545f24288 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts @@ -0,0 +1,10 @@ +class Based { } +class Derived extends Based { + public x: number; + constructor() { + this.x = 100; + super(); + this.x = 10; + var that = this; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts new file mode 100644 index 00000000000..fd9de120b05 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts @@ -0,0 +1,15 @@ +class Based { } +class Derived extends Based { + public x: number; + constructor() { + class innver { + public y: boolean; + constructor() { + this.y = true; + } + } + super(); + this.x = 10; + var that = this; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts new file mode 100644 index 00000000000..1fdee00c2f8 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts @@ -0,0 +1,19 @@ +class Based { } +class Derived extends Based { + public x: number; + constructor() { + (() => { + this; // No error + }); + () => { + this; // No error + }; + (() => { + this; // No error + })(); + super(); + super(); + this.x = 10; + var that = this; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts new file mode 100644 index 00000000000..65d1db6df75 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts @@ -0,0 +1,7 @@ +class Based { constructor(...arg) { } } +class Derived extends Based { + public x: number; + constructor() { + super(this.x); + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts new file mode 100644 index 00000000000..2cdcb9ad3a8 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts @@ -0,0 +1,10 @@ +class Base { + constructor(...arg) { + } +} +class Super extends Base { + constructor() { + (() => this); // No Error + super(); + } +} \ No newline at end of file diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts new file mode 100644 index 00000000000..1c4af98f0a2 --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts @@ -0,0 +1,9 @@ +class Base { + constructor(func: ()=>Base) { + } +} +class Super extends Base { + constructor() { + super((() => this)); // No error + } +} \ No newline at end of file From c2fb6944041c5d5d3c05cd041518059782839d30 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Sep 2015 17:19:03 -0700 Subject: [PATCH 008/160] Update baselines --- .../checkSuperCallBeforeThisAccessing1.js | 33 +++++++++++ ...checkSuperCallBeforeThisAccessing1.symbols | 28 ++++++++++ .../checkSuperCallBeforeThisAccessing1.types | 31 ++++++++++ ...ckSuperCallBeforeThisAccessing2.errors.txt | 16 ++++++ .../checkSuperCallBeforeThisAccessing2.js | 33 +++++++++++ .../checkSuperCallBeforeThisAccessing3.js | 43 ++++++++++++++ ...checkSuperCallBeforeThisAccessing3.symbols | 38 +++++++++++++ .../checkSuperCallBeforeThisAccessing3.types | 43 ++++++++++++++ .../checkSuperCallBeforeThisAccessing4.js | 52 +++++++++++++++++ ...checkSuperCallBeforeThisAccessing4.symbols | 43 ++++++++++++++ .../checkSuperCallBeforeThisAccessing4.types | 56 +++++++++++++++++++ ...ckSuperCallBeforeThisAccessing5.errors.txt | 13 +++++ .../checkSuperCallBeforeThisAccessing5.js | 31 ++++++++++ .../checkSuperCallBeforeThisAccessing6.js | 36 ++++++++++++ ...checkSuperCallBeforeThisAccessing6.symbols | 20 +++++++ .../checkSuperCallBeforeThisAccessing6.types | 23 ++++++++ .../checkSuperCallBeforeThisAccessing7.js | 30 ++++++++++ ...checkSuperCallBeforeThisAccessing7.symbols | 19 +++++++ .../checkSuperCallBeforeThisAccessing7.types | 22 ++++++++ ...ckSuperCallBeforeThisAccessing8.errors.txt | 16 ++++++ .../checkSuperCallBeforeThisAccessing8.js | 35 ++++++++++++ .../reference/classUpdateTests.errors.txt | 18 ++---- ...derivedClassParameterProperties.errors.txt | 45 ++++++--------- .../derivedClassParameterProperties.js | 4 +- ...rivedClassSuperCallsWithThisArg.errors.txt | 5 +- .../strictModeInConstructor.errors.txt | 12 ++-- .../thisInInvalidContexts.errors.txt | 5 +- .../reference/thisInInvalidContexts.js | 4 +- ...InInvalidContextsExternalModule.errors.txt | 5 +- .../thisInInvalidContextsExternalModule.js | 4 +- .../reference/thisInSuperCall.errors.txt | 7 ++- tests/baselines/reference/thisInSuperCall.js | 4 +- .../reference/thisInSuperCall2.errors.txt | 7 ++- tests/baselines/reference/thisInSuperCall2.js | 4 +- tests/cases/compiler/thisInSuperCall.ts | 2 +- tests/cases/compiler/thisInSuperCall2.ts | 2 +- .../derivedClassParameterProperties.ts | 2 +- .../thisKeyword/thisInInvalidContexts.ts | 2 +- .../thisInInvalidContextsExternalModule.ts | 2 +- 39 files changed, 725 insertions(+), 70 deletions(-) create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt create mode 100644 tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js new file mode 100644 index 00000000000..ec6e6e39ee8 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js @@ -0,0 +1,33 @@ +//// [checkSuperCallBeforeThisAccessing1.ts] +class Based { } +class Derived extends Based { + public x: number; + constructor() { + super(); + this; + this.x = 10; + var that = this; + } +} + +//// [checkSuperCallBeforeThisAccessing1.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Based = (function () { + function Based() { + } + return Based; +})(); +var Derived = (function (_super) { + __extends(Derived, _super); + function Derived() { + _super.call(this); + this; + this.x = 10; + var that = this; + } + return Derived; +})(Based); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols new file mode 100644 index 00000000000..008d1156b56 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.symbols @@ -0,0 +1,28 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts === +class Based { } +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0)) + +class Derived extends Based { +>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15)) +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0)) + + public x: number; +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29)) + + constructor() { + super(); +>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 0)) + + this; +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15)) + + this.x = 10; +>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15)) +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing1.ts, 1, 29)) + + var that = this; +>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing1.ts, 7, 11)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing1.ts, 0, 15)) + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types new file mode 100644 index 00000000000..f6114d28997 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing1.ts === +class Based { } +>Based : Based + +class Derived extends Based { +>Derived : Derived +>Based : Based + + public x: number; +>x : number + + constructor() { + super(); +>super() : void +>super : typeof Based + + this; +>this : Derived + + this.x = 10; +>this.x = 10 : number +>this.x : number +>this : Derived +>x : number +>10 : number + + var that = this; +>that : Derived +>this : Derived + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt new file mode 100644 index 00000000000..2c9473976a4 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt @@ -0,0 +1,16 @@ +tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: 'super' has to be called before 'this' accessing. + + +==== tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts (1 errors) ==== + class Based { } + class Derived extends Based { + public x: number; + constructor() { + this.x = 100; + super(); + ~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. + this.x = 10; + var that = this; + } + } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js new file mode 100644 index 00000000000..eb58afd820b --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js @@ -0,0 +1,33 @@ +//// [checkSuperCallBeforeThisAccessing2.ts] +class Based { } +class Derived extends Based { + public x: number; + constructor() { + this.x = 100; + super(); + this.x = 10; + var that = this; + } +} + +//// [checkSuperCallBeforeThisAccessing2.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Based = (function () { + function Based() { + } + return Based; +})(); +var Derived = (function (_super) { + __extends(Derived, _super); + function Derived() { + this.x = 100; + _super.call(this); + this.x = 10; + var that = this; + } + return Derived; +})(Based); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js new file mode 100644 index 00000000000..2c5652cf95f --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js @@ -0,0 +1,43 @@ +//// [checkSuperCallBeforeThisAccessing3.ts] +class Based { } +class Derived extends Based { + public x: number; + constructor() { + class innver { + public y: boolean; + constructor() { + this.y = true; + } + } + super(); + this.x = 10; + var that = this; + } +} + +//// [checkSuperCallBeforeThisAccessing3.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Based = (function () { + function Based() { + } + return Based; +})(); +var Derived = (function (_super) { + __extends(Derived, _super); + function Derived() { + var innver = (function () { + function innver() { + this.y = true; + } + return innver; + })(); + _super.call(this); + this.x = 10; + var that = this; + } + return Derived; +})(Based); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols new file mode 100644 index 00000000000..8dd68fc3b74 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.symbols @@ -0,0 +1,38 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts === +class Based { } +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0)) + +class Derived extends Based { +>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15)) +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0)) + + public x: number; +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29)) + + constructor() { + class innver { +>innver : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19)) + + public y: boolean; +>y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22)) + + constructor() { + this.y = true; +>this.y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22)) +>this : Symbol(innver, Decl(checkSuperCallBeforeThisAccessing3.ts, 3, 19)) +>y : Symbol(y, Decl(checkSuperCallBeforeThisAccessing3.ts, 4, 22)) + } + } + super(); +>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 0)) + + this.x = 10; +>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15)) +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing3.ts, 1, 29)) + + var that = this; +>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing3.ts, 12, 11)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing3.ts, 0, 15)) + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types new file mode 100644 index 00000000000..45077a6fe5e --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types @@ -0,0 +1,43 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing3.ts === +class Based { } +>Based : Based + +class Derived extends Based { +>Derived : Derived +>Based : Based + + public x: number; +>x : number + + constructor() { + class innver { +>innver : innver + + public y: boolean; +>y : boolean + + constructor() { + this.y = true; +>this.y = true : boolean +>this.y : boolean +>this : innver +>y : boolean +>true : boolean + } + } + super(); +>super() : void +>super : typeof Based + + this.x = 10; +>this.x = 10 : number +>this.x : number +>this : Derived +>x : number +>10 : number + + var that = this; +>that : Derived +>this : Derived + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js new file mode 100644 index 00000000000..eacec00c438 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js @@ -0,0 +1,52 @@ +//// [checkSuperCallBeforeThisAccessing4.ts] +class Based { } +class Derived extends Based { + public x: number; + constructor() { + (() => { + this; // No error + }); + () => { + this; // No error + }; + (() => { + this; // No error + })(); + super(); + super(); + this.x = 10; + var that = this; + } +} + +//// [checkSuperCallBeforeThisAccessing4.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Based = (function () { + function Based() { + } + return Based; +})(); +var Derived = (function (_super) { + __extends(Derived, _super); + function Derived() { + var _this = this; + (function () { + _this; // No error + }); + (function () { + _this; // No error + }); + (function () { + _this; // No error + })(); + _super.call(this); + _super.call(this); + this.x = 10; + var that = this; + } + return Derived; +})(Based); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols new file mode 100644 index 00000000000..7101280358d --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.symbols @@ -0,0 +1,43 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts === +class Based { } +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0)) + +class Derived extends Based { +>Derived : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) +>Based : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0)) + + public x: number; +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29)) + + constructor() { + (() => { + this; // No error +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) + + }); + () => { + this; // No error +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) + + }; + (() => { + this; // No error +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) + + })(); + super(); +>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0)) + + super(); +>super : Symbol(Based, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 0)) + + this.x = 10; +>this.x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) +>x : Symbol(x, Decl(checkSuperCallBeforeThisAccessing4.ts, 1, 29)) + + var that = this; +>that : Symbol(that, Decl(checkSuperCallBeforeThisAccessing4.ts, 16, 11)) +>this : Symbol(Derived, Decl(checkSuperCallBeforeThisAccessing4.ts, 0, 15)) + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types new file mode 100644 index 00000000000..965d09a4109 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types @@ -0,0 +1,56 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing4.ts === +class Based { } +>Based : Based + +class Derived extends Based { +>Derived : Derived +>Based : Based + + public x: number; +>x : number + + constructor() { + (() => { +>(() => { this; // No error }) : () => void +>() => { this; // No error } : () => void + + this; // No error +>this : Derived + + }); + () => { +>() => { this; // No error } : () => void + + this; // No error +>this : Derived + + }; + (() => { +>(() => { this; // No error })() : void +>(() => { this; // No error }) : () => void +>() => { this; // No error } : () => void + + this; // No error +>this : Derived + + })(); + super(); +>super() : void +>super : typeof Based + + super(); +>super() : void +>super : typeof Based + + this.x = 10; +>this.x = 10 : number +>this.x : number +>this : Derived +>x : number +>10 : number + + var that = this; +>that : Derived +>this : Derived + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt new file mode 100644 index 00000000000..fa5cfd524cb --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt @@ -0,0 +1,13 @@ +tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: 'super' has to be called before 'this' accessing. + + +==== tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts (1 errors) ==== + class Based { constructor(...arg) { } } + class Derived extends Based { + public x: number; + constructor() { + super(this.x); + ~~~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js new file mode 100644 index 00000000000..489c7200050 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js @@ -0,0 +1,31 @@ +//// [checkSuperCallBeforeThisAccessing5.ts] +class Based { constructor(...arg) { } } +class Derived extends Based { + public x: number; + constructor() { + super(this.x); + } +} + +//// [checkSuperCallBeforeThisAccessing5.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Based = (function () { + function Based() { + var arg = []; + for (var _i = 0; _i < arguments.length; _i++) { + arg[_i - 0] = arguments[_i]; + } + } + return Based; +})(); +var Derived = (function (_super) { + __extends(Derived, _super); + function Derived() { + _super.call(this, this.x); + } + return Derived; +})(Based); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js new file mode 100644 index 00000000000..6ad9773bc5f --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js @@ -0,0 +1,36 @@ +//// [checkSuperCallBeforeThisAccessing6.ts] +class Base { + constructor(...arg) { + } +} +class Super extends Base { + constructor() { + (() => this); // No Error + super(); + } +} + +//// [checkSuperCallBeforeThisAccessing6.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Base = (function () { + function Base() { + var arg = []; + for (var _i = 0; _i < arguments.length; _i++) { + arg[_i - 0] = arguments[_i]; + } + } + return Base; +})(); +var Super = (function (_super) { + __extends(Super, _super); + function Super() { + var _this = this; + (function () { return _this; }); // No Error + _super.call(this); + } + return Super; +})(Base); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols new file mode 100644 index 00000000000..84bac5775ec --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.symbols @@ -0,0 +1,20 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts === +class Base { +>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0)) + + constructor(...arg) { +>arg : Symbol(arg, Decl(checkSuperCallBeforeThisAccessing6.ts, 1, 16)) + } +} +class Super extends Base { +>Super : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing6.ts, 3, 1)) +>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0)) + + constructor() { + (() => this); // No Error +>this : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing6.ts, 3, 1)) + + super(); +>super : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing6.ts, 0, 0)) + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types new file mode 100644 index 00000000000..8e2d285d85b --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types @@ -0,0 +1,23 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing6.ts === +class Base { +>Base : Base + + constructor(...arg) { +>arg : any[] + } +} +class Super extends Base { +>Super : Super +>Base : Base + + constructor() { + (() => this); // No Error +>(() => this) : () => Super +>() => this : () => Super +>this : Super + + super(); +>super() : void +>super : typeof Base + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js new file mode 100644 index 00000000000..eafc662085f --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js @@ -0,0 +1,30 @@ +//// [checkSuperCallBeforeThisAccessing7.ts] +class Base { + constructor(func: ()=>Base) { + } +} +class Super extends Base { + constructor() { + super((() => this)); // No error + } +} + +//// [checkSuperCallBeforeThisAccessing7.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Base = (function () { + function Base(func) { + } + return Base; +})(); +var Super = (function (_super) { + __extends(Super, _super); + function Super() { + var _this = this; + _super.call(this, (function () { return _this; })); // No error + } + return Super; +})(Base); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols new file mode 100644 index 00000000000..3611429d2b2 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts === +class Base { +>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0)) + + constructor(func: ()=>Base) { +>func : Symbol(func, Decl(checkSuperCallBeforeThisAccessing7.ts, 1, 16)) +>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0)) + } +} +class Super extends Base { +>Super : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing7.ts, 3, 1)) +>Base : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0)) + + constructor() { + super((() => this)); // No error +>super : Symbol(Base, Decl(checkSuperCallBeforeThisAccessing7.ts, 0, 0)) +>this : Symbol(Super, Decl(checkSuperCallBeforeThisAccessing7.ts, 3, 1)) + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types new file mode 100644 index 00000000000..fa5e7dbe857 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types @@ -0,0 +1,22 @@ +=== tests/cases/compiler/checkSuperCallBeforeThisAccessing7.ts === +class Base { +>Base : Base + + constructor(func: ()=>Base) { +>func : () => Base +>Base : Base + } +} +class Super extends Base { +>Super : Super +>Base : Base + + constructor() { + super((() => this)); // No error +>super((() => this)) : void +>super : typeof Base +>(() => this) : () => Super +>() => this : () => Super +>this : Super + } +} diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt new file mode 100644 index 00000000000..f7c763ee708 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt @@ -0,0 +1,16 @@ +tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. + + +==== tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts (1 errors) ==== + class Base { + constructor(...arg) { + } + } + class Super extends Base { + constructor() { + var that = this; + super(); + ~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js new file mode 100644 index 00000000000..4675d328b38 --- /dev/null +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js @@ -0,0 +1,35 @@ +//// [checkSuperCallBeforeThisAccessing8.ts] +class Base { + constructor(...arg) { + } +} +class Super extends Base { + constructor() { + var that = this; + super(); + } +} + +//// [checkSuperCallBeforeThisAccessing8.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var Base = (function () { + function Base() { + var arg = []; + for (var _i = 0; _i < arguments.length; _i++) { + arg[_i - 0] = arguments[_i]; + } + } + return Base; +})(); +var Super = (function (_super) { + __extends(Super, _super); + function Super() { + var that = this; + _super.call(this); + } + return Super; +})(Base); diff --git a/tests/baselines/reference/classUpdateTests.errors.txt b/tests/baselines/reference/classUpdateTests.errors.txt index 59e9bc9ced1..55965756410 100644 --- a/tests/baselines/reference/classUpdateTests.errors.txt +++ b/tests/baselines/reference/classUpdateTests.errors.txt @@ -1,11 +1,11 @@ tests/cases/compiler/classUpdateTests.ts(34,2): error TS2377: Constructors for derived classes must contain a 'super' call. tests/cases/compiler/classUpdateTests.ts(43,18): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/compiler/classUpdateTests.ts(57,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/classUpdateTests.ts(59,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/compiler/classUpdateTests.ts(63,7): error TS2415: Class 'L' incorrectly extends base class 'G'. Property 'p1' is private in type 'L' but not in type 'G'. tests/cases/compiler/classUpdateTests.ts(69,7): error TS2415: Class 'M' incorrectly extends base class 'G'. Property 'p1' is private in type 'M' but not in type 'G'. -tests/cases/compiler/classUpdateTests.ts(70,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/classUpdateTests.ts(72,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/compiler/classUpdateTests.ts(93,3): error TS1128: Declaration or statement expected. tests/cases/compiler/classUpdateTests.ts(95,1): error TS1128: Declaration or statement expected. tests/cases/compiler/classUpdateTests.ts(99,3): error TS1128: Declaration or statement expected. @@ -80,14 +80,11 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st class K extends G { constructor(public p1:number) { // ERROR - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var i = 0; - ~~~~~~~~~~~~ super(); - ~~~~~~~~~~ - } - ~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } class L extends G { @@ -104,14 +101,11 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st !!! error TS2415: Class 'M' incorrectly extends base class 'G'. !!! error TS2415: Property 'p1' is private in type 'M' but not in type 'G'. constructor(private p1:number) { // ERROR - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var i = 0; - ~~~~~~~~~~~~ super(); - ~~~~~~~~~~ - } - ~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } // diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt index 0dba0d24cb0..7b57951d493 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt +++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt @@ -1,10 +1,11 @@ -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(15,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(30,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(56,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(79,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (4 errors) ==== +==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (5 errors) ==== // ordering of super calls in derived constructors matters depending on other class contents class Base { @@ -20,14 +21,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP class Derived2 extends Base { constructor(public y: string) { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var a = 1; - ~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } class Derived3 extends Base { @@ -40,14 +38,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP class Derived4 extends Base { a = 1; constructor(y: string) { - ~~~~~~~~~~~~~~~~~~~~~~~~ var b = 2; - ~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } class Derived5 extends Base { @@ -63,7 +58,9 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP constructor(y: string) { this.a = 1; var b = 2; - super(); // ok + super(); // error: "super" has to be called before "this" accessing + ~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } @@ -71,16 +68,12 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP a = 1; b: number; constructor(y: string) { - ~~~~~~~~~~~~~~~~~~~~~~~~ this.a = 3; - ~~~~~~~~~~~~~~~~~~~ this.b = 3; - ~~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } class Derived8 extends Base { @@ -100,16 +93,12 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP a = 1; b: number; constructor(y: string) { - ~~~~~~~~~~~~~~~~~~~~~~~~ this.a = 3; - ~~~~~~~~~~~~~~~~~~~ this.b = 3; - ~~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + } } class Derived10 extends Base2 { diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js index 55c0a312b71..0d4a476af12 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.js +++ b/tests/baselines/reference/derivedClassParameterProperties.js @@ -47,7 +47,7 @@ class Derived6 extends Base { constructor(y: string) { this.a = 1; var b = 2; - super(); // ok + super(); // error: "super" has to be called before "this" accessing } } @@ -155,7 +155,7 @@ var Derived6 = (function (_super) { function Derived6(y) { this.a = 1; var b = 2; - _super.call(this); // ok + _super.call(this); // error: "super" has to be called before "this" accessing } return Derived6; })(Base); diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt index ef43d1d6f52..d8b724e3d0f 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt @@ -1,8 +1,9 @@ +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (2 errors) ==== +==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (3 errors) ==== class Base { x: string; constructor(a) { } @@ -11,6 +12,8 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS class Derived extends Base { constructor() { super(this); // ok + ~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } diff --git a/tests/baselines/reference/strictModeInConstructor.errors.txt b/tests/baselines/reference/strictModeInConstructor.errors.txt index 9a80732842a..3c38530cc12 100644 --- a/tests/baselines/reference/strictModeInConstructor.errors.txt +++ b/tests/baselines/reference/strictModeInConstructor.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/strictModeInConstructor.ts(29,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. ==== tests/cases/compiler/strictModeInConstructor.ts (1 errors) ==== @@ -29,16 +29,12 @@ tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' c public s: number = 9; constructor () { - ~~~~~~~~~~~~~~~~ var x = 1; // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ super(); - ~~~~~~~~~~~~~~~~ - "use strict"; - ~~~~~~~~~~~~~~~~~~~~~ - } - ~~~~~ + ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + "use strict"; + } } class Bs extends A { diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index 76b90ed7c20..0200ae6f84c 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -1,4 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -23,7 +24,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // Error + ~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js index d5ba69ff536..66cbdb9682c 100644 --- a/tests/baselines/reference/thisInInvalidContexts.js +++ b/tests/baselines/reference/thisInInvalidContexts.js @@ -12,7 +12,7 @@ class ClassWithNoInitializer extends BaseErrClass { t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // Error } } @@ -70,7 +70,7 @@ var ClassWithNoInitializer = (function (_super) { __extends(ClassWithNoInitializer, _super); //'this' in optional super call function ClassWithNoInitializer() { - _super.call(this, this); // OK + _super.call(this, this); // Error } return ClassWithNoInitializer; })(BaseErrClass); diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index 2aa474d4cdc..ced387a453b 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -1,4 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -24,7 +25,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // error: "super" has to be called before "this" accessing + ~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js index 31a2e995a18..df3abd156de 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js @@ -12,7 +12,7 @@ class ClassWithNoInitializer extends BaseErrClass { t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // error: "super" has to be called before "this" accessing } } @@ -71,7 +71,7 @@ var ClassWithNoInitializer = (function (_super) { __extends(ClassWithNoInitializer, _super); //'this' in optional super call function ClassWithNoInitializer() { - _super.call(this, this); // OK + _super.call(this, this); // error: "super" has to be called before "this" accessing } return ClassWithNoInitializer; })(BaseErrClass); diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt index 57255aa9582..d0be13d8adc 100644 --- a/tests/baselines/reference/thisInSuperCall.errors.txt +++ b/tests/baselines/reference/thisInSuperCall.errors.txt @@ -1,15 +1,18 @@ +tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17006: 'super' has to be called before 'this' accessing. tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/compiler/thisInSuperCall.ts (2 errors) ==== +==== tests/cases/compiler/thisInSuperCall.ts (3 errors) ==== class Base { constructor(x: any) {} } class Foo extends Base { constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing + ~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } diff --git a/tests/baselines/reference/thisInSuperCall.js b/tests/baselines/reference/thisInSuperCall.js index f7d7ca4e4fd..0bcaf35fcbf 100644 --- a/tests/baselines/reference/thisInSuperCall.js +++ b/tests/baselines/reference/thisInSuperCall.js @@ -5,7 +5,7 @@ class Base { class Foo extends Base { constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing } } @@ -36,7 +36,7 @@ var Base = (function () { var Foo = (function (_super) { __extends(Foo, _super); function Foo() { - _super.call(this, this); // no error + _super.call(this, this); // error: "super" has to be called before "this" accessing } return Foo; })(Base); diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt index d3a94f79487..0559f83eb90 100644 --- a/tests/baselines/reference/thisInSuperCall2.errors.txt +++ b/tests/baselines/reference/thisInSuperCall2.errors.txt @@ -1,7 +1,8 @@ +tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/compiler/thisInSuperCall2.ts (1 errors) ==== +==== tests/cases/compiler/thisInSuperCall2.ts (2 errors) ==== class Base { constructor(a: any) {} } @@ -9,7 +10,9 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be class Foo extends Base { public x: number; constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing + ~~~~~~~~~~~~ +!!! error TS17006: 'super' has to be called before 'this' accessing. } } diff --git a/tests/baselines/reference/thisInSuperCall2.js b/tests/baselines/reference/thisInSuperCall2.js index a9bbeda9fe7..8957a089210 100644 --- a/tests/baselines/reference/thisInSuperCall2.js +++ b/tests/baselines/reference/thisInSuperCall2.js @@ -6,7 +6,7 @@ class Base { class Foo extends Base { public x: number; constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing } } @@ -33,7 +33,7 @@ var Base = (function () { var Foo = (function (_super) { __extends(Foo, _super); function Foo() { - _super.call(this, this); // no error + _super.call(this, this); // error: "super" has to be called before "this" accessing } return Foo; })(Base); diff --git a/tests/cases/compiler/thisInSuperCall.ts b/tests/cases/compiler/thisInSuperCall.ts index 6a54e9ac6f1..b7df7cbafad 100644 --- a/tests/cases/compiler/thisInSuperCall.ts +++ b/tests/cases/compiler/thisInSuperCall.ts @@ -4,7 +4,7 @@ class Base { class Foo extends Base { constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing } } diff --git a/tests/cases/compiler/thisInSuperCall2.ts b/tests/cases/compiler/thisInSuperCall2.ts index 5de7c34cf32..2869ab9a805 100644 --- a/tests/cases/compiler/thisInSuperCall2.ts +++ b/tests/cases/compiler/thisInSuperCall2.ts @@ -5,7 +5,7 @@ class Base { class Foo extends Base { public x: number; constructor() { - super(this); // no error + super(this); // error: "super" has to be called before "this" accessing } } diff --git a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts index edfd7ab4f8c..a054ed0f683 100644 --- a/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts +++ b/tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts @@ -46,7 +46,7 @@ class Derived6 extends Base { constructor(y: string) { this.a = 1; var b = 2; - super(); // ok + super(); // error: "super" has to be called before "this" accessing } } diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts index 0afbc450040..2b929318c13 100644 --- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts +++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts @@ -11,7 +11,7 @@ class ClassWithNoInitializer extends BaseErrClass { t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // Error } } diff --git a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts index 513e56977df..e3d8ce9f5fc 100644 --- a/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts +++ b/tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts @@ -11,7 +11,7 @@ class ClassWithNoInitializer extends BaseErrClass { t; //'this' in optional super call constructor() { - super(this); // OK + super(this); // error: "super" has to be called before "this" accessing } } From 680a8932203ea345f74c7e81b87077fab225f128 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 15 Sep 2015 17:19:19 -0700 Subject: [PATCH 009/160] Add tests --- .../compiler/checkSuperCallBeforeThisAccessing8.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts diff --git a/tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts b/tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts new file mode 100644 index 00000000000..230b40fc24d --- /dev/null +++ b/tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts @@ -0,0 +1,10 @@ +class Base { + constructor(...arg) { + } +} +class Super extends Base { + constructor() { + var that = this; + super(); + } +} \ No newline at end of file From a7688592b2aef3678f10ef246d0f2e49854ae1d1 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 6 Oct 2015 19:46:46 -0700 Subject: [PATCH 010/160] Address PR feedback Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/types.ts --- src/compiler/checker.ts | 17 ++++++++++------- src/compiler/diagnosticMessages.json | 4 ++-- src/compiler/types.ts | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b328a4c8366..fb47d6bd57c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6859,9 +6859,8 @@ namespace ts { // (()=>this); // No Error // super(); // } - if ((container).hasSeenSuperBeforeThis === undefined) { - (container).hasSeenSuperBeforeThis = false; - } + let nodeLinks = getNodeLinks(container); + nodeLinks.flags |= NodeCheckFlags.HasSeenThisCall; } // Now skip arrow functions to get the "real" owner of 'this'. @@ -9605,8 +9604,12 @@ namespace ts { const signature = getResolvedSignature(node); if (node.expression.kind === SyntaxKind.SuperKeyword) { let containgFunction = getContainingFunction(node.expression); - if (containgFunction && containgFunction.kind === SyntaxKind.Constructor && (containgFunction).hasSeenSuperBeforeThis === undefined) { - (containgFunction).hasSeenSuperBeforeThis = true; + + if (containgFunction && containgFunction.kind === SyntaxKind.Constructor) { + let nodeLinks = getNodeLinks(containgFunction); + if (!(nodeLinks.flags & NodeCheckFlags.HasSeenThisCall)) { + nodeLinks.flags |= NodeCheckFlags.HasSeenSuperBeforeThis; + } } return voidType; } @@ -11208,9 +11211,9 @@ namespace ts { markThisReferencesAsErrors(superCallStatement.expression); } } - else if (!node.hasSeenSuperBeforeThis) { + else if (!(getNodeCheckFlags(node) & NodeCheckFlags.HasSeenSuperBeforeThis)){ // In ES6, super inside constructor of class-declaration has to precede "this" accessing - error(superCallStatement, Diagnostics.super_has_to_be_called_before_this_accessing); + error(superCallStatement, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class); } } else if (baseConstructorType !== nullType) { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 51a4e2c6c8f..4bf83bd3e45 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2540,8 +2540,8 @@ "category": "Error", "code": 17007 }, - "'super' has to be called before 'this' accessing.": { + "'super' must be called before accessing 'this' in the constructor of a derived class.": { "category": "Error", - "code": 17006 + "code": 17008 } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5a216f8bbcd..9aded35059a 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -695,7 +695,6 @@ namespace ts { // @kind(SyntaxKind.Constructor) export interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement { body?: FunctionBody; - hasSeenSuperBeforeThis: boolean; // TODDO (yuisu): comment } // For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. @@ -2031,6 +2030,8 @@ namespace ts { BlockScopedBindingInLoop = 0x00004000, LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure + HasSeenSuperBeforeThis = 0x00020000, // Set during the binding if the 'super' is used before 'this' in constructor function + HasSeenThisCall = 0x00040000, // Set during the binding when encounter 'this' } /* @internal */ From c0f818f1a2c0025a0e06983698ee354ffe6ab862 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 6 Oct 2015 19:47:17 -0700 Subject: [PATCH 011/160] Update baseline for new message --- .../reference/checkSuperCallBeforeThisAccessing2.errors.txt | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing5.errors.txt | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing8.errors.txt | 4 ++-- .../reference/derivedClassParameterProperties.errors.txt | 4 ++-- .../reference/derivedClassSuperCallsWithThisArg.errors.txt | 4 ++-- tests/baselines/reference/thisInInvalidContexts.errors.txt | 4 ++-- .../reference/thisInInvalidContextsExternalModule.errors.txt | 4 ++-- tests/baselines/reference/thisInSuperCall.errors.txt | 4 ++-- tests/baselines/reference/thisInSuperCall2.errors.txt | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt index 2c9473976a4..6fdb2e3e394 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts (1 errors) ==== @@ -9,7 +9,7 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: this.x = 100; super(); ~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. this.x = 10; var that = this; } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt index fa5cfd524cb..edd7745a03c 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts (1 errors) ==== @@ -8,6 +8,6 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: constructor() { super(this.x); ~~~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt index f7c763ee708..39db87d41a1 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts (1 errors) ==== @@ -11,6 +11,6 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: var that = this; super(); ~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt index 7b57951d493..c5d853dec56 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt +++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. @@ -60,7 +60,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP var b = 2; super(); // error: "super" has to be called before "this" accessing ~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt index d8b724e3d0f..e72dbe293e9 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location. @@ -13,7 +13,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS constructor() { super(this); // ok ~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index 0200ae6f84c..09fa952e2c2 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -26,7 +26,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): constructor() { super(this); // Error ~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index ced387a453b..9909c0cbfe9 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -27,7 +27,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt index d0be13d8adc..ea4b6fd742a 100644 --- a/tests/baselines/reference/thisInSuperCall.errors.txt +++ b/tests/baselines/reference/thisInSuperCall.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location. @@ -12,7 +12,7 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be r constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt index 0559f83eb90..7130ee8deb8 100644 --- a/tests/baselines/reference/thisInSuperCall2.errors.txt +++ b/tests/baselines/reference/thisInSuperCall2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17006: 'super' has to be called before 'this' accessing. +tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location. @@ -12,7 +12,7 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' has to be called before 'this' accessing. +!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. } } From 319a9cd4309f69e3dcac367eb87e3a1e46dbf6a5 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 30 Nov 2015 10:30:03 -0800 Subject: [PATCH 012/160] Update baseline with new error message number and fix space and comment --- src/compiler/checker.ts | 9 ++++----- src/compiler/types.ts | 2 +- .../checkSuperCallBeforeThisAccessing1.types | 8 ++++---- .../checkSuperCallBeforeThisAccessing2.errors.txt | 4 ++-- .../checkSuperCallBeforeThisAccessing3.types | 8 ++++---- .../checkSuperCallBeforeThisAccessing4.types | 12 ++++++------ .../checkSuperCallBeforeThisAccessing5.errors.txt | 4 ++-- .../checkSuperCallBeforeThisAccessing6.types | 6 +++--- .../checkSuperCallBeforeThisAccessing7.types | 6 +++--- .../checkSuperCallBeforeThisAccessing8.errors.txt | 4 ++-- .../derivedClassParameterProperties.errors.txt | 4 ++-- .../derivedClassSuperCallsWithThisArg.errors.txt | 4 ++-- .../reference/thisInInvalidContexts.errors.txt | 6 +++--- .../thisInInvalidContextsExternalModule.errors.txt | 6 +++--- tests/baselines/reference/thisInSuperCall.errors.txt | 4 ++-- .../baselines/reference/thisInSuperCall2.errors.txt | 4 ++-- 16 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fb47d6bd57c..0488b1b6dd1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6848,7 +6848,6 @@ namespace ts { let container = getThisContainer(node, /* includeArrowFunctions */ true); let needToCaptureLexicalThis = false; - if (container.kind === SyntaxKind.Constructor) { // Keep track of whether we have seen "super" before encounter "this" so that // we can report appropriate error later in checkConstructorDeclaration @@ -6859,7 +6858,7 @@ namespace ts { // (()=>this); // No Error // super(); // } - let nodeLinks = getNodeLinks(container); + const nodeLinks = getNodeLinks(container); nodeLinks.flags |= NodeCheckFlags.HasSeenThisCall; } @@ -9603,10 +9602,10 @@ namespace ts { const signature = getResolvedSignature(node); if (node.expression.kind === SyntaxKind.SuperKeyword) { - let containgFunction = getContainingFunction(node.expression); + const containgFunction = getContainingFunction(node.expression); if (containgFunction && containgFunction.kind === SyntaxKind.Constructor) { - let nodeLinks = getNodeLinks(containgFunction); + const nodeLinks = getNodeLinks(containgFunction); if (!(nodeLinks.flags & NodeCheckFlags.HasSeenThisCall)) { nodeLinks.flags |= NodeCheckFlags.HasSeenSuperBeforeThis; } @@ -11211,7 +11210,7 @@ namespace ts { markThisReferencesAsErrors(superCallStatement.expression); } } - else if (!(getNodeCheckFlags(node) & NodeCheckFlags.HasSeenSuperBeforeThis)){ + else if (!(getNodeCheckFlags(node) & NodeCheckFlags.HasSeenSuperBeforeThis)) { // In ES6, super inside constructor of class-declaration has to precede "this" accessing error(superCallStatement, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9aded35059a..9a82891df77 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2030,7 +2030,7 @@ namespace ts { BlockScopedBindingInLoop = 0x00004000, LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure - HasSeenSuperBeforeThis = 0x00020000, // Set during the binding if the 'super' is used before 'this' in constructor function + HasSeenSuperBeforeThis = 0x00020000, // Set during the binding if 'super' is used before 'this' in constructor function HasSeenThisCall = 0x00040000, // Set during the binding when encounter 'this' } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types index f6114d28997..d734b0c6ad0 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.types @@ -15,17 +15,17 @@ class Derived extends Based { >super : typeof Based this; ->this : Derived +>this : this this.x = 10; >this.x = 10 : number >this.x : number ->this : Derived +>this : this >x : number >10 : number var that = this; ->that : Derived ->this : Derived +>that : this +>this : this } } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt index 6fdb2e3e394..e48f43c8662 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts (1 errors) ==== @@ -9,7 +9,7 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17006: this.x = 100; super(); ~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. this.x = 10; var that = this; } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types index 45077a6fe5e..c4e9e15ed8e 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.types @@ -20,7 +20,7 @@ class Derived extends Based { this.y = true; >this.y = true : boolean >this.y : boolean ->this : innver +>this : this >y : boolean >true : boolean } @@ -32,12 +32,12 @@ class Derived extends Based { this.x = 10; >this.x = 10 : number >this.x : number ->this : Derived +>this : this >x : number >10 : number var that = this; ->that : Derived ->this : Derived +>that : this +>this : this } } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types index 965d09a4109..f42a0ac8563 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.types @@ -15,14 +15,14 @@ class Derived extends Based { >() => { this; // No error } : () => void this; // No error ->this : Derived +>this : this }); () => { >() => { this; // No error } : () => void this; // No error ->this : Derived +>this : this }; (() => { @@ -31,7 +31,7 @@ class Derived extends Based { >() => { this; // No error } : () => void this; // No error ->this : Derived +>this : this })(); super(); @@ -45,12 +45,12 @@ class Derived extends Based { this.x = 10; >this.x = 10 : number >this.x : number ->this : Derived +>this : this >x : number >10 : number var that = this; ->that : Derived ->this : Derived +>that : this +>this : this } } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt index edd7745a03c..1258101cffc 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts (1 errors) ==== @@ -8,6 +8,6 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17006: constructor() { super(this.x); ~~~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types index 8e2d285d85b..826dab0c400 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.types @@ -12,9 +12,9 @@ class Super extends Base { constructor() { (() => this); // No Error ->(() => this) : () => Super ->() => this : () => Super ->this : Super +>(() => this) : () => this +>() => this : () => this +>this : this super(); >super() : void diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types index fa5e7dbe857..11d2ab26d20 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.types @@ -15,8 +15,8 @@ class Super extends Base { super((() => this)); // No error >super((() => this)) : void >super : typeof Base ->(() => this) : () => Super ->() => this : () => Super ->this : Super +>(() => this) : () => this +>() => this : () => this +>this : this } } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt index 39db87d41a1..7a00a4f0130 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts (1 errors) ==== @@ -11,6 +11,6 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17006: var that = this; super(); ~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt index c5d853dec56..37f272db082 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt +++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt @@ -1,6 +1,6 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. @@ -60,7 +60,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP var b = 2; super(); // error: "super" has to be called before "this" accessing ~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt index e72dbe293e9..0190a659166 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location. @@ -13,7 +13,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS constructor() { super(this); // ok ~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index 09fa952e2c2..d74db892019 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -8,7 +8,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(44,9): tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (7 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (8 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -26,7 +26,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): constructor() { super(this); // Error ~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index 9909c0cbfe9..c4188993eee 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -9,7 +9,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (8 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -27,7 +27,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt index ea4b6fd742a..f0fc5854123 100644 --- a/tests/baselines/reference/thisInSuperCall.errors.txt +++ b/tests/baselines/reference/thisInSuperCall.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location. @@ -12,7 +12,7 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be r constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt index 7130ee8deb8..11ea23d020c 100644 --- a/tests/baselines/reference/thisInSuperCall2.errors.txt +++ b/tests/baselines/reference/thisInSuperCall2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location. @@ -12,7 +12,7 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be constructor() { super(this); // error: "super" has to be called before "this" accessing ~~~~~~~~~~~~ -!!! error TS17006: 'super' must be called before accessing 'this' in the constructor of a derived class. +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } From f18e20316a7a3e11f3bd1151c655edd9eaebd58e Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 30 Nov 2015 20:41:12 -0800 Subject: [PATCH 013/160] fix merge issues --- src/compiler/core.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/compiler/core.ts b/src/compiler/core.ts index 3d81583f7fd..55a2b15194b 100644 --- a/src/compiler/core.ts +++ b/src/compiler/core.ts @@ -74,11 +74,6 @@ namespace ts { GreaterThan = 1 } - /* @internal */ - export function isArray(obj: any): boolean { - return Array.isArray ? Array.isArray(obj) : typeof obj === "object" && obj instanceof Array; - } - /** * Iterates through 'array' by index and performs the callback on each element of array until the callback * returns a truthy value, then returns that value. From 2745895064bc2c1ac36ff67b101200239712a1d4 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 1 Dec 2015 11:13:54 -0800 Subject: [PATCH 014/160] Alternate approach to fix super calls in async methods. --- src/compiler/checker.ts | 14 ++-- src/compiler/emitter.ts | 83 ++++++++++++++----- src/compiler/types.ts | 2 +- ...asyncArrowFunctionCapturesArguments_es6.js | 2 +- .../asyncAwaitIsolatedModules_es6.js | 2 +- tests/baselines/reference/asyncAwait_es6.js | 2 +- .../reference/asyncMethodWithSuper_es6.js | 27 ++++++ .../asyncMethodWithSuper_es6.symbols | 26 ++++++ .../reference/asyncMethodWithSuper_es6.types | 29 +++++++ tests/baselines/reference/asyncMultiFile.js | 2 +- .../reference/reachabilityChecks7.js | 2 +- .../reference/superSymbolIndexedAccess5.js | 2 +- .../reference/superSymbolIndexedAccess6.js | 2 +- .../async/es6/asyncMethodWithSuper_es6.ts | 13 +++ 14 files changed, 176 insertions(+), 32 deletions(-) create mode 100644 tests/baselines/reference/asyncMethodWithSuper_es6.js create mode 100644 tests/baselines/reference/asyncMethodWithSuper_es6.symbols create mode 100644 tests/baselines/reference/asyncMethodWithSuper_es6.types create mode 100644 tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9ed3ca55e19..21317bec3fb 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6756,7 +6756,6 @@ namespace ts { if (node.parserContextFlags & ParserContextFlags.Await) { getNodeLinks(container).flags |= NodeCheckFlags.CaptureArguments; - getNodeLinks(node).flags |= NodeCheckFlags.LexicalArguments; } } @@ -6934,6 +6933,11 @@ namespace ts { getNodeLinks(node).flags |= nodeCheckFlag; + // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference. + if (container.kind === SyntaxKind.MethodDeclaration && container.flags & NodeFlags.Async) { + getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuper; + } + if (needToCaptureLexicalThis) { // call expressions are allowed only in constructors so they should always capture correct 'this' // super property access expressions can also appear in arrow functions - @@ -9858,7 +9862,7 @@ namespace ts { return aggregatedTypes; } - /* + /* *TypeScript Specification 1.0 (6.3) - July 2014 * An explicitly typed function whose return type isn't the Void or the Any type * must have at least one return statement somewhere in its body. @@ -9884,15 +9888,15 @@ namespace ts { const hasExplicitReturn = func.flags & NodeFlags.HasExplicitReturn; if (returnType && !hasExplicitReturn) { - // minimal check: function has syntactic return type annotation and no explicit return statements in the body + // minimal check: function has syntactic return type annotation and no explicit return statements in the body // this function does not conform to the specification. - // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present + // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value); } else if (compilerOptions.noImplicitReturns) { if (!returnType) { // If return type annotation is omitted check if function has any explicit return statements. - // If it does not have any - its inferred return type is void - don't do any checks. + // If it does not have any - its inferred return type is void - don't do any checks. // Otherwise get inferred return type from function body and report error only if it is not void / anytype const inferredReturnType = hasExplicitReturn ? getReturnTypeOfSignature(getSignatureFromDeclaration(func)) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 48f9dd32aaf..d6a709fc5e7 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -321,7 +321,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) { const awaiterHelper = ` var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { return new Promise(function (resolve, reject) { - generator = generator.call(thisArg, _arguments); + generator = generator.apply(thisArg, _arguments); function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); } function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } } function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } } @@ -1496,11 +1496,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } function emitExpressionIdentifier(node: Identifier) { - if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LexicalArguments) { - write("_arguments"); - return; - } - const container = resolver.getReferencedExportContainer(node); if (container) { if (container.kind === SyntaxKind.SourceFile) { @@ -2287,23 +2282,72 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(")"); } + function isSuperPropertyAccess(node: Expression): node is PropertyAccessExpression { + return node.kind === SyntaxKind.PropertyAccessExpression + && (node).expression.kind === SyntaxKind.SuperKeyword; + } + + function isSuperElementAccess(node: Expression): node is ElementAccessExpression { + return node.kind === SyntaxKind.ElementAccessExpression + && (node).expression.kind === SyntaxKind.SuperKeyword; + } + + function isInAsyncMethodWithSuperInES6(node: CallExpression) { + if (languageVersion === ScriptTarget.ES6) { + const container = getSuperContainer(node, /*includeFunctions*/ false); + if (container && resolver.getNodeCheckFlags(container) & NodeCheckFlags.AsyncMethodWithSuper) { + return true; + } + } + + return false; + } + + function emitSuperAccessInAsyncMethod(node: Expression) { + write("_super("); + emit(node); + write(")"); + } + function emitCallExpression(node: CallExpression) { if (languageVersion < ScriptTarget.ES6 && hasSpreadElement(node.arguments)) { emitCallWithSpread(node); return; } + + const expression = node.expression; let superCall = false; - if (node.expression.kind === SyntaxKind.SuperKeyword) { - emitSuper(node.expression); + let isAsyncMethodWithSuper = false; + if (expression.kind === SyntaxKind.SuperKeyword) { + emitSuper(expression); superCall = true; } else { - emit(node.expression); - superCall = node.expression.kind === SyntaxKind.PropertyAccessExpression && (node.expression).expression.kind === SyntaxKind.SuperKeyword; + if (isSuperPropertyAccess(expression)) { + superCall = true; + if (isInAsyncMethodWithSuperInES6(node)) { + isAsyncMethodWithSuper = true; + const name = createSynthesizedNode(SyntaxKind.StringLiteral); + name.text = expression.name.text; + emitSuperAccessInAsyncMethod(name); + } + } + else if (isSuperElementAccess(expression)) { + superCall = true; + if (isInAsyncMethodWithSuperInES6(node)) { + isAsyncMethodWithSuper = true; + emitSuperAccessInAsyncMethod(expression.argumentExpression); + } + } + + if (!isAsyncMethodWithSuper) { + emit(expression); + } } - if (superCall && languageVersion < ScriptTarget.ES6) { + + if (superCall && (languageVersion < ScriptTarget.ES6 || isAsyncMethodWithSuper)) { write(".call("); - emitThis(node.expression); + emitThis(expression); if (node.arguments.length) { write(", "); emitCommaList(node.arguments); @@ -2980,7 +3024,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } else { // this is top level converted loop so we need to create an alias for 'this' here - // NOTE: + // NOTE: // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set. // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'. write(`var ${convertedLoopState.thisName} = this;`); @@ -4452,6 +4496,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi write(" {"); increaseIndent(); writeLine(); + + if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) { + write("const _super = name => super[name];"); + writeLine(); + } + write("return"); } @@ -4472,12 +4522,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } // Emit the call to __awaiter. - if (hasLexicalArguments) { - write(", function* (_arguments)"); - } - else { - write(", function* ()"); - } + write(", function* ()"); // Emit the signature and body for the inner generator function. emitFunctionBody(node); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f8b26ddaa6d..dc17b9de5ec 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2022,7 +2022,7 @@ namespace ts { SuperInstance = 0x00000100, // Instance 'super' reference SuperStatic = 0x00000200, // Static 'super' reference ContextChecked = 0x00000400, // Contextual types have been assigned - LexicalArguments = 0x00000800, + AsyncMethodWithSuper = 0x00000800, CaptureArguments = 0x00001000, // Lexical 'arguments' used in body (for async functions) // Values for enum members have been computed, and any errors have been reported for them. diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js index c24259cf0b5..fdaa365836d 100644 --- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js +++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js @@ -11,6 +11,6 @@ class C { class C { method() { function other() { } - var fn = () => __awaiter(this, arguments, Promise, function* (_arguments) { return yield other.apply(this, _arguments); }); + var fn = () => __awaiter(this, arguments, Promise, function* () { return yield other.apply(this, arguments); }); } } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js index 7007c66ae28..9f3005e5861 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js @@ -42,7 +42,7 @@ module M { //// [asyncAwaitIsolatedModules_es6.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { return new Promise(function (resolve, reject) { - generator = generator.call(thisArg, _arguments); + generator = generator.apply(thisArg, _arguments); function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); } function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } } function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } } diff --git a/tests/baselines/reference/asyncAwait_es6.js b/tests/baselines/reference/asyncAwait_es6.js index 155a44d339d..fb4dbf9955d 100644 --- a/tests/baselines/reference/asyncAwait_es6.js +++ b/tests/baselines/reference/asyncAwait_es6.js @@ -42,7 +42,7 @@ module M { //// [asyncAwait_es6.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { return new Promise(function (resolve, reject) { - generator = generator.call(thisArg, _arguments); + generator = generator.apply(thisArg, _arguments); function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); } function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } } function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } } diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.js b/tests/baselines/reference/asyncMethodWithSuper_es6.js new file mode 100644 index 00000000000..315ce5fdb90 --- /dev/null +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.js @@ -0,0 +1,27 @@ +//// [asyncMethodWithSuper_es6.ts] +class A { + x() { + } +} + +class B extends A { + async y() { + super.x(); + super["x"](); + } +} + +//// [asyncMethodWithSuper_es6.js] +class A { + x() { + } +} +class B extends A { + y() { + const _super = name => super[name]; + return __awaiter(this, void 0, Promise, function* () { + _super("x").call(this); + _super("x").call(this); + }); + } +} diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.symbols b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols new file mode 100644 index 00000000000..2b7388702f1 --- /dev/null +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols @@ -0,0 +1,26 @@ +=== tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts === +class A { +>A : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) + + x() { +>x : Symbol(x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + } +} + +class B extends A { +>B : Symbol(B, Decl(asyncMethodWithSuper_es6.ts, 3, 1)) +>A : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) + + async y() { +>y : Symbol(y, Decl(asyncMethodWithSuper_es6.ts, 5, 19)) + + super.x(); +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + super["x"](); +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + } +} diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.types b/tests/baselines/reference/asyncMethodWithSuper_es6.types new file mode 100644 index 00000000000..7786b417e81 --- /dev/null +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.types @@ -0,0 +1,29 @@ +=== tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts === +class A { +>A : A + + x() { +>x : () => void + } +} + +class B extends A { +>B : B +>A : A + + async y() { +>y : () => Promise + + super.x(); +>super.x() : void +>super.x : () => void +>super : A +>x : () => void + + super["x"](); +>super["x"]() : void +>super["x"] : () => void +>super : A +>"x" : string + } +} diff --git a/tests/baselines/reference/asyncMultiFile.js b/tests/baselines/reference/asyncMultiFile.js index e93dc586255..fa4a210c252 100644 --- a/tests/baselines/reference/asyncMultiFile.js +++ b/tests/baselines/reference/asyncMultiFile.js @@ -8,7 +8,7 @@ function g() { } //// [a.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { return new Promise(function (resolve, reject) { - generator = generator.call(thisArg, _arguments); + generator = generator.apply(thisArg, _arguments); function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); } function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } } function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } } diff --git a/tests/baselines/reference/reachabilityChecks7.js b/tests/baselines/reference/reachabilityChecks7.js index c78f99953e9..f3a27dfdab8 100644 --- a/tests/baselines/reference/reachabilityChecks7.js +++ b/tests/baselines/reference/reachabilityChecks7.js @@ -33,7 +33,7 @@ let x1 = () => { use("Test"); } //// [reachabilityChecks7.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) { return new Promise(function (resolve, reject) { - generator = generator.call(thisArg, _arguments); + generator = generator.apply(thisArg, _arguments); function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); } function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } } function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } } diff --git a/tests/baselines/reference/superSymbolIndexedAccess5.js b/tests/baselines/reference/superSymbolIndexedAccess5.js index 64a8ac5094c..2626051706c 100644 --- a/tests/baselines/reference/superSymbolIndexedAccess5.js +++ b/tests/baselines/reference/superSymbolIndexedAccess5.js @@ -34,7 +34,7 @@ var Bar = (function (_super) { _super.apply(this, arguments); } Bar.prototype[symbol] = function () { - return _super.prototype[symbol](); + return _super.prototype[symbol].call(this); }; return Bar; })(Foo); diff --git a/tests/baselines/reference/superSymbolIndexedAccess6.js b/tests/baselines/reference/superSymbolIndexedAccess6.js index e014cf47c1a..48834422e24 100644 --- a/tests/baselines/reference/superSymbolIndexedAccess6.js +++ b/tests/baselines/reference/superSymbolIndexedAccess6.js @@ -34,7 +34,7 @@ var Bar = (function (_super) { _super.apply(this, arguments); } Bar[symbol] = function () { - return _super[symbol](); + return _super[symbol].call(this); }; return Bar; })(Foo); diff --git a/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts b/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts new file mode 100644 index 00000000000..2225200ef60 --- /dev/null +++ b/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts @@ -0,0 +1,13 @@ +// @target: ES6 +// @noEmitHelpers: true +class A { + x() { + } +} + +class B extends A { + async y() { + super.x(); + super["x"](); + } +} \ No newline at end of file From 67a4fe5d67261fbb65abee8e2a9318600e5c49bf Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 1 Dec 2015 14:29:37 -0800 Subject: [PATCH 015/160] Support for assignment/destructuring using super in an async method --- src/compiler/checker.ts | 17 +++- src/compiler/emitter.ts | 64 +++++++----- src/compiler/types.ts | 11 ++- .../reference/asyncMethodWithSuper_es6.js | 76 +++++++++++++- .../asyncMethodWithSuper_es6.symbols | 80 ++++++++++++++- .../reference/asyncMethodWithSuper_es6.types | 98 ++++++++++++++++++- .../async/es6/asyncMethodWithSuper_es6.ts | 41 +++++++- 7 files changed, 347 insertions(+), 40 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 21317bec3fb..0d24f7c89fe 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6902,6 +6902,16 @@ namespace ts { return false; } + function isSuperPropertyAccess(node: Node) { + return node.kind === SyntaxKind.PropertyAccessExpression + && (node).expression.kind === SyntaxKind.SuperKeyword; + } + + function isSuperElementAccess(node: Node) { + return node.kind === SyntaxKind.ElementAccessExpression + && (node).expression.kind === SyntaxKind.SuperKeyword; + } + function checkSuperExpression(node: Node): Type { const isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (node.parent).expression === node; const classDeclaration = getContainingClass(node); @@ -6935,7 +6945,12 @@ namespace ts { // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference. if (container.kind === SyntaxKind.MethodDeclaration && container.flags & NodeFlags.Async) { - getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuper; + if ((isSuperPropertyAccess(node.parent) || isSuperElementAccess(node.parent)) && isAssignmentTarget(node.parent)) { + getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuperBinding; + } + else { + getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuper; + } } if (needToCaptureLexicalThis) { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index d6a709fc5e7..5c1eaf67b0e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2126,6 +2126,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return; } + if (languageVersion === ScriptTarget.ES6 && + node.expression.kind === SyntaxKind.SuperKeyword && + isInAsyncMethodWithSuperInES6(node)) { + const name = createSynthesizedNode(SyntaxKind.StringLiteral); + name.text = node.name.text; + emitSuperAccessInAsyncMethod(node.expression, name); + return; + } + emit(node.expression); const indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken); @@ -2207,6 +2216,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi if (tryEmitConstantValue(node)) { return; } + + if (languageVersion === ScriptTarget.ES6 && + node.expression.kind === SyntaxKind.SuperKeyword && + isInAsyncMethodWithSuperInES6(node)) { + emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression); + return; + } + emit(node.expression); write("["); emit(node.argumentExpression); @@ -2292,10 +2309,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi && (node).expression.kind === SyntaxKind.SuperKeyword; } - function isInAsyncMethodWithSuperInES6(node: CallExpression) { + function isInAsyncMethodWithSuperInES6(node: Node) { if (languageVersion === ScriptTarget.ES6) { const container = getSuperContainer(node, /*includeFunctions*/ false); - if (container && resolver.getNodeCheckFlags(container) & NodeCheckFlags.AsyncMethodWithSuper) { + if (container && resolver.getNodeCheckFlags(container) & (NodeCheckFlags.AsyncMethodWithSuper | NodeCheckFlags.AsyncMethodWithSuperBinding)) { return true; } } @@ -2303,10 +2320,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return false; } - function emitSuperAccessInAsyncMethod(node: Expression) { + function emitSuperAccessInAsyncMethod(superNode: Node, argumentExpression: Expression) { + const container = getSuperContainer(superNode, /*includeFunctions*/ false); + const isSuperBinding = resolver.getNodeCheckFlags(container) & NodeCheckFlags.AsyncMethodWithSuperBinding; write("_super("); - emit(node); - write(")"); + emit(argumentExpression); + write(isSuperBinding ? ").value" : ")"); } function emitCallExpression(node: CallExpression) { @@ -2323,26 +2342,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi superCall = true; } else { - if (isSuperPropertyAccess(expression)) { - superCall = true; - if (isInAsyncMethodWithSuperInES6(node)) { - isAsyncMethodWithSuper = true; - const name = createSynthesizedNode(SyntaxKind.StringLiteral); - name.text = expression.name.text; - emitSuperAccessInAsyncMethod(name); - } - } - else if (isSuperElementAccess(expression)) { - superCall = true; - if (isInAsyncMethodWithSuperInES6(node)) { - isAsyncMethodWithSuper = true; - emitSuperAccessInAsyncMethod(expression.argumentExpression); - } - } - - if (!isAsyncMethodWithSuper) { - emit(expression); - } + superCall = isSuperPropertyAccess(expression) || isSuperElementAccess(expression); + isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node); + emit(expression); } if (superCall && (languageVersion < ScriptTarget.ES6 || isAsyncMethodWithSuper)) { @@ -4497,8 +4499,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi increaseIndent(); writeLine(); - if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) { - write("const _super = name => super[name];"); + if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuperBinding) { + writeLines(` +const _super = (function (geti, seti) { + const cache = Object.create(null); + return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } }); +})(name => super[name], (name, value) => super[name] = value);`); + writeLine(); + } + else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.AsyncMethodWithSuper) { + write(`const _super = name => super[name];`); writeLine(); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index dc17b9de5ec..002543081f8 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2023,13 +2023,14 @@ namespace ts { SuperStatic = 0x00000200, // Static 'super' reference ContextChecked = 0x00000400, // Contextual types have been assigned AsyncMethodWithSuper = 0x00000800, - CaptureArguments = 0x00001000, // Lexical 'arguments' used in body (for async functions) + AsyncMethodWithSuperBinding = 0x00001000, + CaptureArguments = 0x00002000, // Lexical 'arguments' used in body (for async functions) // Values for enum members have been computed, and any errors have been reported for them. - EnumValuesComputed = 0x00002000, - BlockScopedBindingInLoop = 0x00004000, - LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. - LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure + EnumValuesComputed = 0x00004000, + BlockScopedBindingInLoop = 0x00008000, + LexicalModuleMergesWithClass = 0x00010000, // Instantiated lexical module declaration is merged with a previous class declaration. + LoopWithBlockScopedBindingCapturedInFunction = 0x00020000, // Loop that contains block scoped variable captured in closure } /* @internal */ diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.js b/tests/baselines/reference/asyncMethodWithSuper_es6.js index 315ce5fdb90..74d4de79881 100644 --- a/tests/baselines/reference/asyncMethodWithSuper_es6.js +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.js @@ -5,9 +5,48 @@ class A { } class B extends A { - async y() { + // async method with only call/get on 'super' does not require a binding + async simple() { + // call with property access super.x(); + + // call with element access super["x"](); + + // property access (read) + const a = super.x; + + // element access (read) + const b = super["x"]; + } + + // async method with assignment/destructuring on 'super' requires a binding + async advanced() { + const f = () => {}; + + // call with property access + super.x(); + + // call with element access + super["x"](); + + // property access (read) + const a = super.x; + + // element access (read) + const b = super["x"]; + + // property access (assign) + super.x = f; + + // element access (assign) + super["x"] = f; + + // destructuring assign with property access + ({ f: super.x } = { f }); + + // destructuring assign with element access + ({ f: super["x"] } = { f }); } } @@ -17,11 +56,44 @@ class A { } } class B extends A { - y() { + // async method with only call/get on 'super' does not require a binding + simple() { const _super = name => super[name]; return __awaiter(this, void 0, Promise, function* () { + // call with property access _super("x").call(this); + // call with element access _super("x").call(this); + // property access (read) + const a = _super("x"); + // element access (read) + const b = _super("x"); + }); + } + // async method with assignment/destructuring on 'super' requires a binding + advanced() { + const _super = (function (geti, seti) { + const cache = Object.create(null); + return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } }); + })(name => super[name], (name, value) => super[name] = value); + return __awaiter(this, void 0, Promise, function* () { + const f = () => { }; + // call with property access + _super("x").value.call(this); + // call with element access + _super("x").value.call(this); + // property access (read) + const a = _super("x").value; + // element access (read) + const b = _super("x").value; + // property access (assign) + _super("x").value = f; + // element access (assign) + _super("x").value = f; + // destructuring assign with property access + ({ f: _super("x").value } = { f }); + // destructuring assign with element access + ({ f: _super("x").value } = { f }); }); } } diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.symbols b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols index 2b7388702f1..37937a061a8 100644 --- a/tests/baselines/reference/asyncMethodWithSuper_es6.symbols +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.symbols @@ -11,16 +11,92 @@ class B extends A { >B : Symbol(B, Decl(asyncMethodWithSuper_es6.ts, 3, 1)) >A : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) - async y() { ->y : Symbol(y, Decl(asyncMethodWithSuper_es6.ts, 5, 19)) + // async method with only call/get on 'super' does not require a binding + async simple() { +>simple : Symbol(simple, Decl(asyncMethodWithSuper_es6.ts, 5, 19)) + // call with property access super.x(); >super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) >super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) >x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + // call with element access super["x"](); >super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) >"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // property access (read) + const a = super.x; +>a : Symbol(a, Decl(asyncMethodWithSuper_es6.ts, 15, 13)) +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // element access (read) + const b = super["x"]; +>b : Symbol(b, Decl(asyncMethodWithSuper_es6.ts, 18, 13)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + } + + // async method with assignment/destructuring on 'super' requires a binding + async advanced() { +>advanced : Symbol(advanced, Decl(asyncMethodWithSuper_es6.ts, 19, 5)) + + const f = () => {}; +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 23, 13)) + + // call with property access + super.x(); +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // call with element access + super["x"](); +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // property access (read) + const a = super.x; +>a : Symbol(a, Decl(asyncMethodWithSuper_es6.ts, 32, 13)) +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // element access (read) + const b = super["x"]; +>b : Symbol(b, Decl(asyncMethodWithSuper_es6.ts, 35, 13)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) + + // property access (assign) + super.x = f; +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 23, 13)) + + // element access (assign) + super["x"] = f; +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 23, 13)) + + // destructuring assign with property access + ({ f: super.x } = { f }); +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 44, 10)) +>super.x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>x : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 44, 27)) + + // destructuring assign with element access + ({ f: super["x"] } = { f }); +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 47, 10)) +>super : Symbol(A, Decl(asyncMethodWithSuper_es6.ts, 0, 0)) +>"x" : Symbol(A.x, Decl(asyncMethodWithSuper_es6.ts, 0, 9)) +>f : Symbol(f, Decl(asyncMethodWithSuper_es6.ts, 47, 30)) } } diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.types b/tests/baselines/reference/asyncMethodWithSuper_es6.types index 7786b417e81..04c5b5a9baf 100644 --- a/tests/baselines/reference/asyncMethodWithSuper_es6.types +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.types @@ -11,19 +11,113 @@ class B extends A { >B : B >A : A - async y() { ->y : () => Promise + // async method with only call/get on 'super' does not require a binding + async simple() { +>simple : () => Promise + // call with property access super.x(); >super.x() : void >super.x : () => void >super : A >x : () => void + // call with element access super["x"](); >super["x"]() : void >super["x"] : () => void >super : A >"x" : string + + // property access (read) + const a = super.x; +>a : () => void +>super.x : () => void +>super : A +>x : () => void + + // element access (read) + const b = super["x"]; +>b : () => void +>super["x"] : () => void +>super : A +>"x" : string + } + + // async method with assignment/destructuring on 'super' requires a binding + async advanced() { +>advanced : () => Promise + + const f = () => {}; +>f : () => void +>() => {} : () => void + + // call with property access + super.x(); +>super.x() : void +>super.x : () => void +>super : A +>x : () => void + + // call with element access + super["x"](); +>super["x"]() : void +>super["x"] : () => void +>super : A +>"x" : string + + // property access (read) + const a = super.x; +>a : () => void +>super.x : () => void +>super : A +>x : () => void + + // element access (read) + const b = super["x"]; +>b : () => void +>super["x"] : () => void +>super : A +>"x" : string + + // property access (assign) + super.x = f; +>super.x = f : () => void +>super.x : () => void +>super : A +>x : () => void +>f : () => void + + // element access (assign) + super["x"] = f; +>super["x"] = f : () => void +>super["x"] : () => void +>super : A +>"x" : string +>f : () => void + + // destructuring assign with property access + ({ f: super.x } = { f }); +>({ f: super.x } = { f }) : { f: () => void; } +>{ f: super.x } = { f } : { f: () => void; } +>{ f: super.x } : { f: () => void; } +>f : () => void +>super.x : () => void +>super : A +>x : () => void +>{ f } : { f: () => void; } +>f : () => void + + // destructuring assign with element access + ({ f: super["x"] } = { f }); +>({ f: super["x"] } = { f }) : { f: () => void; } +>{ f: super["x"] } = { f } : { f: () => void; } +>{ f: super["x"] } : { f: () => void; } +>f : () => void +>super["x"] : () => void +>super : A +>"x" : string +>{ f } : { f: () => void; } +>f : () => void } } diff --git a/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts b/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts index 2225200ef60..795fe7defb0 100644 --- a/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts +++ b/tests/cases/conformance/async/es6/asyncMethodWithSuper_es6.ts @@ -6,8 +6,47 @@ class A { } class B extends A { - async y() { + // async method with only call/get on 'super' does not require a binding + async simple() { + // call with property access super.x(); + + // call with element access super["x"](); + + // property access (read) + const a = super.x; + + // element access (read) + const b = super["x"]; + } + + // async method with assignment/destructuring on 'super' requires a binding + async advanced() { + const f = () => {}; + + // call with property access + super.x(); + + // call with element access + super["x"](); + + // property access (read) + const a = super.x; + + // element access (read) + const b = super["x"]; + + // property access (assign) + super.x = f; + + // element access (assign) + super["x"] = f; + + // destructuring assign with property access + ({ f: super.x } = { f }); + + // destructuring assign with element access + ({ f: super["x"] } = { f }); } } \ No newline at end of file From 7ad3cb74d4806a6deb6ea44c5c1a8d5d329ea52e Mon Sep 17 00:00:00 2001 From: Yui T Date: Wed, 16 Dec 2015 18:13:15 -0800 Subject: [PATCH 016/160] Address comments --- src/compiler/checker.ts | 25 +++++-------------- src/compiler/types.ts | 3 +-- .../baselines/reference/baseCheck.errors.txt | 11 +++++++- tests/baselines/reference/bases.errors.txt | 5 +++- ...ckSuperCallBeforeThisAccessing2.errors.txt | 6 ++--- ...ckSuperCallBeforeThisAccessing5.errors.txt | 4 +-- ...ckSuperCallBeforeThisAccessing8.errors.txt | 6 ++--- ...derivedClassParameterProperties.errors.txt | 20 ++++++++++++--- ...rivedClassSuperCallsWithThisArg.errors.txt | 9 ++++--- .../thisInInvalidContexts.errors.txt | 9 ++++--- ...InInvalidContextsExternalModule.errors.txt | 9 ++++--- .../reference/thisInSuperCall.errors.txt | 12 ++++++--- .../reference/thisInSuperCall1.errors.txt | 5 +++- .../reference/thisInSuperCall2.errors.txt | 9 ++++--- .../reference/thisInSuperCall3.errors.txt | 5 +++- 15 files changed, 86 insertions(+), 52 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0488b1b6dd1..07fdec43c71 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6849,17 +6849,11 @@ namespace ts { let needToCaptureLexicalThis = false; if (container.kind === SyntaxKind.Constructor) { - // Keep track of whether we have seen "super" before encounter "this" so that - // we can report appropriate error later in checkConstructorDeclaration - // We have to do the check here to make sure we won't give false error when - // "this" is used in arrow functions - // For example: - // constructor() { - // (()=>this); // No Error - // super(); - // } - const nodeLinks = getNodeLinks(container); - nodeLinks.flags |= NodeCheckFlags.HasSeenThisCall; + const baseTypeNode = getClassExtendsHeritageClauseElement(container.parent); + if (baseTypeNode && !(getNodeCheckFlags(container) & NodeCheckFlags.HasSeenSuperCall)) { + // In ES6, super inside constructor of class-declaration has to precede "this" accessing + error(node, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class); + } } // Now skip arrow functions to get the "real" owner of 'this'. @@ -9605,10 +9599,7 @@ namespace ts { const containgFunction = getContainingFunction(node.expression); if (containgFunction && containgFunction.kind === SyntaxKind.Constructor) { - const nodeLinks = getNodeLinks(containgFunction); - if (!(nodeLinks.flags & NodeCheckFlags.HasSeenThisCall)) { - nodeLinks.flags |= NodeCheckFlags.HasSeenSuperBeforeThis; - } + getNodeLinks(containgFunction).flags |= NodeCheckFlags.HasSeenSuperCall; } return voidType; } @@ -11210,10 +11201,6 @@ namespace ts { markThisReferencesAsErrors(superCallStatement.expression); } } - else if (!(getNodeCheckFlags(node) & NodeCheckFlags.HasSeenSuperBeforeThis)) { - // In ES6, super inside constructor of class-declaration has to precede "this" accessing - error(superCallStatement, Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class); - } } else if (baseConstructorType !== nullType) { error(node, Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9a82891df77..de706229915 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2030,8 +2030,7 @@ namespace ts { BlockScopedBindingInLoop = 0x00004000, LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure - HasSeenSuperBeforeThis = 0x00020000, // Set during the binding if 'super' is used before 'this' in constructor function - HasSeenThisCall = 0x00040000, // Set during the binding when encounter 'this' + HasSeenSuperCall = 0x00040000, // Set during the binding when encounter 'super' } /* @internal */ diff --git a/tests/baselines/reference/baseCheck.errors.txt b/tests/baselines/reference/baseCheck.errors.txt index f52ba4b3dbd..0b4e9fd61b1 100644 --- a/tests/baselines/reference/baseCheck.errors.txt +++ b/tests/baselines/reference/baseCheck.errors.txt @@ -1,15 +1,18 @@ tests/cases/compiler/baseCheck.ts(9,18): error TS2304: Cannot find name 'loc'. tests/cases/compiler/baseCheck.ts(17,53): error TS2346: Supplied parameters do not match any signature of call target. tests/cases/compiler/baseCheck.ts(17,59): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/baseCheck.ts(17,59): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/baseCheck.ts(18,62): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/baseCheck.ts(18,62): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/baseCheck.ts(19,59): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. tests/cases/compiler/baseCheck.ts(19,68): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/baseCheck.ts(19,68): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/baseCheck.ts(22,9): error TS2304: Cannot find name 'x'. tests/cases/compiler/baseCheck.ts(23,7): error TS2304: Cannot find name 'x'. tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'. -==== tests/cases/compiler/baseCheck.ts (9 errors) ==== +==== tests/cases/compiler/baseCheck.ts (12 errors) ==== class C { constructor(x: number, y: number) { } } class ELoc extends C { constructor(x: number) { @@ -33,14 +36,20 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'. !!! error TS2346: Supplied parameters do not match any signature of call target. ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. class E extends C { constructor(public z: number) { super(0, this.z) } } ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. class F extends C { constructor(public z: number) { super("hello", this.z) } } // first param type ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. function f() { if (x<10) { diff --git a/tests/baselines/reference/bases.errors.txt b/tests/baselines/reference/bases.errors.txt index c03a47d7532..7c48c977b2d 100644 --- a/tests/baselines/reference/bases.errors.txt +++ b/tests/baselines/reference/bases.errors.txt @@ -4,6 +4,7 @@ tests/cases/compiler/bases.ts(7,17): error TS2304: Cannot find name 'any'. tests/cases/compiler/bases.ts(11,7): error TS2420: Class 'C' incorrectly implements interface 'I'. Property 'x' is missing in type 'C'. tests/cases/compiler/bases.ts(12,5): error TS2377: Constructors for derived classes must contain a 'super' call. +tests/cases/compiler/bases.ts(13,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/bases.ts(13,14): error TS2339: Property 'x' does not exist on type 'C'. tests/cases/compiler/bases.ts(13,15): error TS1005: ';' expected. tests/cases/compiler/bases.ts(13,17): error TS2304: Cannot find name 'any'. @@ -11,7 +12,7 @@ tests/cases/compiler/bases.ts(17,9): error TS2339: Property 'x' does not exist o tests/cases/compiler/bases.ts(18,9): error TS2339: Property 'y' does not exist on type 'C'. -==== tests/cases/compiler/bases.ts (10 errors) ==== +==== tests/cases/compiler/bases.ts (11 errors) ==== interface I { x; } @@ -36,6 +37,8 @@ tests/cases/compiler/bases.ts(18,9): error TS2339: Property 'y' does not exist o ~~~~~~~~~~~~~~~ this.x: any; ~~~~~~~~~~~~~~~~~~~~ + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ~ !!! error TS2339: Property 'x' does not exist on type 'C'. ~ diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt index e48f43c8662..c8aa356fd4f 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(5,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts (1 errors) ==== @@ -7,9 +7,9 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing2.ts(6,9): error TS17008: public x: number; constructor() { this.x = 100; - super(); - ~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. + super(); this.x = 10; var that = this; } diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt index 1258101cffc..8ffed5961a3 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts (1 errors) ==== @@ -7,7 +7,7 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing5.ts(5,9): error TS17008: public x: number; constructor() { super(this.x); - ~~~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt index 7a00a4f0130..2b37f740331 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(7,20): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. ==== tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts (1 errors) ==== @@ -9,8 +9,8 @@ tests/cases/compiler/checkSuperCallBeforeThisAccessing8.ts(8,9): error TS17008: class Super extends Base { constructor() { var that = this; - super(); - ~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. + super(); } } \ No newline at end of file diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt index 37f272db082..c54ef2a02b7 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt +++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt @@ -1,11 +1,15 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(49,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(47,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(57,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(58,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(80,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(81,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (5 errors) ==== +==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (9 errors) ==== // ordering of super calls in derived constructors matters depending on other class contents class Base { @@ -57,10 +61,10 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP a: number; constructor(y: string) { this.a = 1; + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. var b = 2; super(); // error: "super" has to be called before "this" accessing - ~~~~~~~~ -!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -69,7 +73,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP b: number; constructor(y: string) { this.a = 3; + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. this.b = 3; + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. super(); // error ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. @@ -94,7 +102,11 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP b: number; constructor(y: string) { this.a = 3; + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. this.b = 3; + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. super(); // error ~~~~~~~~ !!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt index 0190a659166..7439c81be85 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt @@ -1,9 +1,10 @@ -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (3 errors) ==== +==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (4 errors) ==== class Base { x: string; constructor(a) { } @@ -12,7 +13,7 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS class Derived extends Base { constructor() { super(this); // ok - ~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -22,6 +23,8 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS super(this); // error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index d74db892019..ccf6a015bd9 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -1,6 +1,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(38,25): error TS2507: Type 'any' is not a constructor function type. @@ -8,7 +9,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(44,9): tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (8 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (9 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -25,7 +26,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): //'this' in optional super call constructor() { super(this); // Error - ~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -37,6 +38,8 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): super(this); // Error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index c4188993eee..449f3ede56a 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -1,6 +1,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS2507: Type 'any' is not a constructor function type. @@ -9,7 +10,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (10 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -26,7 +27,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod //'this' in optional super call constructor() { super(this); // error: "super" has to be called before "this" accessing - ~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -38,6 +39,8 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod super(this); // Error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt index f0fc5854123..000c2074892 100644 --- a/tests/baselines/reference/thisInSuperCall.errors.txt +++ b/tests/baselines/reference/thisInSuperCall.errors.txt @@ -1,9 +1,11 @@ -tests/cases/compiler/thisInSuperCall.ts(7,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/thisInSuperCall.ts(7,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/thisInSuperCall.ts(14,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/thisInSuperCall.ts(20,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall.ts (3 errors) ==== +==== tests/cases/compiler/thisInSuperCall.ts (5 errors) ==== class Base { constructor(x: any) {} } @@ -11,7 +13,7 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be r class Foo extends Base { constructor() { super(this); // error: "super" has to be called before "this" accessing - ~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -22,6 +24,8 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be r super(this); // error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -30,5 +34,7 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be r super(this); // error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/thisInSuperCall1.errors.txt b/tests/baselines/reference/thisInSuperCall1.errors.txt index 7efc66d1666..98d8ee123ae 100644 --- a/tests/baselines/reference/thisInSuperCall1.errors.txt +++ b/tests/baselines/reference/thisInSuperCall1.errors.txt @@ -1,7 +1,8 @@ tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall1.ts (1 errors) ==== +==== tests/cases/compiler/thisInSuperCall1.ts (2 errors) ==== class Base { constructor(a: any) {} } @@ -11,6 +12,8 @@ tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS2332: 'this' cannot be r super(this); ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt index 11ea23d020c..4047bcb9a06 100644 --- a/tests/baselines/reference/thisInSuperCall2.errors.txt +++ b/tests/baselines/reference/thisInSuperCall2.errors.txt @@ -1,8 +1,9 @@ -tests/cases/compiler/thisInSuperCall2.ts(8,9): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/compiler/thisInSuperCall2.ts(8,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall2.ts (2 errors) ==== +==== tests/cases/compiler/thisInSuperCall2.ts (3 errors) ==== class Base { constructor(a: any) {} } @@ -11,7 +12,7 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be public x: number; constructor() { super(this); // error: "super" has to be called before "this" accessing - ~~~~~~~~~~~~ + ~~~~ !!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -23,6 +24,8 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be super(this); // error ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/thisInSuperCall3.errors.txt b/tests/baselines/reference/thisInSuperCall3.errors.txt index df5c5f8b5a2..0e7d1575096 100644 --- a/tests/baselines/reference/thisInSuperCall3.errors.txt +++ b/tests/baselines/reference/thisInSuperCall3.errors.txt @@ -1,7 +1,8 @@ tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS2332: 'this' cannot be referenced in current location. +tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall3.ts (1 errors) ==== +==== tests/cases/compiler/thisInSuperCall3.ts (2 errors) ==== class Base { constructor(a: any) {} } @@ -13,6 +14,8 @@ tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS2332: 'this' cannot be r super(this); ~~~~ !!! error TS2332: 'this' cannot be referenced in current location. + ~~~~ +!!! error TS17008: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file From ce2495f39812ec51402ddb3f8881b5f189eed17c Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 17 Dec 2015 17:21:21 -0800 Subject: [PATCH 017/160] Update baseline from merging master --- .../reference/checkSuperCallBeforeThisAccessing1.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing2.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing3.js | 6 +++--- .../reference/checkSuperCallBeforeThisAccessing4.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing5.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing6.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing7.js | 4 ++-- .../reference/checkSuperCallBeforeThisAccessing8.js | 4 ++-- .../thisInInvalidContextsExternalModule.errors.txt | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js index ec6e6e39ee8..cfb5726dac1 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js @@ -20,7 +20,7 @@ var Based = (function () { function Based() { } return Based; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -30,4 +30,4 @@ var Derived = (function (_super) { var that = this; } return Derived; -})(Based); +}(Based)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js index eb58afd820b..afbc15cf912 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js @@ -20,7 +20,7 @@ var Based = (function () { function Based() { } return Based; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -30,4 +30,4 @@ var Derived = (function (_super) { var that = this; } return Derived; -})(Based); +}(Based)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js index 2c5652cf95f..7e9c23c1f83 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js @@ -25,7 +25,7 @@ var Based = (function () { function Based() { } return Based; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -34,10 +34,10 @@ var Derived = (function (_super) { this.y = true; } return innver; - })(); + }()); _super.call(this); this.x = 10; var that = this; } return Derived; -})(Based); +}(Based)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js index eacec00c438..1257b446ccb 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js @@ -29,7 +29,7 @@ var Based = (function () { function Based() { } return Based; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { @@ -49,4 +49,4 @@ var Derived = (function (_super) { var that = this; } return Derived; -})(Based); +}(Based)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js index 489c7200050..1889ee998ca 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js @@ -21,11 +21,11 @@ var Based = (function () { } } return Based; -})(); +}()); var Derived = (function (_super) { __extends(Derived, _super); function Derived() { _super.call(this, this.x); } return Derived; -})(Based); +}(Based)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js index 6ad9773bc5f..39db4dec174 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js @@ -24,7 +24,7 @@ var Base = (function () { } } return Base; -})(); +}()); var Super = (function (_super) { __extends(Super, _super); function Super() { @@ -33,4 +33,4 @@ var Super = (function (_super) { _super.call(this); } return Super; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js index eafc662085f..d071c05db5d 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js @@ -19,7 +19,7 @@ var Base = (function () { function Base(func) { } return Base; -})(); +}()); var Super = (function (_super) { __extends(Super, _super); function Super() { @@ -27,4 +27,4 @@ var Super = (function (_super) { _super.call(this, (function () { return _this; })); // No error } return Super; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js index 4675d328b38..f334cc7f42b 100644 --- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js +++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js @@ -24,7 +24,7 @@ var Base = (function () { } } return Base; -})(); +}()); var Super = (function (_super) { __extends(Super, _super); function Super() { @@ -32,4 +32,4 @@ var Super = (function (_super) { _super.call(this); } return Super; -})(Base); +}(Base)); diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index 25ee8cbe122..bc671b2fdbe 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -78,4 +78,4 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod export = this; // Should be an error ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. +!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. \ No newline at end of file From cabe1d678f793b1f68161ffaba11dbd0ab5a3dfa Mon Sep 17 00:00:00 2001 From: Yui T Date: Sun, 20 Dec 2015 16:39:42 -0800 Subject: [PATCH 018/160] Fix prefix double underscore with extra underscore --- src/compiler/utilities.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index c5a31992a80..3aaae73e4c4 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -230,9 +230,19 @@ namespace ts { return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); } + function prefixWithUnderscoreUnderscore(identifier: string): boolean { + if (identifier.length <= 2) { + return false; + } + else { + return identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? true : false; + } + } + // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' + // TODO(yuisu): comment export function escapeIdentifier(identifier: string): string { - return identifier.length >= 2 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? "_" + identifier : identifier; + return prefixWithUnderscoreUnderscore(identifier)? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier From a034314a9e92af56dbfc99e38dfd8031c51abfe5 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 21 Dec 2015 15:45:58 -0800 Subject: [PATCH 019/160] Add tests --- src/compiler/emitter.ts | 2 +- src/compiler/utilities.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ab775ba9fc6..726fe22aad1 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3848,7 +3848,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // We create a synthetic copy of the identifier in order to avoid the rewriting that might // otherwise occur when the identifier is emitted. index = createSynthesizedNode(propName.kind); - (index).text = (propName).text; + (index).text = unescapeIdentifier((propName).text); } return !nameIsComputed && index.kind === SyntaxKind.Identifier diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 3aaae73e4c4..50382b46de6 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -238,11 +238,10 @@ namespace ts { return identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? true : false; } } - + // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' - // TODO(yuisu): comment export function escapeIdentifier(identifier: string): string { - return prefixWithUnderscoreUnderscore(identifier)? "_" + identifier : identifier; + return prefixWithUnderscoreUnderscore(identifier) ? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier From 677e080dad9acd8f73baf00e3c1bd9f3425363b2 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 21 Dec 2015 16:23:51 -0800 Subject: [PATCH 020/160] Add tests --- src/compiler/emitter.ts | 2 +- src/compiler/utilities.ts | 5 +- ...portsAndImportsWithUnderscores1.errors.txt | 18 +++ .../exportsAndImportsWithUnderscores1.js | 29 +++++ .../exportsAndImportsWithUnderscores2.js | 27 +++++ .../exportsAndImportsWithUnderscores2.symbols | 21 ++++ .../exportsAndImportsWithUnderscores2.types | 26 +++++ .../exportsAndImportsWithUnderscores3.js | 29 +++++ .../exportsAndImportsWithUnderscores3.symbols | 23 ++++ .../exportsAndImportsWithUnderscores3.types | 30 +++++ .../exportsAndImportsWithUnderscores4.js | 75 ++++++++++++ .../exportsAndImportsWithUnderscores4.symbols | 75 ++++++++++++ .../exportsAndImportsWithUnderscores4.types | 109 ++++++++++++++++++ .../exportsAndImportsWithUnderscores1.ts | 14 +++ .../exportsAndImportsWithUnderscores2.ts | 13 +++ .../exportsAndImportsWithUnderscores3.ts | 14 +++ .../exportsAndImportsWithUnderscores4.ts | 35 ++++++ 17 files changed, 541 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores1.errors.txt create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores1.js create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores2.js create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores2.types create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores3.js create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores3.types create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores4.js create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores4.symbols create mode 100644 tests/baselines/reference/exportsAndImportsWithUnderscores4.types create mode 100644 tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores1.ts create mode 100644 tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores2.ts create mode 100644 tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores3.ts create mode 100644 tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores4.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ab775ba9fc6..726fe22aad1 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3848,7 +3848,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // We create a synthetic copy of the identifier in order to avoid the rewriting that might // otherwise occur when the identifier is emitted. index = createSynthesizedNode(propName.kind); - (index).text = (propName).text; + (index).text = unescapeIdentifier((propName).text); } return !nameIsComputed && index.kind === SyntaxKind.Identifier diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 3aaae73e4c4..50382b46de6 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -238,11 +238,10 @@ namespace ts { return identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? true : false; } } - + // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' - // TODO(yuisu): comment export function escapeIdentifier(identifier: string): string { - return prefixWithUnderscoreUnderscore(identifier)? "_" + identifier : identifier; + return prefixWithUnderscoreUnderscore(identifier) ? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.errors.txt b/tests/baselines/reference/exportsAndImportsWithUnderscores1.errors.txt new file mode 100644 index 00000000000..7a65dd62c2b --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.errors.txt @@ -0,0 +1,18 @@ +tests/cases/conformance/es6/modules/m1.ts(6,5): error TS1005: ',' expected. + + +==== tests/cases/conformance/es6/modules/m1.ts (1 errors) ==== + + var R: any + export default R = { + "__": 20, + "_": 10 + "___": 30 + ~~~~~ +!!! error TS1005: ',' expected. + } + +==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ==== + import R from "./m1"; + const { __, _, ___ } = R; + \ No newline at end of file diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js new file mode 100644 index 00000000000..d14eab3c251 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js @@ -0,0 +1,29 @@ +//// [tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores1.ts] //// + +//// [m1.ts] + +var R: any +export default R = { + "__": 20, + "_": 10 + "___": 30 +} + +//// [m2.ts] +import R from "./m1"; +const { __, _, ___ } = R; + + +//// [m1.js] +"use strict"; +var R; +exports.__esModule = true; +exports["default"] = R = { + "__": 20, + "_": 10, + "___": 30 +}; +//// [m2.js] +"use strict"; +var m1_1 = require("./m1"); +var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js new file mode 100644 index 00000000000..5d1dcbb9322 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js @@ -0,0 +1,27 @@ +//// [tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores2.ts] //// + +//// [m1.ts] + +var R: any +export default R = { + "__esmodule": true, + "__proto__": {} +} + +//// [m2.ts] +import R from "./m1"; +const { __esmodule, __proto__ } = R; + + +//// [m1.js] +"use strict"; +var R; +exports.__esModule = true; +exports["default"] = R = { + "__esmodule": true, + "__proto__": {} +}; +//// [m2.js] +"use strict"; +var m1_1 = require("./m1"); +var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols new file mode 100644 index 00000000000..d5f5ef17a62 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.symbols @@ -0,0 +1,21 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +var R: any +>R : Symbol(R, Decl(m1.ts, 1, 3)) + +export default R = { +>R : Symbol(R, Decl(m1.ts, 1, 3)) + + "__esmodule": true, + "__proto__": {} +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import R from "./m1"; +>R : Symbol(R, Decl(m2.ts, 0, 6)) + +const { __esmodule, __proto__ } = R; +>__esmodule : Symbol(__esmodule, Decl(m2.ts, 1, 7)) +>__proto__ : Symbol(__proto__, Decl(m2.ts, 1, 19)) +>R : Symbol(R, Decl(m2.ts, 0, 6)) + diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.types b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types new file mode 100644 index 00000000000..a684440f5bd --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.types @@ -0,0 +1,26 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +var R: any +>R : any + +export default R = { +>R = { "__esmodule": true, "__proto__": {}} : { "__esmodule": boolean; "__proto__": {}; } +>R : any +>{ "__esmodule": true, "__proto__": {}} : { "__esmodule": boolean; "__proto__": {}; } + + "__esmodule": true, +>true : boolean + + "__proto__": {} +>{} : {} +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import R from "./m1"; +>R : { "__esmodule": boolean; "__proto__": {}; } + +const { __esmodule, __proto__ } = R; +>__esmodule : boolean +>__proto__ : {} +>R : { "__esmodule": boolean; "__proto__": {}; } + diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js new file mode 100644 index 00000000000..477f870742d --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js @@ -0,0 +1,29 @@ +//// [tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores3.ts] //// + +//// [m1.ts] + +var R: any +export default R = { + "___": 30, + "___hello": 21, + "_hi": 40, +} + +//// [m2.ts] +import R from "./m1"; +const { ___, ___hello, _hi } = R; + + +//// [m1.js] +"use strict"; +var R; +exports.__esModule = true; +exports["default"] = R = { + "___": 30, + "___hello": 21, + "_hi": 40 +}; +//// [m2.js] +"use strict"; +var m1_1 = require("./m1"); +var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi; diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols new file mode 100644 index 00000000000..cd4ba38e8c9 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.symbols @@ -0,0 +1,23 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +var R: any +>R : Symbol(R, Decl(m1.ts, 1, 3)) + +export default R = { +>R : Symbol(R, Decl(m1.ts, 1, 3)) + + "___": 30, + "___hello": 21, + "_hi": 40, +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import R from "./m1"; +>R : Symbol(R, Decl(m2.ts, 0, 6)) + +const { ___, ___hello, _hi } = R; +>___ : Symbol(___, Decl(m2.ts, 1, 7)) +>___hello : Symbol(___hello, Decl(m2.ts, 1, 12)) +>_hi : Symbol(_hi, Decl(m2.ts, 1, 22)) +>R : Symbol(R, Decl(m2.ts, 0, 6)) + diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.types b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types new file mode 100644 index 00000000000..5addb44172d --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +var R: any +>R : any + +export default R = { +>R = { "___": 30, "___hello": 21, "_hi": 40,} : { "___": number; "___hello": number; "_hi": number; } +>R : any +>{ "___": 30, "___hello": 21, "_hi": 40,} : { "___": number; "___hello": number; "_hi": number; } + + "___": 30, +>30 : number + + "___hello": 21, +>21 : number + + "_hi": 40, +>40 : number +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import R from "./m1"; +>R : { "___": number; "___hello": number; "_hi": number; } + +const { ___, ___hello, _hi } = R; +>___ : number +>___hello : number +>_hi : number +>R : { "___": number; "___hello": number; "_hi": number; } + diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js new file mode 100644 index 00000000000..22cd7c2e71a --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js @@ -0,0 +1,75 @@ +//// [tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores4.ts] //// + +//// [m1.ts] + +declare var console: any; +export function _() { + console.log("_"); +} +export function __() { + console.log("__"); +} +export function ___() { + console.log("___"); +} +export function _hi() { + console.log("_hi"); +} +export function __proto() { + console.log("__proto"); +} +export function __esmodule() { + console.log("__esmodule"); +} +export function ___hello(){ + console.log("___hello"); +} + +//// [m2.ts] +import {_, __, ___hello, __esmodule, __proto, _hi} from "./m1"; +_(); +__(); +___hello(); +__esmodule(); +__proto(); +_hi(); + +//// [m1.js] +"use strict"; +function _() { + console.log("_"); +} +exports._ = _; +function __() { + console.log("__"); +} +exports.__ = __; +function ___() { + console.log("___"); +} +exports.___ = ___; +function _hi() { + console.log("_hi"); +} +exports._hi = _hi; +function __proto() { + console.log("__proto"); +} +exports.__proto = __proto; +function __esmodule() { + console.log("__esmodule"); +} +exports.__esmodule = __esmodule; +function ___hello() { + console.log("___hello"); +} +exports.___hello = ___hello; +//// [m2.js] +"use strict"; +var m1_1 = require("./m1"); +m1_1._(); +m1_1.__(); +m1_1.___hello(); +m1_1.__esmodule(); +m1_1.__proto(); +m1_1._hi(); diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.symbols b/tests/baselines/reference/exportsAndImportsWithUnderscores4.symbols new file mode 100644 index 00000000000..a8fb3f307b5 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.symbols @@ -0,0 +1,75 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +declare var console: any; +>console : Symbol(console, Decl(m1.ts, 1, 11)) + +export function _() { +>_ : Symbol(_, Decl(m1.ts, 1, 25)) + + console.log("_"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function __() { +>__ : Symbol(__, Decl(m1.ts, 4, 1)) + + console.log("__"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function ___() { +>___ : Symbol(___, Decl(m1.ts, 7, 1)) + + console.log("___"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function _hi() { +>_hi : Symbol(_hi, Decl(m1.ts, 10, 1)) + + console.log("_hi"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function __proto() { +>__proto : Symbol(__proto, Decl(m1.ts, 13, 1)) + + console.log("__proto"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function __esmodule() { +>__esmodule : Symbol(__esmodule, Decl(m1.ts, 16, 1)) + + console.log("__esmodule"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} +export function ___hello(){ +>___hello : Symbol(___hello, Decl(m1.ts, 19, 1)) + + console.log("___hello"); +>console : Symbol(console, Decl(m1.ts, 1, 11)) +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import {_, __, ___hello, __esmodule, __proto, _hi} from "./m1"; +>_ : Symbol(_, Decl(m2.ts, 0, 8)) +>__ : Symbol(__, Decl(m2.ts, 0, 10)) +>___hello : Symbol(___hello, Decl(m2.ts, 0, 14)) +>__esmodule : Symbol(__esmodule, Decl(m2.ts, 0, 24)) +>__proto : Symbol(__proto, Decl(m2.ts, 0, 36)) +>_hi : Symbol(_hi, Decl(m2.ts, 0, 45)) + +_(); +>_ : Symbol(_, Decl(m2.ts, 0, 8)) + +__(); +>__ : Symbol(__, Decl(m2.ts, 0, 10)) + +___hello(); +>___hello : Symbol(___hello, Decl(m2.ts, 0, 14)) + +__esmodule(); +>__esmodule : Symbol(__esmodule, Decl(m2.ts, 0, 24)) + +__proto(); +>__proto : Symbol(__proto, Decl(m2.ts, 0, 36)) + +_hi(); +>_hi : Symbol(_hi, Decl(m2.ts, 0, 45)) + diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.types b/tests/baselines/reference/exportsAndImportsWithUnderscores4.types new file mode 100644 index 00000000000..a9042042285 --- /dev/null +++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.types @@ -0,0 +1,109 @@ +=== tests/cases/conformance/es6/modules/m1.ts === + +declare var console: any; +>console : any + +export function _() { +>_ : () => void + + console.log("_"); +>console.log("_") : any +>console.log : any +>console : any +>log : any +>"_" : string +} +export function __() { +>__ : () => void + + console.log("__"); +>console.log("__") : any +>console.log : any +>console : any +>log : any +>"__" : string +} +export function ___() { +>___ : () => void + + console.log("___"); +>console.log("___") : any +>console.log : any +>console : any +>log : any +>"___" : string +} +export function _hi() { +>_hi : () => void + + console.log("_hi"); +>console.log("_hi") : any +>console.log : any +>console : any +>log : any +>"_hi" : string +} +export function __proto() { +>__proto : () => void + + console.log("__proto"); +>console.log("__proto") : any +>console.log : any +>console : any +>log : any +>"__proto" : string +} +export function __esmodule() { +>__esmodule : () => void + + console.log("__esmodule"); +>console.log("__esmodule") : any +>console.log : any +>console : any +>log : any +>"__esmodule" : string +} +export function ___hello(){ +>___hello : () => void + + console.log("___hello"); +>console.log("___hello") : any +>console.log : any +>console : any +>log : any +>"___hello" : string +} + +=== tests/cases/conformance/es6/modules/m2.ts === +import {_, __, ___hello, __esmodule, __proto, _hi} from "./m1"; +>_ : () => void +>__ : () => void +>___hello : () => void +>__esmodule : () => void +>__proto : () => void +>_hi : () => void + +_(); +>_() : void +>_ : () => void + +__(); +>__() : void +>__ : () => void + +___hello(); +>___hello() : void +>___hello : () => void + +__esmodule(); +>__esmodule() : void +>__esmodule : () => void + +__proto(); +>__proto() : void +>__proto : () => void + +_hi(); +>_hi() : void +>_hi : () => void + diff --git a/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores1.ts b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores1.ts new file mode 100644 index 00000000000..8e38deaaf13 --- /dev/null +++ b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores1.ts @@ -0,0 +1,14 @@ +//@module: commonjs +//@target: ES3 + +// @filename: m1.ts +var R: any +export default R = { + "__": 20, + "_": 10 + "___": 30 +} + +// @filename: m2.ts +import R from "./m1"; +const { __, _, ___ } = R; diff --git a/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores2.ts b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores2.ts new file mode 100644 index 00000000000..fac9f467549 --- /dev/null +++ b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores2.ts @@ -0,0 +1,13 @@ +//@module: commonjs +//@target: ES3 + +// @filename: m1.ts +var R: any +export default R = { + "__esmodule": true, + "__proto__": {} +} + +// @filename: m2.ts +import R from "./m1"; +const { __esmodule, __proto__ } = R; diff --git a/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores3.ts b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores3.ts new file mode 100644 index 00000000000..cd71808915c --- /dev/null +++ b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores3.ts @@ -0,0 +1,14 @@ +//@module: commonjs +//@target: ES3 + +// @filename: m1.ts +var R: any +export default R = { + "___": 30, + "___hello": 21, + "_hi": 40, +} + +// @filename: m2.ts +import R from "./m1"; +const { ___, ___hello, _hi } = R; diff --git a/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores4.ts b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores4.ts new file mode 100644 index 00000000000..34022597552 --- /dev/null +++ b/tests/cases/conformance/es6/modules/exportsAndImportsWithUnderscores4.ts @@ -0,0 +1,35 @@ +//@module: commonjs +//@target: ES3 + +// @filename: m1.ts +declare var console: any; +export function _() { + console.log("_"); +} +export function __() { + console.log("__"); +} +export function ___() { + console.log("___"); +} +export function _hi() { + console.log("_hi"); +} +export function __proto() { + console.log("__proto"); +} +export function __esmodule() { + console.log("__esmodule"); +} +export function ___hello(){ + console.log("___hello"); +} + +// @filename: m2.ts +import {_, __, ___hello, __esmodule, __proto, _hi} from "./m1"; +_(); +__(); +___hello(); +__esmodule(); +__proto(); +_hi(); \ No newline at end of file From 2fc906ef33d443bdf70c6d15ab98f4346fd51414 Mon Sep 17 00:00:00 2001 From: Yui T Date: Mon, 21 Dec 2015 17:07:18 -0800 Subject: [PATCH 021/160] Address PR --- src/compiler/emitter.ts | 4 ++++ src/compiler/utilities.ts | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 726fe22aad1..a5ffb92b083 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3848,6 +3848,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // We create a synthetic copy of the identifier in order to avoid the rewriting that might // otherwise occur when the identifier is emitted. index = createSynthesizedNode(propName.kind); + // We need to escape identifier here because when parsing an identifier prefixing with "__" + // the parser need to append "_" in order to escape colliding with magic identifiers such as "__proto__" + // Therefore, in order to correctly emit identifiers that are written in original TypeScript file, + // we will unescapeIdentifier to remove additional underscore (if no underscore is added, the function will return original input string) (index).text = unescapeIdentifier((propName).text); } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 50382b46de6..6b924c1099e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -230,18 +230,10 @@ namespace ts { return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia); } - function prefixWithUnderscoreUnderscore(identifier: string): boolean { - if (identifier.length <= 2) { - return false; - } - else { - return identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? true : false; - } - } - // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' export function escapeIdentifier(identifier: string): string { - return prefixWithUnderscoreUnderscore(identifier) ? "_" + identifier : identifier; + const prefixWithUnderscore = identifier.length > 2 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._; + return prefixWithUnderscore ? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier From 0da676d24c29c180d350c2d9c43763d3ee2cb1d6 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:08:14 -0500 Subject: [PATCH 022/160] Added tests. --- ...tringLiteralTypesOverloadAssignability01.ts | 17 +++++++++++++++++ ...tringLiteralTypesOverloadAssignability02.ts | 17 +++++++++++++++++ ...tringLiteralTypesOverloadAssignability03.ts | 17 +++++++++++++++++ ...tringLiteralTypesOverloadAssignability04.ts | 17 +++++++++++++++++ ...tringLiteralTypesOverloadAssignability05.ts | 18 ++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts new file mode 100644 index 00000000000..fce073f16ef --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts @@ -0,0 +1,17 @@ +// @declaration: true + +function f(x: "foo"): number; +function f(x: string): number { + return 0; +} + +function g(x: "bar"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts new file mode 100644 index 00000000000..1a4f18430d5 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts @@ -0,0 +1,17 @@ +// @declaration: true + +function f(x: "foo"): number; +function f(x: "foo"): number { + return 0; +} + +function g(x: "bar"): number; +function g(x: "bar"): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts new file mode 100644 index 00000000000..0aacd899bcc --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts @@ -0,0 +1,17 @@ +// @declaration: true + +function f(x: "foo"): number; +function f(x: string): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts new file mode 100644 index 00000000000..eae4046286f --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts @@ -0,0 +1,17 @@ +// @declaration: true + +function f(x: "foo"): number; +function f(x: "foo"): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: "foo"): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; \ No newline at end of file diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts new file mode 100644 index 00000000000..9482ff02a1e --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts @@ -0,0 +1,18 @@ +// @declaration: true + +function f(x: "foo"): number; +function f(x: string): number; +function f(x: string): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; \ No newline at end of file From 0eb62881668e63052c5429810e2b12228cb3701f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:08:29 -0500 Subject: [PATCH 023/160] Accepted baselines. --- ...ralTypesOverloadAssignability01.errors.txt | 25 ++++++++++++ ...ringLiteralTypesOverloadAssignability01.js | 36 ++++++++++++++++++ ...ralTypesOverloadAssignability02.errors.txt | 31 +++++++++++++++ ...ringLiteralTypesOverloadAssignability02.js | 36 ++++++++++++++++++ ...ralTypesOverloadAssignability03.errors.txt | 25 ++++++++++++ ...ringLiteralTypesOverloadAssignability03.js | 36 ++++++++++++++++++ ...ralTypesOverloadAssignability04.errors.txt | 31 +++++++++++++++ ...ringLiteralTypesOverloadAssignability04.js | 36 ++++++++++++++++++ ...ralTypesOverloadAssignability05.errors.txt | 28 ++++++++++++++ ...ringLiteralTypesOverloadAssignability05.js | 38 +++++++++++++++++++ 10 files changed, 322 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability03.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability04.js create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability05.js diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt new file mode 100644 index 00000000000..56fa60a795c --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt @@ -0,0 +1,25 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts (2 errors) ==== + + function f(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function f(x: string): number { + return 0; + } + + function g(x: "bar"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function g(x: string): number { + return 0; + } + + let a = f; + let b = g; + + a = b; + b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.js b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.js new file mode 100644 index 00000000000..7b7c84165f3 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.js @@ -0,0 +1,36 @@ +//// [stringLiteralTypesOverloadAssignability01.ts] + +function f(x: "foo"): number; +function f(x: string): number { + return 0; +} + +function g(x: "bar"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; + +//// [stringLiteralTypesOverloadAssignability01.js] +function f(x) { + return 0; +} +function g(x) { + return 0; +} +var a = f; +var b = g; +a = b; +b = a; + + +//// [stringLiteralTypesOverloadAssignability01.d.ts] +declare function f(x: "foo"): number; +declare function g(x: "bar"): number; +declare let a: typeof f; +declare let b: typeof g; diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt new file mode 100644 index 00000000000..47862617afa --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt @@ -0,0 +1,31 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(8,10): error TS2381: A signature with an implementation cannot use a string literal type. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts (4 errors) ==== + + function f(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function f(x: "foo"): number { + ~ +!!! error TS2381: A signature with an implementation cannot use a string literal type. + return 0; + } + + function g(x: "bar"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function g(x: "bar"): number { + ~ +!!! error TS2381: A signature with an implementation cannot use a string literal type. + return 0; + } + + let a = f; + let b = g; + + a = b; + b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.js b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.js new file mode 100644 index 00000000000..7a8db4722a6 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.js @@ -0,0 +1,36 @@ +//// [stringLiteralTypesOverloadAssignability02.ts] + +function f(x: "foo"): number; +function f(x: "foo"): number { + return 0; +} + +function g(x: "bar"): number; +function g(x: "bar"): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; + +//// [stringLiteralTypesOverloadAssignability02.js] +function f(x) { + return 0; +} +function g(x) { + return 0; +} +var a = f; +var b = g; +a = b; +b = a; + + +//// [stringLiteralTypesOverloadAssignability02.d.ts] +declare function f(x: "foo"): number; +declare function g(x: "bar"): number; +declare let a: typeof f; +declare let b: typeof g; diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt new file mode 100644 index 00000000000..1e58fc9028f --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt @@ -0,0 +1,25 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts (2 errors) ==== + + function f(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function f(x: string): number { + return 0; + } + + function g(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function g(x: string): number { + return 0; + } + + let a = f; + let b = g; + + a = b; + b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.js b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.js new file mode 100644 index 00000000000..1d9452a9c65 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.js @@ -0,0 +1,36 @@ +//// [stringLiteralTypesOverloadAssignability03.ts] + +function f(x: "foo"): number; +function f(x: string): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; + +//// [stringLiteralTypesOverloadAssignability03.js] +function f(x) { + return 0; +} +function g(x) { + return 0; +} +var a = f; +var b = g; +a = b; +b = a; + + +//// [stringLiteralTypesOverloadAssignability03.d.ts] +declare function f(x: "foo"): number; +declare function g(x: "foo"): number; +declare let a: typeof f; +declare let b: typeof g; diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt new file mode 100644 index 00000000000..1b179b95fe6 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt @@ -0,0 +1,31 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(8,10): error TS2381: A signature with an implementation cannot use a string literal type. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts (4 errors) ==== + + function f(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function f(x: "foo"): number { + ~ +!!! error TS2381: A signature with an implementation cannot use a string literal type. + return 0; + } + + function g(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function g(x: "foo"): number { + ~ +!!! error TS2381: A signature with an implementation cannot use a string literal type. + return 0; + } + + let a = f; + let b = g; + + a = b; + b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.js b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.js new file mode 100644 index 00000000000..975c7d80cb5 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.js @@ -0,0 +1,36 @@ +//// [stringLiteralTypesOverloadAssignability04.ts] + +function f(x: "foo"): number; +function f(x: "foo"): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: "foo"): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; + +//// [stringLiteralTypesOverloadAssignability04.js] +function f(x) { + return 0; +} +function g(x) { + return 0; +} +var a = f; +var b = g; +a = b; +b = a; + + +//// [stringLiteralTypesOverloadAssignability04.d.ts] +declare function f(x: "foo"): number; +declare function g(x: "foo"): number; +declare let a: typeof f; +declare let b: typeof g; diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt new file mode 100644 index 00000000000..0830f08fb80 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt @@ -0,0 +1,28 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '{ (x: "foo"): number; (x: string): number; }'. + Type '(x: "foo") => number' provides no match for the signature '(x: string): number' + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts (2 errors) ==== + + function f(x: "foo"): number; + function f(x: string): number; + function f(x: string): number { + return 0; + } + + function g(x: "foo"): number; + ~ +!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. + function g(x: string): number { + return 0; + } + + let a = f; + let b = g; + + a = b; + ~ +!!! error TS2322: Type '(x: "foo") => number' is not assignable to type '{ (x: "foo"): number; (x: string): number; }'. +!!! error TS2322: Type '(x: "foo") => number' provides no match for the signature '(x: string): number' + b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.js b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.js new file mode 100644 index 00000000000..b08dbc04082 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.js @@ -0,0 +1,38 @@ +//// [stringLiteralTypesOverloadAssignability05.ts] + +function f(x: "foo"): number; +function f(x: string): number; +function f(x: string): number { + return 0; +} + +function g(x: "foo"): number; +function g(x: string): number { + return 0; +} + +let a = f; +let b = g; + +a = b; +b = a; + +//// [stringLiteralTypesOverloadAssignability05.js] +function f(x) { + return 0; +} +function g(x) { + return 0; +} +var a = f; +var b = g; +a = b; +b = a; + + +//// [stringLiteralTypesOverloadAssignability05.d.ts] +declare function f(x: "foo"): number; +declare function f(x: string): number; +declare function g(x: "foo"): number; +declare let a: typeof f; +declare let b: typeof g; From f1b84950eaae83ddcddac228186e3f4dfbbe0273 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:10:01 -0500 Subject: [PATCH 024/160] Removed checks for specialized signature compatibility and always perform the same checking on specialized and non-specialized signatures. --- src/compiler/checker.ts | 70 +++-------------------------------------- 1 file changed, 4 insertions(+), 66 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 5d57e9d2028..16e957f35b5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11273,8 +11273,6 @@ namespace ts { } } } - - checkSpecializedSignatureDeclaration(node); } function checkTypeForDuplicateIndexSignatures(node: Node) { @@ -11589,48 +11587,6 @@ namespace ts { return (node.flags & NodeFlags.Private) && isInAmbientContext(node); } - function checkSpecializedSignatureDeclaration(signatureDeclarationNode: SignatureDeclaration): void { - if (!produceDiagnostics) { - return; - } - const signature = getSignatureFromDeclaration(signatureDeclarationNode); - if (!signature.hasStringLiterals) { - return; - } - - // TypeScript 1.0 spec (April 2014): 3.7.2.2 - // Specialized signatures are not permitted in conjunction with a function body - if (nodeIsPresent((signatureDeclarationNode).body)) { - error(signatureDeclarationNode, Diagnostics.A_signature_with_an_implementation_cannot_use_a_string_literal_type); - return; - } - - // TypeScript 1.0 spec (April 2014): 3.7.2.4 - // Every specialized call or construct signature in an object type must be assignable - // to at least one non-specialized call or construct signature in the same object type - let signaturesToCheck: Signature[]; - // Unnamed (call\construct) signatures in interfaces are inherited and not shadowed so examining just node symbol won't give complete answer. - // Use declaring type to obtain full list of signatures. - if (!signatureDeclarationNode.name && signatureDeclarationNode.parent && signatureDeclarationNode.parent.kind === SyntaxKind.InterfaceDeclaration) { - Debug.assert(signatureDeclarationNode.kind === SyntaxKind.CallSignature || signatureDeclarationNode.kind === SyntaxKind.ConstructSignature); - const signatureKind = signatureDeclarationNode.kind === SyntaxKind.CallSignature ? SignatureKind.Call : SignatureKind.Construct; - const containingSymbol = getSymbolOfNode(signatureDeclarationNode.parent); - const containingType = getDeclaredTypeOfSymbol(containingSymbol); - signaturesToCheck = getSignaturesOfType(containingType, signatureKind); - } - else { - signaturesToCheck = getSignaturesOfSymbol(getSymbolOfNode(signatureDeclarationNode)); - } - - for (const otherSignature of signaturesToCheck) { - if (!otherSignature.hasStringLiterals && isSignatureAssignableTo(signature, otherSignature, /*ignoreReturnTypes*/ false)) { - return; - } - } - - error(signatureDeclarationNode, Diagnostics.Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature); - } - function getEffectiveDeclarationFlags(n: Node, flagsToCheck: NodeFlags): NodeFlags { let flags = getCombinedNodeFlags(n); @@ -11852,28 +11808,10 @@ namespace ts { if (bodyDeclaration) { const signatures = getSignaturesOfSymbol(symbol); const bodySignature = getSignatureFromDeclaration(bodyDeclaration); - // If the implementation signature has string literals, we will have reported an error in - // checkSpecializedSignatureDeclaration - if (!bodySignature.hasStringLiterals) { - // TypeScript 1.0 spec (April 2014): 6.1 - // If a function declaration includes overloads, the overloads determine the call - // signatures of the type given to the function object - // and the function implementation signature must be assignable to that type - // - // TypeScript 1.0 spec (April 2014): 3.8.4 - // Note that specialized call and construct signatures (section 3.7.2.4) are not significant when determining assignment compatibility - // Consider checking against specialized signatures too. Not doing so creates a type hole: - // - // function g(x: "hi", y: boolean); - // function g(x: string, y: {}); - // function g(x: string, y: string) { } - // - // The implementation is completely unrelated to the specialized signature, yet we do not check this. - for (const signature of signatures) { - if (!signature.hasStringLiterals && !isImplementationCompatibleWithOverload(bodySignature, signature)) { - error(signature.declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation); - break; - } + for (const signature of signatures) { + if (!isImplementationCompatibleWithOverload(bodySignature, signature)) { + error(signature.declaration, Diagnostics.Overload_signature_is_not_compatible_with_function_implementation); + break; } } } From b0f58649ab7913fdc8e4ecaef3aef1f66cd799c4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:25:48 -0500 Subject: [PATCH 025/160] Accepted baselines. --- .../reference/ambientErrors.errors.txt | 5 +- ...callbackArgsDifferByOptionality.errors.txt | 5 +- ...tOverloadFunctionNoSubtypeError.errors.txt | 26 -- ...tantOverloadFunctionNoSubtypeError.symbols | 48 +++ ...nstantOverloadFunctionNoSubtypeError.types | 49 +++ ...uctorsWithSpecializedSignatures.errors.txt | 30 +- ...ertyIsRelatableToTargetProperty.errors.txt | 5 +- ...overloadOnConstAsTypeAnnotation.errors.txt | 5 +- ...rloadOnConstDuplicateOverloads1.errors.txt | 19 - ...overloadOnConstDuplicateOverloads1.symbols | 37 ++ .../overloadOnConstDuplicateOverloads1.types | 37 ++ ...eWithBadImplementationInDerived.errors.txt | 17 - ...BaseWithBadImplementationInDerived.symbols | 22 ++ ...InBaseWithBadImplementationInDerived.types | 22 ++ .../overloadOnConstInCallback1.errors.txt | 15 - .../overloadOnConstInCallback1.symbols | 30 ++ .../overloadOnConstInCallback1.types | 36 ++ ...tLiteralImplementingAnInterface.errors.txt | 14 - ...jectLiteralImplementingAnInterface.symbols | 19 + ...ObjectLiteralImplementingAnInterface.types | 21 + .../overloadOnConstInheritance2.errors.txt | 5 +- .../overloadOnConstInheritance3.errors.txt | 8 +- .../overloadOnConstInheritance4.errors.txt | 21 - .../overloadOnConstInheritance4.symbols | 28 ++ .../overloadOnConstInheritance4.types | 28 ++ ...rloadOnConstNoAnyImplementation.errors.txt | 11 +- ...loadOnConstNoAnyImplementation2.errors.txt | 14 +- ...nConstNoNonSpecializedSignature.errors.txt | 11 - ...adOnConstNoNonSpecializedSignature.symbols | 13 + ...loadOnConstNoNonSpecializedSignature.types | 13 + ...adOnConstNoStringImplementation.errors.txt | 27 -- ...rloadOnConstNoStringImplementation.symbols | 56 +++ ...verloadOnConstNoStringImplementation.types | 78 ++++ ...dOnConstNoStringImplementation2.errors.txt | 35 -- ...loadOnConstNoStringImplementation2.symbols | 73 ++++ ...erloadOnConstNoStringImplementation2.types | 97 +++++ ...loadOnConstantsInvalidOverload1.errors.txt | 9 +- .../overloadingOnConstants2.errors.txt | 13 +- ...dingOnConstantsInImplementation.errors.txt | 16 - ...loadingOnConstantsInImplementation.symbols | 16 + ...erloadingOnConstantsInImplementation.types | 16 + ...lizedOverloadWithRestParameters.errors.txt | 21 - ...cializedOverloadWithRestParameters.symbols | 48 +++ ...pecializedOverloadWithRestParameters.types | 50 +++ ...edSignatureAsCallbackParameter1.errors.txt | 7 +- ...ubtypeOfNonSpecializedSignature.errors.txt | 39 +- ...eOverloadReturnTypeWithIndexers.errors.txt | 22 -- ...tureOverloadReturnTypeWithIndexers.symbols | 53 +++ ...natureOverloadReturnTypeWithIndexers.types | 53 +++ ...ingLiteralTypeIsSubtypeOfString.errors.txt | 124 ------ ...stringLiteralTypeIsSubtypeOfString.symbols | 343 +++++++++++++++++ .../stringLiteralTypeIsSubtypeOfString.types | 363 ++++++++++++++++++ .../stringLiteralTypesAsTags02.errors.txt | 50 --- .../stringLiteralTypesAsTags02.symbols | 106 +++++ .../stringLiteralTypesAsTags02.types | 115 ++++++ ...LiteralTypesAsTypeParameterConstraint01.js | 23 -- ...TypesInImplementationSignatures.errors.txt | 62 --- ...ralTypesInImplementationSignatures.symbols | 66 ++++ ...teralTypesInImplementationSignatures.types | 71 ++++ ...ypesInImplementationSignatures2.errors.txt | 38 +- ...ralTypesOverloadAssignability01.errors.txt | 25 -- ...iteralTypesOverloadAssignability01.symbols | 40 ++ ...gLiteralTypesOverloadAssignability01.types | 44 +++ ...ralTypesOverloadAssignability02.errors.txt | 31 -- ...iteralTypesOverloadAssignability02.symbols | 40 ++ ...gLiteralTypesOverloadAssignability02.types | 44 +++ ...ralTypesOverloadAssignability03.errors.txt | 25 -- ...iteralTypesOverloadAssignability03.symbols | 40 ++ ...gLiteralTypesOverloadAssignability03.types | 44 +++ ...ralTypesOverloadAssignability04.errors.txt | 31 -- ...iteralTypesOverloadAssignability04.symbols | 40 ++ ...gLiteralTypesOverloadAssignability04.types | 44 +++ ...ralTypesOverloadAssignability05.errors.txt | 5 +- ...ingLiteralTypesTypePredicates01.errors.txt | 33 -- ...stringLiteralTypesTypePredicates01.symbols | 62 +++ .../stringLiteralTypesTypePredicates01.types | 69 ++++ ...gumentsWithStringLiteralTypes01.errors.txt | 5 +- 77 files changed, 2504 insertions(+), 822 deletions(-) delete mode 100644 tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt create mode 100644 tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols create mode 100644 tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types delete mode 100644 tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstDuplicateOverloads1.symbols create mode 100644 tests/baselines/reference/overloadOnConstDuplicateOverloads1.types delete mode 100644 tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols create mode 100644 tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types delete mode 100644 tests/baselines/reference/overloadOnConstInCallback1.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstInCallback1.symbols create mode 100644 tests/baselines/reference/overloadOnConstInCallback1.types delete mode 100644 tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols create mode 100644 tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types delete mode 100644 tests/baselines/reference/overloadOnConstInheritance4.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstInheritance4.symbols create mode 100644 tests/baselines/reference/overloadOnConstInheritance4.types delete mode 100644 tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols create mode 100644 tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.types delete mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation.symbols create mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation.types delete mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols create mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.types delete mode 100644 tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt create mode 100644 tests/baselines/reference/overloadingOnConstantsInImplementation.symbols create mode 100644 tests/baselines/reference/overloadingOnConstantsInImplementation.types delete mode 100644 tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt create mode 100644 tests/baselines/reference/specializedOverloadWithRestParameters.symbols create mode 100644 tests/baselines/reference/specializedOverloadWithRestParameters.types delete mode 100644 tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.errors.txt create mode 100644 tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols create mode 100644 tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types delete mode 100644 tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols create mode 100644 tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types delete mode 100644 tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags02.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesAsTags02.types delete mode 100644 tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability03.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability04.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types delete mode 100644 tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesTypePredicates01.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesTypePredicates01.types diff --git a/tests/baselines/reference/ambientErrors.errors.txt b/tests/baselines/reference/ambientErrors.errors.txt index 5e257c2de3f..7b42085e0c2 100644 --- a/tests/baselines/reference/ambientErrors.errors.txt +++ b/tests/baselines/reference/ambientErrors.errors.txt @@ -1,5 +1,4 @@ tests/cases/conformance/ambient/ambientErrors.ts(2,15): error TS1039: Initializers are not allowed in ambient contexts. -tests/cases/conformance/ambient/ambientErrors.ts(6,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/ambient/ambientErrors.ts(17,22): error TS2371: A parameter initializer is only allowed in a function or constructor implementation. tests/cases/conformance/ambient/ambientErrors.ts(20,24): error TS1183: An implementation cannot be declared in ambient contexts. tests/cases/conformance/ambient/ambientErrors.ts(29,9): error TS1066: In ambient enum declarations member initializer must be constant expression. @@ -15,7 +14,7 @@ tests/cases/conformance/ambient/ambientErrors.ts(51,16): error TS2436: Ambient m tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export assignment cannot be used in a module with other exported elements. -==== tests/cases/conformance/ambient/ambientErrors.ts (15 errors) ==== +==== tests/cases/conformance/ambient/ambientErrors.ts (14 errors) ==== // Ambient variable with an initializer declare var x = 4; ~ @@ -24,8 +23,6 @@ tests/cases/conformance/ambient/ambientErrors.ts(57,5): error TS2309: An export // Ambient functions with invalid overloads declare function fn(x: number): string; declare function fn(x: 'foo'): number; - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. // Ambient functions with duplicate signatures declare function fn1(x: number): string; diff --git a/tests/baselines/reference/callbackArgsDifferByOptionality.errors.txt b/tests/baselines/reference/callbackArgsDifferByOptionality.errors.txt index 2df02c30185..5ec083a685a 100644 --- a/tests/baselines/reference/callbackArgsDifferByOptionality.errors.txt +++ b/tests/baselines/reference/callbackArgsDifferByOptionality.errors.txt @@ -1,11 +1,8 @@ -tests/cases/compiler/callbackArgsDifferByOptionality.ts(1,23): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/callbackArgsDifferByOptionality.ts(4,5): error TS2304: Cannot find name 'cb'. -==== tests/cases/compiler/callbackArgsDifferByOptionality.ts (2 errors) ==== +==== tests/cases/compiler/callbackArgsDifferByOptionality.ts (1 errors) ==== function x3(callback: (x?: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function x3(callback: (x: string) => number); function x3(callback: (x: any) => number) { cb(); diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt deleted file mode 100644 index 3c5e6f8efca..00000000000 --- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts (3 errors) ==== - class Base { foo() { } } - class Derived1 extends Base { bar() { } } - class Derived2 extends Base { baz() { } } - class Derived3 extends Base { biz() { } } - - function foo(tagName: 'canvas'): Derived3; - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(tagName: 'div'): Derived2; - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(tagName: 'span'): Derived1; - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(tagName: number): Base; - function foo(tagName: any): Base { - - return null; - } - \ No newline at end of file diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols new file mode 100644 index 00000000000..3a604e4b30e --- /dev/null +++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.symbols @@ -0,0 +1,48 @@ +=== tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts === +class Base { foo() { } } +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 12)) + +class Derived1 extends Base { bar() { } } +>Derived1 : Symbol(Derived1, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 24)) +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) +>bar : Symbol(bar, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 29)) + +class Derived2 extends Base { baz() { } } +>Derived2 : Symbol(Derived2, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 41)) +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) +>baz : Symbol(baz, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 29)) + +class Derived3 extends Base { biz() { } } +>Derived3 : Symbol(Derived3, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 41)) +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) +>biz : Symbol(biz, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 29)) + +function foo(tagName: 'canvas'): Derived3; +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36)) +>tagName : Symbol(tagName, Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 13)) +>Derived3 : Symbol(Derived3, Decl(constantOverloadFunctionNoSubtypeError.ts, 2, 41)) + +function foo(tagName: 'div'): Derived2; +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36)) +>tagName : Symbol(tagName, Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 13)) +>Derived2 : Symbol(Derived2, Decl(constantOverloadFunctionNoSubtypeError.ts, 1, 41)) + +function foo(tagName: 'span'): Derived1; +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36)) +>tagName : Symbol(tagName, Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 13)) +>Derived1 : Symbol(Derived1, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 24)) + +function foo(tagName: number): Base; +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36)) +>tagName : Symbol(tagName, Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 13)) +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) + +function foo(tagName: any): Base { +>foo : Symbol(foo, Decl(constantOverloadFunctionNoSubtypeError.ts, 3, 41), Decl(constantOverloadFunctionNoSubtypeError.ts, 5, 42), Decl(constantOverloadFunctionNoSubtypeError.ts, 6, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 7, 40), Decl(constantOverloadFunctionNoSubtypeError.ts, 8, 36)) +>tagName : Symbol(tagName, Decl(constantOverloadFunctionNoSubtypeError.ts, 9, 13)) +>Base : Symbol(Base, Decl(constantOverloadFunctionNoSubtypeError.ts, 0, 0)) + + return null; +} + diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types new file mode 100644 index 00000000000..121faab82d5 --- /dev/null +++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.types @@ -0,0 +1,49 @@ +=== tests/cases/compiler/constantOverloadFunctionNoSubtypeError.ts === +class Base { foo() { } } +>Base : Base +>foo : () => void + +class Derived1 extends Base { bar() { } } +>Derived1 : Derived1 +>Base : Base +>bar : () => void + +class Derived2 extends Base { baz() { } } +>Derived2 : Derived2 +>Base : Base +>baz : () => void + +class Derived3 extends Base { biz() { } } +>Derived3 : Derived3 +>Base : Base +>biz : () => void + +function foo(tagName: 'canvas'): Derived3; +>foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; } +>tagName : "canvas" +>Derived3 : Derived3 + +function foo(tagName: 'div'): Derived2; +>foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; } +>tagName : "div" +>Derived2 : Derived2 + +function foo(tagName: 'span'): Derived1; +>foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; } +>tagName : "span" +>Derived1 : Derived1 + +function foo(tagName: number): Base; +>foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; } +>tagName : number +>Base : Base + +function foo(tagName: any): Base { +>foo : { (tagName: "canvas"): Derived3; (tagName: "div"): Derived2; (tagName: "span"): Derived1; (tagName: number): Base; } +>tagName : any +>Base : Base + + return null; +>null : null +} + diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt b/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt index c4d0c7ffb66..4f869fd63a0 100644 --- a/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt +++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt @@ -1,22 +1,12 @@ -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(3,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(4,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(17,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(18,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(20,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(28,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(33,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/constructorsWithSpecializedSignatures.ts(34,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/constructorsWithSpecializedSignatures.ts(18,5): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/compiler/constructorsWithSpecializedSignatures.ts(26,5): error TS2394: Overload signature is not compatible with function implementation. -==== tests/cases/compiler/constructorsWithSpecializedSignatures.ts (8 errors) ==== +==== tests/cases/compiler/constructorsWithSpecializedSignatures.ts (2 errors) ==== // errors declare class C { constructor(x: "hi"); - ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. constructor(x: "foo"); - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. constructor(x: number); } @@ -30,35 +20,27 @@ tests/cases/compiler/constructorsWithSpecializedSignatures.ts(34,5): error TS238 // errors class D { constructor(x: "hi"); - ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. constructor(x: "foo"); ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +!!! error TS2394: Overload signature is not compatible with function implementation. constructor(x: number); constructor(x: "hi") { } - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. } // overloads are ok class D2 { constructor(x: "hi"); constructor(x: "foo"); + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. constructor(x: string); constructor(x: "hi") { } // error - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. } // errors interface I { new (x: "hi"); - ~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. new (x: "foo"); - ~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. new (x: number); } diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt index 450d180e884..2938f7bf18d 100644 --- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt +++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.errors.txt @@ -1,16 +1,13 @@ -tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts(9,5): error TS2322: Type '(x: "hi", items: string[]) => typeof foo' is not assignable to type 'D'. Property 'x' is missing in type '(x: "hi", items: string[]) => typeof foo'. -==== tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts (2 errors) ==== +==== tests/cases/compiler/crashInsourcePropertyIsRelatableToTargetProperty.ts (1 errors) ==== class C { private x = 1; } class D extends C { } function foo(x: "hi", items: string[]): typeof foo; - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: string, items: string[]): typeof foo { return null; } diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt index a78e0c8abcf..45f61055ede 100644 --- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt +++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt @@ -1,11 +1,8 @@ -tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,8): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,37): error TS1005: ';' expected. -==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (2 errors) ==== +==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (1 errors) ==== var f: (x: 'hi') => number = ('hi') => { return 1; }; - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. ~~ !!! error TS1005: ';' expected. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt deleted file mode 100644 index 0f5126b5920..00000000000 --- a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(1,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts (2 errors) ==== - function foo(a: 'hi', x: string); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(a: 'hi', x: string); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(a: any, x: any) { - } - - function foo2(a: 'hi', x: string); - function foo2(a: 'hi', x: string); - function foo2(a: string, x: string); - function foo2(a: any, x: any) { - } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.symbols b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.symbols new file mode 100644 index 00000000000..5ac0cfbd00c --- /dev/null +++ b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.symbols @@ -0,0 +1,37 @@ +=== tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts === +function foo(a: 'hi', x: string); +>foo : Symbol(foo, Decl(overloadOnConstDuplicateOverloads1.ts, 0, 0), Decl(overloadOnConstDuplicateOverloads1.ts, 0, 33), Decl(overloadOnConstDuplicateOverloads1.ts, 1, 33)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 0, 13)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 0, 21)) + +function foo(a: 'hi', x: string); +>foo : Symbol(foo, Decl(overloadOnConstDuplicateOverloads1.ts, 0, 0), Decl(overloadOnConstDuplicateOverloads1.ts, 0, 33), Decl(overloadOnConstDuplicateOverloads1.ts, 1, 33)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 1, 13)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 1, 21)) + +function foo(a: any, x: any) { +>foo : Symbol(foo, Decl(overloadOnConstDuplicateOverloads1.ts, 0, 0), Decl(overloadOnConstDuplicateOverloads1.ts, 0, 33), Decl(overloadOnConstDuplicateOverloads1.ts, 1, 33)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 2, 13)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 2, 20)) +} + +function foo2(a: 'hi', x: string); +>foo2 : Symbol(foo2, Decl(overloadOnConstDuplicateOverloads1.ts, 3, 1), Decl(overloadOnConstDuplicateOverloads1.ts, 5, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 6, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 7, 36)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 5, 14)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 5, 22)) + +function foo2(a: 'hi', x: string); +>foo2 : Symbol(foo2, Decl(overloadOnConstDuplicateOverloads1.ts, 3, 1), Decl(overloadOnConstDuplicateOverloads1.ts, 5, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 6, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 7, 36)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 6, 14)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 6, 22)) + +function foo2(a: string, x: string); +>foo2 : Symbol(foo2, Decl(overloadOnConstDuplicateOverloads1.ts, 3, 1), Decl(overloadOnConstDuplicateOverloads1.ts, 5, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 6, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 7, 36)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 7, 14)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 7, 24)) + +function foo2(a: any, x: any) { +>foo2 : Symbol(foo2, Decl(overloadOnConstDuplicateOverloads1.ts, 3, 1), Decl(overloadOnConstDuplicateOverloads1.ts, 5, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 6, 34), Decl(overloadOnConstDuplicateOverloads1.ts, 7, 36)) +>a : Symbol(a, Decl(overloadOnConstDuplicateOverloads1.ts, 8, 14)) +>x : Symbol(x, Decl(overloadOnConstDuplicateOverloads1.ts, 8, 21)) +} diff --git a/tests/baselines/reference/overloadOnConstDuplicateOverloads1.types b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.types new file mode 100644 index 00000000000..f74bb5bf958 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstDuplicateOverloads1.types @@ -0,0 +1,37 @@ +=== tests/cases/compiler/overloadOnConstDuplicateOverloads1.ts === +function foo(a: 'hi', x: string); +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : "hi" +>x : string + +function foo(a: 'hi', x: string); +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : "hi" +>x : string + +function foo(a: any, x: any) { +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : any +>x : any +} + +function foo2(a: 'hi', x: string); +>foo2 : { (a: "hi", x: string): any; (a: "hi", x: string): any; (a: string, x: string): any; } +>a : "hi" +>x : string + +function foo2(a: 'hi', x: string); +>foo2 : { (a: "hi", x: string): any; (a: "hi", x: string): any; (a: string, x: string): any; } +>a : "hi" +>x : string + +function foo2(a: string, x: string); +>foo2 : { (a: "hi", x: string): any; (a: "hi", x: string): any; (a: string, x: string): any; } +>a : string +>x : string + +function foo2(a: any, x: any) { +>foo2 : { (a: "hi", x: string): any; (a: "hi", x: string): any; (a: string, x: string): any; } +>a : any +>x : any +} diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.errors.txt b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.errors.txt deleted file mode 100644 index e040559a054..00000000000 --- a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts(6,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts (2 errors) ==== - interface I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - - class C implements I { - x1(a: number, callback: (x: 'hi') => number) { // error - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols new file mode 100644 index 00000000000..6e4429759e2 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts === +interface I { +>I : Symbol(I, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 13)) +>a : Symbol(a, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 17)) +>x : Symbol(x, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 1, 29)) +} + +class C implements I { +>C : Symbol(C, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 2, 1)) +>I : Symbol(I, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number) { // error +>x1 : Symbol(x1, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 4, 22)) +>a : Symbol(a, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 17)) +>x : Symbol(x, Decl(overloadOnConstInBaseWithBadImplementationInDerived.ts, 5, 29)) + } +} diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types new file mode 100644 index 00000000000..079ae80b364 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.types @@ -0,0 +1,22 @@ +=== tests/cases/compiler/overloadOnConstInBaseWithBadImplementationInDerived.ts === +interface I { +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" +} + +class C implements I { +>C : C +>I : I + + x1(a: number, callback: (x: 'hi') => number) { // error +>x1 : (a: number, callback: (x: "hi") => number) => void +>a : number +>callback : (x: "hi") => number +>x : "hi" + } +} diff --git a/tests/baselines/reference/overloadOnConstInCallback1.errors.txt b/tests/baselines/reference/overloadOnConstInCallback1.errors.txt deleted file mode 100644 index 5d594204933..00000000000 --- a/tests/baselines/reference/overloadOnConstInCallback1.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -tests/cases/compiler/overloadOnConstInCallback1.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstInCallback1.ts (1 errors) ==== - class C { - x1(a: number, callback: (x: 'hi') => number); // error - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - x1(a: number, callback: (x: any) => number) { - callback('hi'); - callback('bye'); - var hm = "hm"; - callback(hm); - } - } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInCallback1.symbols b/tests/baselines/reference/overloadOnConstInCallback1.symbols new file mode 100644 index 00000000000..923c726714e --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInCallback1.symbols @@ -0,0 +1,30 @@ +=== tests/cases/compiler/overloadOnConstInCallback1.ts === +class C { +>C : Symbol(C, Decl(overloadOnConstInCallback1.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); // error +>x1 : Symbol(x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49)) +>a : Symbol(a, Decl(overloadOnConstInCallback1.ts, 1, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 1, 17)) +>x : Symbol(x, Decl(overloadOnConstInCallback1.ts, 1, 29)) + + x1(a: number, callback: (x: any) => number) { +>x1 : Symbol(x1, Decl(overloadOnConstInCallback1.ts, 0, 9), Decl(overloadOnConstInCallback1.ts, 1, 49)) +>a : Symbol(a, Decl(overloadOnConstInCallback1.ts, 2, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 2, 17)) +>x : Symbol(x, Decl(overloadOnConstInCallback1.ts, 2, 29)) + + callback('hi'); +>callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 2, 17)) + + callback('bye'); +>callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 2, 17)) + + var hm = "hm"; +>hm : Symbol(hm, Decl(overloadOnConstInCallback1.ts, 5, 11)) + + callback(hm); +>callback : Symbol(callback, Decl(overloadOnConstInCallback1.ts, 2, 17)) +>hm : Symbol(hm, Decl(overloadOnConstInCallback1.ts, 5, 11)) + } +} diff --git a/tests/baselines/reference/overloadOnConstInCallback1.types b/tests/baselines/reference/overloadOnConstInCallback1.types new file mode 100644 index 00000000000..c8c123df1e8 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInCallback1.types @@ -0,0 +1,36 @@ +=== tests/cases/compiler/overloadOnConstInCallback1.ts === +class C { +>C : C + + x1(a: number, callback: (x: 'hi') => number); // error +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" + + x1(a: number, callback: (x: any) => number) { +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: any) => number +>x : any + + callback('hi'); +>callback('hi') : number +>callback : (x: any) => number +>'hi' : string + + callback('bye'); +>callback('bye') : number +>callback : (x: any) => number +>'bye' : string + + var hm = "hm"; +>hm : string +>"hm" : string + + callback(hm); +>callback(hm) : number +>callback : (x: any) => number +>hm : string + } +} diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.errors.txt b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.errors.txt deleted file mode 100644 index 5788a9e6bbe..00000000000 --- a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts(5,35): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts (2 errors) ==== - interface I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - - var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols new file mode 100644 index 00000000000..9ea93140085 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts === +interface I { +>I : Symbol(I, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 13)) +>a : Symbol(a, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 17)) +>x : Symbol(x, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 1, 29)) +} + +var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error +>i2 : Symbol(i2, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 4, 3)) +>I : Symbol(I, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 0, 0)) +>x1 : Symbol(x1, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 4, 13)) +>a : Symbol(a, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 4, 19)) +>cb : Symbol(cb, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 4, 29)) +>x : Symbol(x, Decl(overloadOnConstInObjectLiteralImplementingAnInterface.ts, 4, 35)) + diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types new file mode 100644 index 00000000000..e22162d1e7a --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/overloadOnConstInObjectLiteralImplementingAnInterface.ts === +interface I { +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" +} + +var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error +>i2 : I +>I : I +>{ x1: (a: number, cb: (x: 'hi') => number) => { } } : { x1: (a: number, cb: (x: "hi") => number) => void; } +>x1 : (a: number, cb: (x: "hi") => number) => void +>(a: number, cb: (x: 'hi') => number) => { } : (a: number, cb: (x: "hi") => number) => void +>a : number +>cb : (x: "hi") => number +>x : "hi" + diff --git a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt index 4b502f145a6..5d3930a4e45 100644 --- a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt +++ b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt @@ -2,10 +2,9 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interfa Types of property 'addEventListener' are incompatible. Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. Type '(x: "bar") => string' provides no match for the signature '(x: string): any' -tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -==== tests/cases/compiler/overloadOnConstInheritance2.ts (2 errors) ==== +==== tests/cases/compiler/overloadOnConstInheritance2.ts (1 errors) ==== interface Base { addEventListener(x: string): any; addEventListener(x: 'foo'): string; @@ -17,7 +16,5 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(6,5): error TS2382: Speciali !!! error TS2430: Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. !!! error TS2430: Type '(x: "bar") => string' provides no match for the signature '(x: string): any' addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt index 6d9f9b00692..bedff91fc27 100644 --- a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt +++ b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt @@ -2,11 +2,9 @@ tests/cases/compiler/overloadOnConstInheritance3.ts(4,11): error TS2430: Interfa Types of property 'addEventListener' are incompatible. Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'. Type '{ (x: "bar"): string; (x: "foo"): string; }' provides no match for the signature '(x: string): any' -tests/cases/compiler/overloadOnConstInheritance3.ts(6,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -==== tests/cases/compiler/overloadOnConstInheritance3.ts (3 errors) ==== +==== tests/cases/compiler/overloadOnConstInheritance3.ts (1 errors) ==== interface Base { addEventListener(x: string): any; } @@ -18,10 +16,6 @@ tests/cases/compiler/overloadOnConstInheritance3.ts(7,5): error TS2382: Speciali !!! error TS2430: Type '{ (x: "bar"): string; (x: "foo"): string; }' provides no match for the signature '(x: string): any' // shouldn't need to redeclare the string overload addEventListener(x: 'bar'): string; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. addEventListener(x: 'foo'): string; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance4.errors.txt b/tests/baselines/reference/overloadOnConstInheritance4.errors.txt deleted file mode 100644 index 54200023408..00000000000 --- a/tests/baselines/reference/overloadOnConstInheritance4.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/compiler/overloadOnConstInheritance4.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstInheritance4.ts(5,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstInheritance4.ts(6,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstInheritance4.ts (3 errors) ==== - interface I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - class C implements I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - x1(a: number, callback: (x: 'hi') => number) { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance4.symbols b/tests/baselines/reference/overloadOnConstInheritance4.symbols new file mode 100644 index 00000000000..9bfa61e6aa9 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInheritance4.symbols @@ -0,0 +1,28 @@ +=== tests/cases/compiler/overloadOnConstInheritance4.ts === +interface I { +>I : Symbol(I, Decl(overloadOnConstInheritance4.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 0, 13)) +>a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 1, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 1, 17)) +>x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 1, 29)) +} +class C implements I { +>C : Symbol(C, Decl(overloadOnConstInheritance4.ts, 2, 1)) +>I : Symbol(I, Decl(overloadOnConstInheritance4.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49)) +>a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 4, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 4, 17)) +>x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 4, 29)) + + x1(a: number, callback: (x: 'hi') => number) { +>x1 : Symbol(x1, Decl(overloadOnConstInheritance4.ts, 3, 22), Decl(overloadOnConstInheritance4.ts, 4, 49)) +>a : Symbol(a, Decl(overloadOnConstInheritance4.ts, 5, 7)) +>callback : Symbol(callback, Decl(overloadOnConstInheritance4.ts, 5, 17)) +>x : Symbol(x, Decl(overloadOnConstInheritance4.ts, 5, 29)) + } +} + diff --git a/tests/baselines/reference/overloadOnConstInheritance4.types b/tests/baselines/reference/overloadOnConstInheritance4.types new file mode 100644 index 00000000000..cacd3adfcc9 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInheritance4.types @@ -0,0 +1,28 @@ +=== tests/cases/compiler/overloadOnConstInheritance4.ts === +interface I { +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" +} +class C implements I { +>C : C +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" + + x1(a: number, callback: (x: 'hi') => number) { +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" + } +} + diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation.errors.txt b/tests/baselines/reference/overloadOnConstNoAnyImplementation.errors.txt index 2827a97ca82..fe5219606ff 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation.errors.txt +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation.errors.txt @@ -1,16 +1,9 @@ -tests/cases/compiler/overloadOnConstNoAnyImplementation.ts(1,28): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoAnyImplementation.ts(2,28): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadOnConstNoAnyImplementation.ts(9,8): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. -tests/cases/compiler/overloadOnConstNoAnyImplementation.ts(14,7): error TS2381: A signature with an implementation cannot use a string literal type. -==== tests/cases/compiler/overloadOnConstNoAnyImplementation.ts (4 errors) ==== +==== tests/cases/compiler/overloadOnConstNoAnyImplementation.ts (1 errors) ==== function x1(a: number, cb: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function x1(a: number, cb: (x: 'bye') => number); - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function x1(a: number, cb: (x: string) => number) { cb('hi'); cb('bye'); @@ -25,6 +18,4 @@ tests/cases/compiler/overloadOnConstNoAnyImplementation.ts(14,7): error TS2381: var cb: (number) => number = (x: number) => 1; x1(1, cb); x1(1, (x: 'hi') => 1); // error - ~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. x1(1, (x: string) => 1); \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt index aab390c48e8..a9d4092f6d3 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt @@ -1,21 +1,13 @@ -tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(6,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(12,18): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. -tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(17,9): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(18,9): error TS2381: A signature with an implementation cannot use a string literal type. -==== tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts (5 errors) ==== +==== tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts (1 errors) ==== interface I { x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. } class C { x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. x1(a: number, callback: (x: string) => number) { callback('hi'); callback('bye'); @@ -29,11 +21,7 @@ tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(18,9): error TS2381: var c: C; c.x1(1, (x: 'hi') => { return 1; } ); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. c.x1(1, (x: 'bye') => { return 1; } ); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. c.x1(1, (x) => { return 1; } ); c.x1(1, (x: number) => { return 1; } ); \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt deleted file mode 100644 index 6b96abce29e..00000000000 --- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts(2,4): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts (1 errors) ==== - class C { - x1(a: 'hi'); // error, no non-specialized signature in overload list - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - x1(a: string) { } - } - \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols new file mode 100644 index 00000000000..ff7f88f43c3 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.symbols @@ -0,0 +1,13 @@ +=== tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts === +class C { +>C : Symbol(C, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 0)) + + x1(a: 'hi'); // error, no non-specialized signature in overload list +>x1 : Symbol(x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15)) +>a : Symbol(a, Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 6)) + + x1(a: string) { } +>x1 : Symbol(x1, Decl(overloadOnConstNoNonSpecializedSignature.ts, 0, 9), Decl(overloadOnConstNoNonSpecializedSignature.ts, 1, 15)) +>a : Symbol(a, Decl(overloadOnConstNoNonSpecializedSignature.ts, 2, 6)) +} + diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.types b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.types new file mode 100644 index 00000000000..09360b748c3 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.types @@ -0,0 +1,13 @@ +=== tests/cases/compiler/overloadOnConstNoNonSpecializedSignature.ts === +class C { +>C : C + + x1(a: 'hi'); // error, no non-specialized signature in overload list +>x1 : (a: "hi") => any +>a : "hi" + + x1(a: string) { } +>x1 : (a: "hi") => any +>a : string +} + diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation.errors.txt b/tests/baselines/reference/overloadOnConstNoStringImplementation.errors.txt deleted file mode 100644 index 12dcdaf9769..00000000000 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation.errors.txt +++ /dev/null @@ -1,27 +0,0 @@ -tests/cases/compiler/overloadOnConstNoStringImplementation.ts(1,28): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoStringImplementation.ts(2,28): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoStringImplementation.ts(14,7): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/compiler/overloadOnConstNoStringImplementation.ts (3 errors) ==== - function x2(a: number, cb: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function x2(a: number, cb: (x: 'bye') => number); - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function x2(a: number, cb: (x: any) => number) { - cb('hi'); - cb('bye'); - var hm = 'hm'; - cb(hm); // should this work without a string definition? - cb('uh'); - cb(1); - } - - var cb: (number) => number = (x: number) => 1; - x2(1, cb); // error - x2(1, (x: 'hi') => 1); // error - ~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - x2(1, (x: string) => 1); \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation.symbols b/tests/baselines/reference/overloadOnConstNoStringImplementation.symbols new file mode 100644 index 00000000000..a8d3bd7953d --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation.symbols @@ -0,0 +1,56 @@ +=== tests/cases/compiler/overloadOnConstNoStringImplementation.ts === +function x2(a: number, cb: (x: 'hi') => number); +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation.ts, 0, 12)) +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 0, 22)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 0, 28)) + +function x2(a: number, cb: (x: 'bye') => number); +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation.ts, 1, 12)) +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 1, 22)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 1, 28)) + +function x2(a: number, cb: (x: any) => number) { +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation.ts, 2, 12)) +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 2, 28)) + + cb('hi'); +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) + + cb('bye'); +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) + + var hm = 'hm'; +>hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation.ts, 5, 7)) + + cb(hm); // should this work without a string definition? +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) +>hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation.ts, 5, 7)) + + cb('uh'); +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) + + cb(1); +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 2, 22)) +} + +var cb: (number) => number = (x: number) => 1; +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 11, 3)) +>number : Symbol(number, Decl(overloadOnConstNoStringImplementation.ts, 11, 9)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 11, 30)) + +x2(1, cb); // error +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>cb : Symbol(cb, Decl(overloadOnConstNoStringImplementation.ts, 11, 3)) + +x2(1, (x: 'hi') => 1); // error +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 13, 7)) + +x2(1, (x: string) => 1); +>x2 : Symbol(x2, Decl(overloadOnConstNoStringImplementation.ts, 0, 0), Decl(overloadOnConstNoStringImplementation.ts, 0, 48), Decl(overloadOnConstNoStringImplementation.ts, 1, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation.ts, 14, 7)) + diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation.types b/tests/baselines/reference/overloadOnConstNoStringImplementation.types new file mode 100644 index 00000000000..9161620841f --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation.types @@ -0,0 +1,78 @@ +=== tests/cases/compiler/overloadOnConstNoStringImplementation.ts === +function x2(a: number, cb: (x: 'hi') => number); +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>a : number +>cb : (x: "hi") => number +>x : "hi" + +function x2(a: number, cb: (x: 'bye') => number); +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>a : number +>cb : (x: "bye") => number +>x : "bye" + +function x2(a: number, cb: (x: any) => number) { +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>a : number +>cb : (x: any) => number +>x : any + + cb('hi'); +>cb('hi') : number +>cb : (x: any) => number +>'hi' : string + + cb('bye'); +>cb('bye') : number +>cb : (x: any) => number +>'bye' : string + + var hm = 'hm'; +>hm : string +>'hm' : string + + cb(hm); // should this work without a string definition? +>cb(hm) : number +>cb : (x: any) => number +>hm : string + + cb('uh'); +>cb('uh') : number +>cb : (x: any) => number +>'uh' : string + + cb(1); +>cb(1) : number +>cb : (x: any) => number +>1 : number +} + +var cb: (number) => number = (x: number) => 1; +>cb : (number: any) => number +>number : any +>(x: number) => 1 : (x: number) => number +>x : number +>1 : number + +x2(1, cb); // error +>x2(1, cb) : any +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>1 : number +>cb : (number: any) => number + +x2(1, (x: 'hi') => 1); // error +>x2(1, (x: 'hi') => 1) : any +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>1 : number +>(x: 'hi') => 1 : (x: "hi") => number +>x : "hi" +>1 : number + +x2(1, (x: string) => 1); +>x2(1, (x: string) => 1) : any +>x2 : { (a: number, cb: (x: "hi") => number): any; (a: number, cb: (x: "bye") => number): any; } +>1 : number +>(x: string) => 1 : (x: string) => number +>x : string +>1 : number + diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt deleted file mode 100644 index c85b004f160..00000000000 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt +++ /dev/null @@ -1,35 +0,0 @@ -tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(2,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(6,29): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(17,9): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(18,9): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts (4 errors) ==== - interface I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - - class C implements I { - x1(a: number, callback: (x: 'hi') => number); - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - x1(a: number, callback: (x: any) => number) { - callback('hi'); - callback('bye'); - var hm = "hm"; - callback(hm); - callback(1); - } - } - - var c: C; - c.x1(1, (x: 'hi') => { return 1; } ); - ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - c.x1(1, (x: 'bye') => { return 1; } ); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - c.x1(1, (x: string) => { return 1; } ); - c.x1(1, (x: number) => { return 1; } ); \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols b/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols new file mode 100644 index 00000000000..8629708d187 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols @@ -0,0 +1,73 @@ +=== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts === +interface I { +>I : Symbol(I, Decl(overloadOnConstNoStringImplementation2.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 0, 13)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 1, 7)) +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 1, 17)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 1, 29)) +} + +class C implements I { +>C : Symbol(C, Decl(overloadOnConstNoStringImplementation2.ts, 2, 1)) +>I : Symbol(I, Decl(overloadOnConstNoStringImplementation2.ts, 0, 0)) + + x1(a: number, callback: (x: 'hi') => number); +>x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 5, 7)) +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 5, 17)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 5, 29)) + + x1(a: number, callback: (x: any) => number) { +>x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 6, 7)) +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 6, 29)) + + callback('hi'); +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) + + callback('bye'); +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) + + var hm = "hm"; +>hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation2.ts, 9, 11)) + + callback(hm); +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) +>hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation2.ts, 9, 11)) + + callback(1); +>callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) + } +} + +var c: C; +>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) +>C : Symbol(C, Decl(overloadOnConstNoStringImplementation2.ts, 2, 1)) + +c.x1(1, (x: 'hi') => { return 1; } ); +>c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) +>x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 16, 9)) + +c.x1(1, (x: 'bye') => { return 1; } ); +>c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) +>x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 17, 9)) + +c.x1(1, (x: string) => { return 1; } ); +>c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) +>x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 18, 9)) + +c.x1(1, (x: number) => { return 1; } ); +>c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) +>x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) +>x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 19, 9)) + diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types new file mode 100644 index 00000000000..40521db3f89 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types @@ -0,0 +1,97 @@ +=== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts === +interface I { +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" +} + +class C implements I { +>C : C +>I : I + + x1(a: number, callback: (x: 'hi') => number); +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: "hi") => number +>x : "hi" + + x1(a: number, callback: (x: any) => number) { +>x1 : (a: number, callback: (x: "hi") => number) => any +>a : number +>callback : (x: any) => number +>x : any + + callback('hi'); +>callback('hi') : number +>callback : (x: any) => number +>'hi' : string + + callback('bye'); +>callback('bye') : number +>callback : (x: any) => number +>'bye' : string + + var hm = "hm"; +>hm : string +>"hm" : string + + callback(hm); +>callback(hm) : number +>callback : (x: any) => number +>hm : string + + callback(1); +>callback(1) : number +>callback : (x: any) => number +>1 : number + } +} + +var c: C; +>c : C +>C : C + +c.x1(1, (x: 'hi') => { return 1; } ); +>c.x1(1, (x: 'hi') => { return 1; } ) : any +>c.x1 : (a: number, callback: (x: "hi") => number) => any +>c : C +>x1 : (a: number, callback: (x: "hi") => number) => any +>1 : number +>(x: 'hi') => { return 1; } : (x: "hi") => number +>x : "hi" +>1 : number + +c.x1(1, (x: 'bye') => { return 1; } ); +>c.x1(1, (x: 'bye') => { return 1; } ) : any +>c.x1 : (a: number, callback: (x: "hi") => number) => any +>c : C +>x1 : (a: number, callback: (x: "hi") => number) => any +>1 : number +>(x: 'bye') => { return 1; } : (x: "bye") => number +>x : "bye" +>1 : number + +c.x1(1, (x: string) => { return 1; } ); +>c.x1(1, (x: string) => { return 1; } ) : any +>c.x1 : (a: number, callback: (x: "hi") => number) => any +>c : C +>x1 : (a: number, callback: (x: "hi") => number) => any +>1 : number +>(x: string) => { return 1; } : (x: string) => number +>x : string +>1 : number + +c.x1(1, (x: number) => { return 1; } ); +>c.x1(1, (x: number) => { return 1; } ) : any +>c.x1 : (a: number, callback: (x: "hi") => number) => any +>c : C +>x1 : (a: number, callback: (x: "hi") => number) => any +>1 : number +>(x: number) => { return 1; } : (x: number) => number +>x : number +>1 : number + diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt index 4fea7cc1227..3fe0a43d855 100644 --- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt +++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.errors.txt @@ -1,9 +1,8 @@ -tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(7,10): error TS2381: A signature with an implementation cannot use a string literal type. +tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(6,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: Argument of type '"HI"' is not assignable to parameter of type '"SPAN"'. -==== tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts (3 errors) ==== +==== tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts (2 errors) ==== class Base { foo() { } } class Derived1 extends Base { bar() { } } class Derived2 extends Base { baz() { } } @@ -11,10 +10,8 @@ tests/cases/compiler/overloadOnConstantsInvalidOverload1.ts(11,5): error TS2345: function foo(name: "SPAN"): Derived1; ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +!!! error TS2394: Overload signature is not compatible with function implementation. function foo(name: "DIV"): Derived2 { - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. return null; } diff --git a/tests/baselines/reference/overloadingOnConstants2.errors.txt b/tests/baselines/reference/overloadingOnConstants2.errors.txt index b448deaadc7..f50a6bbd8c3 100644 --- a/tests/baselines/reference/overloadingOnConstants2.errors.txt +++ b/tests/baselines/reference/overloadingOnConstants2.errors.txt @@ -1,10 +1,9 @@ -tests/cases/compiler/overloadingOnConstants2.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstants2.ts(9,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstants2.ts(9,10): error TS2394: Overload signature is not compatible with function implementation. tests/cases/compiler/overloadingOnConstants2.ts(15,13): error TS2345: Argument of type '"um"' is not assignable to parameter of type '"bye"'. -tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2394: Overload signature is not compatible with function implementation. -==== tests/cases/compiler/overloadingOnConstants2.ts (4 errors) ==== +==== tests/cases/compiler/overloadingOnConstants2.ts (3 errors) ==== class C { private x = 1; } @@ -13,11 +12,9 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialize private y = 1; } function foo(x: "hi", items: string[]): D; - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function foo(x: "bye", items: string[]): E; ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +!!! error TS2394: Overload signature is not compatible with function implementation. function foo(x: string, items: string[]): C { return null; } @@ -31,7 +28,7 @@ tests/cases/compiler/overloadingOnConstants2.ts(19,10): error TS2382: Specialize //function bar(x: "hi", items: string[]): D; function bar(x: "bye", items: string[]): E; ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +!!! error TS2394: Overload signature is not compatible with function implementation. function bar(x: string, items: string[]): C; function bar(x: string, items: string[]): C { return null; diff --git a/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt b/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt deleted file mode 100644 index 19afdb26806..00000000000 --- a/tests/baselines/reference/overloadingOnConstantsInImplementation.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(1,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/overloadingOnConstantsInImplementation.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/compiler/overloadingOnConstantsInImplementation.ts (3 errors) ==== - function foo(a: 'hi', x: string); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(a: 'hi', x: string); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function foo(a: 'hi', x: any) { - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - } \ No newline at end of file diff --git a/tests/baselines/reference/overloadingOnConstantsInImplementation.symbols b/tests/baselines/reference/overloadingOnConstantsInImplementation.symbols new file mode 100644 index 00000000000..5cf7b2ba928 --- /dev/null +++ b/tests/baselines/reference/overloadingOnConstantsInImplementation.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/overloadingOnConstantsInImplementation.ts === +function foo(a: 'hi', x: string); +>foo : Symbol(foo, Decl(overloadingOnConstantsInImplementation.ts, 0, 0), Decl(overloadingOnConstantsInImplementation.ts, 0, 33), Decl(overloadingOnConstantsInImplementation.ts, 1, 33)) +>a : Symbol(a, Decl(overloadingOnConstantsInImplementation.ts, 0, 13)) +>x : Symbol(x, Decl(overloadingOnConstantsInImplementation.ts, 0, 21)) + +function foo(a: 'hi', x: string); +>foo : Symbol(foo, Decl(overloadingOnConstantsInImplementation.ts, 0, 0), Decl(overloadingOnConstantsInImplementation.ts, 0, 33), Decl(overloadingOnConstantsInImplementation.ts, 1, 33)) +>a : Symbol(a, Decl(overloadingOnConstantsInImplementation.ts, 1, 13)) +>x : Symbol(x, Decl(overloadingOnConstantsInImplementation.ts, 1, 21)) + +function foo(a: 'hi', x: any) { +>foo : Symbol(foo, Decl(overloadingOnConstantsInImplementation.ts, 0, 0), Decl(overloadingOnConstantsInImplementation.ts, 0, 33), Decl(overloadingOnConstantsInImplementation.ts, 1, 33)) +>a : Symbol(a, Decl(overloadingOnConstantsInImplementation.ts, 2, 13)) +>x : Symbol(x, Decl(overloadingOnConstantsInImplementation.ts, 2, 21)) +} diff --git a/tests/baselines/reference/overloadingOnConstantsInImplementation.types b/tests/baselines/reference/overloadingOnConstantsInImplementation.types new file mode 100644 index 00000000000..0cdb13e995f --- /dev/null +++ b/tests/baselines/reference/overloadingOnConstantsInImplementation.types @@ -0,0 +1,16 @@ +=== tests/cases/compiler/overloadingOnConstantsInImplementation.ts === +function foo(a: 'hi', x: string); +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : "hi" +>x : string + +function foo(a: 'hi', x: string); +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : "hi" +>x : string + +function foo(a: 'hi', x: any) { +>foo : { (a: "hi", x: string): any; (a: "hi", x: string): any; } +>a : "hi" +>x : any +} diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt b/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt deleted file mode 100644 index 0e67cc37f32..00000000000 --- a/tests/baselines/reference/specializedOverloadWithRestParameters.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/compiler/specializedOverloadWithRestParameters.ts(3,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/compiler/specializedOverloadWithRestParameters.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/specializedOverloadWithRestParameters.ts (2 errors) ==== - class Base { foo() { } } - class Derived1 extends Base { bar() { } } - function f(tagName: 'span', ...args): Derived1; // error - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f(tagName: number, ...args): Base; - function f(tagName: any): Base { - return null; - } - function g(tagName: 'span', arg): Derived1; // error - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function g(tagName: number, arg): Base; - function g(tagName: any): Base { - return null; - } \ No newline at end of file diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.symbols b/tests/baselines/reference/specializedOverloadWithRestParameters.symbols new file mode 100644 index 00000000000..77e16aced4d --- /dev/null +++ b/tests/baselines/reference/specializedOverloadWithRestParameters.symbols @@ -0,0 +1,48 @@ +=== tests/cases/compiler/specializedOverloadWithRestParameters.ts === +class Base { foo() { } } +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) +>foo : Symbol(foo, Decl(specializedOverloadWithRestParameters.ts, 0, 12)) + +class Derived1 extends Base { bar() { } } +>Derived1 : Symbol(Derived1, Decl(specializedOverloadWithRestParameters.ts, 0, 24)) +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) +>bar : Symbol(bar, Decl(specializedOverloadWithRestParameters.ts, 1, 29)) + +function f(tagName: 'span', ...args): Derived1; // error +>f : Symbol(f, Decl(specializedOverloadWithRestParameters.ts, 1, 41), Decl(specializedOverloadWithRestParameters.ts, 2, 47), Decl(specializedOverloadWithRestParameters.ts, 3, 43)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 2, 11)) +>args : Symbol(args, Decl(specializedOverloadWithRestParameters.ts, 2, 27)) +>Derived1 : Symbol(Derived1, Decl(specializedOverloadWithRestParameters.ts, 0, 24)) + +function f(tagName: number, ...args): Base; +>f : Symbol(f, Decl(specializedOverloadWithRestParameters.ts, 1, 41), Decl(specializedOverloadWithRestParameters.ts, 2, 47), Decl(specializedOverloadWithRestParameters.ts, 3, 43)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 3, 11)) +>args : Symbol(args, Decl(specializedOverloadWithRestParameters.ts, 3, 27)) +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) + +function f(tagName: any): Base { +>f : Symbol(f, Decl(specializedOverloadWithRestParameters.ts, 1, 41), Decl(specializedOverloadWithRestParameters.ts, 2, 47), Decl(specializedOverloadWithRestParameters.ts, 3, 43)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 4, 11)) +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) + + return null; +} +function g(tagName: 'span', arg): Derived1; // error +>g : Symbol(g, Decl(specializedOverloadWithRestParameters.ts, 6, 1), Decl(specializedOverloadWithRestParameters.ts, 7, 43), Decl(specializedOverloadWithRestParameters.ts, 8, 39)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 7, 11)) +>arg : Symbol(arg, Decl(specializedOverloadWithRestParameters.ts, 7, 27)) +>Derived1 : Symbol(Derived1, Decl(specializedOverloadWithRestParameters.ts, 0, 24)) + +function g(tagName: number, arg): Base; +>g : Symbol(g, Decl(specializedOverloadWithRestParameters.ts, 6, 1), Decl(specializedOverloadWithRestParameters.ts, 7, 43), Decl(specializedOverloadWithRestParameters.ts, 8, 39)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 8, 11)) +>arg : Symbol(arg, Decl(specializedOverloadWithRestParameters.ts, 8, 27)) +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) + +function g(tagName: any): Base { +>g : Symbol(g, Decl(specializedOverloadWithRestParameters.ts, 6, 1), Decl(specializedOverloadWithRestParameters.ts, 7, 43), Decl(specializedOverloadWithRestParameters.ts, 8, 39)) +>tagName : Symbol(tagName, Decl(specializedOverloadWithRestParameters.ts, 9, 11)) +>Base : Symbol(Base, Decl(specializedOverloadWithRestParameters.ts, 0, 0)) + + return null; +} diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.types b/tests/baselines/reference/specializedOverloadWithRestParameters.types new file mode 100644 index 00000000000..1f7fd391ec7 --- /dev/null +++ b/tests/baselines/reference/specializedOverloadWithRestParameters.types @@ -0,0 +1,50 @@ +=== tests/cases/compiler/specializedOverloadWithRestParameters.ts === +class Base { foo() { } } +>Base : Base +>foo : () => void + +class Derived1 extends Base { bar() { } } +>Derived1 : Derived1 +>Base : Base +>bar : () => void + +function f(tagName: 'span', ...args): Derived1; // error +>f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; } +>tagName : "span" +>args : any[] +>Derived1 : Derived1 + +function f(tagName: number, ...args): Base; +>f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; } +>tagName : number +>args : any[] +>Base : Base + +function f(tagName: any): Base { +>f : { (tagName: "span", ...args: any[]): Derived1; (tagName: number, ...args: any[]): Base; } +>tagName : any +>Base : Base + + return null; +>null : null +} +function g(tagName: 'span', arg): Derived1; // error +>g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; } +>tagName : "span" +>arg : any +>Derived1 : Derived1 + +function g(tagName: number, arg): Base; +>g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; } +>tagName : number +>arg : any +>Base : Base + +function g(tagName: any): Base { +>g : { (tagName: "span", arg: any): Derived1; (tagName: number, arg: any): Base; } +>tagName : any +>Base : Base + + return null; +>null : null +} diff --git a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt index 1fb3082622a..61b499e0aee 100644 --- a/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt +++ b/tests/baselines/reference/specializedSignatureAsCallbackParameter1.errors.txt @@ -1,9 +1,8 @@ tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts(7,4): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts(8,4): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. -tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts(8,7): error TS2381: A signature with an implementation cannot use a string literal type. -==== tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts (3 errors) ==== +==== tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts (2 errors) ==== function x3(a: number, cb: (x: number) => number); function x3(a: string, cb: (x: number) => number); function x3(a: any, cb: (x: number) => number) { @@ -15,6 +14,4 @@ tests/cases/compiler/specializedSignatureAsCallbackParameter1.ts(8,7): error TS2 !!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. x3(1, (x: 'hm') => 1); ~ -!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. - ~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. \ No newline at end of file +!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. \ No newline at end of file diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt index a9293a83a13..d698193d02b 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt @@ -1,91 +1,58 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(8,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(14,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(20,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(26,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(28,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(33,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(35,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(40,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(42,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(47,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(49,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(4,10): error TS2394: Overload signature is not compatible with function implementation. -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts (12 errors) ==== +==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts (1 errors) ==== // Specialized signatures must be a subtype of a non-specialized signature // All the below should be errors function foo(x: 'a'); ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. +!!! error TS2394: Overload signature is not compatible with function implementation. function foo(x: number) { } class C { foo(x: 'a'); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: number); foo(x: any) { } } class C2 { foo(x: 'a'); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); foo(x: any) { } } class C3 { foo(x: 'a'); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); foo(x: any) { } } interface I { (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: number); foo(x: 'a'); - ~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: number); } interface I2 { (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: T); foo(x: 'a'); - ~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); } interface I3 { (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: T); foo(x: 'a'); - ~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: T); } var a: { (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: number); foo(x: 'a'); - ~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: number); } diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.errors.txt b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.errors.txt deleted file mode 100644 index 788a8092ec7..00000000000 --- a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tests/cases/compiler/specializedSignatureOverloadReturnTypeWithIndexers.ts(15,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/compiler/specializedSignatureOverloadReturnTypeWithIndexers.ts (1 errors) ==== - interface A { - f(p: string): { [p: string]: string; }; - f(p: "spec"): { [p: string]: any; } // Should be ok - } - interface B { - f(p: string): { [p: number]: string; }; - f(p: "spec"): { [p: string]: any; } // Should be ok - } - interface C { - f(p: string): { [p: number]: string; }; - f(p: "spec"): { [p: number]: any; } // Should be ok - } - interface D { - f(p: string): { [p: string]: string; }; - f(p: "spec"): { [p: number]: any; } // Should be error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } \ No newline at end of file diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols new file mode 100644 index 00000000000..ea966cfda18 --- /dev/null +++ b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.symbols @@ -0,0 +1,53 @@ +=== tests/cases/compiler/specializedSignatureOverloadReturnTypeWithIndexers.ts === +interface A { +>A : Symbol(A, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 0)) + + f(p: string): { [p: string]: string; }; +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 21)) + + f(p: "spec"): { [p: string]: any; } // Should be ok +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 0, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 1, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 2, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 2, 21)) +} +interface B { +>B : Symbol(B, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 3, 1)) + + f(p: string): { [p: number]: string; }; +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 21)) + + f(p: "spec"): { [p: string]: any; } // Should be ok +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 4, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 5, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 6, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 6, 21)) +} +interface C { +>C : Symbol(C, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 7, 1)) + + f(p: string): { [p: number]: string; }; +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 21)) + + f(p: "spec"): { [p: number]: any; } // Should be ok +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 8, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 9, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 10, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 10, 21)) +} +interface D { +>D : Symbol(D, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 11, 1)) + + f(p: string): { [p: string]: string; }; +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 21)) + + f(p: "spec"): { [p: number]: any; } // Should be error +>f : Symbol(f, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 12, 13), Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 13, 43)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 14, 6)) +>p : Symbol(p, Decl(specializedSignatureOverloadReturnTypeWithIndexers.ts, 14, 21)) +} diff --git a/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types new file mode 100644 index 00000000000..1a7e9549327 --- /dev/null +++ b/tests/baselines/reference/specializedSignatureOverloadReturnTypeWithIndexers.types @@ -0,0 +1,53 @@ +=== tests/cases/compiler/specializedSignatureOverloadReturnTypeWithIndexers.ts === +interface A { +>A : A + + f(p: string): { [p: string]: string; }; +>f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: string]: any; }; } +>p : string +>p : string + + f(p: "spec"): { [p: string]: any; } // Should be ok +>f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: string]: any; }; } +>p : "spec" +>p : string +} +interface B { +>B : B + + f(p: string): { [p: number]: string; }; +>f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: string]: any; }; } +>p : string +>p : number + + f(p: "spec"): { [p: string]: any; } // Should be ok +>f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: string]: any; }; } +>p : "spec" +>p : string +} +interface C { +>C : C + + f(p: string): { [p: number]: string; }; +>f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: number]: any; }; } +>p : string +>p : number + + f(p: "spec"): { [p: number]: any; } // Should be ok +>f : { (p: string): { [p: number]: string; }; (p: "spec"): { [p: number]: any; }; } +>p : "spec" +>p : number +} +interface D { +>D : D + + f(p: string): { [p: string]: string; }; +>f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: number]: any; }; } +>p : string +>p : string + + f(p: "spec"): { [p: number]: any; } // Should be error +>f : { (p: string): { [p: string]: string; }; (p: "spec"): { [p: number]: any; }; } +>p : "spec" +>p : number +} diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt deleted file mode 100644 index af75273ade3..00000000000 --- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.errors.txt +++ /dev/null @@ -1,124 +0,0 @@ -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(22,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(26,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(30,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(34,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(38,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(77,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts(90,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts (7 errors) ==== - // string literal types are subtypes of string, any - - // ok - function f1(x: 'a'); - function f1(x: string); - function f1(x: string) { } - - // ok - function f2(x: 'a'); - function f2(x: any); - function f2(x: any) { } - - // errors - function f3(x: 'a'); - function f3(x: Object); - function f3(x: any) { } - - function f4(x: 'a'); - function f4(x: {}); - function f4(x: any) { } - - function f5(x: 'a'); - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f5(x: number); - function f5(x: any) { } - - function f6(x: 'a'); - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f6(x: boolean); - function f6(x: any) { } - - function f7(x: 'a'); - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f7(x: Date); - function f7(x: any) { } - - function f8(x: 'a'); - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f8(x: RegExp); - function f8(x: any) { } - - function f9(x: 'a'); - ~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f9(x: () => {}); - function f9(x: any) { } - - class C implements String { - toString(): string { return null; } - charAt(pos: number): string { return null; } - charCodeAt(index: number): number { return null; } - concat(...strings: string[]): string { return null; } - indexOf(searchString: string, position?: number): number { return null; } - lastIndexOf(searchString: string, position?: number): number { return null; } - localeCompare(that: string): number { return null; } - match(regexp: any): string[] { return null; } - replace(searchValue: any, replaceValue: any): string { return null; } - search(regexp: any): number { return null; } - slice(start?: number, end?: number): string { return null; } - split(separator: any, limit?: number): string[] { return null; } - substring(start: number, end?: number): string { return null; } - toLowerCase(): string { return null; } - toLocaleLowerCase(): string { return null; } - toUpperCase(): string { return null; } - toLocaleUpperCase(): string { return null; } - trim(): string { return null; } - length: number; - substr(from: number, length?: number): string { return null; } - valueOf(): string { return null; } - [index: number]: string; - } - - // BUG 831846 - function f10(x: 'a'); - function f10(x: C); - function f10(x: any) { } - - interface I extends String { - foo: string; - } - - // BUG 831846 - function f11(x: 'a'); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f11(x: I); - function f11(x: any) { } - - function f12(x: 'a'); - function f12(x: T); - function f12(x: any) { } - - function f13(x: 'a'); - function f13(x: T); - function f13(x: any) { } - - enum E { A } - function f14(x: 'a'); - ~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f14(x: E); - function f14(x: any) { } - - function f15(x: 'a'); - function f15(x: U); - function f15(x: any) { } - - function f16(x: 'a'); - function f16(x: U); - function f16(x: any) { } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols new file mode 100644 index 00000000000..1a49a6a6c47 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.symbols @@ -0,0 +1,343 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts === +// string literal types are subtypes of string, any + +// ok +function f1(x: 'a'); +>f1 : Symbol(f1, Decl(stringLiteralTypeIsSubtypeOfString.ts, 0, 0), Decl(stringLiteralTypeIsSubtypeOfString.ts, 3, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 4, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 3, 12)) + +function f1(x: string); +>f1 : Symbol(f1, Decl(stringLiteralTypeIsSubtypeOfString.ts, 0, 0), Decl(stringLiteralTypeIsSubtypeOfString.ts, 3, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 4, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 4, 12)) + +function f1(x: string) { } +>f1 : Symbol(f1, Decl(stringLiteralTypeIsSubtypeOfString.ts, 0, 0), Decl(stringLiteralTypeIsSubtypeOfString.ts, 3, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 4, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 5, 12)) + +// ok +function f2(x: 'a'); +>f2 : Symbol(f2, Decl(stringLiteralTypeIsSubtypeOfString.ts, 5, 26), Decl(stringLiteralTypeIsSubtypeOfString.ts, 8, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 9, 20)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 8, 12)) + +function f2(x: any); +>f2 : Symbol(f2, Decl(stringLiteralTypeIsSubtypeOfString.ts, 5, 26), Decl(stringLiteralTypeIsSubtypeOfString.ts, 8, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 9, 20)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 9, 12)) + +function f2(x: any) { } +>f2 : Symbol(f2, Decl(stringLiteralTypeIsSubtypeOfString.ts, 5, 26), Decl(stringLiteralTypeIsSubtypeOfString.ts, 8, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 9, 20)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 10, 12)) + +// errors +function f3(x: 'a'); +>f3 : Symbol(f3, Decl(stringLiteralTypeIsSubtypeOfString.ts, 10, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 13, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 14, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 13, 12)) + +function f3(x: Object); +>f3 : Symbol(f3, Decl(stringLiteralTypeIsSubtypeOfString.ts, 10, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 13, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 14, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 14, 12)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function f3(x: any) { } +>f3 : Symbol(f3, Decl(stringLiteralTypeIsSubtypeOfString.ts, 10, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 13, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 14, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 15, 12)) + +function f4(x: 'a'); +>f4 : Symbol(f4, Decl(stringLiteralTypeIsSubtypeOfString.ts, 15, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 17, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 18, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 17, 12)) + +function f4(x: {}); +>f4 : Symbol(f4, Decl(stringLiteralTypeIsSubtypeOfString.ts, 15, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 17, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 18, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 18, 12)) + +function f4(x: any) { } +>f4 : Symbol(f4, Decl(stringLiteralTypeIsSubtypeOfString.ts, 15, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 17, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 18, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 19, 12)) + +function f5(x: 'a'); +>f5 : Symbol(f5, Decl(stringLiteralTypeIsSubtypeOfString.ts, 19, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 21, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 22, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 21, 12)) + +function f5(x: number); +>f5 : Symbol(f5, Decl(stringLiteralTypeIsSubtypeOfString.ts, 19, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 21, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 22, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 22, 12)) + +function f5(x: any) { } +>f5 : Symbol(f5, Decl(stringLiteralTypeIsSubtypeOfString.ts, 19, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 21, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 22, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 23, 12)) + +function f6(x: 'a'); +>f6 : Symbol(f6, Decl(stringLiteralTypeIsSubtypeOfString.ts, 23, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 25, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 26, 24)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 25, 12)) + +function f6(x: boolean); +>f6 : Symbol(f6, Decl(stringLiteralTypeIsSubtypeOfString.ts, 23, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 25, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 26, 24)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 26, 12)) + +function f6(x: any) { } +>f6 : Symbol(f6, Decl(stringLiteralTypeIsSubtypeOfString.ts, 23, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 25, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 26, 24)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 12)) + +function f7(x: 'a'); +>f7 : Symbol(f7, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 21)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 12)) + +function f7(x: Date); +>f7 : Symbol(f7, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 21)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 12)) +>Date : Symbol(Date, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function f7(x: any) { } +>f7 : Symbol(f7, Decl(stringLiteralTypeIsSubtypeOfString.ts, 27, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 29, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 30, 21)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 31, 12)) + +function f8(x: 'a'); +>f8 : Symbol(f8, Decl(stringLiteralTypeIsSubtypeOfString.ts, 31, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 33, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 34, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 33, 12)) + +function f8(x: RegExp); +>f8 : Symbol(f8, Decl(stringLiteralTypeIsSubtypeOfString.ts, 31, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 33, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 34, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 34, 12)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + +function f8(x: any) { } +>f8 : Symbol(f8, Decl(stringLiteralTypeIsSubtypeOfString.ts, 31, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 33, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 34, 23)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 35, 12)) + +function f9(x: 'a'); +>f9 : Symbol(f9, Decl(stringLiteralTypeIsSubtypeOfString.ts, 35, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 37, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 38, 25)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 37, 12)) + +function f9(x: () => {}); +>f9 : Symbol(f9, Decl(stringLiteralTypeIsSubtypeOfString.ts, 35, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 37, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 38, 25)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 38, 12)) + +function f9(x: any) { } +>f9 : Symbol(f9, Decl(stringLiteralTypeIsSubtypeOfString.ts, 35, 23), Decl(stringLiteralTypeIsSubtypeOfString.ts, 37, 20), Decl(stringLiteralTypeIsSubtypeOfString.ts, 38, 25)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 39, 12)) + +class C implements String { +>C : Symbol(C, Decl(stringLiteralTypeIsSubtypeOfString.ts, 39, 23)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + toString(): string { return null; } +>toString : Symbol(toString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 41, 27)) + + charAt(pos: number): string { return null; } +>charAt : Symbol(charAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 42, 39)) +>pos : Symbol(pos, Decl(stringLiteralTypeIsSubtypeOfString.ts, 43, 11)) + + charCodeAt(index: number): number { return null; } +>charCodeAt : Symbol(charCodeAt, Decl(stringLiteralTypeIsSubtypeOfString.ts, 43, 48)) +>index : Symbol(index, Decl(stringLiteralTypeIsSubtypeOfString.ts, 44, 15)) + + concat(...strings: string[]): string { return null; } +>concat : Symbol(concat, Decl(stringLiteralTypeIsSubtypeOfString.ts, 44, 54)) +>strings : Symbol(strings, Decl(stringLiteralTypeIsSubtypeOfString.ts, 45, 11)) + + indexOf(searchString: string, position?: number): number { return null; } +>indexOf : Symbol(indexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 45, 57)) +>searchString : Symbol(searchString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 12)) +>position : Symbol(position, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 33)) + + lastIndexOf(searchString: string, position?: number): number { return null; } +>lastIndexOf : Symbol(lastIndexOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 46, 77)) +>searchString : Symbol(searchString, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 16)) +>position : Symbol(position, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 37)) + + localeCompare(that: string): number { return null; } +>localeCompare : Symbol(localeCompare, Decl(stringLiteralTypeIsSubtypeOfString.ts, 47, 81)) +>that : Symbol(that, Decl(stringLiteralTypeIsSubtypeOfString.ts, 48, 18)) + + match(regexp: any): string[] { return null; } +>match : Symbol(match, Decl(stringLiteralTypeIsSubtypeOfString.ts, 48, 56)) +>regexp : Symbol(regexp, Decl(stringLiteralTypeIsSubtypeOfString.ts, 49, 10)) + + replace(searchValue: any, replaceValue: any): string { return null; } +>replace : Symbol(replace, Decl(stringLiteralTypeIsSubtypeOfString.ts, 49, 49)) +>searchValue : Symbol(searchValue, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 12)) +>replaceValue : Symbol(replaceValue, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 29)) + + search(regexp: any): number { return null; } +>search : Symbol(search, Decl(stringLiteralTypeIsSubtypeOfString.ts, 50, 73)) +>regexp : Symbol(regexp, Decl(stringLiteralTypeIsSubtypeOfString.ts, 51, 11)) + + slice(start?: number, end?: number): string { return null; } +>slice : Symbol(slice, Decl(stringLiteralTypeIsSubtypeOfString.ts, 51, 48)) +>start : Symbol(start, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 10)) +>end : Symbol(end, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 25)) + + split(separator: any, limit?: number): string[] { return null; } +>split : Symbol(split, Decl(stringLiteralTypeIsSubtypeOfString.ts, 52, 64)) +>separator : Symbol(separator, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 10)) +>limit : Symbol(limit, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 25)) + + substring(start: number, end?: number): string { return null; } +>substring : Symbol(substring, Decl(stringLiteralTypeIsSubtypeOfString.ts, 53, 68)) +>start : Symbol(start, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 14)) +>end : Symbol(end, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 28)) + + toLowerCase(): string { return null; } +>toLowerCase : Symbol(toLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 54, 67)) + + toLocaleLowerCase(): string { return null; } +>toLocaleLowerCase : Symbol(toLocaleLowerCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 55, 42)) + + toUpperCase(): string { return null; } +>toUpperCase : Symbol(toUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 56, 48)) + + toLocaleUpperCase(): string { return null; } +>toLocaleUpperCase : Symbol(toLocaleUpperCase, Decl(stringLiteralTypeIsSubtypeOfString.ts, 57, 42)) + + trim(): string { return null; } +>trim : Symbol(trim, Decl(stringLiteralTypeIsSubtypeOfString.ts, 58, 48)) + + length: number; +>length : Symbol(length, Decl(stringLiteralTypeIsSubtypeOfString.ts, 59, 35)) + + substr(from: number, length?: number): string { return null; } +>substr : Symbol(substr, Decl(stringLiteralTypeIsSubtypeOfString.ts, 60, 19)) +>from : Symbol(from, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 11)) +>length : Symbol(length, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 24)) + + valueOf(): string { return null; } +>valueOf : Symbol(valueOf, Decl(stringLiteralTypeIsSubtypeOfString.ts, 61, 66)) + + [index: number]: string; +>index : Symbol(index, Decl(stringLiteralTypeIsSubtypeOfString.ts, 63, 5)) +} + +// BUG 831846 +function f10(x: 'a'); +>f10 : Symbol(f10, Decl(stringLiteralTypeIsSubtypeOfString.ts, 64, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 67, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 68, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 67, 13)) + +function f10(x: C); +>f10 : Symbol(f10, Decl(stringLiteralTypeIsSubtypeOfString.ts, 64, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 67, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 68, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 68, 13)) +>C : Symbol(C, Decl(stringLiteralTypeIsSubtypeOfString.ts, 39, 23)) + +function f10(x: any) { } +>f10 : Symbol(f10, Decl(stringLiteralTypeIsSubtypeOfString.ts, 64, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 67, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 68, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 69, 13)) + +interface I extends String { +>I : Symbol(I, Decl(stringLiteralTypeIsSubtypeOfString.ts, 69, 24)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + foo: string; +>foo : Symbol(foo, Decl(stringLiteralTypeIsSubtypeOfString.ts, 71, 28)) +} + +// BUG 831846 +function f11(x: 'a'); +>f11 : Symbol(f11, Decl(stringLiteralTypeIsSubtypeOfString.ts, 73, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 76, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 77, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 76, 13)) + +function f11(x: I); +>f11 : Symbol(f11, Decl(stringLiteralTypeIsSubtypeOfString.ts, 73, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 76, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 77, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 77, 13)) +>I : Symbol(I, Decl(stringLiteralTypeIsSubtypeOfString.ts, 69, 24)) + +function f11(x: any) { } +>f11 : Symbol(f11, Decl(stringLiteralTypeIsSubtypeOfString.ts, 73, 1), Decl(stringLiteralTypeIsSubtypeOfString.ts, 76, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 77, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 78, 13)) + +function f12(x: 'a'); +>f12 : Symbol(f12, Decl(stringLiteralTypeIsSubtypeOfString.ts, 78, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 80, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 22)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 80, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 80, 16)) + +function f12(x: T); +>f12 : Symbol(f12, Decl(stringLiteralTypeIsSubtypeOfString.ts, 78, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 80, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 22)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 16)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 13)) + +function f12(x: any) { } +>f12 : Symbol(f12, Decl(stringLiteralTypeIsSubtypeOfString.ts, 78, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 80, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 81, 22)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 16)) + +function f13(x: 'a'); +>f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 31)) + +function f13(x: T); +>f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 31)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 13)) + +function f13(x: any) { } +>f13 : Symbol(f13, Decl(stringLiteralTypeIsSubtypeOfString.ts, 82, 27), Decl(stringLiteralTypeIsSubtypeOfString.ts, 84, 39), Decl(stringLiteralTypeIsSubtypeOfString.ts, 85, 37)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 31)) + +enum E { A } +>E : Symbol(E, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 42)) +>A : Symbol(E.A, Decl(stringLiteralTypeIsSubtypeOfString.ts, 88, 8)) + +function f14(x: 'a'); +>f14 : Symbol(f14, Decl(stringLiteralTypeIsSubtypeOfString.ts, 88, 12), Decl(stringLiteralTypeIsSubtypeOfString.ts, 89, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 90, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 89, 13)) + +function f14(x: E); +>f14 : Symbol(f14, Decl(stringLiteralTypeIsSubtypeOfString.ts, 88, 12), Decl(stringLiteralTypeIsSubtypeOfString.ts, 89, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 90, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 90, 13)) +>E : Symbol(E, Decl(stringLiteralTypeIsSubtypeOfString.ts, 86, 42)) + +function f14(x: any) { } +>f14 : Symbol(f14, Decl(stringLiteralTypeIsSubtypeOfString.ts, 88, 12), Decl(stringLiteralTypeIsSubtypeOfString.ts, 89, 21), Decl(stringLiteralTypeIsSubtypeOfString.ts, 90, 19)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 91, 13)) + +function f15(x: 'a'); +>f15 : Symbol(f15, Decl(stringLiteralTypeIsSubtypeOfString.ts, 91, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 37), Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 35)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 13)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 15)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 29)) + +function f15(x: U); +>f15 : Symbol(f15, Decl(stringLiteralTypeIsSubtypeOfString.ts, 91, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 37), Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 35)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 13)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 15)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 29)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 15)) + +function f15(x: any) { } +>f15 : Symbol(f15, Decl(stringLiteralTypeIsSubtypeOfString.ts, 91, 24), Decl(stringLiteralTypeIsSubtypeOfString.ts, 93, 37), Decl(stringLiteralTypeIsSubtypeOfString.ts, 94, 35)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 13)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 15)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 29)) + +function f16(x: 'a'); +>f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 30)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 44)) + +function f16(x: U); +>f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 30)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 44)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 30)) + +function f16(x: any) { } +>f16 : Symbol(f16, Decl(stringLiteralTypeIsSubtypeOfString.ts, 95, 40), Decl(stringLiteralTypeIsSubtypeOfString.ts, 97, 52), Decl(stringLiteralTypeIsSubtypeOfString.ts, 98, 50)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 13)) +>String : Symbol(String, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>U : Symbol(U, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 30)) +>T : Symbol(T, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 13)) +>x : Symbol(x, Decl(stringLiteralTypeIsSubtypeOfString.ts, 99, 44)) + diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types new file mode 100644 index 00000000000..e5185476173 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types @@ -0,0 +1,363 @@ +=== tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/stringLiteralTypeIsSubtypeOfString.ts === +// string literal types are subtypes of string, any + +// ok +function f1(x: 'a'); +>f1 : { (x: "a"): any; (x: string): any; } +>x : "a" + +function f1(x: string); +>f1 : { (x: "a"): any; (x: string): any; } +>x : string + +function f1(x: string) { } +>f1 : { (x: "a"): any; (x: string): any; } +>x : string + +// ok +function f2(x: 'a'); +>f2 : { (x: "a"): any; (x: any): any; } +>x : "a" + +function f2(x: any); +>f2 : { (x: "a"): any; (x: any): any; } +>x : any + +function f2(x: any) { } +>f2 : { (x: "a"): any; (x: any): any; } +>x : any + +// errors +function f3(x: 'a'); +>f3 : { (x: "a"): any; (x: Object): any; } +>x : "a" + +function f3(x: Object); +>f3 : { (x: "a"): any; (x: Object): any; } +>x : Object +>Object : Object + +function f3(x: any) { } +>f3 : { (x: "a"): any; (x: Object): any; } +>x : any + +function f4(x: 'a'); +>f4 : { (x: "a"): any; (x: {}): any; } +>x : "a" + +function f4(x: {}); +>f4 : { (x: "a"): any; (x: {}): any; } +>x : {} + +function f4(x: any) { } +>f4 : { (x: "a"): any; (x: {}): any; } +>x : any + +function f5(x: 'a'); +>f5 : { (x: "a"): any; (x: number): any; } +>x : "a" + +function f5(x: number); +>f5 : { (x: "a"): any; (x: number): any; } +>x : number + +function f5(x: any) { } +>f5 : { (x: "a"): any; (x: number): any; } +>x : any + +function f6(x: 'a'); +>f6 : { (x: "a"): any; (x: boolean): any; } +>x : "a" + +function f6(x: boolean); +>f6 : { (x: "a"): any; (x: boolean): any; } +>x : boolean + +function f6(x: any) { } +>f6 : { (x: "a"): any; (x: boolean): any; } +>x : any + +function f7(x: 'a'); +>f7 : { (x: "a"): any; (x: Date): any; } +>x : "a" + +function f7(x: Date); +>f7 : { (x: "a"): any; (x: Date): any; } +>x : Date +>Date : Date + +function f7(x: any) { } +>f7 : { (x: "a"): any; (x: Date): any; } +>x : any + +function f8(x: 'a'); +>f8 : { (x: "a"): any; (x: RegExp): any; } +>x : "a" + +function f8(x: RegExp); +>f8 : { (x: "a"): any; (x: RegExp): any; } +>x : RegExp +>RegExp : RegExp + +function f8(x: any) { } +>f8 : { (x: "a"): any; (x: RegExp): any; } +>x : any + +function f9(x: 'a'); +>f9 : { (x: "a"): any; (x: () => {}): any; } +>x : "a" + +function f9(x: () => {}); +>f9 : { (x: "a"): any; (x: () => {}): any; } +>x : () => {} + +function f9(x: any) { } +>f9 : { (x: "a"): any; (x: () => {}): any; } +>x : any + +class C implements String { +>C : C +>String : String + + toString(): string { return null; } +>toString : () => string +>null : null + + charAt(pos: number): string { return null; } +>charAt : (pos: number) => string +>pos : number +>null : null + + charCodeAt(index: number): number { return null; } +>charCodeAt : (index: number) => number +>index : number +>null : null + + concat(...strings: string[]): string { return null; } +>concat : (...strings: string[]) => string +>strings : string[] +>null : null + + indexOf(searchString: string, position?: number): number { return null; } +>indexOf : (searchString: string, position?: number) => number +>searchString : string +>position : number +>null : null + + lastIndexOf(searchString: string, position?: number): number { return null; } +>lastIndexOf : (searchString: string, position?: number) => number +>searchString : string +>position : number +>null : null + + localeCompare(that: string): number { return null; } +>localeCompare : (that: string) => number +>that : string +>null : null + + match(regexp: any): string[] { return null; } +>match : (regexp: any) => string[] +>regexp : any +>null : null + + replace(searchValue: any, replaceValue: any): string { return null; } +>replace : (searchValue: any, replaceValue: any) => string +>searchValue : any +>replaceValue : any +>null : null + + search(regexp: any): number { return null; } +>search : (regexp: any) => number +>regexp : any +>null : null + + slice(start?: number, end?: number): string { return null; } +>slice : (start?: number, end?: number) => string +>start : number +>end : number +>null : null + + split(separator: any, limit?: number): string[] { return null; } +>split : (separator: any, limit?: number) => string[] +>separator : any +>limit : number +>null : null + + substring(start: number, end?: number): string { return null; } +>substring : (start: number, end?: number) => string +>start : number +>end : number +>null : null + + toLowerCase(): string { return null; } +>toLowerCase : () => string +>null : null + + toLocaleLowerCase(): string { return null; } +>toLocaleLowerCase : () => string +>null : null + + toUpperCase(): string { return null; } +>toUpperCase : () => string +>null : null + + toLocaleUpperCase(): string { return null; } +>toLocaleUpperCase : () => string +>null : null + + trim(): string { return null; } +>trim : () => string +>null : null + + length: number; +>length : number + + substr(from: number, length?: number): string { return null; } +>substr : (from: number, length?: number) => string +>from : number +>length : number +>null : null + + valueOf(): string { return null; } +>valueOf : () => string +>null : null + + [index: number]: string; +>index : number +} + +// BUG 831846 +function f10(x: 'a'); +>f10 : { (x: "a"): any; (x: C): any; } +>x : "a" + +function f10(x: C); +>f10 : { (x: "a"): any; (x: C): any; } +>x : C +>C : C + +function f10(x: any) { } +>f10 : { (x: "a"): any; (x: C): any; } +>x : any + +interface I extends String { +>I : I +>String : String + + foo: string; +>foo : string +} + +// BUG 831846 +function f11(x: 'a'); +>f11 : { (x: "a"): any; (x: I): any; } +>x : "a" + +function f11(x: I); +>f11 : { (x: "a"): any; (x: I): any; } +>x : I +>I : I + +function f11(x: any) { } +>f11 : { (x: "a"): any; (x: I): any; } +>x : any + +function f12(x: 'a'); +>f12 : { (x: "a"): any; (x: T): any; } +>T : T +>x : "a" + +function f12(x: T); +>f12 : { (x: "a"): any; (x: T): any; } +>T : T +>x : T +>T : T + +function f12(x: any) { } +>f12 : { (x: "a"): any; (x: T): any; } +>T : T +>x : any + +function f13(x: 'a'); +>f13 : { (x: "a"): any; (x: T): any; } +>T : T +>String : String +>x : "a" + +function f13(x: T); +>f13 : { (x: "a"): any; (x: T): any; } +>T : T +>String : String +>x : T +>T : T + +function f13(x: any) { } +>f13 : { (x: "a"): any; (x: T): any; } +>T : T +>String : String +>x : any + +enum E { A } +>E : E +>A : E + +function f14(x: 'a'); +>f14 : { (x: "a"): any; (x: E): any; } +>x : "a" + +function f14(x: E); +>f14 : { (x: "a"): any; (x: E): any; } +>x : E +>E : E + +function f14(x: any) { } +>f14 : { (x: "a"): any; (x: E): any; } +>x : any + +function f15(x: 'a'); +>f15 : { (x: "a"): any; (x: U): any; } +>T : T +>U : U +>T : T +>x : "a" + +function f15(x: U); +>f15 : { (x: "a"): any; (x: U): any; } +>T : T +>U : U +>T : T +>x : U +>U : U + +function f15(x: any) { } +>f15 : { (x: "a"): any; (x: U): any; } +>T : T +>U : U +>T : T +>x : any + +function f16(x: 'a'); +>f16 : { (x: "a"): any; (x: U): any; } +>T : T +>String : String +>U : U +>T : T +>x : "a" + +function f16(x: U); +>f16 : { (x: "a"): any; (x: U): any; } +>T : T +>String : String +>U : U +>T : T +>x : U +>U : U + +function f16(x: any) { } +>f16 : { (x: "a"): any; (x: U): any; } +>T : T +>String : String +>U : U +>T : T +>x : any + diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt b/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt deleted file mode 100644 index 077113632d0..00000000000 --- a/tests/baselines/reference/stringLiteralTypesAsTags02.errors.txt +++ /dev/null @@ -1,50 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts(18,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts(19,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts (2 errors) ==== - - type Kind = "A" | "B" - - interface Entity { - kind: Kind; - } - - interface A extends Entity { - kind: "A"; - a: number; - } - - interface B extends Entity { - kind: "B"; - b: string; - } - - function hasKind(entity: Entity, kind: "A"): entity is A; - ~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function hasKind(entity: Entity, kind: "B"): entity is B; - ~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function hasKind(entity: Entity, kind: Kind): entity is (A | B) { - return entity.kind === kind; - } - - let x: A = { - kind: "A", - a: 100, - } - - if (hasKind(x, "A")) { - let a = x; - } - else { - let b = x; - } - - if (!hasKind(x, "B")) { - let c = x; - } - else { - let d = x; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.symbols b/tests/baselines/reference/stringLiteralTypesAsTags02.symbols new file mode 100644 index 00000000000..61d50230993 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags02.symbols @@ -0,0 +1,106 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts === + +type Kind = "A" | "B" +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags02.ts, 0, 0)) + +interface Entity { +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) + + kind: Kind; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 3, 18)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags02.ts, 0, 0)) +} + +interface A extends Entity { +>A : Symbol(A, Decl(stringLiteralTypesAsTags02.ts, 5, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) + + kind: "A"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 7, 28)) + + a: number; +>a : Symbol(a, Decl(stringLiteralTypesAsTags02.ts, 8, 14)) +} + +interface B extends Entity { +>B : Symbol(B, Decl(stringLiteralTypesAsTags02.ts, 10, 1)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) + + kind: "B"; +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 12, 28)) + + b: string; +>b : Symbol(b, Decl(stringLiteralTypesAsTags02.ts, 13, 14)) +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags02.ts, 15, 1), Decl(stringLiteralTypesAsTags02.ts, 17, 57), Decl(stringLiteralTypesAsTags02.ts, 18, 57)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 17, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 17, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 17, 17)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags02.ts, 5, 1)) + +function hasKind(entity: Entity, kind: "B"): entity is B; +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags02.ts, 15, 1), Decl(stringLiteralTypesAsTags02.ts, 17, 57), Decl(stringLiteralTypesAsTags02.ts, 18, 57)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 18, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 18, 32)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 18, 17)) +>B : Symbol(B, Decl(stringLiteralTypesAsTags02.ts, 10, 1)) + +function hasKind(entity: Entity, kind: Kind): entity is (A | B) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags02.ts, 15, 1), Decl(stringLiteralTypesAsTags02.ts, 17, 57), Decl(stringLiteralTypesAsTags02.ts, 18, 57)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 19, 17)) +>Entity : Symbol(Entity, Decl(stringLiteralTypesAsTags02.ts, 1, 21)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 19, 32)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesAsTags02.ts, 0, 0)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 19, 17)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags02.ts, 5, 1)) +>B : Symbol(B, Decl(stringLiteralTypesAsTags02.ts, 10, 1)) + + return entity.kind === kind; +>entity.kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags02.ts, 3, 18)) +>entity : Symbol(entity, Decl(stringLiteralTypesAsTags02.ts, 19, 17)) +>kind : Symbol(Entity.kind, Decl(stringLiteralTypesAsTags02.ts, 3, 18)) +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 19, 32)) +} + +let x: A = { +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) +>A : Symbol(A, Decl(stringLiteralTypesAsTags02.ts, 5, 1)) + + kind: "A", +>kind : Symbol(kind, Decl(stringLiteralTypesAsTags02.ts, 23, 12)) + + a: 100, +>a : Symbol(a, Decl(stringLiteralTypesAsTags02.ts, 24, 14)) +} + +if (hasKind(x, "A")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags02.ts, 15, 1), Decl(stringLiteralTypesAsTags02.ts, 17, 57), Decl(stringLiteralTypesAsTags02.ts, 18, 57)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesAsTags02.ts, 29, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) +} +else { + let b = x; +>b : Symbol(b, Decl(stringLiteralTypesAsTags02.ts, 32, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) +} + +if (!hasKind(x, "B")) { +>hasKind : Symbol(hasKind, Decl(stringLiteralTypesAsTags02.ts, 15, 1), Decl(stringLiteralTypesAsTags02.ts, 17, 57), Decl(stringLiteralTypesAsTags02.ts, 18, 57)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) + + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesAsTags02.ts, 36, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) +} +else { + let d = x; +>d : Symbol(d, Decl(stringLiteralTypesAsTags02.ts, 39, 7)) +>x : Symbol(x, Decl(stringLiteralTypesAsTags02.ts, 23, 3)) +} diff --git a/tests/baselines/reference/stringLiteralTypesAsTags02.types b/tests/baselines/reference/stringLiteralTypesAsTags02.types new file mode 100644 index 00000000000..0b8ea0faf67 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesAsTags02.types @@ -0,0 +1,115 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTags02.ts === + +type Kind = "A" | "B" +>Kind : "A" | "B" + +interface Entity { +>Entity : Entity + + kind: Kind; +>kind : "A" | "B" +>Kind : "A" | "B" +} + +interface A extends Entity { +>A : A +>Entity : Entity + + kind: "A"; +>kind : "A" + + a: number; +>a : number +} + +interface B extends Entity { +>B : B +>Entity : Entity + + kind: "B"; +>kind : "B" + + b: string; +>b : string +} + +function hasKind(entity: Entity, kind: "A"): entity is A; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "A" +>entity : any +>A : A + +function hasKind(entity: Entity, kind: "B"): entity is B; +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "B" +>entity : any +>B : B + +function hasKind(entity: Entity, kind: Kind): entity is (A | B) { +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>entity : Entity +>Entity : Entity +>kind : "A" | "B" +>Kind : "A" | "B" +>entity : any +>A : A +>B : B + + return entity.kind === kind; +>entity.kind === kind : boolean +>entity.kind : "A" | "B" +>entity : Entity +>kind : "A" | "B" +>kind : "A" | "B" +} + +let x: A = { +>x : A +>A : A +>{ kind: "A", a: 100,} : { kind: "A"; a: number; } + + kind: "A", +>kind : "A" +>"A" : "A" + + a: 100, +>a : number +>100 : number +} + +if (hasKind(x, "A")) { +>hasKind(x, "A") : entity is A +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>x : A +>"A" : "A" + + let a = x; +>a : A +>x : A +} +else { + let b = x; +>b : A +>x : A +} + +if (!hasKind(x, "B")) { +>!hasKind(x, "B") : boolean +>hasKind(x, "B") : entity is B +>hasKind : { (entity: Entity, kind: "A"): entity is A; (entity: Entity, kind: "B"): entity is B; } +>x : A +>"B" : "B" + + let c = x; +>c : A +>x : A +} +else { + let d = x; +>d : A +>x : A +} diff --git a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js index 558f6bdf4c2..4f49d326ec0 100644 --- a/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js +++ b/tests/baselines/reference/stringLiteralTypesAsTypeParameterConstraint01.js @@ -43,26 +43,3 @@ declare let g: (x: "foo") => "foo"; declare let gResult: "foo"; declare let h: (x: "foo" | "bar") => "foo" | "bar"; declare let hResult: "foo" | "bar"; - - -//// [DtsFileErrors] - - -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(3,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts(5,16): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesAsTypeParameterConstraint01.d.ts (2 errors) ==== - declare function foo(f: (x: T) => T): (x: T) => T; - declare function bar(f: (x: T) => T): (x: T) => T; - declare let f: (x: "foo") => "foo"; - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - declare let fResult: "foo"; - declare let g: (x: "foo") => "foo"; - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - declare let gResult: "foo"; - declare let h: (x: "foo" | "bar") => "foo" | "bar"; - declare let hResult: "foo" | "bar"; - \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt deleted file mode 100644 index 2bff320197a..00000000000 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.errors.txt +++ /dev/null @@ -1,62 +0,0 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(4,18): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(5,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(8,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(12,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(13,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(17,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(18,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(22,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(23,17): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts(24,8): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts (11 errors) ==== - // String literal types are only valid in overload signatures - - function foo(x: 'hi') { } - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - var f = function foo(x: 'hi') { } - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - var f2 = (x: 'hi', y: 'hi') => { } - ~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - - class C { - foo(x: 'hi') { } - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - } - - interface I { - (x: 'hi'); - ~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - foo(x: 'hi', y: 'hi'); - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - - var a: { - (x: 'hi'); - ~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - foo(x: 'hi'); - ~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - } - - var b = { - foo(x: 'hi') { }, - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - a: function foo(x: 'hi', y: 'hi') { }, - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - b: (x: 'hi') => { } - ~~~~~~~~~~~~~~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - } - \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols new file mode 100644 index 00000000000..6f764b5c271 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.symbols @@ -0,0 +1,66 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts === +// String literal types are only valid in overload signatures + +function foo(x: 'hi') { } +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 0, 0)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 2, 13)) + +var f = function foo(x: 'hi') { } +>f : Symbol(f, Decl(stringLiteralTypesInImplementationSignatures.ts, 3, 3)) +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 3, 7)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 3, 21)) + +var f2 = (x: 'hi', y: 'hi') => { } +>f2 : Symbol(f2, Decl(stringLiteralTypesInImplementationSignatures.ts, 4, 3)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 4, 10)) +>y : Symbol(y, Decl(stringLiteralTypesInImplementationSignatures.ts, 4, 18)) + +class C { +>C : Symbol(C, Decl(stringLiteralTypesInImplementationSignatures.ts, 4, 34)) + + foo(x: 'hi') { } +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 6, 9)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 7, 8)) +} + +interface I { +>I : Symbol(I, Decl(stringLiteralTypesInImplementationSignatures.ts, 8, 1)) + + (x: 'hi'); +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 11, 5)) + + foo(x: 'hi', y: 'hi'); +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 11, 14)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 12, 8)) +>y : Symbol(y, Decl(stringLiteralTypesInImplementationSignatures.ts, 12, 16)) +} + +var a: { +>a : Symbol(a, Decl(stringLiteralTypesInImplementationSignatures.ts, 15, 3)) + + (x: 'hi'); +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 16, 5)) + + foo(x: 'hi'); +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 16, 14)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 17, 8)) +} + +var b = { +>b : Symbol(b, Decl(stringLiteralTypesInImplementationSignatures.ts, 20, 3)) + + foo(x: 'hi') { }, +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 20, 9)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 21, 8)) + + a: function foo(x: 'hi', y: 'hi') { }, +>a : Symbol(a, Decl(stringLiteralTypesInImplementationSignatures.ts, 21, 21)) +>foo : Symbol(foo, Decl(stringLiteralTypesInImplementationSignatures.ts, 22, 6)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 22, 20)) +>y : Symbol(y, Decl(stringLiteralTypesInImplementationSignatures.ts, 22, 28)) + + b: (x: 'hi') => { } +>b : Symbol(b, Decl(stringLiteralTypesInImplementationSignatures.ts, 22, 42)) +>x : Symbol(x, Decl(stringLiteralTypesInImplementationSignatures.ts, 23, 8)) +} + diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types new file mode 100644 index 00000000000..356d19fce3a --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.types @@ -0,0 +1,71 @@ +=== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.ts === +// String literal types are only valid in overload signatures + +function foo(x: 'hi') { } +>foo : (x: "hi") => void +>x : "hi" + +var f = function foo(x: 'hi') { } +>f : (x: "hi") => void +>function foo(x: 'hi') { } : (x: "hi") => void +>foo : (x: "hi") => void +>x : "hi" + +var f2 = (x: 'hi', y: 'hi') => { } +>f2 : (x: "hi", y: "hi") => void +>(x: 'hi', y: 'hi') => { } : (x: "hi", y: "hi") => void +>x : "hi" +>y : "hi" + +class C { +>C : C + + foo(x: 'hi') { } +>foo : (x: "hi") => void +>x : "hi" +} + +interface I { +>I : I + + (x: 'hi'); +>x : "hi" + + foo(x: 'hi', y: 'hi'); +>foo : (x: "hi", y: "hi") => any +>x : "hi" +>y : "hi" +} + +var a: { +>a : { (x: "hi"): any; foo(x: "hi"): any; } + + (x: 'hi'); +>x : "hi" + + foo(x: 'hi'); +>foo : (x: "hi") => any +>x : "hi" +} + +var b = { +>b : { foo(x: "hi"): void; a: (x: "hi", y: "hi") => void; b: (x: "hi") => void; } +>{ foo(x: 'hi') { }, a: function foo(x: 'hi', y: 'hi') { }, b: (x: 'hi') => { }} : { foo(x: "hi"): void; a: (x: "hi", y: "hi") => void; b: (x: "hi") => void; } + + foo(x: 'hi') { }, +>foo : (x: "hi") => void +>x : "hi" + + a: function foo(x: 'hi', y: 'hi') { }, +>a : (x: "hi", y: "hi") => void +>function foo(x: 'hi', y: 'hi') { } : (x: "hi", y: "hi") => void +>foo : (x: "hi", y: "hi") => void +>x : "hi" +>y : "hi" + + b: (x: 'hi') => { } +>b : (x: "hi") => void +>(x: 'hi') => { } : (x: "hi") => void +>x : "hi" +} + diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt index 4f94bad7441..b0ab5010ea5 100644 --- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.errors.txt @@ -1,74 +1,38 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(4,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(8,5): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(12,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(13,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(14,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(15,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(19,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(20,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(21,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(22,5): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(26,5): error TS2300: Duplicate identifier 'foo'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(26,5): error TS2381: A signature with an implementation cannot use a string literal type. tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(27,5): error TS2300: Duplicate identifier 'foo'. -tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts(27,5): error TS2381: A signature with an implementation cannot use a string literal type. -==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts (14 errors) ==== +==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures2.ts (2 errors) ==== // String literal types are only valid in overload signatures function foo(x: any); function foo(x: 'hi') { } - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. class C { foo(x: string); foo(x: 'hi') { } - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. } interface I { (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: 'hi'); - ~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: 'a', y: 'a'); - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: 'hi', y: 'hi'); - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. } var a: { (x: 'hi'); - ~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. (x: 'a'); - ~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: 'hi'); - ~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. foo(x: 'a'); - ~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. } var b = { foo(x: 'hi') { }, ~~~ !!! error TS2300: Duplicate identifier 'foo'. - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. foo(x: 'a') { }, ~~~ !!! error TS2300: Duplicate identifier 'foo'. - ~~~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt deleted file mode 100644 index 56fa60a795c..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt +++ /dev/null @@ -1,25 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts (2 errors) ==== - - function f(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f(x: string): number { - return 0; - } - - function g(x: "bar"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function g(x: string): number { - return 0; - } - - let a = f; - let b = g; - - a = b; - b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols new file mode 100644 index 00000000000..0704bbfb891 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts === + +function f(x: "foo"): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 11)) + +function f(x: string): number { +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 2, 11)) + + return 0; +} + +function g(x: "bar"): number; +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 11)) + +function g(x: string): number { +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 7, 11)) + + return 0; +} + +let a = f; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) + +let b = g; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) + +a = b; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) + +b = a; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types new file mode 100644 index 00000000000..021c209fdb5 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types @@ -0,0 +1,44 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts === + +function f(x: "foo"): number; +>f : (x: "foo") => number +>x : "foo" + +function f(x: string): number { +>f : (x: "foo") => number +>x : string + + return 0; +>0 : number +} + +function g(x: "bar"): number; +>g : (x: "bar") => number +>x : "bar" + +function g(x: string): number { +>g : (x: "bar") => number +>x : string + + return 0; +>0 : number +} + +let a = f; +>a : (x: "foo") => number +>f : (x: "foo") => number + +let b = g; +>b : (x: "bar") => number +>g : (x: "bar") => number + +a = b; +>a = b : (x: "bar") => number +>a : (x: "foo") => number +>b : (x: "bar") => number + +b = a; +>b = a : (x: "foo") => number +>b : (x: "bar") => number +>a : (x: "foo") => number + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt deleted file mode 100644 index 47862617afa..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(8,10): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts (4 errors) ==== - - function f(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f(x: "foo"): number { - ~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - return 0; - } - - function g(x: "bar"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function g(x: "bar"): number { - ~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - return 0; - } - - let a = f; - let b = g; - - a = b; - b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols new file mode 100644 index 00000000000..5554b3e8768 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts === + +function f(x: "foo"): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 11)) + +function f(x: "foo"): number { +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 2, 11)) + + return 0; +} + +function g(x: "bar"): number; +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 11)) + +function g(x: "bar"): number { +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 7, 11)) + + return 0; +} + +let a = f; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) + +let b = g; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) + +a = b; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) + +b = a; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types new file mode 100644 index 00000000000..5e272a38326 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types @@ -0,0 +1,44 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts === + +function f(x: "foo"): number; +>f : (x: "foo") => number +>x : "foo" + +function f(x: "foo"): number { +>f : (x: "foo") => number +>x : "foo" + + return 0; +>0 : number +} + +function g(x: "bar"): number; +>g : (x: "bar") => number +>x : "bar" + +function g(x: "bar"): number { +>g : (x: "bar") => number +>x : "bar" + + return 0; +>0 : number +} + +let a = f; +>a : (x: "foo") => number +>f : (x: "foo") => number + +let b = g; +>b : (x: "bar") => number +>g : (x: "bar") => number + +a = b; +>a = b : (x: "bar") => number +>a : (x: "foo") => number +>b : (x: "bar") => number + +b = a; +>b = a : (x: "foo") => number +>b : (x: "bar") => number +>a : (x: "foo") => number + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt deleted file mode 100644 index 1e58fc9028f..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.errors.txt +++ /dev/null @@ -1,25 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts (2 errors) ==== - - function f(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f(x: string): number { - return 0; - } - - function g(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function g(x: string): number { - return 0; - } - - let a = f; - let b = g; - - a = b; - b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.symbols new file mode 100644 index 00000000000..361f9e9db4d --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.symbols @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts === + +function f(x: "foo"): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability03.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability03.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability03.ts, 1, 11)) + +function f(x: string): number { +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability03.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability03.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability03.ts, 2, 11)) + + return 0; +} + +function g(x: "foo"): number; +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability03.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability03.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability03.ts, 6, 11)) + +function g(x: string): number { +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability03.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability03.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability03.ts, 7, 11)) + + return 0; +} + +let a = f; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability03.ts, 11, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability03.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability03.ts, 1, 29)) + +let b = g; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability03.ts, 12, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability03.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability03.ts, 6, 29)) + +a = b; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability03.ts, 11, 3)) +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability03.ts, 12, 3)) + +b = a; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability03.ts, 12, 3)) +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability03.ts, 11, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types new file mode 100644 index 00000000000..8150eedd7b8 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability03.types @@ -0,0 +1,44 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability03.ts === + +function f(x: "foo"): number; +>f : (x: "foo") => number +>x : "foo" + +function f(x: string): number { +>f : (x: "foo") => number +>x : string + + return 0; +>0 : number +} + +function g(x: "foo"): number; +>g : (x: "foo") => number +>x : "foo" + +function g(x: string): number { +>g : (x: "foo") => number +>x : string + + return 0; +>0 : number +} + +let a = f; +>a : (x: "foo") => number +>f : (x: "foo") => number + +let b = g; +>b : (x: "foo") => number +>g : (x: "foo") => number + +a = b; +>a = b : (x: "foo") => number +>a : (x: "foo") => number +>b : (x: "foo") => number + +b = a; +>b = a : (x: "foo") => number +>b : (x: "foo") => number +>a : (x: "foo") => number + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt deleted file mode 100644 index 1b179b95fe6..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(2,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(3,10): error TS2381: A signature with an implementation cannot use a string literal type. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(7,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts(8,10): error TS2381: A signature with an implementation cannot use a string literal type. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts (4 errors) ==== - - function f(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function f(x: "foo"): number { - ~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - return 0; - } - - function g(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function g(x: "foo"): number { - ~ -!!! error TS2381: A signature with an implementation cannot use a string literal type. - return 0; - } - - let a = f; - let b = g; - - a = b; - b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.symbols new file mode 100644 index 00000000000..75f7d12c25f --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.symbols @@ -0,0 +1,40 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts === + +function f(x: "foo"): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability04.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability04.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability04.ts, 1, 11)) + +function f(x: "foo"): number { +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability04.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability04.ts, 1, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability04.ts, 2, 11)) + + return 0; +} + +function g(x: "foo"): number; +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability04.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability04.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability04.ts, 6, 11)) + +function g(x: "foo"): number { +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability04.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability04.ts, 6, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability04.ts, 7, 11)) + + return 0; +} + +let a = f; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability04.ts, 11, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability04.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability04.ts, 1, 29)) + +let b = g; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability04.ts, 12, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability04.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability04.ts, 6, 29)) + +a = b; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability04.ts, 11, 3)) +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability04.ts, 12, 3)) + +b = a; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability04.ts, 12, 3)) +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability04.ts, 11, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types new file mode 100644 index 00000000000..7187e276fe4 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability04.types @@ -0,0 +1,44 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability04.ts === + +function f(x: "foo"): number; +>f : (x: "foo") => number +>x : "foo" + +function f(x: "foo"): number { +>f : (x: "foo") => number +>x : "foo" + + return 0; +>0 : number +} + +function g(x: "foo"): number; +>g : (x: "foo") => number +>x : "foo" + +function g(x: "foo"): number { +>g : (x: "foo") => number +>x : "foo" + + return 0; +>0 : number +} + +let a = f; +>a : (x: "foo") => number +>f : (x: "foo") => number + +let b = g; +>b : (x: "foo") => number +>g : (x: "foo") => number + +a = b; +>a = b : (x: "foo") => number +>a : (x: "foo") => number +>b : (x: "foo") => number + +b = a; +>b = a : (x: "foo") => number +>b : (x: "foo") => number +>a : (x: "foo") => number + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt index 0830f08fb80..b08f98564f8 100644 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt @@ -1,9 +1,8 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts(8,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '{ (x: "foo"): number; (x: string): number; }'. Type '(x: "foo") => number' provides no match for the signature '(x: string): number' -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts (2 errors) ==== +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts (1 errors) ==== function f(x: "foo"): number; function f(x: string): number; @@ -12,8 +11,6 @@ tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignabil } function g(x: "foo"): number; - ~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. function g(x: string): number { return 0; } diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt b/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt deleted file mode 100644 index b888c3ca77e..00000000000 --- a/tests/baselines/reference/stringLiteralTypesTypePredicates01.errors.txt +++ /dev/null @@ -1,33 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(4,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. -tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts(5,10): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts (2 errors) ==== - - type Kind = "A" | "B" - - function kindIs(kind: Kind, is: "A"): kind is "A"; - ~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function kindIs(kind: Kind, is: "B"): kind is "B"; - ~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. - function kindIs(kind: Kind, is: Kind): boolean { - return kind === is; - } - - var x: Kind = "A"; - - if (kindIs(x, "A")) { - let a = x; - } - else { - let b = x; - } - - if (!kindIs(x, "B")) { - let c = x; - } - else { - let d = x; - } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.symbols b/tests/baselines/reference/stringLiteralTypesTypePredicates01.symbols new file mode 100644 index 00000000000..6b18cab7432 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.symbols @@ -0,0 +1,62 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts === + +type Kind = "A" | "B" +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) + +function kindIs(kind: Kind, is: "A"): kind is "A"; +>kindIs : Symbol(kindIs, Decl(stringLiteralTypesTypePredicates01.ts, 1, 21), Decl(stringLiteralTypesTypePredicates01.ts, 3, 50), Decl(stringLiteralTypesTypePredicates01.ts, 4, 50)) +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 3, 16)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) +>is : Symbol(is, Decl(stringLiteralTypesTypePredicates01.ts, 3, 27)) +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 3, 16)) + +function kindIs(kind: Kind, is: "B"): kind is "B"; +>kindIs : Symbol(kindIs, Decl(stringLiteralTypesTypePredicates01.ts, 1, 21), Decl(stringLiteralTypesTypePredicates01.ts, 3, 50), Decl(stringLiteralTypesTypePredicates01.ts, 4, 50)) +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 4, 16)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) +>is : Symbol(is, Decl(stringLiteralTypesTypePredicates01.ts, 4, 27)) +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 4, 16)) + +function kindIs(kind: Kind, is: Kind): boolean { +>kindIs : Symbol(kindIs, Decl(stringLiteralTypesTypePredicates01.ts, 1, 21), Decl(stringLiteralTypesTypePredicates01.ts, 3, 50), Decl(stringLiteralTypesTypePredicates01.ts, 4, 50)) +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 5, 16)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) +>is : Symbol(is, Decl(stringLiteralTypesTypePredicates01.ts, 5, 27)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) + + return kind === is; +>kind : Symbol(kind, Decl(stringLiteralTypesTypePredicates01.ts, 5, 16)) +>is : Symbol(is, Decl(stringLiteralTypesTypePredicates01.ts, 5, 27)) +} + +var x: Kind = "A"; +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) +>Kind : Symbol(Kind, Decl(stringLiteralTypesTypePredicates01.ts, 0, 0)) + +if (kindIs(x, "A")) { +>kindIs : Symbol(kindIs, Decl(stringLiteralTypesTypePredicates01.ts, 1, 21), Decl(stringLiteralTypesTypePredicates01.ts, 3, 50), Decl(stringLiteralTypesTypePredicates01.ts, 4, 50)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) + + let a = x; +>a : Symbol(a, Decl(stringLiteralTypesTypePredicates01.ts, 12, 7)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) +} +else { + let b = x; +>b : Symbol(b, Decl(stringLiteralTypesTypePredicates01.ts, 15, 7)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) +} + +if (!kindIs(x, "B")) { +>kindIs : Symbol(kindIs, Decl(stringLiteralTypesTypePredicates01.ts, 1, 21), Decl(stringLiteralTypesTypePredicates01.ts, 3, 50), Decl(stringLiteralTypesTypePredicates01.ts, 4, 50)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) + + let c = x; +>c : Symbol(c, Decl(stringLiteralTypesTypePredicates01.ts, 19, 7)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) +} +else { + let d = x; +>d : Symbol(d, Decl(stringLiteralTypesTypePredicates01.ts, 22, 7)) +>x : Symbol(x, Decl(stringLiteralTypesTypePredicates01.ts, 9, 3)) +} diff --git a/tests/baselines/reference/stringLiteralTypesTypePredicates01.types b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types new file mode 100644 index 00000000000..43c8271b76b --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesTypePredicates01.types @@ -0,0 +1,69 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesTypePredicates01.ts === + +type Kind = "A" | "B" +>Kind : "A" | "B" + +function kindIs(kind: Kind, is: "A"): kind is "A"; +>kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; } +>kind : "A" | "B" +>Kind : "A" | "B" +>is : "A" +>kind : any + +function kindIs(kind: Kind, is: "B"): kind is "B"; +>kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; } +>kind : "A" | "B" +>Kind : "A" | "B" +>is : "B" +>kind : any + +function kindIs(kind: Kind, is: Kind): boolean { +>kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; } +>kind : "A" | "B" +>Kind : "A" | "B" +>is : "A" | "B" +>Kind : "A" | "B" + + return kind === is; +>kind === is : boolean +>kind : "A" | "B" +>is : "A" | "B" +} + +var x: Kind = "A"; +>x : "A" | "B" +>Kind : "A" | "B" +>"A" : "A" + +if (kindIs(x, "A")) { +>kindIs(x, "A") : kind is "A" +>kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; } +>x : "A" | "B" +>"A" : "A" + + let a = x; +>a : "A" +>x : "A" +} +else { + let b = x; +>b : "B" +>x : "B" +} + +if (!kindIs(x, "B")) { +>!kindIs(x, "B") : boolean +>kindIs(x, "B") : kind is "B" +>kindIs : { (kind: "A" | "B", is: "A"): kind is "A"; (kind: "A" | "B", is: "B"): kind is "B"; } +>x : "A" | "B" +>"B" : "B" + + let c = x; +>c : "A" +>x : "A" +} +else { + let d = x; +>d : "B" +>x : "B" +} diff --git a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt index 49f17e7891d..ef582ab9b26 100644 --- a/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt +++ b/tests/baselines/reference/typeArgumentsWithStringLiteralTypes01.errors.txt @@ -1,4 +1,3 @@ -tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(4,18): error TS2382: Specialized overload signature is not assignable to any non-specialized signature. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(37,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(38,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts(39,25): error TS2345: Argument of type 'string' is not assignable to parameter of type '"Hello"'. @@ -36,13 +35,11 @@ tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes0 Type '"World"' is not assignable to type '"Hello"'. -==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (25 errors) ==== +==== tests/cases/conformance/types/stringLiteral/typeArgumentsWithStringLiteralTypes01.ts (24 errors) ==== declare function randBool(): boolean; declare function takeReturnString(str: string): string; declare function takeReturnHello(str: "Hello"): "Hello"; - ~~~~~~~~~~~~~~~ -!!! error TS2382: Specialized overload signature is not assignable to any non-specialized signature. declare function takeReturnHelloWorld(str: "Hello" | "World"): "Hello" | "World"; function fun1(x: T, y: T) { From 4ec234aa93d329df484177e0046e56c5fa8eb0b4 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:38:34 -0500 Subject: [PATCH 026/160] Don't skip over specialized signatures when checking for assignability. --- src/compiler/checker.ts | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 16e957f35b5..9aaf0b93f31 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5568,29 +5568,25 @@ namespace ts { const saveErrorInfo = errorInfo; outer: for (const t of targetSignatures) { - if (!t.hasStringLiterals || target.flags & TypeFlags.FromSignature) { - // Only elaborate errors from the first failure - let shouldElaborateErrors = reportErrors; - for (const s of sourceSignatures) { - if (!s.hasStringLiterals || source.flags & TypeFlags.FromSignature) { - const related = signatureRelatedTo(s, t, shouldElaborateErrors); - if (related) { - result &= related; - errorInfo = saveErrorInfo; - continue outer; - } - shouldElaborateErrors = false; - } + // Only elaborate errors from the first failure + let shouldElaborateErrors = reportErrors; + for (const s of sourceSignatures) { + const related = signatureRelatedTo(s, t, shouldElaborateErrors); + if (related) { + result &= related; + errorInfo = saveErrorInfo; + continue outer; } - // don't elaborate the primitive apparent types (like Number) - // because the actual primitives will have already been reported. - if (shouldElaborateErrors && !isPrimitiveApparentType(source)) { - reportError(Diagnostics.Type_0_provides_no_match_for_the_signature_1, - typeToString(source), - signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind)); - } - return Ternary.False; + shouldElaborateErrors = false; } + // don't elaborate the primitive apparent types (like Number) + // because the actual primitives will have already been reported. + if (shouldElaborateErrors && !isPrimitiveApparentType(source)) { + reportError(Diagnostics.Type_0_provides_no_match_for_the_signature_1, + typeToString(source), + signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind)); + } + return Ternary.False; } return result; } From c8b459f32c98c8c68f27235e6cf6b9c02ed2f724 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:39:46 -0500 Subject: [PATCH 027/160] Accepted baselines. --- ...overloadOnConstAsTypeAnnotation.errors.txt | 5 +- .../overloadOnConstInheritance2.errors.txt | 6 +- .../overloadOnConstInheritance3.errors.txt | 21 ---- .../overloadOnConstInheritance3.symbols | 22 +++++ .../overloadOnConstInheritance3.types | 22 +++++ ...loadOnConstNoAnyImplementation2.errors.txt | 18 +++- ...dOnConstNoStringImplementation2.errors.txt | 37 +++++++ ...loadOnConstNoStringImplementation2.symbols | 73 -------------- ...erloadOnConstNoStringImplementation2.types | 97 ------------------- ...ralTypesOverloadAssignability01.errors.txt | 33 +++++++ ...iteralTypesOverloadAssignability01.symbols | 40 -------- ...gLiteralTypesOverloadAssignability01.types | 44 --------- ...ralTypesOverloadAssignability02.errors.txt | 33 +++++++ ...iteralTypesOverloadAssignability02.symbols | 40 -------- ...gLiteralTypesOverloadAssignability02.types | 44 --------- ...ralTypesOverloadAssignability05.errors.txt | 25 ----- ...iteralTypesOverloadAssignability05.symbols | 44 +++++++++ ...gLiteralTypesOverloadAssignability05.types | 48 +++++++++ 18 files changed, 263 insertions(+), 389 deletions(-) delete mode 100644 tests/baselines/reference/overloadOnConstInheritance3.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstInheritance3.symbols create mode 100644 tests/baselines/reference/overloadOnConstInheritance3.types create mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt delete mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols delete mode 100644 tests/baselines/reference/overloadOnConstNoStringImplementation2.types create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types delete mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability05.symbols create mode 100644 tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt index 45f61055ede..7c651707eeb 100644 --- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt +++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt @@ -1,8 +1,11 @@ +tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,5): error TS2322: Type 'string' is not assignable to type '(x: "hi") => number'. tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,37): error TS1005: ';' expected. -==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (1 errors) ==== +==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (2 errors) ==== var f: (x: 'hi') => number = ('hi') => { return 1; }; + ~ +!!! error TS2322: Type 'string' is not assignable to type '(x: "hi") => number'. ~~ !!! error TS1005: ';' expected. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt index 5d3930a4e45..3e25a825d1a 100644 --- a/tests/baselines/reference/overloadOnConstInheritance2.errors.txt +++ b/tests/baselines/reference/overloadOnConstInheritance2.errors.txt @@ -1,7 +1,8 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. Types of property 'addEventListener' are incompatible. Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. - Type '(x: "bar") => string' provides no match for the signature '(x: string): any' + Types of parameters 'x' and 'x' are incompatible. + Type '"bar"' is not assignable to type '"foo"'. ==== tests/cases/compiler/overloadOnConstInheritance2.ts (1 errors) ==== @@ -14,7 +15,8 @@ tests/cases/compiler/overloadOnConstInheritance2.ts(5,11): error TS2430: Interfa !!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. !!! error TS2430: Types of property 'addEventListener' are incompatible. !!! error TS2430: Type '(x: "bar") => string' is not assignable to type '{ (x: string): any; (x: "foo"): string; }'. -!!! error TS2430: Type '(x: "bar") => string' provides no match for the signature '(x: string): any' +!!! error TS2430: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2430: Type '"bar"' is not assignable to type '"foo"'. addEventListener(x: 'bar'): string; // shouldn't need to redeclare the string overload } \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt b/tests/baselines/reference/overloadOnConstInheritance3.errors.txt deleted file mode 100644 index bedff91fc27..00000000000 --- a/tests/baselines/reference/overloadOnConstInheritance3.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/compiler/overloadOnConstInheritance3.ts(4,11): error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. - Types of property 'addEventListener' are incompatible. - Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'. - Type '{ (x: "bar"): string; (x: "foo"): string; }' provides no match for the signature '(x: string): any' - - -==== tests/cases/compiler/overloadOnConstInheritance3.ts (1 errors) ==== - interface Base { - addEventListener(x: string): any; - } - interface Deriver extends Base { - ~~~~~~~ -!!! error TS2430: Interface 'Deriver' incorrectly extends interface 'Base'. -!!! error TS2430: Types of property 'addEventListener' are incompatible. -!!! error TS2430: Type '{ (x: "bar"): string; (x: "foo"): string; }' is not assignable to type '(x: string) => any'. -!!! error TS2430: Type '{ (x: "bar"): string; (x: "foo"): string; }' provides no match for the signature '(x: string): any' - // shouldn't need to redeclare the string overload - addEventListener(x: 'bar'): string; - addEventListener(x: 'foo'): string; - } - \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstInheritance3.symbols b/tests/baselines/reference/overloadOnConstInheritance3.symbols new file mode 100644 index 00000000000..32d07b19285 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInheritance3.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/overloadOnConstInheritance3.ts === +interface Base { +>Base : Symbol(Base, Decl(overloadOnConstInheritance3.ts, 0, 0)) + + addEventListener(x: string): any; +>addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 0, 16)) +>x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 1, 21)) +} +interface Deriver extends Base { +>Deriver : Symbol(Deriver, Decl(overloadOnConstInheritance3.ts, 2, 1)) +>Base : Symbol(Base, Decl(overloadOnConstInheritance3.ts, 0, 0)) + + // shouldn't need to redeclare the string overload + addEventListener(x: 'bar'): string; +>addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39)) +>x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 5, 21)) + + addEventListener(x: 'foo'): string; +>addEventListener : Symbol(addEventListener, Decl(overloadOnConstInheritance3.ts, 3, 32), Decl(overloadOnConstInheritance3.ts, 5, 39)) +>x : Symbol(x, Decl(overloadOnConstInheritance3.ts, 6, 21)) +} + diff --git a/tests/baselines/reference/overloadOnConstInheritance3.types b/tests/baselines/reference/overloadOnConstInheritance3.types new file mode 100644 index 00000000000..bd8d4ba1917 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstInheritance3.types @@ -0,0 +1,22 @@ +=== tests/cases/compiler/overloadOnConstInheritance3.ts === +interface Base { +>Base : Base + + addEventListener(x: string): any; +>addEventListener : (x: string) => any +>x : string +} +interface Deriver extends Base { +>Deriver : Deriver +>Base : Base + + // shouldn't need to redeclare the string overload + addEventListener(x: 'bar'): string; +>addEventListener : { (x: "bar"): string; (x: "foo"): string; } +>x : "bar" + + addEventListener(x: 'foo'): string; +>addEventListener : { (x: "bar"): string; (x: "foo"): string; } +>x : "foo" +} + diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt index a9d4092f6d3..bfd888c9912 100644 --- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt +++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.errors.txt @@ -1,7 +1,13 @@ tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(12,18): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'. +tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(18,9): error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"bye"' is not assignable to type '"hi"'. +tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(21,9): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type 'number' is not assignable to type '"hi"'. -==== tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts (1 errors) ==== +==== tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts (3 errors) ==== interface I { x1(a: number, callback: (x: 'hi') => number); } @@ -22,6 +28,14 @@ tests/cases/compiler/overloadOnConstNoAnyImplementation2.ts(12,18): error TS2345 var c: C; c.x1(1, (x: 'hi') => { return 1; } ); c.x1(1, (x: 'bye') => { return 1; } ); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'. +!!! error TS2345: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2345: Type '"bye"' is not assignable to type '"hi"'. c.x1(1, (x) => { return 1; } ); - c.x1(1, (x: number) => { return 1; } ); \ No newline at end of file + c.x1(1, (x: number) => { return 1; } ); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'. +!!! error TS2345: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2345: Type 'number' is not assignable to type '"hi"'. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt new file mode 100644 index 00000000000..fddfa04eef7 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.errors.txt @@ -0,0 +1,37 @@ +tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(18,9): error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"bye"' is not assignable to type '"hi"'. +tests/cases/compiler/overloadOnConstNoStringImplementation2.ts(20,9): error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type 'number' is not assignable to type '"hi"'. + + +==== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts (2 errors) ==== + interface I { + x1(a: number, callback: (x: 'hi') => number); + } + + class C implements I { + x1(a: number, callback: (x: 'hi') => number); + x1(a: number, callback: (x: any) => number) { + callback('hi'); + callback('bye'); + var hm = "hm"; + callback(hm); + callback(1); + } + } + + var c: C; + c.x1(1, (x: 'hi') => { return 1; } ); + c.x1(1, (x: 'bye') => { return 1; } ); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '(x: "bye") => number' is not assignable to parameter of type '(x: "hi") => number'. +!!! error TS2345: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2345: Type '"bye"' is not assignable to type '"hi"'. + c.x1(1, (x: string) => { return 1; } ); + c.x1(1, (x: number) => { return 1; } ); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2345: Argument of type '(x: number) => number' is not assignable to parameter of type '(x: "hi") => number'. +!!! error TS2345: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2345: Type 'number' is not assignable to type '"hi"'. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols b/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols deleted file mode 100644 index 8629708d187..00000000000 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.symbols +++ /dev/null @@ -1,73 +0,0 @@ -=== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts === -interface I { ->I : Symbol(I, Decl(overloadOnConstNoStringImplementation2.ts, 0, 0)) - - x1(a: number, callback: (x: 'hi') => number); ->x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 0, 13)) ->a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 1, 7)) ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 1, 17)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 1, 29)) -} - -class C implements I { ->C : Symbol(C, Decl(overloadOnConstNoStringImplementation2.ts, 2, 1)) ->I : Symbol(I, Decl(overloadOnConstNoStringImplementation2.ts, 0, 0)) - - x1(a: number, callback: (x: 'hi') => number); ->x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 5, 7)) ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 5, 17)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 5, 29)) - - x1(a: number, callback: (x: any) => number) { ->x1 : Symbol(x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->a : Symbol(a, Decl(overloadOnConstNoStringImplementation2.ts, 6, 7)) ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 6, 29)) - - callback('hi'); ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) - - callback('bye'); ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) - - var hm = "hm"; ->hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation2.ts, 9, 11)) - - callback(hm); ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) ->hm : Symbol(hm, Decl(overloadOnConstNoStringImplementation2.ts, 9, 11)) - - callback(1); ->callback : Symbol(callback, Decl(overloadOnConstNoStringImplementation2.ts, 6, 17)) - } -} - -var c: C; ->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) ->C : Symbol(C, Decl(overloadOnConstNoStringImplementation2.ts, 2, 1)) - -c.x1(1, (x: 'hi') => { return 1; } ); ->c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) ->x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 16, 9)) - -c.x1(1, (x: 'bye') => { return 1; } ); ->c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) ->x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 17, 9)) - -c.x1(1, (x: string) => { return 1; } ); ->c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) ->x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 18, 9)) - -c.x1(1, (x: number) => { return 1; } ); ->c.x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->c : Symbol(c, Decl(overloadOnConstNoStringImplementation2.ts, 15, 3)) ->x1 : Symbol(C.x1, Decl(overloadOnConstNoStringImplementation2.ts, 4, 22), Decl(overloadOnConstNoStringImplementation2.ts, 5, 49)) ->x : Symbol(x, Decl(overloadOnConstNoStringImplementation2.ts, 19, 9)) - diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types b/tests/baselines/reference/overloadOnConstNoStringImplementation2.types deleted file mode 100644 index 40521db3f89..00000000000 --- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.types +++ /dev/null @@ -1,97 +0,0 @@ -=== tests/cases/compiler/overloadOnConstNoStringImplementation2.ts === -interface I { ->I : I - - x1(a: number, callback: (x: 'hi') => number); ->x1 : (a: number, callback: (x: "hi") => number) => any ->a : number ->callback : (x: "hi") => number ->x : "hi" -} - -class C implements I { ->C : C ->I : I - - x1(a: number, callback: (x: 'hi') => number); ->x1 : (a: number, callback: (x: "hi") => number) => any ->a : number ->callback : (x: "hi") => number ->x : "hi" - - x1(a: number, callback: (x: any) => number) { ->x1 : (a: number, callback: (x: "hi") => number) => any ->a : number ->callback : (x: any) => number ->x : any - - callback('hi'); ->callback('hi') : number ->callback : (x: any) => number ->'hi' : string - - callback('bye'); ->callback('bye') : number ->callback : (x: any) => number ->'bye' : string - - var hm = "hm"; ->hm : string ->"hm" : string - - callback(hm); ->callback(hm) : number ->callback : (x: any) => number ->hm : string - - callback(1); ->callback(1) : number ->callback : (x: any) => number ->1 : number - } -} - -var c: C; ->c : C ->C : C - -c.x1(1, (x: 'hi') => { return 1; } ); ->c.x1(1, (x: 'hi') => { return 1; } ) : any ->c.x1 : (a: number, callback: (x: "hi") => number) => any ->c : C ->x1 : (a: number, callback: (x: "hi") => number) => any ->1 : number ->(x: 'hi') => { return 1; } : (x: "hi") => number ->x : "hi" ->1 : number - -c.x1(1, (x: 'bye') => { return 1; } ); ->c.x1(1, (x: 'bye') => { return 1; } ) : any ->c.x1 : (a: number, callback: (x: "hi") => number) => any ->c : C ->x1 : (a: number, callback: (x: "hi") => number) => any ->1 : number ->(x: 'bye') => { return 1; } : (x: "bye") => number ->x : "bye" ->1 : number - -c.x1(1, (x: string) => { return 1; } ); ->c.x1(1, (x: string) => { return 1; } ) : any ->c.x1 : (a: number, callback: (x: "hi") => number) => any ->c : C ->x1 : (a: number, callback: (x: "hi") => number) => any ->1 : number ->(x: string) => { return 1; } : (x: string) => number ->x : string ->1 : number - -c.x1(1, (x: number) => { return 1; } ); ->c.x1(1, (x: number) => { return 1; } ) : any ->c.x1 : (a: number, callback: (x: "hi") => number) => any ->c : C ->x1 : (a: number, callback: (x: "hi") => number) => any ->1 : number ->(x: number) => { return 1; } : (x: number) => number ->x : number ->1 : number - diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt new file mode 100644 index 00000000000..4c66c2000f9 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.errors.txt @@ -0,0 +1,33 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(15,1): error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"bar"' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"foo"' is not assignable to type '"bar"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts (2 errors) ==== + + function f(x: "foo"): number; + function f(x: string): number { + return 0; + } + + function g(x: "bar"): number; + function g(x: string): number { + return 0; + } + + let a = f; + let b = g; + + a = b; + ~ +!!! error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type '"bar"' is not assignable to type '"foo"'. + b = a; + ~ +!!! error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type '"foo"' is not assignable to type '"bar"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols deleted file mode 100644 index 0704bbfb891..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.symbols +++ /dev/null @@ -1,40 +0,0 @@ -=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts === - -function f(x: "foo"): number; ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 11)) - -function f(x: string): number { ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 2, 11)) - - return 0; -} - -function g(x: "bar"): number; ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 11)) - -function g(x: string): number { ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability01.ts, 7, 11)) - - return 0; -} - -let a = f; ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability01.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability01.ts, 1, 29)) - -let b = g; ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability01.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability01.ts, 6, 29)) - -a = b; ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) - -b = a; ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability01.ts, 12, 3)) ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability01.ts, 11, 3)) - diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types deleted file mode 100644 index 021c209fdb5..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability01.types +++ /dev/null @@ -1,44 +0,0 @@ -=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability01.ts === - -function f(x: "foo"): number; ->f : (x: "foo") => number ->x : "foo" - -function f(x: string): number { ->f : (x: "foo") => number ->x : string - - return 0; ->0 : number -} - -function g(x: "bar"): number; ->g : (x: "bar") => number ->x : "bar" - -function g(x: string): number { ->g : (x: "bar") => number ->x : string - - return 0; ->0 : number -} - -let a = f; ->a : (x: "foo") => number ->f : (x: "foo") => number - -let b = g; ->b : (x: "bar") => number ->g : (x: "bar") => number - -a = b; ->a = b : (x: "bar") => number ->a : (x: "foo") => number ->b : (x: "bar") => number - -b = a; ->b = a : (x: "foo") => number ->b : (x: "bar") => number ->a : (x: "foo") => number - diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt new file mode 100644 index 00000000000..952fd7aae86 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.errors.txt @@ -0,0 +1,33 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(15,1): error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"bar"' is not assignable to type '"foo"'. +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'. + Types of parameters 'x' and 'x' are incompatible. + Type '"foo"' is not assignable to type '"bar"'. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts (2 errors) ==== + + function f(x: "foo"): number; + function f(x: "foo"): number { + return 0; + } + + function g(x: "bar"): number; + function g(x: "bar"): number { + return 0; + } + + let a = f; + let b = g; + + a = b; + ~ +!!! error TS2322: Type '(x: "bar") => number' is not assignable to type '(x: "foo") => number'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type '"bar"' is not assignable to type '"foo"'. + b = a; + ~ +!!! error TS2322: Type '(x: "foo") => number' is not assignable to type '(x: "bar") => number'. +!!! error TS2322: Types of parameters 'x' and 'x' are incompatible. +!!! error TS2322: Type '"foo"' is not assignable to type '"bar"'. \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols deleted file mode 100644 index 5554b3e8768..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.symbols +++ /dev/null @@ -1,40 +0,0 @@ -=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts === - -function f(x: "foo"): number; ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 11)) - -function f(x: "foo"): number { ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 2, 11)) - - return 0; -} - -function g(x: "bar"): number; ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 11)) - -function g(x: "bar"): number { ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) ->x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability02.ts, 7, 11)) - - return 0; -} - -let a = f; ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) ->f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability02.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability02.ts, 1, 29)) - -let b = g; ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) ->g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability02.ts, 4, 1), Decl(stringLiteralTypesOverloadAssignability02.ts, 6, 29)) - -a = b; ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) - -b = a; ->b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability02.ts, 12, 3)) ->a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability02.ts, 11, 3)) - diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types deleted file mode 100644 index 5e272a38326..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability02.types +++ /dev/null @@ -1,44 +0,0 @@ -=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability02.ts === - -function f(x: "foo"): number; ->f : (x: "foo") => number ->x : "foo" - -function f(x: "foo"): number { ->f : (x: "foo") => number ->x : "foo" - - return 0; ->0 : number -} - -function g(x: "bar"): number; ->g : (x: "bar") => number ->x : "bar" - -function g(x: "bar"): number { ->g : (x: "bar") => number ->x : "bar" - - return 0; ->0 : number -} - -let a = f; ->a : (x: "foo") => number ->f : (x: "foo") => number - -let b = g; ->b : (x: "bar") => number ->g : (x: "bar") => number - -a = b; ->a = b : (x: "bar") => number ->a : (x: "foo") => number ->b : (x: "bar") => number - -b = a; ->b = a : (x: "foo") => number ->b : (x: "bar") => number ->a : (x: "foo") => number - diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt deleted file mode 100644 index b08f98564f8..00000000000 --- a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.errors.txt +++ /dev/null @@ -1,25 +0,0 @@ -tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts(16,1): error TS2322: Type '(x: "foo") => number' is not assignable to type '{ (x: "foo"): number; (x: string): number; }'. - Type '(x: "foo") => number' provides no match for the signature '(x: string): number' - - -==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts (1 errors) ==== - - function f(x: "foo"): number; - function f(x: string): number; - function f(x: string): number { - return 0; - } - - function g(x: "foo"): number; - function g(x: string): number { - return 0; - } - - let a = f; - let b = g; - - a = b; - ~ -!!! error TS2322: Type '(x: "foo") => number' is not assignable to type '{ (x: "foo"): number; (x: string): number; }'. -!!! error TS2322: Type '(x: "foo") => number' provides no match for the signature '(x: string): number' - b = a; \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.symbols b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.symbols new file mode 100644 index 00000000000..9a59a7c929a --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.symbols @@ -0,0 +1,44 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts === + +function f(x: "foo"): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability05.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability05.ts, 1, 29), Decl(stringLiteralTypesOverloadAssignability05.ts, 2, 30)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability05.ts, 1, 11)) + +function f(x: string): number; +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability05.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability05.ts, 1, 29), Decl(stringLiteralTypesOverloadAssignability05.ts, 2, 30)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability05.ts, 2, 11)) + +function f(x: string): number { +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability05.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability05.ts, 1, 29), Decl(stringLiteralTypesOverloadAssignability05.ts, 2, 30)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability05.ts, 3, 11)) + + return 0; +} + +function g(x: "foo"): number; +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability05.ts, 5, 1), Decl(stringLiteralTypesOverloadAssignability05.ts, 7, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability05.ts, 7, 11)) + +function g(x: string): number { +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability05.ts, 5, 1), Decl(stringLiteralTypesOverloadAssignability05.ts, 7, 29)) +>x : Symbol(x, Decl(stringLiteralTypesOverloadAssignability05.ts, 8, 11)) + + return 0; +} + +let a = f; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability05.ts, 12, 3)) +>f : Symbol(f, Decl(stringLiteralTypesOverloadAssignability05.ts, 0, 0), Decl(stringLiteralTypesOverloadAssignability05.ts, 1, 29), Decl(stringLiteralTypesOverloadAssignability05.ts, 2, 30)) + +let b = g; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability05.ts, 13, 3)) +>g : Symbol(g, Decl(stringLiteralTypesOverloadAssignability05.ts, 5, 1), Decl(stringLiteralTypesOverloadAssignability05.ts, 7, 29)) + +a = b; +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability05.ts, 12, 3)) +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability05.ts, 13, 3)) + +b = a; +>b : Symbol(b, Decl(stringLiteralTypesOverloadAssignability05.ts, 13, 3)) +>a : Symbol(a, Decl(stringLiteralTypesOverloadAssignability05.ts, 12, 3)) + diff --git a/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types new file mode 100644 index 00000000000..b7dd9262a67 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloadAssignability05.types @@ -0,0 +1,48 @@ +=== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloadAssignability05.ts === + +function f(x: "foo"): number; +>f : { (x: "foo"): number; (x: string): number; } +>x : "foo" + +function f(x: string): number; +>f : { (x: "foo"): number; (x: string): number; } +>x : string + +function f(x: string): number { +>f : { (x: "foo"): number; (x: string): number; } +>x : string + + return 0; +>0 : number +} + +function g(x: "foo"): number; +>g : (x: "foo") => number +>x : "foo" + +function g(x: string): number { +>g : (x: "foo") => number +>x : string + + return 0; +>0 : number +} + +let a = f; +>a : { (x: "foo"): number; (x: string): number; } +>f : { (x: "foo"): number; (x: string): number; } + +let b = g; +>b : (x: "foo") => number +>g : (x: "foo") => number + +a = b; +>a = b : (x: "foo") => number +>a : { (x: "foo"): number; (x: string): number; } +>b : (x: "foo") => number + +b = a; +>b = a : { (x: "foo"): number; (x: string): number; } +>b : (x: "foo") => number +>a : { (x: "foo"): number; (x: string): number; } + From 5f9983a6983487b469783f59cd6be5ccc2840817 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:42:56 -0500 Subject: [PATCH 028/160] Updated tests. --- tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts | 2 +- ...pecializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts b/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts index 12b99fb29ce..4188d6919a7 100644 --- a/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts +++ b/tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts @@ -1,3 +1,3 @@ // @allowUnreachableCode: true -var f: (x: 'hi') => number = ('hi') => { return 1; }; \ No newline at end of file +var f: (x: 'hi') => number = (x: 'hi') => { return 1; }; \ No newline at end of file diff --git a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts index 46bb0ea2c81..01f33fbd7bb 100644 --- a/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts +++ b/tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts @@ -1,5 +1,4 @@ -// Specialized signatures must be a subtype of a non-specialized signature -// All the below should be errors +// @declaration: true function foo(x: 'a'); function foo(x: number) { } From decec4db657e72b2c2a2be2c7692cd1e265427a8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 15:56:44 -0500 Subject: [PATCH 029/160] Accepted baselines. --- ...overloadOnConstAsTypeAnnotation.errors.txt | 11 ---- .../overloadOnConstAsTypeAnnotation.js | 8 +-- .../overloadOnConstAsTypeAnnotation.symbols | 7 +++ .../overloadOnConstAsTypeAnnotation.types | 9 +++ ...ubtypeOfNonSpecializedSignature.errors.txt | 4 +- ...reIsNotSubtypeOfNonSpecializedSignature.js | 56 +++++++++++++++++-- 6 files changed, 71 insertions(+), 24 deletions(-) delete mode 100644 tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt create mode 100644 tests/baselines/reference/overloadOnConstAsTypeAnnotation.symbols create mode 100644 tests/baselines/reference/overloadOnConstAsTypeAnnotation.types diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt deleted file mode 100644 index 7c651707eeb..00000000000 --- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,5): error TS2322: Type 'string' is not assignable to type '(x: "hi") => number'. -tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts(2,37): error TS1005: ';' expected. - - -==== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts (2 errors) ==== - - var f: (x: 'hi') => number = ('hi') => { return 1; }; - ~ -!!! error TS2322: Type 'string' is not assignable to type '(x: "hi") => number'. - ~~ -!!! error TS1005: ';' expected. \ No newline at end of file diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js index aa5c8701f28..94250b48cbc 100644 --- a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js +++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.js @@ -1,10 +1,6 @@ //// [overloadOnConstAsTypeAnnotation.ts] -var f: (x: 'hi') => number = ('hi') => { return 1; }; +var f: (x: 'hi') => number = (x: 'hi') => { return 1; }; //// [overloadOnConstAsTypeAnnotation.js] -var f = ('hi'); -{ - return 1; -} -; +var f = function (x) { return 1; }; diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.symbols b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.symbols new file mode 100644 index 00000000000..c420e50cda2 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.symbols @@ -0,0 +1,7 @@ +=== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts === + +var f: (x: 'hi') => number = (x: 'hi') => { return 1; }; +>f : Symbol(f, Decl(overloadOnConstAsTypeAnnotation.ts, 1, 3)) +>x : Symbol(x, Decl(overloadOnConstAsTypeAnnotation.ts, 1, 8)) +>x : Symbol(x, Decl(overloadOnConstAsTypeAnnotation.ts, 1, 30)) + diff --git a/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types new file mode 100644 index 00000000000..10a185708d4 --- /dev/null +++ b/tests/baselines/reference/overloadOnConstAsTypeAnnotation.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/overloadOnConstAsTypeAnnotation.ts === + +var f: (x: 'hi') => number = (x: 'hi') => { return 1; }; +>f : (x: "hi") => number +>x : "hi" +>(x: 'hi') => { return 1; } : (x: "hi") => number +>x : "hi" +>1 : number + diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt index d698193d02b..73318e782a3 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.errors.txt @@ -1,9 +1,7 @@ -tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(4,10): error TS2394: Overload signature is not compatible with function implementation. +tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts(2,10): error TS2394: Overload signature is not compatible with function implementation. ==== tests/cases/conformance/types/objectTypeLiteral/callSignatures/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts (1 errors) ==== - // Specialized signatures must be a subtype of a non-specialized signature - // All the below should be errors function foo(x: 'a'); ~~~ diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js index f2946cbeab8..bb2dab55957 100644 --- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js +++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js @@ -1,6 +1,4 @@ //// [specializedSignatureIsNotSubtypeOfNonSpecializedSignature.ts] -// Specialized signatures must be a subtype of a non-specialized signature -// All the below should be errors function foo(x: 'a'); function foo(x: number) { } @@ -67,8 +65,6 @@ var a3: { //// [specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js] -// Specialized signatures must be a subtype of a non-specialized signature -// All the below should be errors function foo(x) { } var C = (function () { function C() { @@ -91,3 +87,55 @@ var C3 = (function () { var a; var a2; var a3; + + +//// [specializedSignatureIsNotSubtypeOfNonSpecializedSignature.d.ts] +declare function foo(x: 'a'): any; +declare class C { + foo(x: 'a'): any; + foo(x: number): any; +} +declare class C2 { + foo(x: 'a'): any; + foo(x: T): any; +} +declare class C3 { + foo(x: 'a'): any; + foo(x: T): any; +} +interface I { + (x: 'a'): any; + (x: number): any; + foo(x: 'a'): any; + foo(x: number): any; +} +interface I2 { + (x: 'a'): any; + (x: T): any; + foo(x: 'a'): any; + foo(x: T): any; +} +interface I3 { + (x: 'a'): any; + (x: T): any; + foo(x: 'a'): any; + foo(x: T): any; +} +declare var a: { + (x: 'a'); + (x: number); + foo(x: 'a'); + foo(x: number); +}; +declare var a2: { + (x: 'a'); + (x: T); + foo(x: 'a'); + foo(x: T); +}; +declare var a3: { + (x: 'a'); + (x: T); + foo(x: 'a'); + foo(x: T); +}; From d9d5e3a28331899106c6698d86041fb41dd503c8 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 16:16:02 -0500 Subject: [PATCH 030/160] Added test from #6278. --- .../stringLiteral/stringLiteralTypesOverloads05.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts diff --git a/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts new file mode 100644 index 00000000000..182155790a6 --- /dev/null +++ b/tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts @@ -0,0 +1,13 @@ +// @declaration: true + +interface Animal { animal: {} }; +interface Dog extends Animal { dog: {} } +interface Cat extends Animal { cat: {} } +interface Moose extends Animal { moose: {} } + +function doThing(x: "dog"): Dog; +function doThing(x: "cat"): Cat; +function doThing(x: string): Animal; +function doThing(x: string, y?: string): Moose { + return undefined; +} \ No newline at end of file From cee7eb10ed87a27b868c7fbc84752c6a8c3e7374 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 28 Dec 2015 16:20:34 -0500 Subject: [PATCH 031/160] Accepted baselines. --- .../stringLiteralTypesOverloads05.errors.txt | 18 +++++++++ .../stringLiteralTypesOverloads05.js | 37 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads05.errors.txt create mode 100644 tests/baselines/reference/stringLiteralTypesOverloads05.js diff --git a/tests/baselines/reference/stringLiteralTypesOverloads05.errors.txt b/tests/baselines/reference/stringLiteralTypesOverloads05.errors.txt new file mode 100644 index 00000000000..e57327ab0e0 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads05.errors.txt @@ -0,0 +1,18 @@ +tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts(7,10): error TS2394: Overload signature is not compatible with function implementation. + + +==== tests/cases/conformance/types/stringLiteral/stringLiteralTypesOverloads05.ts (1 errors) ==== + + interface Animal { animal: {} }; + interface Dog extends Animal { dog: {} } + interface Cat extends Animal { cat: {} } + interface Moose extends Animal { moose: {} } + + function doThing(x: "dog"): Dog; + ~~~~~~~ +!!! error TS2394: Overload signature is not compatible with function implementation. + function doThing(x: "cat"): Cat; + function doThing(x: string): Animal; + function doThing(x: string, y?: string): Moose { + return undefined; + } \ No newline at end of file diff --git a/tests/baselines/reference/stringLiteralTypesOverloads05.js b/tests/baselines/reference/stringLiteralTypesOverloads05.js new file mode 100644 index 00000000000..23be3dac1e1 --- /dev/null +++ b/tests/baselines/reference/stringLiteralTypesOverloads05.js @@ -0,0 +1,37 @@ +//// [stringLiteralTypesOverloads05.ts] + +interface Animal { animal: {} }; +interface Dog extends Animal { dog: {} } +interface Cat extends Animal { cat: {} } +interface Moose extends Animal { moose: {} } + +function doThing(x: "dog"): Dog; +function doThing(x: "cat"): Cat; +function doThing(x: string): Animal; +function doThing(x: string, y?: string): Moose { + return undefined; +} + +//// [stringLiteralTypesOverloads05.js] +; +function doThing(x, y) { + return undefined; +} + + +//// [stringLiteralTypesOverloads05.d.ts] +interface Animal { + animal: {}; +} +interface Dog extends Animal { + dog: {}; +} +interface Cat extends Animal { + cat: {}; +} +interface Moose extends Animal { + moose: {}; +} +declare function doThing(x: "dog"): Dog; +declare function doThing(x: "cat"): Cat; +declare function doThing(x: string): Animal; From 36a82c70b1ffad912c612c1fb0c9e4272ea18c9a Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Sun, 10 Jan 2016 18:01:40 -0800 Subject: [PATCH 032/160] Address PR --- src/compiler/utilities.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 6b924c1099e..bee0a3eca48 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -232,8 +232,8 @@ namespace ts { // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' export function escapeIdentifier(identifier: string): string { - const prefixWithUnderscore = identifier.length > 2 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._; - return prefixWithUnderscore ? "_" + identifier : identifier; + const prefixedWithUnderscores = identifier.length >= 3 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._; + return prefixedWithUnderscores ? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier From b46efc9b55c6aaf4dc5f46934ecf2e6d15998e92 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 13 Jan 2016 18:34:38 -0800 Subject: [PATCH 033/160] Allow modifies on type members + introduce "readonly" modifier --- src/compiler/checker.ts | 41 ++++++++-- src/compiler/diagnosticMessages.json | 12 ++- src/compiler/parser.ts | 111 +++++++++++---------------- src/compiler/program.ts | 1 + src/compiler/scanner.ts | 1 + src/compiler/types.ts | 33 ++++---- src/compiler/utilities.ts | 2 + 7 files changed, 107 insertions(+), 94 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e73bbea8fae..c73b6309f16 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15675,9 +15675,17 @@ namespace ts { return; } - let lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node, lastAsync: Node; + let lastStatic: Node, lastPrivate: Node, lastProtected: Node, lastDeclare: Node, lastAsync: Node, lastReadonly: Node; let flags = 0; for (const modifier of node.modifiers) { + if (modifier.kind !== SyntaxKind.ReadonlyKeyword) { + if (node.kind === SyntaxKind.PropertySignature || node.kind === SyntaxKind.MethodSignature) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_type_member, tokenToString(modifier.kind)); + } + if (node.kind === SyntaxKind.IndexSignature) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_an_index_signature, tokenToString(modifier.kind)); + } + } switch (modifier.kind) { case SyntaxKind.ConstKeyword: if (node.kind !== SyntaxKind.EnumDeclaration && node.parent.kind === SyntaxKind.ClassDeclaration) { @@ -15706,6 +15714,9 @@ namespace ts { else if (flags & NodeFlags.Static) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "static"); } + else if (flags & NodeFlags.Readonly) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly"); + } else if (flags & NodeFlags.Async) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "async"); } @@ -15727,6 +15738,9 @@ namespace ts { if (flags & NodeFlags.Static) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "static"); } + else if (flags & NodeFlags.Readonly) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly"); + } else if (flags & NodeFlags.Async) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "static", "async"); } @@ -15743,6 +15757,20 @@ namespace ts { lastStatic = modifier; break; + case SyntaxKind.ReadonlyKeyword: + if (flags & NodeFlags.Readonly) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "readonly"); + } + else if (flags & NodeFlags.Async) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "readonly", "async"); + } + else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) { + return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, "readonly"); + } + flags |= NodeFlags.Readonly; + lastReadonly = modifier; + break; + case SyntaxKind.ExportKeyword: if (flags & NodeFlags.Export) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "export"); @@ -15839,6 +15867,9 @@ namespace ts { else if (flags & NodeFlags.Async) { return grammarErrorOnNode(lastAsync, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async"); } + else if (flags & NodeFlags.Readonly) { + return grammarErrorOnNode(lastReadonly, Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly"); + } return; } else if ((node.kind === SyntaxKind.ImportDeclaration || node.kind === SyntaxKind.ImportEqualsDeclaration) && flags & NodeFlags.Ambient) { @@ -15984,15 +16015,9 @@ namespace ts { } } - function checkGrammarForIndexSignatureModifier(node: SignatureDeclaration): void { - if (node.flags & NodeFlags.Modifier) { - grammarErrorOnFirstToken(node, Diagnostics.Modifiers_not_permitted_on_index_signature_members); - } - } - function checkGrammarIndexSignature(node: SignatureDeclaration) { // Prevent cascading error by short-circuit - return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node) || checkGrammarForIndexSignatureModifier(node); + return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node); } function checkGrammarForAtLeastOneTypeArgument(node: Node, typeArguments: NodeArray): boolean { diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 760da6058c1..a10787764d9 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -203,6 +203,14 @@ "category": "Error", "code": 1068 }, + "'{0}' modifier cannot appear on a type member.": { + "category": "Error", + "code": 1070 + }, + "'{0}' modifier cannot appear on an index signature.": { + "category": "Error", + "code": 1071 + }, "A '{0}' modifier cannot be used with an import declaration.": { "category": "Error", "code": 1079 @@ -423,10 +431,6 @@ "category": "Error", "code": 1144 }, - "Modifiers not permitted on index signature members.": { - "category": "Error", - "code": 1145 - }, "Declaration expected.": { "category": "Error", "code": 1146 diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 420d201adc9..6738b9c2d95 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1192,7 +1192,7 @@ namespace ts { case ParsingContext.SwitchClauses: return token === SyntaxKind.CaseKeyword || token === SyntaxKind.DefaultKeyword; case ParsingContext.TypeMembers: - return isStartOfTypeMember(); + return lookAhead(isTypeMemberStart); case ParsingContext.ClassMembers: // We allow semicolons as class elements (as specified by ES6) as long as we're // not in error recovery. If we're in error recovery, we don't want an errant @@ -2233,13 +2233,13 @@ namespace ts { return finishNode(node); } - function parsePropertyOrMethodSignature(): PropertySignature | MethodSignature { - const fullStart = scanner.getStartPos(); + function parsePropertyOrMethodSignature(fullStart: number, modifiers: ModifiersArray): PropertySignature | MethodSignature { const name = parsePropertyName(); const questionToken = parseOptionalToken(SyntaxKind.QuestionToken); if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { const method = createNode(SyntaxKind.MethodSignature, fullStart); + setModifiers(method, modifiers); method.name = name; method.questionToken = questionToken; @@ -2251,6 +2251,7 @@ namespace ts { } else { const property = createNode(SyntaxKind.PropertySignature, fullStart); + setModifiers(property, modifiers); property.name = name; property.questionToken = questionToken; property.type = parseTypeAnnotation(); @@ -2267,77 +2268,51 @@ namespace ts { } } - function isStartOfTypeMember(): boolean { - switch (token) { - case SyntaxKind.OpenParenToken: - case SyntaxKind.LessThanToken: - case SyntaxKind.OpenBracketToken: // Both for indexers and computed properties - return true; - default: - if (isModifierKind(token)) { - const result = lookAhead(isStartOfIndexSignatureDeclaration); - if (result) { - return result; - } - } - - return isLiteralPropertyName() && lookAhead(isTypeMemberWithLiteralPropertyName); + function isTypeMemberStart(): boolean { + let idToken: SyntaxKind; + // Return true if we have the start of a signature member + if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { + return true; } - } - - function isStartOfIndexSignatureDeclaration() { + // Eat up all modifiers, but hold on to the last one in case it is actually an identifier while (isModifierKind(token)) { + idToken = token; nextToken(); } - - return isIndexSignature(); - } - - function isTypeMemberWithLiteralPropertyName() { - nextToken(); - return token === SyntaxKind.OpenParenToken || - token === SyntaxKind.LessThanToken || - token === SyntaxKind.QuestionToken || - token === SyntaxKind.ColonToken || - canParseSemicolon(); + // Index signatures and computed property names are type members + if (token === SyntaxKind.OpenBracketToken) { + return true; + } + // Try to get the first property-like token following all modifiers + if (isLiteralPropertyName()) { + idToken = token; + nextToken(); + } + // If we were able to get any potential identifier, check that it is + // the start of a member declaration + if (idToken) { + return token === SyntaxKind.OpenParenToken || + token === SyntaxKind.LessThanToken || + token === SyntaxKind.QuestionToken || + token === SyntaxKind.ColonToken || + canParseSemicolon(); + } + return false; } function parseTypeMember(): TypeElement { - switch (token) { - case SyntaxKind.OpenParenToken: - case SyntaxKind.LessThanToken: - return parseSignatureMember(SyntaxKind.CallSignature); - case SyntaxKind.OpenBracketToken: - // Indexer or computed property - return isIndexSignature() - ? parseIndexSignatureDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined) - : parsePropertyOrMethodSignature(); - case SyntaxKind.NewKeyword: - if (lookAhead(isStartOfConstructSignature)) { - return parseSignatureMember(SyntaxKind.ConstructSignature); - } - // fall through. - case SyntaxKind.StringLiteral: - case SyntaxKind.NumericLiteral: - return parsePropertyOrMethodSignature(); - default: - // Index declaration as allowed as a type member. But as per the grammar, - // they also allow modifiers. So we have to check for an index declaration - // that might be following modifiers. This ensures that things work properly - // when incrementally parsing as the parser will produce the Index declaration - // if it has the same text regardless of whether it is inside a class or an - // object type. - if (isModifierKind(token)) { - const result = tryParse(parseIndexSignatureWithModifiers); - if (result) { - return result; - } - } - - if (tokenIsIdentifierOrKeyword(token)) { - return parsePropertyOrMethodSignature(); - } + if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) { + return parseSignatureMember(SyntaxKind.CallSignature); } + if (token === SyntaxKind.NewKeyword && lookAhead(isStartOfConstructSignature)) { + return parseSignatureMember(SyntaxKind.ConstructSignature); + } + const fullStart = getNodePos(); + const modifiers = parseModifiers(); + if (isIndexSignature()) { + return parseIndexSignatureDeclaration(fullStart, /*decorators*/ undefined, modifiers); + } + return parsePropertyOrMethodSignature(fullStart, modifiers); } function parseIndexSignatureWithModifiers() { @@ -4423,6 +4398,7 @@ namespace ts { case SyntaxKind.PrivateKeyword: case SyntaxKind.ProtectedKeyword: case SyntaxKind.PublicKeyword: + case SyntaxKind.ReadonlyKeyword: nextToken(); // ASI takes effect for this modifier. if (scanner.hasPrecedingLineBreak()) { @@ -4501,6 +4477,7 @@ namespace ts { case SyntaxKind.PrivateKeyword: case SyntaxKind.ProtectedKeyword: case SyntaxKind.StaticKeyword: + case SyntaxKind.ReadonlyKeyword: // When these don't start a declaration, they may be the start of a class member if an identifier // immediately follows. Otherwise they're an identifier in an expression statement. return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine); @@ -4582,6 +4559,7 @@ namespace ts { case SyntaxKind.PublicKeyword: case SyntaxKind.AbstractKeyword: case SyntaxKind.StaticKeyword: + case SyntaxKind.ReadonlyKeyword: if (isStartOfDeclaration()) { return parseDeclaration(); } @@ -4868,6 +4846,7 @@ namespace ts { case SyntaxKind.PrivateKeyword: case SyntaxKind.ProtectedKeyword: case SyntaxKind.StaticKeyword: + case SyntaxKind.ReadonlyKeyword: return true; default: return false; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 6905e01b1e6..849e97ec537 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -836,6 +836,7 @@ namespace ts { case SyntaxKind.PublicKeyword: case SyntaxKind.PrivateKeyword: case SyntaxKind.ProtectedKeyword: + case SyntaxKind.ReadonlyKeyword: case SyntaxKind.DeclareKeyword: diagnostics.push(createDiagnosticForNode(modifier, Diagnostics._0_can_only_be_used_in_a_ts_file, tokenToString(modifier.kind))); return true; diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts index 8161ea998c4..b05fbb2e0f1 100644 --- a/src/compiler/scanner.ts +++ b/src/compiler/scanner.ts @@ -93,6 +93,7 @@ namespace ts { "private": SyntaxKind.PrivateKeyword, "protected": SyntaxKind.ProtectedKeyword, "public": SyntaxKind.PublicKeyword, + "readonly": SyntaxKind.ReadonlyKeyword, "require": SyntaxKind.RequireKeyword, "return": SyntaxKind.ReturnKeyword, "set": SyntaxKind.SetKeyword, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9c5690901b3..f6216664d2e 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -163,6 +163,7 @@ namespace ts { IsKeyword, ModuleKeyword, NamespaceKeyword, + ReadonlyKeyword, RequireKeyword, NumberKeyword, SetKeyword, @@ -375,24 +376,24 @@ namespace ts { Private = 1 << 4, // Property/Method Protected = 1 << 5, // Property/Method Static = 1 << 6, // Property/Method - Abstract = 1 << 7, // Class/Method/ConstructSignature - Async = 1 << 8, // Property/Method/Function - Default = 1 << 9, // Function/Class (export default declaration) - MultiLine = 1 << 10, // Multi-line array or object literal - Synthetic = 1 << 11, // Synthetic node (for full fidelity) - DeclarationFile = 1 << 12, // Node is a .d.ts file - Let = 1 << 13, // Variable declaration - Const = 1 << 14, // Variable declaration - OctalLiteral = 1 << 15, // Octal numeric literal - Namespace = 1 << 16, // Namespace declaration - ExportContext = 1 << 17, // Export context (initialized by binding) - ContainsThis = 1 << 18, // Interface contains references to "this" - HasImplicitReturn = 1 << 19, // If function implicitly returns on one of codepaths (initialized by binding) - HasExplicitReturn = 1 << 20, // If function has explicit reachable return on one of codepaths (initialized by binding) - Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async, + Readonly = 1 << 7, // Property/Method + Abstract = 1 << 8, // Class/Method/ConstructSignature + Async = 1 << 9, // Property/Method/Function + Default = 1 << 10, // Function/Class (export default declaration) + MultiLine = 1 << 11, // Multi-line array or object literal + Synthetic = 1 << 12, // Synthetic node (for full fidelity) + DeclarationFile = 1 << 13, // Node is a .d.ts file + Let = 1 << 14, // Variable declaration + Const = 1 << 15, // Variable declaration + OctalLiteral = 1 << 16, // Octal numeric literal + Namespace = 1 << 17, // Namespace declaration + ExportContext = 1 << 18, // Export context (initialized by binding) + ContainsThis = 1 << 19, // Interface contains references to "this" + HasImplicitReturn = 1 << 20, // If function implicitly returns on one of codepaths (initialized by binding) + HasExplicitReturn = 1 << 21, // If function has explicit reachable return on one of codepaths (initialized by binding) + Modifier = Export | Ambient | Public | Private | Protected | Static | Readonly | Abstract | Default | Async, AccessibilityModifier = Public | Private | Protected, BlockScoped = Let | Const, - ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 7bc708c7178..bbf73737f22 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1548,6 +1548,7 @@ namespace ts { case SyntaxKind.PublicKeyword: case SyntaxKind.PrivateKeyword: case SyntaxKind.ProtectedKeyword: + case SyntaxKind.ReadonlyKeyword: case SyntaxKind.StaticKeyword: return true; } @@ -2279,6 +2280,7 @@ namespace ts { case SyntaxKind.ConstKeyword: return NodeFlags.Const; case SyntaxKind.DefaultKeyword: return NodeFlags.Default; case SyntaxKind.AsyncKeyword: return NodeFlags.Async; + case SyntaxKind.ReadonlyKeyword: return NodeFlags.Readonly; } return 0; } From 07b7008ba6db8a0872f66bc1b14955525e73c594 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 13 Jan 2016 18:35:51 -0800 Subject: [PATCH 034/160] Accepting new baselines --- ...rfaceWithAccessibilityModifiers.errors.txt | 12 +++++----- .../interfaceWithPrivateMember.errors.txt | 22 +++++++------------ .../reference/interfaceWithPrivateMember.js | 1 - ...fiersOnInterfaceIndexSignature1.errors.txt | 4 ++-- .../parserIndexMemberDeclaration10.errors.txt | 6 ++--- .../parserIndexMemberDeclaration6.errors.txt | 4 ++-- .../parserIndexMemberDeclaration7.errors.txt | 4 ++-- .../parserIndexMemberDeclaration8.errors.txt | 4 ++-- .../parserIndexMemberDeclaration9.errors.txt | 4 ++-- ...serModifierOnPropertySignature1.errors.txt | 4 ++-- .../reference/parserSymbolIndexer3.errors.txt | 6 ++--- .../reference/privateIndexer.errors.txt | 12 +++++----- .../reference/publicIndexer.errors.txt | 12 +++++----- .../reference/staticAsIdentifier.errors.txt | 6 ++--- .../reference/staticIndexer.errors.txt | 4 ++-- .../reference/staticIndexers.errors.txt | 12 +++++----- 16 files changed, 55 insertions(+), 62 deletions(-) diff --git a/tests/baselines/reference/interfaceWithAccessibilityModifiers.errors.txt b/tests/baselines/reference/interfaceWithAccessibilityModifiers.errors.txt index ecf803d522b..1c6f8f1939d 100644 --- a/tests/baselines/reference/interfaceWithAccessibilityModifiers.errors.txt +++ b/tests/baselines/reference/interfaceWithAccessibilityModifiers.errors.txt @@ -1,6 +1,6 @@ -tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(3,5): error TS1131: Property or signature expected. -tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(4,5): error TS1131: Property or signature expected. -tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(5,5): error TS1131: Property or signature expected. +tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(3,5): error TS1070: 'public' modifier cannot appear on a type member. +tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(4,5): error TS1070: 'private' modifier cannot appear on a type member. +tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts(5,5): error TS1070: 'protected' modifier cannot appear on a type member. ==== tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibilityModifiers.ts (3 errors) ==== @@ -8,11 +8,11 @@ tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessibil interface Foo { public a: any; ~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'public' modifier cannot appear on a type member. private b: any; ~~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'private' modifier cannot appear on a type member. protected c: any; ~~~~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'protected' modifier cannot appear on a type member. } \ No newline at end of file diff --git a/tests/baselines/reference/interfaceWithPrivateMember.errors.txt b/tests/baselines/reference/interfaceWithPrivateMember.errors.txt index dc1cfeabed5..ecbd9ec293c 100644 --- a/tests/baselines/reference/interfaceWithPrivateMember.errors.txt +++ b/tests/baselines/reference/interfaceWithPrivateMember.errors.txt @@ -1,32 +1,26 @@ -tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(5,5): error TS1131: Property or signature expected. -tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(9,5): error TS1131: Property or signature expected. -tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,5): error TS1131: Property or signature expected. -tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,16): error TS2304: Cannot find name 'string'. -tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(14,1): error TS1128: Declaration or statement expected. +tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(5,5): error TS1070: 'private' modifier cannot appear on a type member. +tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(9,5): error TS1070: 'private' modifier cannot appear on a type member. +tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts(13,5): error TS1070: 'private' modifier cannot appear on a type member. -==== tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts (5 errors) ==== +==== tests/cases/conformance/types/namedTypes/interfaceWithPrivateMember.ts (3 errors) ==== // interfaces do not permit private members, these are errors interface I { private x: string; ~~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'private' modifier cannot appear on a type member. } interface I2 { private y: T; ~~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'private' modifier cannot appear on a type member. } var x: { private y: string; ~~~~~~~ -!!! error TS1131: Property or signature expected. - ~~~~~~ -!!! error TS2304: Cannot find name 'string'. - } - ~ -!!! error TS1128: Declaration or statement expected. \ No newline at end of file +!!! error TS1070: 'private' modifier cannot appear on a type member. + } \ No newline at end of file diff --git a/tests/baselines/reference/interfaceWithPrivateMember.js b/tests/baselines/reference/interfaceWithPrivateMember.js index ceb388b1eae..d59037cf058 100644 --- a/tests/baselines/reference/interfaceWithPrivateMember.js +++ b/tests/baselines/reference/interfaceWithPrivateMember.js @@ -17,4 +17,3 @@ var x: { //// [interfaceWithPrivateMember.js] // interfaces do not permit private members, these are errors var x; -y: string; diff --git a/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.errors.txt b/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.errors.txt index b325710a9f0..e09a73ff68a 100644 --- a/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.errors.txt +++ b/tests/baselines/reference/modifiersOnInterfaceIndexSignature1.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/modifiersOnInterfaceIndexSignature1.ts(2,3): error TS1145: Modifiers not permitted on index signature members. +tests/cases/compiler/modifiersOnInterfaceIndexSignature1.ts(2,3): error TS1071: 'public' modifier cannot appear on an index signature. ==== tests/cases/compiler/modifiersOnInterfaceIndexSignature1.ts (1 errors) ==== interface I { public [a: string]: number; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'public' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt index d448aaa3f29..1e94ed36b23 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration10.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,11): error TS1030: 'static' modifier already seen. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts(2,4): error TS1071: 'static' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration10.ts (1 errors) ==== class C { static static [x: string]: string; - ~~~~~~ -!!! error TS1030: 'static' modifier already seen. + ~~~~~~ +!!! error TS1071: 'static' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserIndexMemberDeclaration6.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration6.errors.txt index 713031dbe4f..df15ae5950e 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration6.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration6.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.ts(2,4): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.ts(2,4): error TS1071: 'static' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration6.ts (1 errors) ==== class C { static [x: string]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'static' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserIndexMemberDeclaration7.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration7.errors.txt index 64984ee642f..ebbfaf8af4d 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration7.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration7.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration7.ts(2,4): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration7.ts(2,4): error TS1071: 'public' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration7.ts (1 errors) ==== class C { public [x: string]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'public' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserIndexMemberDeclaration8.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration8.errors.txt index 1fffaa299ce..4a5eec13cb5 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration8.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration8.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration8.ts(2,4): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration8.ts(2,4): error TS1071: 'private' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration8.ts (1 errors) ==== class C { private [x: string]: string; ~~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'private' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserIndexMemberDeclaration9.errors.txt b/tests/baselines/reference/parserIndexMemberDeclaration9.errors.txt index 493a7894499..88360adcd70 100644 --- a/tests/baselines/reference/parserIndexMemberDeclaration9.errors.txt +++ b/tests/baselines/reference/parserIndexMemberDeclaration9.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration9.ts(2,4): error TS1031: 'export' modifier cannot appear on a class element. +tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration9.ts(2,4): error TS1071: 'export' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration9.ts (1 errors) ==== class C { export [x: string]: string; ~~~~~~ -!!! error TS1031: 'export' modifier cannot appear on a class element. +!!! error TS1071: 'export' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/parserModifierOnPropertySignature1.errors.txt b/tests/baselines/reference/parserModifierOnPropertySignature1.errors.txt index 4c8750a80c4..1ddb9712bf2 100644 --- a/tests/baselines/reference/parserModifierOnPropertySignature1.errors.txt +++ b/tests/baselines/reference/parserModifierOnPropertySignature1.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts(2,5): error TS1131: Property or signature expected. +tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts(2,5): error TS1070: 'public' modifier cannot appear on a type member. ==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnPropertySignature1.ts (1 errors) ==== interface Foo{ public biz; ~~~~~~ -!!! error TS1131: Property or signature expected. +!!! error TS1070: 'public' modifier cannot appear on a type member. } \ No newline at end of file diff --git a/tests/baselines/reference/parserSymbolIndexer3.errors.txt b/tests/baselines/reference/parserSymbolIndexer3.errors.txt index 5484a096d4c..27d3a522b3e 100644 --- a/tests/baselines/reference/parserSymbolIndexer3.errors.txt +++ b/tests/baselines/reference/parserSymbolIndexer3.errors.txt @@ -1,9 +1,9 @@ -tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolIndexer3.ts(2,13): error TS1023: An index signature parameter type must be 'string' or 'number'. +tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolIndexer3.ts(2,5): error TS1071: 'static' modifier cannot appear on an index signature. ==== tests/cases/conformance/parser/ecmascript6/Symbols/parserSymbolIndexer3.ts (1 errors) ==== class C { static [s: symbol]: string; - ~ -!!! error TS1023: An index signature parameter type must be 'string' or 'number'. + ~~~~~~ +!!! error TS1071: 'static' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/privateIndexer.errors.txt b/tests/baselines/reference/privateIndexer.errors.txt index 5d8ae7c9351..5ee21d8e4e3 100644 --- a/tests/baselines/reference/privateIndexer.errors.txt +++ b/tests/baselines/reference/privateIndexer.errors.txt @@ -1,6 +1,6 @@ -tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(4,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(8,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(12,5): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(4,5): error TS1071: 'private' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(8,5): error TS1071: 'private' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(12,5): error TS1071: 'private' modifier cannot appear on an index signature. ==== tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts (3 errors) ==== @@ -9,17 +9,17 @@ tests/cases/conformance/classes/indexMemberDeclarations/privateIndexer.ts(12,5): class C { private [x: string]: string; ~~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'private' modifier cannot appear on an index signature. } class D { private [x: number]: string; ~~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'private' modifier cannot appear on an index signature. } class E { private [x: string]: T; ~~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'private' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/publicIndexer.errors.txt b/tests/baselines/reference/publicIndexer.errors.txt index 860290ea25b..29454f2a208 100644 --- a/tests/baselines/reference/publicIndexer.errors.txt +++ b/tests/baselines/reference/publicIndexer.errors.txt @@ -1,6 +1,6 @@ -tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(4,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(8,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(12,5): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(4,5): error TS1071: 'public' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(8,5): error TS1071: 'public' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(12,5): error TS1071: 'public' modifier cannot appear on an index signature. ==== tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts (3 errors) ==== @@ -9,17 +9,17 @@ tests/cases/conformance/classes/indexMemberDeclarations/publicIndexer.ts(12,5): class C { public [x: string]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'public' modifier cannot appear on an index signature. } class D { public [x: number]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'public' modifier cannot appear on an index signature. } class E { public [x: string]: T; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'public' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/staticAsIdentifier.errors.txt b/tests/baselines/reference/staticAsIdentifier.errors.txt index 52108a5a221..4173b0b14c5 100644 --- a/tests/baselines/reference/staticAsIdentifier.errors.txt +++ b/tests/baselines/reference/staticAsIdentifier.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/staticAsIdentifier.ts(2,12): error TS1030: 'static' modifier already seen. +tests/cases/compiler/staticAsIdentifier.ts(2,5): error TS1071: 'static' modifier cannot appear on an index signature. ==== tests/cases/compiler/staticAsIdentifier.ts (1 errors) ==== class C { static static - ~~~~~~ -!!! error TS1030: 'static' modifier already seen. + ~~~~~~ +!!! error TS1071: 'static' modifier cannot appear on an index signature. [x: string]: string; } \ No newline at end of file diff --git a/tests/baselines/reference/staticIndexer.errors.txt b/tests/baselines/reference/staticIndexer.errors.txt index 3e910121051..19ed61df658 100644 --- a/tests/baselines/reference/staticIndexer.errors.txt +++ b/tests/baselines/reference/staticIndexer.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/staticIndexer.ts(2,5): error TS1145: Modifiers not permitted on index signature members. +tests/cases/compiler/staticIndexer.ts(2,5): error TS1071: 'static' modifier cannot appear on an index signature. ==== tests/cases/compiler/staticIndexer.ts (1 errors) ==== class C { static [s: string]: number; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'static' modifier cannot appear on an index signature. } \ No newline at end of file diff --git a/tests/baselines/reference/staticIndexers.errors.txt b/tests/baselines/reference/staticIndexers.errors.txt index 29c46d0ce8c..8223a38a9ae 100644 --- a/tests/baselines/reference/staticIndexers.errors.txt +++ b/tests/baselines/reference/staticIndexers.errors.txt @@ -1,6 +1,6 @@ -tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(4,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(8,5): error TS1145: Modifiers not permitted on index signature members. -tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(12,5): error TS1145: Modifiers not permitted on index signature members. +tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(4,5): error TS1071: 'static' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(8,5): error TS1071: 'static' modifier cannot appear on an index signature. +tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(12,5): error TS1071: 'static' modifier cannot appear on an index signature. tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(12,25): error TS2302: Static members cannot reference class type parameters. @@ -10,19 +10,19 @@ tests/cases/conformance/classes/indexMemberDeclarations/staticIndexers.ts(12,25) class C { static [x: string]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'static' modifier cannot appear on an index signature. } class D { static [x: number]: string; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'static' modifier cannot appear on an index signature. } class E { static [x: string]: T; ~~~~~~ -!!! error TS1145: Modifiers not permitted on index signature members. +!!! error TS1071: 'static' modifier cannot appear on an index signature. ~ !!! error TS2302: Static members cannot reference class type parameters. } \ No newline at end of file From 0dc485ad2c14e6ad3d2115a9f61366c1976b9d13 Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Fri, 15 Jan 2016 23:31:45 -0500 Subject: [PATCH 035/160] Added test case --- ...gReturnStatementsAndExpressions.errors.txt | 23 ++++++++++++++++--- ...nsMissingReturnStatementsAndExpressions.js | 20 ++++++++++++++++ ...nsMissingReturnStatementsAndExpressions.ts | 11 +++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt index 58ffd051d4d..41528f70880 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt @@ -1,9 +1,11 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(3,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. -tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(95,16): error TS2378: A 'get' accessor must return a value. -tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(118,5): error TS1003: Identifier expected. +tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(93,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. +tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(101,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. +tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(106,16): error TS2378: A 'get' accessor must return a value. +tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(129,5): error TS1003: Identifier expected. -==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (3 errors) ==== +==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (5 errors) ==== function f1(): string { @@ -98,6 +100,21 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(118,5): e return "Okay, not type annotated."; } + function f19(): void | number { + ~~~~~~~~~~~~~ +!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. + // Okay; function return type is union containing void + } + + function f20(): any | number { + // Okay; function return type is union containing any + } + + function f21(): number | string { + ~~~~~~~~~~~~~~~ +!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. + // Not okay; union does not contain void or any + } class C { public get m1() { diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js index 4dfe851683a..17468722e20 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js @@ -91,6 +91,17 @@ function f18() { return "Okay, not type annotated."; } +function f19(): void | number { + // Okay; function return type is union containing void +} + +function f20(): any | number { + // Okay; function return type is union containing any +} + +function f21(): number | string { + // Not okay; union does not contain void or any +} class C { public get m1() { @@ -191,6 +202,15 @@ function f17() { function f18() { return "Okay, not type annotated."; } +function f19() { + // Okay; function return type is union containing void +} +function f20() { + // Okay; function return type is union containing any +} +function f21() { + // Not okay; union does not contain void or any +} var C = (function () { function C() { } diff --git a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts index fde615af41d..582940038c5 100644 --- a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts +++ b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts @@ -92,6 +92,17 @@ function f18() { return "Okay, not type annotated."; } +function f19(): void | number { + // Okay; function return type is union containing void +} + +function f20(): any | number { + // Okay; function return type is union containing any +} + +function f21(): number | string { + // Not okay; union does not contain void or any +} class C { public get m1() { From e568892ea52eb0b479f890a2aa833e019426a2c3 Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Fri, 15 Jan 2016 23:50:30 -0500 Subject: [PATCH 036/160] Allow missing return for unions containing any or void --- doc/spec.md | 10 +++++----- src/compiler/checker.ts | 11 +++++++++-- ...nsMissingReturnStatementsAndExpressions.errors.txt | 5 +---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/spec.md b/doc/spec.md index 30de2c5a6b6..4c1ec4f2302 100644 --- a/doc/spec.md +++ b/doc/spec.md @@ -265,7 +265,7 @@ function f() { To benefit from this inference, a programmer can use the TypeScript language service. For example, a code editor can incorporate the TypeScript language service and use the service to find the members of a string object as in the following screen shot. -  ![](images/image1.png) +  ![](images/image1.png) In this example, the programmer benefits from type inference without providing type annotations. Some beneficial tools, however, do require the programmer to provide type annotations. In TypeScript, we can express a parameter requirement as in the following code fragment. @@ -413,7 +413,7 @@ This signature denotes that a function may be passed as the parameter of the '$' A typical client would not need to add any additional typing but could just use a community-supplied typing to discover (through statement completion with documentation tips) and verify (through static checking) correct use of the library, as in the following screen shot. -  ![](images/image2.png) +  ![](images/image2.png) Section [3.3](#3.3) provides additional information about object types. @@ -630,7 +630,7 @@ An important goal of TypeScript is to provide accurate and straightforward types JavaScript programming interfaces often include functions whose behavior is discriminated by a string constant passed to the function. The Document Object Model makes heavy use of this pattern. For example, the following screen shot shows that the 'createElement' method of the 'document' object has multiple signatures, some of which identify the types returned when specific strings are passed into the method. -  ![](images/image3.png) +  ![](images/image3.png) The following code fragment uses this feature. Because the 'span' variable is inferred to have the type 'HTMLSpanElement', the code can reference without static error the 'isMultiline' property of 'span'. @@ -641,7 +641,7 @@ span.isMultiLine = false; // OK: HTMLSpanElement has isMultiline property In the following screen shot, a programming tool combines information from overloading on string parameters with contextual typing to infer that the type of the variable 'e' is 'MouseEvent' and that therefore 'e' has a 'clientX' property. -  ![](images/image4.png) +  ![](images/image4.png) Section [3.9.2.4](#3.9.2.4) provides details on how to use string literals in function signatures. @@ -3885,7 +3885,7 @@ function g(x: number) { the inferred return type for 'f' and 'g' is Any because the functions reference themselves through a cycle with no return type annotations. Adding an explicit return type 'number' to either breaks the cycle and causes the return type 'number' to be inferred for the other. -An explicitly typed function whose return type isn't the Void or the Any type must have at least one return statement somewhere in its body. An exception to this rule is if the function implementation consists of a single 'throw' statement. +An explicitly typed function whose return type isn't the Void type, the Any type, or a union type containing the Void or Any type as a constituent must have at least one return statement somewhere in its body. An exception to this rule is if the function implementation consists of a single 'throw' statement. The type of 'this' in a function implementation is the Any type. diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index dd943ec807e..133f09ef422 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2466,6 +2466,12 @@ namespace ts { return type && (type.flags & TypeFlags.Any) !== 0; } + function isUnionContaining(type: Type, kinds: TypeFlags) { + return type + && (type.flags & TypeFlags.Union) + && someConstituentTypeHasKind(type, kinds); + } + // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been // assigned by contextual typing. function getTypeForBindingElementParent(node: VariableLikeDeclaration) { @@ -10201,7 +10207,8 @@ namespace ts { /* *TypeScript Specification 1.0 (6.3) - July 2014 - * An explicitly typed function whose return type isn't the Void or the Any type + * An explicitly typed function whose return type isn't the Void type, + * the Any type, or a union type containing the Void or Any type as a constituent * must have at least one return statement somewhere in its body. * An exception to this rule is if the function implementation consists of a single 'throw' statement. * @param returnType - return type of the function, can be undefined if return type is not explicitly specified @@ -10212,7 +10219,7 @@ namespace ts { } // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions. - if (returnType === voidType || isTypeAny(returnType)) { + if (returnType === voidType || isTypeAny(returnType) || isUnionContaining(returnType, TypeFlags.Any) || isUnionContaining(returnType, TypeFlags.Void)) { return; } diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt index 41528f70880..1ccc296b75b 100644 --- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt +++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt @@ -1,11 +1,10 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(3,16): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. -tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(93,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(101,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(106,16): error TS2378: A 'get' accessor must return a value. tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(129,5): error TS1003: Identifier expected. -==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (5 errors) ==== +==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (4 errors) ==== function f1(): string { @@ -101,8 +100,6 @@ tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts(129,5): e } function f19(): void | number { - ~~~~~~~~~~~~~ -!!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value. // Okay; function return type is union containing void } From eb87bad2c88ead32de1739317ffc74c6c524279a Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Sat, 16 Jan 2016 00:15:19 -0500 Subject: [PATCH 037/160] Removed trailing whitespace --- src/compiler/checker.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 133f09ef422..b7637682f1a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2467,9 +2467,7 @@ namespace ts { } function isUnionContaining(type: Type, kinds: TypeFlags) { - return type - && (type.flags & TypeFlags.Union) - && someConstituentTypeHasKind(type, kinds); + return type && (type.flags & TypeFlags.Union) && someConstituentTypeHasKind(type, kinds); } // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been From d50435736bf54562581db4c6eccc97f0afa460e5 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 16 Jan 2016 12:09:18 -0800 Subject: [PATCH 038/160] Check readonly in assignments and type relations --- src/compiler/checker.ts | 108 ++++++++++----------------- src/compiler/diagnosticMessages.json | 4 + 2 files changed, 45 insertions(+), 67 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c73b6309f16..7ad6a5d6d7a 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5523,6 +5523,13 @@ namespace ts { } return Ternary.False; } + if (isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) { + if (reportErrors) { + reportError(Diagnostics.Property_0_is_read_only_in_type_1_but_read_write_in_type_2, + symbolToString(targetProp), typeToString(source), typeToString(target)); + } + return Ternary.False; + } } } } @@ -10323,81 +10330,48 @@ namespace ts { return true; } - function checkReferenceExpression(n: Node, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean { - function findSymbol(n: Node): Symbol { - const symbol = getNodeLinks(n).resolvedSymbol; - // Because we got the symbol from the resolvedSymbol property, it might be of kind - // SymbolFlags.ExportValue. In this case it is necessary to get the actual export - // symbol, which will have the correct flags set on it. - return symbol && getExportSymbolOfValueSymbolIfExported(symbol); + function isReadonlySymbol(symbol: Symbol): boolean { + if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { + return symbol === undefinedSymbol || (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; } - - function isReferenceOrErrorExpression(n: Node): boolean { - // TypeScript 1.0 spec (April 2014): - // Expressions are classified as values or references. - // References are the subset of expressions that are permitted as the target of an assignment. - // Specifically, references are combinations of identifiers(section 4.3), parentheses(section 4.7), - // and property accesses(section 4.10). - // All other expression constructs described in this chapter are classified as values. - switch (n.kind) { - case SyntaxKind.Identifier: { - const symbol = findSymbol(n); - // TypeScript 1.0 spec (April 2014): 4.3 - // An identifier expression that references a variable or parameter is classified as a reference. - // An identifier expression that references any other kind of entity is classified as a value(and therefore cannot be the target of an assignment). - return !symbol || symbol === unknownSymbol || symbol === argumentsSymbol || (symbol.flags & SymbolFlags.Variable) !== 0; - } - case SyntaxKind.PropertyAccessExpression: { - const symbol = findSymbol(n); - // TypeScript 1.0 spec (April 2014): 4.10 - // A property access expression is always classified as a reference. - // NOTE (not in spec): assignment to enum members should not be allowed - return !symbol || symbol === unknownSymbol || (symbol.flags & ~SymbolFlags.EnumMember) !== 0; - } - case SyntaxKind.ElementAccessExpression: - // old compiler doesn't check indexed access - return true; - case SyntaxKind.ParenthesizedExpression: - return isReferenceOrErrorExpression((n).expression); - default: - return false; - } + if (symbol.flags & SymbolFlags.Accessor) { + return !(symbol.flags & SymbolFlags.SetAccessor); } + return false; + } - function isConstVariableReference(n: Node): boolean { - switch (n.kind) { - case SyntaxKind.Identifier: - case SyntaxKind.PropertyAccessExpression: { - const symbol = findSymbol(n); - return symbol && (symbol.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0; - } - case SyntaxKind.ElementAccessExpression: { - const index = (n).argumentExpression; - const symbol = findSymbol((n).expression); - if (symbol && index && index.kind === SyntaxKind.StringLiteral) { - const name = (index).text; - const prop = getPropertyOfType(getTypeOfSymbol(symbol), name); - return prop && (prop.flags & SymbolFlags.Variable) !== 0 && (getDeclarationFlagsFromSymbol(prop) & NodeFlags.Const) !== 0; - } - return false; - } - case SyntaxKind.ParenthesizedExpression: - return isConstVariableReference((n).expression); - default: - return false; - } + function isConstantSymbol(symbol: Symbol): boolean { + if (symbol.flags & SymbolFlags.Variable) { + return (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0; } + } - if (!isReferenceOrErrorExpression(n)) { - error(n, invalidReferenceMessage); + function checkReferenceExpression(expr: Expression, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean { + // References are combinations of identifiers, parentheses, and property accesses. + const node = skipParenthesizedNodes(expr); + if (node.kind !== SyntaxKind.Identifier && node.kind !== SyntaxKind.PropertyAccessExpression && node.kind !== SyntaxKind.ElementAccessExpression) { + error(expr, invalidReferenceMessage); return false; } - - if (isConstVariableReference(n)) { - error(n, constantVariableMessage); - return false; + // Because we got the symbol from the resolvedSymbol property, it might be of kind + // SymbolFlags.ExportValue. In this case it is necessary to get the actual export + // symbol, which will have the correct flags set on it. + const symbol = getExportSymbolOfValueSymbolIfExported(getNodeLinks(node).resolvedSymbol); + if (symbol) { + if (symbol !== unknownSymbol && symbol !== argumentsSymbol) { + if (symbol === undefinedSymbol || !(symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Method | SymbolFlags.Accessor))) { + error(expr, invalidReferenceMessage); + return false; + } + if (isReadonlySymbol(symbol) || isConstantSymbol(symbol)) { + error(expr, constantVariableMessage); + return false; + } + } + } + else { + // Check indexers } - return true; } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index a10787764d9..98a05f5a302 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -991,6 +991,10 @@ "category": "Error", "code": 2342 }, + "Property '{0}' is read-only in type '{1}' but read-write in type '{2}'.": { + "category": "Error", + "code": 2343 + }, "Type '{0}' does not satisfy the constraint '{1}'.": { "category": "Error", "code": 2344 From 8319f2ee98f2ef943e920992c683533fb70ae6f5 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 16 Jan 2016 12:10:16 -0800 Subject: [PATCH 039/160] Accepting new baselines --- ...nmentToParenthesizedIdentifiers.errors.txt | 35 +++++++++---------- .../decrementOperatorWithEnumType.errors.txt | 8 ++++- .../incrementOperatorWithEnumType.errors.txt | 8 ++++- .../interfaceImplementation5.errors.txt | 12 ++++++- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt index a50ffdf72d7..dcfed4ae28b 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt @@ -6,15 +6,12 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(17,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(18,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(25,5): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(31,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. - Types of property 'x' are incompatible. - Type 'string' is not assignable to type 'number'. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(32,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. - Types of property 'x' are incompatible. - Type 'string' is not assignable to type 'number'. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(33,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. - Types of property 'x' are incompatible. - Type 'string' is not assignable to type 'number'. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(27,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(28,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(29,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(31,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(32,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(33,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(37,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(38,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(43,5): error TS2322: Type 'string' is not assignable to type 'number'. @@ -30,7 +27,7 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(70,1): error TS2364: Invalid left-hand side of assignment expression. -==== tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts (24 errors) ==== +==== tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts (27 errors) ==== var x: number; x = 3; // OK (x) = 3; // OK @@ -74,24 +71,24 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize !!! error TS2364: Invalid left-hand side of assignment expression. } M2.M3 = { x: 3 }; // OK + ~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. (M2).M3 = { x: 3 }; // OK + ~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. (M2.M3) = { x: 3 }; // OK + ~~~~~~~ +!!! error TS2364: Invalid left-hand side of assignment expression. M2.M3 = { x: '' }; // Error ~~~~~ -!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. -!!! error TS2322: Types of property 'x' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type 'number'. +!!! error TS2364: Invalid left-hand side of assignment expression. (M2).M3 = { x: '' }; // Error ~~~~~~~ -!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. -!!! error TS2322: Types of property 'x' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type 'number'. +!!! error TS2364: Invalid left-hand side of assignment expression. (M2.M3) = { x: '' }; // Error ~~~~~~~ -!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. -!!! error TS2322: Types of property 'x' are incompatible. -!!! error TS2322: Type 'string' is not assignable to type 'number'. +!!! error TS2364: Invalid left-hand side of assignment expression. function fn() { } diff --git a/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt b/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt index a0c30e9dc93..221163c097f 100644 --- a/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt @@ -1,21 +1,27 @@ +tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(6,25): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(7,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(10,3): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,1): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,7): error TS2304: Cannot find name 'A'. -==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts (3 errors) ==== +==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts (5 errors) ==== // -- operator on enum type enum ENUM1 { A, B, "" }; // expression var ResultIsNumber1 = --ENUM1["A"]; + ~~~~~~~~~~ +!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. var ResultIsNumber2 = ENUM1.A--; ~~~~~~~ !!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. // miss assignment operator --ENUM1["A"]; + ~~~~~~~~~~ +!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. ENUM1[A]--; ~~~~~~~~ diff --git a/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt b/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt index 9bcf6c7612f..8c556f89732 100644 --- a/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt @@ -1,20 +1,26 @@ +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(6,25): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(7,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(10,3): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(12,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -==== tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts (2 errors) ==== +==== tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts (4 errors) ==== // ++ operator on enum type enum ENUM1 { A, B, "" }; // expression var ResultIsNumber1 = ++ENUM1["B"]; + ~~~~~~~~~~ +!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. var ResultIsNumber2 = ENUM1.B++; ~~~~~~~ !!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. // miss assignment operator ++ENUM1["B"]; + ~~~~~~~~~~ +!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. ENUM1.B++; ~~~~~~~ diff --git a/tests/baselines/reference/interfaceImplementation5.errors.txt b/tests/baselines/reference/interfaceImplementation5.errors.txt index 882d8516121..aba0c9f8850 100644 --- a/tests/baselines/reference/interfaceImplementation5.errors.txt +++ b/tests/baselines/reference/interfaceImplementation5.errors.txt @@ -1,19 +1,26 @@ +tests/cases/compiler/interfaceImplementation5.ts(5,7): error TS2420: Class 'C1' incorrectly implements interface 'I1'. + Property 'getset1' is read-only in type 'C1' but read-write in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(6,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(10,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(14,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. +tests/cases/compiler/interfaceImplementation5.ts(18,7): error TS2420: Class 'C4' incorrectly implements interface 'I1'. + Property 'getset1' is read-only in type 'C4' but read-write in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(19,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(23,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(27,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -==== tests/cases/compiler/interfaceImplementation5.ts (8 errors) ==== +==== tests/cases/compiler/interfaceImplementation5.ts (10 errors) ==== interface I1 { getset1:number; } class C1 implements I1 { + ~~ +!!! error TS2420: Class 'C1' incorrectly implements interface 'I1'. +!!! error TS2420: Property 'getset1' is read-only in type 'C1' but read-write in type 'I1'. public get getset1(){return 1;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. @@ -35,6 +42,9 @@ tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors } class C4 implements I1 { + ~~ +!!! error TS2420: Class 'C4' incorrectly implements interface 'I1'. +!!! error TS2420: Property 'getset1' is read-only in type 'C4' but read-write in type 'I1'. public get getset1(){var x:any; return x;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. From 07763ed1f8c7f6281ec27d16cb996191ee0812b7 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 17 Jan 2016 07:24:51 -0800 Subject: [PATCH 040/160] Removing unused function --- src/compiler/parser.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 6738b9c2d95..46dd9a7defa 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -2315,15 +2315,6 @@ namespace ts { return parsePropertyOrMethodSignature(fullStart, modifiers); } - function parseIndexSignatureWithModifiers() { - const fullStart = scanner.getStartPos(); - const decorators = parseDecorators(); - const modifiers = parseModifiers(); - return isIndexSignature() - ? parseIndexSignatureDeclaration(fullStart, decorators, modifiers) - : undefined; - } - function isStartOfConstructSignature() { nextToken(); return token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken; From 5b233e4d9df5f88bdfe9c2c25e2386ffacbfa3c3 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 17 Jan 2016 09:47:13 -0800 Subject: [PATCH 041/160] Refactor to introduce IndexInfo type --- src/compiler/checker.ts | 161 ++++++++++++++++++++++++---------------- src/compiler/types.ts | 13 +++- 2 files changed, 105 insertions(+), 69 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7ad6a5d6d7a..1f815a6fd3e 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -133,6 +133,8 @@ namespace ts { const anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); + const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true); + const globals: SymbolTable = {}; let globalESSymbolConstructorSymbol: Symbol; @@ -1319,19 +1321,19 @@ namespace ts { return result || emptyArray; } - function setObjectTypeMembers(type: ObjectType, members: SymbolTable, callSignatures: Signature[], constructSignatures: Signature[], stringIndexType: Type, numberIndexType: Type): ResolvedType { + function setObjectTypeMembers(type: ObjectType, members: SymbolTable, callSignatures: Signature[], constructSignatures: Signature[], stringIndexInfo: IndexInfo, numberIndexInfo: IndexInfo): ResolvedType { (type).members = members; (type).properties = getNamedMembers(members); (type).callSignatures = callSignatures; (type).constructSignatures = constructSignatures; - if (stringIndexType) (type).stringIndexType = stringIndexType; - if (numberIndexType) (type).numberIndexType = numberIndexType; + if (stringIndexInfo) (type).stringIndexInfo = stringIndexInfo; + if (numberIndexInfo) (type).numberIndexInfo = numberIndexInfo; return type; } - function createAnonymousType(symbol: Symbol, members: SymbolTable, callSignatures: Signature[], constructSignatures: Signature[], stringIndexType: Type, numberIndexType: Type): ResolvedType { + function createAnonymousType(symbol: Symbol, members: SymbolTable, callSignatures: Signature[], constructSignatures: Signature[], stringIndexInfo: IndexInfo, numberIndexInfo: IndexInfo): ResolvedType { return setObjectTypeMembers(createObjectType(TypeFlags.Anonymous, symbol), - members, callSignatures, constructSignatures, stringIndexType, numberIndexType); + members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } function forEachSymbolTableInScope(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T { @@ -1967,7 +1969,7 @@ namespace ts { function writeLiteralType(type: ObjectType, flags: TypeFormatFlags) { const resolved = resolveStructuredTypeMembers(type); - if (!resolved.properties.length && !resolved.stringIndexType && !resolved.numberIndexType) { + if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) { if (!resolved.callSignatures.length && !resolved.constructSignatures.length) { writePunctuation(writer, SyntaxKind.OpenBraceToken); writePunctuation(writer, SyntaxKind.CloseBraceToken); @@ -2013,7 +2015,7 @@ namespace ts { writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } - if (resolved.stringIndexType) { + if (resolved.stringIndexInfo) { // [x: string]: writePunctuation(writer, SyntaxKind.OpenBracketToken); writer.writeParameter(getIndexerParameterName(resolved, IndexKind.String, /*fallbackName*/"x")); @@ -2023,11 +2025,11 @@ namespace ts { writePunctuation(writer, SyntaxKind.CloseBracketToken); writePunctuation(writer, SyntaxKind.ColonToken); writeSpace(writer); - writeType(resolved.stringIndexType, TypeFormatFlags.None); + writeType(resolved.stringIndexInfo.type, TypeFormatFlags.None); writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } - if (resolved.numberIndexType) { + if (resolved.numberIndexInfo) { // [x: number]: writePunctuation(writer, SyntaxKind.OpenBracketToken); writer.writeParameter(getIndexerParameterName(resolved, IndexKind.Number, /*fallbackName*/"x")); @@ -2037,7 +2039,7 @@ namespace ts { writePunctuation(writer, SyntaxKind.CloseBracketToken); writePunctuation(writer, SyntaxKind.ColonToken); writeSpace(writer); - writeType(resolved.numberIndexType, TypeFormatFlags.None); + writeType(resolved.numberIndexInfo.type, TypeFormatFlags.None); writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } @@ -3343,8 +3345,8 @@ namespace ts { (type).declaredProperties = getNamedMembers(symbol.members); (type).declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]); (type).declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]); - (type).declaredStringIndexType = getIndexTypeOfSymbol(symbol, IndexKind.String); - (type).declaredNumberIndexType = getIndexTypeOfSymbol(symbol, IndexKind.Number); + (type).declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, IndexKind.String); + (type).declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, IndexKind.Number); } return type; } @@ -3362,15 +3364,15 @@ namespace ts { let members = source.symbol.members; let callSignatures = source.declaredCallSignatures; let constructSignatures = source.declaredConstructSignatures; - let stringIndexType = source.declaredStringIndexType; - let numberIndexType = source.declaredNumberIndexType; + let stringIndexInfo = source.declaredStringIndexInfo; + let numberIndexInfo = source.declaredNumberIndexInfo; if (!rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) { mapper = createTypeMapper(typeParameters, typeArguments); members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1); callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature); constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature); - stringIndexType = instantiateType(source.declaredStringIndexType, mapper); - numberIndexType = instantiateType(source.declaredNumberIndexType, mapper); + stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper); + numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper); } const baseTypes = getBaseTypes(source); if (baseTypes.length) { @@ -3383,11 +3385,11 @@ namespace ts { addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType)); callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Call)); constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Construct)); - stringIndexType = stringIndexType || getIndexTypeOfType(instantiatedBaseType, IndexKind.String); - numberIndexType = numberIndexType || getIndexTypeOfType(instantiatedBaseType, IndexKind.Number); + stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, IndexKind.String); + numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, IndexKind.Number); } } - setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); + setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } function resolveClassOrInterfaceMembers(type: InterfaceType): void { @@ -3458,7 +3460,7 @@ namespace ts { const arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type])); const members = createTupleTypeMemberSymbols(type.elementTypes); addInheritedMembers(members, arrayType.properties); - setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexType, arrayType.numberIndexType); + setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo); } function findMatchingSignature(signatureList: Signature[], signature: Signature, partialMatch: boolean, ignoreReturnTypes: boolean): Signature { @@ -3526,16 +3528,18 @@ namespace ts { return result || emptyArray; } - function getUnionIndexType(types: Type[], kind: IndexKind): Type { + function getUnionIndexInfo(types: Type[], kind: IndexKind): IndexInfo { const indexTypes: Type[] = []; + let isAnyReadonly = false; for (const type of types) { - const indexType = getIndexTypeOfType(type, kind); - if (!indexType) { + const indexInfo = getIndexInfoOfType(type, kind); + if (!indexInfo) { return undefined; } - indexTypes.push(indexType); + indexTypes.push(indexInfo.type); + isAnyReadonly = isAnyReadonly || indexInfo.isReadonly; } - return getUnionType(indexTypes); + return createIndexInfo(getUnionType(indexTypes), isAnyReadonly); } function resolveUnionTypeMembers(type: UnionType) { @@ -3543,29 +3547,34 @@ namespace ts { // type use getPropertiesOfType (only the language service uses this). const callSignatures = getUnionSignatures(type.types, SignatureKind.Call); const constructSignatures = getUnionSignatures(type.types, SignatureKind.Construct); - const stringIndexType = getUnionIndexType(type.types, IndexKind.String); - const numberIndexType = getUnionIndexType(type.types, IndexKind.Number); - setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType); + const stringIndexInfo = getUnionIndexInfo(type.types, IndexKind.String); + const numberIndexInfo = getUnionIndexInfo(type.types, IndexKind.Number); + setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } function intersectTypes(type1: Type, type2: Type): Type { return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]); } + function intersectIndexInfos(info1: IndexInfo, info2: IndexInfo): IndexInfo { + return !info1 ? info2 : !info2 ? info1 : createIndexInfo( + getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly); + } + function resolveIntersectionTypeMembers(type: IntersectionType) { // The members and properties collections are empty for intersection types. To get all properties of an // intersection type use getPropertiesOfType (only the language service uses this). let callSignatures: Signature[] = emptyArray; let constructSignatures: Signature[] = emptyArray; - let stringIndexType: Type = undefined; - let numberIndexType: Type = undefined; + let stringIndexInfo: IndexInfo = undefined; + let numberIndexInfo: IndexInfo = undefined; for (const t of type.types) { callSignatures = concatenate(callSignatures, getSignaturesOfType(t, SignatureKind.Call)); constructSignatures = concatenate(constructSignatures, getSignaturesOfType(t, SignatureKind.Construct)); - stringIndexType = intersectTypes(stringIndexType, getIndexTypeOfType(t, IndexKind.String)); - numberIndexType = intersectTypes(numberIndexType, getIndexTypeOfType(t, IndexKind.Number)); + stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, IndexKind.String)); + numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, IndexKind.Number)); } - setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexType, numberIndexType); + setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } function resolveAnonymousTypeMembers(type: AnonymousType) { @@ -3574,17 +3583,17 @@ namespace ts { const members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false); const callSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Call), type.mapper, instantiateSignature); const constructSignatures = instantiateList(getSignaturesOfType(type.target, SignatureKind.Construct), type.mapper, instantiateSignature); - const stringIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.String), type.mapper); - const numberIndexType = instantiateType(getIndexTypeOfType(type.target, IndexKind.Number), type.mapper); - setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); + const stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, IndexKind.String), type.mapper); + const numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, IndexKind.Number), type.mapper); + setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } else if (symbol.flags & SymbolFlags.TypeLiteral) { const members = symbol.members; const callSignatures = getSignaturesOfSymbol(members["__call"]); const constructSignatures = getSignaturesOfSymbol(members["__new"]); - const stringIndexType = getIndexTypeOfSymbol(symbol, IndexKind.String); - const numberIndexType = getIndexTypeOfSymbol(symbol, IndexKind.Number); - setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexType, numberIndexType); + const stringIndexInfo = getIndexInfoOfSymbol(symbol, IndexKind.String); + const numberIndexInfo = getIndexInfoOfSymbol(symbol, IndexKind.Number); + setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo); } else { // Combinations of function, class, enum and module @@ -3605,8 +3614,8 @@ namespace ts { addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType)); } } - const numberIndexType = (symbol.flags & SymbolFlags.Enum) ? stringType : undefined; - setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexType); + const numberIndexInfo = symbol.flags & SymbolFlags.Enum ? enumNumberIndexInfo : undefined; + setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo); // We resolve the members before computing the signatures because a signature may use // typeof with a qualified name expression that circularly references the type we are // in the process of resolving (see issue #6072). The temporarily empty signature list @@ -3825,13 +3834,25 @@ namespace ts { function getSignaturesOfType(type: Type, kind: SignatureKind): Signature[] { return getSignaturesOfStructuredType(getApparentType(type), kind); } - function getIndexTypeOfStructuredType(type: Type, kind: IndexKind): Type { + + function getIndexInfoOfStructuredType(type: Type, kind: IndexKind): IndexInfo { if (type.flags & TypeFlags.StructuredType) { const resolved = resolveStructuredTypeMembers(type); - return kind === IndexKind.String ? resolved.stringIndexType : resolved.numberIndexType; + return kind === IndexKind.String ? resolved.stringIndexInfo : resolved.numberIndexInfo; } } + function getIndexTypeOfStructuredType(type: Type, kind: IndexKind): Type { + const info = getIndexInfoOfStructuredType(type, kind); + return info && info.type; + } + + // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and + // maps primitive types and type parameters are to their apparent types. + function getIndexInfoOfType(type: Type, kind: IndexKind): IndexInfo { + return getIndexInfoOfStructuredType(getApparentType(type), kind); + } + // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and // maps primitive types and type parameters are to their apparent types. function getIndexTypeOfType(type: Type, kind: IndexKind): Type { @@ -4104,11 +4125,17 @@ namespace ts { return undefined; } - function getIndexTypeOfSymbol(symbol: Symbol, kind: IndexKind): Type { + function createIndexInfo(type: Type, isReadonly: boolean): IndexInfo { + return { type, isReadonly }; + } + + function getIndexInfoOfSymbol(symbol: Symbol, kind: IndexKind): IndexInfo { const declaration = getIndexDeclarationOfSymbol(symbol, kind); - return declaration - ? declaration.type ? getTypeFromTypeNode(declaration.type) : anyType - : undefined; + if (declaration) { + return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, + (declaration.flags & NodeFlags.Readonly) !== 0); + } + return undefined; } function getConstraintDeclaration(type: TypeParameter) { @@ -4845,6 +4872,10 @@ namespace ts { return type; } + function instantiateIndexInfo(info: IndexInfo, mapper: TypeMapper): IndexInfo { + return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly); + } + // Returns true if the given expression contains (at any level of nesting) a function or arrow expression // that is subject to contextual typing. function isContextSensitive(node: Expression | MethodDeclaration | ObjectLiteralElement): boolean { @@ -5251,7 +5282,7 @@ namespace ts { if (type.flags & TypeFlags.ObjectType) { const resolved = resolveStructuredTypeMembers(type); if (relation === assignableRelation && (type === globalObjectType || resolved.properties.length === 0) || - resolved.stringIndexType || resolved.numberIndexType || getPropertyOfType(type, name)) { + resolved.stringIndexInfo || resolved.numberIndexInfo || getPropertyOfType(type, name)) { return true; } } @@ -6020,8 +6051,8 @@ namespace ts { regularType.properties = (type).properties; regularType.callSignatures = (type).callSignatures; regularType.constructSignatures = (type).constructSignatures; - regularType.stringIndexType = (type).stringIndexType; - regularType.numberIndexType = (type).numberIndexType; + regularType.stringIndexInfo = (type).stringIndexInfo; + regularType.numberIndexInfo = (type).numberIndexInfo; (type).regularType = regularType; } return regularType; @@ -6046,11 +6077,11 @@ namespace ts { } members[p.name] = p; }); - let stringIndexType = getIndexTypeOfType(type, IndexKind.String); - let numberIndexType = getIndexTypeOfType(type, IndexKind.Number); - if (stringIndexType) stringIndexType = getWidenedType(stringIndexType); - if (numberIndexType) numberIndexType = getWidenedType(numberIndexType); - return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexType, numberIndexType); + const stringIndexInfo = getIndexInfoOfType(type, IndexKind.String); + const numberIndexInfo = getIndexInfoOfType(type, IndexKind.Number); + return createAnonymousType(type.symbol, members, emptyArray, emptyArray, + stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), + numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly)); } function getWidenedType(type: Type): Type { @@ -7428,7 +7459,7 @@ namespace ts { // Return true if the given contextual type provides an index signature of the given kind function contextualTypeHasIndexSignature(type: Type, kind: IndexKind): boolean { - return !!(type.flags & TypeFlags.Union ? forEach((type).types, t => getIndexTypeOfStructuredType(t, kind)) : getIndexTypeOfStructuredType(type, kind)); + return !!(type.flags & TypeFlags.Union ? forEach((type).types, t => getIndexInfoOfStructuredType(t, kind)) : getIndexInfoOfStructuredType(type, kind)); } // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of @@ -7923,9 +7954,9 @@ namespace ts { } } - const stringIndexType = getIndexType(IndexKind.String); - const numberIndexType = getIndexType(IndexKind.Number); - const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexType, numberIndexType); + const stringIndexInfo = getIndexInfo(IndexKind.String); + const numberIndexInfo = getIndexInfo(IndexKind.Number); + const result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo); const freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : TypeFlags.FreshObjectLiteral; result.flags |= TypeFlags.ObjectLiteral | TypeFlags.ContainsObjectLiteral | freshObjectLiteralFlag | (typeFlags & TypeFlags.PropagatingFlags) | (patternWithComputedProperties ? TypeFlags.ObjectLiteralPatternWithComputedProperties : 0); if (inDestructuringPattern) { @@ -7933,7 +7964,7 @@ namespace ts { } return result; - function getIndexType(kind: IndexKind) { + function getIndexInfo(kind: IndexKind) { if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) { const propTypes: Type[] = []; for (let i = 0; i < propertiesArray.length; i++) { @@ -7949,9 +7980,9 @@ namespace ts { } } } - const result = propTypes.length ? getUnionType(propTypes) : undefinedType; - typeFlags |= result.flags; - return result; + const unionType = propTypes.length ? getUnionType(propTypes) : undefinedType; + typeFlags |= unionType.flags; + return createIndexInfo(unionType, /*isReadonly*/ false); } return undefined; } @@ -8321,7 +8352,7 @@ namespace ts { return links.resolvedJsxType = getTypeOfSymbol(sym); } else if (links.jsxFlags & JsxFlags.IntrinsicIndexedElement) { - return links.resolvedJsxType = getIndexTypeOfSymbol(sym, IndexKind.String); + return links.resolvedJsxType = getIndexInfoOfSymbol(sym, IndexKind.String).type; } else { // Resolution failed, so we don't know @@ -8956,7 +8987,7 @@ namespace ts { if (type.flags & TypeFlags.ObjectType) { const resolved = resolveStructuredTypeMembers(type); if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 && - resolved.properties.length === 0 && !resolved.stringIndexType && !resolved.numberIndexType) { + resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) { return resolved.callSignatures[0]; } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index f6216664d2e..1ccb9e4067c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2175,8 +2175,8 @@ namespace ts { declaredProperties: Symbol[]; // Declared members declaredCallSignatures: Signature[]; // Declared call signatures declaredConstructSignatures: Signature[]; // Declared construct signatures - declaredStringIndexType: Type; // Declared string index type - declaredNumberIndexType: Type; // Declared numeric index type + declaredStringIndexInfo: IndexInfo; // Declared string indexing info + declaredNumberIndexInfo: IndexInfo; // Declared numeric indexing info } // Type references (TypeFlags.Reference). When a class or interface has type parameters or @@ -2228,8 +2228,8 @@ namespace ts { properties: Symbol[]; // Properties callSignatures: Signature[]; // Call signatures of type constructSignatures: Signature[]; // Construct signatures of type - stringIndexType?: Type; // String index type - numberIndexType?: Type; // Numeric index type + stringIndexInfo?: IndexInfo; // String indexing info + numberIndexInfo?: IndexInfo; // Numeric indexing info } /* @internal */ @@ -2292,6 +2292,11 @@ namespace ts { Number, } + export interface IndexInfo { + type: Type; + isReadonly: boolean; + } + /* @internal */ export interface TypeMapper { (t: TypeParameter): Type; From b8cd0e5964f4b999222cbbe6ef1e3da78885d65c Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 08:58:00 -0800 Subject: [PATCH 042/160] Support readonly indexers + include readonly modifier in typeToString --- src/compiler/checker.ts | 167 ++++++++++++++------------- src/compiler/diagnosticMessages.json | 4 + src/compiler/types.ts | 2 + 3 files changed, 94 insertions(+), 79 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1f815a6fd3e..75751b45458 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -133,7 +133,7 @@ namespace ts { const anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); - const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true); + const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ false); const globals: SymbolTable = {}; @@ -1956,15 +1956,35 @@ namespace ts { buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Value, SymbolFormatFlags.None, typeFormatFlags); } - function getIndexerParameterName(type: ObjectType, indexKind: IndexKind, fallbackName: string): string { - const declaration = getIndexDeclarationOfSymbol(type.symbol, indexKind); - if (!declaration) { - // declaration might not be found if indexer was added from the contextual type. - // in this case use fallback name - return fallbackName; + function writeIndexSignature(info: IndexInfo, keyword: SyntaxKind) { + if (info) { + if (info.isReadonly) { + writeKeyword(writer, SyntaxKind.ReadonlyKeyword); + writeSpace(writer); + } + writePunctuation(writer, SyntaxKind.OpenBracketToken); + writer.writeParameter(info.declaration ? declarationNameToString(info.declaration.parameters[0].name) : "x"); + writePunctuation(writer, SyntaxKind.ColonToken); + writeSpace(writer); + writeKeyword(writer, keyword); + writePunctuation(writer, SyntaxKind.CloseBracketToken); + writePunctuation(writer, SyntaxKind.ColonToken); + writeSpace(writer); + writeType(info.type, TypeFormatFlags.None); + writePunctuation(writer, SyntaxKind.SemicolonToken); + writer.writeLine(); + } + } + + function writePropertyWithModifiers(prop: Symbol) { + if (isReadonlySymbol(prop)) { + writeKeyword(writer, SyntaxKind.ReadonlyKeyword); + writeSpace(writer); + } + buildSymbolDisplay(prop, writer); + if (prop.flags & SymbolFlags.Optional) { + writePunctuation(writer, SyntaxKind.QuestionToken); } - Debug.assert(declaration.parameters.length !== 0); - return declarationNameToString(declaration.parameters[0].name); } function writeLiteralType(type: ObjectType, flags: TypeFormatFlags) { @@ -2015,53 +2035,21 @@ namespace ts { writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } - if (resolved.stringIndexInfo) { - // [x: string]: - writePunctuation(writer, SyntaxKind.OpenBracketToken); - writer.writeParameter(getIndexerParameterName(resolved, IndexKind.String, /*fallbackName*/"x")); - writePunctuation(writer, SyntaxKind.ColonToken); - writeSpace(writer); - writeKeyword(writer, SyntaxKind.StringKeyword); - writePunctuation(writer, SyntaxKind.CloseBracketToken); - writePunctuation(writer, SyntaxKind.ColonToken); - writeSpace(writer); - writeType(resolved.stringIndexInfo.type, TypeFormatFlags.None); - writePunctuation(writer, SyntaxKind.SemicolonToken); - writer.writeLine(); - } - if (resolved.numberIndexInfo) { - // [x: number]: - writePunctuation(writer, SyntaxKind.OpenBracketToken); - writer.writeParameter(getIndexerParameterName(resolved, IndexKind.Number, /*fallbackName*/"x")); - writePunctuation(writer, SyntaxKind.ColonToken); - writeSpace(writer); - writeKeyword(writer, SyntaxKind.NumberKeyword); - writePunctuation(writer, SyntaxKind.CloseBracketToken); - writePunctuation(writer, SyntaxKind.ColonToken); - writeSpace(writer); - writeType(resolved.numberIndexInfo.type, TypeFormatFlags.None); - writePunctuation(writer, SyntaxKind.SemicolonToken); - writer.writeLine(); - } + writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword); + writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword); for (const p of resolved.properties) { const t = getTypeOfSymbol(p); if (p.flags & (SymbolFlags.Function | SymbolFlags.Method) && !getPropertiesOfObjectType(t).length) { const signatures = getSignaturesOfType(t, SignatureKind.Call); for (const signature of signatures) { - buildSymbolDisplay(p, writer); - if (p.flags & SymbolFlags.Optional) { - writePunctuation(writer, SyntaxKind.QuestionToken); - } + writePropertyWithModifiers(p); buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack); writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } } else { - buildSymbolDisplay(p, writer); - if (p.flags & SymbolFlags.Optional) { - writePunctuation(writer, SyntaxKind.QuestionToken); - } + writePropertyWithModifiers(p); writePunctuation(writer, SyntaxKind.ColonToken); writeSpace(writer); writeType(t, TypeFormatFlags.None); @@ -4125,15 +4113,15 @@ namespace ts { return undefined; } - function createIndexInfo(type: Type, isReadonly: boolean): IndexInfo { - return { type, isReadonly }; + function createIndexInfo(type: Type, isReadonly: boolean, declaration?: SignatureDeclaration): IndexInfo { + return { type, isReadonly, declaration }; } function getIndexInfoOfSymbol(symbol: Symbol, kind: IndexKind): IndexInfo { const declaration = getIndexDeclarationOfSymbol(symbol, kind); if (declaration) { return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, - (declaration.flags & NodeFlags.Readonly) !== 0); + (declaration.flags & NodeFlags.Readonly) !== 0, declaration); } return undefined; } @@ -4873,7 +4861,7 @@ namespace ts { } function instantiateIndexInfo(info: IndexInfo, mapper: TypeMapper): IndexInfo { - return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly); + return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration); } // Returns true if the given expression contains (at any level of nesting) a function or arrow expression @@ -5739,27 +5727,34 @@ namespace ts { if (relation === identityRelation) { return indexTypesIdenticalTo(IndexKind.String, source, target); } - const targetType = getIndexTypeOfType(target, IndexKind.String); - if (targetType) { - if ((targetType.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) { + const targetInfo = getIndexInfoOfType(target, IndexKind.String); + if (targetInfo) { + if ((targetInfo.type.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) { // non-primitive assignment to any is always allowed, eg // `var x: { [index: string]: any } = { property: 12 };` return Ternary.True; } - const sourceType = getIndexTypeOfType(source, IndexKind.String); - if (!sourceType) { + const sourceInfo = getIndexInfoOfType(source, IndexKind.String); + if (!sourceInfo) { if (reportErrors) { reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source)); } return Ternary.False; } - const related = isRelatedTo(sourceType, targetType, reportErrors); + const related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors); if (!related) { if (reportErrors) { reportError(Diagnostics.Index_signatures_are_incompatible); } return Ternary.False; } + if (sourceInfo.isReadonly && !targetInfo.isReadonly) { + if (reportErrors) { + reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_read_write_in_type_1, + typeToString(source), typeToString(target)); + } + return Ternary.False; + } return related; } return Ternary.True; @@ -5769,28 +5764,29 @@ namespace ts { if (relation === identityRelation) { return indexTypesIdenticalTo(IndexKind.Number, source, target); } - const targetType = getIndexTypeOfType(target, IndexKind.Number); - if (targetType) { - if ((targetType.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) { + const targetInfo = getIndexInfoOfType(target, IndexKind.Number); + if (targetInfo) { + if ((targetInfo.type.flags & TypeFlags.Any) && !(originalSource.flags & TypeFlags.Primitive)) { // non-primitive assignment to any is always allowed, eg // `var x: { [index: number]: any } = { property: 12 };` return Ternary.True; } - const sourceStringType = getIndexTypeOfType(source, IndexKind.String); - const sourceNumberType = getIndexTypeOfType(source, IndexKind.Number); - if (!(sourceStringType || sourceNumberType)) { + const sourceStringInfo = getIndexInfoOfType(source, IndexKind.String); + const sourceNumberInfo = getIndexInfoOfType(source, IndexKind.Number); + if (!(sourceStringInfo || sourceNumberInfo)) { if (reportErrors) { reportError(Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source)); } return Ternary.False; } let related: Ternary; - if (sourceStringType && sourceNumberType) { + if (sourceStringInfo && sourceNumberInfo) { // If we know for sure we're testing both string and numeric index types then only report errors from the second one - related = isRelatedTo(sourceStringType, targetType, /*reportErrors*/ false) || isRelatedTo(sourceNumberType, targetType, reportErrors); + related = isRelatedTo(sourceStringInfo.type, targetInfo.type, /*reportErrors*/ false) || + isRelatedTo(sourceNumberInfo.type, targetInfo.type, reportErrors); } else { - related = isRelatedTo(sourceStringType || sourceNumberType, targetType, reportErrors); + related = isRelatedTo((sourceStringInfo || sourceNumberInfo).type, targetInfo.type, reportErrors); } if (!related) { if (reportErrors) { @@ -5798,19 +5794,26 @@ namespace ts { } return Ternary.False; } + if ((sourceStringInfo && sourceStringInfo.isReadonly || sourceNumberInfo && sourceNumberInfo.isReadonly) && !targetInfo.isReadonly) { + if (reportErrors) { + reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_read_write_in_type_1, + typeToString(source), typeToString(target)); + } + return Ternary.False; + } return related; } return Ternary.True; } function indexTypesIdenticalTo(indexKind: IndexKind, source: Type, target: Type): Ternary { - const targetType = getIndexTypeOfType(target, indexKind); - const sourceType = getIndexTypeOfType(source, indexKind); - if (!sourceType && !targetType) { + const targetInfo = getIndexInfoOfType(target, indexKind); + const sourceInfo = getIndexInfoOfType(source, indexKind); + if (!sourceInfo && !targetInfo) { return Ternary.True; } - if (sourceType && targetType) { - return isRelatedTo(sourceType, targetType); + if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) { + return isRelatedTo(sourceInfo.type, targetInfo.type); } return Ternary.False; } @@ -8719,16 +8722,18 @@ namespace ts { // Try to use a number indexer. if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, TypeFlags.NumberLike) || isForInVariableForNumericPropertyNames(node.argumentExpression)) { - const numberIndexType = getIndexTypeOfType(objectType, IndexKind.Number); - if (numberIndexType) { - return numberIndexType; + const numberIndexInfo = getIndexInfoOfType(objectType, IndexKind.Number); + if (numberIndexInfo) { + getNodeLinks(node).resolvedIndexInfo = numberIndexInfo; + return numberIndexInfo.type; } } // Try to use string indexing. - const stringIndexType = getIndexTypeOfType(objectType, IndexKind.String); - if (stringIndexType) { - return stringIndexType; + const stringIndexInfo = getIndexInfoOfType(objectType, IndexKind.String); + if (stringIndexInfo) { + getNodeLinks(node).resolvedIndexInfo = stringIndexInfo; + return stringIndexInfo.type; } // Fall back to any. @@ -10384,10 +10389,11 @@ namespace ts { error(expr, invalidReferenceMessage); return false; } - // Because we got the symbol from the resolvedSymbol property, it might be of kind + // Because we get the symbol from the resolvedSymbol property, it might be of kind // SymbolFlags.ExportValue. In this case it is necessary to get the actual export // symbol, which will have the correct flags set on it. - const symbol = getExportSymbolOfValueSymbolIfExported(getNodeLinks(node).resolvedSymbol); + const links = getNodeLinks(node); + const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol); if (symbol) { if (symbol !== unknownSymbol && symbol !== argumentsSymbol) { if (symbol === undefinedSymbol || !(symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Method | SymbolFlags.Accessor))) { @@ -10400,8 +10406,11 @@ namespace ts { } } } - else { - // Check indexers + else if (node.kind === SyntaxKind.ElementAccessExpression) { + if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) { + error(expr, constantVariableMessage); + return false; + } } return true; } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 98a05f5a302..6599a35f494 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1083,6 +1083,10 @@ "category": "Error", "code": 2365 }, + "Index signature is read-only in type '{0}' but read-write in type '{1}'.": { + "category": "Error", + "code": 2366 + }, "Type parameter name cannot be '{0}'": { "category": "Error", "code": 2368 diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 1ccb9e4067c..0a8cbb3abd3 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2068,6 +2068,7 @@ namespace ts { resolvedAwaitedType?: Type; // Cached awaited type of type node resolvedSignature?: Signature; // Cached signature of signature node or call expression resolvedSymbol?: Symbol; // Cached name resolution result + resolvedIndexInfo?: IndexInfo; // Cached indexing info resolution result flags?: NodeCheckFlags; // Set of flags specific to Node enumMemberValue?: number; // Constant value of enum member isVisible?: boolean; // Is this node visible @@ -2295,6 +2296,7 @@ namespace ts { export interface IndexInfo { type: Type; isReadonly: boolean; + declaration?: SignatureDeclaration; } /* @internal */ From 17b5899f3fe200df91f1545c0fd486290cccf122 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 08:58:25 -0800 Subject: [PATCH 043/160] Fixing fourslash test --- .../cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts index 53f5e6988b7..a2e783d9ce0 100644 --- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts +++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts @@ -9,7 +9,7 @@ ////var /*2*/x = point./*3*/x; goTo.marker('1'); -verify.quickInfoIs("function makePoint(x: number): {\n x: number;\n}", undefined); +verify.quickInfoIs("function makePoint(x: number): {\n readonly x: number;\n}", undefined); goTo.marker('2'); verify.quickInfoIs("var x: number", undefined); @@ -18,4 +18,4 @@ goTo.marker('3'); verify.memberListContains("x", "(property) x: number", undefined); goTo.marker('4'); -verify.quickInfoIs("var point: {\n x: number;\n}", undefined); +verify.quickInfoIs("var point: {\n readonly x: number;\n}", undefined); From 13f763d33c9568c0926cd18b980f81e2b73229a1 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 08:58:36 -0800 Subject: [PATCH 044/160] Accepting new baselines --- tests/baselines/reference/accessorWithES5.types | 4 ++-- .../reference/commentsOnObjectLiteral4.types | 4 ++-- .../reference/computedPropertyNames11_ES5.types | 4 ++-- .../reference/computedPropertyNames11_ES6.types | 4 ++-- .../reference/declFileObjectLiteralWithOnlyGetter.js | 4 ++-- .../declFileObjectLiteralWithOnlyGetter.types | 12 ++++++------ tests/baselines/reference/downlevelLetConst18.types | 4 ++-- tests/baselines/reference/symbolProperty5.types | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/baselines/reference/accessorWithES5.types b/tests/baselines/reference/accessorWithES5.types index cb54e92b184..29471548918 100644 --- a/tests/baselines/reference/accessorWithES5.types +++ b/tests/baselines/reference/accessorWithES5.types @@ -21,8 +21,8 @@ class D { } var x = { ->x : { a: number; } ->{ get a() { return 1 }} : { a: number; } +>x : { readonly a: number; } +>{ get a() { return 1 }} : { readonly a: number; } get a() { return 1 } >a : number diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types index 364df6e5ea1..f458d73ae36 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral4.types +++ b/tests/baselines/reference/commentsOnObjectLiteral4.types @@ -1,8 +1,8 @@ === tests/cases/compiler/commentsOnObjectLiteral4.ts === var v = { ->v : { bar: number; } ->{ /** * @type {number} */ get bar(): number { return this._bar; }} : { bar: number; } +>v : { readonly bar: number; } +>{ /** * @type {number} */ get bar(): number { return this._bar; }} : { readonly bar: number; } /** * @type {number} diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types index e0787fc3ee7..ae626ec3cba 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.types +++ b/tests/baselines/reference/computedPropertyNames11_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } +>v : { readonly [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types index 8ad31a7c2a1..06dc26e9843 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES6.types +++ b/tests/baselines/reference/computedPropertyNames11_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } +>v : { readonly [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js index 396ee75422e..eb440c028d5 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js @@ -22,9 +22,9 @@ var /*2*/ x = point.x; //// [declFileObjectLiteralWithOnlyGetter.d.ts] declare function makePoint(x: number): { - x: number; + readonly x: number; }; declare var point: { - x: number; + readonly x: number; }; declare var x: number; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types index c0fb7b763fc..dd3cbe20983 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types @@ -1,11 +1,11 @@ === tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts === function /*1*/makePoint(x: number) { ->makePoint : (x: number) => { x: number; } +>makePoint : (x: number) => { readonly x: number; } >x : number return { ->{ get x() { return x; }, } : { x: number; } +>{ get x() { return x; }, } : { readonly x: number; } get x() { return x; }, >x : number @@ -14,14 +14,14 @@ function /*1*/makePoint(x: number) { }; }; var /*4*/point = makePoint(2); ->point : { x: number; } ->makePoint(2) : { x: number; } ->makePoint : (x: number) => { x: number; } +>point : { readonly x: number; } +>makePoint(2) : { readonly x: number; } +>makePoint : (x: number) => { readonly x: number; } >2 : number var /*2*/x = point./*3*/x; >x : number >point./*3*/x : number ->point : { x: number; } +>point : { readonly x: number; } >x : number diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types index 42421aa80c0..1f7be616124 100644 --- a/tests/baselines/reference/downlevelLetConst18.types +++ b/tests/baselines/reference/downlevelLetConst18.types @@ -54,8 +54,8 @@ for (let x; ;) { >x : any ({ get foo() { return x } }) ->({ get foo() { return x } }) : { foo: any; } ->{ get foo() { return x } } : { foo: any; } +>({ get foo() { return x } }) : { readonly foo: any; } +>{ get foo() { return x } } : { readonly foo: any; } >foo : any >x : any } diff --git a/tests/baselines/reference/symbolProperty5.types b/tests/baselines/reference/symbolProperty5.types index 4af020dca1b..b338f94f6d3 100644 --- a/tests/baselines/reference/symbolProperty5.types +++ b/tests/baselines/reference/symbolProperty5.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/Symbols/symbolProperty5.ts === var x = { ->x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } ->{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } +>x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } +>{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } [Symbol.iterator]: 0, >Symbol.iterator : symbol From 2a20e915e8850a47e059f5c1d12f866394ebd5e8 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 16:58:09 -0800 Subject: [PATCH 045/160] Allow assignments to readonly properties in constructors --- src/compiler/checker.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 75751b45458..9fcf951ce83 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10366,6 +10366,17 @@ namespace ts { return true; } + function isReferenceWithinOwnConstructor(expr: Expression, symbol: Symbol): boolean { + // Allow assignments to readonly properties or methods (but not readonly accessors) within constructors + // of the same class declaration. + if ((expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) && + (expr as PropertyAccessExpression | ElementAccessExpression).expression.kind === SyntaxKind.ThisKeyword && + symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { + const func = getContainingFunction(expr); + return func && func.kind === SyntaxKind.Constructor && func.parent === symbol.valueDeclaration.parent; + } + } + function isReadonlySymbol(symbol: Symbol): boolean { if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { return symbol === undefinedSymbol || (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; @@ -10400,7 +10411,7 @@ namespace ts { error(expr, invalidReferenceMessage); return false; } - if (isReadonlySymbol(symbol) || isConstantSymbol(symbol)) { + if (isConstantSymbol(symbol) || (isReadonlySymbol(symbol) && !isReferenceWithinOwnConstructor(expr, symbol))) { error(expr, constantVariableMessage); return false; } From 01c96868697163cbb4f6f7135a882d14eeaa31e8 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 17:35:10 -0800 Subject: [PATCH 046/160] Allow 'readonly' only on property and index signature declarations --- src/compiler/checker.ts | 9 +++------ src/compiler/diagnosticMessages.json | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9fcf951ce83..937065cd559 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10378,7 +10378,7 @@ namespace ts { } function isReadonlySymbol(symbol: Symbol): boolean { - if (symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { + if (symbol.flags & SymbolFlags.Property) { return symbol === undefinedSymbol || (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; } if (symbol.flags & SymbolFlags.Accessor) { @@ -15786,11 +15786,8 @@ namespace ts { if (flags & NodeFlags.Readonly) { return grammarErrorOnNode(modifier, Diagnostics._0_modifier_already_seen, "readonly"); } - else if (flags & NodeFlags.Async) { - return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, "readonly", "async"); - } - else if (node.parent.kind === SyntaxKind.ModuleBlock || node.parent.kind === SyntaxKind.SourceFile) { - return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_appear_on_a_module_element, "readonly"); + else if (node.kind !== SyntaxKind.PropertyDeclaration && node.kind !== SyntaxKind.PropertySignature && node.kind !== SyntaxKind.IndexSignature) { + return grammarErrorOnNode(modifier, Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature); } flags |= NodeFlags.Readonly; lastReadonly = modifier; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 6599a35f494..fc4aae4ed30 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -67,6 +67,10 @@ "category": "Error", "code": 1023 }, + "'readonly' modifier can only appear on a property declaration or index signature.": { + "category": "Error", + "code": 1024 + }, "Accessibility modifier already seen.": { "category": "Error", "code": 1028 From d3be38ea2f027dd16a88aa2026bbb58ecbec2d38 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 17:56:58 -0800 Subject: [PATCH 047/160] Updating error messages --- src/compiler/checker.ts | 15 +++++++++------ src/compiler/diagnosticMessages.json | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 937065cd559..e762d915cec 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10476,7 +10476,7 @@ namespace ts { // run check only if former checks succeeded to avoid reporting cascading errors checkReferenceExpression(node.operand, Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, - Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant); + Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property); } return numberType; } @@ -10490,7 +10490,7 @@ namespace ts { // run check only if former checks succeeded to avoid reporting cascading errors checkReferenceExpression(node.operand, Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, - Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant); + Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property); } return numberType; } @@ -10681,7 +10681,7 @@ namespace ts { function checkReferenceAssignment(target: Expression, sourceType: Type, contextualMapper?: TypeMapper): Type { const targetType = checkExpression(target, contextualMapper); - if (checkReferenceExpression(target, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant)) { + if (checkReferenceExpression(target, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) { checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined); } return sourceType; @@ -10863,7 +10863,9 @@ namespace ts { // requires VarExpr to be classified as a reference // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1) // and the type of the non - compound operation to be assignable to the type of VarExpr. - const ok = checkReferenceExpression(left, Diagnostics.Invalid_left_hand_side_of_assignment_expression, Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant); + const ok = checkReferenceExpression(left, + Diagnostics.Invalid_left_hand_side_of_assignment_expression, + Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property); // Use default messages if (ok) { // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported @@ -12935,7 +12937,7 @@ namespace ts { else { const leftType = checkExpression(varExpr); checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ Diagnostics.Invalid_left_hand_side_in_for_of_statement, - /*constantVariableMessage*/ Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_previously_defined_constant); + /*constantVariableMessage*/ Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property); // iteratedType will be undefined if the rightType was missing properties/signatures // required to get its iteratedType (like [Symbol.iterator] or next). This may be @@ -12982,7 +12984,8 @@ namespace ts { } else { // run check only former check succeeded to avoid cascading errors - checkReferenceExpression(varExpr, Diagnostics.Invalid_left_hand_side_in_for_in_statement, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_previously_defined_constant); + checkReferenceExpression(varExpr, Diagnostics.Invalid_left_hand_side_in_for_in_statement, + Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property); } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index fc4aae4ed30..7392035ecda 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1395,11 +1395,11 @@ "category": "Error", "code": 2448 }, - "The operand of an increment or decrement operator cannot be a constant.": { + "The operand of an increment or decrement operator cannot be a constant or a read-only property.": { "category": "Error", "code": 2449 }, - "Left-hand side of assignment expression cannot be a constant.": { + "Left-hand side of assignment expression cannot be a constant or a read-only property.": { "category": "Error", "code": 2450 }, @@ -1531,11 +1531,11 @@ "category": "Error", "code": 2484 }, - "The left-hand side of a 'for...of' statement cannot be a previously defined constant.": { + "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property.": { "category": "Error", "code": 2485 }, - "The left-hand side of a 'for...in' statement cannot be a previously defined constant.": { + "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property.": { "category": "Error", "code": 2486 }, From 723475b656d95792d536d1e37acaf9ac94e65c34 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 18 Jan 2016 17:57:42 -0800 Subject: [PATCH 048/160] Accepting new baselines --- .../constDeclarations-access.errors.txt | 4 +- .../constDeclarations-access2.errors.txt | 68 +++++++++--------- .../constDeclarations-access3.errors.txt | 72 +++++++++---------- .../constDeclarations-access4.errors.txt | 72 +++++++++---------- .../constDeclarations-access5.errors.txt | 72 +++++++++---------- .../constDeclarations-errors.errors.txt | 4 +- tests/baselines/reference/for-of2.errors.txt | 4 +- 7 files changed, 148 insertions(+), 148 deletions(-) diff --git a/tests/baselines/reference/constDeclarations-access.errors.txt b/tests/baselines/reference/constDeclarations-access.errors.txt index 04b942aec09..3c748cc4a5f 100644 --- a/tests/baselines/reference/constDeclarations-access.errors.txt +++ b/tests/baselines/reference/constDeclarations-access.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/file2.ts(1,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. +tests/cases/compiler/file2.ts(1,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ==== tests/cases/compiler/file1.ts (0 errors) ==== @@ -8,4 +8,4 @@ tests/cases/compiler/file2.ts(1,1): error TS2449: The operand of an increment or ==== tests/cases/compiler/file2.ts (1 errors) ==== x++; ~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. \ No newline at end of file +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. \ No newline at end of file diff --git a/tests/baselines/reference/constDeclarations-access2.errors.txt b/tests/baselines/reference/constDeclarations-access2.errors.txt index 6a360e11014..667f490a374 100644 --- a/tests/baselines/reference/constDeclarations-access2.errors.txt +++ b/tests/baselines/reference/constDeclarations-access2.errors.txt @@ -1,20 +1,20 @@ -tests/cases/compiler/constDeclarations-access2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(6,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(18,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(19,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(20,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(21,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access2.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. +tests/cases/compiler/constDeclarations-access2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(6,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(18,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(19,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(20,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(21,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access2.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ==== tests/cases/compiler/constDeclarations-access2.ts (17 errors) ==== @@ -24,57 +24,57 @@ tests/cases/compiler/constDeclarations-access2.ts(23,3): error TS2449: The opera // Errors x = 1; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x += 2; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x -= 3; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x *= 4; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x /= 5; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x %= 6; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x <<= 7; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x >>= 8; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x >>>= 9; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x &= 10; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x |= 11; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x ^= 12; ~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. x++; ~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. x--; ~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++x; ~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. --x; ~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++((x)); ~~~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. // OK var a = x + 1; diff --git a/tests/baselines/reference/constDeclarations-access3.errors.txt b/tests/baselines/reference/constDeclarations-access3.errors.txt index 577b087dff0..a6cb124d28c 100644 --- a/tests/baselines/reference/constDeclarations-access3.errors.txt +++ b/tests/baselines/reference/constDeclarations-access3.errors.txt @@ -1,21 +1,21 @@ -tests/cases/compiler/constDeclarations-access3.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(17,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(21,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(22,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(24,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(26,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access3.ts(28,1): error TS2450: Left-hand side of assignment expression cannot be a constant. +tests/cases/compiler/constDeclarations-access3.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(17,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(21,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(22,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(24,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(26,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access3.ts(28,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/compiler/constDeclarations-access3.ts (18 errors) ==== @@ -28,61 +28,61 @@ tests/cases/compiler/constDeclarations-access3.ts(28,1): error TS2450: Left-hand // Errors M.x = 1; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x += 2; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x -= 3; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x *= 4; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x /= 5; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x %= 6; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x <<= 7; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x >>= 8; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x >>>= 9; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x &= 10; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x |= 11; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x ^= 12; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x++; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. M.x--; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++M.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. --M.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++((M.x)); ~~~~~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. M["x"] = 0; ~~~~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. // OK var a = M.x + 1; diff --git a/tests/baselines/reference/constDeclarations-access4.errors.txt b/tests/baselines/reference/constDeclarations-access4.errors.txt index 9745c0d2624..3d7d4a704a8 100644 --- a/tests/baselines/reference/constDeclarations-access4.errors.txt +++ b/tests/baselines/reference/constDeclarations-access4.errors.txt @@ -1,21 +1,21 @@ -tests/cases/compiler/constDeclarations-access4.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(17,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(21,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(22,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(24,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(26,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations-access4.ts(28,1): error TS2450: Left-hand side of assignment expression cannot be a constant. +tests/cases/compiler/constDeclarations-access4.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(16,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(17,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(21,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(22,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(23,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(24,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(26,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations-access4.ts(28,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/compiler/constDeclarations-access4.ts (18 errors) ==== @@ -28,61 +28,61 @@ tests/cases/compiler/constDeclarations-access4.ts(28,1): error TS2450: Left-hand // Errors M.x = 1; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x += 2; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x -= 3; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x *= 4; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x /= 5; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x %= 6; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x <<= 7; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x >>= 8; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x >>>= 9; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x &= 10; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x |= 11; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x ^= 12; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. M.x++; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. M.x--; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++M.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. --M.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++((M.x)); ~~~~~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. M["x"] = 0; ~~~~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. // OK var a = M.x + 1; diff --git a/tests/baselines/reference/constDeclarations-access5.errors.txt b/tests/baselines/reference/constDeclarations-access5.errors.txt index 23200e50ee4..45160bbc7ce 100644 --- a/tests/baselines/reference/constDeclarations-access5.errors.txt +++ b/tests/baselines/reference/constDeclarations-access5.errors.txt @@ -1,21 +1,21 @@ -tests/cases/compiler/constDeclarations_access_2.ts(4,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(6,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(17,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(18,1): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(19,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(20,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(22,3): error TS2449: The operand of an increment or decrement operator cannot be a constant. -tests/cases/compiler/constDeclarations_access_2.ts(24,1): error TS2450: Left-hand side of assignment expression cannot be a constant. +tests/cases/compiler/constDeclarations_access_2.ts(4,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(6,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(11,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(12,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(13,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(14,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(15,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(17,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(18,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(19,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(20,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(22,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/constDeclarations_access_2.ts(24,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/compiler/constDeclarations_access_2.ts (18 errors) ==== @@ -24,61 +24,61 @@ tests/cases/compiler/constDeclarations_access_2.ts(24,1): error TS2450: Left-han // Errors m.x = 1; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x += 2; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x -= 3; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x *= 4; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x /= 5; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x %= 6; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x <<= 7; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x >>= 8; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x >>>= 9; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x &= 10; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x |= 11; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m.x ^= 12; ~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. m m.x++; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. m.x--; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++m.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. --m.x; ~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ++((m.x)); ~~~~~~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. m["x"] = 0; ~~~~~~ -!!! error TS2450: Left-hand side of assignment expression cannot be a constant. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. // OK var a = m.x + 1; diff --git a/tests/baselines/reference/constDeclarations-errors.errors.txt b/tests/baselines/reference/constDeclarations-errors.errors.txt index 10501beb1a5..98b12b616f7 100644 --- a/tests/baselines/reference/constDeclarations-errors.errors.txt +++ b/tests/baselines/reference/constDeclarations-errors.errors.txt @@ -4,7 +4,7 @@ tests/cases/compiler/constDeclarations-errors.ts(5,7): error TS1155: 'const' dec tests/cases/compiler/constDeclarations-errors.ts(5,11): error TS1155: 'const' declarations must be initialized tests/cases/compiler/constDeclarations-errors.ts(5,15): error TS1155: 'const' declarations must be initialized tests/cases/compiler/constDeclarations-errors.ts(5,27): error TS1155: 'const' declarations must be initialized -tests/cases/compiler/constDeclarations-errors.ts(10,27): error TS2449: The operand of an increment or decrement operator cannot be a constant. +tests/cases/compiler/constDeclarations-errors.ts(10,27): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. tests/cases/compiler/constDeclarations-errors.ts(13,11): error TS1155: 'const' declarations must be initialized tests/cases/compiler/constDeclarations-errors.ts(16,20): error TS1155: 'const' declarations must be initialized @@ -33,7 +33,7 @@ tests/cases/compiler/constDeclarations-errors.ts(16,20): error TS1155: 'const' d // error, assigning to a const for(const c8 = 0; c8 < 1; c8++) { } ~~ -!!! error TS2449: The operand of an increment or decrement operator cannot be a constant. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. // error, can not be unintalized for(const c9; c9 < 1;) { } diff --git a/tests/baselines/reference/for-of2.errors.txt b/tests/baselines/reference/for-of2.errors.txt index 0b5133cde13..f4f39f60f67 100644 --- a/tests/baselines/reference/for-of2.errors.txt +++ b/tests/baselines/reference/for-of2.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/es6/for-ofStatements/for-of2.ts(1,7): error TS1155: 'const' declarations must be initialized -tests/cases/conformance/es6/for-ofStatements/for-of2.ts(2,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a previously defined constant. +tests/cases/conformance/es6/for-ofStatements/for-of2.ts(2,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. ==== tests/cases/conformance/es6/for-ofStatements/for-of2.ts (2 errors) ==== @@ -8,4 +8,4 @@ tests/cases/conformance/es6/for-ofStatements/for-of2.ts(2,6): error TS2485: The !!! error TS1155: 'const' declarations must be initialized for (v of []) { } ~ -!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a previously defined constant. \ No newline at end of file +!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. \ No newline at end of file From dc8ab95db591921336652dd36bfb98ca9b0c887e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 19 Jan 2016 09:45:46 -0800 Subject: [PATCH 049/160] Chaning "read-write" to "writable" in error messages --- src/compiler/checker.ts | 6 +++--- src/compiler/diagnosticMessages.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index cd922475d45..72a0c71178f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5641,7 +5641,7 @@ namespace ts { } if (isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) { if (reportErrors) { - reportError(Diagnostics.Property_0_is_read_only_in_type_1_but_read_write_in_type_2, + reportError(Diagnostics.Property_0_is_read_only_in_type_1_but_writable_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target)); } return Ternary.False; @@ -5780,7 +5780,7 @@ namespace ts { } if (sourceInfo.isReadonly && !targetInfo.isReadonly) { if (reportErrors) { - reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_read_write_in_type_1, + reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_writable_in_type_1, typeToString(source), typeToString(target)); } return Ternary.False; @@ -5826,7 +5826,7 @@ namespace ts { } if ((sourceStringInfo && sourceStringInfo.isReadonly || sourceNumberInfo && sourceNumberInfo.isReadonly) && !targetInfo.isReadonly) { if (reportErrors) { - reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_read_write_in_type_1, + reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_writable_in_type_1, typeToString(source), typeToString(target)); } return Ternary.False; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 42455576b44..cb01650d13f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -995,7 +995,7 @@ "category": "Error", "code": 2342 }, - "Property '{0}' is read-only in type '{1}' but read-write in type '{2}'.": { + "Property '{0}' is read-only in type '{1}' but writable in type '{2}'.": { "category": "Error", "code": 2343 }, @@ -1087,7 +1087,7 @@ "category": "Error", "code": 2365 }, - "Index signature is read-only in type '{0}' but read-write in type '{1}'.": { + "Index signature is read-only in type '{0}' but writable in type '{1}'.": { "category": "Error", "code": 2366 }, From 4abf717cefe54d58d296d599f9a81bf26342b407 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 19 Jan 2016 09:45:57 -0800 Subject: [PATCH 050/160] Accepting new baselines --- .../reference/interfaceImplementation5.errors.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/baselines/reference/interfaceImplementation5.errors.txt b/tests/baselines/reference/interfaceImplementation5.errors.txt index aba0c9f8850..bb2d5f1bdb0 100644 --- a/tests/baselines/reference/interfaceImplementation5.errors.txt +++ b/tests/baselines/reference/interfaceImplementation5.errors.txt @@ -1,11 +1,11 @@ tests/cases/compiler/interfaceImplementation5.ts(5,7): error TS2420: Class 'C1' incorrectly implements interface 'I1'. - Property 'getset1' is read-only in type 'C1' but read-write in type 'I1'. + Property 'getset1' is read-only in type 'C1' but writable in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(6,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(10,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(14,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(18,7): error TS2420: Class 'C4' incorrectly implements interface 'I1'. - Property 'getset1' is read-only in type 'C4' but read-write in type 'I1'. + Property 'getset1' is read-only in type 'C4' but writable in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(19,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(23,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(27,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. @@ -20,7 +20,7 @@ tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors class C1 implements I1 { ~~ !!! error TS2420: Class 'C1' incorrectly implements interface 'I1'. -!!! error TS2420: Property 'getset1' is read-only in type 'C1' but read-write in type 'I1'. +!!! error TS2420: Property 'getset1' is read-only in type 'C1' but writable in type 'I1'. public get getset1(){return 1;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. @@ -44,7 +44,7 @@ tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors class C4 implements I1 { ~~ !!! error TS2420: Class 'C4' incorrectly implements interface 'I1'. -!!! error TS2420: Property 'getset1' is read-only in type 'C4' but read-write in type 'I1'. +!!! error TS2420: Property 'getset1' is read-only in type 'C4' but writable in type 'I1'. public get getset1(){var x:any; return x;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. From 28840863a635b6803505a821bcb18d9638c38012 Mon Sep 17 00:00:00 2001 From: Asad Saeeduddin Date: Tue, 19 Jan 2016 15:23:57 -0500 Subject: [PATCH 051/160] Addressed PR feedback: refactored away helper function, generated spec from docx --- doc/TypeScript Language Specification.docx | Bin 316896 -> 317460 bytes doc/spec.md | 8 ++++---- src/compiler/checker.ts | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/doc/TypeScript Language Specification.docx b/doc/TypeScript Language Specification.docx index 78c869175512d02338a61741a2bbbe570aa97bcb..4b8d3998f905a43b52b728204eaeb7c0d7c1e834 100644 GIT binary patch delta 263837 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�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 delta 263299 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%0A?^W29&CG`e zC#h~C=@yOXN!n)cPMEgEDsoej`_uh`B)mhl(C1yY{pye&S~zpXq`2X?e<#+pB)o}R ziHaM$L!nohXU1%oE&Zg%m1=ex!Pmk5p_^x$N%qV84*bpDB=n-9>sl=eQh^2<)>znF zkm!&;JZ_+7s+tMuoD4E-YPnU%RB|Z0Bl1HYv+VwY;iq`t9pwmc0PkxV#!7-wt|xF>G(W%ummStz8X}n z^l2EttonR94JSooHN;U6YkN@l6~z7Dup9$m_&vr; z-73P|D4D5)Z|6wkpkf>+p|JHsblhM;IR=oMCuOaaW`oLh8XQa}rVW`6s!kWzPA#WC zWK9E!W2CN5%dWS~fyn#&@PU6wf5Ib^?RMr!0CTg*{cr(+DF(b@JF@c1xdqa@4MT3~ z0pa6YPEN8H4bwDTR$F#H2gzHk*CsMnJi@s`fg3Ma5gBSS?ggyDf@U}WI#IM6Kh1m5 zAtyi2_$T;0qd(z6MCX}Bk7ztFWC_#m%}EjmLpO}!Q^_Z|@e}=o>E3^wkWVOmKi&QV znUfA!QqEseqFi}SIw|xcq}GuIU`2967C?K1<5X<+@$E~V z5So|QhT;%NFC@9ad)mrrhkidGopFimi5F5Y5+}og1$c{;bYNld2W=fNf)}}|k*l-U z4#g=8(jI!H!`ENar!^QYOXwV-_M}q;AoJDkpgRYE!e*0Y+n0xx?*S!9o!Izi=^?Kc zbM1Qmje#A*b{OHW&ube#FA_FR5L(G#x)o zrvBKS+Vg`Z3gD#sms|k>Nq_!Zv{}lvUZ9*rPae^s_wpIv`W<&2_C4 z@_?RQFpMA3DgN69!}sI*aG$Nj0Gi8$ram|d#FzVZ;qif3J+Ti7yMeH`h*r#AILqwe z7D?p%Ht~^esVfIOMOU=W5L)<^lL8$`S*-`WWQW|gqc!h&|46a`D$Fne* zgi4k-_hMHNP(B&vp?`{X8hVpxmJ~gy`A9?diCFfCK^|?<_6NLZql)y)&&5}D6oUSA z?>z6)!(qL}5^d|OH)|Z+h-WUk%0pjxB;p?7HH4JqCfg%n_|GE%!0xYI zpToS`lM5O{mW0CzDTQgR%%y1Aow|P6;RV}M#lAfnihti`Xn#L%*VGm|WIG39z5csX z=o)&S|9%NT@R$&8!|~i5hWIY9y5j~x97jbYH;KTR`SHjna46QpORQYx6meWwv@kD7 z%W1+t`UzQ0lA-6hp|1On0svdBLeS|)F}hHR5HIRo8M{Yr4_TqDt_n%dBx6dd#%g}{ z*g;gr+3)YO-C*G!PM~cD7qWWcq^dI5h#=Lga5WuG1KM*Lrc~g@Z{clsE;8dxFIk{Ykfj z{sxx;1OXI(7Fp!oaZ8^gW-W|D^mo7+vGk66YE$B^$6^*X3K{g~4>S_?0*%Ya*qc9IQ-^mbOdzT(+Jp>O**!zF`2>K#Pfab8>y!(4ionc8A z#=aYd1?g%7VEt0M#_zs+=lltmO=~kpSClcC3n8R`iV-18TUru?)R9WYpzi+j3kaU~+Si#3JeP1I!OM4nz3R#H9>%Wrx%g zsMeCJ2%KmnSpZb-;_!KpzVd2JLQbo2tT9t{AUq4i$#C{2M9Bv#zOodV1r4sk)pnujr_zCYn7_>PhPBnDh5KJl4P7!RY%c^JPOA&Jw-!#K>pWKr0q zhY>AO=3y+bTBD)-cB6%d(K%qWoZ7+Y?2)X+hFW&VtGQQBZeL?}<1%}Az#hpJr}FYX z$JZ11>JDQsYIcbXbn40JXa<|Hze_r7V<%XDJFLwJe*y9|MU77YYYT_n>tV1Q|t-j(*+)_q_;BO-|_Y{m*QN?MT-XprEV4t7q zmcmWk=#;kUK45pqN32&YFC&UsVKS_6xg(ZR$5lgco7z`pm2?vUQ zJh>q@;Ok}u)!pfue*y2YWttoUMyCGbKnfGY(Jk5#n-usFaenjLK&7e^j|r!tL&!X& z#5uQ%orxmeDFc{@(8vu&E-4;hDW5QHg|ZVS!9ovqnRI+I?j1 zC_e2pu>$SZp;M3;n%L_C%m8+jmgy*e|JyI9jY(D^SU;p9Y+!a2SFp|=#ZxyN@kKir z#N`{4{NFZ1&}4TE9L(NTzE_c1hGbI>C#I-GCt!r7Q6o?@7#hV`nhkB-m>do0MM;ua zgkPFK&^=ac)EXrl`RZ1st$Yuol{iQU@^`xseWHHng!0 z;)T&5jANS?<|YtykChH}kgzw>DRmG-9yjvmoats+oV$|W+zLOb=dQ%Dhm;WcCy69? zh5BzOn&vdF&+u}&@AQ?SG<_wJr>{@|c=28Nk)bXB1k;vT0>O*S^O}c$LFzA^W7iwa zNYHtsOXoaI564cD>B>r~S4ePwJ#Ns>VSj^*=H2>m+)?l#4-lvEm5F)=o8q-+xa1ry z)U3GOf42Gwe=Ue6gRjXf&#$l0Q7w+P6%fty$a8wA>LdI?Nb>FyfWRSYm%$rm7DO=e z0_L7iCo}~|5FMdhY3;OsVGQvyi3I14Y`J9bWwt#m(k+C(A}byJA6jPR6mUM1(*;)p z)D)Fx0Fz-~eJU!xG)b;u=f9yP3DK$_IwuPMdX*?01inK2rSrwTa=v(1&h_=Rg99kZW!GNv=%)2Nrdc8m`b|`JRz2t!>5#FitUw|O`lX*>=u{zRMb#EW zKO?&>={qPmkp=~qi3tG=f7c23mqr%l{!uMCtvEM3v#9Dj#(<$;yIIBXT*sD`6d0Ly zxLrTXW+zjHVKkq*O3vU=B-kX8vq~YpTb@;oY&^laR5kSEGg?_z zonoW4T24u6l7go@ISg_GJGSEbU@Q}Z&CU+HEP_i&^SeeyTsX`0e`7O>NTIM9>!lqk zW}~sWD3dfNvKVzN8o9AgD#8_bp+8Ak)WVFcL~Q#}9C=>sDXP;Yl89|;c~U~bVdeba z<9e6YGGqj%mo!v6QG{ySp>Y~U18*!tBY|3)#sG`?CtA!4qB$IAjAbUg-RtF`_=0(mSzQS{DD}bT=WIr zfqq;eeFR)F%2MeAFHT0|CgcB{M>SpE(sf)(|Iu{23}*f?9LfQcZCqYzwgjRJ#`p;x zgq?3!!C^&z(yf_0tZ?_N{h?@(_3QfOIoqwY+GjbF2rHlff6sS|uaNWDUanTko-*g7 z1Er$Ne+N?&{q?X*mk_y&8$wfqGA*b97X^I8Z~3ee_xp%+lWesYP4l?RmgwJTm9Q;4 zKJ(%kG8Wy$4U))XDZ4b{0!O_nC3)4dUS-3cS~*+%vrwc zM?Nxdh+VP&x>aJVj3P@UD;9k<^f(g$?jJ*{{5$oRkJMtR?XM&eEeK{!!s zB*f@vmwnu??~WVn7hWzN4@W4wRd&)Oej6oQj?ld79t%a+&=RGPFTFsA`;qbOpu_)& z*r)W`f8-9Et1?`G?Ep%yRF%ZAuK8-P8WsfGGNbJ&N`Jy5w{?9|mGDFz;1|xHoZq1d zyF0jo#@^n*IZ4~%)2_0gM%iMW-JS&Y74mc}N;eG4qRbwm;E$lPq_Qm+!`3q3RiB%e z-DD@ax$S;T3Gm2bfzssFQ52t$!q$5vw8&9~f5c)B7*IxQc8P&2+|qgTqFe+o?{5g`n%scg!I1;sE>fr8`CuuO-IrM~Ee24kjnvE;q*& zDd2;-2QF2}Bh}JJ18+K3#^>U*T*$^ZO#UA(iH_`XWH{cgL7^b9tyk?PN8|3Ypyy4j6R5G97Pu$=c8If7{bGSC@?M^|y!b^(Etb_3h#N?t{~3h4+pS ze+MBr-J4c|lc8o>i6Q!P_Pl;t@2;Fwt=Vv=am^G^EtyxpGz!$z^}{JmUsftmsu@d- z_TX&RNI`b8t=ttyX;)56X>NLXNIH;$v&;fUdGDOI;IMhfHb_&bm~BC-#PD08e+l%x zGWg4wLsx5L#Mp5Sw8B~*(Qr@1jDFMK2re7=SSYL5j`{Ti@%ptHx+{s^Vj0fYA9`_D zcDsB9542hP{RhXWP10+i<9(|xAygi*yPXkH1bE4rj7)cRb2Wq3J~zr6u;#sibQdW` zpk4pg4{-Mj5Z<{nl$Yn^4rr79f4Y87_ib7;k)Q7`7rpo2DFX@mLGLv;(0kEdnZ&;D zk3@TA7zL5XXBg9$@gSm;(IP6Et-Z*EIMX`T6lq`X)BX4O%CiXLGYECYVbYe1^+$u@ z3@7}G7ONrv#5Tz&OQaed8$S^#Y079XgaI3F(8Zr&!uoD7%N^wDo-}Jbe`HSKpR}0} zM`^2On@_@IlFtV8RJ}Z%#O_!h#bOkP!i?1@4u$#Nxb~ZmlnCGTLW?*QJ(#v}C{aD6 z%x*$eAc~$s^*|H?7)hAkEcSb_Yl=>`_A-j>s#)kqGn{W})L% zV}My{_%*j8c%t&==-`kBf8yfw@49 z2Rcy;MB50k)%p?fJK{-lV~cxp?bTLo?8o!sMv1iZ(gZin<8a`rZ(vlP&*EsDRBaOm z3QIKQ?uco5<7hCu0(iAz+!OTjsQC*9{;xD37wxNbo7!N$-hoKKf09x#n{b_OOv|ND zK=ji_KBl`%MlsFZYsZj-NcnLs>e#6S^4D$ljI$W^k(BP7X15$}c3E~{V*xCt%04@Xdvxmqqmc%(yl2dMS%b+>rDCsxJw_(0xF zH&2`VJ=%~HJ^Kh2e+2$5#wBdt7heFh6jciJ<1XwcqjlXbV5ebq{03W}Q`&Jg=>1^< z=^hVw8&n&=m#Up|SC$l0x|R*bI3-8x!7eQ)nzagM4mMOYH!Iv`fzX_ma9|Q#x7uiR zCGTycneG&s`>5D8I6t|te5ePk-8R;tfsVj$7{-X}VZ#{6e;(O}Q4OoNJX@j?pPth2 zI2(hN_a<>pHI5t?y1za_<_0)q)$+J6UQ%yHoWi)(3;R5|a|Cp8ML?1* z$jc1L%TgHW79Dx3HRQD@d2BS8&6LK5vv|tVm9u!bO}`$I{*N|5dVp0y(Tv9onKQQt zb*wY4exiuHe<%Rq!r3Crb-fZ*&A4_x5|Jqi@)P22==tM70Bb;$zlb{?s~C6mWhoEq zuS_8^kn5UaaLZJz-iCu-qq0?(g1dV~Lt9N$T&t5thg@ z0{6=z-Mk`j0lTB^Du?=a2hy!h3%yi3MKE0gB+kEn&?Vk$!G9PcK&oK8fA7pdw5n)# zV^Eh!E<31JrjonX(ewHKYEb=@knj=XS`=bGLi&9xnbP!&Mt`d2D!lQ^FHq%@UeXz(lV zAY1hT*aay)i+>mX=rn~Kvyh0;GI(yZ+NuHRh&hlQ5jI38dOO^JKET%rG%2vIhZ^z@ zGGo|oXyQmqOyyS7!+Mo24m1&!WEDeh%*uHL>={hLiv<}9-Pa>bVw;aj z^-Y1C<)088tyE4=sH2JYi3%yq=?_uEUvSV8WS$Z&;D1Yg2!E-DbBPfoCc8A`p^i0b zD4ZB;Z<_5NK(kee4~FdyHe7?^od`g6?kcNu?Mg_X*qGjR}m(yR8w_ky5@daG_2vrVPTO zXlRw-34a}1@B|mB?1VBSKbjWN8uUEEKQXH!aRPWbSUFNL)I9J9K6SO+aEgv_*Gl%K znNEb6N->O4I1)2Vqi`hVd*iY=xMPJI>WW#}foU6#G*pKp=_gc$Bk74F2}csY4E9mp z8$umK=f#2N<>GH)nbe>fcoev?r@a0~2G4D}C4brAnhPd(>`$l4#M-<@&?&33pwFg(KWrJR*t}|NPRfFk7g#ekhp|=| zG$*!H3zw~h0zUJ@X@khh|DzuE^|TRbRmyf$)F`g zmfG}KCTkL70GCx0Y^3Y~_JS@AC4U(X!Z9t@(WN#--XX}!%Xi`3wcj5fHYZSt%*yzrT~I}j3SV#! z*sM7{#hg2;bm>Oo`7YfW6lHd!FrhhQlA$rXv5if|{8_x=Y!rPGt5epKRDTqZ)LN>d z9gr>If_FtaO)VZDH`vF$pe>3Yq5QDU(K?BOi8>`3xB1P(_o?e9@~Q&fW;1Aw`lsdO7C!V&7mTpdT7f=1q&-a z8Ci1%-x!=Sm+TjV{rAna8}>YZ#MhrOb6C8!8@@P_blYzDkKnAdl$cY0fOKO{VvZ8e zqgPUurOl^7Fd>RP?mx^coHXr$6z#L2n;M@K!iH3n3%4c^0X)8s{(swES!9N3=Hn>8 zH&zxA9)l?GZ7%oqVA|IjaogcVr7a>xAB8kM(n?ztznnsM+RX-fj#+c5Snxvts2iqUNv@~J~?k|3J6c_-tdVN%(!uQ%dJfM|4%G2fdzJ>tks z{9#~mj_JX)c6tojp+$9!ag=>W?p%Z&vA$IbyOHPmUTEXi>VKNT8a<^;0(XDtB@=%T z;!xt^(4#+LP~acdNpmAUIf!wjRgXP%)bAH5t`K+&7lblAQe`9uUmB>jl`xJ*#Ld;pq$-DLW>S^k_i9pU!R*?k(oU$nHr5iy&ZOGb z#Kq$-drDUzC?3|!`^7fhKj7|^sx`%t6ttETia%$r-7HoKa({Xc*~^t{0xo9}Y*;2>CH;C2 zPNV}iK!GLr%SWsU9rtSpF9EYGgF8RwF}W0kCagKU@QYfFu9#rX`tA-18yjk_*5I(a zg`?1TqD86D>B=}YU|cc>L4h%^S*9eQ!|u3t)YVP=5S^8Dcyj;7^*6*p6?rBrH_-bo z&TiKoOn>-D>A(-hdFdGf)t7ddhlPld&zya5m3PZ@b6dft;F(sLIA_2BwTtn>Tdgjz z77S*28?~D&=k|EO$^I!FrG$~>ZXkW{uvfSBWO&?)SIPBk%b^>4)nLV>mo)<7g;rgl zLP&W@%59)NSlEk4d|_hxlWs*=|H}8)H?4k!Nq=PH3Ft%pQU--yl=?-we)IP>6-}K= zE2LCy(q($syfFD~xMox(vIdQaKDk2sXT2>7QeD9i=@tn*WM0avuUj#T6=wu~1QO$9 zZa|2Fsq=va(aA9H%69ZbeWGD2yY*MxeXHEjAfq9k1rdXnI~6D=^LXSboj}e=6W2sW z;D2QnGpy2TC-FCjR9iFJ08Sj{EWS6u1_Rav4=L$WwqGAG@_0E&o1oS|ejrh-yY=H{ zu>?(Sy@1nzKLzpa3WXJQvldyGX*deu##by_8S2zfAzNRD|Waks-t}O+Xv^% zJM_QHp_#@&IU^J)Bx6AlSzIbniwiE;q2n#5<~KpeE9i5M$@%yHzUWN|v@0bs zqCpuMh|fB*8w*lVXET;tBqU!*Uy1Jl>SQX#n?VPrp4wY=(H!cfAJFi|$o5qEc&%IG z%K3%g9lzkJe~|F6Kj44;!ReurOxMR16;#mllyPenujV_cvTKU(7RZplr``puoZ}F! zb$tMs6uPXkCmnh%-R%!_v^8nLP=Y~btbK#D{0x8;vutgs*UnxGEOM`)XE8ZZX~RU| zwqJUX#Xa9e1u$}X7lokkJZ~7|-e?68i)$!cJFG%zf6-M`F?HM3qu*y^KDL|w#DF)F zdw)6+kbA}$fGij67eoJ#kF)<-?=pP@-bonGrn$%HA=`m%M{?e{92+*ZE*}`bou|?9 zZ$t1bvefghREtl>aX6!~L6Tzt()qUKOgm_AR7`i>Ib&Z~*uLUsoDa_KEueqsdvmu@ zBH_=Jf0sBoFAvO5l(jA#%%9h!kiPZ??t+PpUzO~0UBrAeief6OgrLd7_N{XIbU^$8 zxa^ILuXq<4aoHRB-h}AuB;Ol*H)Zel-=1nL*)Fd^5q&Qg)k ze0N1r7{ubf&#o7Y`0CFLxR)pNf2&pQn^S7ETtfWiZMsPhFF$502o_LB zERw0(%>R6jY-WsLe~=`N+Lw(}d|&*ruMM+WZx343)7{Wu_)ojPE)Iw%x0fLvAdEtv zlzkc8CLw@)gSKX}zOepL%4BW0U>ZcRr+`OxQgvEmvN=*dA9e`ke<69G+$8Tsr&Q%Y zf6|>&ys*Zn6vIPjIHjz`J+H;Kp1-FB>E!q6B6-7UOF za4CXB8kCUJU%Q_`=r+1QKS2%7R{-Lhf1kjDggx!9^ZE&DOMdecy!i>fX+J?z8CC1F z(FTY=p0najbi9d<*DgB#7`wIww@o~E(#!_iriXN~N&lx0wHb5LG#n-*RmKFY~^72Db&o0I2 zHsv|%?UFdMPlGtli{C)ow~`8bf4-zbK}scONAX0{DVD1YDO$7SLrCeWu!JUgQVR<% z6j8~QF-8{Cwv6dUhBJ2gA$hqj+77vPjx)jFoG7UHQBsSXtkQ_7E$G0G-B| z^zN=%k zun7*(`6=6OUP$#Bo)fUpf59cVNfo+m`;R>Ll{AYgb760@)yumoCt*gj5TmrV$TP@! z1Qrw(IY;Fi-}NIXjC8sJ*lrhfZ)gs2E?432VjeKq(Ui>uJDPuTc2Q@tZ>yp(R~>U z%n&@-%(xA}7R4WGf3WyKuOKz(Wcla@6jhr!NE_`^gB7W_V1cSZh$ilkI`b^uZWCPe z6+O##AEB-sAWz<)Sh9#SXuw_^cu5isPNh-|ul;%jcE#utl|sez2Hqd=;$TyVu+1u4 z@3;SPD7=AkHetr+Ift3ll5-T%j>UQnj)qQyAnCNUy=v(|f1sr!d2NPoai5n}GIS`| zI(#E4pmwa=W>`DTR;Z^dMNgVp$K>kqUaai_Ts094f)Yzt&3>cLlXF%11&}&5R{FC2pZ@_wHBlN#?b)Zu6pC05g;h zh6-yfFIUicRdw75QGP@B`#+E9Y=iv{z{y*N6}Rl(e|#qA2bCsm6Kq*8TP{NaUhfOF z+i00X#x;2DFkwi0=ezQ~0!g@f=-~w{i@X3KGr-=e%diUSdE^E&Vmu);*{%Zt@6T4v zGLGYTKtf^L0xAAn<4bP`oB5GMlv%5mGdf%7?F@T`XPCC6;t7s0%l%hB)eKIk>ByV= zRkOi|e+s1H%SrC_+OfqCLtkc4R4LRiUdWeE(@!6qUmjOT^#$MAZhf~w+Iy8A_vj4X zZPM+p&JLIT+k4Rl)+h?Z9;g zpJYdF=|l&IUBHf`xKjkUXLENpQkoTufBpUlZFWdoVBz+~VMZg`o#iCxt~-eTX1qna zA^~PS;I|45)ZM-H>`$c|0QjQmfmvdKYfZ_kPVJzP^k=a(RB@ydF&3Ci1mVBfIHTtpT}B+r6+10)IN;%TCds@W|%+t+?F;)|{Ev=lLBC zu@A^bxnVClJ{K1q6_kqFPJ}rKZLyFH<58*ARI#Ai&*~dH{YBiFF3Q5;P}|PDv;E;; zd)JA@@@%fj)VGteZAovw!zgf-f6@B5@dpmYmR)qJvqQWv_UA>b8o{(TpH-jpn^W|8 z36jA$iiNTlj0OuLlfz9U)v#O6PUC*dycE*OC|7NiATh&R$IjCYiS>TSvQWn)xp6R< zAnts)c7i76Wh%}yDJYH_x;?xMz7RnSrvkvt9`dcpEcp^j;e@;6=Lm;WG z`g{}*qTDo>%#N*-C3MrgJMJ*5nB84zU0(^!=4O81h1-U#mOXqJ1PG5{n|@Z*(q3kp z3|=A;s_4&rUNyy2WT@=!5UOOzt&J^1?=)MIu4BI|xkQvE%#5x|6E*+>{aGRba9GcX zQSjYi@%1Of(JFaibP3Fm)BQ67E+_mO-8-fGablT;(qUB%`-XpEqp@Ayr1+ZvfT-%J~XEU8ZHH4`v*A_Cv6RHVlR_&D~;28^2 zdjNB9E43`)x)Gc`ZP}F9sCwa33#u!CWRCxypzNZ*cI~)oJ|O$%I0(WS4M~u)2iTj3 z^l7cTw3!SCQ9c;1f8hawujTASY?7cnxV9z+FcC{-3U+ay-We0iz{G^;jRbw)j?>tkx^OfXn{4yob9MI2fP__~I7537I``Me_iWF$-ve`CqhIbGm30I{w1P2|w zs}v&C@D({*_8{A>a51Zu^O!DwC2x}^^{_dx&iAl5Ebp5n1L!ujmxSSPuHMvQ%FYn$ z(u!PkQ>qXK*hORrv*D0Q;L?c$)A*F*w=6B?hq81xs zFe%TH3?$T2tOibw+ARbQ6Xq(b4S6OI5GCH0HIqmlu;w%W9C$5CY$IT0f zzQer%I6Nkh_B|XcjX90<5Dn^${ZU@%lkk&ye^~l<{oKPMOxB?Ioa7g1qEsePFqu#@ zuZ3OA4AaOiX1+I%<#YpNIJ%LAU91Pw+AgkDbg-LGWfkjbqe+-%SmfrAksRs$VX<8n zDJ_f&f`z+7OQAr`XzF6=fw474#VgsJu)kE}`d%ECQduyr+Bl-0Q|e*&-|Y*LxInH4 zeeSb}O7HHF0k~x=;HajEhyKXT%QeFhpuQ_%d9!<+Vw}Wb$Y*uXpYX^c zouc1%2!(=CXb8RaM3_wdv8&iBUnD&d1lvT#Fa5UIfy#*_+EIn3sqan#tl%*d(;p2d zem+Nw9m-9fKjMP|%m^hc&3}3_6(kb%f1Z4!l2rwfOXyd1W-`6+Kkx8ot6?QF14}aB^rTqrJ1w4SMz#VJ9b>g62j6622ahZsKo-wQrI^6ecunP5ccG zW~+Op=sXmAAGfRZZz^u<+9QR_PKzH6<&To?{8&LS!PqQlOMlYsnh}_`2w8@=J@Ysk z&U5R7IRHik4m>RGMY;hk?AIysA42A(q*M3}ex zH-@6=U^Z%?z5U&W9n_7_240+u#!YZ^w$8217TXTvH5NDr5aN*Qb3h{QVsOFcLz`V1 zk7GAcREm1rrEj~G0b+ZEf*M^y(v$%&f0w@RM|r54Ue?LfUr0C<`rqMMf1QyLBuK+2 zJM(b!E81*Usv0trE1IE6W4!hV3L}3?FDyE5598-I$MyCwJj9HOM|nkTCw?Z;+*L$b z;Q5MaUwPb@gDGRcWk8x=?O31JSM<)hs=$+ce(-hBm=0Wn0~t98#p_+Vtl`F(WyNqv z^nOyty{ONGOG05tX-!-jAa-B1bxeZoDNGfXE&-)Dt+K|KcIza;ET%Zc5vTWyrQ?Y78Mi{9+Q#p2Sa~y8zSMLpW3Ys3rP|us~Tt?dvS4l_a!6h z?ss3ZpRiz7mei!5Ru6+>ye8{n!4a?P-8-DphfV(_6n|5jNPPgQNB$Kpywz^0IXSdB zx_W?ef|~P!pdp7P1H$RMxP?P|c`z&K%mJVdZ_!Urlm}dMb2j;L^ci2Z7p2fJEZu*L zUT@}4OLoJem;Qv8Kvp*5lgXeL4%Jd1-RmKv*URpBkCoARZ2)z&llq%;4H> z->pDAl%c6`z9 zQiECa2q&g=L5;owW+;^j>K=rsQ{jopD%v~y`)r5ABU(NvawNAKOE#uK7sP)#74;nZ zxg8fU?r`FHw4=`%ZpRHclEBy1gniz`V>vKKj2BeCY!Q1(xdX~^8DL4pkLqhdA)14k zpNEVI;g;PN)q3HvGo3$5wtvJmC-?*zrUj37zW>KVZ(QlyV<;*=5}iaO06S!96&bKq zUo@pD#3nY_g^}XDs6c@iCT@R_40KgW6ad(%K;E@iFQl&+-L6b{dLYibvQzf+db9cd z*KPKU^vjor+iat*SX+O1pI%b%h?}z?*C`+ zTbJC%l{8<4F+axkMx82=6e-Catqomg95JW6-4S#6HA6 z;XcVC6CeeUATGQ}DqH^HZc`+X$V?;>iNu#>nA9zC7 zl&+qtW2L-fEL&vtT?2nMw=;A5p6H(T=47|P$8XiR65Q)mBuw@Xy?Gj+miw`my@|&b z07jH-pBiV}sMqyInWKP=^EbvrRzl6+8doc(-|G2Dj4yxKUZPZRF_c{y$xL&b zxc4tp>)$$ms5Kwj2_|0X=UruSGFWKFb>5iIn}%p;9`LwM>_#XU1Q+?$?3s9h&uV`& zPf>o_nIbOcTT?McT_nw50ai7Rx8c)(QFa}^#SZf~VAiYGZ|RUklE)lhESvZvg&|y_$J;xmV-Oa(!5lcda0sM$RtU zWBr&TUg>H0zf88|KhFsu+$KcL1XM@}7(#N-np>LKF*ZxGd3sKu5)nO3+3-sm8<2SG zaVMUSH$K~2UfUG8x$0FJ0a+IJwfwn zw>!y)f0|b>Wl_1=q&pAtar^VAmk~L`JWuaV^yoK%iL=^~lb8!5nkS_-LNjY{R%luLu*L;n!6xV_t*X0T}?H3>EWdLf1xtbFE<6EgXO6dEy_+vzq3fay1Ypg-ni`q+3 z)<3w$8qPcdiO!rk{M(w&>`ujTeOdNP*O`9?MsNvg6x16*YbR4R!aDHhYW+?+f;Kd{ z2`#wVvzKnqYHGos=OU@XKDWY_Hrte{MycO6wYQ~JdMQnAY1`cSDc8uxcYap8KEVCV ze6OTT^Mr1oQhFE||{m_3K zeMgQyfH^})#DZ?e^TJ-=@4~lb-(bwFh*-eBVe<#>G&-Yoyx1AR4dluf@IPh93k9x? zM&Xpph%n|FBau~-TL6(XKUbw-tTTmzvFu)@K2P1bH&ZndZ}xaS5};d5ni7p9*FIZ& z?vbzgRQcn;>rpE~_fs_(hTdQ>X48L}&xpo`O-V7q1u36UqSByhaH6e@q`7VPMo$<6}ML{jnKgHZg%uNl6(y43hUced3ZI&%F2yVqrO<8N`3wVnTZm zR!kfYt--Znj{qVk0~I?0*>c6X`PG)1I?54R(a1=wNg=}dZoWEzV4uR; zs+t@GK^Q7=Lg5Spu5ICcvu%I;6oW&oJ|E-h93D3Li@FLD0Pi*hCSU+-H5md7Fu@hb z8Dt)|Mfe406=yGzDC@ce!X(5p$n44-*~Mf~zFhG?r?fsc{M8QJ9N7->u71oM> z8{QTUconVNV69MeMEn;RyXQ4|;W1gSfVDVfmiq&{%(`QR@SeBHrx<_k8h(C^3bqg7 zL9lS~lG#T1Eqk=fN?g;|=}t5!Qql%&Ov(4xf9P0-$n5*RL;yZ5U*gS!z;1H5HA3*#$^IO6Vn2d4R5mw(gS!^ z+~<~uNa(2enct9yVX}V}Dqr*GUblCQ(3PzDxRIv=+#yT2;ZubAoc^8=)5-7pZW#Ek zdpbMQzb&L;C|b|k8NOl9?*t*8nPsNu);!Ad4}xK8x*#1Jni3Tmu&t=f7{sa<0R8H3%Wd6+0UbzM&&2J~m)X*o-`h|){}skx~xo9PB?Lr%*q_k-ojtj{5?MCeJBco5()Y?3|VT5Phz2l8HT zbB3xCF;%PRIYOX$+=bZa<*^;=MSz8a&7tz9Bv0Bn=(vAldUYG72GBtaXlzuSj(sa( zw)hK05(#^u>taWZ*LVu>RO(Jv<4M6hVFRYNHXN6j9m(&7R`E81b%Du}IAt3vIi?B~ z?^AEDX>Gq)0UTHD3lIXg@1fd3=4G^4J_?l-GDrHxiQ!7I$>HydmlcNTl(u9raJy+` zad|7mbn<_ZJDdGIGXBg8!YcxnNQ?IeMA-n#`yJ>2L`$~B+qnc;kR5;%ts|I*rhf3t zHD&fpl(^Lkb~*cc3zI|~>}B;>OQ`)98i{(0 zVf#dOMln5*qsA2QIrdSCdne@qE&-)y=B89Qhi8AX@UT-rMMt&!NhKOX!9^mb?P9aT zqcLZ>PIeqR^9gjwn)q$BroqL>_*v8;t~FGML1!E)aa)|9l07RvCBqrN5sRvD&%yPg zg-FRp9yVS4&(12rO*gl7!tD#!IAwroUa2eC2YW!@pgG2 z8+w1jL@tIzKHNoXIQ~{~U^?{&0ZVr(aa|s_$>D>#G$7B%V+7H(-{DRT4Z$~VVxoh- z7jQO#s!e&Wt@wJ$5yP(ugu5sb4~z6Q+@|zAXM17#5%D*Ma$HOyGqG^n)>SFs9F!?UPatv>rU&z)!*#OebOK0`Z z=*s*G1uK`kcBU-QnUsQIT2iXK#N+wBz@uUI^7}gMrIrO?(o@+;p*Yw5V)@Z)B-<5~A&$U2rVO)YQ6=*A*KtKNpjwY!CimZOqlj0~_vogr zqX*)q3BTPq+xWv{{%PJ7x|8j~yn%n;b>)B~!Y}z<7#*dY@ON2uH{H(TX{L%7{@CkI z1189)#io#$q2kgmeu|-RhZd2jGjqwPST8wDZA~BPF4wsE!lqx*IwXa`d9*yR0;NEV zyWPc`;^i#Wz>bOdR8$Gn9C4l?wz6D2FYe>DEngp_uNb7kyq!XY3k^BX7`T6d@*_|V zDhn+@rtO??hy@;KxKSj%VNGX`un{_=+mAP>N^4|;Efa+C^7u05RLEB*i<&eI<)FGK%w=bUvY$hvB{&1Nb)+@-9f?T(Kw1KoYF>hW^LM}9^jzY3W z*vP5oqQUwta?x`B{dk>$>LGu<;2BuU>yk`CZY`4E^2aFI5gEYuI=y};=!P(QMt2FP z|26p>eTud>&MJW%vt8mmMT?Dkx#yj=vZE3$#Q#w6F2G+{C%e7Dse#BJo^y;Yo^!39 zJ0pAVO3$4k(cwHQ6LfV%bp(eZJijr8q7s@JyS^ctbe@dSc5iSjnFK*#MjEjif0n6jdT)mcr!r)c|u=m39M_JV|H30g^v<7h6f z<}=R^18P2ML!zM0aF8f&CkVSee?WyU|0a}v(^Gzf0f8cnO28Xfdi&~c+>yHpm`V=4 zh5w1QF8hgDcG*w8ly846h>ktdX(TWLZe^=ikx4)lfhit*@hc)4s6H7?JAtphYKW1B z7%vCxzuq{z!#&K0;x%U4?e2i}95q*`xn9}5<;4zAhA>?Ua$bnQaV1k;Cz-mPE~~Cp zMm(RcftU5us|W1r;&Dl3nU^gTQXjj$@k~VHVUKhZ7O{Umr>=k2WBlQ94Kb(vouVQmf4ViFZ*U!%i@tZ+zZg)IC7u1q!>~sqRa4Z`}ee zx}tF#P=j(14yw+RNf->yc%z!&o+P32f?!I%IA=&+wFuMH$0(C z3$Tri$rR>imNN+e5oekvUO;@Y{s~!H0Fkt1Y5odfu0OW?sMJ{X`G~kiQ>CA#yEHor zdIQ#i)mp906Xix#e_6?`U8ek~-|=xdlPN*{_F<81fs4ZxAdx(QFWwH_u$)rw-Xw80 z^n<`3$sB(y@fUQk*duI2=DpVmr1v&!3z3=yv- zB80Mo&eWeOYv{u|xnHbvhm6iE+TbhE0!gLhjl#|>5B;aucolu)AoQnw#TjIiqN^c~ zaw{q0t!jEQmMK~lMXYLz)BCcvWOk^GoZ&c0*3o}rQ?JWZ>*_JVKxa+K9G0D++Y|MQ zaLBk@V5J&+n&-X2Y`Ykn7+`?nl5HZrkC53!hJu}jjB8m(+H?i$$R}e6zqEfCa29#l z*-Yj$fuoI>Xj<{m3s(y`XwFYEMfX?m!CHH|+CD9~$9Tg|l(xxins(;j&}>S_!Ll!p zOF@5&Q%pQS%ZpN^sJM-=2^}hv(<^Qs)$RsF|L!4+mqVY*4igME918UkerZ&_+{;>A z>3J=ncy3mAi8?J==J_|O#bn`qjJ7e{d$n_|Th(K0zSgsB-;3&cMf%N#trqF0fHjzAe>s-&-zB$pgH9~ zh1qF<*+!N~Hk9$G*BMDsP`(HAq)J$SS9<3$r-N03^oDw!$JkI`3)GVYxT6RTnca{m zR1c>et>Kjn^@6KOg*O*!QekG0iSeAX<0ZNItYW|#wMvQxt5}r=#cx!#$m{gHv21_l zi@#h07#P5yxO4iDtLW}A$-wgU|X7pz|)T%fJ?oi9__^A^Hvyt@fhWN|L z*SwrMm$38iQ0D;xp9Snc)gFp!A{$^%6P4Pg(ihBDR0F1W0jmo;+z&U|+_LE;OUE(q zM^-||M(=Hz_LD_tx@?%nMMP^RrAB`(<0j4IKjp~H1z5zJP&F$U=L~`_t%-RYG0u@& zq2)W7edq_^7GLc{6Uui2`yf_Lr6nhfyR^CH%$;AXiBxN|@)wJ~Pi!@m{G-!D@p<0n z$Rvd4dS?8T%*o0uwi^gNV{~ZoU20!&Cjvn1%;*&D4fl4=+9(vUq<`>7^HqO=30tED zAQ&HaEXj5ShiX|$>qETVLCUN+{|!vv)ir8r2A#(A6?f=Y``3ooRLW=zGu8%MPGX?M z0T@^upCW$h&YU9e?J8`_Z9w(1}jeB+R+L3?E_HFh7(;6iI zWTBC|eGq48n$Z8!=&>o6n~ufn$5-H{r2vXl5pWUC4(r>yq%R1qr&T-}rzL6;Gw~(}_O_Gy&9-7_dRJwRver>MaIa z`4|MagAjC}3;zO?aJhfjM`9W>_W^l=1*!7Nnno;W1cSffAZRoz6l2X9ZfI53M4mGy zc_X<+?rK^Zm}%6sNMelNzI{>0SlbzYPR+S?O(t2DsHgt(tMM^0J~MWYtT#|r?(o~A@F#I;;>mqJL+Q_>#nUBDZr<3 z^H#9Hsg|a9KgiHh5I|UUY4%03%S_r;ms-=M|M!3X?`MA~ReXb3%~=tXWVt*L0mbS- zzNlcuh?0r|T)n80!6qn+gGw&!;4Ue9f$e&(I?PS}PN|$$8w4glF4r z4m#(qfmMom$m|zfr8uXV^$rIFu#WJc=y72~#Z!MV@PkQT1H`xi36p`}M@uN%Lyrom zxKltq46`-hN#{u#rn=O8)1^B~vSC~`;HcX5djzjP?pp~3y8NeVOs(t9mNtCbxZ1mc z+wsKkCwqh~%bYX5R0ohi-;qcC@FZHOztQavdg@3aUx8)F7ZuyQao|s8 znt6Y>a%gD_M;`JXvJx=4A7#}o*nxuVCsxu#_7j#AXn8Lt2N-?yxSd2rP#krJuga4 zR1ERM-h>fXYWf(YBeDwPInU|+x#m?(1olig6SwZf!*M_4ej4GeAFU!1fps^YhEpC6M zq<~pPUY6975;W3xU2o2sxov#HGmFeKpCg=U2{<0<=~B-1IF6~6WnV&GtGbbTdDV2| z`Eb9Em!>dlgTSAKY1)5ILBOSkiS-QgaRDW~XaONQ;l6h^Z{tskz1q|0gxyX+qt+$O zkxe`i)SgUci3hFt&Q!YNUN}*v0VIFh_yb}zV@B3-jpqu*YEl$}E=#c54?#H|7oRlI z0Xr0K-R$T}_`OkwC7dh90saNf8WlUZw#qH~QSX1`oXBO2 zn>jMpgn%voO7jAbITy4r6`aKjdpON1GI4wAaEnB?9KZ_Y2h;`8IIG$*kp)J*b<&f% zcmR@ihkM*V;JSz8LgWPUWPn$B<`Bxa$?C8q61xAI%i-7L7;-~8#mJyV05|j$u2}fC(qFAl$(@`++%(G%WFAZzoU ztjv74fSz+^tSj3UQW0@yK`Ij6u750tl@`ycIi}3E#Q%%Tif!~jT&T?w29O*n{t#{O zatPX0B^O6-I2}}1Z$QKzr@8v?D9>1mobcIQ1BQ!{${Q|@`jdYp$nEKBRmK(L{12t# z%);p`AKKQpIr-=H{)hLNKBN@dyxZmA^i5m;qqNZ)ykv`gZEk*f>%9M=g+ZH-c|ZKK zag`VK;EXDt<=)m7)IUzEnnlB5+~~vWH|42gCheNDmtGF7HHP6ywcm`S<|o9(tO3nU zh<{h{xZ*-^X7hhvWkR(!d(J&o&NVNX>YQ|5w0(JC@zy~f=O5tXD5dx!Gnnt$@cz9x zye5={IqQOwn5DmgTTccUFYecx$hpZiAvHQ#<@-Uhn3FAO%0h=VNTXN#bKBcAlUdd0 zoa`Y-Go{wxew5`WiW@>366U`-ccTL^RxMZ{veUU}bt`;$ z*F@BR?2Uis;_cG0>y2j$lpvc63<0z(LY?@7u!l$XW#5F{H{1n=KK%we+Yf)G7pVa~ zXXX5Qz#H?$<0;v#0Z;6k{|OAdIj?+_7Im?tKNO>xTVxCa$ zO|GM=c8WF8=l~4JQmTOkU1gfVCSy%1HR@84cS?lSMul&zru$)RRVz?Ag0a`-Qo3nh z>|tfD96v833GP>J63j2y?fBC(^iIfofKCP{Q7zD}p3ZvOUmJe^uwG3b7w{|lzxPDP zfBZG4`-nKR>84-xeGF+o@1rkebo^~LcVLa|dZ9ZA{4jL>bL;#kt%H?)Tba!Cl(Cf3 zk?$VQm#j_!8Gp2t0j5cijqUcJG&&vE4X5e!ZULx6xw1E&_gH>sLL}IoxP2DyYr=<6 zt!btm7N)GSLm`W`t@NtPlwEJ;ha(~4Sc{b~N4RT|-whiZo&t=GzilY07tIH}GP4#l ze>$vLrmWt;RG1aK7zUkAcA>DGD9Fnbr7Rs4!VNYrdw-UKd1 zC!mT!6mwjOE<)_Ad7;kw-I<@u;XR8`o0MM)V4Xs(7z&c{qFq5!Y!(ASDsHbAZ(m=+ zL}X+&DoCyZJ;+ZE#jhUT0dM)LduuombbH?x-^w^}i{*Vr!NQcBSqNuB8e!74>55 z%SAYY6(>#w`%-rX*V37a3t^jf#S4fhoXc zJQ3X=EVd@Qij64nCnGA(k`evYN}0+px0&`=GQDs3$~T2mkLC|E`Xk@-#QM(c5w=`s z@_);!M;QknwFwb+@)8Oz7#wZb=VMq-fLuW+o57^xP*LCxdUJ*xU)GGl=Q*Yv+bm(q zPc=#U{1|PUzc<*TinAP}YAUW}rcY>>a2hugUr(J2^_C0%NLzJ>*m zcQ|!O&6Eg^e^zRj%adtBy4|VQpJEnZCVyS_=yIg1C>YerG)AGO04ABK*VVhNX_`Bp z>j&!W8K7&uOXS4mUAJ#)>VI2SJHt&j)rTQPR#axmakI9Hx6$$aU~r6xRc5rL&8obw zL6&-^8IV;bAtny>g?Z>?*7JhG-8c5Is*L#05wAlFm0_x2Rd%iH`(`ypZv?d(Q-6)D zy0$sfm<%n)n#h{kp(oNvWz<5~TNw@BmFRDzE6}mkDq3S;`eMwKWiUoM6_V1(vA2o} znbAn)0C0R8sNoJ6C*&EiHssO6HhCfvtEU1HYm~H)6&mfQlAaHBXE?`)TcN4D23(qf z>-w&k?86>m%XM6uIuMR3?47mh*N|RlLAQOv0}B}2hvk$08Bu$ zzZD8r=?EXX8P*8Ws0Lhju!YH9b+CL$W>^fqzn4IDAP$0Oy!X9DEbyk%MQ50HQMuhrhry1z&QH0il zb!>qz{@nL`F@Vr@-QJ91r=Kl=z{s+h0V=(s74OKudDKyjf#6mcMND&(p(ev(o+0US zmOya|R&;k#dAWXXq&!+w&NMyg;D3LxV)AgpxOJl650I`}ypwj+*L||*;E4r*VKp+Q z0XZ#jNNFN@l3Iw_isti-vr55pSRjv+;W^pGpt}s>lUA`HuR=}A4c#}J;#%v)jVIE_ zzH#lWHcc{~wl__<(*wW;XV-aCbG=Nqu`Q{YgHawETlro<`#;0%g?4*xx8&}tG z?so&xKVpw+t81;yk02OzSP3i{hg1-A_Hhb!sU=q&Br6r67N(BW{qQ%{+?Y;0&sSD$ zpa@3>ZHRPn4YxyAdJQMNV5)y|I89kqnovU#X#UptNL`Fz!jW(^blz-@hI=YP9xDJrXfM{b7?pycc|ttq^G1ahpVlun=WFZ0?f- z(YuuseR*DNc90pb(Jg*_!!*uRld~L&Y&$Db?nLVdgXy6B=g~bm4d#$C|>w6)J`aL#nrjW z9}T5-uDIHMe9h)t=l$b>m?)TzSnr699_MJ`N>`aY=;+uO@E3pi+G7nqbkYvv{VrO= zkq}`K;Rg$=alFiem8*D5I7qlfR(7(Yr~k@sx&batIpA77;#*jjJE7b6a^=SYcdE+k zv;iW;t4tgasox2GKXlpdL;ej;g(48?fPTX`G1|eL$2DUDZoodikD)kpj&Cwd(Vo~j z{}Y0pny{76jGce_{gHUfb2{!!x-2n<$rI-l=ueifOSGgE-keH}Us#9ATmZk{8%(p> zuaeKp=Gl>p=u8nV<|;)gi7J~+n-VFAa>fOj(+$`61Gm#<;<0w#h_QwmV#|2DJUqb} z{u2DJ-C_9%=k~` z8-a>#{?dQ+WYBRt;z{q!4Fit`F=~a$zjp*!m4b2I@nyx)FOsXpZR4U3JntL{9Qgnggs30}X$uq%JY8c}I;UrR$KK4O5dkjcL!mP?^z3CzhGWzV8Zc zmyeIt?)^k?m{+*nGsEp#C{3$)yP{>$E)g%)+*rE@X9wXG6y)Wg@M;~}muibDIG7g# z%`1Os(gkAk4uX!?%^!g(Zifi3)7v5R(OEU<`@!b5Si0H-=k0ZR-rO9VSA3mDQRt(y zs?B-9dA*rGQ)fiV!FlCEQz#Q+I`ezuxgGA6hJ_H+$Y9INx2AeRn%J7En&1;1L}sMCKbfM7M+ zAfUcBOiMk@d~sN=B0L)n=^WA3&X;4*0&e3u5nBV-8;w&yxWWy873rp}md9}oS`f!t z6Qfa2ReC){fzeonC8m-(`>wibc8NKLtVPP=1%b$ZN5*J#P7qoB3^f3exd_W)O(B3q zXzClZ2}x~eOma4&K#$_vN??DkFVkEwlvUnb_(5kdWx1USCjDKC$*R6UVDT5)+p^FwFLnRP;2t?R|rgXiLFW%xW zA}FhI&gTAL#xkphk8lVlrycbN&_Gp|~Xa3$~i5!2zJ2A&kAl1IVKzq$&J; zWMfH>`7|HE8GJerrz(mO@Z|m&9><)xVrY*s*8r8)j3RcA3LJlUGQIi!_b|Oh_0zC( z4#zHE7DNh_uP04|?sR-a>{6>OdsJ!%Cdn#wjpSQx)*JppUsxvV1YV-{f&7`zQx7QJ zaHOcVWqdC*UB<45BzgVit@DQyuiolTjH?hzkGtxU`2%h*{(Bn~sV7NRQeA>@P!4s)aD$V&oIK>~yxa2&1*oe~ z{7)@#;W1jTmHUT_Ccn~AgW>GDPN$2TPE9Y74~z9q7qovjw#Dt}%WS(%wv;d6#(v%= zER*ltYIHSx->Ttj+oNDA9YbiH-K~W9$y1EGM4`_+nXBoJx})CFY2{BMg`H;4dKs5R3Uu`_2BH2;@uGn-?)41JSj2FZTP22)^N zchv1qj)#A1#;jv>Lg0e0U{xNQ;0s!%VrEAP$zi)p%c9_|dZVfVWLvMacywTt%-AX~ zfr#rvlvb=#^)c%BBL-nn))p}6`JgTn$l=}(pOYQSy^VLy@-bR|#G}##4*-_R=(qtj zjH_fy!rXc$2Cw`&VxEa5O>z>7vk)8uEj6i3!>E6jD4_U@Tmj`ojd-2X*eq^{%p_?K zfmQ4PsU2&d5xJp4>$Q2oYh7)U?ZAJ;YgU#PRw5-o>_NRPY(!>Z>qL=z>H48d_Gn(N zs)^F+gtGz^oa?&bBt5QLI1i+?JmzwaX#R^5Lc|$XizY?fQq`_7tQ)vHvSI+^_t84} zY(9TN)8tz#6Y(OHPj#EkN-ZJ51i`F`MNcpVJhL!qTKMMG9?}r#U2A(*mIN z7P3Rg8w$gV$3F!a!ltLnH_Fi5iEfppf~|i!=Wt$RiK^#fCcST#8A|j$jqk?SGoMCx zwMzG(;xFI0eDHX#ObU5BK2)WK8u0uq2IkUuzDYQTNtyFxvV@A8{43W>%sLpJ59{PU zt!eV=XEgG!ZZDL5m$oW0fPa}|VQ@pfc{f<_eR;Tl=1=A^+cD?4E|JwYA-P>K54e9P z{6f>WI6@R`fFK{sI(vw=5comtgnT&6d5wGJ-Ete>Q+}O3HQM(*xGOt2Rcds%STR)5 zwlpnTKBPCfP}@SIQ(WMIY0*8->%3+?n8a$UH6869^BSRxwFpc8Ek=_ujI@Dp;ws)P zo}Z(|cE>X93JRCz27iWHnS@D~R@Q&k_gz2q!_Yl%SzE6jTTF}E4&O+vmgUKvnLDDn z1=A1w!8px6W{WaQKF0s&YS)8VuSW}8n|3>Jv`CAWSzOr*J7?6w?yVc1N(&8E$?`2( zZyt^V@or~fl^jl(UCsrR%u`s!UNrr)N7#tW)6-_Fjzf3SWyebN1%o6|^uB){h)&r| z>PhnS9IvD8&zP>fbN-NhjL8_~ZIC~(Rb1}1siT#~bx&(ksFaawcR&2W@J)kJ;i26x zi$Y~e6-(P;0!@`Y0}tpa;05!bWWfCBh6dTeFJOXyT3BTb&>IN5w}m-(Q$Vi15{%oh+H5pKnfpvd-x7#iYc~}ZEZgkmCT0y9@pSau%1AaHqb(R5=MTQ%b zGqqwDBIkSJE!s@v)5%#c0iNACvzn97!0nADsYfrG=es5iu!?oCJ$;okf3K+bPj>42 z1#znB9bL(7ts7z-lv@^Ifa&Exx>w-%WAIPA#VGW}tV{ZF|0c28q(X?$c;U=#vK(5urBoP&cP zlf3~GghX@1U*wuIe7A9yiyfpu0sN{YH45&)r$I%?5Gep(EXgxq*9s68QXE1qdy0Z? zkgww9VxJ%^Avo)sy}^IR!)kDxN?!WL@Wxl1w%~|)~hb%BZz2#0YV5)VI4Cdygm(O z3k$*(OM}Y15}NGKtn45skdxU#RSKQu&W*?sf}L+gBUyRd)_{MREb(PWlu)@hD~BUA zwv;E^X4WG1FEE$*#=E;hzRuDoePKz8ko6(U49jLBJyEweKcj%Ut=5F!Z`^&+EdsW#8cC zw&L9+mO;XpIU#>rx#-LOpw2$$hEgW;Uo(&XT~?c*2>&3v&y*Vk|5J)GQ(HWfNig%o zZLmA(xCYlxrUyi$qkECGngXTwxUh;n#fvOby zL$txPJd~{n*tj`rgm}ivQe|LfsS;%B5e6j%6vS}|gu6qEo%C?nB7#n)z`Jw<{h?9Z|rZqGw75LB(#>x_~SZsg2QXVxJOdANjPH(Kf;;534H}m`q z;ve*3|CsEoVy(v!TNG(gku>!Kf0~k{4l()DZhu0pBiyf~G4|~X2Q2o(-XzSh{Lj7$ zz&V#n2Al?$dM9b3u((Mu)k}G+GUKIq9W91vRFnkhhs6>JRgH|t#KU6Xv+_o0dOOl( zO3i;TEmjtx@66eAY9DbDOF1*l0R`JjQcLJ`;7wgxny73sPuYL#{A=<#`V;{c3LTLt zD><&!qs3VzuwMcQYO)#MJ$yap@Ndb!3i+EQi)Mu1;Ik5?#*Nu-A1zk7wwgB-gL&wU z#JWrDQK_M@38^4vx)4&KZjdUZg5myRNQHlawWJ0G81^nz+nfYtQH~tK4F3~S(-Jc$ zUUx9l--m!B-gF;Mw?(^xm$h&{#GfL#0zq{u=iI2YxI1u10fX?D695aXs)bn)hNGFP z1vDJWsnieV!4XfDGLt>Tm*u_-_-ggWR?NoMnWvil8GN2osbiZZTu|24nEBnwKuLcR zD3hirdtS;zsTXJ0Z9z#_30lfzxjbweOgPbNQ4!!>sW5~{h~Q|Ks*2K77634jro~_y z61y2(z%xa=^q1K2?pj;d(TC+8S-GzdycM!;9R&}``d$1J*I)x<}US6;1tv#^C z=m|;}_8q-*bPQgnfro8GsNWF_zAk?U-pDg(h#+9<{Yy=I#JUqTn4_T`d!#M0RFSNj z6HDzq&bl2xy%IupfgcuVBNpH@Z=i}srdZ?=*~ijDVxh%511Ez&P@&EP?@zQ^Z=f8k zN5Qjqy1S{pUN|4q;Jc~RR3d_c1joCwdD8=vlbSnT9>lr1k07)HPD(j&J~MycbAQAF z0;bBZp;ySeD{i^yZfn7E@s4{Nz3O;V;&2}EH96H0f4NZA`57kA=Xe+4?oBNfHlU`Y zqQCd8@6bwZK?k={Ci7Go07@i1kO1)uUcV$>nLi>uE!POuNQD@$Y@DX*ch$R7uN%sN zQG{RUEj;?@Iw8(BA@+x7NZo(_3K$1DjGe4LIt!GF`(eq<-~*}`GBKJasrtP5o)(G@ z*$XO9L#hIZl=Ta}4g#`+Vi^YVmXaL&h+LMs=mR&p{m{UaZj`mkp$VrJPYQc0BFPy2`UE=wky$ z{5@}3WmZqs2skUzm&I}qH{&)%#H5qYNKNik+9}SRe>OJ7E$(1U++gIV=i*p7ON_SK^ljL! z>A09oMd@eYJli>lhNTVUwIgwMAt!{Tc~m zG)t0QAfu}0UQI#63{{zejl8Z{%}Mu7*@6-lU5&vDH3nYbjV3RC?|DLFU~rC6VeYD^ z;m$FxEAfk(eEgzIH|+d8@s;G`!o{*6Lwjr)Thf@ z(xpSN#zcQ6ay?X8o(u>S!8$l{Q_urAPWu?+9=r|um5CDu^gl0ROe+BLR?%`z3?^p5 zB-<4r9wb$V0;^6z6USX2^*vfjdwFvGIZIapAV zRMXeV<^%cH8g99Q!6jcM+h}EAjyfKpBLk3OWAlGIovFM6g7|vDM&-;XeYu=P@grhd9kN|lmh0vmvPlN7sEZ~1L)T!D~+IE?>965gwE`Hg+bw)op22k!T z=#ZSUqkj&Frc~bRuPAY1N_Nrj2UIN`x~U!^ZwSM$*+!YSk^%YO(&4_X8Ox7pjj#tk8VNZ1a_d`s6+dW6i7z(e#WWduCtjxNCvxXAE3_E`@1u3{x%nLCZ_qOsXP&|2^qzmgi{#iO zq&>OQ-AJ?oIJm{$Sx1W%qW*BZl&d0Kj3P{1Aq_UBaLxKE{O{2E-#Wj>um!#{ z&YCnhDqj;HW%ZRo5~RkIhLnHAu*J@~|4O_S44z@6eS3(Q(S_|Yq+DYCGK#cLab4Lw z++i+h7T};MqwqrXkZducOV(@%-xAu0w*`G+>%w5}P8Eg5BVJ?x?*I4E@^KUYeu#i9 zGCmB|Fh&WGa?TNU?#9`FPVx``KYL%>MRv0Yi` z@*(GXiX(A%Sk{PhdfD|Rm;e5t0gwbppaF>F%&fhxvb{@+K%>#!X!I*TuByJrm4$&? z)yUt#%)@LD)Fr91Kv2w4Uz^Ti&_B|a$!HRf3`i3TYl{u8ZoKyx@d^WJs8m3(CRBa~ zQOeyW(HYuwUWe4HT?v2hQoEIUbE=+E~P4H15)J^_j1c5Ignz{rQ_8fB*jcO}o>ogse&6 zPbzWJo`UvhydDzr&n`WuUwc2cIyXNp6zo=AA_jwnZ@zw#8AX5V0PC@uUBATQBat)p z8YLolPKa$fB0KUdR~T@4-clr_2^rV3UjnMIACLU;+~;wwvkIq5Nr=xX4y4)0dq@z{ z)yQyN7$u2e;M6JmgX7+5WYY)I=x6|uG_-2_^*|3rE9IT>w@5OgglkE0&fKH3Hrnl zZLzfdG%Jgh6~XhP_wKUalkpzU_xe27)*iJ~crAOBA%bVo#;;gae)v%AnG^Vcc4(F1 z;2|uuD;~`p6|bUb@kome$?;00Q4siH*#Yw*1?z#($e4eX*=Ls7d`~gZ5gcn+7@Eob z*%psiOekHnSab)y3gY}Cf~n(zGhsV&-G3~gn^~3oOanw{yF-tr;~t8t@i8NHW*GRG z6KdYxr-%24PeAq`mdrgucq@3#DoN=RfDhQ4)EoE zi}GCkbDjA?bDEtXFe%-48{9h)iOfVG%4*><4#KjJAne=Q?J<9BX}s5RvIyvm#tduL z+;O$++@bk5yy@JHM-Hv*0~mJrId#Z*$0PX5c~hg4g{*V;NjtHS-!#)$6(@B|<( zWkLn;@2tVKAM@>*FzrhN|2&h`*Wt;IfvDbO%KdncST=d$kC!p`wy1|PrML+QXL!)+ z>+OFTXF!WX46Kt})MtZDC_xA4)8;o>PKQjHxVf}C(K2)L2#pPID z3rj~FjeR$?B3{Ou1g*kU^#*p?8DUq5Ci*@*vu=cZjTPW23fpE8&3)eJ&Vl~0wJ?M* zB$fRrAw?AfL(&xLnDQ!(^E;Fmmq8qr^{L@PO>U#MlWBJSZw?DSP=_>c?2IduW^8{` zzv`VSAevl9mP_=$ddwd8DfDxw?r_G)4nC;NS-~Ql^DKYPMRKYfs7#w<`X2ng&4V~S ze6mHx0LgBvjlW1_x1ca12N4+NU9sO6A88LKriyx}`{E;`VkVU+8B)HgGfs%~<2^ID z#3Q&aMI8G{|4ZWVYnJqxskAAg&vt(R?LY(oMs=&jXw_;1VFvdbaL`Hrbc7vr*Cy<5 z-T(=C>DN#>4qHS|?pBu#$H0l>WWH!N9k^;9wB5-9IuTsqTD>Ebb}6N_w2{N@;oU%c z2tQH^>c08dW+ENJx1EK7PY5R`*FW!bjwOlP)b3hfb|Xx0H_?&(ZKWdqA5!JXc0bv zXfjQtL*OX#x27RMa{<%PxXG4^K>F0k``5#ANI9)Msk2JJD_NUA0q9BeUzY#~FgE08{GVb&D z_j~d$IJxLr$zA?j-X{2OpytUB($>f`ye032rxZJI5#=KmJDQ}%m+=1WKgo-a;Q0!e zL+zgYIi4`L75v~YDa>^)9>JN#esTl|>%ZO==X3E;|9zjm6W-ou=`MdGh#m*@ukVWD zEd2HT4!*K;cQ*m>MVSkQ3X*~q$Ddp zh~yYT{-}alBU^ri!1{mfefkJBu6NmKd(7{6&HyHKHuG_?EX&3}qz7FvkLKv9jA5w2 z9@yPDil-53fP&IS`3|sQvKNWyK+Kvnbe$$!mg&oZHRie+%oYKn}i#_1L+~%e>xF*rB>0C2N@Sfh`N7C&t-JWSLYmhMnNBg z-R=az8OO_kJuE(CN052khszh_Wnjjq&hJ}k@;=y-qXT8jUeF}|a=Hn|bM$gV(Mbz1 zUG@emZLkcI$|uh>t!{I-Yv)R|Itmhl)@o#(B|+8-Epbv8bP?#FDjBILIAx6??uh6H z9-VSe)C*MW=i`6Kq-gejrF+j0LQ~`3mK*WAPN2-_9nf~dD`a^zAFal`Se#ClySgBa zeO9mB0hVrOK~e}l&+QiBI-11Ts257*?J+6A;*m&KBFy_2n1TJ#4OkMf@g*6l4Sleq z*!yh1N8==WoJ?oJ^3dp3aeMHXs7`oi_M2}2_pFvOHq(D12*!SO;HmJ6n&qy>R5xyt z5B|pI>yba2;=SF$bH)o^@*;=|of>%Ml<^~%7B4-g`Cgv-O%FQ9d_CTbt2Zp2h&`f9 zL)P)_0hA`5P0Z6}6>4j#c;Zpo11s-goGiv`K74wiKG&01Yqz4xO8ver6N6N%J)xCi zaB?p#h3|jMkgc7Agx@VSW#ebx(->x=4%97*(foOxU*q1Y-uMZhh#NAqSS^Nm;5w%YQ>aBBO@CR%I?47*v@dDb(s$Rk7=?I9(?}yp(ZjX`vKM zs;qxx2UMlb-{maeP)BkM9zH95!?%PkwHXWvHlTKv7RG*v(amk@x*&0Ka zbh$faXNb=dd9v;q2+3GyU@weKC&_3NqnAD&<;mhKX;kHbSJ{P=t68GBRd40tj#hOA z&x_)o;JQ1}|J-8N0;yi2hLbA|wUGbylYXSP7hR9=8n zWw_yLzF^X6YavX3xRqvn(}UJDP5g0E#jH@RiTl6l$Xzwj2u2n((PTO$hf6@ajOf0h zUgowYI+iq1u!vEV{a5zsV{vRo%BX)dO`aXBdPSY@eV|hjJ0PI5A`n}oP6v||8Tw6gxeLM`W%T<3gU!gfb zl~gQ_xLspB4}uXY+gS}gLw(TYG#N$ZdBO|Ml-4lpyUm#B73j(EG~gQ%swtu)4iZk{ z#i;Cml~N6gBlM9WPT%|Jl;$^w5D{%e!F+{hKykf}en(*K2FuG0U7?``$}D4Ya-=m)Wb z{%;1;P5%#X6a2<*o)EhLm^bIOwZxopGUZLes0$91ZEHfjm45lAhhv`0V*cg@AM+=0 z*KIorWURuQ`isg_WjG8*^LUQu>ORu~%JUUJ3|C3CjL`9Z3QmxR8Tas+*LJQlRtS#3yp2BscB zj3@CZh~?BVOYD7DK>uy(O+7S%mh`R%_>c8HgL132Qz4!v(IiO>mkI;`XAgq!u)5}L z0YU6*T3Pr|7$}VIT)z~i!EzlFM|<|Bz%e*<<2auCs8;H7s+NC$vMGV~l*cKNVfh&n zZ?^m5#DgP2iuBK?i)6H@g*c1VVvp#^szcDl^Fd>j1kWUwU>^nJ>73~=j^kG$I<5<_NjBDMMkWiNuoo`V2~N@{Tn* z8b`j#uExQ&L{KGn^kJI(3+58Wh2PE_Fwtq~x`B5?C%b$PzU6Q|MyWOlkhtFRyQ~z-tT$$i+1~EI&dVgI zO7&&wuc9wciK4-Yh#w6v3{7?EcG1@he=gtrRxp22T_D=1s9p^qT9}R^;v$)hrz^Al zetzINgJAIyEm!pFBjzd9k!8|72_nFysBdUHTq<~;_3-G?=m){3G?b->Ps~@-`~q2| z_j7*O(G)PM8L43YK-(6)l6!t{X|6Zz2(HiVdfoqa4s7P7Ow%^m@~%*vod3)!m)KZk zsjYu^_;oh`V;O#gzvvFK{NgK$5nKV&pkk)166mD#ig%e|eIurlrQsqD%5ZcIGxC}^ z<&EY$2S$e84cP2mDju=*0T!QxpWT5^_o{|$j$@^-0Y zEwW$6>U15c`wLCJ2%2Q&%W9HzB`HHIHTn0ZN@<@9NqwOnPCdu${bip@H#?D%jP7Zl zD2!`t!z^Mc#a*A}2QvG+ls94PHa9w}L+M#IkxT<&94{AT7w*4i@7KRPUO(Ftl4F0L z_s~`sVDRCjn-o{LFpko-xoV|EiHy?Fp0ohD6&%~ zjM(J-2aAzEZ8wvX9!ln6@eM^Df24mU#XmuJ;`As}V&ixcFrd6H=;N4v-~~NaQ2v>g zhm>s(&Zx%wbnx%{g8r5Fmtx1vU$0gBiuMP)de%C&OdAC@+~i9rb^dLY6ubLQ(WQ2{ z*-LWK&8j5|!yUl{(T`By>X7c6@U)0^NFelRnOA1ix}e#we^U@5P51k^1S5ax`Eq;_ zbn>s4ftL;Ut1XIMs~gXAprut?c{n2dQ+A$f3LOkL>08aDZwA+cu0G0xQLvmyZJ4gW zFnWe7yPolfrmYC$B-pS_2q!`#>Q$fg?k}VDirpg|ku;R7ycRL9UIGwG-RbG~20{eq zmD-Py@G2y;G)vL*hn5qQhlGC)=6iBVl|O(Qo3!q26R^UqdansX)5X}AV~n5S5W9Yx zhC0NqMT>lhy%|QduQ$mmV662FqFp%0UYuw@eG%=0igp0u`aGpYegH$(x7g^LRUFQn zojI=G2dm7h>vg*Ck3Xc)z7Rbi_>!*2c+WWbtsHH=X&~~jqj6l>jlX{!x_v_Qat>Vr z$7CuWx}#}0;tni2EtY{Rx^vPpa8(S_sUOmxRk5zTtU9l3oM$KR#EP6}JMZoj3wf-n z9#?iA-V3OTHs%xEVyqqeqxA@_kc4}g!f+Loq4jf5WwG`i(oYCV$*(mJfaQS~JMYS5n1z9}*?Pxr;~d@mQH zuHY(zeh73AJ;TBu(Lq!iAcW*J)ISC?fH^o`$R1|@d&vnTfQ7T%-Rzkc?|n_Ts(*=L zgP1?(KW9MbH+ac%LBH4WW@mD9T;6&aZQ@8;UP#tFXZd`#+aQ0>CU#w)p$!6qc{rU{ zvnxKoLV|JdUB`Uo-QM1Mc#%QAf5>WE2l=zFc1D)<)Igc>G{DK;=2L;)t`=aQ6+2x? z`X1gC(=;kq*S5vJfbZy{ATDULY3g$}6_~GGL&?AYqW|xozSdC?`EsG|_BpUlx2-;b z;+(=4E(bt!NaTNeR#Uy9nA(Db_s9w3@w93=b^<_Y(~V(M3izZV+J}tt3XN40*;(Ay z{CORt3p6b%Q!QA6jPQ#0zhpHjA(f`uZF*BkiE4e`-b0Kb)1o!^0?mBwQB?a7@Le%^yq{`U z5OmdtAqeu~a;D`lr48wyfEC6p%OFX~j#aNIKb)y;kZrc`LVX!ESp9-gI2}pW_h#op zl@moCV=;djZC2L>x$A(CO^;ZPlhzA17;H@hL7szb*k4CwPq+RVM&WXu1j#7!jSRyrp``^>tamMOf7#C$?3EAc;Q+n9m{s_=%Ma=C zQ(g5y9OD_Pzxqkwhe14fs_L)FZI|M&675Y#(>Z_Jvh(aU)0_`Qoo0_#S{C-ZNnwp& zMsXBPukSV@O*EGc=zWt9zdS%aRj{O2^#*8jbnm~5Tu6i>Lf-=|QidBn9qcuKl zQKXscuAnPZx*>Atum?zhe$T9+1V68=A?*LY%7+(4%%DnTSx*4DuQD8#=>{IJH`Ypk zVETVe?UsV~C-32MqD37BY?l23QC1v?)>|Ahf!N9_ZD|v6ydDs!i3CyiDb!phOq)ZY zWA8p?$~ooe#)rQNOdhhFV#XSg`Qcr51eO*gR;hGKXYgINEgpE;yjtW*w-e##PlD{G z_Kmob)$;CJP{*ZJ>V+IbmkXA}A60fCuOxr>)K;H^A+};u98{{1?E&=?bY}$N$~{EeDaZqw&o)E4BhC(q=N)_A${HI>UfRI0Vsb> zTn9T2Wm*73Sj8mDP>mZX00oc#MrL}KANaYdH}GT+kHD1OwzYOge{>)vgc!6oNauYw z)SDDT>Slb_jwG(!V_W*6mQaZpP-wt;wZ58g&5HqOQ1pfVW{LXABr@&>4Bs9~Kw$f= zVr76WtXe4wb6nL*QTX2a-W&VVQ4)VoLx)z1W-wh_DNfs^kKHE3?#JTJ>0=)4BxSGS z4FhGh9&eUqVFErWdPrEnPIL#1MlBBV&C*}Rb)2ktkV|iv_QxJkND;8O2T`{+rgkQ= zA1$~hsWMysa8-c1xU}ggTrTk>>*nXkZ)H2OY#YZ{YK8+pG0fjXTdE6G9+iJQRqTvY zE^)RiveV%YXF~i3XxWr{AG7`btDg_W$AfqJ^l(?~y;j`42-9LYT6B?X!uQrKVuKhO z(2Pv>JU1}i~N)4F{u3Lzn!RSupR>nJb^k&vDS*z#XeIg_z z`aV^3gbh2ZSwu~Ox89HU;AMY-unJJEj+Z?sPmhnFtrcDi03mAD!l>mW*TQ6+_{>b# zy9pto#YEodO$c*rsU9$@2W3Yq&z0=XYF*;6K_E{I)#%&M6rt4P6x{jvI+~cC%KZAREI-L+15u2{*2mr2k^6)lrSe{dN z(r)`kjqm3RBuVwQaUuj8pZv=-;j3;d!uL+wOXRt!_pBS3?mK^u-d4;LVpbU8YscCb zw$wrd#A8MiuRXHE_I*^jq>*J?%WN!4>&@uF;TTq^g!&lTQ z?t(+<%#~v-oTAm&(`e~0RA`ak46d+NjRO#0E2xKhWut-qQ8J1Q=&vG350I~UBsyQY z#U~nl+!s-sLE(R@vb?Jf)2sa*mdyXT$yPs#V}BC4Sc3YNt zLv)IMcY1EUBf)?`nAW`+_I;e~p6WFw7Rj5qovgR*cC?tD(D?NVWrup!B_?u_f zeAEbQC)2c4LNo%RE1NqV1>CTRMp;}%be&VG^j5_sN>)1Ud6#t;8T7x zJYAU_0jhgd6{w{QfXZpazF=vqn}Twpq))4m2^%(?N6WR6{9YEiu-ZvAgQ7&wR*KQ1 zQl2AsRhl_~$a@T&wNLJ*Xbvqk%zd@bf94|B>RNv&413kJQ22gGlbadLo=tA%39);j zxLJ7MlSpOi=v821(db%*89+Gnv3RJ?*eaN=ed5?e80k4%e)H^t@H#cif-NgqDY#J| zS@A_?0NiB^^A{SjEBxx|-4fAgk|g0I@}J5r5#0uUr^GqV49`mA4O;}RJU#1SUy(B= zJVbw0N=+~A`Vq*FO}ArF4Qyz94zpl^creQ}48sIXX2!jT;#mG7n(&;X^NihX4&COK zH7DD-b@(>iqs`zLaA^ZW8C9-{#KyiA84_K`BJr1KdL_74xKvgGFjMe*w;8Ky6`Cul zEN=i9)T&%+ zvE5#*`h-mvqadIi%jqK?Is}0$%49V8=Pf>vhnY{JU?s)NT1CqK`2FhpuW2kRgkgW@ z`|RkE#T*GkkxN(^XI=JW!_e=KLO)z1^Ur8-EIk@)(E&!#^vp`mR#{)KX#H7uubZ&b zl8u7dxD?H)bJ*n{@*UKZ=?M31OK3LTLahWA8Cs>oiD)v)GxL@hDsGzrg)nGx+J4OU zdoTMysD|C%A*vEgO;D-WWB$5hJHz&>xKsYq-D?LI+ zErDXa{LB0;EpYAyBR?L7cnGcTiO|xPNs*YEBdK@E5cr`#wv`P0$F3`7l3`VBFTAuE zFeIhB*7xj+5!cf5j&2{1W{=0D0|*;Rj`Ndoi= zdu}&%s-Wo)7o793SkcZTz&B8_+wvQ=KBPBc^UQ?1;zQ;=Ky!7fU^mx7FPr<1=_e*} z#Jj`|QH9A6CtfAItC_B8k!ya(5$0_QXvLd8kRMwhZu(e! z3tySzEWe>wMgE9_g)D!WRs;jnR&hB$Ue0QpR0y`C_(r~Wv-@wjmEG1%RaC6s6V%?rzb6G_|(~Hv%0JP-(Qv-j{s_4WX|MZROIo2cB zFuOIyV8nsm4m%)W^xV6kjFr&>aC>{34gyBYIq=kYNUW&wP5%ejta+&PJmGX5Pv>6* z@)v>pMIe8k0$JpIftkt1+%k>uRjY?4dw(+sf?lkoer+MDm*ZffE;KB^p^}q7qJyX; zr%O>E>V0h&=%Ih#R!jIXBN}>o&RlBrgyrm}wK9zBUD!AR8XG6RVas-KVK-K#a#mAo zoz7WJDJM!6akHNae<(oZ7qc~X3fHK&5H zpF|@{T)JAZheOmeX2P_CT;p8qr3=_+&# z1kY*_M^R55P@PNazrt-rQoq*rbgcXoF7++U&2k)6A7~~R9WCUrgZ8%Hr!4te>^`yc zwtFy_yvv!P2lDpFZ}26~$7E!*;sWlD5k3dA57?uC3hgJI30a5DuhZ3)_cqP zm(Ys8RZf43Fr}P5%Q3;S7gKU=c}M8#u+46~Q&DEF>o})>p}1OxL8FB+f23s{7okY2 zE4Bq37g8LJ5YcnGkaNNNuk6#u;@Aw4RLQcWFIg6^ljTM}vnQMJe7qKk8ZA*F{9Hq* zrfdr~fDCc42a24m12pp2-Uzuy}|d#K@!r#TK5h0G_=`@ zf5Z3aEoG@CkxDjt1MNwvepRNycgEx-8IK$KaR6&Tl)tbXjTa1)CD<5Y2|qv2==wnF zDrrZxifiOsf|MDYf#@}lFCfq5BYEZYUmSmr$5&PBwxj*)3*N_u?HVrut* zTf)8jf^&CumSrb$R91V&JV7*w`VrFk&yWF_)0%Q6E915J$@OWBYe0s6lA9=q@G9;^ z?*=64JyHYqfJ!njwZ&B(I|AO2xtb=HIZGPFk?3#CK}9pgBRf)Z^B?wsWQ+<)rG($Rr{E(mXbWeNik!6xQ$S&W3u~Aq)v<)mi zWXFAxLOaJ(vA?wYUN+!buA)g0qi_K^R65Ro38sd!PIt6+{yyL4kXcx_F{LFWY7s#D z9X2+F)9>PSOR0c6S9d1njiNM;bu91 ziso`7aZ6nR!2ZwlL&{^eSgImRHiW7h1=RYM4=jn0p1u%!7)-};62(td@nmv4?p}y} z0QJz{#LKZ4}$bfLaXn!Ef3TjS7CzP^2)AYm_QJgqoayB?WWoo zL}jL+g;tcWlF|X%gDogYLRm~C<8i!y<^^uq@`-Mat(osC`z^(kRS)q^xHj}oV|{0_ zLAU`18-$xjRNQc$;Wu(KgcddzGl(XeivWwft%I6WEmmI|Tv%@Du3-J;(*tjGPUP(o zzmJHxVN7OAXBvo}h45yECX43ztY=Ew-Gd#c0tE~kLg0R_s$OseiTWQl=5!N(uY)OH z!b3)TFO{nIQ=v|C0e}i!wh&b2GrHoQsAD`2g0h~Cjv9ffh-zG$6|n)=(`3ON#abIi znIC?#D0$7tlO>NZNiP-+w*}zWP$NREObo&>SD6@u@2%CuWI7G~Y2adFFoWq_E3X?? zFbjiuYj6vLNEtKXE(PTcEjiPFg54?;AH7FNBTJ@-Qi54SeA^K)(JgOL9@tS6$zAQtf8L8t$YP>qS?UU9HSrjLcZkRNumyTJS zPC1;v^^KK{{BwTTQO}Zafn}6%5`7&FtjeU|&TropXYL134iASTks?iGkO{JyKE=?o zLw4f$qUpP|cv!{6jCe+^myuxk6F9%MNXduPresrI=SjZ7K3~iO*mQb>)vm zNyrQdOKzv-g=u~}lj=DUB&RI13O*9%xUPP0{k==@(Kv{ssZ0G{Bbcs!Bg6gQJRw@Y zSJ=5Lyi2(6u*s%>SR0k50})%Y1DC>XmPZ~$R+CS+plC{togh_vWzMK5> z7Fo%|@E_AR{5~TehH9)U^WE5gl%vf4_Q+yFI91RJBisFDXUP1x61*m4s!Ti@WPz8B zZO`tMc6WD7w?AiRP=;874b=inn(mutO~>;$$!J>XQj~aq_#-+p;@q~$JV~fhA~?5$ zF(lSaQ0F$yZE8EWd1ySx^#%@I9WB8s#(uOKl@bs(W3BCEpz>AwdN+2p@UFODF5_t+ zH`3#e>V>N5ovyyAS%WIZqJKcjn|wrYdyC76>H1hvvAB-u2vZl200!0lIDbQ=IoZ22 z*eMPW{B^#691j>E(|J7Fuxq4tB9_2b@)hpakAitz?)w1z!iJalrJhmAFMlHVAT%Vi zOM}aUQLvmyr72{|^TV;&UFeoK?=B@N)Z{H&*$sQBrID_1z4HE2?3i|dHsn&48srZt z2OgVes1lGLX*0rf-vmSF??7>aGR`O%Pv<<`%MB%e3#j9Nc>nECD6irdFz{EQzl>-? zpfD$YXgMc&NDj04K7W5Ge{j0oL8ioG>uO!NiIm~!5i+pemJzCbf;5SP$vW19q@&D# zy$rmR@?%l#oUQ>wq2=Gwuy2(5ap14!wf#qw&e9tuo!KMPdf;-!vVG`@My)xO@n)B8 z_i#~vpf89n_aTQPHpg${(PSL*qg*rR_C9@tbJB8@tM2r|_x2wBgeW0lV!Bwlf$4VF zYL!NDn+&_poA*U$GKMZQp!6v1n(4{=nC#x2(ky=eb8l{Uy* zedULD+3{HFs$dOPOpVb2FILJH@dx#$odkdYf;%GSEYLiJh@quC)%c~TIus1G70OtW zHF;bkv8f4b+Gad`e@w!>aqLebQy5Th5+b?{LWk8UjWOyqy>@5@KVD5GRj^Ytcp5T) zCv2xcx?SODdFC)UwuIMdQq7sRiZWa#hd>3(!qG?~DUUCI2hC&dp|-6m2MFODmd^Bv zd>0Iz}h^LRh;Xho2FD4+R9#J{9^!0(VGna9j0TX}P42vUmG4{iNdoI2lsl6Vl;vIxX)3ef8oFO2%h?j?d2C5&A!fE7B zO^)Q=s6M{+M?+CP2ugJ`I}om-{6UJNaLb$@gmY#Ib)rKnKjQ$BczzADUAssPO%X}n zU^F)wWCq7g20=bN;@_S2BuvJMk9Z!sgt1oHnr?q_tljC^3AZ$XU*21K%xAxl z-6xD!9GYec9+wA7S9)%mENBSc;VWJdz*O|Nf3jt9b|pA{v+x&kq2zKol(cf=?K6Gv zXX<^sVT1XDs>1TCIXc9<^>Vo!?=N^Mkqm)YP%FC|&Jy=NTN16)oxf@_bSfqCUY zGxKsjhaZ3O0BNB@3B7_*huIcd)WT&9uD_yzl3sV3%6jGe<` zsS)>r{^DNV*#GeE4@|o_<&e^dS#K3Sy+Y;1JD-}aiu~}dI6hRS$;K(hQ{T!%k14a~ z`%8c6RRvu}0{Qd@u+?(y^DXN+`*_SB@^jA3w-zUuYpk66>ERMvDt02Fv8C}ei6#jz zf~5Y2hDo<$OKEN8iiPLLWAV`|17mbd0n1rW$9`3I)+Vg9(T75OMPp(IVvV-qz}8r2 z(X@j{g;WFkK+hIwTTs=tW+;bXOF?kj#zlWo1Z{u?_q9i@6zD5e9f%-h&r|Kh$DYo2ObLBEWe@K%pcVRt48Q`QCqsWEBMba z#%;@pDg=Oz;Zw-S4wh}N3V}+S;zJev)cjGWz^5RNM}bn_$!}OmM)t^te99A&R!@Hy z;e}Io2VDO^og_SAm0rXjh=2pJCmA1wlm8jqCuL&A(>V>hyH94XZ@t=cE2>DU?GO$b z!BfSz1;V;CpQ(K@>g|NwI91HvGtnoD7;7zwT7_t$Xhm^!{XAOii+}rzfBUx@GS*}X z^gj1u9I=k~s$?Bc*HxQ)Do})r2%mqpRVZJaP`bCY2PdgPsr^Cm;=!ketZ z0&h(!6Sama%d_eU>2mP33_@^Ra)~?K7G^)*UwG>e7ODm2aqd*D^wM!*hbbHhX%PQhk7T+_%foMs+kH`EBYp{i91}t=! zZhy8V74@_ypz(Zr&+2x9bsL3X>W3jW2A^leyK{z8zj=BV(uv9yY085~Bu4g*dN~Nn zF9))<85r?8f?@Ib(~*C^#NfBmFW>ZV7Rc+-oCU7IdP*4hF{glGH4T!ftU~ffbmXoo zq`lgJ7CyJv8X(8_@IE_wt&l1SNrS3a5SsNs03j+f68#2a@nQr{=$iok%JA0;eZR9t zo&A{qk&#=C_xIwsN4fer7IB`ng2$eAe@_r0^y>9)&i6%20qh50 zyl3WgIhsz!?hyZ--{2*-qH%Z7PiU7O2U?ARQw0I#v>bmd*QE!b1#yIJ#%Mi`0r;PA!Z@I(fO zPCGx`RqTKNfz%x48s=v8cy3Z@7=;GFhfXDNg%;?U+p6g9RhFS|ynlZ&4%zPa7vs)5{ZGhM=rP|L3b+fGEmlH2$Kwiw`@l7( z0pX&}&bl(a!DV6C1j!^=&rw1=le^iePF}|b3!;B$HR83{XZTIhJg@ys#|$C^&<3C# zx4{f85;0A$Z`O;^8A2S9*M!7+egN5a?g2dSi^(WlR7cx2$uOg(pTtdh$cM!+R&_0H z?G>AJ$b=XfX1Zzt;vVAOf4@JYhlq@J`$GyF(;O?@N(dVgBo$WP4}+DiG1RxWGGjeG zW~zT^;UVCF2zLiq`cH^au$w4kw4%c~?0Q>V_B+U=v_K;=%wu}w_3?4Ei6hNW_ZG`J zZWObDa54TYC92?&C0tV-hqVE&N5s}cG_mD+i3s4CnE2c(sdMXnOPgmKlzcPRvQx2# zHo)Ae1%f*}>hG>rpsQ!PyXebKwiZtonjL=#K;T~FdA1kcXZe)vX-5_U?LIxjjyz;3 zG-Yu&_8N}Vjqgub+VW62F>vAxbv#&08Y;tH4JnVUL1`rTG*T&*TMC)=LSuBXl8*F- zRnlRPv|H*@iiuiq+hvue%uzx=JkOT2yY{+PbQ>sA6-A26*-dL@XhoXjq6ld0j`)9u zE!&|D%(DG?cZ(zal6>PgF5nhUp!CKWwn@7eh>-mK;Rr;C*zCWxGI zAxer|u|C*nJQ*bs{Z{wQSVhPIGd@;?{6pEzci!&it0v<{O)~KnZEM>HHY3PJq3~DO z3F}DAhejJ>>W{{4%-1r)PaR5k;TGj5st&TfHd`D=D2lflB|5xd?4YvITYJ0tZQ^* zKF&%Q@`t>RF8y)1kvUm_sE6w)YdvRy0sR=dy9K(BX2UrMi{9}$9r>Gy7N36@S<>Vx zTxDf@MV~7VHx05eB(na10y9Hhnr=WGu+JBfpKPRHjppagU9nmKD+q4tpqq@NF;7?5 z-sf43L~>HyK-aBPez*U0LnRsg1(E&*Zm<&;s3=v7OpRYx%wi&^Cjz^@@!%RFG%86{ z6(n~6>3#kIDWh%&7I2x)%*KDRYS=8+a)Nz}9%%e*!1j62LqG?M%efGTdgD4(%4sriUEZwQjH2` zC71Crui2>?L|KW90i?Bs^ZP~;j?4DAvx7@ZXsC(&>2s6%k5J$73>AONSX&AF>@*|3 zso<(NlR-;2$*yVMuaUKc77lq=E<@>t@0yG}VJq#4$&D5~qD~ZNQ;xsC3KlW<*lG?x zPE16Lz{ztIhT|!E;G~btn%EbWcY{V-d{Q%vbv;VW_YU=X{Ui!~mk#J=Fx{$FhPS?d z>vuy8)&||YJFhzu2`_)Kiqn3)h|yvIA3-P2@XLe<3Kgo|rqtI&)r@l$Sqk4v%H%H&0!&3Shl&AqzH&#K)npD-g0t``>B&B7v%bzI$!LKmp zv&H-2a<|X7-b40qSNHg(X1My$x$(eZ^?1xb5IUiX5`pPVYeaukA3}Z{v)r+qH!{Qd znA4w>1Lgbt4A)?&s|_{V?^qpX%LQD?W!3lgTsBI`zoDrUsT-JXTsFB4ZVhZ^nh
u-YfNDlmbPVG}vG$mt3&35^LjFhuG0F+a%uf1M&JQhc<*lsUJn=;_t4SoEP zN!D~VJv43mb~bWG0?c2Rg~m)J@=?T24tfp|`CD@9t8H=kKq!eFXiyuH^Y}5N10BltGVJ)-ro2{4 zlkH!3yBvRa7f#sKT0SV>^kIQ#66B>EFlw~?fA+pbxp5px@K-n;akKWd$CgM@kLoC0 z$a>85-c5JMRQ2pdbo5=&5^Zx!7Cn?yF8ADA>_6N;?1#;l91;L2fCQ4@OO{>S+3xD1 zNFb3fBog_k(*vKcljS`(HaK#b9EFRI$v}XHn{|JyT5$pme4NqKqoC|atvtD^?Go0ex3AvE)Td8a$0rD+K)(?B|1f{x);_(RiK!F9Zv3!DK&2TwDVYBy#9kpG@zu0yMR>d-#w*523`uR{4?qs@lh#Sq5|h$!!JOf(4B zOa*_C^g5N8USAdAkK-z_6FZ4Fud0r=Q&ZN-2!YJmrf`fe=viK1V)c|-54!+vaUK!_ zwk5CC%R6q4dA9(uS)=q8rcZg1UuWqRBWHNcJ1wPlLiVzrZ`GX0QeITNpy7V4qpK1a zAX32Q^gx@ML6vty(^Y@Z))!gZtBHk_CW%FDlGD9>j2NZ2*n z)BZ*`AyEgAIVhcq1K#?GSQz2vE@__mM4Qr5_9lPZ(DOXPP-7@O&G2TXP?>v$X5BXbWQ94J#l|4 z@c%B_qqaqDHHb{=R_XPHYrE4_`q%5#7f>({bjB~QS6DO2R3`wv2Hn4YS5FB=051*P z)s^O0-+%}mmq%}~6{Y0Vc+k^edy^HIPm`$USFoxb5r)c~(U2Uew*M>DCLwPHIhzE3 zM4@3*ecVGCX5hmu)ItgFHpvATC^dgtquTeNCs=Ix`fDG`1VG~9O884e+XY1aZCJ(h z&RoA0H>(-mzY<#;WB(LqDA<4H?Ywu^FHC1&0P1i2=vShbPC+N-fp0#|?P;i^TzaT! zj5~4b!;)K#m-MO>UM*h&w#)(x%UcEVQ1cZ836+`p$kb_I4PX=24gJwA#8-d8ESuvp z3mWC~8kmJ`Nz!yzbzI)KgT+Yp#?QJP`fY0^bF-m#h+-It2)qWyY}_uT0*By@HxF^1ZS|LwM=cd zJF)TF6b7Hm@K$Nds;FyS7B+vel))Gr)YRN9GCJJQhZ}yk2{{Z9Yz#IuWHW5*4>IPo z6UixD4<6A%MyiVoKowPB))X7G{N|Gf&daacI-@oD&;-S!yJzYsAzukwV=X@%XMXjV zw5%jhixyL?3L#z?G9N{?6o#x{QAui_c{m6I^UFxaUut0L$nwds4Yq&ybfu|F3-=nVR0JAUvPe<~rpin+qEu3-03>nsA@YE54{oIQoX#wc_~W*$$n8a_VN8M~ zeychunrH&?wMv?ZGag?ok6AIoS&CU!B*J0iii+KI4vlc=suq7C-{`w@=ytBL*$)#o?Ay-h(CCnjUQRXMA0)B zf~5Ham|w;a(h4yZF-q?%6cO$7ts531v!5#pv0!6w)R-Wr-Rf*rFY`*yH`syM={ z(3m&;>__X+Tfu*Z9nr)2uJDa;XU02a zaQ(E1S$0ZT)}ZOdfa_h=PxLmf4rGpc?qt!EkjWqAaeJ~HkU$o9MT}t3`77%-3LmV0 z^*(#7Cn$e-5iy48ldY zgv{vW6=A9AP`cNUZxVls!quKqC4IRuiPtK7>2MO~#T1qY=gj(ZxMCejieCcphg3F@ zOQ7=5!67L@7zWh;k@LbAMGY<2zY+mJIRg1fn`igBjZrDGf&bms|>+Hdxpbo?aglC1siIyia~AXdrsXWc4*s z`LNDN0d}g#n2fWregvJTD~J5)%g>|SnK!pwv`3+O#f^Z$x)i=VAoWY>%qGUL95a)V zQZ;`tbzDW~@r^UH7dD=npZ=T;oW8ckCJ`(x-6XWYR-&ocd5>PO#yR%b_}6pSb&~48 z?EYNQ@imBVN?CDAxVn90=BFW!b-+u;E4_2W2Aod^WD`LLjNR=hwE5~-z(s(&j+)pv%Zhlq0XNW^VNTgw8hK4i#)5r8?CRPmOf}hY{+h+gqs}x z2c3bvNJmWS)f*qagnG+qL?j@nfNsO^dHjodaoD~+m<;0%$Y`pxJFyqj62T|5)B%Kq zZo*vG`F!Yf`ndZF0#;)0W<_vQzEM_Kb$=te^%Czzu-W<1Eg7KzX_9n z!7Sd%E~rWgiDZ7+?YXy(c^Ds~@N<7aJ&Z(MfDo#n$Y?u^3sP}IAkVCO$4dlRHQ+5* zY?w2rXHWAR^ft0#iX-r?AEOSf2^e2U6^Li-jNI-u-b>jm#^f+gxfqkf_l?Gwq6Ydi7v7~qOslAu!_BvyZi82{mM z9X{h55g#U{I);PEj1eBik|H3ZBFKu?MOuPD88~7huKXwtNr&s8_?0b-D<} z6r2a5F#{+h_hXQ>JG(pKxliw85arvOZYrET>#b$q1)TmeWbRR75 z3H|r$m9+|P$p%5rV7q@O-=|Tp6{k#g#RDrNHaG)F*5k$JOthb%FSw&Acpz_spfL*W zH!NW6#=rMI2i#4S4ler;ko{5&M_GmbHmy%(7Gs52*lPa8m`ipU!z59Cw5|=k5Cw%n zw%r|V7P&htAz)FXw3A4R$qe?z?sb1YPoMYorETTcGpb!4hQBvVe^H+FG@Ae|Z9C(g zDxsy9B4zq@LR%{LKnxl0>XCZKQ>SSfqU^K(vb7#0_E2 zPg|50o!k9ysCqPtYa%F(KL#H!m#*3=xCZREld4aoK#~t)hHd1nr4wNKg z${2O9YPR>ux7Xz1%3rR*$3wS&9XKh=nnFFQ%!uMtB?LA9bEs2IdmMv5cLUvv`Rxm| zecX^Ub^vLgV%7*xY7S^B0UTSI%z?j`m?OcC9$jJK@^?9Hk(H|-^qoPRvai}yusSU) z^c6Ld4UkLLLAS{)_3BV2obyCwA~0hmWx}fi6;USR39;uke?SXx4QE|{J29TQ6GA>; z35o%VJ01gP0#KE3#!u^oaF$Jd;C8X>v@ymhdB>lWQY8XIjdEGv(3Us*o9!;x(Z=jNR3m_YocnFK3_RKjSE3Ei z7(Ml^m@mHxI+in_<6T#46D#gXSZ5)bWQ}P42C-GfbOs030Z(8yQ zm|u6$`e5H3KTV{pD6vI+n>u)!5_T@ zQKU|v7!igYcRE8O^cW!z$fiVrTW+FacuFBJc#$d{!|p>9$s`n`=Aa@}G!q(*LEIbI zy(Ib-My$3xvXls9I^4kJ;6WEqpcxmbIWY3cQsbm0F88#5d?)=2gj|U6?@~dU?1#-N z3_lw%wuJxK=42{ncXCrsE`O_;V#85qD3`5BD=swfssu>LyYwbC$J0A= z`pytVtIi&205?COfp8V+wOI7+37Y;!+rS;0fiuqnVIs# zUk{2ZHcr~yOiF%QXL99L#Ll9Nu-YmmtUtR1^!5agnI*oUzAHx>-KHlL71O0ibQ~aAW(UKD_)S9oJxXCD&H`TV0A1wKw@{D?too* z7eNM%f80_qcyFD2#5mNKrbCPXjEt)+goSWL8z85f{567-U<1yY0u{Mct8F-1-syE0 zqon937nGjOOOhy$)J0MXdoZ$)QW(d4Fw&^Mp)G^6DTO`u4W}ZgN-M6JXnn8ABUR;p z4)SqSKe_Res$#X{_8docRE)ZV!GgOS*%JO3e1`tr2QQ|MH#pl*iBW}@tU~M2QHY6w zi&r`Lhy%eFmKxxxKtV}u9=`D^@v0sbmMD;^?p14JjEq-Z7-(@!V#ELQKmPNp#QdhZ zRGE}lR0Apk@_71^m9b_DFH&psy$1DvaWa&wt}R{xC95xzDz(=@&xfypp4At5eqlXj zE>qax5Ve+f)iR&ekT{(gQ-T3&#@_Gemic-X6%oGn8cs( zdwYxUg^N#~LB?gZwC1d1#bRw(SVDK4i z4Ybl&9LP&U3#%;{JFnDphW1dbNRn`{(U}-5>I*+-&Y5K4&$UI=zdLy9qeJhAL9itPYHf zqy4&Ag_@#%@L{(zchrd&(l2V~tcI~P6nmuYbwG@=jX;6QERb7~#dm4NPGI?Y4(|C1 z^m3swn6axHCEP5s*jv&%Z0Za-FcXqOWV9V3D`{a;KBf?joc^HStszZ+Tovi(#vSO& zBxht$m!O8xUe2Y!q;3&6FA%8y)?fwS^AAxxhmxgED-kMJnXfDFa*=N=5JbsxqoSFQW-y?F>t z*Xcva?jqH?bHOYeLW5@H=g)`M>dqz9dCYQPMN({@g zSOZ_LdQGRTpl1;Pvv9$`3U}B(sB5;Zme?3e;{iiIvgI{F?n^6wl?C>O@KBZiif-z> z?8e*J)M*zZQ4^iW7LLs+)jhf3P$!2hsBv)X1<;%sda$q}VWvyaoqRNjU^=Mu%$~?y zo++N>rt<>pix-~`)8w>z84xAKxI|%F&3cx!WqmLhiH|o zr;6a1*Jv$z$}G5lT6a1ixw<;-RZ!cNf$(FuH!o**9pKL84kptxOt|@l~}ok9JE~9d7ITw*gA#JH8AGg*NP*I zA45XQo3*+FnFa?-Z%-?IZ^H-tSg+TKhfB~R6VvhpaN|;#^VGbc)ITU@!FEa;hOvp2 zC=0@5cGtP9Y*d5A%9;&{jS(sYzcn##4@6nH}SMaeEc zQ%e(nH_@c)3wt=neI_(h^>7TNmEt`8U8|W&NA`BM5+MYgE+zp$EPW`PPe6;@_^<_l zacV3Jg<5FS>u>3FtSb#|dYW@*y&lhXuk|#47dyglSwmN;P_l%w#F8hkJ=CviCqrj3 zl1uoVo~q5ghwV-K(=HQ|I<`b!CG{WyP&O^q=7@?|QUlcg;w_;85QJgGrLg7Zy)nVr z&B}uhCDvF~waRNNYQ(0OLaj7$1+*KEaut}^_UD~}!=egvm|ntxTDxe=axtU~CPXWL z<9&q-AZ16l^3Ag-dk48oDYr!Lt-$aGjU)Vs+{`h+XVCyJ z4FaeIRG$d6a9vzbpXU`T5(X||?eNc23P1O58x;cc7`A-i`Nj&pS>@7Q+%Jac2 z;dbp;LkwDvNmNVcm(oO6bzHr>PIn@gXBo{qvzb^Oc|6%*3+(mm!4%(8$-e#YxK^7t zaD?D?WCx1c#biu>b{(z- zb?D0stwZ4QJ`A@$lwbJ>)gsQmyt6)DSkL6&=j0#j?x`A zxSj@1dTjJH2~yZg(C?9k!E**RXm#t7IUKugaIBCwrHw=$&v&H7@!v!1^@1|`S; z$QL4LCBoS4jtj#rsnEu!VYE+_(3@cwKj72Fi9f!Dq{4ofeB z&nD-HmtN2d3%+)Ts{s4?cSn@uITRR{X1g-j_X?WI8rL9iK~9r6=-~=~xuF+Wj=`=8 zK4+p>aTFa-?Vdulj~9a9szRQxMN30o2V$G?ZCy~OWs;_wxZ^IZkN5j6F2yg6)FR>M zFNb03xMjJ8tce(OQ6V~kCd$ect*>gZcopj4Em*v8Mlv4G97vo!6}BTi=2ima_@?#? z+0`c8T<1Qv^_L-y@_Yq<8=1F}3l1H2F*G#G6!z^d3O09*z<#=0S$xyW4VuHHJ};Km zB*MQ++aWoAy$t0OElaomE5sg;~wxkDjV=UTa@xk{tG#ZrOq;5iG4JMX*FuKURby9EP7>d zZoQ|)rhh(vXZ`%kuW#_)pblf0{1@R6hN1V?FTWneCx28d-KIPtWgx3&oHs|kfY7WG zXqr17bHK*m5g_P)U6Xf7PM>$Xd-CAhZ_hbnT|Vx&_h+|f-Y>zg=eUdfYreW;$U2$( zu-Ce`6cH)is2OR{8E+nxdL$|nBia$%=@rKO3C!x(0Db|w7&#YDl^#T(T5_BWIsWWL zc+<*LCdc?FmYfcpmsQQo4guv%&Io5zQD0bFejM0xGsVPzuUI%s${t*&YN47r8-?qq z6Tfq)3fj-jfEGuk*5sxoeA5sL%=#I5eyBII@w~|TTb=8G3kJm51HnZBZ1kRi= zVIyxS$Z;cZo&(F&hSHA>VKZkdwY!T>+yazcU@Bah7_sVMrDhoEbd};|BE4yUbxyF# ztk)UE6AHP1sYS5DQ`@;y)r+F=$)o~+F+o#1X8G}S3)id*D$3;4PboKFU3motYdEAc zvT`4C-vBuYvVn!xdXr&7v7G9=eWx?w*Lm?67v`RK+rSbrZ(kwhetwTk6mLA!Eq*)~dLT321F%QAZ|GH8VlGilb43#mCijlF=@w(&45cMT$qJ74$uG82B%& zq|yPbH|l$q92^Y=vEdfP@%)4pmQXMb&)m00@0*Y3S5ok}pP zIE-F@YtTrJTj-!!6;j3pl@H|&l!Kde`-@SM9Q{IZAz2vsBRcZ&^k;2xA-@GwC4RVo ztWg#kLQJa<5E=qGr0^#>m)#I^mIaD@h>fl@nqt~UjTk^iq@Qd)G~pB#tG;W`4s4el zp4cK^%z+^`GFP&MlxlU`5{N;@6n-1lgG1JThV^JgEeY!(Vy1}b;TrVp3&i!DJ-5+4 z`NH^WqkB%pLTICV3XR!D_na6#+UTBBB1aqDQyQFRj2`a}*SHlZFsKS#BWaMMlY~m& zFH&J`yg@d6^nwWZ@V6id9RtohIQllRyWsECN_c0nH{OvS{*g9=uc1v(jHjpj;85KS-T{dCCxyP#BCK5KT9J9x4!J@jd^kz4Dr~ARfJ4*RiBrH~ zkx<1WqtWy-@g&e#F0As%7$uteRk5Zj1Qc6+ZHjU;{_=m-wZO`d{9_y{Q zNkLMntsk$R$rR!SYLLT<9k zrTjEdLP0+`bft({bFSFSvvM|n1MO_{j%T68Pm()9`rdc^VvxRK$)Q;%yi)zH_6mun zjqv`<>n2Bu%)OVV##5V6Ka&Y-CG~`8C!7FPw zAOsYhMyh7vxRVN?6>Wu}11;V-P8NH7FFRQjTK_mT@TW!}UJOWj3CkdK<_bQxRd}N%WX0mZ6^O1qRtX)#OgFewJlBDuSbYwQMYzF+v z_f`aDj%*6tgyE+LFZ%Rh=S8rHVDp#bA^aJylQ(i?Rb-60(Y3Xm<= zdwQcCcYpMvyZr+(@8C*7#Tr^C0e;sn0IwUt;By&!B0{(-mU!Z)C|vESODfH>lX#I8 zL4HhTFzX*K3|XpwxbVGk|8TowyPb|REYLqZAIxI?!+V!qw6kJ={(R}~;RsRAO)0P& z-zl16vR|q)Migv))!`KRX6Z*eFEHkx-Pk*5rZ`^rjw>zNfiJmV+_JzOUP*%8BW`zu zdLRPQbXPBzlE-4EW=CQb?Po^|JM{3uxBcVr{iSqwN7x)L-PFqK)e zK^%b;CB_^!54SSeJk06?rUo2G{@s4;G*}`<;QQ9e(mRTh@K78hj?plPMyM*@W3_0P?|XCJIRzCX9U@YywrmA?av&u()ttGbw1Osu%cT+mV$=Z*%@|b z*Nh1D_$4r$c4h;2mRvt61}I2q1q9eN^Kn2>4*;$jcFr{(sRmz-Kw$)DO;oQl!Zq*< zcTXgL==l~kQSyeY31|6`H{tS5 zD2G!OhV{Y78BK6SI3ad<1Ut3KUEn~5So~>!Sl2b7Gj(l8uF*JidiGSRBn=Dyu#AF7 z+1a03zVMxH`Tm!kzgdAjXNt$MZ~d$H*<-Vd3AC~MhA}KOBDo3H;Kcz8iei}ZIH|6n=WWr=2 z%W%6pXZf2<_3+44CdPSrM|@_PCIUFM$aS%$=HArT53@r0i^5E(vL#GF1SawyLb%mT z@+YZ>(F1;15+G!mzp7zdb3227;kBHHkv&$x&1i$#roa~1(5!`b#bR*83BF;3r}OfW zWZDgec4vU9 z=XNHjS49!7jl3Nt*&(L0#?=H2-cL!_VGuQ{%BWZ6Lom0J zZ~FkQfX(p^#b9953hp)@TwJFTCL3Bt4d_Nyd_G6xahtP6-3n}bNUTXdSINbp0+PQtoMIAJ6XMW#3<#V^pXB@~ zf}fYmeU!R)NR8N?cLswQitgm}A)!$fHlr9=MxQWS8Qu_qZ6Mi6mQkGx9|N${>vTsk zee!)p<1IVBnhvRTSVUX`-~dD!!P^Dgiyv$(xM{Oi0mRO+90Xo}#4LTp2e$`%O3b0p ze#G1bG-L#W(4E z`MY&_sV_U39jt+WesQk@)y8<82GLRxZCC?*{2H|~gq-qCFcmP<8|IMOdJZompPYLs zA zfDvkH(b@oH8~>>?SZwn-d+FA?WE(gJ0B_kCsiTqM^Y zSd}p*b=Qk~->GS$SFcIaamnT~q4zWlC1X(SY0w-+4_CpPkR{VVk^q}PWWU5JSP~A% zKdVo>1cT@W5KLe|1BM#(TrD0s#{!GiKY9s&tWnlSjq}M`kTXaPo)ZJGc+KRxk^v>M zG9`30ik{v0wBO4ce^?65RNC%u3YHctvZ98hZG6r=aKRQ8m^!g#Q+TgIMxXIvY^paC*@}Ue_sTOI=#;rE>>; z_TPymdX$s0fBAara8t4M8jn)|I4wgK29hbN^Ec>dtmWL!t`IUOXG+<(=-SC{2nv`? zyghDz&~ws*I53VnUR8RXd3)F+1%AX|ls1~iO89a1<2!2>E@@t6n&s}v#ucrD%_l3O zIeyXiD~CF!?t?AS;?M8D>6*bJ?<;?bhXwW|KQ2N@f2MzW=WUlk0Lpr^4cFe5PBhtU zQ;(Kg;qP<+Sn1Qd?Qik;-4T1fy@%vP`iL;87tyalNZx_K`je_k`IT2&eU;KEGPd$S&l!VgQ&LFB3ZCB1Sp%) z%5zFNf7<``!~e7n$xS9Xsg&F%E6tNQeEBJ?i@!7~aTFk2;RzV`Zt_QYtAjYT?f!;`ZS%k-mds^sAN^%;fBVcz--v;7yv7rpJ)leu&6R_fST3Nz^kBGx< z@Wl#gm98E9Cq%$r#B7&W9Nd|9`qyy)W1wu}jT!;KvNR@*7BRRk7`Q`DCPjJkQo z17drV&I}J<&AZQ-*}dUBwugT(#!YS~f6hU#?>gnPpTvcYAEV$QfV#0%d`+=Bz5q6W zf(@Jf1O4)%8Y*)_lMm~Kj7EcZWnrj@u>8+yFd8d{K)r=TQdnO^vx@P;1f?p*3*Q?j z1UdGg3!1Ay#rS+M3s;PIkd|ri3KiY%pvUXusW}N^f4(Ve>hIu9GB>GnvC(>NX05Y9Gf1}9Ee;IdD2Z)_r?8*g=16njW(W$PsS+ob)m$grm<*k*dZAt+qup++OB^oH}>f6`~HQQ`}4 zR^pgt+Tq2z4J6jwPh=jhAngDgb*9okCOEDK3Im-&OFi@6e8DY?M9@lD`Ps*ynlt0F zpV;KyI`Yv%EcujNJqzW2SbK4n#oPo@YeJF%f96C%%|@;}K@aaWm@Ddm8Re=0CvR$* z!H_Q_|IUk6Yk!+Kp2gU)e@ddv9>*%L>NuCucer2S5J?ob`I zlBuh%emHcyBl(_OSUtuvGR*u0w54%}85gYT48dGqCR;_P=eonVCy~Oc!~`B4ckV7` zb3X2M7_NQ1^$v$aMy&{385qR1z04V;0t-Ch$AOO9vF9jm*s-Pne?bo%M_U{wEjn_K zL*))ME$a!aSO0lP!Fv1=9l1RZoix(wI1k;B^U&{p*W`hy+772aCDnG$VUG{XuQ(ER zFhNy;fjYt_sNuAO3=f*SN$BZuNjUIebB%^>=NdJ_8#ykC(~i-4z~#9l=WLX}+vJ^% zs?w<%bnW4&gz~(ef4kSV974t)(UGejj;LDB9**cmQnD(L%9X$NcfJ)zf~A(PIwAGy zIw36F-i7LAZ42fCg23C?I6DZH#b$C<3{ zWzKO8%PJLttgO;+lT`uBe-49H5lMCHlGM(^9;D)3Us_TDe-|esr?7Le6L2GI-EUU@ zZLq=Hlp1YgNU2Bo+t2Yt?43-h3HVntg^``E+Zj2%yf`QXfMP*U&ZT`hD6l+bW#n`+ z?JLkVwD5jb*U&wkFDox_7FdIDPXRqddxJHkhxnsBscuXUF>Jh?Ccl`p{c%6zh4EPWwFBhb{fu3U4##;29LUk6g3t0Gkm8mu0D%voY`2`6`L~TO(CoYou+%#1-~JX`-t-{BK>yWy#NpYUPh8xX8-oLgH~j8I1V~ zION4$f9Fg6W9ohMG@}hE15#lfEOxE@zzF1x;2lludqsH1%Q;uVI|^?8!sBXU#N^)` zOkYu#H$vDt?Rx|2s!o=a)@s6FL!AYnbfA-$w`CS68^at+nUbLFaY5NskD>xy#%A%S#&~WH{v)WF7)@NjbJI(3~!Rxv1#%I6`KblSqtb>}l;@FzSF2nWy zVFMb4T2@poWc$6a>7bY|5%kZ&%3sOa=BfrOVmKs=lRZbXes3^g<@PIIQd9dZe``h2 zYvg2wIY!Fp+L;en?YTlm%J{!tSXb2s&I&af`M;PB8yBB|Ql{|F1?|}l{~Z1+uj{?j z?M#L_%JBEz!{c|j3UX%l1aFG_zj6i;;GpX2{}hq$BBi-#c|0X|4~G4jJxy_U*X~_A zhlc`p_qzR2Pv&m^vN`*ScvBR~e-K~o4_tSCjdJQCGe@ZM6~vn{Hu!KzDo?j9^Y-|x&;dFK&DI17S%EZS`CK2Q)Fgl zdLoQ1VgUeJnw=KJXO*q)z0Ywe^;GONvnsF&=Tp1yCG#?;q7kL{147iH*1Oa=qd7# zQ9#2z=+FN~etIIK!wLZae_nn%{`q^lwUQSGw(!d8i z7kJFTi=o=d1e|u}ois0Xd%gZF$$$7rpY>qxbu;G8jn0mqU-5aLK z37tk-?rXX46`X~?PIST_439E{w>Cz5PHv^8MQ4l77M(3Re_M1`M`vqkyiQ9)IWfiN zYjqtj=>H+qdzExDAxV2|eJz{G+r3L_xvw>4T2rPqW!ihxR@7R})uOXSXN%4jolT&# zHB(-*nNn92Q7crfj%v}_qO(P3i_X(9NZ=2a8YaOxbKKc9oxiA0_?KU&aPmh2oRA6! zIfhT~yjudAYkCc z#+4??@yFSZ@2pw4+(R0tDm(F>@M%O=`pJrDYI^kj%Ax&u?t|?vjGhTco53SzkNznh zmT_hZ*s=fRG29S{SkW3~$I~kTHU$72uWY!>^p{!Ue-y3c%qkp6ynZMSzA(FiI< z*`g7&auz2H>tFC~k#?}us#UH&RX>1BdZnTQ`mEX%qzU0D-}JkEJTI5mR!R?od~v`L zI(2^O0$#5GPXiVZp<6+?yFZj3ss>WhI~PT&n5YXf{)6eHFIc)jpUQ4p&LAIqv^oL` zP#1c+e_%s+JB#esTfCZ;gi=~hK&%>ued+eQ6JF0x1HhpUhCyLVi4)K~gZzm%&w1F( z@Ez(v7iTms+LYRLUL>JCA60lQg6?RraM7Ahb=A^nt6{vkY8ZxNVttSd3u>T}vmhAa z4nLg;5ayA0K49L0J6AOr@O`gT$)1zYKe?>Ke<~Xts+qJ{uNUjU-RQgG)&@GX8b*Ck zVJ|I9A70ZIoxh%!6_M63QhncZyH1ZIZu}$cMNa`pCEzyC zm(sge{E*!iGCDXtDS#(c$VhhLwD+0tisTkjB1o>6n&T9k_BzvRsgml6`O{wt^I$`ReR(3x1zJ@wT zr=jN>u7lLteXoKGPRJ&Cy9jJ?)#9qfRdcvPZ4NQop>FfyYi2F@gAHiBXYhyZzW)YK zxviFMfG>|3h+2>!uh9?LqVw%avWee;f4%uNqzIo5_rV_wk1C2_0JdgA>!7Vw{u(JP z)Y>tv>ieoUUK4G=-mF>hTRWu{*49pG?G&w{aavcAt!uT_?#*fU7F{j6T68spF8G6u zX}pE-hplaJqPD?H)$eKD3k~pe>t1Nld31EPCPd49wYwkS4@L2vf`wD$Ul^QIf7k6d zU3{k?nEd!Cf+?IR8CR)O+9oVdJ1>Fo+IB|^&d-|45}Rk1hPL!J)-v3D_9IC6-i7G6 zokgcVk1O@>@WjM?7_y0p$jekJje%2-kt$oDoPB)rYYi zP~0BZQ&w=x%6MqSx%}+o9ZZvcoBu>7_tue*A}ODetLIA#xP&U{U~}t75!sq?6a6ISX6MZa3+hsglY4lf?Hmd3V^nFojzKt z3PW6f-W$zX`AW^mNu3qO^=hVz%VB{qm`;~fY8d%gfj8r^z3rA9e>I`B1o^ViJaNq@ zS&mY3>h-JGo zm=EKfMio)722B=L5#ACoNXsoy1yWeKMx(cNRSy0v3gAiARpA?w%uDU%Qx1Ys)wYG5 zQGWe(IO<;8QrLp3q^8tST? zF!k`hh`H4J8tST?hMsGJQA#WJ-VaSpEO(eQT53$dTY*!A`_^q}!er!8b>zp5W8ge}-o?;nCV3>^%pXL^olv ziCz$t)Z=l){hIq>_e-v_ssL00^~9se?uH|*kwBm-E8kg_ne~W?jh486ikqJ;I$LyB zMrZ3NJWX9LoET&Cscv(&Hn$P1wnoALoh?_jT-CZBkBmb*ID5662yI;^AMKIyiB-?Uef@E`K5nSLS^Z+J0PhF%T2{neBknm%F>TE6rXOGUBt zle!ZWnIE@MUww$Z{n`(2(i%q&x#GG^yem)eUJ=8ce{OfqSHRLo8JyC(Olf@>nRVXn zEyu+9qih!y+Cr=%@AeMyC(Cp&W`>sh914(93?@aQ2VC^H^KWAE6T+YjWB_nbbOjSG9( zNlO>@>fx~{>@C+Bf?98aJo9>86`9Q|ZrSxWf6zn0z=Gh?S%1IrBY*R=ck9n0-}{6O zVSM#d7^5X@z1UPcP5a&cC=nK`Li=^NkG)_Iy*8kE0Fw5*FoF(TyB+)k{d|a{BLV>z z*vCh(AI6Y)k&Uc5;9}o-aR8G)Bs!;=WxqH@hOEuO+4$hiUi%v~j&txa=t9eQv)jzK ze;xow|Mn3(_SgPxuur^_^kr~MqL0YMmcaa{<;wZ{pZuF%cQEXYdhW#eTjcz0iziOM zH3Q(_gSm~9##sW6=(+t7>7Nl_^)7oBi$k(lSXvXhp8gm6ZR1=g z`;nEGPc<*Qd`20oSh#8D+Dd;EoNA?De-DxNXS!e@?_2eHcQu^P#wtC)`0hC`P~_`! zpj7VY#4SeL(MfQ4Dh7impFvA8)1_H7-(ay#JbS>vPdN2V<548vU^*D%tl;rmIP&Ko z?Bq120ud4t7yM|&%f?Q#eqM>wtoWj0>zlG{Uea&QiQ1#}xe+nNn;PuMV%Q%|e@C1h zp^xy$Rm~`N-iv0GW`5FDfkpbAcX$65|6yZJQy28}qzld^VLx?J)L#B<=cD$gY?xS#XTq8T@B@#zn=mWwLeT@u+{K^o0K*tjkzU^j| zZJT2N&#IddFIw$Mc0opk2$FX*e-fywvp?WEIXV>wToa`7`gNg`v221YK&3OLf}4E) z?7JCRlCJG$^gPAnr)pyI61o|kG4(Xp3hJo$61o|kntBA&4R6BrfiuY z@X6uox%LD(50?4Km}O3U+4^~)%f!tfZ=SgJsx|iHVQcJLRr{i?^NIUKf3zIf8vEAR zx5mCT_U+!PT9Oo>Kd%-_?Os7+xN6;p)_ph|bhYk7>pryZ!}B}bYwi8n;HtIvt-U`R zbhY-rwfC*PKM@za44G+-cx%L4Bii?b#`b5jpZx0Fo9^r z7F3%L$6dES8PJVp@i&;Sx;I8reep=s=pe}GImsyi(LvhHMi8I+a1i7hO2Uiqrr+RXL}EoXQt4K zaey(9AA*eTe}&f$&>A5);Qkm$s*kuO1uSnT1XFCp&$-077dTUq+obqk}T(2-B6Zxne*y)@t2T)OQ?`oI(^Sx)K}A6Zb=BsTm)dI>=(q=khXFBW5DIbp zCCvIHpaBkI^U@X+XZ|q;@T>}obK=tOC;hLSk`W?EUQo=xUNs;gGK4{U&geXk<2dCm zlnQS0`Li!5wj^C!Q2ac_241SAj$34EB&Ap!nF-V`Y*73{6OZTCLwq~2Lrr8bUeP1iXvjEM}B zH&2{7d_I<*e@EF16`a=6x94QWmj1+9^sQ-b3|DPH)!LdyrN%__kT;)}l4+1!7!>SFSbe_P*~hx<(c6^!1_`CwiXn*)pe z3D*`A3Rgq;VAYu~d0Ns(3>UuNJ04V;rHfz+K55a>O&Hw?*smIJy>VwTbGmAo{q@_m2k!OxUfR{wB;> z?nY*Ye~oBt5D=zGA_XmL7}PB@QgY`#)LHXQC)Y?VkxYr)+81hrrle)Zl?t`9amp2H zXWutksI3LF=0a`le9A&?hB%T!?J~vAdNGlz4I6kc|Q6 zHJuJ%S`cqs$u808$|`xL_}!>{ou?8ry9{R{e=^xEKufs_pcM#W3mT%4xJ18_nif>H z8`>}M8e#s#y~^sy;a^N~cvAC?{(gXesKv1)q03UW5(&vq2KYa(5Ce}~3>RpB8@j3~ zvcb3eI~4b&@xURsev#KduFLD6ulkcI4u(=3&_^tg$m`GGeA0gYXO(_HLEvyU&jD-T zf8@Wja<37K*N(S&x4)WpIlT1;qu#=0$(WBcMQc|q)Bo>dfc{a@<|+v=oAmmw+Lb0P zlh!+6$eRERUv<|Iw|+X6 z<2mlQvw5<8U2r_vH%H6id@xl~IgBt}fA>mo=l$tWJq)9@?!7qnqrD-2WJ8zZkL-I> z{^)nc!(ngScWwAX3#N5s;%Zn#JEMw4Si-AWgkz>lLyaRtF>;|y=aP(I2!O(=c^m*_ znmY^jtHB{|Gi4-F%;2R&iuv9m*dGoDL)RwQ*MnJau&TOX=-L=aJ(zaV+`Dw$%YHS)sN`8sp4X=kW+b=BAq$gzC42;QcOUHh@8aOjcl;=V zpV#YSA$GNt?@O@N%oayAR`whee;^)Fpcus48quaR=PY0i>{|4?-L8vEMc@}nsHaRc zF;D`k&tU_-+gE)K+yVJc#`L>tw--tfLoojjKQsWq>9;p{z$HBY1*s>^A%sD&V5l2Z zs5YIeh*!nS8f~bbE!;~wpC;WxQ>kTzQMf1B5J`KhuDc`}p$1X>pYI&Ue|ZCc{15o! z-{Ft%;E&(!;A$_Zd;FLG4S)Rh&Kd>GYP$n>F-~)c$X0Wv|0o?0 zi4Vu?e<1e@cDd41orr9_0X>xFbv*A*-40#-g#~Njo%{PJ+#J_FY^D*bNx8zP{c?q= z$vMV4jL@@tIH2C&I{R?{e_hIrgawg9dg)AsJbH7Cz%#iEqZC)QZ&Iq3pxKdBLXvTO z8GY2BbXQB|4w#WM&kR$_nPfO%P;_rwxuU`S;R<#QQ~sPe#r)UKvDn;dYH%18=xX2hosHEha$a7t$a1h^p z*#>J8$>VDbwx9x;8xTB4owha{PFK`P5l=5!K+5{auy6dEV4tPk7|h2blL3MvF5pf1}_&cDfyRPz{&P;oe^( ze`rm7H@$M0BRjFo?v>(_XWY(;&rz84yPYK|`cm-|PFI%kC6fb5ZZ2VMCY#qxutP4~ zfX&&$jw}A185rr2TR%=d1YXTumXX6IUAjs}_xVg~fYo43p8I->{$xsa;3TF*S=*?G zlO~g*4P+xxWGafox3-lSgu zw8Fq!M-x?9M1fiw_WJBa0p=)e{wD#dvIJ=0DQW_pe{WivkICaox|B!C)8U{Rq#C;x zA=zIM8Tb9>0(PAp-$PCY`$7ahM*L8joa#b+WlHR4APq)EmAN%i*1~Wbjewj>Jm97bsL8OYH@uOg!V?%uk{UeD^3SWSnwyzH6 zJ`_Nay0w-!pQ*xh4!B{>(;~WfK_<6TwqCMy11^fZ2Z56;&)=(sPnW%ZZ@$#Qry79` z&a-onX|9_}ep+|f>Fe{+DO$eU1)uaMqSO9xe>fW`$22;dW5y|UHphH#d^R_kjJsWT z(6cz3(}QW7XxF<`mh$N*RGrST)KMp*>qX{59y$6ud}?1=XqHulx(ys(Sm3A{$3V-P zcu{nimqSE@jbD5S6(8?+niB8K-dtgGQgK@CVSwHmowYG?5eiOhjFd$j^%)~EHq@yi ze|iSNn;sq?YgP|5e^LQupz%%-RVXc~9+4LgPBLv4b!K`7C-!hbdJQKI715I%B+J7G z6T?F15f~P#IM2?oFbdt&uxO|Y={VGqWbuaf#7j@1BG+V5zEMgQXWAdtu9nsf72r0O z2a`j&nLFyNa0^%#2FO|#rVR717qTAse_`m$@}-Co`|-o#L!md=7V$x}3-+I!29Z%>2Ql=DU2RKSd2j6Gh608CMDOg}yig(cNu*_n^|>%0mHDp&9KDrTaCtArqzj+Yp7e~3FJ zai&rcXi^bbfUbi5dUxF5jq43rHc1jM=FM5QoS3{+On+Aa2y8P^rj^R=N#tk$Z8G%UH@19#Z@q5Yyjz2yMsxdh6|P z72X_x-R<_qNqW9`c1i)C=70W&fA`s=%UFjSznHzmB20sa9;|F&v?yr46!~8w00L(i zBk16`1o74(xVz`yzI0Z=9A7>7fiR*`24bz8Q@Kus>Ob5~Jo&x@ZT(hBypSkJgfSa- z`l|0r!w7%?iZOtZWTK`}h&w`Ey%jyajzl4k(d4zD;Gr25NcvOBQ2>wsfBN;pdH62` z&|e=eoUi}Izg(Rqi{>T(9l?ka$Ojc7k?ftFh&%#+v?6j=BJy`H6^{!{o4$CU63&RUP)Ih`^0k~$ z$$%gD&=WWr_p)}f4@bkU;_*oDUDMm!$ z&%ytUgkYzPqdG%(w4yupSF{mUp(I-cxaqpDt{_Z&vNnsRyL?Uh| z%sWB|M+=lP+^FUre=SFyu9EZA1uS}+y+;^6uD8eqMREXOA4tf?)9&B}N%5hf(TZg-L0g~G}{_Y0Q&!LYX&lMS}oQ>JkBh(`>L(q6v$Hf7|i#^`517;*Q7V@TjXQt!L)ANQ3&Gg=2N9(u-ZhO z8^|)-RsH(n+zdeC~&RLW4lC$*#Nk3tES>PG}QqSwX!Dya!spoio(CN+i%#M?Kk1CYXRVY}t z$f}B$u?&Tq2W{#FGwqe<+#L5p^P-X@&YMjJ;MyQ~Q51fWjx7b}0{P4FHY`L^hQL(A zHrBXsf9~k5Q4n)L|F8gqfx;a7cw3EB%tSu&3+N3jne!-<6#90Cab-g{{n90_tS9e- zXgIDgn#sak&NUaKz(5_yHIlTA4&n+ z??VaEu`R$m3`ONqT#OnLW;K$&^Eetv2g9J?e@s{ZtGABPThNAMjo!D>N~x=_4t?}^ z(zYrebw=YPm895lL`y|j7?ZqbgG%TJckAyV2~f;|B1MIhGvsQ49(6iY55Lyn z>48vUzz!PXGN!w0MeA7&Qi;+wg;{ViB6s>&tbBWrugO49%!lq`F6;`)|8ih$iN*d)Lo7DEY?BrPWbkS~hi$6XRVt(k`p(X3kZ8*y0mMMZl5$6?%MCMb zIz!0bP!7w)U3;jCihOUA0YZ@7A`_@2^IJH zS(p@S1IybKAy%k{GsO!3I?0co_UB7N$g_#{gt36k0I(_?_k@ldd`nGEm*dQ`GMba% zltGiJxF}`AL?`A%jsd|c-fE2bXxMGaeEjQY9^C4a?KDYJdIf0^?-EGwe{p-&t$zr9 zMepPq>Z@Rw^xZ*UeJcqSo}zoE`p6&{CHq%NDTDzt<=k5xGd<5;D<~F3E`s848_;Ts ze#jYGd-$rE0u6GosIaf%1U+4I8;@EgaZVY|ih2`;?fUJvtgwg`)@qVU&wO>Xm+f-F zw`pZlZiCYluq&x}J0FCOe_U=X$_gwillwkQ8Jaa)_;Q-;Lwj>|ww6i3S}N?;XmHlB zwGCPb`2<2%R&i4W8?YMpI@vyuURQ9hpT)ih-$EsaF~aQlLZ#9ipZnSXsg~7*oo;8a zqW8I_>w@XCdKTIaqU6-$NpGCp(kYmlr6&W8keEu6^lE-9`9{<>`-$g@+e}g{yzH zB5Ek2e?V$==SPQA3+Y{WJouaN%U%V>ygyh>6kxN?7@#YQ}ha4efSII zoaFgy=bz5y<)!oFa2i9FAHT$Nv9{kkK9$ISItS=V@-gyo^NUyh<<|?xzkGQ8Hiz&W zu=DZACAS&N7O!j<|7bRgU8%p{r0dkJuOU@njYVm#s8+X`e@KWb4wfJC@_A;?J#6CQ z4jZbaj#vFrTJ`sB{!OvGR2F@e%!)3JjCRr>r(tB%ud|d{+Fcl ziG0P!JxQbDYhJ42LE!{^4poD@6L(2_Z=vlW6?ttvviod}pT*V$^v@aQ5 z^hc2Q-ygkbW77C5Hy`^G?u;iynqp78h_q3^*Q4ize=4@aVBcb}@s>Pda>QN7oyRrN zp$!DoTsC)y)3MT{2=<@D-DlVgt|sQPS#e7eb(v7Pfn{g;nj)BztAI`g(DmsNSCX99 zSn6tB1y8>}Ud$+n*cK??c2QWZG%rH7$tZttlr~X6{!QAJ>HrBrslrdpzrpCqBjQ*x zQ_|4ye;UhuJ_~4%wZ1yr)dW3ZlEj2>GhJirz<1+T%`lygCL`r#dly-H-o{55*@a)! zC)9e@`?L?g?EKAbdSG>c>LdcXuJ1xg`TF{3ViiE1+1+*04v^L%)H6Lxty&eIo()Ks zM`OZY-FcsoLyLa+C1{gJB1+uu!{x_A-ARbfAZ>NI4ZnkcSwMj>U>O6G0^Y^#$_HAV# z0q=Pr-@HLg3auHi`$pXgxaP4&{7R1&&O-(HJ9*S>Or;mZkIuh4?%O(m)bk^C{7%k~ zCI{uc>99MQr<#zhdErUIb=~e@kz|8=`8QSQNUuX;cVo=A zoC2#2_+%5N*or;tjBn6~U5;rA8;9wd?no779uJZYaodb>UBtrCGmehx{#K)Y+7q=z zV9L%V{+vcy)nLdXI&yD?YBclMik-K%fXx7*>1x!QbBvfvMq-o6jTf3V_vggce*h9* z(-|x@P@hQ95%^&lj-q_dElY2%T|HJ>RcSKkIVe@gx`;ET)v(c0SNTJ1Fb1RxSB)=O^cH$tC;*DS2} z$Nln5e3Bav1x<7dHvf?s5vqCtZ~M1ovqq2v68}}D_Tj8(nW(< zc35-kS3=7x-mTM6Hp_MAZUV8?8w{?1P3%@q5}kYA7iE2YDQaF&r-9bs5q)}*rOFp8$i z3YXe=s75WSe$2g>r~h_Ik`qvynC%~6D4X>Yz(cbrOh@T+cJuTv|jL?2a~wy4b-S5oe{x0nboe?%Bf`;#T#9CnHj zKOhO}bcQL%$_M8FS1v!`F439Wh703J`VhTUDygZYg_Jy;IkX`$TaE2*$l<6o9J)zI z$E%O3Hz_I<6K!$-dALdnlpWDXN%^Kg1sY7o%NzrNL^hP=G5Q6NizpeAH2|WKpJ4!M zsLpJw0-aXF7=X9&fA4*0+==-+xpxfX)H@{1Zjc@~9J!-Krq8*n2iaemcM^JKoCHq( zX?4#{7~N^i{czOlxl5K#QK8ahh1LOzFPC&GhC|zVp7iS}GoeBKaYKu8=J^Q;K+sk~ zkz|WunT%F$h0`(ed2W5#m}Rt+0Z919S916VTs7T4)OIHfeUj}H_U!Qyu z&Z9SYCe3?DJDvt8gJy_BAbZKN--xXuhqK4AilQrN6jsrepi;j`K}F5g-r6{bxTv(3 zlR@ILFcQ>9e{4#}#E-^K}JVOJ_I>EEVufBCJkz?595QefDHs=1CW$&zv% zH^3WP6UqMa_f-Dxq+sVY>fU$8i_o<)YB0zhgk``n2lzGVJBtNlWzcA zO_g|a2ZN>Bo+&?Hb_R53k<{~(Ed|vl6md#9GT4w1(0~w~8K08be9Hhs$1(bQD z`c=?qf4`0exiL*f8Ok(i!fs6wu>Y$kECqWngS*|VrAeh zp{yrhIuY>p0h5Sxt#;N;0+Oevkh_!qa7mA|MWj;oMyu-_v8wt`7#GOQ6WEfMPaOAf zCQ`sd&n+0@k4;sB>HWJl#!+x+V=<1mf1okW^-6t4y1tZG?0R>{J%6aMIjk?lK$>U2sb>;buPs*cbLPfntuN;VQyHaQjPc3qS zLukpk7v(+rf75yNtP@k-qoQjBk5Ns$7*%^BmCqno6gR1ul@8N4^~Wc>`*)mHf# z7R0r!&7k-y#ex5(Ah-D_P&%fkcx#Z2Hbx%j0C+IyA_S|JW^w>59a9<}%L{Z(f8i=H zn`(@5`cn^t{xr!Hlp;5f8Cs9xY&?n=E0PsJJs&Bp=B4lv@A-NuVhon8_MG=S$^98+ zd;yp3S_2QddQ9i|jKwrZgY(g4MZc@OE@Ls#@4K^ce#=ignf4+JI;;Y+XQTxcP%1%U zmD1I}lfWf2U=0tJ19j zOqeBXn@E_Ui}nJvO)Fomd~xz+i$|I0+{~Y{dngNDHb0r6(!1ErUO62A6LrSBO>4i6mCM zZh<&WVno$^=5zHv>pZbnVAqx{&%phZ9(5OHlZ^00Rh;cI&sgtSFGXbS$@rRM>c>LX zX;kbpVhQroCHMG^NR{`x{rOC&%K7@kC$b3yogTs%ZkxheL8Xc>e+l)Pth98OgZV^^ zbnX|7^!~8lTTwP5GbGnN9e4i0@vg(qK8{iMj>lYdl3x4dd&KJ(Tn<>prC092)gSn(n+;kB zLISsvJ0B{=@#o?7e?QQ}gL62pw{SNI?NS@~hf8O=JA`oM0fmBe0lN{CF&(FuSWzMP$}3W^fE+B=)#v_yku+$e!DU&aT!3CrVfnsz6co73h1D z87zWceOb6+6do4tDGsB{Dy;A_4Wg=prOs5sh_f-=`IzGy10_UnN&GXk$FtB6uPVWE z_1SJZG3;_fZvuq5N!n{$qA(o{Ti zt~g`gf36z;)S`ND-=#_zlK7T&%b|E0wH!79zcFHeI0y2+dhJv*F4l0AaJcOiRe5C& z)XvlT%^T-udc`u~C-4%@HBUWpgORfst1lFwv4;w&n3}e(JRj3g3{-LD5nB>#t+%5F zYob2=O%NSo*c09a;A46__C9cYZ2su$taEt>e;<}6SszJ!f!BiljUPqH#-Juap30D7 z_OGxzY%PZM5cX0Q#%?4~1+@F0&Bj@7t7 zdGqRPBU_T{z}_MTX#h4$2jfv;(=_URieW@h-KjPYM9smf$=@ek@?^tc#YuX)TY+5F ze}Oe0)A)9PM}=Q1bBzdH%L;f*y=QY0R;XFSJ^p5iF#|m~@0_o1D}yJAhdxs0@d4aF z+PC;OjkjI`zkI}0ZL9|9|A;m2QrA8q}fCiu`K*e@F!&}Fj;HR{{P z4Pr=j5Lb8LD~2M~BWi3{4<6AJ5*|_Fe@NZai~&nBg6IHO@%qlcDI7r}pCvhZl(#ZF zIhv#=sE-7`#vmC$Pxgwg5$x-20(@|TES(qoFr!H!QI!>x$2;8yl7oJ!S4_D*8%8nl zzhK40>=9AmZTCpZPWOm=B=CXy~bO6G4XP#5}0}+q!@qaG=5eEBe8=Dev9jnciI%TApm`h%rAxO+D9RJAu zdbYAb4R{r|5NMqrU4_P^wn7!(f7Rt~+rVXdBHJ{~Md!c(YJ-DT8Qcs95-?(m`E3qw zt0RayCRX@4D<->im{O{B{%t-GdT6mS#EYZGB!IMvpx0XBD$ZvJAd;Y1=jM&PJn)~e+4TK1^V9} z0df|>pgLeOLIiwnvVF?2(pfTDZK)MV8w0DUtG)!1C!o&EK3P{oniagLlRs2_0c73c{~%IA3>EFbru_Td*P=}xtPI`p2&ER~LxL?KS@ zSV>WxqYr-6*s8fYO~v)de-lkxQ)$}{R)H%OFDvNs(T|FAMzi5^MQ?k#3M{565t=Z} zprCdk2vK?0Qs%E1n*idgEhTGHpgH`k9ejP76bpU*Nv-4&7HV!3;YIAz>1Z;ViU4jv zk-vr(^i3%yu%ci&{+U~w!7RU^kMOG_cQT(6Gytzr+=d&hn&=8{fB6;t@PFmqH*UAv z@4ygS^!LHIPn)mY-~Q+U0C9Map7+Ts_;fP+=XDsz;a&D`IC{xu58r(=>f(Ri zgeb1e{&{M|3O7g9VAH9)>L!D&VK?Ey+52BIP)PTj=(vs#7tZw&cY?ta_+Mk6 z78Be?-W|dsUJlu~*njvauqM594q$qN{d#xYfYCtMx`&WI%E$j<+Q$xa{XxE@nk$Mq8-*Y~KDQx2ISTzoR&Yb-3aE|7!3@gmr?0df&X zD4_C0{K)NCH|NhVamHu8kRPPhXVDR;Lvx8!vf-Ih7_9YU1*~BL7Pv)1)1cgkkzy637 z6jmA+R(c96n15@~e$HVX-us&i=MdZl=y%Y6J3q#sVbf-7b1dC2ci=9^=`I9m^guwfS=e9vA^jn|=4@<|t1rIN=RH${cb$D@RyoK(9pBr?$4Zfb3G z%hstU6Pk(@!BnFNhW*iO%qfCvjDUROO9eOBs3jUbuOVDP9JaqjLje)8UZvQHNHjk* zTs<6uTjYEM;9j8bgE+v4_`9P?TT?2c0+jN-<3mcy!QpgBv1V}aDEP|vdHx${2P$yqha7mE(!h}G*s z2ez;Ct~=*W;>^P`ELg#>+9Jb8!-P8h@v?YRvbrrNq1-coab_n(SBhY+NzoX4_(ZaR0kBeMtFzq?)d z<-jXVAuHu*!p70uFT^%9*|t8}gSTp1|DK!yW?d0<;}A(OTwtka*&$o9P{E2`K7 zUz|kytY1ERN_+s1`Acx{FQ6JsPL$Mr0e>yaogP0vaS*x!WRHFIsdZ;I81{%SAsG!{ zk?;!6*kG-OW8LgF^DRC(q<;fb{O+4;|29Yslj?g&;)y=`Uu7%&({knDotvK98}^1n z*ZEuI{B4WDOTR4*=D~*^UU8DsRvcp5bNiztub_A7N-qg9o6p~GOpqc$#%oy`fq&u~ zlm1n1XS7%lzf0I0P04{mF)&aRa_j%p6vZhde!71!)yU&+*B#*_+dQKAUofIsKL-A= zPIUSUxp+jl)o{4?*AO&7?}2z*v}`zDRH)W`1&R1QKvCrX_c6f9Hz8z>lfVi`jx zW?{gXBw;8((g=?%E}5x@2z%WD9X187Fu8XJYCNJSBpDXjtw4-sL1KSAK!2HwuEM3) z>qCYsqpr;})?m_NGO|jWCv6@8zR15pT6VuCP^L(@_F+qwpu*qSQ$}|tWW={K9|dBV z-45YhTH%5(NmA@4l53aHYJw>LLRZ4p^l<%?`={5UHqT%;9`&^y@70Q zv@y)Xeq5AYH&WPBPv=SjHGi9-Vwv7z=SIkN)ouoo3vU`AVoOLBAvcJS|8%N$yKRV? z7tTW?fPJ&|ce}89=YoF$yEVgGm?nh5-U1d#ru|#nUIORFZp~D7THW*}fvlMx8OV{3 zEAttr)S6+pJO*#O}&7)7vh)?-O zs#6QR^em=2tHQemHN;IAE!spRvs-ktk>U(O5OaUiBCXndezG0ISQ4<=9fl zQ}N~3U9OjiHe?~MDM z?x2Iem3`A^zG2F#=r`(nc@LL*u7A%}Y!ReAp)xLAX{SXs7XgJSMYRNl)^q*rK^G+}c4>>Q4AB8#)?aib z6bzbhEs%lku-{woGB9-A5zWrdA(g%izo>dhExq+twdfo)g|TI*6r%m=y3$lvgwJg# zD&6s{u(qW2G}3+IRVq94l$?|(S&g{rhr#)e)rf!-wSNtUAaCQ0Zuv!W^|P1>Xtq!m_<<#`Hc1M<&PPu~QD`z>f zX-f7rQHWVL{LCFwEvGx^cW1OGBnntOD6J&nO43#}IbXWuhIu10SF_QmJIr^>?m<)} zJWt_Y*MHbB`ZE57*wUQ$EJo+Y4~q}#{>=S(r#q+Z`7H)sgzF<#!@Se(6@+SwC>HI4 z{U;~F5li%b)5DA228TF|9^QRJ>Xk%5@hB)l$~zr@NM<6gQ9il|Vv<9ir(+6WU8sS` zBTW5&8SXjmAP^d`80A+1H}StteseeK3&)t>FwSK8opp_S5ljbT_N}sJT z*OorpkkYdB`H55FX_h``u9XK3T}u|DJ|EJZf(91FsI)blPy-9FFW3@VO}m}Rk}N^0 z$je#;9f&rFvl-Jg{$a-)Ejyh-Af@7|{VHfFsBkWr9_8jvB^gB1W(M&McYTx)@9o$z8MTDf+b(IOrNS|Ii z;OAl)h;1k%mF-b!~h>Go*fiagyK@UiRQ zGBL0(lgU_q+J^*9pr}mpA83zA((f%?uaA+@twhpoU>=i&BL)SP4bPWrK65FaFXwg* zs~jfh*oxb1FvDHDg>DW+yM-=b`?J|Em#f(GVS5Ft&ws!CBnYmsUtYtGw|@$O)=X@; zA41@1cel@Xcl*f*f;Ko%)3t=>Z9rFx-EDd8Q5Wvg#f5KAS)~tq19#4qI#pHaa80&K zK$g9JZ%$lgXqBf<4aFb0!%ja*O#W^cd{S;lu)|A$1kx*q7<89YwZ=5cn`g!;l{e3P zZ=5$jnLvyFLC+#@UJs^i-hX`WQkgifpHP)J&r;_~c?l&KKR#C2_+)&*)I}-Af}Vpo zD>f<`AWBdnD(ZbcUWt|uf9+tR4dAinVfxtvu_+R?DSssaUsgrt7i2ik5i*NiQr+D$ zB^RJPfnyh7R9wKr@YD{qZ8l#^U{)tuPJF!IsZFfbrmN;KrnJt|Pk;Nv;cTGfYa>g~ zj8n?eGv8ZTdUxUuEiAnrOnXb;tA-bqrDv(5w)7m)4fYXElCx4@_@v*8)C=`bHUdX? z9aSW7NA7f`tY?JQ6W?8X2f?j#1SDc7sPQPcB_uC~*zD9-Bh3vA6gmY@Kym(;Go`pT zj;mRVlhd-)70xn7xPN2eM`gk@C>FBF;&?LrR^nhS5y^4^(n&B=!nLx#$L@qq7ZF#9 zzkO=Ksgf>{V-~vEEA7jBUL5rJvSoE~BYmVJD7|7$#zWZs>i1@Sf@8@bWl!-;XT35z z?#u3zwBhLH@0Zk`+-ecb^#mz-=c_TYMGUMjSvMn*0hiB5qkq*T^WKS4kT;j$UoWse zKMZ|Yt_;QaBh4lL^L_(&eMCoSrbh1P+d)6H9AZU%Ah2l4`asA)vupZr2bVn}lC8J? z`V(Lru?bH#Ow1kb4zXidnU|I~vPKacA;_c#)TE721cd7@x}83sq3(|QlOerpk<9QH z71!#UtblS8tA8V4>hKufA7dx>qFWz!Mpbhy#t?+6=5m(vAE&?ImSj%1;|^?e5E7Ja zaJyBXJ?fV$>C`WN+5fus5vXuOX5`<6pMga%R_;NZ5sQ#46oXz1dEg}d4gWuT-?kh# zjx6{qjD8r~yK1?3DOQy`tcg-x`uN1@>5j2?&O=9sgMX@`B<_@onz~q4cTB{7#D3v^ z$s!XV36KB?@KTc9j+jxj$s&+Qk7DGHu~bhq?i5kLrl) zc`%-ps}KlK-M3nl9439~r+S#QA?hc>)4!e}o_=pl(Jedw$XV?=+U)fe7@MIBE1(n6 z{yx2ne@5x|Qt7FdV9THov|5faNv@D%Y~gtHV0uHlv-N`ckQyLRI{+lLYxGtVium%$_gD1UdjX>S9=3HM|4YY#kN#R5-^g~#5oVAD7K zsj*yT%1_!&Qpz9BI-2t!G{cWH( zJk?oQZ`GjiEWNv;B@wRD!!25j*dI@@Eon{>i@tUY(wD2+b(>!AO!~ti_Na}g@qdk@ z6w^jC%2!ci5u1$M6{FPStZFyQLS0?QugXlLYf{Hs+2z=j6q1?iO^f;1qDv3;;Q5|A zp3)SouRWqvMvv@f3Jlja7XiLajo~nhEd(@hl`KUFCLcCmQplER8JOD zYbDT!Eo5Q%l%yos5>HG@c;H$+?|)-w|5*6A?hOsyojaeoT+tl3*0l$&y3xB4A1&6= zIrI$$UT;S>g`Nn>wSnyzc;P^v)Gxk4g?;lOT?PIm3`5VyuJjCdhl_XQSbqm)-r@Fh z39+)4_Cs+({#BT*qk^^RU@#m>YZeU${&*o)`V58vc}|H!vt!fT_gqtm+w=TO*5+3} z5?nC9gJP44T=Wa0i#&V;Mw@UPUJm91Z9Oiy*~!&9D_<^_)`iv#SMB>*65DJOI5xb( zO_p5PKvIzvG0^eW!)>y}ZmDd7G)< zg~vIo62pGZm5Fio@d5lcj6h*nElZ5U(J+hluF@R=^gg9?S2HSg8;gOUyir7@UXd~; zREB5aFPB*-Zn4{R91+UN2jp*ZW{9~Wj}Lq8v%n<(dRiR8TxE-onv48+Y%NX;(pz5)m!GZmG{59o`uvoHNczJa}O^q)?In%9C zcb!4#jwZ4#5#QjJuzyD!sROAB>mUh#l>l%RuhKh~ zk;<W$%J$_=xyGjr|XCc)J zHu;FWDk%M>E{+JTvF&q6Wi{xV`#fD)s20!aoPp0zm{NR85^R)kQ>Bnr`A~``ZiZ zyQ0>#D&gN0Zn6_ct2$Ggj%pH%5o<(Z~x&GD#!8p@(kz2nUgAO&0(0M9nFW<>1KGSPl!vu+>8u zR#?_7-R=+0TSObaosJt1l0bbDi$ckHmZ< zcq*AT_=o+s@bh1G>H3HkYFX+1SNs_S=cT-*j(@2BhJH8=SuHTTS;SCE4GY!bX4qfu6o7v~QaMl1}Lb4RP6VS0Z;ld3( zS7^Lqhk6<9^~fd7!Ig4JYYJdMzw3*u*75cLOjS7&;cI2KO<&+Zy1=ydyv*!*-<`1n zUw;O(kcaW^Fx@0K+w2GX5FZ=a#k}3^QYAQV|D1N3w z;1_z}`o^i>IJGgSs>{b37~O3CO4)2I3Oi3%M_PM$mEOZy5>J?Ta7wTBh~npwPGNT3 zlhvEWP>#OdtVbpv3wcUb^=3E9b4YoMx__)DTdEDt3}0ozaDNy~f;=un9ai)ajw}RUZVV(K2-97z5+BSb<^$p3wtkeSFJ2byzH+DX|#GKIH(j!PHDI9xDb zwQZufpDRc+_ry`>+AiH}fF*Q;j+eoR`Q8r~FHEPuNR+(QV$ez|w*?nk%ugS$wSVRI z3`S6SnSs#S0`~xf+6#QnKBsXtdI^;^QmYvQ^fS#z=c68|c?;{kTfdMb6r|Q)g zCtOg3SA`2YmhydqQodH=Bn!N^Uj6bimf5g zN7!--; ztr4)841zGffkN|lLT?^Wn^8yM@9Nr`nCL+wKfX`4Ek~)77j`wK+9NOw+W>2QbHrn!H*=Wrh`qpSK0!RZAG;y0Z)V7w47=5XJdk zNi8_xaO5&ynQB+=zy^h0KwCaVfoNOu9~jTUu3o$NI^M-K6$Kd+>t+KP!V)GSD-`6( zdkok*_q*gSftV}{`OD4+8hxo4A?_A zj_iEP-Kew3P#(;@%YmN2uzM_>2(K9DlXEJr9bUeEt^HKFU>^4Rs(+q=(NV@Qr^|kX z)A7&OcBf;kGhl)RAxL748V!BOx4ab5Dy>8kXQHkNeVl2q3__2+VY=QX&II-mp}E2v zRVJk;3@=GSD(q1wl!;ZLx>5M-g2B; zsE2s} z>J0Uf4)~?-kMgYGWQ(`uA-x($(pswKj%{I%HZdvHpelvd1NbeYR?lDsoy99m;3q`e z&k|Z4Xq5xMDp>N|sq}@_thBzv^|O*TG;JF%YS6Z#o9HUuz<*VZDDO0ikEn$f-QUL% zh#x%R(-*9Q30Q7qv=l{9J8Cf#X^MLUh0rQ?Q26ER4m1&41Fwm=Wwlnucp9%NV^%VX zEfftyJ58L|tLk_CI^t`uiLYSYy)#CiYPdt~N+0)@-q9AY{!%;I!`4duX(4N+>vG`w z^3=ZS0=_+=6SAZ;0ewbj;wIXyH-x^j@IIvyp=w3;^X{bxTccKrT!68tTORjC6B)}Sndb90 zs#pbRr+Tb@37o=K&~ICPAUgAGq!m`ETXJgwGn)$ zsoJ7KPYnYb(2}I$i*Cf(aM5Fia*oSp#ewJF2$H4!0POBGoKs7Eg${o z1Ai+Bsb_3e{Uf$e0~kb2F&P9)SGZ4DxiHyoUHbEfXw)*8xUEpYw5Z9G=ukoRBED+M z9`~_R4V5N%Zwne1K70M7hZ;=dEcgPdZ-BBbrwkeBG<=u9HJa;q2X5-?U3!N#JRIMJ?ac-+u=32Hw#1{5ox>0l-dmh36H`r5Rg(8>o8{ zUtA6+mzR1HZ&1rt0s~7ZG=qUX!jVsy>}y-#RyA~`-lKvTuV21;?3sqKndRB_NO28^=f z-nmIW!I7u-IAauC)k^4gs3%9j*5I`r;9Pk8x&sz+C;o(9FwR+sJ;IUOMkwX&*aA$a zVXM-mZT~lP3$cnqsvEM|o>ZoRH-F9FAYw*=?@#zE%@_Ymx1k&!6*RTa9l*^ALp37? zIJzIUUM_91t=@Yq4aLV?5w++7g$qqqlp)(o_`=Y5`@xM z36U;)C;k-g9-SnwDoMlYc>9(nmT|U#k;|Baqmj#)``+ATJaL0b=+%|numjW9WvulW z*H5SO7}xLZE0$MSW7sVH@N${CwFpPGBPhJFZ91L8<^&5z3 z0wTKO{Q3oRTH*c(=^glh6@Sw|ZvVMWAHYq8iCYC%qJIm@^r0@e-lf^a=oGOM9WYIV z8wtlbBe(=Tg6SiW?Zv$IcX0$B_3I=2k~;KjL~6Z6qjOsjABH4SET2`ZQ`9l9yD(X* z#h%zB9J#G6Cojhyh^=+sV|t^V&8DuxZi#?_M+`JExtcvHAk=u5n}72KeSDJC&NJF% zu`R4%YxM&ur$m*3xl(8i67s+Y{{$7R{6XmZq3fQ?XYHT6?s;IbKB?PUsTiRh2Rrn4 z;mYWfqOH2fwwHw5;jOhKlvflD#KsgKZo$1|B?vpKBHCOKe!!?i&cQ-|!}b#L066J~ zoC;f`TCegX1lFahm48>248)SPAIM?Gio80jDmkALh{Ox+74p(YrE)SBQNddHxA0?8WuRLYsO6{#xd+J91`<*F%xb}wSZH@pr< zAt($jieol3qX9GNT{RED7X3ves`^>plaJu3J8~y8hBw%CrUTM7y13a2Zr=Y+UOc@0 z&h?;P1o`h<^54U8Ry*SU<|niV59vL59r1q{Ns-}zw{-lJ$L zR9Y8XKe}|MuDJCaLUr0Tui2u}u0CH+6|2~W!-?mI%zTr7BdN_8@yyCl^et zZlAB@gMY5}&~trn$m%T1zflw%DAi`pGWG1*6Z-5@rtFovAi?DzoX${OmC+}@LG*Df zmcy#sV7Sq`WCc|(*rFue4Qc)J@<280N$>4cQyVjPe{rcNBVA!?19B^&hLW2VzStur zxtTPbYu?rG&MbB4+lnKf3(Ea1wX}Dh0mr z{5PKG0qKqBo6?+^MEhE1S9osdUrMW@if?F!Dt%P99`z-Dx*UF()>ecKo>gF>HSPkQ z5q~JS@XGwI5cvlac}>2vpMPvbY&AsSCYbm~`K@>iKl5N%k zpi?2kmB8A~kENkNQeoG&CI;urK?Bjo(I} zVyLThm+lWlIL9R#6`8dR2oY2xeOPU}*@)CC#V1V-%62w?&5{A{s56161d7Z2{VKh? zA~qT&PJQ|(1GQu{74S>dAzXr7?th{iz(&1*dbs7b5AY6kXa(@gdyH5iI9$bRy3M84;vi&cY_|oOnPC*} zF2t)Nwgm&N?`$E8b%0&L!^aJ}n=ujEiRs`yRH7UCBk!^lE~k%hWXiS8!!9^77k2Sn ze=>5jij?wi6jdzwb|75X<$q^|X&?)%sLNRTot3fFBUC4G@+EP^xY?u+gka$YkrTm5 zidg+w;@&FPl|Wzo^;?K zN_6vmvWdSxBt%i)@6r{d5E2^2LpU-qroiWrL*b3wF1bz9J>&N)2!A&cLuH+;VIjFZ z&FlzrtRVz{B+NoA-y>emLV*5pj7U7kgn z$|iv`tl;I%rM-?nDj1E_eS%FYgGqSiK+2gq;)}TAf{nbWrLFZHID`tpC#g}=K zIgCFIhXV0kr+;8?;hkYt$`eaCm8cLcrJRpX4eoO;@T7Ei9uB*gV9`H^(oG5=Up))h zN)bu!w@5Snmi76QQ@|P30MCOC2sutyaLh_~Uo%PEMfbhnJ5slM{qrIl`0wZ4PtOA7 zjM=o?KH-P;`&^YOv^kq=XAh5 zfQ1qc}fZ%l9&6%OW}B<#_5-$ocdugSMLg=gnV_HO$u@A zyiS7-!)9R^iVQdO;qo%0RdT3lKCq4`#Ih2HTMW7sSzV>jSr>b`bVuP>?B(<{PCv3` z#;mV9ZK{tiRnnEQOAmtFXkxXPsPSK!jBdUS^?yce!P;|)ZpD+~XSrPBFS1DxqdaPWU>{Vwa zM}I>%T!i8Uzu9CEdhC*>MkY)fce4V**+bl!nK0Wu;?lCE{}Ej@Ls#kve#P}*?hjY~z5hM_+nYie5lSAViU{6Y>SH@oQmmNLWkc*k(I`LxM?$2g9> zdj~9n&+=lF?2AGG=(hhI3O-0g#a7-KA#lyhFf*dauf$t_rzQc5Dt{cYR7())Xhh$QTQXu&Q{r7l8>7Ho&RItP$!J3ke_1@NlU=+55r4Rg z2_?i^xEg)x^%-EDSeLpHH~v}`03 zh&sg+ze;RXq~_mB=}0O2&Zhowgyo{j>?^)`rjlLkSF6GtMLk=P4eE9D2#I#GW>-0L zN&0qZS->03L;ZQp@bgAj#JTUy^M9yEp*!)%fyEW^dN8e1s|W4SVpGao&vEeXxP|?e z7Iomk8W5d%sZI4Ystdpk(`eJV?~UsM5X;>QCzFZArq_dMTduxRtKM!pU8|S+tx?@L zrDD*Cio5Qw)$_f&1QE3xs2T5{_)NKs}fZ`d4V%Kh@8u zlL_^^Qv8!be)XW2ietJ~a3pKdGY*drWSrU0J#H4Ys)OorZa zp2x3^$Gq0H^EMgR91Z%$*hXvUCxx#C`XKg11k%gT&R;f%AM|;gO)x1>dej~j8m>ey z`MaZn`j-Jg0wsS_3Fa6pALZxOvHq7&r# z-9FxY!s;?Knh`mx$5mD|r#KFlV)<~ATtk)xD}9QA65)ThZ4py%(>BM>fgFkxIJr4j zaA;x$yKvdCr--wx-p=z`5&z5iWH_AayBN!Xpt%=CLO@EZ6X7}bT=?X52l8M#C6chz zuZKPoRz!#4-YC{IEojXyA!9c1$D^z`&jYq(7TtSVU1Yv3!aOv)3Zmo?nuPzJ)?HDo zM}hG&8@PW@Okuz>Z&^LgO&qa;oE68>KD~<{Fs&k?#e=}{si+i9_jVOy(F|IL58|lD z4eU;9q$Si_qsm-@sx-;|fZp7^PFQ=2sDjtFlc@E=^Udge11MMn%ur_}C{zIvGTTsF+C`7L%`R1t7HFp__2I!A^Jlv%h3x+xa^aIv6)^FGQ@ z5wYga#r|1UN@FfhA(>T)uru{TrS%4y3#i0qdtc+(=NvF)pc^2Sg(dYaD@4F|vEJ;Q%3L0@MX%sZ# zzBhjk8o5Cj4nw!D1e+b0wy6W2He^&kpDtunPad!64Xv0;@pVQ3>%7itxpJ-W%QLV# z(5{2fXt@v@ANV=f(;FmoAjTFu z8i+2iB(YDx&MD4gw1>#?YJW%$#{=_l2qhxX9{^P#87*YhUJalUapsPK=~A0)TX&Ex zR*DxG#Jff}L?M7=<4c5|!8L}Wer$hHH&!>%c;*H(eGy*6&zoh_6yKYx3U55|M#0D? zo2C{_J5>>$hwZSU(-i#P%W8@Iwl0csCm<`Rr=_%(7KmPg!u{EeU0qaMV-D!D0rvC%xp9qk2S^N8kuS} zW16GjQ<_wIuXh3cpe<(g30$I}Fdp;|b1G7d@J#feUcfg)&R19ht_ue5fjfS$Et2_- z!TV=$*am7!e&eQZ)@eS7m2ZD>I0^>7V4e1S3t%uEUS5jH9qbW~e7f^*7j@k}69#m@ z(hBLkd=Ir&A`EGHQZd~{U> zls^94asUNwqwk!>jhOG8i?4FAro&ohP8O|*+h^XkT^8J^$3TBGy(_zAacd#2 zm1x5g4LtmG<}7y>Ge0&PC)zwjk9!EaAGZbO){p~-@kxlPGyIyub0OIXa2#cEKRICM z^+fN_gK!}&+9AF{qGykA5Sh}psi%f!v9ZWKO#fp2TH4tA&4AUW2S8%GCIS4G<>gHYHc$eAd$wu<2kNK;KdSRBSrzf=Lw~705ggu`Ew6GbMnFyl(m4 zA!;&(dpB1lRivu~vr$;5aeM4rRp4Cu!@w_+*!9%ohogVcr3p!$SLPXJ^=KOu+mxp| zSF)VdO~@+*)Wu$6$|+d%k4D9e)jJ`+`EquGPq32}ssm}4H6kz4$+@(9IHrAyh^hs7 zaC#+bT5?VUK>PY~n!)XKsGjy2jde=xd37LH0B!I?wlqlanz5oaic7mh3s<&q&{#TO7!m{PIvdJ3UqF=bJ)_Ro2pjEw&P8 zT@rl40X5s;43cR3`0H;{XiPlI?!aFz@(Lec^1gq6RXf_pehP1>CxSlWW}uf_R7-PF(ws)D+b+uUS{Mth*hf2brt zXaG3j-p@T8Xd> z5{axVC2l$$?Cdr*95`z0STVbl({#3WA_#M(j8-6*dc&iCB8;puQei8p?&eDoSfYOe zV~uXAWi`v7>gTU@*BTpf^IqBkl)n1`?IqY&GIu*cEuUO|r&5E7meRT-D1Q3^<#<0E za+Ri=INGXqq<2=gyYUadE298%xl7e@_nQFPprXD3lz%-DoYljfiW?Mwz99slb$%()e_~bWW>s5P|XQqa%m>z$wEqz=+ zhm936_AHSFcjZrpEM=+xr$yGsm}&_)c|FHXl8*w=0^IR8#qcEyOHzMW%Wr>#EK}~ghxABf!7ANeZ;}^QIWUoN<#aS>iR}pYnf>>(~oO9-K1o zw%2LXz=fH=w#kyT{@P~1S~z)|K-|5Pw__+Sert$0GbeBpX!TBD9keFWw#2y$D10ync5{#j1#S-6_UWSxJ%5g5PokY!J5*mmn}3$hgW2SoxAwGK zKc%h|Fu#}VGB{26&hCOck&Psi{g%myE994QiYJ!$B#hHQZ0dh&6blPOBb1}T`&~-R zV(8d#7em@%vcJQ;#_aw9Hv8UCgY`DKhmsVBhnV1`ut@<^T!Sm5YrvQT*Iii(o@0~1 zS_08{ZP+CWy2u^3wC}_&#z7e;|G)q9e-BV99?}f&3A=6JZmH0x0$MZS$>h9y(Oi{G z>`@&y$~%@9#m|2((Hb?O!Bv;5v*<88xD5P2Tgs%ESk{}6ZV9#v$nHoeK6(6itJ zIgOIP&x1)$ClujF{&3(04K|@hPSy=;p|rG}ZJL7r^0V{yt+PFDHu@62-L0d(b9vLX zK=pQ9N=<)Mrpa0wM30&-L(P0Jz<55GFUp~nM!nz$JwHo;pHMr;Z` z_8u@`#O~Hn&xlReavJ*mM!wH%+drS{M(yy#P`|k^A76c`CbsOHU--M}CdxP9Z|MQ* zJVpl-O45u|=S4AZ;LOj}rjo54{8HCV2MbUhK0AM30OuJ47uP?x=>y&!zKWsyAazKx zn?vB<)6K>X7rO1C{gsuPP(%{p${Nji{4R*RV%*v<2>DnwG?>c%ndxXp96a#FqWZ4nz&Fpr*k6 zCRrti&0}5#iIvZPc(c zY6{NXVJC&4^Ez~b`q;%cM=0uBY$FS!z-E7(J3Ti*5e+${KTZ;!(4Dy2M0=$gH8y~M zAqtxi;}`9=hg66+&@V9A-t=@tss%#5HsOeng#{?uduh(n65O`i(dDVG=`xt5^YTE9 ziF2TiGY9dG|J}zat0m5RXw_xLIo%%xo2%zc&gXI+bg~XHCY?kWCA1tyv2zfSJ|2J4 zJEHqR^+19VQ}XoO11oxuQi(1sYc7H-eMmV41}7#ezl^FRwQg$59^uF`jb)LI7GP+N zWux(}%HdnpH&`RNn!)DNZ`j^}+H^3D4UMbP&Pejt0#-6k_6nPk^p8yjI+w-9m(Y}U z4u%q9)CE#*AKZO9LjzKH=CM!+f@Xgyj(;Nrg<(Pd;V-#g0$x3NJ2U`|ZOA{MJHd1h z={qO|0KTUOF2fsP*aPj1a4NV?)6cuitc)b91$EvXB68>}6K;kcJ>f3MiC`jRubYk! zG;FDZK%Iar&CW-4yafO*=fg46$;#*s;o&VYn=tn(J7De0*=Is$%pmT`2tTgTYR zhNk0YIjv{;?xs7D0Bb;$znpv8hgmp(m@O|6+b6R^bg8FZH0}m%np+=rO0;Pk>_1f_ z?+aqSp^+k>)p^TXRq({9-d7KHzkG!c5ZkHAPUDAapmA*L0yC>Yl(^a$WLq#9CK~`L z2rj#R3}2IFQP|@RaENEj?DVM*G><}Wc1Z*GUxKfzoRL~dH#u?zC~>sCt%#s>)~C1E`Z zN_5A+p$j)^|M=nO`Oj~hdAgzwxzh4(ABiopNw)uVcDT6RyEXOf+!FgR-95hjj`b<3 zgGJa0A$*PG}IX4p(V# zDA3?^|F~VE^c2Sf)PUk59?2&mIyV>&J$Wrs z;SH^tOCNPYbb*}cLV@V;Cftw5Xt%Z^Ih39z%dI0hJq}8!9}oR75KNYTp6C$yRZoXi zSghy}g9tZ>cS|bdChr70aDIfl)RGPsGSnbdsZe79n;o_wlZamRCI`G^1%CII*s^6~ z+areXhQ`hU-=ECs0)?R`elS@eUdyA1Z}?F-3Bj-gjZ`+|{~!Pmrw_MDk>x>u1Nkby z2)Gevcu(GQPZ2qQbv9yuy2isbTf)uz-^q&yLIfU*9Nm)t9*(on&Hc?!m>zOS@5%Fk z{$vLb7XQ3T4~O)w`1dBh=HA{CX%`bjk39V6b($Wyf8HFS*3jFmxez(_?#WX|-|!oJ zyiQj??h=q(gf`+|lEaEX>4#Z5H^oRHOuN|oX*ik=#RJLQ^%o0&>NV5J^*pkrlk0dc zugY~6q{9z&?vQuc?Nbvuj}}T7I2n2#fXL${BuE<7rxh3Q<`?VX{1IIxo8<6V7g%1p zqi~!ZfdFacA8TgT4m_L$-jvA?`R8y1&rjva?^U+}1&YKbm6FL%N3(G7+>O zm}!%2;it)#{BRq8KY*{W2M6nL;4X(^$(zcCUA)s_i2FG~eZGl(RTL=AzL=BQ_1-Fu zvT!!SWXTHB(a4;~eSCe~pbvJ<3O-8Hpmf|W;&h9uf31s zEE8J`x;GDhrz2|YHOi&tzPHGw4#tzwAhgJ(t_Rb)FRfe6ezluXS06{9h*xs`(7gcg zMkBJ!8qq$3lvJ^NBxF$U;%mZ05Xs7!BFouLc0~~q!f+d!AC+eEk|oBVaL+5`R7$Gk zZF{r9yI;P$AQDP6s@WqPx$UtVuiSDuRNinfp16L0DW6IF1`VUCNjDab>bbgd=G?B7 zh(>0_u@k@SRn~*EiquO2vb-Lt_=cLdfw#z-ZEEDrlo#E6GF8z=sjhtzn;hS;U67s_ zMUj0f&RSj${E}*AkCdeKBe4d^u85RXS~NMoPQx+3Xz}#?%Pw6XQHYDjJ&tBLk`YtU zxXEyDZL$O)_7JhX<7Jr=q7U)zF4;z#GCYmSk=ArU^G1^?4L4gN=aLq!RT{Bvk&o*A zIs-*+yL&J&5Lt+9?H_6R5`vI6&XbYABOYO|V{xFnt z%Ys%-nV}B*hN&u-F<1f|GrJs1KormyymP`}Ao7GU^TMevPTVhHs8-$~Y4BgN#r6sP z7YlfW;N&1Q;}GQ<=HsC^mw;FT90Hylm!4Px7Ju?wI_4oq5F8sD;!?jly78XkGWTTU zhv6_d)n#t~d}OgW=}m6=l3wMv3exQ%O0aPUf4;{L^c9tti_vVZ6?<^!UpGR32SE-# zk%~E>EvHnT4efA(H#k&Y74X+Vzn7~R^U0ZO4I=3AbpnwFq0xuA<$-0yr3+gCUX8HG=leIF^or3 zGR(?~PZvQDW@W`Qa?^d_`{aN6drgL)HzHQ<`##IR)Pvb^`Iq_$b;Qc=qDmK(XQzOn z_aA?QQP2(f>^9x3fovek8m$h{NQ%a`>3^MT8YR%JW#&O3o~@h+G_2Jk#1CjkZe}3S zuS$+yat6I&>n8XTLiX|&cGYE`Jt?_>Vy1%WP3|U??AINevfx47Knl> zZ>p73;1~#X3@nG@3NGpDFgqB!!-TQ$7^bK_>Q6!4l7+#9 zQi&x0tpT?93Cq}$&eTUS)aONegv`hrcG{{XpTeS2ebqg}yy0L`x>8Uv?n`~gXzDoB zn=TB$Jz2;eO(CNERK8Rl@fesNkTDFl$3wD*g3v-bd%WAh>(%O5O@GRvYv^8UE(1Rt z@#OgPVp-!+Kc9R_OCN$$if|gf&$TeN_WXkvc&>zSyMmI8$z@1 zcU!tG&O^FeWAdSJ=F?7m1shq+NiEiRbA3h*5jW9py@}!Ma9yfW+&ve}J%3tCmwC#q zG&@a0RD$JvLgKz!#eajVusD1Z9=+cspCFf5t82nwFr+QP6!4I}B$FPVC&2m!q(B*n56E_Kw4NcAG`EKe~PJ{J@`Q2k%VWDla|oUk+z}IMjP1i~?5Qt}Qg4 zQG0EH+nzomR-WfA7NXnkY1I=s`EzVgzN0`*32H|?W?}H$&VPUl4$QisUkPSWbu`_! z1(*J^=1Naga_&f_o5D~&c>=`HCCuV`-sut`Cg*|0@=nzV!5;^gp%|ilek!3Z{~{y@ zPEUJkgKPZXqd{aOy}1D!NpJ3ZQ;H1yvFG}(H?(QsQ46Mh1lMne7i|PL91Sn2FIRz$ zSD8$*kR5pkZGRo$?8K%SrX*9Z^b}X$T!xP6_r0-T^#`Hv zhpuZu#`Rz}FhVNA)^0|t6ts3*SW`#9p9F5mxaI<@axxw%j)1D1g4bPGMAVe#6$EEp z>+m8Ry^_6i4>`#PFzm^Sv!G^iB{~a1V3_lc%$`7pc7HBj29cD9gcwA4swM|*T1fc+ zv-iErjUzdpufmuQvsJflmq?0~)P3y>{hjf|)O5#HU-XBG{Xk2!&1+e7Q9atUOT%%n&#DUy<0rH+Z3DoIQtkw^fE1b*1C6S7GDQ&qDb}?$vq$oF%RnXqD=m0>+Y8L z2uBvmg8yGNjGm-lYCTuF_KJ&+{+uZArS(IW|5JwqI#ozY*{L-sIxla9+Oo*$hRih= zI)A>Um%W*l<@V%_FD(X>vI|E*&3iKokXnT|z6R+nueUV;AC`Ybow$*$Mamg0HB6#Y?y>P>ZfUD`lfWGm!LZQNUvF0JuC3)AKXO%zvTD zxHcBhy^`Nrwr@bRR_kpU5Z+vV%6r^LO#8g^I@#2`8m1|^SH|5LQ`gO9!XfJLtJPB_ zoc{$H^`vOdcpfTa7?9qYpIdtbb-SGIc!$D7U#wmUVdynly zua5+2wU=E&r87SI(ZjwvE5czHNbf~oAtl|f6D4yg<^p#wG1x8{lRm>(7SYxXmMwF*U}bhd_37{<&NgI439X@7t)bM!=c z%N`Ae?%-&N^45L^GBI{>n*4k8I-}rj2fZJFrCYWc)>5g%v2~Fk>{mdEDgqM%l#Ddz zQI?x41b&Auz!mL5mw1Z_$Kk552uYF7QWB(7p(;kX=`vklj>+U%a)tU6 zYbN?VswVM?ddf2G;Y6tX;+JxR3b!H&f~#CDjJqSrh>h4o&mm+{RDYy)i?^!MB#|Pd zBoC>?h+=jO+?ZxlB59MC;YJ4VVatzM=(VfWCsPYL1``B93_zQx;vuRqp=2U%aMc>h zqRbkQ{m&8PxHo1*vz29XR|zS%=-IuAU3R`i5Tnqs0jIpkLyomxniH~sPq9fwD z$LrE|(kH&NSVlhc>gT+N+Pm0$_y=<+JBfdJn^%3VK@3h1^?z2c1TI4R6$owJfHKJK zUw`@d_lxYd!~btyc41%<%BscAA@DQlQl7GNFAmnin5*FB+=wr~*MYq`3tp1#NgqNl zvQT$SHp|V~2}82(pBQn+)XU${x-Y%Wi>H$-dzzJ>B6)AzCX17t_$F_Y1#{RLj2-5v z8LH4LK2%7|YAsnd*IhrVb;1 zED4-eU!Y%pn*H>B=91GAd1kJiEFHzUFvvgmfjySP3E+c=C~fBX|ieyyZMO`!N| zGAwL>{rm7GcFQTvy~3r<>yrWkIS} zJUX*OsyRq!vrn`2xb0Co%P48r@Zl9d3aKAry(R+jLYs|b-z1#}ASbrc224%Y?TN!d z9qC~#gG}7*l6eH)M!bpKtd`v$i*&#iHfy)VrhJ*jH|WInU3VnfXB;t?0=Y^tRghKs zsxtO}O`%RBTz7G`(S$7aUz6GDGghdWE?B!|hN~hp+ul5gNR-wbjst+%0a~m&vlDL7 z7VE+NHM2m_xggn{+C%D-TT%CN4hp1>w%8)iz9B5x4z^N(wUhjubFp^XQZd=ZG0|q` zvUl=($M_?MTF?0r5k z-r-%7?!C_G_=};$x3me<7V0!Zvy_{9`U%i5JEHs|0IjeQanX}a#q}4oe&|9P0J~tb z-V1-XCCTA-8$c7;d*;w)_goic+}8S)@Eux|CKs8Uc|y7uWLE>R^7_UfbC&&>Itfr~}OF!X7Lp^&RpX03bS^v?B1I_jXj$@mz=Q zc&_E0AM{45f>gLIm_QRoK^L3)A=t2ar9fR+vLI#7Um5HvfO-RO3IP9uh#N$3MpW+# zvF`4Cz%G4e&w|II)8KyYSo85wcDM8BH9_KKwO^AH^;^iZZM{!dncrVOAmJ&Tq4G52o~nm2qO2brj{zT@7&9g>}gRzbu}A~}dm&CQd) zeDpTK_KBww@g?@w>sKT8w=pCletwrAY63D1Z{CZ?M`qJsK5l~Fcb8vk0)&5K_~J*O z9=+eR8yVLay<{4x?r9%yLnsp2@JPDlh{Z`S2QJrx@&Y%B(%ZcZ~hUpPByt0sny2xPF3)p4?|!*gW|UfjO}k@3!wxU02qD z{1CDYkGMl~Iz?2Ag(`ny;`QfsImm56HJhZz{`?T*BAggR`1<<#7zA|D0BUXz zW~vh1^WKZ+eS2?gcgx2L&sZ^*Xdm;xrdZ3YD{}!?%!iAaOBKZE6hc?~J7{~1z+0ki zZPMlbC}u`54M#qnnMtPDSlfA9X$OJoJGSL%pgHPbwkVq7E7Z-AAMbyn=Hk$b?KA!t zj?;-GZFc1;+Xai>fi2kAl*iG|>Ni|F_icML;{hOL=#kwY%`^I>QPgkbQE(8Uq4c9| zaE$#~;f?x+Pwac?Q)CXrro@Qh3X`YB6dpePi+%C=$3K~t)kl5s$o}pO`vTPZ`QalT z_TuoFectCkiGafFpLc&@9EVTYzt{e~^zEbXt$fDlfrbCP55rjc=ff_>e~Q;Jaon;` z#V�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

nRxe;wV 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 diff --git a/doc/spec.md b/doc/spec.md index 4c1ec4f2302..fa69d321056 100644 --- a/doc/spec.md +++ b/doc/spec.md @@ -265,7 +265,7 @@ function f() { To benefit from this inference, a programmer can use the TypeScript language service. For example, a code editor can incorporate the TypeScript language service and use the service to find the members of a string object as in the following screen shot. -  ![](images/image1.png) +  ![](images/image1.png) In this example, the programmer benefits from type inference without providing type annotations. Some beneficial tools, however, do require the programmer to provide type annotations. In TypeScript, we can express a parameter requirement as in the following code fragment. @@ -413,7 +413,7 @@ This signature denotes that a function may be passed as the parameter of the '$' A typical client would not need to add any additional typing but could just use a community-supplied typing to discover (through statement completion with documentation tips) and verify (through static checking) correct use of the library, as in the following screen shot. -  ![](images/image2.png) +  ![](images/image2.png) Section [3.3](#3.3) provides additional information about object types. @@ -630,7 +630,7 @@ An important goal of TypeScript is to provide accurate and straightforward types JavaScript programming interfaces often include functions whose behavior is discriminated by a string constant passed to the function. The Document Object Model makes heavy use of this pattern. For example, the following screen shot shows that the 'createElement' method of the 'document' object has multiple signatures, some of which identify the types returned when specific strings are passed into the method. -  ![](images/image3.png) +  ![](images/image3.png) The following code fragment uses this feature. Because the 'span' variable is inferred to have the type 'HTMLSpanElement', the code can reference without static error the 'isMultiline' property of 'span'. @@ -641,7 +641,7 @@ span.isMultiLine = false; // OK: HTMLSpanElement has isMultiline property In the following screen shot, a programming tool combines information from overloading on string parameters with contextual typing to infer that the type of the variable 'e' is 'MouseEvent' and that therefore 'e' has a 'clientX' property. -  ![](images/image4.png) +  ![](images/image4.png) Section [3.9.2.4](#3.9.2.4) provides details on how to use string literals in function signatures. diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b7637682f1a..f2e65004b80 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2466,10 +2466,6 @@ namespace ts { return type && (type.flags & TypeFlags.Any) !== 0; } - function isUnionContaining(type: Type, kinds: TypeFlags) { - return type && (type.flags & TypeFlags.Union) && someConstituentTypeHasKind(type, kinds); - } - // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been // assigned by contextual typing. function getTypeForBindingElementParent(node: VariableLikeDeclaration) { @@ -10217,7 +10213,7 @@ namespace ts { } // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions. - if (returnType === voidType || isTypeAny(returnType) || isUnionContaining(returnType, TypeFlags.Any) || isUnionContaining(returnType, TypeFlags.Void)) { + if (returnType === voidType || isTypeAny(returnType) || (returnType && (returnType.flags & TypeFlags.Union) && someConstituentTypeHasKind(returnType, TypeFlags.Any | TypeFlags.Void))) { return; } From cac3a32513d2f06cbf1d7da0e34b4df571fe472b Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 19 Jan 2016 15:45:41 -0800 Subject: [PATCH 052/160] Add ReadonlyArray to core.d.ts --- src/lib/core.d.ts | 115 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 13 deletions(-) diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts index dbd4d37ef96..cc7d916977c 100644 --- a/src/lib/core.d.ts +++ b/src/lib/core.d.ts @@ -988,6 +988,108 @@ declare var JSON: JSON; /// ECMAScript Array API (specially handled by compiler) ///////////////////////////// +interface ReadonlyArray { + /** + * Gets the length of the array. This is a number one higher than the highest element defined in an array. + */ + readonly length: number; + /** + * Returns a string representation of an array. + */ + toString(): string; + toLocaleString(): string; + /** + * Combines two or more arrays. + * @param items Additional items to add to the end of array1. + */ + concat>(...items: U[]): T[]; + /** + * Combines two or more arrays. + * @param items Additional items to add to the end of array1. + */ + concat(...items: 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. + */ + join(separator?: string): string; + /** + * Returns a section of an array. + * @param start The beginning of the specified portion of the array. + * @param end The end of the specified portion of the array. + */ + slice(start?: number, end?: number): T[]; + /** + * Returns the index of the first occurrence of a value in an array. + * @param searchElement The value to locate in the array. + * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0. + */ + indexOf(searchElement: T, fromIndex?: number): number; + + /** + * Returns the index of the last occurrence of a specified value in an array. + * @param searchElement The value to locate in the array. + * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array. + */ + lastIndexOf(searchElement: T, fromIndex?: number): number; + /** + * Determines whether all the members of an array satisfy the specified test. + * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array. + * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + */ + every(callbackfn: (value: T, index: number, array: ReadonlyArray) => boolean, thisArg?: any): boolean; + /** + * Determines whether the specified callback function returns true for any element of an array. + * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array. + * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + */ + some(callbackfn: (value: T, index: number, array: ReadonlyArray) => boolean, thisArg?: any): boolean; + /** + * Performs the specified action for each element in an array. + * @param callbackfn A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + */ + forEach(callbackfn: (value: T, index: number, array: ReadonlyArray) => void, thisArg?: any): void; + /** + * Calls a defined callback function on each element of an array, and returns an array that contains the results. + * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + */ + map(callbackfn: (value: T, index: number, array: ReadonlyArray) => U, thisArg?: any): U[]; + /** + * Returns the elements of an array that meet the condition specified in a callback function. + * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. + * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. + */ + filter(callbackfn: (value: T, index: number, array: ReadonlyArray) => boolean, thisArg?: any): T[]; + /** + * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. + * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. + * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. + */ + reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray) => T, initialValue?: T): T; + /** + * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. + * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. + * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. + */ + reduce(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray) => U, initialValue: U): U; + /** + * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. + * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. + * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. + */ + reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray) => T, initialValue?: T): T; + /** + * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. + * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. + * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. + */ + reduceRight(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: ReadonlyArray) => U, initialValue: U): U; + + readonly [n: number]: T; +} + interface Array { /** * Gets or sets the length of the array. This is a number one higher than the highest element defined in an array. @@ -1036,19 +1138,16 @@ interface Array { * @param end The end of the specified portion of the array. */ slice(start?: number, end?: number): T[]; - /** * Sorts an array. * @param compareFn The name of the function used to determine the order of the elements. If omitted, the elements are sorted in ascending, ASCII character order. */ sort(compareFn?: (a: T, b: T) => number): T[]; - /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. * @param start The zero-based location in the array from which to start removing elements. */ splice(start: number): T[]; - /** * Removes elements from an array and, if necessary, inserts new elements in their place, returning the deleted elements. * @param start The zero-based location in the array from which to start removing elements. @@ -1056,62 +1155,53 @@ interface Array { * @param items Elements to insert into the array in place of the deleted elements. */ splice(start: number, deleteCount: number, ...items: T[]): T[]; - /** * Inserts new elements at the start of an array. * @param items Elements to insert at the start of the Array. */ unshift(...items: T[]): number; - /** * Returns the index of the first occurrence of a value in an array. * @param searchElement The value to locate in the array. * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at index 0. */ indexOf(searchElement: T, fromIndex?: number): number; - /** * Returns the index of the last occurrence of a specified value in an array. * @param searchElement The value to locate in the array. * @param fromIndex The array index at which to begin the search. If fromIndex is omitted, the search starts at the last index in the array. */ lastIndexOf(searchElement: T, fromIndex?: number): number; - /** * Determines whether all the members of an array satisfy the specified test. * @param callbackfn A function that accepts up to three arguments. The every method calls the callbackfn function for each element in array1 until the callbackfn returns false, or until the end of the array. * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ every(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; - /** * Determines whether the specified callback function returns true for any element of an array. * @param callbackfn A function that accepts up to three arguments. The some method calls the callbackfn function for each element in array1 until the callbackfn returns true, or until the end of the array. * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ some(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): boolean; - /** * Performs the specified action for each element in an array. * @param callbackfn A function that accepts up to three arguments. forEach calls the callbackfn function one time for each element in the array. * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ forEach(callbackfn: (value: T, index: number, array: T[]) => void, thisArg?: any): void; - /** * Calls a defined callback function on each element of an array, and returns an array that contains the results. * @param callbackfn A function that accepts up to three arguments. The map method calls the callbackfn function one time for each element in the array. * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ map(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[]; - /** * Returns the elements of an array that meet the condition specified in a callback function. * @param callbackfn A function that accepts up to three arguments. The filter method calls the callbackfn function one time for each element in the array. * @param thisArg An object to which the this keyword can refer in the callbackfn function. If thisArg is omitted, undefined is used as the this value. */ filter(callbackfn: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[]; - /** * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array. @@ -1124,7 +1214,6 @@ interface Array { * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value. */ reduce(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; - /** * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function. * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array. From 8bb00feb09caa2f2cfcaa3706457bcc70c248c9e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 19 Jan 2016 15:46:12 -0800 Subject: [PATCH 053/160] Consider ReadonlyArray an array-like type --- src/compiler/checker.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 72a0c71178f..0f880cd17f9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -145,6 +145,7 @@ namespace ts { let globalObjectType: ObjectType; let globalFunctionType: ObjectType; let globalArrayType: GenericType; + let globalReadonlyArrayType: GenericType; let globalStringType: ObjectType; let globalNumberType: ObjectType; let globalBooleanType: ObjectType; @@ -156,6 +157,7 @@ namespace ts { let globalIterableIteratorType: GenericType; let anyArrayType: Type; + let anyReadonlyArrayType: Type; let getGlobalClassDecoratorType: () => ObjectType; let getGlobalParameterDecoratorType: () => ObjectType; let getGlobalPropertyDecoratorType: () => ObjectType; @@ -6054,8 +6056,10 @@ namespace ts { } function isArrayLikeType(type: Type): boolean { - // A type is array-like if it is not the undefined or null type and if it is assignable to any[] - return !(type.flags & (TypeFlags.Undefined | TypeFlags.Null)) && isTypeAssignableTo(type, anyArrayType); + // A type is array-like if it is a reference to the global Array or global ReadonlyArray type, + // or if it is not the undefined or null type and if it is assignable to ReadonlyArray + return type.flags & TypeFlags.Reference && ((type).target === globalArrayType || (type).target === globalReadonlyArrayType) || + !(type.flags & (TypeFlags.Undefined | TypeFlags.Null)) && isTypeAssignableTo(type, anyReadonlyArrayType); } function isTupleLikeType(type: Type): boolean { @@ -15719,6 +15723,7 @@ namespace ts { // Initialize special types globalArrayType = getGlobalType("Array", /*arity*/ 1); + globalReadonlyArrayType = getGlobalType("ReadonlyArray", /*arity*/ 1); globalObjectType = getGlobalType("Object"); globalFunctionType = getGlobalType("Function"); globalStringType = getGlobalType("String"); @@ -15763,6 +15768,8 @@ namespace ts { } anyArrayType = createArrayType(anyType); + anyReadonlyArrayType = globalReadonlyArrayType === emptyGenericType ? anyArrayType : + createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]); } function createInstantiatedPromiseLikeType(): ObjectType { From a2c655d683abda68d7a53abba357a0da0a29b4e6 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 20 Jan 2016 15:23:46 -0800 Subject: [PATCH 054/160] handle block scoped binding in nested blocks --- src/compiler/checker.ts | 120 ++++---- src/compiler/emitter.ts | 82 ++++-- src/compiler/types.ts | 13 +- src/compiler/utilities.ts | 19 ++ .../reference/capturedLetConstInLoop1.js | 8 +- .../reference/capturedLetConstInLoop2.js | 6 +- .../reference/capturedLetConstInLoop3.js | 6 +- .../reference/capturedLetConstInLoop4.js | 8 +- .../reference/capturedLetConstInLoop5.js | 6 +- .../reference/capturedLetConstInLoop6.js | 8 +- .../reference/capturedLetConstInLoop7.js | 8 +- .../reference/capturedLetConstInLoop9.js | 10 +- .../reference/downlevelLetConst16.js | 2 +- .../reference/downlevelLetConst17.js | 2 +- .../reference/nestedBlockScopedBindings1.js | 97 +++++++ .../nestedBlockScopedBindings1.symbols | 68 +++++ .../nestedBlockScopedBindings1.types | 82 ++++++ .../reference/nestedBlockScopedBindings10.js | 24 ++ .../nestedBlockScopedBindings10.symbols | 19 ++ .../nestedBlockScopedBindings10.types | 27 ++ .../reference/nestedBlockScopedBindings11.js | 28 ++ .../nestedBlockScopedBindings11.symbols | 24 ++ .../nestedBlockScopedBindings11.types | 30 ++ .../reference/nestedBlockScopedBindings12.js | 28 ++ .../nestedBlockScopedBindings12.symbols | 24 ++ .../nestedBlockScopedBindings12.types | 32 +++ .../reference/nestedBlockScopedBindings13.js | 23 ++ .../nestedBlockScopedBindings13.symbols | 16 ++ .../nestedBlockScopedBindings13.types | 23 ++ .../reference/nestedBlockScopedBindings14.js | 27 ++ .../nestedBlockScopedBindings14.symbols | 22 ++ .../nestedBlockScopedBindings14.types | 29 ++ .../reference/nestedBlockScopedBindings15.js | 68 +++++ .../nestedBlockScopedBindings15.symbols | 46 ++++ .../nestedBlockScopedBindings15.types | 66 +++++ .../reference/nestedBlockScopedBindings16.js | 76 ++++++ .../nestedBlockScopedBindings16.symbols | 58 ++++ .../nestedBlockScopedBindings16.types | 78 ++++++ .../reference/nestedBlockScopedBindings2.js | 244 +++++++++++++++++ .../nestedBlockScopedBindings2.symbols | 197 +++++++++++++ .../nestedBlockScopedBindings2.types | 258 ++++++++++++++++++ .../reference/nestedBlockScopedBindings3.js | 150 ++++++++++ .../nestedBlockScopedBindings3.symbols | 130 +++++++++ .../nestedBlockScopedBindings3.types | 177 ++++++++++++ .../reference/nestedBlockScopedBindings4.js | 91 ++++++ .../nestedBlockScopedBindings4.symbols | 93 +++++++ .../nestedBlockScopedBindings4.types | 129 +++++++++ .../reference/nestedBlockScopedBindings5.js | 169 ++++++++++++ .../nestedBlockScopedBindings5.symbols | 163 +++++++++++ .../nestedBlockScopedBindings5.types | 227 +++++++++++++++ .../reference/nestedBlockScopedBindings6.js | 197 +++++++++++++ .../nestedBlockScopedBindings6.symbols | 177 ++++++++++++ .../nestedBlockScopedBindings6.types | 253 +++++++++++++++++ .../reference/nestedBlockScopedBindings7.js | 19 ++ .../nestedBlockScopedBindings7.symbols | 14 + .../nestedBlockScopedBindings7.types | 19 ++ .../reference/nestedBlockScopedBindings8.js | 23 ++ .../nestedBlockScopedBindings8.symbols | 20 ++ .../nestedBlockScopedBindings8.types | 25 ++ .../reference/nestedBlockScopedBindings9.js | 24 ++ .../nestedBlockScopedBindings9.symbols | 19 ++ .../nestedBlockScopedBindings9.types | 25 ++ .../compiler/nestedBlockScopedBindings1.ts | 49 ++++ .../compiler/nestedBlockScopedBindings10.ts | 11 + .../compiler/nestedBlockScopedBindings11.ts | 13 + .../compiler/nestedBlockScopedBindings12.ts | 13 + .../compiler/nestedBlockScopedBindings13.ts | 9 + .../compiler/nestedBlockScopedBindings14.ts | 11 + .../compiler/nestedBlockScopedBindings15.ts | 31 +++ .../compiler/nestedBlockScopedBindings16.ts | 35 +++ .../compiler/nestedBlockScopedBindings2.ts | 126 +++++++++ .../compiler/nestedBlockScopedBindings3.ts | 68 +++++ .../compiler/nestedBlockScopedBindings4.ts | 40 +++ .../compiler/nestedBlockScopedBindings5.ts | 80 ++++++ .../compiler/nestedBlockScopedBindings6.ts | 88 ++++++ .../compiler/nestedBlockScopedBindings7.ts | 7 + .../compiler/nestedBlockScopedBindings8.ts | 9 + .../compiler/nestedBlockScopedBindings9.ts | 11 + 78 files changed, 4636 insertions(+), 121 deletions(-) create mode 100644 tests/baselines/reference/nestedBlockScopedBindings1.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings1.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings1.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings10.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings10.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings10.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings11.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings11.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings11.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings12.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings12.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings12.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings13.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings13.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings13.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings14.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings14.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings14.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings15.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings15.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings15.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings16.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings16.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings16.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings2.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings2.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings2.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings3.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings3.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings3.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings4.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings4.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings4.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings5.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings5.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings5.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings6.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings6.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings6.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings7.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings7.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings7.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings8.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings8.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings8.types create mode 100644 tests/baselines/reference/nestedBlockScopedBindings9.js create mode 100644 tests/baselines/reference/nestedBlockScopedBindings9.symbols create mode 100644 tests/baselines/reference/nestedBlockScopedBindings9.types create mode 100644 tests/cases/compiler/nestedBlockScopedBindings1.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings10.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings11.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings12.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings13.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings14.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings15.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings16.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings2.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings3.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings4.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings5.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings6.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings7.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings8.ts create mode 100644 tests/cases/compiler/nestedBlockScopedBindings9.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ddb49a2d8f8..1806dc647c1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6967,7 +6967,7 @@ namespace ts { checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); - checkBlockScopedBindingCapturedInLoop(node, symbol); + checkNestedBlockScopedBinding(node, symbol); return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); } @@ -6984,7 +6984,7 @@ namespace ts { return false; } - function checkBlockScopedBindingCapturedInLoop(node: Identifier, symbol: Symbol): void { + function checkNestedBlockScopedBinding(node: Identifier, symbol: Symbol): void { if (languageVersion >= ScriptTarget.ES6 || (symbol.flags & (SymbolFlags.BlockScopedVariable | SymbolFlags.Class)) === 0 || symbol.valueDeclaration.parent.kind === SyntaxKind.CatchClause) { @@ -6996,40 +6996,31 @@ namespace ts { // 2. walk from the declaration up to the boundary of lexical environment and check // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement) - let container: Node; - if (symbol.flags & SymbolFlags.Class) { - // get parent of class declaration - container = getClassLikeDeclarationOfSymbol(symbol).parent; - } - else { - // nesting structure: - // (variable declaration or binding element) -> variable declaration list -> container - container = symbol.valueDeclaration; - while (container.kind !== SyntaxKind.VariableDeclarationList) { - container = container.parent; - } - // get the parent of variable declaration list - container = container.parent; - if (container.kind === SyntaxKind.VariableStatement) { - // if parent is variable statement - get its parent - container = container.parent; - } - } - - const inFunction = isInsideFunction(node.parent, container); - + const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration); + const usedInFunction = isInsideFunction(node.parent, container); let current = container; + + let containedInIterationStatement = false; while (current && !nodeStartsNewLexicalEnvironment(current)) { if (isIterationStatement(current, /*lookInLabeledStatements*/ false)) { - if (inFunction) { - getNodeLinks(current).flags |= NodeCheckFlags.LoopWithBlockScopedBindingCapturedInFunction; - } - // mark value declaration so during emit they can have a special handling - getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.BlockScopedBindingInLoop; + containedInIterationStatement = true; break; } current = current.parent; } + + if (containedInIterationStatement) { + if (usedInFunction) { + // mark iteration statement as containing block-scoped binding captured in some function + getNodeLinks(current).flags |= NodeCheckFlags.LoopWithCapturedBlockScopedBinding; + } + // set 'declared inside loop' bit on the block-scoped binding + getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.BlockScopedBindingInLoop; + } + + if (usedInFunction) { + getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.CapturedBlockScopedBinding; + } } function captureLexicalThis(node: Node, container: Node): void { @@ -15385,42 +15376,61 @@ namespace ts { return symbol && symbol.flags & SymbolFlags.Alias ? getDeclarationOfAliasSymbol(symbol) : undefined; } - function isStatementWithLocals(node: Node) { - switch (node.kind) { - case SyntaxKind.Block: - case SyntaxKind.CaseBlock: - case SyntaxKind.ForStatement: - case SyntaxKind.ForInStatement: - case SyntaxKind.ForOfStatement: - return true; - } - return false; - } - - function isNestedRedeclarationSymbol(symbol: Symbol): boolean { + function isSymbolOfDeclarationWithCollidingName(symbol: Symbol): boolean { if (symbol.flags & SymbolFlags.BlockScoped) { const links = getSymbolLinks(symbol); - if (links.isNestedRedeclaration === undefined) { + if (links.isDeclaratonWithCollidingName === undefined) { const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration); - links.isNestedRedeclaration = isStatementWithLocals(container) && - !!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined); + if (isStatementWithLocals(container)) { + const nodeLinks = getNodeLinks(symbol.valueDeclaration); + if (!!resolveName(container.parent, symbol.name, SymbolFlags.Value, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) { + // redeclaration - always should be renamed + links.isDeclaratonWithCollidingName = true; + } + else if (nodeLinks.flags & NodeCheckFlags.CapturedBlockScopedBinding) { + // binding is captured in the function + // should be renamed if: + // - binding is not top level - top level bindings never collide with anything + // AND + // - binding is not declared in loop, should be renamed to avoid name reuse across siblings + // let a, b + // { let x = 1; a = () => x; } + // { let x = 100; b = () => x; } + // console.log(a()); // should print '1' + // console.log(b()); // should print '100' + // OR + // - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body + // * variables from initializer are passed to rewritted loop body as parameters so they are not captured directly + // * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus + // they will not collide with anything + const isDeclaredInLoop = nodeLinks.flags & NodeCheckFlags.BlockScopedBindingInLoop; + const inLoopInitializer = isIterationStatement(container, /*lookInLabeledStatements*/ false); + const inLoopBodyBlock = container.kind === SyntaxKind.Block && isIterationStatement(container.parent, /*lookInLabeledStatements*/ false); + + links.isDeclaratonWithCollidingName = !isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock)); + } + else { + links.isDeclaratonWithCollidingName = false; + } + } } - return links.isNestedRedeclaration; + return links.isDeclaratonWithCollidingName; } return false; } // When resolved as an expression identifier, if the given node references a nested block scoped entity with - // a name that hides an existing name, return the declaration of that entity. Otherwise, return undefined. - function getReferencedNestedRedeclaration(node: Identifier): Declaration { + // a name that either hides an existing name or might hide it when compiled downlevel, + // return the declaration of that entity. Otherwise, return undefined. + function getReferencedDeclarationWithCollidingName(node: Identifier): Declaration { const symbol = getReferencedValueSymbol(node); - return symbol && isNestedRedeclarationSymbol(symbol) ? symbol.valueDeclaration : undefined; + return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined; } - // Return true if the given node is a declaration of a nested block scoped entity with a name that hides an - // existing name. - function isNestedRedeclaration(node: Declaration): boolean { - return isNestedRedeclarationSymbol(getSymbolOfNode(node)); + // Return true if the given node is a declaration of a nested block scoped entity with a name that either hides an + // existing name or might hide a name when compiled downlevel + function isDeclarationWithCollidingName(node: Declaration): boolean { + return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node)); } function isValueAliasDeclaration(node: Node): boolean { @@ -15621,8 +15631,8 @@ namespace ts { return { getReferencedExportContainer, getReferencedImportDeclaration, - getReferencedNestedRedeclaration, - isNestedRedeclaration, + getReferencedDeclarationWithCollidingName, + isDeclarationWithCollidingName, isValueAliasDeclaration, hasGlobalName, isReferencedAliasDeclaration, diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 05983f72dcb..e50e38a65eb 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1535,7 +1535,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } if (languageVersion !== ScriptTarget.ES6) { - const declaration = resolver.getReferencedNestedRedeclaration(node); + const declaration = resolver.getReferencedDeclarationWithCollidingName(node); if (declaration) { write(getGeneratedNameForNode(declaration.name)); return; @@ -1551,7 +1551,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } } - function isNameOfNestedRedeclaration(node: Identifier) { + function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node: Identifier) { if (languageVersion < ScriptTarget.ES6) { const parent = node.parent; switch (parent.kind) { @@ -1559,7 +1559,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge case SyntaxKind.ClassDeclaration: case SyntaxKind.EnumDeclaration: case SyntaxKind.VariableDeclaration: - return (parent).name === node && resolver.isNestedRedeclaration(parent); + return (parent).name === node && resolver.isDeclarationWithCollidingName(parent); } } return false; @@ -1581,7 +1581,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge else if (isExpressionIdentifier(node)) { emitExpressionIdentifier(node); } - else if (isNameOfNestedRedeclaration(node)) { + else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) { write(getGeneratedNameForNode(node)); } else if (nodeIsSynthesized(node)) { @@ -2855,7 +2855,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge function shouldConvertLoopBody(node: IterationStatement): boolean { return languageVersion < ScriptTarget.ES6 && - (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LoopWithBlockScopedBindingCapturedInFunction) !== 0; + (resolver.getNodeCheckFlags(node) & NodeCheckFlags.LoopWithCapturedBlockScopedBinding) !== 0; } function emitLoop(node: IterationStatement, loopEmitter: (n: IterationStatement, convertedLoop: ConvertedLoop) => void): void { @@ -3009,7 +3009,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge function collectNames(name: Identifier | BindingPattern): void { if (name.kind === SyntaxKind.Identifier) { - const nameText = isNameOfNestedRedeclaration(name) ? getGeneratedNameForNode(name) : (name).text; + const nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name) ? getGeneratedNameForNode(name) : (name).text; loopParameters.push(nameText); } else { @@ -4025,22 +4025,56 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else { let initializer = node.initializer; - if (!initializer && languageVersion < ScriptTarget.ES6) { + if (!initializer && + languageVersion < ScriptTarget.ES6 && + // for names - binding patterns that lack initializer there is no point to emit explicit initializer + // since downlevel codegen for destructuring will fail in the absence of initializer so all binding elements will say uninitialized + node.name.kind === SyntaxKind.Identifier) { - // downlevel emit for non-initialized let bindings defined in loops - // for (...) { let x; } - // should be - // for (...) { var = void 0; } - // this is necessary to preserve ES6 semantic in scenarios like - // for (...) { let x; console.log(x); x = 1 } // assignment on one iteration should not affect other iterations - const isLetDefinedInLoop = - (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BlockScopedBindingInLoop) && - (getCombinedFlagsForIdentifier(node.name) & NodeFlags.Let); + const container = getEnclosingBlockScopeContainer(node); + const flags = resolver.getNodeCheckFlags(node); - // NOTE: default initialization should not be added to let bindings in for-in\for-of statements - if (isLetDefinedInLoop && - node.parent.parent.kind !== SyntaxKind.ForInStatement && - node.parent.parent.kind !== SyntaxKind.ForOfStatement) { + // nested let bindings might need to be initialized explicitly to preserve ES6 semantic + // { let x = 1; } + // { let x; } // x here should be undefined. not 1 + // NOTES: + // Top level bindings never collide with anything and thus don't require explicit initialization. + // As for nested let bindings there are two cases: + // - nested let bindings that were not renamed definitely should be initialized explicitly + // { let x = 1; } + // { let x; if (some-condition) { x = 1}; if (x) { /*1*/ } } + // Without explicit initialization code in /*1*/ can be executed even if some-condition is evaluated to false + // - renaming introduces fresh name that should not collide with any existing names, however renamed bindings sometimes also should be + // explicitly initialized. One particular case: non-captured binding declared inside loop body (but not in loop initializer) + // let x; + // for (;;) { + // let x; + // } + // in downlevel codegen inner 'x' will be renamed so it won't collide with outer 'x' however it will should be reset on every iteration + // as if it was declared anew. + // * Why non-captured binding - because if loop contains block scoped binding captured in some function then loop body will be rewritten + // to have a fresh scope on every iteration so everything will just work. + // * Why loop initializer is excluded - since we've introduced a fresh name it already will be undefined. + const isCapturedInFunction = flags & NodeCheckFlags.CapturedBlockScopedBinding; + const isDeclaredInLoop = flags & NodeCheckFlags.BlockScopedBindingInLoop; + + const emittedAsTopLevel = + isBlockScopedContainerTopLevel(container) || + (isCapturedInFunction && isDeclaredInLoop && container.kind === SyntaxKind.Block && isIterationStatement(container.parent, /*lookInLabeledStatements*/ false)); + + const emittedAsNestedLetDeclaration = + getCombinedNodeFlags(node) & NodeFlags.Let && + !emittedAsTopLevel; + + const emitExplicitInitializer = + emittedAsNestedLetDeclaration && + container.kind !== SyntaxKind.ForInStatement && + container.kind !== SyntaxKind.ForOfStatement && + ( + !resolver.isDeclarationWithCollidingName(node) || + (isDeclaredInLoop && !isCapturedInFunction && !isIterationStatement(container, /*lookInLabeledStatements*/ false)) + ); + if (emitExplicitInitializer) { initializer = createVoidZero(); } } @@ -4075,14 +4109,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } } - function getCombinedFlagsForIdentifier(node: Identifier): NodeFlags { - if (!node.parent || (node.parent.kind !== SyntaxKind.VariableDeclaration && node.parent.kind !== SyntaxKind.BindingElement)) { - return 0; - } - - return getCombinedNodeFlags(node.parent); - } - function isES6ExportedDeclaration(node: Node) { return !!(node.flags & NodeFlags.Export) && modulekind === ModuleKind.ES6 && diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 74c1af6ae52..38565b5bcc4 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1893,8 +1893,8 @@ namespace ts { hasGlobalName(name: string): boolean; getReferencedExportContainer(node: Identifier): SourceFile | ModuleDeclaration | EnumDeclaration; getReferencedImportDeclaration(node: Identifier): Declaration; - getReferencedNestedRedeclaration(node: Identifier): Declaration; - isNestedRedeclaration(node: Declaration): boolean; + getReferencedDeclarationWithCollidingName(node: Identifier): Declaration; + isDeclarationWithCollidingName(node: Declaration): boolean; isValueAliasDeclaration(node: Node): boolean; isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; @@ -2030,7 +2030,7 @@ namespace ts { containingType?: UnionOrIntersectionType; // Containing union or intersection type for synthetic property resolvedExports?: SymbolTable; // Resolved exports of module exportsChecked?: boolean; // True if exports of external module have been checked - isNestedRedeclaration?: boolean; // True if symbol is block scoped redeclaration + isDeclaratonWithCollidingName?: boolean; // True if symbol is block scoped redeclaration bindingElement?: BindingElement; // Binding element associated with property symbol exportsSomeValue?: boolean; // true if module exports some value (not just types) } @@ -2060,9 +2060,10 @@ namespace ts { // Values for enum members have been computed, and any errors have been reported for them. EnumValuesComputed = 0x00002000, - BlockScopedBindingInLoop = 0x00004000, - LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. - LoopWithBlockScopedBindingCapturedInFunction = 0x00010000, // Loop that contains block scoped variable captured in closure + LexicalModuleMergesWithClass = 0x00004000, // Instantiated lexical module declaration is merged with a previous class declaration. + LoopWithCapturedBlockScopedBinding = 0x00008000, // Loop that contains block scoped variable captured in closure + CapturedBlockScopedBinding = 0x00010000, // Block-scoped binding that is captured in some function + BlockScopedBindingInLoop = 0x00020000, // Block-scoped binding with declaration nested inside iteration statement } /* @internal */ diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 69941a6095d..f8091a001e9 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -151,6 +151,18 @@ namespace ts { return node; } + export function isStatementWithLocals(node: Node) { + switch (node.kind) { + case SyntaxKind.Block: + case SyntaxKind.CaseBlock: + case SyntaxKind.ForStatement: + case SyntaxKind.ForInStatement: + case SyntaxKind.ForOfStatement: + return true; + } + return false; + } + export function getStartPositionOfLine(line: number, sourceFile: SourceFile): number { Debug.assert(line >= 0); return getLineStarts(sourceFile)[line]; @@ -256,6 +268,13 @@ namespace ts { ((node).name.kind === SyntaxKind.StringLiteral || isGlobalScopeAugmentation(node)); } + export function isBlockScopedContainerTopLevel(node: Node): boolean { + return node.kind === SyntaxKind.SourceFile || + node.kind === SyntaxKind.ModuleDeclaration || + isFunctionLike(node) || + isFunctionBlock(node); + } + export function isGlobalScopeAugmentation(module: ModuleDeclaration): boolean { return !!(module.flags & NodeFlags.GlobalAugmentation); } diff --git a/tests/baselines/reference/capturedLetConstInLoop1.js b/tests/baselines/reference/capturedLetConstInLoop1.js index 633b78af510..fe76bdd5c91 100644 --- a/tests/baselines/reference/capturedLetConstInLoop1.js +++ b/tests/baselines/reference/capturedLetConstInLoop1.js @@ -138,7 +138,7 @@ for (var x = 0; x < 1; ++x) { _loop_3(x); } var _loop_4 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); }; @@ -146,7 +146,7 @@ while (1 === 1) { _loop_4(); } var _loop_5 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); }; @@ -169,7 +169,7 @@ for (var x = 0, y = 1; x < 1; ++x) { _loop_7(x, y); } var _loop_8 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); }; @@ -177,7 +177,7 @@ while (1 === 1) { _loop_8(); } var _loop_9 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); }; diff --git a/tests/baselines/reference/capturedLetConstInLoop2.js b/tests/baselines/reference/capturedLetConstInLoop2.js index b9fbcf46f57..b41dd380a24 100644 --- a/tests/baselines/reference/capturedLetConstInLoop2.js +++ b/tests/baselines/reference/capturedLetConstInLoop2.js @@ -225,7 +225,7 @@ function foo2(x) { } function foo3(x) { var _loop_5 = function() { - var x_4 = void 0; + var x_4; var a = arguments_5.length; (function () { return x_4 + a; }); (function () { return x_4 + a; }); @@ -260,7 +260,7 @@ function foo5(x) { } function foo6(x) { var _loop_8 = function() { - var x_7 = void 0, y = void 0; + var x_7, y; var a = arguments_8.length; (function () { return x_7 + y + a; }); (function () { return x_7 + y + a; }); @@ -272,7 +272,7 @@ function foo6(x) { } function foo7(x) { var _loop_9 = function() { - var x_8 = void 0, y = void 0; + var x_8, y; var a = arguments_9.length; (function () { return x_8 + y + a; }); (function () { return x_8 + y + a; }); diff --git a/tests/baselines/reference/capturedLetConstInLoop3.js b/tests/baselines/reference/capturedLetConstInLoop3.js index b38c12967dd..233dfe9206c 100644 --- a/tests/baselines/reference/capturedLetConstInLoop3.js +++ b/tests/baselines/reference/capturedLetConstInLoop3.js @@ -270,7 +270,7 @@ function foo2(x) { } function foo3(x) { var _loop_5 = function() { - var x_5 = void 0; + var x_5; (function () { return x_5 + v; }); (function () { return x_5 + v; }); }; @@ -307,7 +307,7 @@ function foo5(x) { } function foo6(x) { var _loop_8 = function() { - var x_8 = void 0, y = void 0; + var x_8, y; v = x_8; (function () { return x_8 + y + v; }); (function () { return x_8 + y + v; }); @@ -320,7 +320,7 @@ function foo6(x) { } function foo7(x) { var _loop_9 = function() { - var x_9 = void 0, y = void 0; + var x_9, y; v = x_9; (function () { return x_9 + y + v; }); (function () { return x_9 + y + v; }); diff --git a/tests/baselines/reference/capturedLetConstInLoop4.js b/tests/baselines/reference/capturedLetConstInLoop4.js index 724c84fe04f..160be3ccaef 100644 --- a/tests/baselines/reference/capturedLetConstInLoop4.js +++ b/tests/baselines/reference/capturedLetConstInLoop4.js @@ -186,7 +186,7 @@ System.register([], function(exports_1) { _loop_3(x); } var _loop_4 = function() { - var x = void 0; + var x; v2 = x; (function () { return x + v2; }); (function () { return x; }); @@ -195,7 +195,7 @@ System.register([], function(exports_1) { _loop_4(); } var _loop_5 = function() { - var x = void 0; + var x; v3 = x; (function () { return x + v3; }); (function () { return x; }); @@ -221,7 +221,7 @@ System.register([], function(exports_1) { _loop_7(x, y); } var _loop_8 = function() { - var x = void 0, y = void 0; + var x, y; v6 = x; (function () { return x + y + v6; }); (function () { return x + y; }); @@ -230,7 +230,7 @@ System.register([], function(exports_1) { _loop_8(); } var _loop_9 = function() { - var x = void 0, y = void 0; + var x, y; v7 = x; (function () { return x + y + v7; }); (function () { return x + y; }); diff --git a/tests/baselines/reference/capturedLetConstInLoop5.js b/tests/baselines/reference/capturedLetConstInLoop5.js index b73484cb430..7807edd122e 100644 --- a/tests/baselines/reference/capturedLetConstInLoop5.js +++ b/tests/baselines/reference/capturedLetConstInLoop5.js @@ -349,7 +349,7 @@ function foo2(x) { } function foo3(x) { var _loop_5 = function() { - var x_5 = void 0; + var x_5; (function () { return x_5 + v; }); (function () { return x_5 + v; }); if (x_5 == 1) { @@ -398,7 +398,7 @@ function foo5(x) { } function foo6(x) { var _loop_8 = function() { - var x_8 = void 0, y = void 0; + var x_8, y; v = x_8; (function () { return x_8 + y + v; }); (function () { return x_8 + y + v; }); @@ -416,7 +416,7 @@ function foo6(x) { } function foo7(x) { var _loop_9 = function() { - var x_9 = void 0, y = void 0; + var x_9, y; v = x_9; (function () { return x_9 + y + v; }); (function () { return x_9 + y + v; }); diff --git a/tests/baselines/reference/capturedLetConstInLoop6.js b/tests/baselines/reference/capturedLetConstInLoop6.js index ca3b634ef18..e196950e696 100644 --- a/tests/baselines/reference/capturedLetConstInLoop6.js +++ b/tests/baselines/reference/capturedLetConstInLoop6.js @@ -287,7 +287,7 @@ for (var x = 0; x < 1; ++x) { if (state_3 === "continue") continue; } var _loop_4 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); if (x == 1) { @@ -303,7 +303,7 @@ while (1 === 1) { if (state_4 === "continue") continue; } var _loop_5 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); if (x == 1) { @@ -350,7 +350,7 @@ for (var x = 0, y = 1; x < 1; ++x) { if (state_7 === "continue") continue; } var _loop_8 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); if (x == 1) { @@ -366,7 +366,7 @@ while (1 === 1) { if (state_8 === "continue") continue; } var _loop_9 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); if (x == 1) { diff --git a/tests/baselines/reference/capturedLetConstInLoop7.js b/tests/baselines/reference/capturedLetConstInLoop7.js index 6ec4ec1df44..8df93bca60f 100644 --- a/tests/baselines/reference/capturedLetConstInLoop7.js +++ b/tests/baselines/reference/capturedLetConstInLoop7.js @@ -454,7 +454,7 @@ l1: for (var x = 0; x < 1; ++x) { } } var _loop_4 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); if (x == 1) { @@ -480,7 +480,7 @@ l2: while (1 === 1) { } } var _loop_5 = function() { - var x = void 0; + var x; (function () { return x; }); (function () { return x; }); if (x == 1) { @@ -557,7 +557,7 @@ l5: for (var x = 0, y = 1; x < 1; ++x) { } } var _loop_8 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); if (x == 1) { @@ -583,7 +583,7 @@ l6: while (1 === 1) { } } var _loop_9 = function() { - var x = void 0, y = void 0; + var x, y; (function () { return x + y; }); (function () { return x + y; }); if (x == 1) { diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js index 9b31218a1e3..cbd4f7efe79 100644 --- a/tests/baselines/reference/capturedLetConstInLoop9.js +++ b/tests/baselines/reference/capturedLetConstInLoop9.js @@ -140,25 +140,25 @@ function foo3 () { //// [capturedLetConstInLoop9.js] var _loop_1 = function(x) { - var x_1 = void 0; + var x_1; (function () { return x_1; }); { - var x_2 = void 0; + var x_2; (function () { return x_2; }); } try { } catch (e) { - var x_3 = void 0; + var x_3; (function () { return x_3; }); } switch (x_1) { case 1: - var x_4 = void 0; + var x_4; (function () { return x_4; }); break; } var _loop_2 = function() { - var x_5 = void 0; + var x_5; (function () { return x_5; }); }; while (1 == 1) { diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js index 4b9d4c438fc..edc778209be 100644 --- a/tests/baselines/reference/downlevelLetConst16.js +++ b/tests/baselines/reference/downlevelLetConst16.js @@ -367,7 +367,7 @@ var M4; use(z); })(M4 || (M4 = {})); function foo3() { - for (var x_7 = void 0;;) { + for (var x_7;;) { use(x_7); } for (var y_7 = [][0];;) { diff --git a/tests/baselines/reference/downlevelLetConst17.js b/tests/baselines/reference/downlevelLetConst17.js index 56ab1e6df54..49212b267f0 100644 --- a/tests/baselines/reference/downlevelLetConst17.js +++ b/tests/baselines/reference/downlevelLetConst17.js @@ -86,7 +86,7 @@ for (;;) { var x_4 = 10; use(x_4); } -for (var x_5 = void 0;;) { +for (var x_5;;) { use(x_5); x_5 = 1; } diff --git a/tests/baselines/reference/nestedBlockScopedBindings1.js b/tests/baselines/reference/nestedBlockScopedBindings1.js new file mode 100644 index 00000000000..ea2745c472e --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings1.js @@ -0,0 +1,97 @@ +//// [nestedBlockScopedBindings1.ts] +function a0() { + { + let x = 1; + } + { + let x = 1; + } +} + +function a1() { + { + let x; + } + { + let x = 1; + } +} + +function a2() { + { + let x = 1; + } + { + let x; + } +} + +function a3() { + { + let x = 1; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a4() { + { + let x; + } + switch (1) { + case 1: + let x = 1; + break; + } +} + + +//// [nestedBlockScopedBindings1.js] +function a0() { + { + var x = 1; + } + { + var x = 1; + } +} +function a1() { + { + var x = void 0; + } + { + var x = 1; + } +} +function a2() { + { + var x = 1; + } + { + var x = void 0; + } +} +function a3() { + { + var x = 1; + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a4() { + { + var x = void 0; + } + switch (1) { + case 1: + var x = 1; + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings1.symbols b/tests/baselines/reference/nestedBlockScopedBindings1.symbols new file mode 100644 index 00000000000..80348a13911 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings1.symbols @@ -0,0 +1,68 @@ +=== tests/cases/compiler/nestedBlockScopedBindings1.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings1.ts, 0, 0)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 2, 11)) + } + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 5, 11)) + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings1.ts, 7, 1)) + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 11, 11)) + } + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 14, 11)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings1.ts, 16, 1)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 20, 11)) + } + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 23, 11)) + } +} + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings1.ts, 25, 1)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 29, 11)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 33, 15)) + + break; + } +} + + +function a4() { +>a4 : Symbol(a4, Decl(nestedBlockScopedBindings1.ts, 36, 1)) + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 41, 11)) + } + switch (1) { + case 1: + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings1.ts, 45, 15)) + + break; + } +} + diff --git a/tests/baselines/reference/nestedBlockScopedBindings1.types b/tests/baselines/reference/nestedBlockScopedBindings1.types new file mode 100644 index 00000000000..6d5b47a348b --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings1.types @@ -0,0 +1,82 @@ +=== tests/cases/compiler/nestedBlockScopedBindings1.ts === +function a0() { +>a0 : () => void + { + let x = 1; +>x : number +>1 : number + } + { + let x = 1; +>x : number +>1 : number + } +} + +function a1() { +>a1 : () => void + { + let x; +>x : any + } + { + let x = 1; +>x : number +>1 : number + } +} + +function a2() { +>a2 : () => void + { + let x = 1; +>x : number +>1 : number + } + { + let x; +>x : any + } +} + +function a3() { +>a3 : () => void + { + let x = 1; +>x : number +>1 : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + + +function a4() { +>a4 : () => void + { + let x; +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x = 1; +>x : number +>1 : number + + break; + } +} + diff --git a/tests/baselines/reference/nestedBlockScopedBindings10.js b/tests/baselines/reference/nestedBlockScopedBindings10.js new file mode 100644 index 00000000000..4cac5bceeeb --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings10.js @@ -0,0 +1,24 @@ +//// [nestedBlockScopedBindings10.ts] +{ + let x; + x = 1; +} + +switch (1) { + case 1: + let y; + y = 1; + break; +} + +//// [nestedBlockScopedBindings10.js] +{ + var x = void 0; + x = 1; +} +switch (1) { + case 1: + var y = void 0; + y = 1; + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings10.symbols b/tests/baselines/reference/nestedBlockScopedBindings10.symbols new file mode 100644 index 00000000000..a569e1b1f92 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings10.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/nestedBlockScopedBindings10.ts === +{ + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings10.ts, 1, 7)) + + x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings10.ts, 1, 7)) +} + +switch (1) { + case 1: + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings10.ts, 7, 11)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings10.ts, 7, 11)) + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings10.types b/tests/baselines/reference/nestedBlockScopedBindings10.types new file mode 100644 index 00000000000..ee2701cdcf1 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings10.types @@ -0,0 +1,27 @@ +=== tests/cases/compiler/nestedBlockScopedBindings10.ts === +{ + let x; +>x : any + + x = 1; +>x = 1 : number +>x : any +>1 : number +} + +switch (1) { +>1 : number + + case 1: +>1 : number + + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings11.js b/tests/baselines/reference/nestedBlockScopedBindings11.js new file mode 100644 index 00000000000..23a536bcbb1 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings11.js @@ -0,0 +1,28 @@ +//// [nestedBlockScopedBindings11.ts] +var x; +{ + let x; + () => x; +} + +var y; +switch (1) { + case 1: + let y; + () => y; + break; +} + +//// [nestedBlockScopedBindings11.js] +var x; +{ + var x_1; + (function () { return x_1; }); +} +var y; +switch (1) { + case 1: + var y_1; + (function () { return y_1; }); + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings11.symbols b/tests/baselines/reference/nestedBlockScopedBindings11.symbols new file mode 100644 index 00000000000..fb3886fedee --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings11.symbols @@ -0,0 +1,24 @@ +=== tests/cases/compiler/nestedBlockScopedBindings11.ts === +var x; +>x : Symbol(x, Decl(nestedBlockScopedBindings11.ts, 0, 3)) +{ + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings11.ts, 2, 7)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings11.ts, 2, 7)) +} + +var y; +>y : Symbol(y, Decl(nestedBlockScopedBindings11.ts, 6, 3)) + +switch (1) { + case 1: + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings11.ts, 9, 11)) + + () => y; +>y : Symbol(y, Decl(nestedBlockScopedBindings11.ts, 9, 11)) + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings11.types b/tests/baselines/reference/nestedBlockScopedBindings11.types new file mode 100644 index 00000000000..ab7b4228278 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings11.types @@ -0,0 +1,30 @@ +=== tests/cases/compiler/nestedBlockScopedBindings11.ts === +var x; +>x : any +{ + let x; +>x : any + + () => x; +>() => x : () => any +>x : any +} + +var y; +>y : any + +switch (1) { +>1 : number + + case 1: +>1 : number + + let y; +>y : any + + () => y; +>() => y : () => any +>y : any + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings12.js b/tests/baselines/reference/nestedBlockScopedBindings12.js new file mode 100644 index 00000000000..0b3e323a263 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings12.js @@ -0,0 +1,28 @@ +//// [nestedBlockScopedBindings12.ts] +var x; +{ + let x; + x = 1; +} + +var y; +switch (1) { + case 1: + let y; + y = 1; + break; +} + +//// [nestedBlockScopedBindings12.js] +var x; +{ + var x_1; + x_1 = 1; +} +var y; +switch (1) { + case 1: + var y_1; + y_1 = 1; + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings12.symbols b/tests/baselines/reference/nestedBlockScopedBindings12.symbols new file mode 100644 index 00000000000..bff0293e45f --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings12.symbols @@ -0,0 +1,24 @@ +=== tests/cases/compiler/nestedBlockScopedBindings12.ts === +var x; +>x : Symbol(x, Decl(nestedBlockScopedBindings12.ts, 0, 3)) +{ + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings12.ts, 2, 7)) + + x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings12.ts, 2, 7)) +} + +var y; +>y : Symbol(y, Decl(nestedBlockScopedBindings12.ts, 6, 3)) + +switch (1) { + case 1: + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings12.ts, 9, 11)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings12.ts, 9, 11)) + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings12.types b/tests/baselines/reference/nestedBlockScopedBindings12.types new file mode 100644 index 00000000000..8c1fdda0ce0 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings12.types @@ -0,0 +1,32 @@ +=== tests/cases/compiler/nestedBlockScopedBindings12.ts === +var x; +>x : any +{ + let x; +>x : any + + x = 1; +>x = 1 : number +>x : any +>1 : number +} + +var y; +>y : any + +switch (1) { +>1 : number + + case 1: +>1 : number + + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings13.js b/tests/baselines/reference/nestedBlockScopedBindings13.js new file mode 100644 index 00000000000..86e5635df68 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings13.js @@ -0,0 +1,23 @@ +//// [nestedBlockScopedBindings13.ts] +for (; false;) { + let x; + () => x; +} + +for (; false;) { + let y; + y = 1; +} + +//// [nestedBlockScopedBindings13.js] +var _loop_1 = function() { + var x; + (function () { return x; }); +}; +for (; false;) { + _loop_1(); +} +for (; false;) { + var y = void 0; + y = 1; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings13.symbols b/tests/baselines/reference/nestedBlockScopedBindings13.symbols new file mode 100644 index 00000000000..a5bc7ed7866 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings13.symbols @@ -0,0 +1,16 @@ +=== tests/cases/compiler/nestedBlockScopedBindings13.ts === +for (; false;) { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings13.ts, 1, 7)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings13.ts, 1, 7)) +} + +for (; false;) { + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings13.ts, 6, 7)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings13.ts, 6, 7)) +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings13.types b/tests/baselines/reference/nestedBlockScopedBindings13.types new file mode 100644 index 00000000000..2e7bc7de77e --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings13.types @@ -0,0 +1,23 @@ +=== tests/cases/compiler/nestedBlockScopedBindings13.ts === +for (; false;) { +>false : boolean + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any +} + +for (; false;) { +>false : boolean + + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings14.js b/tests/baselines/reference/nestedBlockScopedBindings14.js new file mode 100644 index 00000000000..1180f587420 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings14.js @@ -0,0 +1,27 @@ +//// [nestedBlockScopedBindings14.ts] +var x; +for (; false;) { + let x; + () => x; +} + +var y; +for (; false;) { + let y; + y = 1; +} + +//// [nestedBlockScopedBindings14.js] +var x; +var _loop_1 = function() { + var x_1; + (function () { return x_1; }); +}; +for (; false;) { + _loop_1(); +} +var y; +for (; false;) { + var y_1 = void 0; + y_1 = 1; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings14.symbols b/tests/baselines/reference/nestedBlockScopedBindings14.symbols new file mode 100644 index 00000000000..4a13b296e88 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings14.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/nestedBlockScopedBindings14.ts === +var x; +>x : Symbol(x, Decl(nestedBlockScopedBindings14.ts, 0, 3)) + +for (; false;) { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings14.ts, 2, 7)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings14.ts, 2, 7)) +} + +var y; +>y : Symbol(y, Decl(nestedBlockScopedBindings14.ts, 6, 3)) + +for (; false;) { + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings14.ts, 8, 7)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings14.ts, 8, 7)) +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings14.types b/tests/baselines/reference/nestedBlockScopedBindings14.types new file mode 100644 index 00000000000..966eaaaac7a --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings14.types @@ -0,0 +1,29 @@ +=== tests/cases/compiler/nestedBlockScopedBindings14.ts === +var x; +>x : any + +for (; false;) { +>false : boolean + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any +} + +var y; +>y : any + +for (; false;) { +>false : boolean + + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings15.js b/tests/baselines/reference/nestedBlockScopedBindings15.js new file mode 100644 index 00000000000..8e294de98e4 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings15.js @@ -0,0 +1,68 @@ +//// [nestedBlockScopedBindings15.ts] +for (; false;) { + { + let x; + () => x; + } +} + +for (; false;) { + { + let y; + y = 1; + } +} + +for (; false;) { + switch (1){ + case 1: + let z0; + () => z0; + break; + } +} + +for (; false;) { + switch (1){ + case 1: + let z; + z = 1; + break; + } +} + +//// [nestedBlockScopedBindings15.js] +var _loop_1 = function() { + { + var x_1; + (function () { return x_1; }); + } +}; +for (; false;) { + _loop_1(); +} +for (; false;) { + { + var y = void 0; + y = 1; + } +} +var _loop_2 = function() { + switch (1) { + case 1: + var z0_1; + (function () { return z0_1; }); + break; + } +}; +for (; false;) { + _loop_2(); +} +for (; false;) { + switch (1) { + case 1: + var z = void 0; + z = 1; + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings15.symbols b/tests/baselines/reference/nestedBlockScopedBindings15.symbols new file mode 100644 index 00000000000..26ef28f6050 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings15.symbols @@ -0,0 +1,46 @@ +=== tests/cases/compiler/nestedBlockScopedBindings15.ts === +for (; false;) { + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings15.ts, 2, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings15.ts, 2, 11)) + } +} + +for (; false;) { + { + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings15.ts, 9, 11)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings15.ts, 9, 11)) + } +} + +for (; false;) { + switch (1){ + case 1: + let z0; +>z0 : Symbol(z0, Decl(nestedBlockScopedBindings15.ts, 17, 15)) + + () => z0; +>z0 : Symbol(z0, Decl(nestedBlockScopedBindings15.ts, 17, 15)) + + break; + } +} + +for (; false;) { + switch (1){ + case 1: + let z; +>z : Symbol(z, Decl(nestedBlockScopedBindings15.ts, 26, 15)) + + z = 1; +>z : Symbol(z, Decl(nestedBlockScopedBindings15.ts, 26, 15)) + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings15.types b/tests/baselines/reference/nestedBlockScopedBindings15.types new file mode 100644 index 00000000000..5173c0c5600 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings15.types @@ -0,0 +1,66 @@ +=== tests/cases/compiler/nestedBlockScopedBindings15.ts === +for (; false;) { +>false : boolean + { + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + } +} + +for (; false;) { +>false : boolean + { + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number + } +} + +for (; false;) { +>false : boolean + + switch (1){ +>1 : number + + case 1: +>1 : number + + let z0; +>z0 : any + + () => z0; +>() => z0 : () => any +>z0 : any + + break; + } +} + +for (; false;) { +>false : boolean + + switch (1){ +>1 : number + + case 1: +>1 : number + + let z; +>z : any + + z = 1; +>z = 1 : number +>z : any +>1 : number + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings16.js b/tests/baselines/reference/nestedBlockScopedBindings16.js new file mode 100644 index 00000000000..91f67d0d8f2 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings16.js @@ -0,0 +1,76 @@ +//// [nestedBlockScopedBindings16.ts] +var x; +for (; false;) { + { + let x; + () => x; + } +} + +var y; +for (; false;) { + { + let y; + y = 1; + } +} + +var z0; +for (; false;) { + switch (1){ + case 1: + let z0; + () => z0; + break; + } +} + +var z; +for (; false;) { + switch (1){ + case 1: + let z; + z = 1; + break; + } +} + +//// [nestedBlockScopedBindings16.js] +var x; +var _loop_1 = function() { + { + var x_1; + (function () { return x_1; }); + } +}; +for (; false;) { + _loop_1(); +} +var y; +for (; false;) { + { + var y_1 = void 0; + y_1 = 1; + } +} +var z0; +var _loop_2 = function() { + switch (1) { + case 1: + var z0_1; + (function () { return z0_1; }); + break; + } +}; +for (; false;) { + _loop_2(); +} +var z; +for (; false;) { + switch (1) { + case 1: + var z_1 = void 0; + z_1 = 1; + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings16.symbols b/tests/baselines/reference/nestedBlockScopedBindings16.symbols new file mode 100644 index 00000000000..cbe8114cf14 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings16.symbols @@ -0,0 +1,58 @@ +=== tests/cases/compiler/nestedBlockScopedBindings16.ts === +var x; +>x : Symbol(x, Decl(nestedBlockScopedBindings16.ts, 0, 3)) + +for (; false;) { + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings16.ts, 3, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings16.ts, 3, 11)) + } +} + +var y; +>y : Symbol(y, Decl(nestedBlockScopedBindings16.ts, 8, 3)) + +for (; false;) { + { + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings16.ts, 11, 11)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings16.ts, 11, 11)) + } +} + +var z0; +>z0 : Symbol(z0, Decl(nestedBlockScopedBindings16.ts, 16, 3)) + +for (; false;) { + switch (1){ + case 1: + let z0; +>z0 : Symbol(z0, Decl(nestedBlockScopedBindings16.ts, 20, 15)) + + () => z0; +>z0 : Symbol(z0, Decl(nestedBlockScopedBindings16.ts, 20, 15)) + + break; + } +} + +var z; +>z : Symbol(z, Decl(nestedBlockScopedBindings16.ts, 26, 3)) + +for (; false;) { + switch (1){ + case 1: + let z; +>z : Symbol(z, Decl(nestedBlockScopedBindings16.ts, 30, 15)) + + z = 1; +>z : Symbol(z, Decl(nestedBlockScopedBindings16.ts, 30, 15)) + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings16.types b/tests/baselines/reference/nestedBlockScopedBindings16.types new file mode 100644 index 00000000000..22698402a62 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings16.types @@ -0,0 +1,78 @@ +=== tests/cases/compiler/nestedBlockScopedBindings16.ts === +var x; +>x : any + +for (; false;) { +>false : boolean + { + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + } +} + +var y; +>y : any + +for (; false;) { +>false : boolean + { + let y; +>y : any + + y = 1; +>y = 1 : number +>y : any +>1 : number + } +} + +var z0; +>z0 : any + +for (; false;) { +>false : boolean + + switch (1){ +>1 : number + + case 1: +>1 : number + + let z0; +>z0 : any + + () => z0; +>() => z0 : () => any +>z0 : any + + break; + } +} + +var z; +>z : any + +for (; false;) { +>false : boolean + + switch (1){ +>1 : number + + case 1: +>1 : number + + let z; +>z : any + + z = 1; +>z = 1 : number +>z : any +>1 : number + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings2.js b/tests/baselines/reference/nestedBlockScopedBindings2.js new file mode 100644 index 00000000000..f3a8d7f0f67 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings2.js @@ -0,0 +1,244 @@ +//// [nestedBlockScopedBindings2.ts] +function a0() { + { + let x = 1; + () => x; + } + { + let x = 1; + } +} + +function a1() { + { + let x; + } + { + let x = 1; + () => x; + } +} + +function a2() { + { + let x = 1; + () => x; + } + { + let x; + () => x; + } +} + + +function a3() { + { + let x = 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + + +function a4() { + { + let x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + + +function a5() { + { + let x; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a6() { + switch (1) { + case 1: + let x; + break; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a7() { + switch (1) { + case 1: + let x; + () => x; + break; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a8() { + switch (1) { + case 1: + let x; + break; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +function a9() { + switch (1) { + case 1: + let x; + () => x; + break; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + + +//// [nestedBlockScopedBindings2.js] +function a0() { + { + var x_1 = 1; + (function () { return x_1; }); + } + { + var x = 1; + } +} +function a1() { + { + var x = void 0; + } + { + var x_2 = 1; + (function () { return x_2; }); + } +} +function a2() { + { + var x_3 = 1; + (function () { return x_3; }); + } + { + var x_4; + (function () { return x_4; }); + } +} +function a3() { + { + var x_5 = 1; + (function () { return x_5; }); + } + switch (1) { + case 1: + var x_6; + (function () { return x_6; }); + break; + } +} +function a4() { + { + var x = void 0; + } + switch (1) { + case 1: + var x_7; + (function () { return x_7; }); + break; + } +} +function a5() { + { + var x_8; + (function () { return x_8; }); + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a6() { + switch (1) { + case 1: + var x = void 0; + break; + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a7() { + switch (1) { + case 1: + var x_9; + (function () { return x_9; }); + break; + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a8() { + switch (1) { + case 1: + var x = void 0; + break; + } + switch (1) { + case 1: + var x_10; + (function () { return x_10; }); + break; + } +} +function a9() { + switch (1) { + case 1: + var x_11; + (function () { return x_11; }); + break; + } + switch (1) { + case 1: + var x_12; + (function () { return x_12; }); + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings2.symbols b/tests/baselines/reference/nestedBlockScopedBindings2.symbols new file mode 100644 index 00000000000..e97e1539e95 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings2.symbols @@ -0,0 +1,197 @@ +=== tests/cases/compiler/nestedBlockScopedBindings2.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings2.ts, 0, 0)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 2, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 2, 11)) + } + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 6, 11)) + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings2.ts, 8, 1)) + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 12, 11)) + } + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 15, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 15, 11)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings2.ts, 18, 1)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 22, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 22, 11)) + } + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 26, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 26, 11)) + } +} + + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings2.ts, 29, 1)) + { + let x = 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 34, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 34, 11)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 39, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 39, 15)) + + break; + } +} + + +function a4() { +>a4 : Symbol(a4, Decl(nestedBlockScopedBindings2.ts, 43, 1)) + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 48, 11)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 52, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 52, 15)) + + break; + } +} + + +function a5() { +>a5 : Symbol(a5, Decl(nestedBlockScopedBindings2.ts, 56, 1)) + { + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 61, 11)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 61, 11)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 66, 15)) + + break; + } +} + +function a6() { +>a6 : Symbol(a6, Decl(nestedBlockScopedBindings2.ts, 69, 1)) + + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 74, 15)) + + break; + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 79, 15)) + + break; + } +} + +function a7() { +>a7 : Symbol(a7, Decl(nestedBlockScopedBindings2.ts, 82, 1)) + + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 87, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 87, 15)) + + break; + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 93, 15)) + + break; + } +} + +function a8() { +>a8 : Symbol(a8, Decl(nestedBlockScopedBindings2.ts, 96, 1)) + + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 101, 15)) + + break; + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 106, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 106, 15)) + + break; + } +} + +function a9() { +>a9 : Symbol(a9, Decl(nestedBlockScopedBindings2.ts, 110, 1)) + + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 115, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 115, 15)) + + break; + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 121, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings2.ts, 121, 15)) + + break; + } +} + diff --git a/tests/baselines/reference/nestedBlockScopedBindings2.types b/tests/baselines/reference/nestedBlockScopedBindings2.types new file mode 100644 index 00000000000..adb33b4dc76 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings2.types @@ -0,0 +1,258 @@ +=== tests/cases/compiler/nestedBlockScopedBindings2.ts === +function a0() { +>a0 : () => void + { + let x = 1; +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + { + let x = 1; +>x : number +>1 : number + } +} + +function a1() { +>a1 : () => void + { + let x; +>x : any + } + { + let x = 1; +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } +} + +function a2() { +>a2 : () => void + { + let x = 1; +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + { + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + } +} + + +function a3() { +>a3 : () => void + { + let x = 1; +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} + + +function a4() { +>a4 : () => void + { + let x; +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} + + +function a5() { +>a5 : () => void + { + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + +function a6() { +>a6 : () => void + + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + +function a7() { +>a7 : () => void + + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + +function a8() { +>a8 : () => void + + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} + +function a9() { +>a9 : () => void + + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} + diff --git a/tests/baselines/reference/nestedBlockScopedBindings3.js b/tests/baselines/reference/nestedBlockScopedBindings3.js new file mode 100644 index 00000000000..97fba2da301 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings3.js @@ -0,0 +1,150 @@ +//// [nestedBlockScopedBindings3.ts] +function a0() { + { + for (let x = 0; x < 1; ) { + () => x; + } + } + { + for (let x;;) { + () => x; + } + } +} + +function a1() { + for (let x; x < 1;) { + () => x; + } + for (let x;;) { + () => x; + } +} + +function a2() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + + +function a3() { + for (let x; x < 1;) { + x = x + 1; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a4() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a5() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +//// [nestedBlockScopedBindings3.js] +function a0() { + { + var _loop_1 = function(x) { + (function () { return x; }); + }; + for (var x = 0; x < 1;) { + _loop_1(x); + } + } + { + var _loop_2 = function(x) { + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_2(x); + } + } +} +function a1() { + var _loop_3 = function(x) { + (function () { return x; }); + }; + for (var x = void 0; x < 1;) { + _loop_3(x); + } + var _loop_4 = function(x) { + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_4(x); + } +} +function a2() { + for (var x = void 0; x < 1;) { + x = x + 1; + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a3() { + for (var x = void 0; x < 1;) { + x = x + 1; + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a4() { + var _loop_5 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x = void 0; x < 1;) { + _loop_5(x); + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a5() { + var _loop_6 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x = void 0; x < 1;) { + _loop_6(x); + } + switch (1) { + case 1: + var x_1; + (function () { return x_1; }); + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings3.symbols b/tests/baselines/reference/nestedBlockScopedBindings3.symbols new file mode 100644 index 00000000000..160f40a0472 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings3.symbols @@ -0,0 +1,130 @@ +=== tests/cases/compiler/nestedBlockScopedBindings3.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings3.ts, 0, 0)) + { + for (let x = 0; x < 1; ) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 2, 16)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 2, 16)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 2, 16)) + } + } + { + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 7, 16)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 7, 16)) + } + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings3.ts, 11, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 14, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 14, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 14, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 17, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 17, 12)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings3.ts, 20, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 23, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 23, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 23, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 23, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 26, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 26, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 26, 12)) + } +} + + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings3.ts, 29, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 33, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 33, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 33, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 33, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 38, 15)) + + break; + } +} + +function a4() { +>a4 : Symbol(a4, Decl(nestedBlockScopedBindings3.ts, 41, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 44, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 44, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 44, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 44, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 44, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 50, 15)) + + break; + } +} + + +function a5() { +>a5 : Symbol(a5, Decl(nestedBlockScopedBindings3.ts, 53, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 57, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 57, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 57, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 57, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 57, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 63, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings3.ts, 63, 15)) + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings3.types b/tests/baselines/reference/nestedBlockScopedBindings3.types new file mode 100644 index 00000000000..37b89242f3e --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings3.types @@ -0,0 +1,177 @@ +=== tests/cases/compiler/nestedBlockScopedBindings3.ts === +function a0() { +>a0 : () => void + { + for (let x = 0; x < 1; ) { +>x : number +>0 : number +>x < 1 : boolean +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + } + { + for (let x;;) { +>x : any + + () => x; +>() => x : () => any +>x : any + } + } +} + +function a1() { +>a1 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + () => x; +>() => x : () => any +>x : any + } + for (let x;;) { +>x : any + + () => x; +>() => x : () => any +>x : any + } +} + +function a2() { +>a2 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + + +function a3() { +>a3 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + +function a4() { +>a4 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + + () => x; +>() => x : () => any +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + + +function a5() { +>a5 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + + () => x; +>() => x : () => any +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.js b/tests/baselines/reference/nestedBlockScopedBindings4.js new file mode 100644 index 00000000000..51cddcf676d --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings4.js @@ -0,0 +1,91 @@ +//// [nestedBlockScopedBindings4.ts] +function a0() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + + +function a3() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + +//// [nestedBlockScopedBindings4.js] +function a0() { + for (var x = void 0; x < 1;) { + x = x + 1; + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a1() { + var _loop_1 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x = void 0; x < 1;) { + _loop_1(x); + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a2() { + for (var x = void 0; x < 1;) { + x = x + 1; + } + var _loop_2 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_2(x); + } +} +function a3() { + var _loop_3 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x = void 0; x < 1;) { + _loop_3(x); + } + var _loop_4 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_4(x); + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.symbols b/tests/baselines/reference/nestedBlockScopedBindings4.symbols new file mode 100644 index 00000000000..dac99d8158f --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings4.symbols @@ -0,0 +1,93 @@ +=== tests/cases/compiler/nestedBlockScopedBindings4.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings4.ts, 0, 0)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 1, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 1, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 1, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 1, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 4, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 4, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 4, 12)) + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings4.ts, 7, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 10, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 10, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 10, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 10, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 10, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 14, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 14, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 14, 12)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings4.ts, 17, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 20, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 20, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 20, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 20, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 23, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 23, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 23, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 23, 12)) + } +} + + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings4.ts, 27, 1)) + + for (let x; x < 1;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 31, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 31, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 31, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 31, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 31, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 35, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 35, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 35, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings4.ts, 35, 12)) + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings4.types b/tests/baselines/reference/nestedBlockScopedBindings4.types new file mode 100644 index 00000000000..b38d61f3f44 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings4.types @@ -0,0 +1,129 @@ +=== tests/cases/compiler/nestedBlockScopedBindings4.ts === +function a0() { +>a0 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a1() { +>a1 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + + () => x; +>() => x : () => any +>x : any + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a2() { +>a2 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } +} + + +function a3() { +>a3 : () => void + + for (let x; x < 1;) { +>x : any +>x < 1 : boolean +>x : any +>1 : number + + x = x + 1; +>x = x + 1 : any +>x : any +>x + 1 : any +>x : any +>1 : number + + () => x; +>() => x : () => any +>x : any + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings5.js b/tests/baselines/reference/nestedBlockScopedBindings5.js new file mode 100644 index 00000000000..c80c72c0ed6 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings5.js @@ -0,0 +1,169 @@ +//// [nestedBlockScopedBindings5.ts] +function a0() { + for (let x in []) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x in []) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x in []) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + + +function a3() { + for (let x in []) { + x = x + 1; + () => x; + } + for (let x;false;) { + x = x + 2; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } + +} + +function a4() { + for (let x in []) { + x = x + 1; + } + for (let x;false;) { + x = x + 2; + } + switch (1) { + case 1: + let x; + () => x; + break; + } + +} + +function a5() { + let y; + for (let x in []) { + x = x + 1; + } + for (let x;false;) { + x = x + 2; + () => x; + } + switch (1) { + case 1: + let x; + break; + } + +} + +//// [nestedBlockScopedBindings5.js] +function a0() { + for (var x in []) { + x = x + 1; + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a1() { + var _loop_1 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x in []) { + _loop_1(x); + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a2() { + for (var x in []) { + x = x + 1; + } + var _loop_2 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_2(x); + } +} +function a3() { + var _loop_3 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var x in []) { + _loop_3(x); + } + var _loop_4 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0; false;) { + _loop_4(x); + } + switch (1) { + case 1: + var x_1; + (function () { return x_1; }); + break; + } +} +function a4() { + for (var x in []) { + x = x + 1; + } + for (var x = void 0; false;) { + x = x + 2; + } + switch (1) { + case 1: + var x_2; + (function () { return x_2; }); + break; + } +} +function a5() { + var y; + for (var x in []) { + x = x + 1; + } + var _loop_5 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0; false;) { + _loop_5(x); + } + switch (1) { + case 1: + var x = void 0; + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings5.symbols b/tests/baselines/reference/nestedBlockScopedBindings5.symbols new file mode 100644 index 00000000000..202a1d2e83f --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings5.symbols @@ -0,0 +1,163 @@ +=== tests/cases/compiler/nestedBlockScopedBindings5.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings5.ts, 0, 0)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 1, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 1, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 1, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 4, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 4, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 4, 12)) + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings5.ts, 7, 1)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 10, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 10, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 10, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 10, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 14, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 14, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 14, 12)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings5.ts, 17, 1)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 20, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 20, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 20, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 23, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 23, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 23, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 23, 12)) + } +} + + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings5.ts, 27, 1)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 31, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 31, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 31, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 31, 12)) + } + for (let x;false;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 35, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 35, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 35, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 35, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 41, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 41, 15)) + + break; + } + +} + +function a4() { +>a4 : Symbol(a4, Decl(nestedBlockScopedBindings5.ts, 46, 1)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 49, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 49, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 49, 12)) + } + for (let x;false;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 52, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 52, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 52, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 57, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 57, 15)) + + break; + } + +} + +function a5() { +>a5 : Symbol(a5, Decl(nestedBlockScopedBindings5.ts, 62, 1)) + + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings5.ts, 65, 7)) + + for (let x in []) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 66, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 66, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 66, 12)) + } + for (let x;false;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 69, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 69, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 69, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 69, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings5.ts, 75, 15)) + + break; + } + +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings5.types b/tests/baselines/reference/nestedBlockScopedBindings5.types new file mode 100644 index 00000000000..10ea0e5f902 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings5.types @@ -0,0 +1,227 @@ +=== tests/cases/compiler/nestedBlockScopedBindings5.ts === +function a0() { +>a0 : () => void + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a1() { +>a1 : () => void + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + + () => x; +>() => x : () => string +>x : string + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a2() { +>a2 : () => void + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } +} + + +function a3() { +>a3 : () => void + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + + () => x; +>() => x : () => string +>x : string + } + for (let x;false;) { +>x : any +>false : boolean + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } + +} + +function a4() { +>a4 : () => void + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + } + for (let x;false;) { +>x : any +>false : boolean + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } + +} + +function a5() { +>a5 : () => void + + let y; +>y : any + + for (let x in []) { +>x : string +>[] : undefined[] + + x = x + 1; +>x = x + 1 : string +>x : string +>x + 1 : string +>x : string +>1 : number + } + for (let x;false;) { +>x : any +>false : boolean + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } + +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.js b/tests/baselines/reference/nestedBlockScopedBindings6.js new file mode 100644 index 00000000000..78207b98fcd --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings6.js @@ -0,0 +1,197 @@ +//// [nestedBlockScopedBindings6.ts] +function a0() { + for (let x of [1]) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x of [1]) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x of [1]) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + +function a3() { + for (let x of [1]) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + +function a4() { + for (let x of [1]) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a5() { + for (let x of [1]) { + x = x + 1; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +function a6() { + for (let x of [1]) { + x = x + 1; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a7() { + for (let x of [1]) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +//// [nestedBlockScopedBindings6.js] +function a0() { + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + x = x + 1; + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a1() { + var _loop_1 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_1(x); + } + for (var x = void 0;;) { + x = x + 2; + } +} +function a2() { + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + x = x + 1; + } + var _loop_2 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_2(x); + } +} +function a3() { + var _loop_3 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_3(x); + } + var _loop_4 = function(x) { + x = x + 2; + (function () { return x; }); + }; + for (var x = void 0;;) { + _loop_4(x); + } +} +function a4() { + var _loop_5 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_5(x); + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a5() { + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + x = x + 1; + } + switch (1) { + case 1: + var x_1; + (function () { return x_1; }); + break; + } +} +function a6() { + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + x = x + 1; + } + switch (1) { + case 1: + var x = void 0; + break; + } +} +function a7() { + var _loop_6 = function(x) { + x = x + 1; + (function () { return x; }); + }; + for (var _i = 0, _a = [1]; _i < _a.length; _i++) { + var x = _a[_i]; + _loop_6(x); + } + switch (1) { + case 1: + var x_2; + (function () { return x_2; }); + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.symbols b/tests/baselines/reference/nestedBlockScopedBindings6.symbols new file mode 100644 index 00000000000..43cfcb43814 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings6.symbols @@ -0,0 +1,177 @@ +=== tests/cases/compiler/nestedBlockScopedBindings6.ts === +function a0() { +>a0 : Symbol(a0, Decl(nestedBlockScopedBindings6.ts, 0, 0)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 1, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 1, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 1, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 4, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 4, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 4, 12)) + } +} + +function a1() { +>a1 : Symbol(a1, Decl(nestedBlockScopedBindings6.ts, 7, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 10, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 10, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 10, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 10, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 14, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 14, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 14, 12)) + } +} + +function a2() { +>a2 : Symbol(a2, Decl(nestedBlockScopedBindings6.ts, 17, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 20, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 20, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 20, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 23, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 23, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 23, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 23, 12)) + } +} + +function a3() { +>a3 : Symbol(a3, Decl(nestedBlockScopedBindings6.ts, 27, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 30, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 30, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 30, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 30, 12)) + } + for (let x;;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 34, 12)) + + x = x + 2; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 34, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 34, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 34, 12)) + } +} + +function a4() { +>a4 : Symbol(a4, Decl(nestedBlockScopedBindings6.ts, 38, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 41, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 41, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 41, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 41, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 47, 15)) + + break; + } +} + + +function a5() { +>a5 : Symbol(a5, Decl(nestedBlockScopedBindings6.ts, 50, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 54, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 54, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 54, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 59, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 59, 15)) + + break; + } +} + +function a6() { +>a6 : Symbol(a6, Decl(nestedBlockScopedBindings6.ts, 63, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 66, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 66, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 66, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 71, 15)) + + break; + } +} + +function a7() { +>a7 : Symbol(a7, Decl(nestedBlockScopedBindings6.ts, 74, 1)) + + for (let x of [1]) { +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 77, 12)) + + x = x + 1; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 77, 12)) +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 77, 12)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 77, 12)) + } + switch (1) { + case 1: + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 83, 15)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings6.ts, 83, 15)) + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings6.types b/tests/baselines/reference/nestedBlockScopedBindings6.types new file mode 100644 index 00000000000..5c8c1fa68fa --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings6.types @@ -0,0 +1,253 @@ +=== tests/cases/compiler/nestedBlockScopedBindings6.ts === +function a0() { +>a0 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a1() { +>a1 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + } +} + +function a2() { +>a2 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } +} + +function a3() { +>a3 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + for (let x;;) { +>x : any + + x = x + 2; +>x = x + 2 : any +>x : any +>x + 2 : any +>x : any +>2 : number + + () => x; +>() => x : () => any +>x : any + } +} + +function a4() { +>a4 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + + +function a5() { +>a5 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} + +function a6() { +>a6 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + break; + } +} + +function a7() { +>a7 : () => void + + for (let x of [1]) { +>x : number +>[1] : number[] +>1 : number + + x = x + 1; +>x = x + 1 : number +>x : number +>x + 1 : number +>x : number +>1 : number + + () => x; +>() => x : () => number +>x : number + } + switch (1) { +>1 : number + + case 1: +>1 : number + + let x; +>x : any + + () => x; +>() => x : () => any +>x : any + + break; + } +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings7.js b/tests/baselines/reference/nestedBlockScopedBindings7.js new file mode 100644 index 00000000000..df0e6c52a62 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings7.js @@ -0,0 +1,19 @@ +//// [nestedBlockScopedBindings7.ts] +for (let x; false;) { + () => x; +} + +for (let y; false;) { + y = 1; +} + +//// [nestedBlockScopedBindings7.js] +var _loop_1 = function(x) { + (function () { return x; }); +}; +for (var x = void 0; false;) { + _loop_1(x); +} +for (var y = void 0; false;) { + y = 1; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings7.symbols b/tests/baselines/reference/nestedBlockScopedBindings7.symbols new file mode 100644 index 00000000000..2d65af06a96 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings7.symbols @@ -0,0 +1,14 @@ +=== tests/cases/compiler/nestedBlockScopedBindings7.ts === +for (let x; false;) { +>x : Symbol(x, Decl(nestedBlockScopedBindings7.ts, 0, 8)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings7.ts, 0, 8)) +} + +for (let y; false;) { +>y : Symbol(y, Decl(nestedBlockScopedBindings7.ts, 4, 8)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings7.ts, 4, 8)) +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings7.types b/tests/baselines/reference/nestedBlockScopedBindings7.types new file mode 100644 index 00000000000..2fdb2d90e76 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings7.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/nestedBlockScopedBindings7.ts === +for (let x; false;) { +>x : any +>false : boolean + + () => x; +>() => x : () => any +>x : any +} + +for (let y; false;) { +>y : any +>false : boolean + + y = 1; +>y = 1 : number +>y : any +>1 : number +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings8.js b/tests/baselines/reference/nestedBlockScopedBindings8.js new file mode 100644 index 00000000000..772dc020d6d --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings8.js @@ -0,0 +1,23 @@ +//// [nestedBlockScopedBindings8.ts] +var x; +for (let x; false; ) { + () => x; +} + +var y; +for (let y; false; ) { + y = 1; +} + +//// [nestedBlockScopedBindings8.js] +var x; +var _loop_1 = function(x_1) { + (function () { return x_1; }); +}; +for (var x_1; false;) { + _loop_1(x_1); +} +var y; +for (var y_1; false;) { + y_1 = 1; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings8.symbols b/tests/baselines/reference/nestedBlockScopedBindings8.symbols new file mode 100644 index 00000000000..a61df0502ec --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings8.symbols @@ -0,0 +1,20 @@ +=== tests/cases/compiler/nestedBlockScopedBindings8.ts === +var x; +>x : Symbol(x, Decl(nestedBlockScopedBindings8.ts, 0, 3)) + +for (let x; false; ) { +>x : Symbol(x, Decl(nestedBlockScopedBindings8.ts, 1, 8)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings8.ts, 1, 8)) +} + +var y; +>y : Symbol(y, Decl(nestedBlockScopedBindings8.ts, 5, 3)) + +for (let y; false; ) { +>y : Symbol(y, Decl(nestedBlockScopedBindings8.ts, 6, 8)) + + y = 1; +>y : Symbol(y, Decl(nestedBlockScopedBindings8.ts, 6, 8)) +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings8.types b/tests/baselines/reference/nestedBlockScopedBindings8.types new file mode 100644 index 00000000000..9e4b98ffbf2 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings8.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/nestedBlockScopedBindings8.ts === +var x; +>x : any + +for (let x; false; ) { +>x : any +>false : boolean + + () => x; +>() => x : () => any +>x : any +} + +var y; +>y : any + +for (let y; false; ) { +>y : any +>false : boolean + + y = 1; +>y = 1 : number +>y : any +>1 : number +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings9.js b/tests/baselines/reference/nestedBlockScopedBindings9.js new file mode 100644 index 00000000000..9f037924c68 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings9.js @@ -0,0 +1,24 @@ +//// [nestedBlockScopedBindings9.ts] +{ + let x; + () => x; +} + +switch (1) { + case 1: + let y; + () => y; + break; +} + +//// [nestedBlockScopedBindings9.js] +{ + var x_1; + (function () { return x_1; }); +} +switch (1) { + case 1: + var y_1; + (function () { return y_1; }); + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings9.symbols b/tests/baselines/reference/nestedBlockScopedBindings9.symbols new file mode 100644 index 00000000000..1564c9e8931 --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings9.symbols @@ -0,0 +1,19 @@ +=== tests/cases/compiler/nestedBlockScopedBindings9.ts === +{ + let x; +>x : Symbol(x, Decl(nestedBlockScopedBindings9.ts, 1, 7)) + + () => x; +>x : Symbol(x, Decl(nestedBlockScopedBindings9.ts, 1, 7)) +} + +switch (1) { + case 1: + let y; +>y : Symbol(y, Decl(nestedBlockScopedBindings9.ts, 7, 11)) + + () => y; +>y : Symbol(y, Decl(nestedBlockScopedBindings9.ts, 7, 11)) + + break; +} diff --git a/tests/baselines/reference/nestedBlockScopedBindings9.types b/tests/baselines/reference/nestedBlockScopedBindings9.types new file mode 100644 index 00000000000..b889421e7dd --- /dev/null +++ b/tests/baselines/reference/nestedBlockScopedBindings9.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/nestedBlockScopedBindings9.ts === +{ + let x; +>x : any + + () => x; +>() => x : () => any +>x : any +} + +switch (1) { +>1 : number + + case 1: +>1 : number + + let y; +>y : any + + () => y; +>() => y : () => any +>y : any + + break; +} diff --git a/tests/cases/compiler/nestedBlockScopedBindings1.ts b/tests/cases/compiler/nestedBlockScopedBindings1.ts new file mode 100644 index 00000000000..9fd580044a5 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings1.ts @@ -0,0 +1,49 @@ +function a0() { + { + let x = 1; + } + { + let x = 1; + } +} + +function a1() { + { + let x; + } + { + let x = 1; + } +} + +function a2() { + { + let x = 1; + } + { + let x; + } +} + +function a3() { + { + let x = 1; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a4() { + { + let x; + } + switch (1) { + case 1: + let x = 1; + break; + } +} diff --git a/tests/cases/compiler/nestedBlockScopedBindings10.ts b/tests/cases/compiler/nestedBlockScopedBindings10.ts new file mode 100644 index 00000000000..5b3e5ad34a6 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings10.ts @@ -0,0 +1,11 @@ +{ + let x; + x = 1; +} + +switch (1) { + case 1: + let y; + y = 1; + break; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings11.ts b/tests/cases/compiler/nestedBlockScopedBindings11.ts new file mode 100644 index 00000000000..5d3e527eaf0 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings11.ts @@ -0,0 +1,13 @@ +var x; +{ + let x; + () => x; +} + +var y; +switch (1) { + case 1: + let y; + () => y; + break; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings12.ts b/tests/cases/compiler/nestedBlockScopedBindings12.ts new file mode 100644 index 00000000000..05aa00c1b5b --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings12.ts @@ -0,0 +1,13 @@ +var x; +{ + let x; + x = 1; +} + +var y; +switch (1) { + case 1: + let y; + y = 1; + break; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings13.ts b/tests/cases/compiler/nestedBlockScopedBindings13.ts new file mode 100644 index 00000000000..6cb1133a9f6 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings13.ts @@ -0,0 +1,9 @@ +for (; false;) { + let x; + () => x; +} + +for (; false;) { + let y; + y = 1; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings14.ts b/tests/cases/compiler/nestedBlockScopedBindings14.ts new file mode 100644 index 00000000000..879551a041a --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings14.ts @@ -0,0 +1,11 @@ +var x; +for (; false;) { + let x; + () => x; +} + +var y; +for (; false;) { + let y; + y = 1; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings15.ts b/tests/cases/compiler/nestedBlockScopedBindings15.ts new file mode 100644 index 00000000000..703494e0949 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings15.ts @@ -0,0 +1,31 @@ +for (; false;) { + { + let x; + () => x; + } +} + +for (; false;) { + { + let y; + y = 1; + } +} + +for (; false;) { + switch (1){ + case 1: + let z0; + () => z0; + break; + } +} + +for (; false;) { + switch (1){ + case 1: + let z; + z = 1; + break; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings16.ts b/tests/cases/compiler/nestedBlockScopedBindings16.ts new file mode 100644 index 00000000000..c85a9421102 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings16.ts @@ -0,0 +1,35 @@ +var x; +for (; false;) { + { + let x; + () => x; + } +} + +var y; +for (; false;) { + { + let y; + y = 1; + } +} + +var z0; +for (; false;) { + switch (1){ + case 1: + let z0; + () => z0; + break; + } +} + +var z; +for (; false;) { + switch (1){ + case 1: + let z; + z = 1; + break; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings2.ts b/tests/cases/compiler/nestedBlockScopedBindings2.ts new file mode 100644 index 00000000000..694f27d1a24 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings2.ts @@ -0,0 +1,126 @@ +function a0() { + { + let x = 1; + () => x; + } + { + let x = 1; + } +} + +function a1() { + { + let x; + } + { + let x = 1; + () => x; + } +} + +function a2() { + { + let x = 1; + () => x; + } + { + let x; + () => x; + } +} + + +function a3() { + { + let x = 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + + +function a4() { + { + let x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + + +function a5() { + { + let x; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a6() { + switch (1) { + case 1: + let x; + break; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a7() { + switch (1) { + case 1: + let x; + () => x; + break; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a8() { + switch (1) { + case 1: + let x; + break; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +function a9() { + switch (1) { + case 1: + let x; + () => x; + break; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} diff --git a/tests/cases/compiler/nestedBlockScopedBindings3.ts b/tests/cases/compiler/nestedBlockScopedBindings3.ts new file mode 100644 index 00000000000..e073bebadb9 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings3.ts @@ -0,0 +1,68 @@ +function a0() { + { + for (let x = 0; x < 1; ) { + () => x; + } + } + { + for (let x;;) { + () => x; + } + } +} + +function a1() { + for (let x; x < 1;) { + () => x; + } + for (let x;;) { + () => x; + } +} + +function a2() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + + +function a3() { + for (let x; x < 1;) { + x = x + 1; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a4() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a5() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings4.ts b/tests/cases/compiler/nestedBlockScopedBindings4.ts new file mode 100644 index 00000000000..33ad21e2c42 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings4.ts @@ -0,0 +1,40 @@ +function a0() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x; x < 1;) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + + +function a3() { + for (let x; x < 1;) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + () => x; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings5.ts b/tests/cases/compiler/nestedBlockScopedBindings5.ts new file mode 100644 index 00000000000..65093bcc91f --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings5.ts @@ -0,0 +1,80 @@ +function a0() { + for (let x in []) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x in []) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x in []) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + + +function a3() { + for (let x in []) { + x = x + 1; + () => x; + } + for (let x;false;) { + x = x + 2; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } + +} + +function a4() { + for (let x in []) { + x = x + 1; + } + for (let x;false;) { + x = x + 2; + } + switch (1) { + case 1: + let x; + () => x; + break; + } + +} + +function a5() { + let y; + for (let x in []) { + x = x + 1; + } + for (let x;false;) { + x = x + 2; + () => x; + } + switch (1) { + case 1: + let x; + break; + } + +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings6.ts b/tests/cases/compiler/nestedBlockScopedBindings6.ts new file mode 100644 index 00000000000..badf1db6e59 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings6.ts @@ -0,0 +1,88 @@ +function a0() { + for (let x of [1]) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + } +} + +function a1() { + for (let x of [1]) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + } +} + +function a2() { + for (let x of [1]) { + x = x + 1; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + +function a3() { + for (let x of [1]) { + x = x + 1; + () => x; + } + for (let x;;) { + x = x + 2; + () => x; + } +} + +function a4() { + for (let x of [1]) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + break; + } +} + + +function a5() { + for (let x of [1]) { + x = x + 1; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} + +function a6() { + for (let x of [1]) { + x = x + 1; + } + switch (1) { + case 1: + let x; + break; + } +} + +function a7() { + for (let x of [1]) { + x = x + 1; + () => x; + } + switch (1) { + case 1: + let x; + () => x; + break; + } +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings7.ts b/tests/cases/compiler/nestedBlockScopedBindings7.ts new file mode 100644 index 00000000000..67da827305b --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings7.ts @@ -0,0 +1,7 @@ +for (let x; false;) { + () => x; +} + +for (let y; false;) { + y = 1; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings8.ts b/tests/cases/compiler/nestedBlockScopedBindings8.ts new file mode 100644 index 00000000000..14e33615dc2 --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings8.ts @@ -0,0 +1,9 @@ +var x; +for (let x; false; ) { + () => x; +} + +var y; +for (let y; false; ) { + y = 1; +} \ No newline at end of file diff --git a/tests/cases/compiler/nestedBlockScopedBindings9.ts b/tests/cases/compiler/nestedBlockScopedBindings9.ts new file mode 100644 index 00000000000..d7d749dcf7c --- /dev/null +++ b/tests/cases/compiler/nestedBlockScopedBindings9.ts @@ -0,0 +1,11 @@ +{ + let x; + () => x; +} + +switch (1) { + case 1: + let y; + () => y; + break; +} \ No newline at end of file From fc6947b081a7e2e649f12ed9f6e86942733a3970 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 20 Jan 2016 16:51:48 -0800 Subject: [PATCH 055/160] Make get only accessor compatible with writable property in type relationships --- src/compiler/checker.ts | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 0f880cd17f9..465411e0c68 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10412,19 +10412,13 @@ namespace ts { } function isReadonlySymbol(symbol: Symbol): boolean { - if (symbol.flags & SymbolFlags.Property) { - return symbol === undefinedSymbol || (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; - } - if (symbol.flags & SymbolFlags.Accessor) { - return !(symbol.flags & SymbolFlags.SetAccessor); - } - return false; + return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; } function isConstantSymbol(symbol: Symbol): boolean { - if (symbol.flags & SymbolFlags.Variable) { - return (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0; - } + return symbol === undefinedSymbol || + symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 || + symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor); } function checkReferenceExpression(expr: Expression, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean { @@ -15723,7 +15717,6 @@ namespace ts { // Initialize special types globalArrayType = getGlobalType("Array", /*arity*/ 1); - globalReadonlyArrayType = getGlobalType("ReadonlyArray", /*arity*/ 1); globalObjectType = getGlobalType("Object"); globalFunctionType = getGlobalType("Function"); globalStringType = getGlobalType("String"); @@ -15768,8 +15761,10 @@ namespace ts { } anyArrayType = createArrayType(anyType); - anyReadonlyArrayType = globalReadonlyArrayType === emptyGenericType ? anyArrayType : - createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]); + + const symbol = getGlobalSymbol("ReadonlyArray", SymbolFlags.Type, /*diagnostic*/ undefined); + globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, /*arity*/ 1); + anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType; } function createInstantiatedPromiseLikeType(): ObjectType { From 95623535e18da5869c613da42b5faddb7917d41e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 20 Jan 2016 16:58:53 -0800 Subject: [PATCH 056/160] Fixing fourslash test --- .../cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts index a2e783d9ce0..53f5e6988b7 100644 --- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts +++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts @@ -9,7 +9,7 @@ ////var /*2*/x = point./*3*/x; goTo.marker('1'); -verify.quickInfoIs("function makePoint(x: number): {\n readonly x: number;\n}", undefined); +verify.quickInfoIs("function makePoint(x: number): {\n x: number;\n}", undefined); goTo.marker('2'); verify.quickInfoIs("var x: number", undefined); @@ -18,4 +18,4 @@ goTo.marker('3'); verify.memberListContains("x", "(property) x: number", undefined); goTo.marker('4'); -verify.quickInfoIs("var point: {\n readonly x: number;\n}", undefined); +verify.quickInfoIs("var point: {\n x: number;\n}", undefined); From b6f43e6cae8995aa9e37f9c7879a072d19f713a9 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 20 Jan 2016 16:59:03 -0800 Subject: [PATCH 057/160] Accepting new baselines --- tests/baselines/reference/accessorWithES5.types | 4 ++-- .../reference/commentsOnObjectLiteral4.types | 4 ++-- .../reference/computedPropertyNames11_ES5.types | 4 ++-- .../reference/computedPropertyNames11_ES6.types | 4 ++-- .../reference/declFileObjectLiteralWithOnlyGetter.js | 4 ++-- .../declFileObjectLiteralWithOnlyGetter.types | 12 ++++++------ tests/baselines/reference/downlevelLetConst18.types | 4 ++-- .../reference/interfaceImplementation5.errors.txt | 12 +----------- tests/baselines/reference/symbolProperty5.types | 4 ++-- 9 files changed, 21 insertions(+), 31 deletions(-) diff --git a/tests/baselines/reference/accessorWithES5.types b/tests/baselines/reference/accessorWithES5.types index 29471548918..cb54e92b184 100644 --- a/tests/baselines/reference/accessorWithES5.types +++ b/tests/baselines/reference/accessorWithES5.types @@ -21,8 +21,8 @@ class D { } var x = { ->x : { readonly a: number; } ->{ get a() { return 1 }} : { readonly a: number; } +>x : { a: number; } +>{ get a() { return 1 }} : { a: number; } get a() { return 1 } >a : number diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types index f458d73ae36..364df6e5ea1 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral4.types +++ b/tests/baselines/reference/commentsOnObjectLiteral4.types @@ -1,8 +1,8 @@ === tests/cases/compiler/commentsOnObjectLiteral4.ts === var v = { ->v : { readonly bar: number; } ->{ /** * @type {number} */ get bar(): number { return this._bar; }} : { readonly bar: number; } +>v : { bar: number; } +>{ /** * @type {number} */ get bar(): number { return this._bar; }} : { bar: number; } /** * @type {number} diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types index ae626ec3cba..e0787fc3ee7 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.types +++ b/tests/baselines/reference/computedPropertyNames11_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { readonly [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } +>v : { [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types index 06dc26e9843..8ad31a7c2a1 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES6.types +++ b/tests/baselines/reference/computedPropertyNames11_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { readonly [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } +>v : { [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js index eb440c028d5..396ee75422e 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js @@ -22,9 +22,9 @@ var /*2*/ x = point.x; //// [declFileObjectLiteralWithOnlyGetter.d.ts] declare function makePoint(x: number): { - readonly x: number; + x: number; }; declare var point: { - readonly x: number; + x: number; }; declare var x: number; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types index dd3cbe20983..c0fb7b763fc 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types @@ -1,11 +1,11 @@ === tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts === function /*1*/makePoint(x: number) { ->makePoint : (x: number) => { readonly x: number; } +>makePoint : (x: number) => { x: number; } >x : number return { ->{ get x() { return x; }, } : { readonly x: number; } +>{ get x() { return x; }, } : { x: number; } get x() { return x; }, >x : number @@ -14,14 +14,14 @@ function /*1*/makePoint(x: number) { }; }; var /*4*/point = makePoint(2); ->point : { readonly x: number; } ->makePoint(2) : { readonly x: number; } ->makePoint : (x: number) => { readonly x: number; } +>point : { x: number; } +>makePoint(2) : { x: number; } +>makePoint : (x: number) => { x: number; } >2 : number var /*2*/x = point./*3*/x; >x : number >point./*3*/x : number ->point : { readonly x: number; } +>point : { x: number; } >x : number diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types index 1f7be616124..42421aa80c0 100644 --- a/tests/baselines/reference/downlevelLetConst18.types +++ b/tests/baselines/reference/downlevelLetConst18.types @@ -54,8 +54,8 @@ for (let x; ;) { >x : any ({ get foo() { return x } }) ->({ get foo() { return x } }) : { readonly foo: any; } ->{ get foo() { return x } } : { readonly foo: any; } +>({ get foo() { return x } }) : { foo: any; } +>{ get foo() { return x } } : { foo: any; } >foo : any >x : any } diff --git a/tests/baselines/reference/interfaceImplementation5.errors.txt b/tests/baselines/reference/interfaceImplementation5.errors.txt index bb2d5f1bdb0..882d8516121 100644 --- a/tests/baselines/reference/interfaceImplementation5.errors.txt +++ b/tests/baselines/reference/interfaceImplementation5.errors.txt @@ -1,26 +1,19 @@ -tests/cases/compiler/interfaceImplementation5.ts(5,7): error TS2420: Class 'C1' incorrectly implements interface 'I1'. - Property 'getset1' is read-only in type 'C1' but writable in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(6,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(10,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(14,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(15,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -tests/cases/compiler/interfaceImplementation5.ts(18,7): error TS2420: Class 'C4' incorrectly implements interface 'I1'. - Property 'getset1' is read-only in type 'C4' but writable in type 'I1'. tests/cases/compiler/interfaceImplementation5.ts(19,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(23,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(27,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. -==== tests/cases/compiler/interfaceImplementation5.ts (10 errors) ==== +==== tests/cases/compiler/interfaceImplementation5.ts (8 errors) ==== interface I1 { getset1:number; } class C1 implements I1 { - ~~ -!!! error TS2420: Class 'C1' incorrectly implements interface 'I1'. -!!! error TS2420: Property 'getset1' is read-only in type 'C1' but writable in type 'I1'. public get getset1(){return 1;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. @@ -42,9 +35,6 @@ tests/cases/compiler/interfaceImplementation5.ts(28,16): error TS1056: Accessors } class C4 implements I1 { - ~~ -!!! error TS2420: Class 'C4' incorrectly implements interface 'I1'. -!!! error TS2420: Property 'getset1' is read-only in type 'C4' but writable in type 'I1'. public get getset1(){var x:any; return x;} ~~~~~~~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. diff --git a/tests/baselines/reference/symbolProperty5.types b/tests/baselines/reference/symbolProperty5.types index b338f94f6d3..4af020dca1b 100644 --- a/tests/baselines/reference/symbolProperty5.types +++ b/tests/baselines/reference/symbolProperty5.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/Symbols/symbolProperty5.ts === var x = { ->x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } ->{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } +>x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } +>{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } [Symbol.iterator]: 0, >Symbol.iterator : symbol From 2653a8da461eb9c43e0f6fdb47c29c0a95b9741e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 21 Jan 2016 12:27:11 -0800 Subject: [PATCH 058/160] Treat .js as JSX --- src/compiler/parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index e391408b419..16196e277dc 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -546,7 +546,7 @@ namespace ts { function getLanguageVariant(fileName: string) { // .tsx and .jsx files are treated as jsx language variant. - return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") ? LanguageVariant.JSX : LanguageVariant.Standard; + return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, '.js') ? LanguageVariant.JSX : LanguageVariant.Standard; } function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) { From 125d1f448a2502f004cf553acfd1a0bfc4139782 Mon Sep 17 00:00:00 2001 From: Yui T Date: Thu, 21 Jan 2016 16:16:52 -0800 Subject: [PATCH 059/160] Address PR --- src/compiler/emitter.ts | 2 +- src/compiler/utilities.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 0caff291b60..cc4cec5895f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3848,7 +3848,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi // We create a synthetic copy of the identifier in order to avoid the rewriting that might // otherwise occur when the identifier is emitted. index = createSynthesizedNode(propName.kind); - // We need to escape identifier here because when parsing an identifier prefixing with "__" + // We need to unescape identifier here because when parsing an identifier prefixing with "__" // the parser need to append "_" in order to escape colliding with magic identifiers such as "__proto__" // Therefore, in order to correctly emit identifiers that are written in original TypeScript file, // we will unescapeIdentifier to remove additional underscore (if no underscore is added, the function will return original input string) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 0beabe4b9ea..7bc708c7178 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -232,8 +232,7 @@ namespace ts { // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' export function escapeIdentifier(identifier: string): string { - const prefixedWithUnderscores = identifier.length >= 3 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._; - return prefixedWithUnderscores ? "_" + identifier : identifier; + return identifier.length >= 2 && identifier.charCodeAt(0) === CharacterCodes._ && identifier.charCodeAt(1) === CharacterCodes._ ? "_" + identifier : identifier; } // Remove extra underscore from escaped identifier From fac1bf6eefdce6be46aae32df1d84dcc82b810df Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 22 Jan 2016 10:32:17 -0800 Subject: [PATCH 060/160] Disallow assigments to exported variables from external modules --- src/compiler/checker.ts | 54 ++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 465411e0c68..e8a3cd115d0 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10400,25 +10400,44 @@ namespace ts { return true; } - function isReferenceWithinOwnConstructor(expr: Expression, symbol: Symbol): boolean { - // Allow assignments to readonly properties or methods (but not readonly accessors) within constructors - // of the same class declaration. - if ((expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) && - (expr as PropertyAccessExpression | ElementAccessExpression).expression.kind === SyntaxKind.ThisKeyword && - symbol.flags & (SymbolFlags.Property | SymbolFlags.Method)) { - const func = getContainingFunction(expr); - return func && func.kind === SyntaxKind.Constructor && func.parent === symbol.valueDeclaration.parent; - } - } - function isReadonlySymbol(symbol: Symbol): boolean { return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; } - function isConstantSymbol(symbol: Symbol): boolean { - return symbol === undefinedSymbol || - symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 || - symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor); + function isReferenceToConstant(expr: Expression, symbol: Symbol): boolean { + if (symbol.flags & SymbolFlags.Variable) { + // A variable declared with 'const' is considered constant. + if (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) { + return true; + } + // An exported variable declared in an external module and accessed through a property + // or element access is considered constant. + if (expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) { + if (symbol.parent && symbol.parent.flags & SymbolFlags.ValueModule) { + const declaration = symbol.parent.valueDeclaration; + return declaration && (declaration.kind === SyntaxKind.SourceFile || + declaration.kind === SyntaxKind.ModuleDeclaration && (declaration).name.kind === SyntaxKind.StringLiteral); + } + } + } + if (symbol.flags & SymbolFlags.Accessor) { + // An get accessor with no corresponding set accessor is considered constant. + return !(symbol.flags & SymbolFlags.SetAccessor); + } + return false; + } + + function isReferenceToReadonlyProperty(expr: Expression, symbol: Symbol): boolean { + if (isReadonlySymbol(symbol)) { + // Allow assignments to readonly properties within constructors of the same class declaration. + if ((expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) && + (expr as PropertyAccessExpression | ElementAccessExpression).expression.kind === SyntaxKind.ThisKeyword) { + const func = getContainingFunction(expr); + return !(func && func.kind === SyntaxKind.Constructor && func.parent === symbol.valueDeclaration.parent); + } + return true; + } + return false; } function checkReferenceExpression(expr: Expression, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean { @@ -10435,11 +10454,12 @@ namespace ts { const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol); if (symbol) { if (symbol !== unknownSymbol && symbol !== argumentsSymbol) { - if (symbol === undefinedSymbol || !(symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Method | SymbolFlags.Accessor))) { + if (symbol === undefinedSymbol || + !(symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Method | SymbolFlags.Accessor))) { error(expr, invalidReferenceMessage); return false; } - if (isConstantSymbol(symbol) || (isReadonlySymbol(symbol) && !isReferenceWithinOwnConstructor(expr, symbol))) { + if (isReferenceToConstant(node, symbol) || isReferenceToReadonlyProperty(node, symbol)) { error(expr, constantVariableMessage); return false; } From e5063786ecccaa2c9b1e78ab3746112df98fbdd5 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Fri, 22 Jan 2016 10:32:42 -0800 Subject: [PATCH 061/160] Accepting new baselines --- ...externalModuleImmutableBindings.errors.txt | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt index a6040c154f0..c8c61b2dc81 100644 --- a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt +++ b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt @@ -1,11 +1,23 @@ +tests/cases/compiler/f2.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/f2.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(9,7): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. +tests/cases/compiler/f2.ts(12,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/f2.ts(13,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/f2.ts(17,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/f2.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(19,8): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. +tests/cases/compiler/f2.ts(22,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/compiler/f2.ts(23,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(27,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. +tests/cases/compiler/f2.ts(28,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(29,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. +tests/cases/compiler/f2.ts(30,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(31,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. tests/cases/compiler/f2.ts(32,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. tests/cases/compiler/f2.ts(36,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. +tests/cases/compiler/f2.ts(37,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(38,6): error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. +tests/cases/compiler/f2.ts(39,6): error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. @@ -13,7 +25,7 @@ tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist ==== tests/cases/compiler/f1.ts (0 errors) ==== export var x = 1; -==== tests/cases/compiler/f2.ts (10 errors) ==== +==== tests/cases/compiler/f2.ts (22 errors) ==== // all mutations below are illegal and should be fixed import * as stuff from './f1'; @@ -21,26 +33,42 @@ tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist var n = 'baz'; stuff.x = 0; + ~~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. stuff['x'] = 1; + ~~~~~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. stuff.blah = 2; ~~~~ !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. stuff[n] = 3; stuff.x++; + ~~~~~~~ +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. stuff['x']++; + ~~~~~~~~~~ +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. stuff['blah']++; stuff[n]++; (stuff.x) = 0; + ~~~~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. (stuff['x']) = 1; + ~~~~~~~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. (stuff.blah) = 2; ~~~~ !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. (stuff[n]) = 3; (stuff.x)++; + ~~~~~~~~~ +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. (stuff['x'])++; + ~~~~~~~~~~~~ +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. (stuff['blah'])++; (stuff[n])++; @@ -48,10 +76,14 @@ tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist ~~~~~~~ !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. for (stuff.x of []) {} + ~~~~~~~ +!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. for (stuff['x'] in []) {} ~~~~~~~~~~ !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. for (stuff['x'] of []) {} + ~~~~~~~~~~ +!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. for (stuff.blah in []) {} ~~~~ !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. @@ -65,10 +97,14 @@ tests/cases/compiler/f2.ts(41,13): error TS2339: Property 'blah' does not exist ~~~~~~~~~ !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. for ((stuff.x) of []) {} + ~~~~~~~~~ +!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. for ((stuff['x']) in []) {} ~~~~~~~~~~~~ !!! error TS2405: The left-hand side of a 'for...in' statement must be of type 'string' or 'any'. for ((stuff['x']) of []) {} + ~~~~~~~~~~~~ +!!! error TS2485: The left-hand side of a 'for...of' statement cannot be a constant or a read-only property. for ((stuff.blah) in []) {} ~~~~ !!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'. From ee0060bb2f6dce7bb43b15fc7e8a1d4e6d5b9074 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 23 Jan 2016 15:35:33 -0800 Subject: [PATCH 062/160] No readonly checks in type relationships + No assignments through namespace imports --- src/compiler/checker.ts | 69 +++++++++------------------- src/compiler/diagnosticMessages.json | 8 ---- 2 files changed, 22 insertions(+), 55 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e8a3cd115d0..7b0da6e4fcc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5641,13 +5641,6 @@ namespace ts { } return Ternary.False; } - if (isReadonlySymbol(sourceProp) && !isReadonlySymbol(targetProp)) { - if (reportErrors) { - reportError(Diagnostics.Property_0_is_read_only_in_type_1_but_writable_in_type_2, - symbolToString(targetProp), typeToString(source), typeToString(target)); - } - return Ternary.False; - } } } } @@ -5780,13 +5773,6 @@ namespace ts { } return Ternary.False; } - if (sourceInfo.isReadonly && !targetInfo.isReadonly) { - if (reportErrors) { - reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_writable_in_type_1, - typeToString(source), typeToString(target)); - } - return Ternary.False; - } return related; } return Ternary.True; @@ -5826,13 +5812,6 @@ namespace ts { } return Ternary.False; } - if ((sourceStringInfo && sourceStringInfo.isReadonly || sourceNumberInfo && sourceNumberInfo.isReadonly) && !targetInfo.isReadonly) { - if (reportErrors) { - reportError(Diagnostics.Index_signature_is_read_only_in_type_0_but_writable_in_type_1, - typeToString(source), typeToString(target)); - } - return Ternary.False; - } return related; } return Ternary.True; @@ -10401,36 +10380,19 @@ namespace ts { } function isReadonlySymbol(symbol: Symbol): boolean { - return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0; + return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0 || + symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor); } - function isReferenceToConstant(expr: Expression, symbol: Symbol): boolean { - if (symbol.flags & SymbolFlags.Variable) { - // A variable declared with 'const' is considered constant. - if (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) { - return true; - } - // An exported variable declared in an external module and accessed through a property - // or element access is considered constant. - if (expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) { - if (symbol.parent && symbol.parent.flags & SymbolFlags.ValueModule) { - const declaration = symbol.parent.valueDeclaration; - return declaration && (declaration.kind === SyntaxKind.SourceFile || - declaration.kind === SyntaxKind.ModuleDeclaration && (declaration).name.kind === SyntaxKind.StringLiteral); - } - } - } - if (symbol.flags & SymbolFlags.Accessor) { - // An get accessor with no corresponding set accessor is considered constant. - return !(symbol.flags & SymbolFlags.SetAccessor); - } - return false; + function isConstantSymbol(symbol: Symbol): boolean { + return symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0; } function isReferenceToReadonlyProperty(expr: Expression, symbol: Symbol): boolean { if (isReadonlySymbol(symbol)) { // Allow assignments to readonly properties within constructors of the same class declaration. - if ((expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) && + if (symbol.flags & SymbolFlags.Property && + (expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) && (expr as PropertyAccessExpression | ElementAccessExpression).expression.kind === SyntaxKind.ThisKeyword) { const func = getContainingFunction(expr); return !(func && func.kind === SyntaxKind.Constructor && func.parent === symbol.valueDeclaration.parent); @@ -10440,6 +10402,20 @@ namespace ts { return false; } + function isReferenceThroughNamespaceImport(expr: Expression): boolean { + if (expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) { + const node = skipParenthesizedNodes((expr as PropertyAccessExpression | ElementAccessExpression).expression); + if (node.kind === SyntaxKind.Identifier) { + const symbol = getNodeLinks(node).resolvedSymbol; + if (symbol.flags & SymbolFlags.Alias) { + const declaration = getDeclarationOfAliasSymbol(symbol); + return declaration && declaration.kind === SyntaxKind.NamespaceImport; + } + } + } + return false; + } + function checkReferenceExpression(expr: Expression, invalidReferenceMessage: DiagnosticMessage, constantVariableMessage: DiagnosticMessage): boolean { // References are combinations of identifiers, parentheses, and property accesses. const node = skipParenthesizedNodes(expr); @@ -10454,12 +10430,11 @@ namespace ts { const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol); if (symbol) { if (symbol !== unknownSymbol && symbol !== argumentsSymbol) { - if (symbol === undefinedSymbol || - !(symbol.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Method | SymbolFlags.Accessor))) { + if (node.kind === SyntaxKind.Identifier && !(symbol.flags & SymbolFlags.Variable) || symbol.flags & SymbolFlags.EnumMember) { error(expr, invalidReferenceMessage); return false; } - if (isReferenceToConstant(node, symbol) || isReferenceToReadonlyProperty(node, symbol)) { + if (isConstantSymbol(symbol) || isReferenceToReadonlyProperty(node, symbol) || isReferenceThroughNamespaceImport(node)) { error(expr, constantVariableMessage); return false; } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index cb01650d13f..87de69bb4d5 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -995,10 +995,6 @@ "category": "Error", "code": 2342 }, - "Property '{0}' is read-only in type '{1}' but writable in type '{2}'.": { - "category": "Error", - "code": 2343 - }, "Type '{0}' does not satisfy the constraint '{1}'.": { "category": "Error", "code": 2344 @@ -1087,10 +1083,6 @@ "category": "Error", "code": 2365 }, - "Index signature is read-only in type '{0}' but writable in type '{1}'.": { - "category": "Error", - "code": 2366 - }, "Type parameter name cannot be '{0}'": { "category": "Error", "code": 2368 From 7405a4b9c88a9401894d99740c4aaa52a06604af Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 23 Jan 2016 15:36:09 -0800 Subject: [PATCH 063/160] Accepting new baselines --- .../baselines/reference/accessorWithES5.types | 4 +-- ...nmentToParenthesizedIdentifiers.errors.txt | 35 ++++++++++--------- .../reference/commentsOnObjectLiteral4.types | 4 +-- .../computedPropertyNames11_ES5.types | 4 +-- .../computedPropertyNames11_ES6.types | 4 +-- .../declFileObjectLiteralWithOnlyGetter.js | 4 +-- .../declFileObjectLiteralWithOnlyGetter.types | 12 +++---- .../reference/downlevelLetConst18.types | 4 +-- .../baselines/reference/symbolProperty5.types | 4 +-- 9 files changed, 39 insertions(+), 36 deletions(-) diff --git a/tests/baselines/reference/accessorWithES5.types b/tests/baselines/reference/accessorWithES5.types index cb54e92b184..29471548918 100644 --- a/tests/baselines/reference/accessorWithES5.types +++ b/tests/baselines/reference/accessorWithES5.types @@ -21,8 +21,8 @@ class D { } var x = { ->x : { a: number; } ->{ get a() { return 1 }} : { a: number; } +>x : { readonly a: number; } +>{ get a() { return 1 }} : { readonly a: number; } get a() { return 1 } >a : number diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt index dcfed4ae28b..a50ffdf72d7 100644 --- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt +++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.errors.txt @@ -6,12 +6,15 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(17,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(18,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(25,5): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(27,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(28,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(29,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(31,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(32,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(33,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(31,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. + Types of property 'x' are incompatible. + Type 'string' is not assignable to type 'number'. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(32,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. + Types of property 'x' are incompatible. + Type 'string' is not assignable to type 'number'. +tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(33,1): error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. + Types of property 'x' are incompatible. + Type 'string' is not assignable to type 'number'. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(37,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(38,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(43,5): error TS2322: Type 'string' is not assignable to type 'number'. @@ -27,7 +30,7 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts(70,1): error TS2364: Invalid left-hand side of assignment expression. -==== tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts (27 errors) ==== +==== tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesizedIdentifiers.ts (24 errors) ==== var x: number; x = 3; // OK (x) = 3; // OK @@ -71,24 +74,24 @@ tests/cases/conformance/expressions/valuesAndReferences/assignmentToParenthesize !!! error TS2364: Invalid left-hand side of assignment expression. } M2.M3 = { x: 3 }; // OK - ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. (M2).M3 = { x: 3 }; // OK - ~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. (M2.M3) = { x: 3 }; // OK - ~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. M2.M3 = { x: '' }; // Error ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. +!!! error TS2322: Types of property 'x' are incompatible. +!!! error TS2322: Type 'string' is not assignable to type 'number'. (M2).M3 = { x: '' }; // Error ~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. +!!! error TS2322: Types of property 'x' are incompatible. +!!! error TS2322: Type 'string' is not assignable to type 'number'. (M2.M3) = { x: '' }; // Error ~~~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2322: Type '{ x: string; }' is not assignable to type 'typeof M3'. +!!! error TS2322: Types of property 'x' are incompatible. +!!! error TS2322: Type 'string' is not assignable to type 'number'. function fn() { } diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types index 364df6e5ea1..f458d73ae36 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral4.types +++ b/tests/baselines/reference/commentsOnObjectLiteral4.types @@ -1,8 +1,8 @@ === tests/cases/compiler/commentsOnObjectLiteral4.ts === var v = { ->v : { bar: number; } ->{ /** * @type {number} */ get bar(): number { return this._bar; }} : { bar: number; } +>v : { readonly bar: number; } +>{ /** * @type {number} */ get bar(): number { return this._bar; }} : { readonly bar: number; } /** * @type {number} diff --git a/tests/baselines/reference/computedPropertyNames11_ES5.types b/tests/baselines/reference/computedPropertyNames11_ES5.types index e0787fc3ee7..ae626ec3cba 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES5.types +++ b/tests/baselines/reference/computedPropertyNames11_ES5.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } +>v : { readonly [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/computedPropertyNames11_ES6.types b/tests/baselines/reference/computedPropertyNames11_ES6.types index 8ad31a7c2a1..06dc26e9843 100644 --- a/tests/baselines/reference/computedPropertyNames11_ES6.types +++ b/tests/baselines/reference/computedPropertyNames11_ES6.types @@ -9,8 +9,8 @@ var a: any; >a : any var v = { ->v : { [0]: number; [""]: any; } ->{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { [0]: number; [""]: any; } +>v : { readonly [0]: number; [""]: any; } +>{ get [s]() { return 0; }, set [n](v) { }, get [s + s]() { return 0; }, set [s + n](v) { }, get [+s]() { return 0; }, set [""](v) { }, get [0]() { return 0; }, set [a](v) { }, get [true]() { return 0; }, set [`hello bye`](v) { }, get [`hello ${a} bye`]() { return 0; }} : { readonly [0]: number; [""]: any; } get [s]() { return 0; }, >s : string diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js index 396ee75422e..eb440c028d5 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js @@ -22,9 +22,9 @@ var /*2*/ x = point.x; //// [declFileObjectLiteralWithOnlyGetter.d.ts] declare function makePoint(x: number): { - x: number; + readonly x: number; }; declare var point: { - x: number; + readonly x: number; }; declare var x: number; diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types index c0fb7b763fc..dd3cbe20983 100644 --- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types +++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.types @@ -1,11 +1,11 @@ === tests/cases/compiler/declFileObjectLiteralWithOnlyGetter.ts === function /*1*/makePoint(x: number) { ->makePoint : (x: number) => { x: number; } +>makePoint : (x: number) => { readonly x: number; } >x : number return { ->{ get x() { return x; }, } : { x: number; } +>{ get x() { return x; }, } : { readonly x: number; } get x() { return x; }, >x : number @@ -14,14 +14,14 @@ function /*1*/makePoint(x: number) { }; }; var /*4*/point = makePoint(2); ->point : { x: number; } ->makePoint(2) : { x: number; } ->makePoint : (x: number) => { x: number; } +>point : { readonly x: number; } +>makePoint(2) : { readonly x: number; } +>makePoint : (x: number) => { readonly x: number; } >2 : number var /*2*/x = point./*3*/x; >x : number >point./*3*/x : number ->point : { x: number; } +>point : { readonly x: number; } >x : number diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types index 42421aa80c0..1f7be616124 100644 --- a/tests/baselines/reference/downlevelLetConst18.types +++ b/tests/baselines/reference/downlevelLetConst18.types @@ -54,8 +54,8 @@ for (let x; ;) { >x : any ({ get foo() { return x } }) ->({ get foo() { return x } }) : { foo: any; } ->{ get foo() { return x } } : { foo: any; } +>({ get foo() { return x } }) : { readonly foo: any; } +>{ get foo() { return x } } : { readonly foo: any; } >foo : any >x : any } diff --git a/tests/baselines/reference/symbolProperty5.types b/tests/baselines/reference/symbolProperty5.types index 4af020dca1b..b338f94f6d3 100644 --- a/tests/baselines/reference/symbolProperty5.types +++ b/tests/baselines/reference/symbolProperty5.types @@ -1,7 +1,7 @@ === tests/cases/conformance/es6/Symbols/symbolProperty5.ts === var x = { ->x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } ->{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; [Symbol.toStringTag]: number; } +>x : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } +>{ [Symbol.iterator]: 0, [Symbol.toPrimitive]() { }, get [Symbol.toStringTag]() { return 0; }} : { [Symbol.iterator]: number; [Symbol.toPrimitive](): void; readonly [Symbol.toStringTag]: number; } [Symbol.iterator]: 0, >Symbol.iterator : symbol From ac196eb2aa509c8d270fa47a2e2a8defe23dc034 Mon Sep 17 00:00:00 2001 From: york yao Date: Sun, 24 Jan 2016 17:10:44 +0800 Subject: [PATCH 064/160] use `const` rather than `var` when emitting external import declaration and the target is es6 --- src/compiler/emitter.ts | 23 ++++++++++++++++--- .../reference/asyncImportedPromise_es6.js | 2 +- ...rtDefaultBindingFollowedWithNamedImport.js | 10 ++++---- .../reference/es6ImportNameSpaceImport.js | 2 +- .../reference/es6ImportNamedImport.js | 18 +++++++-------- .../es6ImportNamedImportInExportAssignment.js | 2 +- .../reference/exportsAndImports1-es6.js | 2 +- .../reference/exportsAndImports2-es6.js | 2 +- .../reference/exportsAndImports3-es6.js | 2 +- .../reference/exportsAndImports4-es6.js | 12 +++++----- .../shorthandPropertyAssignmentInES6Module.js | 4 ++-- 11 files changed, 48 insertions(+), 31 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 44cb0ea3ccf..dbde9c14153 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6107,7 +6107,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge if (namespaceDeclaration && !isDefaultImport(node)) { // import x = require("foo") // import * as x from "foo" - if (!isExportedImport) write("var "); + if (!isExportedImport) { + if (languageVersion !== ScriptTarget.ES6) { + write("var "); + } + else { + write("const "); + } + }; emitModuleMemberName(namespaceDeclaration); write(" = "); } @@ -6119,7 +6126,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import d, { x, y } from "foo" const isNakedImport = SyntaxKind.ImportDeclaration && !(node).importClause; if (!isNakedImport) { - write("var "); + if (languageVersion !== ScriptTarget.ES6) { + write("var "); + } + else { + write("const "); + } write(getGeneratedNameForNode(node)); write(" = "); } @@ -6146,7 +6158,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else if (namespaceDeclaration && isDefaultImport(node)) { // import d, * as x from "foo" - write("var "); + if (languageVersion !== ScriptTarget.ES6) { + write("var "); + } + else { + write("const "); + } emitModuleMemberName(namespaceDeclaration); write(" = "); write(getGeneratedNameForNode(node)); diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index d861012488c..a63d7844f4c 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -24,7 +24,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.call(thisArg, _arguments)).next()); }); }; -var task_1 = require("./task"); +const task_1 = require("./task"); class Test { example() { return __awaiter(this, void 0, task_1.Task, function* () { return; }); diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js index d7dfe29208d..4bff2abf82d 100644 --- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js +++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js @@ -31,16 +31,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = {}; //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js] "use strict"; -var es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); +const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a; -var es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); +const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_2.a; -var es6ImportDefaultBindingFollowedWithNamedImport_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); +const es6ImportDefaultBindingFollowedWithNamedImport_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_3.x; var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_3.a; -var es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); +const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x; -var es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); +const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0"); var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m; diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js index 685e1cf643c..8e109779f45 100644 --- a/tests/baselines/reference/es6ImportNameSpaceImport.js +++ b/tests/baselines/reference/es6ImportNameSpaceImport.js @@ -15,7 +15,7 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this exports.a = 10; //// [es6ImportNameSpaceImport_1.js] "use strict"; -var nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); +const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); var x = nameSpaceBinding.a; diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js index 73fe8f4ec1b..8dbdf7ce6f1 100644 --- a/tests/baselines/reference/es6ImportNamedImport.js +++ b/tests/baselines/reference/es6ImportNamedImport.js @@ -53,26 +53,26 @@ exports.z2 = 10; exports.aaaa = 10; //// [es6ImportNamedImport_1.js] "use strict"; -var es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_1.a; -var es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_2.a; -var es6ImportNamedImport_0_3 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_3 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_3.x; var xxxx = es6ImportNamedImport_0_3.a; -var es6ImportNamedImport_0_4 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_4 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_4.x; -var es6ImportNamedImport_0_5 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_5 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_5.m; -var es6ImportNamedImport_0_6 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_6 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_6.a1; var xxxx = es6ImportNamedImport_0_6.x1; -var es6ImportNamedImport_0_7 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_7 = require("./es6ImportNamedImport_0"); var xxxx = es6ImportNamedImport_0_7.a1; var xxxx = es6ImportNamedImport_0_7.x1; -var es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0"); var z111 = es6ImportNamedImport_0_8.z1; -var es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0"); +const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0"); var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js index b67f61e88ae..38766d32cd9 100644 --- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js +++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js @@ -13,7 +13,7 @@ export = a; exports.a = 10; //// [es6ImportNamedImportInExportAssignment_1.js] "use strict"; -var es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); +const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0"); module.exports = es6ImportNamedImportInExportAssignment_0_1.a; diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js index ece98a80318..3ac5aeb0dc5 100644 --- a/tests/baselines/reference/exportsAndImports1-es6.js +++ b/tests/baselines/reference/exportsAndImports1-es6.js @@ -67,7 +67,7 @@ exports.M = t1_1.M; exports.a = t1_1.a; //// [t3.js] "use strict"; -var t1_1 = require("./t1"); +const t1_1 = require("./t1"); exports.v = t1_1.v; exports.f = t1_1.f; exports.C = t1_1.C; diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js index 865534b2851..56639bdbecf 100644 --- a/tests/baselines/reference/exportsAndImports2-es6.js +++ b/tests/baselines/reference/exportsAndImports2-es6.js @@ -24,6 +24,6 @@ exports.y = t1_1.x; exports.x = t1_1.y; //// [t3.js] "use strict"; -var t1_1 = require("./t1"); +const t1_1 = require("./t1"); exports.y = t1_1.x; exports.x = t1_1.y; diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js index ed509d31437..ea16836b1f2 100644 --- a/tests/baselines/reference/exportsAndImports3-es6.js +++ b/tests/baselines/reference/exportsAndImports3-es6.js @@ -69,7 +69,7 @@ exports.M = t1_1.M1; exports.a = t1_1.a1; //// [t3.js] "use strict"; -var t1_1 = require("./t1"); +const t1_1 = require("./t1"); exports.v = t1_1.v1; exports.f = t1_1.f1; exports.C = t1_1.C1; diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js index 39c6583e935..8a8d4f81225 100644 --- a/tests/baselines/reference/exportsAndImports4-es6.js +++ b/tests/baselines/reference/exportsAndImports4-es6.js @@ -45,24 +45,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; //// [t3.js] "use strict"; -var a = require("./t1"); +const a = require("./t1"); exports.a = a; a.default; -var t1_1 = require("./t1"); +const t1_1 = require("./t1"); exports.b = t1_1.default; t1_1.default; -var c = require("./t1"); +const c = require("./t1"); exports.c = c; c.default; -var t1_2 = require("./t1"); +const t1_2 = require("./t1"); exports.d = t1_2.default; t1_2.default; -var t1_3 = require("./t1"), e2 = t1_3; +const t1_3 = require("./t1"), e2 = t1_3; exports.e1 = t1_3.default; exports.e2 = e2; t1_3.default; e2.default; -var t1_4 = require("./t1"); +const t1_4 = require("./t1"); exports.f1 = t1_4.default; exports.f2 = t1_4.default; t1_4.default; diff --git a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js index cab16b96bc3..d52622dffc7 100644 --- a/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js +++ b/tests/baselines/reference/shorthandPropertyAssignmentInES6Module.js @@ -20,8 +20,8 @@ use(foo); exports.x = 1; //// [test.js] "use strict"; -var existingModule_1 = require('./existingModule'); -var missingModule_1 = require('./missingModule'); +const existingModule_1 = require('./existingModule'); +const missingModule_1 = require('./missingModule'); const test = { x: existingModule_1.x, foo: missingModule_1.foo }; use(existingModule_1.x); use(missingModule_1.foo); From 49dd54e91a65b165d468cbaf85c6d56f3d6bb383 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 24 Jan 2016 13:44:05 -0800 Subject: [PATCH 065/160] Include readonly in type equality checks + Treat more symbols as readonly --- src/compiler/checker.ts | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 7b0da6e4fcc..73b36e07476 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -134,7 +134,7 @@ namespace ts { const anySignature = createSignature(undefined, undefined, emptyArray, anyType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); const unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false); - const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ false); + const enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true); const globals: SymbolTable = {}; @@ -5912,6 +5912,9 @@ namespace ts { return Ternary.False; } } + if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) { + return Ternary.False; + } return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp)); } @@ -10380,15 +10383,18 @@ namespace ts { } function isReadonlySymbol(symbol: Symbol): boolean { + // The following symbols are considered read-only: + // Properties with a 'readonly' modifier + // Variables declared with 'const' + // Get accessors without matching set accessors + // Enum members return symbol.flags & SymbolFlags.Property && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Readonly) !== 0 || - symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor); + symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0 || + symbol.flags & SymbolFlags.Accessor && !(symbol.flags & SymbolFlags.SetAccessor) || + (symbol.flags & SymbolFlags.EnumMember) !== 0; } - function isConstantSymbol(symbol: Symbol): boolean { - return symbol.flags & SymbolFlags.Variable && (getDeclarationFlagsFromSymbol(symbol) & NodeFlags.Const) !== 0; - } - - function isReferenceToReadonlyProperty(expr: Expression, symbol: Symbol): boolean { + function isReferenceToReadonlyEntity(expr: Expression, symbol: Symbol): boolean { if (isReadonlySymbol(symbol)) { // Allow assignments to readonly properties within constructors of the same class declaration. if (symbol.flags & SymbolFlags.Property && @@ -10430,11 +10436,13 @@ namespace ts { const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol); if (symbol) { if (symbol !== unknownSymbol && symbol !== argumentsSymbol) { - if (node.kind === SyntaxKind.Identifier && !(symbol.flags & SymbolFlags.Variable) || symbol.flags & SymbolFlags.EnumMember) { + // Only variables (and not functions, classes, namespaces, enum objects, or enum members) + // are considered references when referenced using a simple identifier. + if (node.kind === SyntaxKind.Identifier && !(symbol.flags & SymbolFlags.Variable)) { error(expr, invalidReferenceMessage); return false; } - if (isConstantSymbol(symbol) || isReferenceToReadonlyProperty(node, symbol) || isReferenceThroughNamespaceImport(node)) { + if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) { error(expr, constantVariableMessage); return false; } From ea4e3afd98fec76bfa7ddc7c7d9f37e245dbaf55 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 24 Jan 2016 13:44:22 -0800 Subject: [PATCH 066/160] Fix tests --- tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts | 4 ++-- tests/cases/conformance/enums/enumBasics.ts | 8 ++++---- .../objectLiterals/objectLiteralGettersAndSetters.ts | 4 ++-- .../fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts b/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts index 996560385d8..2033ef743a4 100644 --- a/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts +++ b/tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts @@ -5,6 +5,6 @@ enum E { b = 1 } var x = E; -var x: { a: E; b: E;[x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error var y = E; -var y: { a: E; b: E;[x: number]: string;[x: number]: string } // two errors: the types are not identical and duplicate signatures \ No newline at end of file +var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures \ No newline at end of file diff --git a/tests/cases/conformance/enums/enumBasics.ts b/tests/cases/conformance/enums/enumBasics.ts index 756e08e97af..1e134540713 100644 --- a/tests/cases/conformance/enums/enumBasics.ts +++ b/tests/cases/conformance/enums/enumBasics.ts @@ -11,10 +11,10 @@ var x: number = E1.A; // Enum object type is anonymous with properties of the enum type and numeric indexer var e = E1; var e: { - A: E1; - B: E1; - C: E1; - [n: number]: string; + readonly A: E1; + readonly B: E1; + readonly C: E1; + readonly [n: number]: string; }; var e: typeof E1; diff --git a/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts b/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts index 5a6bc87af36..af0622179ac 100644 --- a/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts +++ b/tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetters.ts @@ -16,11 +16,11 @@ var callSig3: { num: (n: number) => string; }; // Get accessor only, type of the property is the annotated return type of the get accessor var getter1 = { get x(): string { return undefined; } }; -var getter1: { x: string; } +var getter1: { readonly x: string; } // Get accessor only, type of the property is the inferred return type of the get accessor var getter2 = { get x() { return ''; } }; -var getter2: { x: string; } +var getter2: { readonly x: string; } // Set accessor only, type of the property is the param type of the set accessor var setter1 = { set x(n: number) { } }; diff --git a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts index 53f5e6988b7..a2e783d9ce0 100644 --- a/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts +++ b/tests/cases/fourslash/quickInfoOnObjectLiteralWithOnlyGetter.ts @@ -9,7 +9,7 @@ ////var /*2*/x = point./*3*/x; goTo.marker('1'); -verify.quickInfoIs("function makePoint(x: number): {\n x: number;\n}", undefined); +verify.quickInfoIs("function makePoint(x: number): {\n readonly x: number;\n}", undefined); goTo.marker('2'); verify.quickInfoIs("var x: number", undefined); @@ -18,4 +18,4 @@ goTo.marker('3'); verify.memberListContains("x", "(property) x: number", undefined); goTo.marker('4'); -verify.quickInfoIs("var point: {\n x: number;\n}", undefined); +verify.quickInfoIs("var point: {\n readonly x: number;\n}", undefined); From c78ee723a09609b4ebd02bd471b8c4fed6347ab5 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 24 Jan 2016 13:44:54 -0800 Subject: [PATCH 067/160] Accepting new baselines --- .../baselines/reference/assignToEnum.errors.txt | 8 ++++---- tests/baselines/reference/assignments.errors.txt | 4 ++-- .../constEnumPropertyAccess2.errors.txt | 4 ++-- .../decrementOperatorWithEnumType.errors.txt | 12 ++++++------ tests/baselines/reference/enumBasics.js | 8 ++++---- tests/baselines/reference/enumBasics.symbols | 14 +++++++------- tests/baselines/reference/enumBasics.types | 8 ++++---- .../incrementOperatorWithEnumType.errors.txt | 16 ++++++++-------- .../invalidUndefinedAssignments.errors.txt | 4 ++-- .../objectLiteralGettersAndSetters.errors.txt | 4 ++-- .../reference/objectLiteralGettersAndSetters.js | 4 ++-- .../typeOfEnumAndVarRedeclarations.errors.txt | 8 ++++---- .../reference/typeOfEnumAndVarRedeclarations.js | 4 ++-- .../reference/validNullAssignments.errors.txt | 4 ++-- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/baselines/reference/assignToEnum.errors.txt b/tests/baselines/reference/assignToEnum.errors.txt index 4846a96dbb7..d50daa3099f 100644 --- a/tests/baselines/reference/assignToEnum.errors.txt +++ b/tests/baselines/reference/assignToEnum.errors.txt @@ -1,7 +1,7 @@ tests/cases/compiler/assignToEnum.ts(2,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/compiler/assignToEnum.ts(3,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/compiler/assignToEnum.ts(4,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/compiler/assignToEnum.ts(5,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/compiler/assignToEnum.ts(4,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/assignToEnum.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/compiler/assignToEnum.ts (4 errors) ==== @@ -14,9 +14,9 @@ tests/cases/compiler/assignToEnum.ts(5,1): error TS2364: Invalid left-hand side !!! error TS2364: Invalid left-hand side of assignment expression. A.foo = 1; // invalid LHS ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. A.foo = A.bar; // invalid LHS ~~~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. \ No newline at end of file diff --git a/tests/baselines/reference/assignments.errors.txt b/tests/baselines/reference/assignments.errors.txt index 9f89863f31f..05bc4ce1794 100644 --- a/tests/baselines/reference/assignments.errors.txt +++ b/tests/baselines/reference/assignments.errors.txt @@ -1,7 +1,7 @@ tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(11,1): error TS2304: Cannot find name 'M'. tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(14,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(17,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(18,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(18,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(21,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(31,1): error TS2304: Cannot find name 'I'. @@ -32,7 +32,7 @@ tests/cases/conformance/expressions/valuesAndReferences/assignments.ts(31,1): er !!! error TS2364: Invalid left-hand side of assignment expression. E.A = null; // OK per spec, Error per implementation (509581) ~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. function fn() { } fn = null; // Should be error diff --git a/tests/baselines/reference/constEnumPropertyAccess2.errors.txt b/tests/baselines/reference/constEnumPropertyAccess2.errors.txt index 19b273faffa..a943ee00962 100644 --- a/tests/baselines/reference/constEnumPropertyAccess2.errors.txt +++ b/tests/baselines/reference/constEnumPropertyAccess2.errors.txt @@ -1,7 +1,7 @@ tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(14,9): error TS2475: 'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment. tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(15,12): error TS2476: A const enum member can only be accessed using a string literal. tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(17,1): error TS2322: Type 'string' is not assignable to type 'G'. -tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(19,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(19,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts (4 errors) ==== @@ -31,5 +31,5 @@ tests/cases/conformance/constEnums/constEnumPropertyAccess2.ts(19,1): error TS23 function foo(x: G) { } G.B = 3; ~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. \ No newline at end of file diff --git a/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt b/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt index 221163c097f..29e06bc6a4e 100644 --- a/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt +++ b/tests/baselines/reference/decrementOperatorWithEnumType.errors.txt @@ -1,6 +1,6 @@ -tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(6,25): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(7,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(10,3): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(6,25): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(7,23): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(10,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,1): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,7): error TS2304: Cannot find name 'A'. @@ -13,15 +13,15 @@ tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOp // expression var ResultIsNumber1 = --ENUM1["A"]; ~~~~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. var ResultIsNumber2 = ENUM1.A--; ~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. // miss assignment operator --ENUM1["A"]; ~~~~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ENUM1[A]--; ~~~~~~~~ diff --git a/tests/baselines/reference/enumBasics.js b/tests/baselines/reference/enumBasics.js index 25aec5a72d8..4ac41c0f3d1 100644 --- a/tests/baselines/reference/enumBasics.js +++ b/tests/baselines/reference/enumBasics.js @@ -12,10 +12,10 @@ var x: number = E1.A; // Enum object type is anonymous with properties of the enum type and numeric indexer var e = E1; var e: { - A: E1; - B: E1; - C: E1; - [n: number]: string; + readonly A: E1; + readonly B: E1; + readonly C: E1; + readonly [n: number]: string; }; var e: typeof E1; diff --git a/tests/baselines/reference/enumBasics.symbols b/tests/baselines/reference/enumBasics.symbols index 23f2a400741..ce81a80ca5f 100644 --- a/tests/baselines/reference/enumBasics.symbols +++ b/tests/baselines/reference/enumBasics.symbols @@ -28,20 +28,20 @@ var e = E1; var e: { >e : Symbol(e, Decl(enumBasics.ts, 11, 3), Decl(enumBasics.ts, 12, 3), Decl(enumBasics.ts, 18, 3)) - A: E1; + readonly A: E1; >A : Symbol(A, Decl(enumBasics.ts, 12, 8)) >E1 : Symbol(E1, Decl(enumBasics.ts, 0, 0)) - B: E1; ->B : Symbol(B, Decl(enumBasics.ts, 13, 10)) + readonly B: E1; +>B : Symbol(B, Decl(enumBasics.ts, 13, 19)) >E1 : Symbol(E1, Decl(enumBasics.ts, 0, 0)) - C: E1; ->C : Symbol(C, Decl(enumBasics.ts, 14, 10)) + readonly C: E1; +>C : Symbol(C, Decl(enumBasics.ts, 14, 19)) >E1 : Symbol(E1, Decl(enumBasics.ts, 0, 0)) - [n: number]: string; ->n : Symbol(n, Decl(enumBasics.ts, 16, 5)) + readonly [n: number]: string; +>n : Symbol(n, Decl(enumBasics.ts, 16, 14)) }; var e: typeof E1; diff --git a/tests/baselines/reference/enumBasics.types b/tests/baselines/reference/enumBasics.types index 87f6f12b6b2..cecd8f51136 100644 --- a/tests/baselines/reference/enumBasics.types +++ b/tests/baselines/reference/enumBasics.types @@ -28,19 +28,19 @@ var e = E1; var e: { >e : typeof E1 - A: E1; + readonly A: E1; >A : E1 >E1 : E1 - B: E1; + readonly B: E1; >B : E1 >E1 : E1 - C: E1; + readonly C: E1; >C : E1 >E1 : E1 - [n: number]: string; + readonly [n: number]: string; >n : number }; diff --git a/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt b/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt index 8c556f89732..fc8b682b59e 100644 --- a/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt +++ b/tests/baselines/reference/incrementOperatorWithEnumType.errors.txt @@ -1,7 +1,7 @@ -tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(6,25): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(7,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(10,3): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. -tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(12,1): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(6,25): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(7,23): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(10,3): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. +tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts(12,1): error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ==== tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOperatorWithEnumType.ts (4 errors) ==== @@ -12,16 +12,16 @@ tests/cases/conformance/expressions/unaryOperators/incrementOperator/incrementOp // expression var ResultIsNumber1 = ++ENUM1["B"]; ~~~~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. var ResultIsNumber2 = ENUM1.B++; ~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. // miss assignment operator ++ENUM1["B"]; ~~~~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. ENUM1.B++; ~~~~~~~ -!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer. \ No newline at end of file +!!! error TS2449: The operand of an increment or decrement operator cannot be a constant or a read-only property. \ No newline at end of file diff --git a/tests/baselines/reference/invalidUndefinedAssignments.errors.txt b/tests/baselines/reference/invalidUndefinedAssignments.errors.txt index 4c32b1a6c8e..5eff2e7ff1a 100644 --- a/tests/baselines/reference/invalidUndefinedAssignments.errors.txt +++ b/tests/baselines/reference/invalidUndefinedAssignments.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(4,1): error TS2364: Invalid left-hand side of assignment expression. -tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(5,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(5,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(9,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(14,1): error TS2304: Cannot find name 'I'. tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.ts(17,1): error TS2364: Invalid left-hand side of assignment expression. @@ -15,7 +15,7 @@ tests/cases/conformance/types/primitives/undefined/invalidUndefinedAssignments.t !!! error TS2364: Invalid left-hand side of assignment expression. E.A = x; ~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. class C { foo: string } var f: C; diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.errors.txt b/tests/baselines/reference/objectLiteralGettersAndSetters.errors.txt index 4e04b856d8c..1290859fbf9 100644 --- a/tests/baselines/reference/objectLiteralGettersAndSetters.errors.txt +++ b/tests/baselines/reference/objectLiteralGettersAndSetters.errors.txt @@ -79,13 +79,13 @@ tests/cases/conformance/expressions/objectLiterals/objectLiteralGettersAndSetter var getter1 = { get x(): string { return undefined; } }; ~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - var getter1: { x: string; } + var getter1: { readonly x: string; } // Get accessor only, type of the property is the inferred return type of the get accessor var getter2 = { get x() { return ''; } }; ~ !!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher. - var getter2: { x: string; } + var getter2: { readonly x: string; } // Set accessor only, type of the property is the param type of the set accessor var setter1 = { set x(n: number) { } }; diff --git a/tests/baselines/reference/objectLiteralGettersAndSetters.js b/tests/baselines/reference/objectLiteralGettersAndSetters.js index d226c2c5569..d3a9d643086 100644 --- a/tests/baselines/reference/objectLiteralGettersAndSetters.js +++ b/tests/baselines/reference/objectLiteralGettersAndSetters.js @@ -17,11 +17,11 @@ var callSig3: { num: (n: number) => string; }; // Get accessor only, type of the property is the annotated return type of the get accessor var getter1 = { get x(): string { return undefined; } }; -var getter1: { x: string; } +var getter1: { readonly x: string; } // Get accessor only, type of the property is the inferred return type of the get accessor var getter2 = { get x() { return ''; } }; -var getter2: { x: string; } +var getter2: { readonly x: string; } // Set accessor only, type of the property is the param type of the set accessor var setter1 = { set x(n: number) { } }; diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt index d97d33b0103..d7410ec04cb 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts(10,41): error TS2375: Duplicate number index signature. +tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts(10,70): error TS2375: Duplicate number index signature. ==== tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts (1 errors) ==== @@ -9,8 +9,8 @@ tests/cases/compiler/typeOfEnumAndVarRedeclarations.ts(10,41): error TS2375: Dup b = 1 } var x = E; - var x: { a: E; b: E;[x: number]: string; }; // Shouldnt error + var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error var y = E; - var y: { a: E; b: E;[x: number]: string;[x: number]: string } // two errors: the types are not identical and duplicate signatures - ~~~~~~~~~~~~~~~~~~~ + var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2375: Duplicate number index signature. \ No newline at end of file diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js index ce77eac85e6..391c9c1679a 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js @@ -6,9 +6,9 @@ enum E { b = 1 } var x = E; -var x: { a: E; b: E;[x: number]: string; }; // Shouldnt error +var x: { readonly a: E; readonly b: E; readonly [x: number]: string; }; // Shouldnt error var y = E; -var y: { a: E; b: E;[x: number]: string;[x: number]: string } // two errors: the types are not identical and duplicate signatures +var y: { readonly a: E; readonly b: E; readonly [x: number]: string; readonly [x: number]: string } // two errors: the types are not identical and duplicate signatures //// [typeOfEnumAndVarRedeclarations.js] var E; diff --git a/tests/baselines/reference/validNullAssignments.errors.txt b/tests/baselines/reference/validNullAssignments.errors.txt index 042a7172b52..057d6ce4791 100644 --- a/tests/baselines/reference/validNullAssignments.errors.txt +++ b/tests/baselines/reference/validNullAssignments.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/types/primitives/null/validNullAssignments.ts(10,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/types/primitives/null/validNullAssignments.ts(10,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. tests/cases/conformance/types/primitives/null/validNullAssignments.ts(15,1): error TS2364: Invalid left-hand side of assignment expression. tests/cases/conformance/types/primitives/null/validNullAssignments.ts(20,1): error TS2304: Cannot find name 'I'. tests/cases/conformance/types/primitives/null/validNullAssignments.ts(23,1): error TS2364: Invalid left-hand side of assignment expression. @@ -17,7 +17,7 @@ tests/cases/conformance/types/primitives/null/validNullAssignments.ts(30,1): err enum E { A } E.A = null; // error ~~~ -!!! error TS2364: Invalid left-hand side of assignment expression. +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. class C { foo: string } var f: C; From 756164210431692ad6ae62314aacb9871180c0b6 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 24 Jan 2016 15:44:13 -0800 Subject: [PATCH 068/160] Adding const/readonly to core.d.ts and es6.d.ts --- src/lib/core.d.ts | 273 +++++++++++++++++++++++----------------------- src/lib/es6.d.ts | 98 +++++++++-------- 2 files changed, 186 insertions(+), 185 deletions(-) diff --git a/src/lib/core.d.ts b/src/lib/core.d.ts index cc7d916977c..31cf0ca3136 100644 --- a/src/lib/core.d.ts +++ b/src/lib/core.d.ts @@ -2,8 +2,8 @@ /// ECMAScript APIs ///////////////////////////// -declare var NaN: number; -declare var Infinity: number; +declare const NaN: number; +declare const Infinity: number; /** * Evaluates JavaScript code and executes it. @@ -113,7 +113,7 @@ interface ObjectConstructor { (value: any): any; /** A reference to the prototype for a class of objects. */ - prototype: Object; + readonly prototype: Object; /** * Returns the prototype of an object. @@ -204,7 +204,7 @@ interface ObjectConstructor { /** * Provides functionality common to all JavaScript objects. */ -declare var Object: ObjectConstructor; +declare const Object: ObjectConstructor; /** * Creates a new function. @@ -233,7 +233,7 @@ interface Function { bind(thisArg: any, ...argArray: any[]): any; prototype: any; - length: number; + readonly length: number; // Non-standard extensions arguments: any; @@ -247,10 +247,10 @@ interface FunctionConstructor { */ new (...args: string[]): Function; (...args: string[]): Function; - prototype: Function; + readonly prototype: Function; } -declare var Function: FunctionConstructor; +declare const Function: FunctionConstructor; interface IArguments { [index: number]: any; @@ -398,7 +398,7 @@ interface String { trim(): string; /** Returns the length of a String object. */ - length: number; + readonly length: number; // IE extensions /** @@ -411,20 +411,20 @@ interface String { /** Returns the primitive value of the specified object. */ valueOf(): string; - [index: number]: string; + readonly [index: number]: string; } interface StringConstructor { new (value?: any): String; (value?: any): string; - prototype: String; + readonly prototype: String; fromCharCode(...codes: number[]): string; } /** * Allows manipulation and formatting of text strings and determination and location of substrings within strings. */ -declare var String: StringConstructor; +declare const String: StringConstructor; interface Boolean { /** Returns the primitive value of the specified object. */ @@ -434,10 +434,10 @@ interface Boolean { interface BooleanConstructor { new (value?: any): Boolean; (value?: any): boolean; - prototype: Boolean; + readonly prototype: Boolean; } -declare var Boolean: BooleanConstructor; +declare const Boolean: BooleanConstructor; interface Number { /** @@ -471,57 +471,57 @@ interface Number { interface NumberConstructor { new (value?: any): Number; (value?: any): number; - prototype: Number; + readonly prototype: Number; /** The largest number that can be represented in JavaScript. Equal to approximately 1.79E+308. */ - MAX_VALUE: number; + readonly MAX_VALUE: number; /** The closest number to zero that can be represented in JavaScript. Equal to approximately 5.00E-324. */ - MIN_VALUE: number; + readonly MIN_VALUE: number; /** * A value that is not a number. * In equality comparisons, NaN does not equal any value, including itself. To test whether a value is equivalent to NaN, use the isNaN function. */ - NaN: number; + readonly NaN: number; /** * A value that is less than the largest negative number that can be represented in JavaScript. * JavaScript displays NEGATIVE_INFINITY values as -infinity. */ - NEGATIVE_INFINITY: number; + readonly NEGATIVE_INFINITY: number; /** * A value greater than the largest number that can be represented in JavaScript. * JavaScript displays POSITIVE_INFINITY values as infinity. */ - POSITIVE_INFINITY: number; + readonly POSITIVE_INFINITY: number; } /** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */ -declare var Number: NumberConstructor; +declare const Number: NumberConstructor; interface TemplateStringsArray extends Array { - raw: string[]; + readonly raw: string[]; } interface Math { /** The mathematical constant e. This is Euler's number, the base of natural logarithms. */ - E: number; + readonly E: number; /** The natural logarithm of 10. */ - LN10: number; + readonly LN10: number; /** The natural logarithm of 2. */ - LN2: number; + readonly LN2: number; /** The base-2 logarithm of e. */ - LOG2E: number; + readonly LOG2E: number; /** The base-10 logarithm of e. */ - LOG10E: number; + readonly LOG10E: number; /** Pi. This is the ratio of the circumference of a circle to its diameter. */ - PI: number; + readonly PI: number; /** The square root of 0.5, or, equivalently, one divided by the square root of 2. */ - SQRT1_2: number; + readonly SQRT1_2: number; /** The square root of 2. */ - SQRT2: number; + readonly SQRT2: number; /** * Returns the absolute value of a number (the value without regard to whether it is positive or negative). * For example, the absolute value of -5 is the same as the absolute value of 5. @@ -614,7 +614,7 @@ interface Math { tan(x: number): number; } /** An intrinsic object that provides basic mathematics functionality and constants. */ -declare var Math: Math; +declare const Math: Math; /** Enables basic storage and retrieval of dates and times. */ interface Date { @@ -776,7 +776,7 @@ interface DateConstructor { new (value: string): Date; new (year: number, month: number, date?: number, hours?: number, minutes?: number, seconds?: number, ms?: number): Date; (): string; - prototype: Date; + readonly prototype: Date; /** * Parses a string containing a date, and returns the number of milliseconds between that date and midnight, January 1, 1970. * @param s A date string @@ -796,7 +796,7 @@ interface DateConstructor { now(): number; } -declare var Date: DateConstructor; +declare const Date: DateConstructor; interface RegExpMatchArray extends Array { index?: number; @@ -822,16 +822,16 @@ interface RegExp { test(string: string): boolean; /** Returns a copy of the text of the regular expression pattern. Read-only. The regExp argument is a Regular expression object. It can be a variable name or a literal. */ - source: string; + readonly source: string; /** Returns a Boolean value indicating the state of the global flag (g) used with a regular expression. Default is false. Read-only. */ - global: boolean; + readonly global: boolean; /** Returns a Boolean value indicating the state of the ignoreCase flag (i) used with a regular expression. Default is false. Read-only. */ - ignoreCase: boolean; + readonly ignoreCase: boolean; /** Returns a Boolean value indicating the state of the multiline flag (m) used with a regular expression. Default is false. Read-only. */ - multiline: boolean; + readonly multiline: boolean; lastIndex: number; @@ -842,7 +842,7 @@ interface RegExp { interface RegExpConstructor { new (pattern: string, flags?: string): RegExp; (pattern: string, flags?: string): RegExp; - prototype: RegExp; + readonly prototype: RegExp; // Non-standard extensions $1: string; @@ -857,7 +857,7 @@ interface RegExpConstructor { lastMatch: string; } -declare var RegExp: RegExpConstructor; +declare const RegExp: RegExpConstructor; interface Error { name: string; @@ -867,10 +867,10 @@ interface Error { interface ErrorConstructor { new (message?: string): Error; (message?: string): Error; - prototype: Error; + readonly prototype: Error; } -declare var Error: ErrorConstructor; +declare const Error: ErrorConstructor; interface EvalError extends Error { } @@ -878,10 +878,10 @@ interface EvalError extends Error { interface EvalErrorConstructor { new (message?: string): EvalError; (message?: string): EvalError; - prototype: EvalError; + readonly prototype: EvalError; } -declare var EvalError: EvalErrorConstructor; +declare const EvalError: EvalErrorConstructor; interface RangeError extends Error { } @@ -889,10 +889,10 @@ interface RangeError extends Error { interface RangeErrorConstructor { new (message?: string): RangeError; (message?: string): RangeError; - prototype: RangeError; + readonly prototype: RangeError; } -declare var RangeError: RangeErrorConstructor; +declare const RangeError: RangeErrorConstructor; interface ReferenceError extends Error { } @@ -900,10 +900,10 @@ interface ReferenceError extends Error { interface ReferenceErrorConstructor { new (message?: string): ReferenceError; (message?: string): ReferenceError; - prototype: ReferenceError; + readonly prototype: ReferenceError; } -declare var ReferenceError: ReferenceErrorConstructor; +declare const ReferenceError: ReferenceErrorConstructor; interface SyntaxError extends Error { } @@ -911,10 +911,10 @@ interface SyntaxError extends Error { interface SyntaxErrorConstructor { new (message?: string): SyntaxError; (message?: string): SyntaxError; - prototype: SyntaxError; + readonly prototype: SyntaxError; } -declare var SyntaxError: SyntaxErrorConstructor; +declare const SyntaxError: SyntaxErrorConstructor; interface TypeError extends Error { } @@ -922,10 +922,10 @@ interface TypeError extends Error { interface TypeErrorConstructor { new (message?: string): TypeError; (message?: string): TypeError; - prototype: TypeError; + readonly prototype: TypeError; } -declare var TypeError: TypeErrorConstructor; +declare const TypeError: TypeErrorConstructor; interface URIError extends Error { } @@ -933,10 +933,10 @@ interface URIError extends Error { interface URIErrorConstructor { new (message?: string): URIError; (message?: string): URIError; - prototype: URIError; + readonly prototype: URIError; } -declare var URIError: URIErrorConstructor; +declare const URIError: URIErrorConstructor; interface JSON { /** @@ -981,7 +981,7 @@ interface JSON { /** * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format. */ -declare var JSON: JSON; +declare const JSON: JSON; ///////////////////////////// @@ -1238,10 +1238,10 @@ interface ArrayConstructor { (arrayLength: number): T[]; (...items: T[]): T[]; isArray(arg: any): arg is Array; - prototype: Array; + readonly prototype: Array; } -declare var Array: ArrayConstructor; +declare const Array: ArrayConstructor; interface TypedPropertyDescriptor { enumerable?: boolean; @@ -1271,11 +1271,10 @@ interface PromiseLike { } interface ArrayLike { - length: number; - [n: number]: T; + readonly length: number; + readonly [n: number]: T; } - /** * Represents a raw buffer of binary data, which is used to store data for the * different typed arrays. ArrayBuffers cannot be read from or written to directly, @@ -1286,7 +1285,7 @@ interface ArrayBuffer { /** * Read-only. The length of the ArrayBuffer (in bytes). */ - byteLength: number; + readonly byteLength: number; /** * Returns a section of an ArrayBuffer. @@ -1295,11 +1294,11 @@ interface ArrayBuffer { } interface ArrayBufferConstructor { - prototype: ArrayBuffer; + readonly prototype: ArrayBuffer; new (byteLength: number): ArrayBuffer; isView(arg: any): arg is ArrayBufferView; } -declare var ArrayBuffer: ArrayBufferConstructor; +declare const ArrayBuffer: ArrayBufferConstructor; interface ArrayBufferView { /** @@ -1319,9 +1318,9 @@ interface ArrayBufferView { } interface DataView { - buffer: ArrayBuffer; - byteLength: number; - byteOffset: number; + readonly buffer: ArrayBuffer; + readonly byteLength: number; + readonly byteOffset: number; /** * Gets the Float32 value at the specified byte offset from the start of the view. There is * no alignment constraint; multi-byte values may be fetched from any offset. @@ -1449,7 +1448,7 @@ interface DataView { interface DataViewConstructor { new (buffer: ArrayBuffer, byteOffset?: number, byteLength?: number): DataView; } -declare var DataView: DataViewConstructor; +declare const DataView: DataViewConstructor; /** * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested @@ -1459,22 +1458,22 @@ interface Int8Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -1573,7 +1572,7 @@ interface Int8Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -1697,7 +1696,7 @@ interface Int8Array { [index: number]: number; } interface Int8ArrayConstructor { - prototype: Int8Array; + readonly prototype: Int8Array; new (length: number): Int8Array; new (array: ArrayLike): Int8Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int8Array; @@ -1705,7 +1704,7 @@ interface Int8ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -1722,7 +1721,7 @@ interface Int8ArrayConstructor { from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int8Array; } -declare var Int8Array: Int8ArrayConstructor; +declare const Int8Array: Int8ArrayConstructor; /** * A typed array of 8-bit unsigned integer values. The contents are initialized to 0. If the @@ -1732,22 +1731,22 @@ interface Uint8Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -1846,7 +1845,7 @@ interface Uint8Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -1971,7 +1970,7 @@ interface Uint8Array { } interface Uint8ArrayConstructor { - prototype: Uint8Array; + readonly prototype: Uint8Array; new (length: number): Uint8Array; new (array: ArrayLike): Uint8Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8Array; @@ -1979,7 +1978,7 @@ interface Uint8ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -1996,7 +1995,7 @@ interface Uint8ArrayConstructor { from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8Array; } -declare var Uint8Array: Uint8ArrayConstructor; +declare const Uint8Array: Uint8ArrayConstructor; /** * A typed array of 8-bit unsigned integer (clamped) values. The contents are initialized to 0. @@ -2006,22 +2005,22 @@ interface Uint8ClampedArray { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -2120,7 +2119,7 @@ interface Uint8ClampedArray { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -2245,7 +2244,7 @@ interface Uint8ClampedArray { } interface Uint8ClampedArrayConstructor { - prototype: Uint8ClampedArray; + readonly prototype: Uint8ClampedArray; new (length: number): Uint8ClampedArray; new (array: ArrayLike): Uint8ClampedArray; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint8ClampedArray; @@ -2253,7 +2252,7 @@ interface Uint8ClampedArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -2269,7 +2268,7 @@ interface Uint8ClampedArrayConstructor { */ from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint8ClampedArray; } -declare var Uint8ClampedArray: Uint8ClampedArrayConstructor; +declare const Uint8ClampedArray: Uint8ClampedArrayConstructor; /** * A typed array of 16-bit signed integer values. The contents are initialized to 0. If the @@ -2279,22 +2278,22 @@ interface Int16Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -2393,7 +2392,7 @@ interface Int16Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -2518,7 +2517,7 @@ interface Int16Array { } interface Int16ArrayConstructor { - prototype: Int16Array; + readonly prototype: Int16Array; new (length: number): Int16Array; new (array: ArrayLike): Int16Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int16Array; @@ -2526,7 +2525,7 @@ interface Int16ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -2543,7 +2542,7 @@ interface Int16ArrayConstructor { from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int16Array; } -declare var Int16Array: Int16ArrayConstructor; +declare const Int16Array: Int16ArrayConstructor; /** * A typed array of 16-bit unsigned integer values. The contents are initialized to 0. If the @@ -2553,22 +2552,22 @@ interface Uint16Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -2667,7 +2666,7 @@ interface Uint16Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -2792,7 +2791,7 @@ interface Uint16Array { } interface Uint16ArrayConstructor { - prototype: Uint16Array; + readonly prototype: Uint16Array; new (length: number): Uint16Array; new (array: ArrayLike): Uint16Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint16Array; @@ -2800,7 +2799,7 @@ interface Uint16ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -2817,7 +2816,7 @@ interface Uint16ArrayConstructor { from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint16Array; } -declare var Uint16Array: Uint16ArrayConstructor; +declare const Uint16Array: Uint16ArrayConstructor; /** * A typed array of 32-bit signed integer values. The contents are initialized to 0. If the * requested number of bytes could not be allocated an exception is raised. @@ -2826,22 +2825,22 @@ interface Int32Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -2940,7 +2939,7 @@ interface Int32Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -3065,7 +3064,7 @@ interface Int32Array { } interface Int32ArrayConstructor { - prototype: Int32Array; + readonly prototype: Int32Array; new (length: number): Int32Array; new (array: ArrayLike): Int32Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Int32Array; @@ -3073,7 +3072,7 @@ interface Int32ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -3089,7 +3088,7 @@ interface Int32ArrayConstructor { */ from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Int32Array; } -declare var Int32Array: Int32ArrayConstructor; +declare const Int32Array: Int32ArrayConstructor; /** * A typed array of 32-bit unsigned integer values. The contents are initialized to 0. If the @@ -3099,22 +3098,22 @@ interface Uint32Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -3213,7 +3212,7 @@ interface Uint32Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -3338,7 +3337,7 @@ interface Uint32Array { } interface Uint32ArrayConstructor { - prototype: Uint32Array; + readonly prototype: Uint32Array; new (length: number): Uint32Array; new (array: ArrayLike): Uint32Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Uint32Array; @@ -3346,7 +3345,7 @@ interface Uint32ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -3362,7 +3361,7 @@ interface Uint32ArrayConstructor { */ from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Uint32Array; } -declare var Uint32Array: Uint32ArrayConstructor; +declare const Uint32Array: Uint32ArrayConstructor; /** * A typed array of 32-bit float values. The contents are initialized to 0. If the requested number @@ -3372,22 +3371,22 @@ interface Float32Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -3486,7 +3485,7 @@ interface Float32Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -3611,7 +3610,7 @@ interface Float32Array { } interface Float32ArrayConstructor { - prototype: Float32Array; + readonly prototype: Float32Array; new (length: number): Float32Array; new (array: ArrayLike): Float32Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float32Array; @@ -3619,7 +3618,7 @@ interface Float32ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -3636,7 +3635,7 @@ interface Float32ArrayConstructor { from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Float32Array; } -declare var Float32Array: Float32ArrayConstructor; +declare const Float32Array: Float32ArrayConstructor; /** * A typed array of 64-bit float values. The contents are initialized to 0. If the requested @@ -3646,22 +3645,22 @@ interface Float64Array { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * The ArrayBuffer instance referenced by the array. */ - buffer: ArrayBuffer; + readonly buffer: ArrayBuffer; /** * The length in bytes of the array. */ - byteLength: number; + readonly byteLength: number; /** * The offset in bytes of the array. */ - byteOffset: number; + readonly byteOffset: number; /** * Returns the this object after copying a section of the array identified by start and end @@ -3760,7 +3759,7 @@ interface Float64Array { /** * The length of the array. */ - length: number; + readonly length: number; /** * Calls a defined callback function on each element of an array, and returns an array that @@ -3885,7 +3884,7 @@ interface Float64Array { } interface Float64ArrayConstructor { - prototype: Float64Array; + readonly prototype: Float64Array; new (length: number): Float64Array; new (array: ArrayLike): Float64Array; new (buffer: ArrayBuffer, byteOffset?: number, length?: number): Float64Array; @@ -3893,7 +3892,7 @@ interface Float64ArrayConstructor { /** * The size in bytes of each element in the array. */ - BYTES_PER_ELEMENT: number; + readonly BYTES_PER_ELEMENT: number; /** * Returns a new array from a set of elements. @@ -3909,4 +3908,4 @@ interface Float64ArrayConstructor { */ from(arrayLike: ArrayLike, mapfn?: (v: number, k: number) => number, thisArg?: any): Float64Array; } -declare var Float64Array: Float64ArrayConstructor; +declare const Float64Array: Float64ArrayConstructor; diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts index f5d6b06bc47..5d71fba2b0b 100644 --- a/src/lib/es6.d.ts +++ b/src/lib/es6.d.ts @@ -7,14 +7,14 @@ interface Symbol { /** Returns the primitive value of the specified object. */ valueOf(): Object; - [Symbol.toStringTag]: "Symbol"; + readonly [Symbol.toStringTag]: "Symbol"; } interface SymbolConstructor { /** * A reference to the prototype. */ - prototype: Symbol; + readonly prototype: Symbol; /** * Returns a new unique Symbol value. @@ -42,67 +42,67 @@ interface SymbolConstructor { * A method that determines if a constructor object recognizes an object as one of the * constructor’s instances. Called by the semantics of the instanceof operator. */ - hasInstance: symbol; + readonly hasInstance: symbol; /** * A Boolean value that if true indicates that an object should flatten to its array elements * by Array.prototype.concat. */ - isConcatSpreadable: symbol; + readonly isConcatSpreadable: symbol; /** * A method that returns the default iterator for an object. Called by the semantics of the * for-of statement. */ - iterator: symbol; + readonly iterator: symbol; /** * A regular expression method that matches the regular expression against a string. Called * by the String.prototype.match method. */ - match: symbol; + readonly match: symbol; /** * A regular expression method that replaces matched substrings of a string. Called by the * String.prototype.replace method. */ - replace: symbol; + readonly replace: symbol; /** * A regular expression method that returns the index within a string that matches the * regular expression. Called by the String.prototype.search method. */ - search: symbol; + readonly search: symbol; /** * A function valued property that is the constructor function that is used to create * derived objects. */ - species: symbol; + readonly species: symbol; /** * A regular expression method that splits a string at the indices that match the regular * expression. Called by the String.prototype.split method. */ - split: symbol; + readonly split: symbol; /** * A method that converts an object to a corresponding primitive value. * Called by the ToPrimitive abstract operation. */ - toPrimitive: symbol; + readonly toPrimitive: symbol; /** * A String value that is used in the creation of the default string description of an object. * Called by the built-in method Object.prototype.toString. */ - toStringTag: symbol; + readonly toStringTag: symbol; /** * An Object whose own property names are property names that are excluded from the 'with' * environment bindings of the associated objects. */ - unscopables: symbol; + readonly unscopables: symbol; } declare var Symbol: SymbolConstructor; @@ -200,7 +200,7 @@ interface Function { /** * Returns the name of the function. Function names are read-only and can not be changed. */ - name: string; + readonly name: string; /** * Determines whether the given value inherits from this function if this function was used @@ -218,7 +218,7 @@ interface NumberConstructor { * that is representable as a Number value, which is approximately: * 2.2204460492503130808472633361816 x 10‍−‍16. */ - EPSILON: number; + readonly EPSILON: number; /** * Returns true if passed value is finite. @@ -253,14 +253,14 @@ interface NumberConstructor { * a Number value. * The value of Number.MIN_SAFE_INTEGER is 9007199254740991 2^53 − 1. */ - MAX_SAFE_INTEGER: number; + readonly MAX_SAFE_INTEGER: number; /** * The value of the smallest integer n such that n and n − 1 are both exactly representable as * a Number value. * The value of Number.MIN_SAFE_INTEGER is −9007199254740991 (−(2^53 − 1)). */ - MIN_SAFE_INTEGER: number; + readonly MIN_SAFE_INTEGER: number; /** * Converts a string to a floating-point number. @@ -565,7 +565,7 @@ interface IterableIterator extends Iterator { } interface GeneratorFunction extends Function { - [Symbol.toStringTag]: "GeneratorFunction"; + readonly [Symbol.toStringTag]: "GeneratorFunction"; } interface GeneratorFunctionConstructor { @@ -575,7 +575,7 @@ interface GeneratorFunctionConstructor { */ new (...args: string[]): GeneratorFunction; (...args: string[]): GeneratorFunction; - prototype: GeneratorFunction; + readonly prototype: GeneratorFunction; } declare var GeneratorFunction: GeneratorFunctionConstructor; @@ -690,7 +690,7 @@ interface Math { */ cbrt(x: number): number; - [Symbol.toStringTag]: "Math"; + readonly [Symbol.toStringTag]: "Math"; } interface Date { @@ -776,19 +776,19 @@ interface RegExp { * * If no flags are set, the value is the empty string. */ - flags: string; + readonly flags: string; /** * Returns a Boolean value indicating the state of the sticky flag (y) used with a regular * expression. Default is false. Read-only. */ - sticky: boolean; + readonly sticky: boolean; /** * Returns a Boolean value indicating the state of the Unicode flag (u) used with a regular * expression. Default is false. Read-only. */ - unicode: boolean; + readonly unicode: boolean; } interface RegExpConstructor { @@ -804,33 +804,34 @@ interface Map { has(key: K): boolean; keys(): IterableIterator; set(key: K, value?: V): Map; - size: number; + readonly size: number; values(): IterableIterator; [Symbol.iterator]():IterableIterator<[K,V]>; - [Symbol.toStringTag]: "Map"; + readonly [Symbol.toStringTag]: "Map"; } interface MapConstructor { new (): Map; new (): Map; new (iterable: Iterable<[K, V]>): Map; - prototype: Map; + readonly prototype: Map; } declare var Map: MapConstructor; interface WeakMap { + clear(): void; delete(key: K): boolean; get(key: K): V; has(key: K): boolean; set(key: K, value?: V): WeakMap; - [Symbol.toStringTag]: "WeakMap"; + readonly [Symbol.toStringTag]: "WeakMap"; } interface WeakMapConstructor { new (): WeakMap; new (): WeakMap; new (iterable: Iterable<[K, V]>): WeakMap; - prototype: WeakMap; + readonly prototype: WeakMap; } declare var WeakMap: WeakMapConstructor; @@ -842,37 +843,38 @@ interface Set { forEach(callbackfn: (value: T, index: T, set: Set) => void, thisArg?: any): void; has(value: T): boolean; keys(): IterableIterator; - size: number; + readonly size: number; values(): IterableIterator; [Symbol.iterator]():IterableIterator; - [Symbol.toStringTag]: "Set"; + readonly [Symbol.toStringTag]: "Set"; } interface SetConstructor { new (): Set; new (): Set; new (iterable: Iterable): Set; - prototype: Set; + readonly prototype: Set; } declare var Set: SetConstructor; interface WeakSet { add(value: T): WeakSet; + clear(): void; delete(value: T): boolean; has(value: T): boolean; - [Symbol.toStringTag]: "WeakSet"; + readonly [Symbol.toStringTag]: "WeakSet"; } interface WeakSetConstructor { new (): WeakSet; new (): WeakSet; new (iterable: Iterable): WeakSet; - prototype: WeakSet; + readonly prototype: WeakSet; } declare var WeakSet: WeakSetConstructor; interface JSON { - [Symbol.toStringTag]: "JSON"; + readonly [Symbol.toStringTag]: "JSON"; } /** @@ -882,11 +884,11 @@ interface JSON { * buffer as needed. */ interface ArrayBuffer { - [Symbol.toStringTag]: "ArrayBuffer"; + readonly [Symbol.toStringTag]: "ArrayBuffer"; } interface DataView { - [Symbol.toStringTag]: "DataView"; + readonly [Symbol.toStringTag]: "DataView"; } /** @@ -907,7 +909,7 @@ interface Int8Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int8Array"; + readonly [Symbol.toStringTag]: "Int8Array"; } interface Int8ArrayConstructor { @@ -940,7 +942,7 @@ interface Uint8Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "UInt8Array"; + readonly [Symbol.toStringTag]: "UInt8Array"; } interface Uint8ArrayConstructor { @@ -976,7 +978,7 @@ interface Uint8ClampedArray { values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint8ClampedArray"; + readonly [Symbol.toStringTag]: "Uint8ClampedArray"; } interface Uint8ClampedArrayConstructor { @@ -1014,7 +1016,7 @@ interface Int16Array { [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int16Array"; + readonly [Symbol.toStringTag]: "Int16Array"; } interface Int16ArrayConstructor { @@ -1047,7 +1049,7 @@ interface Uint16Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint16Array"; + readonly [Symbol.toStringTag]: "Uint16Array"; } interface Uint16ArrayConstructor { @@ -1080,7 +1082,7 @@ interface Int32Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Int32Array"; + readonly [Symbol.toStringTag]: "Int32Array"; } interface Int32ArrayConstructor { @@ -1113,7 +1115,7 @@ interface Uint32Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Uint32Array"; + readonly [Symbol.toStringTag]: "Uint32Array"; } interface Uint32ArrayConstructor { @@ -1146,7 +1148,7 @@ interface Float32Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Float32Array"; + readonly [Symbol.toStringTag]: "Float32Array"; } interface Float32ArrayConstructor { @@ -1179,7 +1181,7 @@ interface Float64Array { */ values(): IterableIterator; [Symbol.iterator](): IterableIterator; - [Symbol.toStringTag]: "Float64Array"; + readonly [Symbol.toStringTag]: "Float64Array"; } interface Float64ArrayConstructor { @@ -1256,14 +1258,14 @@ interface Promise { catch(onrejected?: (reason: any) => T | PromiseLike): Promise; catch(onrejected?: (reason: any) => void): Promise; - [Symbol.toStringTag]: "Promise"; + readonly [Symbol.toStringTag]: "Promise"; } interface PromiseConstructor { /** * A reference to the prototype. */ - prototype: Promise; + readonly prototype: Promise; /** * Creates a new Promise. @@ -1325,7 +1327,7 @@ interface PromiseConstructor { */ resolve(): Promise; - [Symbol.species]: Function; + readonly [Symbol.species]: Function; } declare var Promise: PromiseConstructor; From 0b1f0d867ef47d81311452b6f76f197097b16bb5 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 24 Jan 2016 15:44:29 -0800 Subject: [PATCH 069/160] Accepting new baselines --- tests/baselines/reference/redefineArray.errors.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/baselines/reference/redefineArray.errors.txt b/tests/baselines/reference/redefineArray.errors.txt index b0062abff88..82ef91807c2 100644 --- a/tests/baselines/reference/redefineArray.errors.txt +++ b/tests/baselines/reference/redefineArray.errors.txt @@ -1,9 +1,7 @@ -tests/cases/compiler/redefineArray.ts(1,1): error TS2322: Type '(n: number, s: string) => number' is not assignable to type 'ArrayConstructor'. - Property 'isArray' is missing in type '(n: number, s: string) => number'. +tests/cases/compiler/redefineArray.ts(1,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. ==== tests/cases/compiler/redefineArray.ts (1 errors) ==== Array = function (n:number, s:string) {return n;}; ~~~~~ -!!! error TS2322: Type '(n: number, s: string) => number' is not assignable to type 'ArrayConstructor'. -!!! error TS2322: Property 'isArray' is missing in type '(n: number, s: string) => number'. \ No newline at end of file +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. \ No newline at end of file From 88676d680fd8a887b0877b9cb8babf49fd787640 Mon Sep 17 00:00:00 2001 From: york yao Date: Mon, 25 Jan 2016 07:50:22 +0800 Subject: [PATCH 070/160] a better way since languageVersion is a number --- src/compiler/emitter.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index dbde9c14153..f6e70738071 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6108,7 +6108,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import x = require("foo") // import * as x from "foo" if (!isExportedImport) { - if (languageVersion !== ScriptTarget.ES6) { + if (languageVersion <= ScriptTarget.ES5) { write("var "); } else { @@ -6126,7 +6126,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import d, { x, y } from "foo" const isNakedImport = SyntaxKind.ImportDeclaration && !(node).importClause; if (!isNakedImport) { - if (languageVersion !== ScriptTarget.ES6) { + if (languageVersion <= ScriptTarget.ES5) { write("var "); } else { @@ -6158,7 +6158,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else if (namespaceDeclaration && isDefaultImport(node)) { // import d, * as x from "foo" - if (languageVersion !== ScriptTarget.ES6) { + if (languageVersion <= ScriptTarget.ES5) { write("var "); } else { From 72c3bb6930ca0aa7359079141ffa9976122f00f2 Mon Sep 17 00:00:00 2001 From: york yao Date: Mon, 25 Jan 2016 10:48:23 +0800 Subject: [PATCH 071/160] extract a helper method --- src/compiler/emitter.ts | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index f6e70738071..fac17cd633c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6096,6 +6096,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } } + function emitVar() { + if (languageVersion <= ScriptTarget.ES5) { + write("var "); + } + else { + write("const "); + } + } + function emitExternalImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) { if (contains(externalImports, node)) { const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0; @@ -6108,12 +6117,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import x = require("foo") // import * as x from "foo" if (!isExportedImport) { - if (languageVersion <= ScriptTarget.ES5) { - write("var "); - } - else { - write("const "); - } + emitVar(); }; emitModuleMemberName(namespaceDeclaration); write(" = "); @@ -6126,12 +6130,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import d, { x, y } from "foo" const isNakedImport = SyntaxKind.ImportDeclaration && !(node).importClause; if (!isNakedImport) { - if (languageVersion <= ScriptTarget.ES5) { - write("var "); - } - else { - write("const "); - } + emitVar(); write(getGeneratedNameForNode(node)); write(" = "); } @@ -6158,12 +6157,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else if (namespaceDeclaration && isDefaultImport(node)) { // import d, * as x from "foo" - if (languageVersion <= ScriptTarget.ES5) { - write("var "); - } - else { - write("const "); - } + emitVar(); emitModuleMemberName(namespaceDeclaration); write(" = "); write(getGeneratedNameForNode(node)); From d06d66cf5d95785c84b99944c63f9f05fa21a8ef Mon Sep 17 00:00:00 2001 From: york yao Date: Mon, 25 Jan 2016 13:35:12 +0800 Subject: [PATCH 072/160] use a local string rather than a function --- src/compiler/emitter.ts | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index fac17cd633c..8fed6ee42f9 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -6096,19 +6096,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } } - function emitVar() { - if (languageVersion <= ScriptTarget.ES5) { - write("var "); - } - else { - write("const "); - } - } - function emitExternalImportDeclaration(node: ImportDeclaration | ImportEqualsDeclaration) { if (contains(externalImports, node)) { const isExportedImport = node.kind === SyntaxKind.ImportEqualsDeclaration && (node.flags & NodeFlags.Export) !== 0; const namespaceDeclaration = getNamespaceDeclarationNode(node); + const varOrConst = (languageVersion <= ScriptTarget.ES5) ? "var " : "const "; if (modulekind !== ModuleKind.AMD) { emitLeadingComments(node); @@ -6117,7 +6109,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import x = require("foo") // import * as x from "foo" if (!isExportedImport) { - emitVar(); + write(varOrConst); }; emitModuleMemberName(namespaceDeclaration); write(" = "); @@ -6130,7 +6122,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // import d, { x, y } from "foo" const isNakedImport = SyntaxKind.ImportDeclaration && !(node).importClause; if (!isNakedImport) { - emitVar(); + write(varOrConst); write(getGeneratedNameForNode(node)); write(" = "); } @@ -6157,7 +6149,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else if (namespaceDeclaration && isDefaultImport(node)) { // import d, * as x from "foo" - emitVar(); + write(varOrConst); emitModuleMemberName(namespaceDeclaration); write(" = "); write(getGeneratedNameForNode(node)); From 4d3f6e76b8bf4155c78fe849c917c61db40cf3a3 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 25 Jan 2016 10:32:34 -0800 Subject: [PATCH 073/160] Error for Promise redeclaration in module with async --- src/compiler/checker.ts | 74 ++++++++++++++++--- src/compiler/diagnosticMessages.json | 6 +- src/compiler/emitter.ts | 8 +- .../asyncAliasReturnType_es6.errors.txt | 10 --- .../reference/asyncAliasReturnType_es6.js | 2 +- .../asyncAliasReturnType_es6.symbols | 11 +++ .../reference/asyncAliasReturnType_es6.types | 11 +++ .../reference/asyncArrowFunction1_es6.js | 2 +- .../reference/asyncArrowFunction6_es6.js | 2 +- .../reference/asyncArrowFunction7_es6.js | 4 +- .../reference/asyncArrowFunction8_es6.js | 2 +- ...asyncArrowFunctionCapturesArguments_es6.js | 2 +- .../asyncArrowFunctionCapturesThis_es6.js | 2 +- .../asyncAwaitIsolatedModules_es6.js | 48 ++++++------ tests/baselines/reference/asyncAwait_es6.js | 48 ++++++------ .../asyncFunctionDeclaration11_es6.js | 2 +- .../asyncFunctionDeclaration13_es6.js | 2 +- .../asyncFunctionDeclaration14_es6.js | 2 +- .../asyncFunctionDeclaration15_es6.errors.txt | 17 +---- .../asyncFunctionDeclaration15_es6.js | 38 +++++----- .../asyncFunctionDeclaration1_es6.js | 2 +- .../asyncFunctionDeclaration6_es6.js | 2 +- .../asyncFunctionDeclaration7_es6.js | 4 +- .../asyncFunctionDeclaration9_es6.js | 2 +- .../reference/asyncFunctionsAcrossFiles.js | 8 +- .../reference/asyncImportedPromise_es6.js | 5 +- .../reference/asyncMethodWithSuper_es6.js | 4 +- tests/baselines/reference/asyncMultiFile.js | 4 +- .../reference/asyncQualifiedReturnType_es6.js | 2 +- .../reference/awaitBinaryExpression1_es6.js | 2 +- .../reference/awaitBinaryExpression2_es6.js | 2 +- .../reference/awaitBinaryExpression3_es6.js | 2 +- .../reference/awaitBinaryExpression4_es6.js | 2 +- .../reference/awaitBinaryExpression5_es6.js | 2 +- .../reference/awaitCallExpression1_es6.js | 2 +- .../reference/awaitCallExpression2_es6.js | 2 +- .../reference/awaitCallExpression3_es6.js | 2 +- .../reference/awaitCallExpression4_es6.js | 2 +- .../reference/awaitCallExpression5_es6.js | 2 +- .../reference/awaitCallExpression6_es6.js | 2 +- .../reference/awaitCallExpression7_es6.js | 2 +- .../reference/awaitCallExpression8_es6.js | 2 +- tests/baselines/reference/awaitUnion_es6.js | 2 +- .../reference/reachabilityChecks7.js | 12 +-- 44 files changed, 212 insertions(+), 154 deletions(-) delete mode 100644 tests/baselines/reference/asyncAliasReturnType_es6.errors.txt create mode 100644 tests/baselines/reference/asyncAliasReturnType_es6.symbols create mode 100644 tests/baselines/reference/asyncAliasReturnType_es6.types diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ca41e509664..b3876b9732d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -376,8 +376,8 @@ namespace ts { const moduleAugmentation = moduleName.parent; if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) { // this is a combined symbol for multiple augmentations within the same file. - // its symbol already has accumulated information for all declarations - // so we need to add it just once - do the work only for first declaration + // its symbol already has accumulated information for all declarations + // so we need to add it just once - do the work only for first declaration Debug.assert(moduleAugmentation.symbol.declarations.length > 1); return; } @@ -386,7 +386,7 @@ namespace ts { mergeSymbolTable(globals, moduleAugmentation.symbol.exports); } else { - // find a module that about to be augmented + // find a module that about to be augmented let mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found); if (!mainModule) { return; @@ -810,7 +810,7 @@ namespace ts { } // No static member is present. - // Check if we're in an instance method and look for a relevant instance member. + // Check if we're in an instance method and look for a relevant instance member. if (location === container && !(location.flags & NodeFlags.Static)) { const instanceType = (getDeclaredTypeOfSymbol(classSymbol)).thisType; if (getPropertyOfType(instanceType, name)) { @@ -1161,7 +1161,7 @@ namespace ts { return getMergedSymbol(sourceFile.symbol); } if (moduleNotFoundError) { - // report errors only if it was requested + // report errors only if it was requested error(moduleReferenceLiteral, Diagnostics.File_0_is_not_a_module, sourceFile.fileName); } return undefined; @@ -2471,10 +2471,21 @@ namespace ts { function getDeclarationContainer(node: Node): Node { node = getRootDeclaration(node); + while (node) { + switch (node.kind) { + case SyntaxKind.VariableDeclaration: + case SyntaxKind.VariableDeclarationList: + case SyntaxKind.ImportSpecifier: + case SyntaxKind.NamedImports: + case SyntaxKind.NamespaceImport: + case SyntaxKind.ImportClause: + node = node.parent; + break; - // Parent chain: - // VaribleDeclaration -> VariableDeclarationList -> VariableStatement -> 'Declaration Container' - return node.kind === SyntaxKind.VariableDeclaration ? node.parent.parent.parent : node.parent; + default: + return node.parent; + } + } } function getTypeOfPrototypeProperty(prototype: Symbol): Type { @@ -11359,6 +11370,9 @@ namespace ts { checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type); } } + else if (isAsyncFunctionLike(node)) { + checkAsyncFunctionReturnType(node); + } } } @@ -12283,6 +12297,21 @@ namespace ts { return unknownType; } + if (languageVersion >= ScriptTarget.ES6) { + const promisedType = getPromisedType(promiseType); + if (!promisedType) { + error(node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType)); + return unknownType; + } + + const promiseInstantiation = createPromiseType(promisedType); + if (!checkTypeAssignableTo(promiseInstantiation, promiseType, node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) { + return unknownType; + } + + return promisedType; + } + const promiseConstructor = getNodeLinks(node.type).resolvedSymbol; if (!promiseConstructor || !symbolIsValue(promiseConstructor)) { const typeName = promiseConstructor @@ -12457,6 +12486,7 @@ namespace ts { checkCollisionWithCapturedSuperVariable(node, node.name); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); } } @@ -12641,6 +12671,25 @@ namespace ts { } } + function checkCollisionWithGlobalPromiseInGeneratedCode(node: Node, name: Identifier): void { + if (!needCollisionCheckForIdentifier(node, name, "Promise")) { + return; + } + + // Uninstantiated modules shouldnt do this check + if (node.kind === SyntaxKind.ModuleDeclaration && getModuleInstanceState(node) !== ModuleInstanceState.Instantiated) { + return; + } + + // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent + const parent = getDeclarationContainer(node); + if (parent.kind === SyntaxKind.SourceFile && isExternalOrCommonJsModule(parent) && parent.flags & NodeFlags.HasAsyncFunctions) { + // If the declaration happens to be in external module, report error that require and exports are reserved keywords + error(name, Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, + declarationNameToString(name), declarationNameToString(name)); + } + } + function checkVarDeclaredNamesNotShadowed(node: VariableDeclaration | BindingElement) { // - ScriptBody : StatementList // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList @@ -12819,6 +12868,7 @@ namespace ts { checkCollisionWithCapturedSuperVariable(node, node.name); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); } } @@ -13584,6 +13634,7 @@ namespace ts { checkTypeNameIsReserved(node.name, Diagnostics.Class_name_cannot_be_0); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); } checkTypeParameters(node.typeParameters); checkExportsOnMergedDeclarations(node); @@ -14090,6 +14141,7 @@ namespace ts { checkTypeNameIsReserved(node.name, Diagnostics.Enum_name_cannot_be_0); checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); computeEnumMemberValues(node); @@ -14194,6 +14246,7 @@ namespace ts { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkExportsOnMergedDeclarations(node); const symbol = getSymbolOfNode(node); @@ -14224,10 +14277,10 @@ namespace ts { if (isAmbientExternalModule) { if (isExternalModuleAugmentation(node)) { // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module) - // otherwise we'll be swamped in cascading errors. + // otherwise we'll be swamped in cascading errors. // We can detect if augmentation was applied using following rules: // - augmentation for a global scope is always applied - // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). + // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged); if (checkBody) { // body of ambient external module is always a module block @@ -14386,6 +14439,7 @@ namespace ts { function checkImportBinding(node: ImportEqualsDeclaration | ImportClause | NamespaceImport | ImportSpecifier) { checkCollisionWithCapturedThisVariable(node, node.name); checkCollisionWithRequireExportsInGeneratedCode(node, node.name); + checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name); checkAliasSymbol(node); } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 8fd40f7b421..b8defa6325b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -794,7 +794,7 @@ "A decorator can only decorate a method implementation, not an overload.": { "category": "Error", "code": 1249 - }, + }, "'with' statements are not allowed in an async function block.": { "category": "Error", "code": 1300 @@ -1687,6 +1687,10 @@ "category": "Error", "code": 2528 }, + "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions.": { + "category": "Error", + "code": 2529 + }, "JSX element attributes type '{0}' may not be a union type.": { "category": "Error", "code": 2600 diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 762b491155b..e85b76160c7 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -320,7 +320,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) { const awaiterHelper = ` var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -4541,11 +4541,11 @@ const _super = (function (geti, seti) { write(", void 0, "); } - if (promiseConstructor) { - emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false); + if (languageVersion >= ScriptTarget.ES6 || !promiseConstructor) { + write("void 0"); } else { - write("Promise"); + emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false); } // Emit the call to __awaiter. diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.errors.txt b/tests/baselines/reference/asyncAliasReturnType_es6.errors.txt deleted file mode 100644 index ec532d1380d..00000000000 --- a/tests/baselines/reference/asyncAliasReturnType_es6.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts(3,16): error TS1055: Type 'PromiseAlias' is not a valid async function return type. - - -==== tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts (1 errors) ==== - type PromiseAlias = Promise; - - async function f(): PromiseAlias { - ~ -!!! error TS1055: Type 'PromiseAlias' is not a valid async function return type. - } \ No newline at end of file diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.js b/tests/baselines/reference/asyncAliasReturnType_es6.js index 0af63b0bfa6..45fe3228f6e 100644 --- a/tests/baselines/reference/asyncAliasReturnType_es6.js +++ b/tests/baselines/reference/asyncAliasReturnType_es6.js @@ -6,6 +6,6 @@ async function f(): PromiseAlias { //// [asyncAliasReturnType_es6.js] function f() { - return __awaiter(this, void 0, PromiseAlias, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.symbols b/tests/baselines/reference/asyncAliasReturnType_es6.symbols new file mode 100644 index 00000000000..4d6db6a1ef4 --- /dev/null +++ b/tests/baselines/reference/asyncAliasReturnType_es6.symbols @@ -0,0 +1,11 @@ +=== tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts === +type PromiseAlias = Promise; +>PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es6.ts, 0, 0)) +>T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18)) +>Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>T : Symbol(T, Decl(asyncAliasReturnType_es6.ts, 0, 18)) + +async function f(): PromiseAlias { +>f : Symbol(f, Decl(asyncAliasReturnType_es6.ts, 0, 34)) +>PromiseAlias : Symbol(PromiseAlias, Decl(asyncAliasReturnType_es6.ts, 0, 0)) +} diff --git a/tests/baselines/reference/asyncAliasReturnType_es6.types b/tests/baselines/reference/asyncAliasReturnType_es6.types new file mode 100644 index 00000000000..8426d2a3542 --- /dev/null +++ b/tests/baselines/reference/asyncAliasReturnType_es6.types @@ -0,0 +1,11 @@ +=== tests/cases/conformance/async/es6/asyncAliasReturnType_es6.ts === +type PromiseAlias = Promise; +>PromiseAlias : Promise +>T : T +>Promise : Promise +>T : T + +async function f(): PromiseAlias { +>f : () => Promise +>PromiseAlias : Promise +} diff --git a/tests/baselines/reference/asyncArrowFunction1_es6.js b/tests/baselines/reference/asyncArrowFunction1_es6.js index 4f03acc5ced..0026cd91a7e 100644 --- a/tests/baselines/reference/asyncArrowFunction1_es6.js +++ b/tests/baselines/reference/asyncArrowFunction1_es6.js @@ -4,5 +4,5 @@ var foo = async (): Promise => { }; //// [asyncArrowFunction1_es6.js] -var foo = () => __awaiter(this, void 0, Promise, function* () { +var foo = () => __awaiter(this, void 0, void 0, function* () { }); diff --git a/tests/baselines/reference/asyncArrowFunction6_es6.js b/tests/baselines/reference/asyncArrowFunction6_es6.js index 54b8aa1f6b1..a01e53f5b11 100644 --- a/tests/baselines/reference/asyncArrowFunction6_es6.js +++ b/tests/baselines/reference/asyncArrowFunction6_es6.js @@ -4,5 +4,5 @@ var foo = async (a = await): Promise => { } //// [asyncArrowFunction6_es6.js] -var foo = (a = yield ) => __awaiter(this, void 0, Promise, function* () { +var foo = (a = yield ) => __awaiter(this, void 0, void 0, function* () { }); diff --git a/tests/baselines/reference/asyncArrowFunction7_es6.js b/tests/baselines/reference/asyncArrowFunction7_es6.js index ac68a8fd2f8..fab705c0b76 100644 --- a/tests/baselines/reference/asyncArrowFunction7_es6.js +++ b/tests/baselines/reference/asyncArrowFunction7_es6.js @@ -7,8 +7,8 @@ var bar = async (): Promise => { } //// [asyncArrowFunction7_es6.js] -var bar = () => __awaiter(this, void 0, Promise, function* () { +var bar = () => __awaiter(this, void 0, void 0, function* () { // 'await' here is an identifier, and not an await expression. - var foo = (a = yield ) => __awaiter(this, void 0, Promise, function* () { + var foo = (a = yield ) => __awaiter(this, void 0, void 0, function* () { }); }); diff --git a/tests/baselines/reference/asyncArrowFunction8_es6.js b/tests/baselines/reference/asyncArrowFunction8_es6.js index 9cee5ee1525..0c33cfcfa2d 100644 --- a/tests/baselines/reference/asyncArrowFunction8_es6.js +++ b/tests/baselines/reference/asyncArrowFunction8_es6.js @@ -5,6 +5,6 @@ var foo = async (): Promise => { } //// [asyncArrowFunction8_es6.js] -var foo = () => __awaiter(this, void 0, Promise, function* () { +var foo = () => __awaiter(this, void 0, void 0, function* () { var v = { [yield ]: foo }; }); diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js index fdaa365836d..ca79eed6c8e 100644 --- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js +++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es6.js @@ -11,6 +11,6 @@ class C { class C { method() { function other() { } - var fn = () => __awaiter(this, arguments, Promise, function* () { return yield other.apply(this, arguments); }); + var fn = () => __awaiter(this, arguments, void 0, function* () { return yield other.apply(this, arguments); }); } } diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js index 0f09e366ef3..de7eb23ed78 100644 --- a/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js +++ b/tests/baselines/reference/asyncArrowFunctionCapturesThis_es6.js @@ -9,6 +9,6 @@ class C { //// [asyncArrowFunctionCapturesThis_es6.js] class C { method() { - var fn = () => __awaiter(this, void 0, Promise, function* () { return yield this; }); + var fn = () => __awaiter(this, void 0, void 0, function* () { return yield this; }); } } diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js index 213ecfd53a6..4022fde7f54 100644 --- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js +++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.js @@ -41,7 +41,7 @@ module M { //// [asyncAwaitIsolatedModules_es6.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -49,65 +49,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; function f0() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } function f1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } function f3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } let f4 = function () { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; let f5 = function () { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; let f6 = function () { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; -let f7 = () => __awaiter(this, void 0, Promise, function* () { }); -let f8 = () => __awaiter(this, void 0, Promise, function* () { }); -let f9 = () => __awaiter(this, void 0, MyPromise, function* () { }); -let f10 = () => __awaiter(this, void 0, Promise, function* () { return p; }); -let f11 = () => __awaiter(this, void 0, Promise, function* () { return mp; }); -let f12 = () => __awaiter(this, void 0, Promise, function* () { return mp; }); -let f13 = () => __awaiter(this, void 0, MyPromise, function* () { return p; }); +let f7 = () => __awaiter(this, void 0, void 0, function* () { }); +let f8 = () => __awaiter(this, void 0, void 0, function* () { }); +let f9 = () => __awaiter(this, void 0, void 0, function* () { }); +let f10 = () => __awaiter(this, void 0, void 0, function* () { return p; }); +let f11 = () => __awaiter(this, void 0, void 0, function* () { return mp; }); +let f12 = () => __awaiter(this, void 0, void 0, function* () { return mp; }); +let f13 = () => __awaiter(this, void 0, void 0, function* () { return p; }); let o = { m1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }, m2() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }, m3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } }; class C { m1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } m2() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } m3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m4() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m5() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m6() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } } var M; (function (M) { function f1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } M.f1 = f1; })(M || (M = {})); diff --git a/tests/baselines/reference/asyncAwait_es6.js b/tests/baselines/reference/asyncAwait_es6.js index 14dfc7fc9aa..be2eb90e3e4 100644 --- a/tests/baselines/reference/asyncAwait_es6.js +++ b/tests/baselines/reference/asyncAwait_es6.js @@ -41,7 +41,7 @@ module M { //// [asyncAwait_es6.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -49,65 +49,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; function f0() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } function f1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } function f3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } let f4 = function () { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; let f5 = function () { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; let f6 = function () { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }; -let f7 = () => __awaiter(this, void 0, Promise, function* () { }); -let f8 = () => __awaiter(this, void 0, Promise, function* () { }); -let f9 = () => __awaiter(this, void 0, MyPromise, function* () { }); -let f10 = () => __awaiter(this, void 0, Promise, function* () { return p; }); -let f11 = () => __awaiter(this, void 0, Promise, function* () { return mp; }); -let f12 = () => __awaiter(this, void 0, Promise, function* () { return mp; }); -let f13 = () => __awaiter(this, void 0, MyPromise, function* () { return p; }); +let f7 = () => __awaiter(this, void 0, void 0, function* () { }); +let f8 = () => __awaiter(this, void 0, void 0, function* () { }); +let f9 = () => __awaiter(this, void 0, void 0, function* () { }); +let f10 = () => __awaiter(this, void 0, void 0, function* () { return p; }); +let f11 = () => __awaiter(this, void 0, void 0, function* () { return mp; }); +let f12 = () => __awaiter(this, void 0, void 0, function* () { return mp; }); +let f13 = () => __awaiter(this, void 0, void 0, function* () { return p; }); let o = { m1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }, m2() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); }, m3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } }; class C { m1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } m2() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } m3() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m4() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m5() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } static m6() { - return __awaiter(this, void 0, MyPromise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } } var M; (function (M) { function f1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } M.f1 = f1; })(M || (M = {})); diff --git a/tests/baselines/reference/asyncFunctionDeclaration11_es6.js b/tests/baselines/reference/asyncFunctionDeclaration11_es6.js index a44343cef78..6fe8921434c 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration11_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration11_es6.js @@ -4,6 +4,6 @@ async function await(): Promise { //// [asyncFunctionDeclaration11_es6.js] function await() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } diff --git a/tests/baselines/reference/asyncFunctionDeclaration13_es6.js b/tests/baselines/reference/asyncFunctionDeclaration13_es6.js index 4257c8691c2..6fab6c39947 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration13_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration13_es6.js @@ -7,7 +7,7 @@ async function foo(): Promise { //// [asyncFunctionDeclaration13_es6.js] function foo() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { // Legal to use 'await' in a type context. var v; }); diff --git a/tests/baselines/reference/asyncFunctionDeclaration14_es6.js b/tests/baselines/reference/asyncFunctionDeclaration14_es6.js index f32d106f92e..f584f917842 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration14_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration14_es6.js @@ -5,7 +5,7 @@ async function foo(): Promise { //// [asyncFunctionDeclaration14_es6.js] function foo() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { return; }); } diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt index bc1ef24127a..d014f9eecf3 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt +++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt @@ -1,17 +1,12 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,16): error TS1055: Type '{}' is not a valid async function return type. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,16): error TS1055: Type 'any' is not a valid async function return type. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,16): error TS1055: Type 'number' is not a valid async function return type. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,16): error TS1055: Type 'PromiseLike' is not a valid async function return type. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,16): error TS1055: Type 'typeof Thenable' is not a valid async function return type. - Type 'Thenable' is not assignable to type 'PromiseLike'. - Types of property 'then' are incompatible. - Type '() => void' is not assignable to type '{ (onfulfilled?: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): PromiseLike; (onfulfilled?: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => void): PromiseLike; }'. - Type 'void' is not assignable to type 'PromiseLike'. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,16): error TS1055: Type 'Thenable' is not a valid async function return type. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(17,16): error TS1059: Return expression in async function does not have a valid callable 'then' member. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(23,25): error TS1058: Operand for 'await' does not have a valid callable 'then' member. -==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts (7 errors) ==== +==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts (6 errors) ==== declare class Thenable { then(): void; } declare let a: any; declare let obj: { then: string; }; @@ -27,15 +22,9 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1 ~~~ !!! error TS1055: Type 'number' is not a valid async function return type. async function fn5(): PromiseLike { } // error - ~~~ -!!! error TS1055: Type 'PromiseLike' is not a valid async function return type. async function fn6(): Thenable { } // error ~~~ -!!! error TS1055: Type 'typeof Thenable' is not a valid async function return type. -!!! error TS1055: Type 'Thenable' is not assignable to type 'PromiseLike'. -!!! error TS1055: Types of property 'then' are incompatible. -!!! error TS1055: Type '() => void' is not assignable to type '{ (onfulfilled?: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => TResult | PromiseLike): PromiseLike; (onfulfilled?: (value: any) => TResult | PromiseLike, onrejected?: (reason: any) => void): PromiseLike; }'. -!!! error TS1055: Type 'void' is not assignable to type 'PromiseLike'. +!!! error TS1055: Type 'Thenable' is not a valid async function return type. async function fn7() { return; } // valid: Promise async function fn8() { return 1; } // valid: Promise async function fn9() { return null; } // valid: Promise diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.js b/tests/baselines/reference/asyncFunctionDeclaration15_es6.js index c72062e24b2..174a95d6f66 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.js @@ -26,59 +26,59 @@ async function fn19() { await thenable; } // error //// [asyncFunctionDeclaration15_es6.js] function fn1() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // valid: Promise function fn2() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // error function fn3() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // error function fn4() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // error function fn5() { - return __awaiter(this, void 0, PromiseLike, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // error function fn6() { - return __awaiter(this, void 0, Thenable, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } // error function fn7() { - return __awaiter(this, void 0, Promise, function* () { return; }); + return __awaiter(this, void 0, void 0, function* () { return; }); } // valid: Promise function fn8() { - return __awaiter(this, void 0, Promise, function* () { return 1; }); + return __awaiter(this, void 0, void 0, function* () { return 1; }); } // valid: Promise function fn9() { - return __awaiter(this, void 0, Promise, function* () { return null; }); + return __awaiter(this, void 0, void 0, function* () { return null; }); } // valid: Promise function fn10() { - return __awaiter(this, void 0, Promise, function* () { return undefined; }); + return __awaiter(this, void 0, void 0, function* () { return undefined; }); } // valid: Promise function fn11() { - return __awaiter(this, void 0, Promise, function* () { return a; }); + return __awaiter(this, void 0, void 0, function* () { return a; }); } // valid: Promise function fn12() { - return __awaiter(this, void 0, Promise, function* () { return obj; }); + return __awaiter(this, void 0, void 0, function* () { return obj; }); } // valid: Promise<{ then: string; }> function fn13() { - return __awaiter(this, void 0, Promise, function* () { return thenable; }); + return __awaiter(this, void 0, void 0, function* () { return thenable; }); } // error function fn14() { - return __awaiter(this, void 0, Promise, function* () { yield 1; }); + return __awaiter(this, void 0, void 0, function* () { yield 1; }); } // valid: Promise function fn15() { - return __awaiter(this, void 0, Promise, function* () { yield null; }); + return __awaiter(this, void 0, void 0, function* () { yield null; }); } // valid: Promise function fn16() { - return __awaiter(this, void 0, Promise, function* () { yield undefined; }); + return __awaiter(this, void 0, void 0, function* () { yield undefined; }); } // valid: Promise function fn17() { - return __awaiter(this, void 0, Promise, function* () { yield a; }); + return __awaiter(this, void 0, void 0, function* () { yield a; }); } // valid: Promise function fn18() { - return __awaiter(this, void 0, Promise, function* () { yield obj; }); + return __awaiter(this, void 0, void 0, function* () { yield obj; }); } // valid: Promise function fn19() { - return __awaiter(this, void 0, Promise, function* () { yield thenable; }); + return __awaiter(this, void 0, void 0, function* () { yield thenable; }); } // error diff --git a/tests/baselines/reference/asyncFunctionDeclaration1_es6.js b/tests/baselines/reference/asyncFunctionDeclaration1_es6.js index 263e27fa35e..e92d55dc0e2 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration1_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration1_es6.js @@ -4,6 +4,6 @@ async function foo(): Promise { //// [asyncFunctionDeclaration1_es6.js] function foo() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } diff --git a/tests/baselines/reference/asyncFunctionDeclaration6_es6.js b/tests/baselines/reference/asyncFunctionDeclaration6_es6.js index 8c37968ab4c..a70316989b3 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration6_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration6_es6.js @@ -4,6 +4,6 @@ async function foo(a = await): Promise { //// [asyncFunctionDeclaration6_es6.js] function foo(a = yield ) { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } diff --git a/tests/baselines/reference/asyncFunctionDeclaration7_es6.js b/tests/baselines/reference/asyncFunctionDeclaration7_es6.js index ef66df4e413..0d360fa866c 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration7_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration7_es6.js @@ -7,10 +7,10 @@ async function bar(): Promise { //// [asyncFunctionDeclaration7_es6.js] function bar() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { // 'await' here is an identifier, and not a yield expression. function foo(a = yield ) { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } }); diff --git a/tests/baselines/reference/asyncFunctionDeclaration9_es6.js b/tests/baselines/reference/asyncFunctionDeclaration9_es6.js index 9723a69f2a2..c57c0eb395a 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration9_es6.js +++ b/tests/baselines/reference/asyncFunctionDeclaration9_es6.js @@ -5,7 +5,7 @@ async function foo(): Promise { //// [asyncFunctionDeclaration9_es6.js] function foo() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { var v = { [yield ]: foo }; }); } diff --git a/tests/baselines/reference/asyncFunctionsAcrossFiles.js b/tests/baselines/reference/asyncFunctionsAcrossFiles.js index 7e8a58205e2..94ccff2358c 100644 --- a/tests/baselines/reference/asyncFunctionsAcrossFiles.js +++ b/tests/baselines/reference/asyncFunctionsAcrossFiles.js @@ -17,7 +17,7 @@ export const b = { //// [b.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -26,13 +26,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; import { a } from './a'; export const b = { - f: () => __awaiter(this, void 0, Promise, function* () { + f: () => __awaiter(this, void 0, void 0, function* () { yield a.f(); }) }; //// [a.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -41,7 +41,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; import { b } from './b'; export const a = { - f: () => __awaiter(this, void 0, Promise, function* () { + f: () => __awaiter(this, void 0, void 0, function* () { yield b.f(); }) }; diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index dd64c797931..56a41b0283f 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -17,16 +17,15 @@ exports.Task = Task; //// [test.js] "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments)).next()); }); }; -var task_1 = require("./task"); class Test { example() { - return __awaiter(this, void 0, task_1.Task, function* () { return; }); + return __awaiter(this, void 0, void 0, function* () { return; }); } } diff --git a/tests/baselines/reference/asyncMethodWithSuper_es6.js b/tests/baselines/reference/asyncMethodWithSuper_es6.js index 74d4de79881..eacb0a882b2 100644 --- a/tests/baselines/reference/asyncMethodWithSuper_es6.js +++ b/tests/baselines/reference/asyncMethodWithSuper_es6.js @@ -59,7 +59,7 @@ class B extends A { // async method with only call/get on 'super' does not require a binding simple() { const _super = name => super[name]; - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { // call with property access _super("x").call(this); // call with element access @@ -76,7 +76,7 @@ class B extends A { const cache = Object.create(null); return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } }); })(name => super[name], (name, value) => super[name] = value); - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { const f = () => { }; // call with property access _super("x").value.call(this); diff --git a/tests/baselines/reference/asyncMultiFile.js b/tests/baselines/reference/asyncMultiFile.js index 6229c29f02c..cbf3445ecc9 100644 --- a/tests/baselines/reference/asyncMultiFile.js +++ b/tests/baselines/reference/asyncMultiFile.js @@ -7,7 +7,7 @@ function g() { } //// [a.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -15,7 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; function f() { - return __awaiter(this, void 0, Promise, function* () { }); + return __awaiter(this, void 0, void 0, function* () { }); } //// [b.js] function g() { } diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.js b/tests/baselines/reference/asyncQualifiedReturnType_es6.js index 1da37946254..4d5aa87bbff 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.js +++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.js @@ -15,6 +15,6 @@ var X; X.MyPromise = MyPromise; })(X || (X = {})); function f() { - return __awaiter(this, void 0, X.MyPromise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } diff --git a/tests/baselines/reference/awaitBinaryExpression1_es6.js b/tests/baselines/reference/awaitBinaryExpression1_es6.js index 8deb771f5ab..a19e94353d5 100644 --- a/tests/baselines/reference/awaitBinaryExpression1_es6.js +++ b/tests/baselines/reference/awaitBinaryExpression1_es6.js @@ -9,7 +9,7 @@ async function func(): Promise { //// [awaitBinaryExpression1_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = (yield p) || a; "after"; diff --git a/tests/baselines/reference/awaitBinaryExpression2_es6.js b/tests/baselines/reference/awaitBinaryExpression2_es6.js index 506af50a0ef..7fb1a70446b 100644 --- a/tests/baselines/reference/awaitBinaryExpression2_es6.js +++ b/tests/baselines/reference/awaitBinaryExpression2_es6.js @@ -9,7 +9,7 @@ async function func(): Promise { //// [awaitBinaryExpression2_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = (yield p) && a; "after"; diff --git a/tests/baselines/reference/awaitBinaryExpression3_es6.js b/tests/baselines/reference/awaitBinaryExpression3_es6.js index 4b298d7b947..f845ce12421 100644 --- a/tests/baselines/reference/awaitBinaryExpression3_es6.js +++ b/tests/baselines/reference/awaitBinaryExpression3_es6.js @@ -9,7 +9,7 @@ async function func(): Promise { //// [awaitBinaryExpression3_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = (yield p) + a; "after"; diff --git a/tests/baselines/reference/awaitBinaryExpression4_es6.js b/tests/baselines/reference/awaitBinaryExpression4_es6.js index 4d313588984..b6e14c82487 100644 --- a/tests/baselines/reference/awaitBinaryExpression4_es6.js +++ b/tests/baselines/reference/awaitBinaryExpression4_es6.js @@ -9,7 +9,7 @@ async function func(): Promise { //// [awaitBinaryExpression4_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = yield p, a; "after"; diff --git a/tests/baselines/reference/awaitBinaryExpression5_es6.js b/tests/baselines/reference/awaitBinaryExpression5_es6.js index 01d6c50f6f0..65a5bbfee77 100644 --- a/tests/baselines/reference/awaitBinaryExpression5_es6.js +++ b/tests/baselines/reference/awaitBinaryExpression5_es6.js @@ -10,7 +10,7 @@ async function func(): Promise { //// [awaitBinaryExpression5_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var o; o.a = yield p; diff --git a/tests/baselines/reference/awaitCallExpression1_es6.js b/tests/baselines/reference/awaitCallExpression1_es6.js index f9dad87a8b6..aeeb598e3bf 100644 --- a/tests/baselines/reference/awaitCallExpression1_es6.js +++ b/tests/baselines/reference/awaitCallExpression1_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression1_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = fn(a, a, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression2_es6.js b/tests/baselines/reference/awaitCallExpression2_es6.js index 87d99cd0793..b41735275a8 100644 --- a/tests/baselines/reference/awaitCallExpression2_es6.js +++ b/tests/baselines/reference/awaitCallExpression2_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression2_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = fn(yield p, a, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression3_es6.js b/tests/baselines/reference/awaitCallExpression3_es6.js index f397d83c3a1..74dee3e7e42 100644 --- a/tests/baselines/reference/awaitCallExpression3_es6.js +++ b/tests/baselines/reference/awaitCallExpression3_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression3_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = fn(a, yield p, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression4_es6.js b/tests/baselines/reference/awaitCallExpression4_es6.js index d8824d7e7a0..682a1776ac5 100644 --- a/tests/baselines/reference/awaitCallExpression4_es6.js +++ b/tests/baselines/reference/awaitCallExpression4_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression4_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = (yield pfn)(a, a, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression5_es6.js b/tests/baselines/reference/awaitCallExpression5_es6.js index f39a633765d..30889b35011 100644 --- a/tests/baselines/reference/awaitCallExpression5_es6.js +++ b/tests/baselines/reference/awaitCallExpression5_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression5_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = o.fn(a, a, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression6_es6.js b/tests/baselines/reference/awaitCallExpression6_es6.js index de8477fa938..55d86119d64 100644 --- a/tests/baselines/reference/awaitCallExpression6_es6.js +++ b/tests/baselines/reference/awaitCallExpression6_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression6_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = o.fn(yield p, a, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression7_es6.js b/tests/baselines/reference/awaitCallExpression7_es6.js index 24edc3b9393..df805266ff3 100644 --- a/tests/baselines/reference/awaitCallExpression7_es6.js +++ b/tests/baselines/reference/awaitCallExpression7_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression7_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = o.fn(a, yield p, a); "after"; diff --git a/tests/baselines/reference/awaitCallExpression8_es6.js b/tests/baselines/reference/awaitCallExpression8_es6.js index 8bee6112a7a..8d7bb4b83ce 100644 --- a/tests/baselines/reference/awaitCallExpression8_es6.js +++ b/tests/baselines/reference/awaitCallExpression8_es6.js @@ -13,7 +13,7 @@ async function func(): Promise { //// [awaitCallExpression8_es6.js] function func() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { "before"; var b = (yield po).fn(a, a, a); "after"; diff --git a/tests/baselines/reference/awaitUnion_es6.js b/tests/baselines/reference/awaitUnion_es6.js index 80c68f811ef..9603454b969 100644 --- a/tests/baselines/reference/awaitUnion_es6.js +++ b/tests/baselines/reference/awaitUnion_es6.js @@ -14,7 +14,7 @@ async function f() { //// [awaitUnion_es6.js] function f() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { let await_a = yield a; let await_b = yield b; let await_c = yield c; diff --git a/tests/baselines/reference/reachabilityChecks7.js b/tests/baselines/reference/reachabilityChecks7.js index 75338742700..0a6b5b0dac7 100644 --- a/tests/baselines/reference/reachabilityChecks7.js +++ b/tests/baselines/reference/reachabilityChecks7.js @@ -32,7 +32,7 @@ let x1 = () => { use("Test"); } //// [reachabilityChecks7.js] var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - return new P(function (resolve, reject) { + return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } } function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } @@ -41,26 +41,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; // async function without return type annotation - error function f1() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } let x = function () { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); }; // async function with which promised type is void - return can be omitted function f2() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } function f3(x) { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { if (x) return 10; }); } function f4() { - return __awaiter(this, void 0, Promise, function* () { + return __awaiter(this, void 0, void 0, function* () { }); } function voidFunc() { From 77d174a3143eb65a289420f4850938cf9a7ff2c7 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 25 Jan 2016 11:46:23 -0800 Subject: [PATCH 074/160] Adding tests --- tests/cases/compiler/readonlyMembers.ts | 67 +++++++++++++++++++ .../importsImplicitlyReadonly.ts | 21 ++++++ 2 files changed, 88 insertions(+) create mode 100644 tests/cases/compiler/readonlyMembers.ts create mode 100644 tests/cases/conformance/externalModules/importsImplicitlyReadonly.ts diff --git a/tests/cases/compiler/readonlyMembers.ts b/tests/cases/compiler/readonlyMembers.ts new file mode 100644 index 00000000000..f24b3657727 --- /dev/null +++ b/tests/cases/compiler/readonlyMembers.ts @@ -0,0 +1,67 @@ +// @target: es5 + +interface X { + readonly a: number; + readonly b?: number; +} +var x: X = { a: 0 }; +x.a = 1; // Error +x.b = 1; // Error + +class C { + readonly a: number; + readonly b = 1; + get c() { return 1 } + constructor() { + this.a = 1; // Ok + this.b = 1; // Ok + this.c = 1; // Error + const f = () => { + this.a = 1; // Error + this.b = 1; // Error + this.c = 1; // Error + } + } + foo() { + this.a = 1; // Error + this.b = 1; // Error + this.c = 1; // Error + } +} + +var o = { + get a() { return 1 }, + get b() { return 1 }, + set b(value) { } +}; +o.a = 1; // Error +o.b = 1; + +var p: { readonly a: number, b: number } = { a: 1, b: 1 }; +p.a = 1; // Error +p.b = 1; +var q: { a: number, b: number } = p; +q.a = 1; +q.b = 1; + +enum E { + A, B, C +} +E.A = 1; // Error + +namespace N { + export const a = 1; + export let b = 1; + export var c = 1; +} +N.a = 1; // Error +N.b = 1; +N.c = 1; + +let xx: { readonly [x: string]: string }; +let s = xx["foo"]; +xx["foo"] = "abc"; // Error + +let yy: { readonly [x: number]: string, [x: string]: string }; +yy[1] = "abc"; // Error +yy["foo"] = "abc"; \ No newline at end of file diff --git a/tests/cases/conformance/externalModules/importsImplicitlyReadonly.ts b/tests/cases/conformance/externalModules/importsImplicitlyReadonly.ts new file mode 100644 index 00000000000..f527606e576 --- /dev/null +++ b/tests/cases/conformance/externalModules/importsImplicitlyReadonly.ts @@ -0,0 +1,21 @@ +// @module: commonjs + +// @filename: a.ts +export var x = 1; +var y = 1; +export { y }; + +// @filename: b.ts +import { x, y } from "./a"; +import * as a1 from "./a"; +import a2 = require("./a"); +const a3 = a1; + +x = 1; // Error +y = 1; // Error +a1.x = 1; // Error +a1.y = 1; // Error +a2.x = 1; +a2.y = 1; +a3.x = 1; +a3.y = 1; \ No newline at end of file From da107fe4cbce3407664950c0f9636b6a9b9218f6 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 25 Jan 2016 11:46:32 -0800 Subject: [PATCH 075/160] Accepting new baselines --- .../importsImplicitlyReadonly.errors.txt | 34 +++++ .../reference/importsImplicitlyReadonly.js | 42 ++++++ .../reference/readonlyMembers.errors.txt | 114 +++++++++++++++ tests/baselines/reference/readonlyMembers.js | 132 ++++++++++++++++++ 4 files changed, 322 insertions(+) create mode 100644 tests/baselines/reference/importsImplicitlyReadonly.errors.txt create mode 100644 tests/baselines/reference/importsImplicitlyReadonly.js create mode 100644 tests/baselines/reference/readonlyMembers.errors.txt create mode 100644 tests/baselines/reference/readonlyMembers.js diff --git a/tests/baselines/reference/importsImplicitlyReadonly.errors.txt b/tests/baselines/reference/importsImplicitlyReadonly.errors.txt new file mode 100644 index 00000000000..cc6e1918020 --- /dev/null +++ b/tests/baselines/reference/importsImplicitlyReadonly.errors.txt @@ -0,0 +1,34 @@ +tests/cases/conformance/externalModules/b.ts(6,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/externalModules/b.ts(7,1): error TS2364: Invalid left-hand side of assignment expression. +tests/cases/conformance/externalModules/b.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/conformance/externalModules/b.ts(9,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + + +==== tests/cases/conformance/externalModules/b.ts (4 errors) ==== + import { x, y } from "./a"; + import * as a1 from "./a"; + import a2 = require("./a"); + const a3 = a1; + + x = 1; // Error + ~ +!!! error TS2364: Invalid left-hand side of assignment expression. + y = 1; // Error + ~ +!!! error TS2364: Invalid left-hand side of assignment expression. + a1.x = 1; // Error + ~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + a1.y = 1; // Error + ~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + a2.x = 1; + a2.y = 1; + a3.x = 1; + a3.y = 1; +==== tests/cases/conformance/externalModules/a.ts (0 errors) ==== + + export var x = 1; + var y = 1; + export { y }; + \ No newline at end of file diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js new file mode 100644 index 00000000000..4630de598cc --- /dev/null +++ b/tests/baselines/reference/importsImplicitlyReadonly.js @@ -0,0 +1,42 @@ +//// [tests/cases/conformance/externalModules/importsImplicitlyReadonly.ts] //// + +//// [a.ts] + +export var x = 1; +var y = 1; +export { y }; + +//// [b.ts] +import { x, y } from "./a"; +import * as a1 from "./a"; +import a2 = require("./a"); +const a3 = a1; + +x = 1; // Error +y = 1; // Error +a1.x = 1; // Error +a1.y = 1; // Error +a2.x = 1; +a2.y = 1; +a3.x = 1; +a3.y = 1; + +//// [a.js] +"use strict"; +exports.x = 1; +var y = 1; +exports.y = y; +//// [b.js] +"use strict"; +var a_1 = require("./a"); +var a1 = require("./a"); +var a2 = require("./a"); +var a3 = a1; +a_1.x = 1; // Error +a_1.y = 1; // Error +a1.x = 1; // Error +a1.y = 1; // Error +a2.x = 1; +a2.y = 1; +a3.x = 1; +a3.y = 1; diff --git a/tests/baselines/reference/readonlyMembers.errors.txt b/tests/baselines/reference/readonlyMembers.errors.txt new file mode 100644 index 00000000000..7bc10aa3746 --- /dev/null +++ b/tests/baselines/reference/readonlyMembers.errors.txt @@ -0,0 +1,114 @@ +tests/cases/compiler/readonlyMembers.ts(7,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(8,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(17,9): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(19,13): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(20,13): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(21,13): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(25,9): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(26,9): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(27,9): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(36,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(40,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(49,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(56,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(62,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. +tests/cases/compiler/readonlyMembers.ts(65,1): error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + + +==== tests/cases/compiler/readonlyMembers.ts (15 errors) ==== + + interface X { + readonly a: number; + readonly b?: number; + } + var x: X = { a: 0 }; + x.a = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + x.b = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + + class C { + readonly a: number; + readonly b = 1; + get c() { return 1 } + constructor() { + this.a = 1; // Ok + this.b = 1; // Ok + this.c = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + const f = () => { + this.a = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + this.b = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + this.c = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + } + } + foo() { + this.a = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + this.b = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + this.c = 1; // Error + ~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + } + } + + var o = { + get a() { return 1 }, + get b() { return 1 }, + set b(value) { } + }; + o.a = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + o.b = 1; + + var p: { readonly a: number, b: number } = { a: 1, b: 1 }; + p.a = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + p.b = 1; + var q: { a: number, b: number } = p; + q.a = 1; + q.b = 1; + + enum E { + A, B, C + } + E.A = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + + namespace N { + export const a = 1; + export let b = 1; + export var c = 1; + } + N.a = 1; // Error + ~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + N.b = 1; + N.c = 1; + + let xx: { readonly [x: string]: string }; + let s = xx["foo"]; + xx["foo"] = "abc"; // Error + ~~~~~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + + let yy: { readonly [x: number]: string, [x: string]: string }; + yy[1] = "abc"; // Error + ~~~~~ +!!! error TS2450: Left-hand side of assignment expression cannot be a constant or a read-only property. + yy["foo"] = "abc"; \ No newline at end of file diff --git a/tests/baselines/reference/readonlyMembers.js b/tests/baselines/reference/readonlyMembers.js new file mode 100644 index 00000000000..899c52d8626 --- /dev/null +++ b/tests/baselines/reference/readonlyMembers.js @@ -0,0 +1,132 @@ +//// [readonlyMembers.ts] + +interface X { + readonly a: number; + readonly b?: number; +} +var x: X = { a: 0 }; +x.a = 1; // Error +x.b = 1; // Error + +class C { + readonly a: number; + readonly b = 1; + get c() { return 1 } + constructor() { + this.a = 1; // Ok + this.b = 1; // Ok + this.c = 1; // Error + const f = () => { + this.a = 1; // Error + this.b = 1; // Error + this.c = 1; // Error + } + } + foo() { + this.a = 1; // Error + this.b = 1; // Error + this.c = 1; // Error + } +} + +var o = { + get a() { return 1 }, + get b() { return 1 }, + set b(value) { } +}; +o.a = 1; // Error +o.b = 1; + +var p: { readonly a: number, b: number } = { a: 1, b: 1 }; +p.a = 1; // Error +p.b = 1; +var q: { a: number, b: number } = p; +q.a = 1; +q.b = 1; + +enum E { + A, B, C +} +E.A = 1; // Error + +namespace N { + export const a = 1; + export let b = 1; + export var c = 1; +} +N.a = 1; // Error +N.b = 1; +N.c = 1; + +let xx: { readonly [x: string]: string }; +let s = xx["foo"]; +xx["foo"] = "abc"; // Error + +let yy: { readonly [x: number]: string, [x: string]: string }; +yy[1] = "abc"; // Error +yy["foo"] = "abc"; + +//// [readonlyMembers.js] +var x = { a: 0 }; +x.a = 1; // Error +x.b = 1; // Error +var C = (function () { + function C() { + var _this = this; + this.b = 1; + this.a = 1; // Ok + this.b = 1; // Ok + this.c = 1; // Error + var f = function () { + _this.a = 1; // Error + _this.b = 1; // Error + _this.c = 1; // Error + }; + } + Object.defineProperty(C.prototype, "c", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + C.prototype.foo = function () { + this.a = 1; // Error + this.b = 1; // Error + this.c = 1; // Error + }; + return C; +}()); +var o = { + get a() { return 1; }, + get b() { return 1; }, + set b(value) { } +}; +o.a = 1; // Error +o.b = 1; +var p = { a: 1, b: 1 }; +p.a = 1; // Error +p.b = 1; +var q = p; +q.a = 1; +q.b = 1; +var E; +(function (E) { + E[E["A"] = 0] = "A"; + E[E["B"] = 1] = "B"; + E[E["C"] = 2] = "C"; +})(E || (E = {})); +E.A = 1; // Error +var N; +(function (N) { + N.a = 1; + N.b = 1; + N.c = 1; +})(N || (N = {})); +N.a = 1; // Error +N.b = 1; +N.c = 1; +var xx; +var s = xx["foo"]; +xx["foo"] = "abc"; // Error +var yy; +yy[1] = "abc"; // Error +yy["foo"] = "abc"; From 8a8ed0a8714c837fafd392ba9b23d2830dba69fb Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 25 Jan 2016 11:49:26 -0800 Subject: [PATCH 076/160] update implementation based on the results of design meeting --- src/compiler/commandLineParser.ts | 4 - src/compiler/diagnosticMessages.json | 98 ++- src/compiler/program.ts | 619 ++++++++---------- src/compiler/types.ts | 5 +- src/harness/compilerRunner.ts | 8 + src/harness/harness.ts | 13 +- src/harness/harnessLanguageService.ts | 3 +- src/services/services.ts | 3 + .../pathMappingBasedModuleResolution1.js | 30 - .../pathMappingBasedModuleResolution1.symbols | 25 - .../pathMappingBasedModuleResolution1.types | 28 - .../pathMappingBasedModuleResolution10.js | 38 -- ...pathMappingBasedModuleResolution10.symbols | 29 - .../pathMappingBasedModuleResolution10.types | 32 - .../pathMappingBasedModuleResolution10_1.js | 38 -- ...thMappingBasedModuleResolution10_1.symbols | 29 - ...pathMappingBasedModuleResolution10_1.types | 32 - .../pathMappingBasedModuleResolution10_2.js | 38 -- ...thMappingBasedModuleResolution10_2.symbols | 29 - ...pathMappingBasedModuleResolution10_2.types | 32 - .../pathMappingBasedModuleResolution11.js | 38 -- ...pathMappingBasedModuleResolution11.symbols | 29 - .../pathMappingBasedModuleResolution11.types | 32 - .../pathMappingBasedModuleResolution1_1.js | 30 - ...athMappingBasedModuleResolution1_1.symbols | 25 - ...gBasedModuleResolution1_classic.errors.txt | 7 + ...thMappingBasedModuleResolution1_classic.js | 9 + ...gBasedModuleResolution1_classic.trace.json | 1 + ...pingBasedModuleResolution1_node.errors.txt | 7 + .../pathMappingBasedModuleResolution1_node.js | 7 + ...pingBasedModuleResolution1_node.trace.json | 1 + .../pathMappingBasedModuleResolution2.js | 26 - .../pathMappingBasedModuleResolution2.symbols | 22 - .../pathMappingBasedModuleResolution2.types | 25 - .../pathMappingBasedModuleResolution2_1.js | 26 - ...BasedModuleResolution2_classic.errors.txt} | 0 ...hMappingBasedModuleResolution2_classic.js} | 0 ...gBasedModuleResolution2_classic.trace.json | 1 + ...pingBasedModuleResolution2_node.errors.txt | 8 + ...pathMappingBasedModuleResolution2_node.js} | 0 ...pingBasedModuleResolution2_node.trace.json | 1 + .../pathMappingBasedModuleResolution3.js | 26 - .../pathMappingBasedModuleResolution3.symbols | 22 - .../pathMappingBasedModuleResolution3.types | 25 - .../pathMappingBasedModuleResolution3_1.js | 26 - ...athMappingBasedModuleResolution3_1.symbols | 22 - .../pathMappingBasedModuleResolution3_1.types | 25 - ...thMappingBasedModuleResolution3_classic.js | 42 ++ ...pingBasedModuleResolution3_classic.symbols | 39 ++ ...gBasedModuleResolution3_classic.trace.json | 27 + ...appingBasedModuleResolution3_classic.types | 44 ++ .../pathMappingBasedModuleResolution3_node.js | 34 + ...MappingBasedModuleResolution3_node.symbols | 39 ++ ...pingBasedModuleResolution3_node.trace.json | 49 ++ ...thMappingBasedModuleResolution3_node.types | 43 ++ .../pathMappingBasedModuleResolution4.js | 30 - .../pathMappingBasedModuleResolution4.symbols | 22 - .../pathMappingBasedModuleResolution4.types | 25 - .../pathMappingBasedModuleResolution4_1.js | 30 - ...athMappingBasedModuleResolution4_1.symbols | 22 - .../pathMappingBasedModuleResolution4_1.types | 25 - ...thMappingBasedModuleResolution4_classic.js | 38 ++ ...ingBasedModuleResolution4_classic.symbols} | 20 +- ...gBasedModuleResolution4_classic.trace.json | 27 + ...ppingBasedModuleResolution4_classic.types} | 21 +- .../pathMappingBasedModuleResolution4_node.js | 30 + ...MappingBasedModuleResolution4_node.symbols | 36 + ...pingBasedModuleResolution4_node.trace.json | 49 ++ ...hMappingBasedModuleResolution4_node.types} | 17 +- ...thMappingBasedModuleResolution5.errors.txt | 6 - ...hMappingBasedModuleResolution5_classic.js} | 2 +- ...ingBasedModuleResolution5_classic.symbols} | 2 +- ...gBasedModuleResolution5_classic.trace.json | 51 ++ ...ppingBasedModuleResolution5_classic.types} | 2 +- .../pathMappingBasedModuleResolution5_node.js | 46 ++ ...appingBasedModuleResolution5_node.symbols} | 12 +- ...pingBasedModuleResolution5_node.trace.json | 84 +++ ...hMappingBasedModuleResolution5_node.types} | 11 +- ...thMappingBasedModuleResolution6_classic.js | 23 + ...pingBasedModuleResolution6_classic.symbols | 22 + ...gBasedModuleResolution6_classic.trace.json | 32 + ...appingBasedModuleResolution6_classic.types | 24 + .../pathMappingBasedModuleResolution6_node.js | 21 + ...MappingBasedModuleResolution6_node.symbols | 22 + ...pingBasedModuleResolution6_node.trace.json | 48 ++ ...thMappingBasedModuleResolution6_node.types | 24 + .../pathMappingBasedModuleResolution7.js | 44 -- .../pathMappingBasedModuleResolution7.symbols | 44 -- .../pathMappingBasedModuleResolution7.types | 53 -- .../pathMappingBasedModuleResolution7_1.js | 44 -- ...athMappingBasedModuleResolution7_1.symbols | 44 -- .../pathMappingBasedModuleResolution7_1.types | 53 -- ...thMappingBasedModuleResolution7_classic.js | 45 ++ ...pingBasedModuleResolution7_classic.symbols | 57 ++ ...gBasedModuleResolution7_classic.trace.json | 77 +++ ...appingBasedModuleResolution7_classic.types | 63 ++ .../pathMappingBasedModuleResolution7_node.js | 44 ++ ...MappingBasedModuleResolution7_node.symbols | 57 ++ ...pingBasedModuleResolution7_node.trace.json | 123 ++++ ...thMappingBasedModuleResolution7_node.types | 63 ++ .../pathMappingBasedModuleResolution8.js | 44 -- .../pathMappingBasedModuleResolution8.symbols | 44 -- .../pathMappingBasedModuleResolution8.types | 53 -- .../pathMappingBasedModuleResolution8_1.js | 55 -- .../pathMappingBasedModuleResolution9.js | 52 -- .../pathMappingBasedModuleResolution9.symbols | 48 -- .../pathMappingBasedModuleResolution9.types | 57 -- .../pathMappingBasedModuleResolution9_1.js | 63 -- ...athMappingBasedModuleResolution9_1.symbols | 61 -- .../pathMappingBasedModuleResolution9_1.types | 73 --- .../pathMappingBasedModuleResolution9_2.js | 63 -- ...athMappingBasedModuleResolution9_2.symbols | 61 -- .../pathMappingBasedModuleResolution9_2.types | 73 --- .../staticInstanceResolution5.errors.txt | 14 +- .../reference/staticInstanceResolution5.js | 13 + .../pathMappingBasedModuleResolution1.ts | 18 - .../pathMappingBasedModuleResolution10.ts | 34 - .../pathMappingBasedModuleResolution10_1.ts | 35 - .../pathMappingBasedModuleResolution10_2.ts | 36 - .../pathMappingBasedModuleResolution11.ts | 34 - .../pathMappingBasedModuleResolution1_1.ts | 18 - ...thMappingBasedModuleResolution1_classic.ts | 19 + .../pathMappingBasedModuleResolution1_node.ts | 18 + .../pathMappingBasedModuleResolution2.ts | 22 - .../pathMappingBasedModuleResolution2_1.ts | 22 - ...hMappingBasedModuleResolution2_classic.ts} | 1 + ...pathMappingBasedModuleResolution2_node.ts} | 29 +- .../pathMappingBasedModuleResolution3.ts | 23 - .../pathMappingBasedModuleResolution3_1.ts | 23 - ...thMappingBasedModuleResolution3_classic.ts | 22 + .../pathMappingBasedModuleResolution3_node.ts | 22 + .../pathMappingBasedModuleResolution4.ts | 23 - .../pathMappingBasedModuleResolution4_1.ts | 23 - ...thMappingBasedModuleResolution4_classic.ts | 28 + .../pathMappingBasedModuleResolution4_node.ts | 28 + ...hMappingBasedModuleResolution5_classic.ts} | 15 +- ...pathMappingBasedModuleResolution5_node.ts} | 23 +- ...thMappingBasedModuleResolution6_classic.ts | 23 + .../pathMappingBasedModuleResolution6_node.ts | 23 + .../pathMappingBasedModuleResolution7.ts | 38 -- ...thMappingBasedModuleResolution7_classic.ts | 49 ++ .../pathMappingBasedModuleResolution7_node.ts | 49 ++ .../pathMappingBasedModuleResolution8.ts | 39 -- .../pathMappingBasedModuleResolution8_1.ts | 45 -- .../pathMappingBasedModuleResolution9.ts | 42 -- .../pathMappingBasedModuleResolution9_1.ts | 48 -- .../pathMappingBasedModuleResolution9_2.ts | 48 -- .../cases/unittests/cachingInServerLSHost.ts | 6 +- tests/cases/unittests/moduleResolution.ts | 475 +++++++++++--- 149 files changed, 2613 insertions(+), 3088 deletions(-) delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_1.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution10_2.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution11.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_classic.errors.txt create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_classic.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_node.errors.txt create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_node.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution1_node.trace.json delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_1.js rename tests/baselines/reference/{pathMappingBasedModuleResolution6.errors.txt => pathMappingBasedModuleResolution2_classic.errors.txt} (100%) rename tests/baselines/reference/{pathMappingBasedModuleResolution6.js => pathMappingBasedModuleResolution2_classic.js} (100%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_classic.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt rename tests/baselines/reference/{pathMappingBasedModuleResolution5.js => pathMappingBasedModuleResolution2_node.js} (100%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_node.trace.json delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_node.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_node.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js rename tests/baselines/reference/{pathMappingBasedModuleResolution2_1.symbols => pathMappingBasedModuleResolution4_classic.symbols} (50%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json rename tests/baselines/reference/{pathMappingBasedModuleResolution1_1.types => pathMappingBasedModuleResolution4_classic.types} (60%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_node.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json rename tests/baselines/reference/{pathMappingBasedModuleResolution2_1.types => pathMappingBasedModuleResolution4_node.types} (59%) delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt rename tests/baselines/reference/{pathMappingBasedModuleResolution7_2.js => pathMappingBasedModuleResolution5_classic.js} (91%) rename tests/baselines/reference/{pathMappingBasedModuleResolution7_2.symbols => pathMappingBasedModuleResolution5_classic.symbols} (95%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json rename tests/baselines/reference/{pathMappingBasedModuleResolution7_2.types => pathMappingBasedModuleResolution5_classic.types} (93%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5_node.js rename tests/baselines/reference/{pathMappingBasedModuleResolution8_1.symbols => pathMappingBasedModuleResolution5_node.symbols} (85%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json rename tests/baselines/reference/{pathMappingBasedModuleResolution8_1.types => pathMappingBasedModuleResolution5_node.types} (83%) create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_node.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_node.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_node.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_1.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_node.js create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_node.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_1.types delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.js delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution9_2.types delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution11.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution2.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts rename tests/cases/compiler/{pathMappingBasedModuleResolution6.ts => pathMappingBasedModuleResolution2_classic.ts} (85%) rename tests/cases/compiler/{pathMappingBasedModuleResolution5.ts => pathMappingBasedModuleResolution2_node.ts} (54%) delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts rename tests/cases/compiler/{pathMappingBasedModuleResolution7_2.ts => pathMappingBasedModuleResolution5_classic.ts} (70%) rename tests/cases/compiler/{pathMappingBasedModuleResolution7_1.ts => pathMappingBasedModuleResolution5_node.ts} (57%) create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts create mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution8.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts delete mode 100644 tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 195122c5f2b..99a1c52913c 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -256,8 +256,6 @@ namespace ts { type: { "node": ModuleResolutionKind.NodeJs, "classic": ModuleResolutionKind.Classic, - // name is lowercased so we can still use hasProperty(userValue.toLower()) to check if user has entered the right value - "baseurl": ModuleResolutionKind.BaseUrl, }, description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6, error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl, @@ -529,8 +527,6 @@ namespace ts { const { options: optionsFromJsonConfigFile, errors } = convertCompilerOptionsFromJson(json["compilerOptions"], basePath, configFileName); const options = extend(existingOptions, optionsFromJsonConfigFile); - // set basePath as inferredBaseUrl so baseUrl module resolution strategy can still work even if user have not specified baseUrl explicity - options.inferredBaseUrl = basePath; return { options, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1b58d960c50..3bb5fb31750 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2159,7 +2159,7 @@ "category": "Error", "code": 5059 }, - "Option '{0}' can only be used when option 'moduleResolution' is 'baseUrl'.": { + "Option 'paths' cannot be used without specifying '--baseUrl' option.": { "category": "Error", "code": 5060 }, @@ -2171,14 +2171,6 @@ "category": "Error", "code": 5062 }, - "'moduleResolution' kind 'baseUrl' cannot be used without specifying '--baseUrl' option.": { - "category": "Error", - "code": 5063 - }, - "Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option.": { - "category": "Error", - "code": 5064 - }, "Concatenate and emit output to single file.": { "category": "Message", "code": 6001 @@ -2479,101 +2471,93 @@ "category": "Message", "code": 6090 }, - "Resolving rooted module name '{0}' - use it as a candidate location.": { + "'paths' option is specified, looking for a pattern to match module name '{0}'.": { "category": "Message", "code": 6091 }, - "Resolving relative module name '{0}'.": { + "Module name '{0}', matched pattern '{1}'.": { "category": "Message", "code": 6092 }, - "Resolving non-relative module name '{0}'.": { + "Trying substitution '{0}', candidate module location: '{1}'.": { "category": "Message", "code": 6093 }, - "Converting relative module name '{0}' to absolute using '{1}' as a base directory => '{2}'.": { + "Resolving module name '{0}' relative to base url '{1}' - '{2}'.": { "category": "Message", "code": 6094 }, - "'rootDirs' option is specified, searching for a longest matching prefix...": { + "Loading module as file / folder, candidate module location '{0}'.": { "category": "Message", "code": 6095 }, - "Found longest matching rootDir '{0}', 'converted relative path '{1}', to non-relative path '{2}'": { + "File '{0}' does not exist.": { "category": "Message", "code": 6096 }, - "'rootDirs' option is not specified, using '{0}' as candidate location.": { + "File '{0}' exist - use it as a module resolution result.": { "category": "Message", "code": 6097 }, - "'paths' option is specified, looking for a pattern to match module name '{0}'.": { + "Loading module '{0}' from 'node_modules' folder.": { "category": "Message", "code": 6098 }, - "Module name '{0}', matched pattern '{1}'.": { + "Found 'package.json' at '{0}'.": { "category": "Message", "code": 6099 }, - "Trying substitution '{0}', candidate module location: '{1}'.": { + "'package.json' does not have 'typings' field.": { "category": "Message", "code": 6100 }, - "Resolving module name '{0}' relative to base url '{1}' - '{2}'.": { + "'package.json' has 'typings' field '{0}' that references '{1}'.": { "category": "Message", "code": 6101 }, - "Loading module '{0}' as file / folder, candidate module location '{1}'.": { + "Module name '{0}' contains '!' character.": { "category": "Message", "code": 6102 }, - "File '{0}' does not exist.": { + "Allow javascript files to be compiled.": { "category": "Message", "code": 6103 }, - "File '{0}' exist - use it as a module resolution result.": { - "category": "Message", - "code": 6104 - }, - "Loading module '{0}' from 'node_modules' folder.": { - "category": "Message", - "code": 6105 - }, - "Found 'package.json' at '{0}'.": { - "category": "Message", - "code": 6106 - }, - "'package.json' does not have 'typings' field.": { - "category": "Message", - "code": 6107 - }, - "'package.json' has 'typings' field '{0}' that references '{1}'.": { - "category": "Message", - "code": 6108 - }, - "Module name '{0}' contains '!' character.": { - "category": "Message", - "code": 6109 - }, - "Allow javascript files to be compiled.": { - "category": "Message", - "code": 6110 - }, - "Base url: '{0}'.": { - "category": "Message", - "code": 6111 - }, "Option '{0}' should have array of strings as a value.": { "category": "Error", - "code": 6112 + "code": 6104 }, "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'.": { "category": "Message", - "code": 6113 + "code": 6105 }, "Expected type of 'typings' field in 'package.json' to be 'string', got '{0}'.": { "category": "Message", - "code": 6114 + "code": 6106 + }, + "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'": { + "category": "Message", + "code": 6107 + }, + "'rootDirs' option is set, using it to resolve relative module name '{0}'": { + "category": "Message", + "code": 6108 + }, + "Longest matching prefix for '{0}' is '{1}'": { + "category": "Message", + "code": 6109 + }, + "Loading '{0}' from the root dir '{1}', candidate location '{2}'": { + "category": "Message", + "code": 6110 + }, + "Trying other entries in 'rootDirs'": { + "category": "Message", + "code": 6111 + }, + "Module resolution using 'rootDirs' has failed": { + "category": "Message", + "code": 6112 }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 065304dc078..910525aa8d2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -45,6 +45,51 @@ namespace ts { return compilerOptions.traceModuleResolution && host.trace !== undefined; } + function startsWith(str: string, prefix: string): boolean { + return str.lastIndexOf(prefix, 0) === 0; + } + + function endsWith(str: string, suffix: string): boolean { + const expectedPos = str.length - suffix.length; + return str.indexOf(suffix, expectedPos) === expectedPos; + } + + function hasZeroOrOneAsteriskCharacter(str: string): boolean { + let seenAsterisk = false; + for (let i = 0; i < str.length; i++) { + if (str.charCodeAt(i) === CharacterCodes.asterisk) { + if (!seenAsterisk) { + seenAsterisk = true; + } + else { + // have already seen asterisk + return false; + } + } + } + return true; + } + + function createResolvedModule(resolvedFileName: string, isExternalLibraryImport: boolean, failedLookupLocations: string[]): ResolvedModuleWithFailedLookupLocations { + return { resolvedModule: resolvedFileName ? { resolvedFileName, isExternalLibraryImport } : undefined, failedLookupLocations }; + } + + function moduleHasNonRelativeName(moduleName: string): boolean { + if (isRootedDiskPath(moduleName)) { + return false; + } + + const i = moduleName.lastIndexOf("./", 1); + const startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === CharacterCodes.dot); + return !startsWithDotSlashOrDotDotSlash; + } + + interface ModuleResolutionState { + host: ModuleResolutionHost; + compilerOptions: CompilerOptions; + traceEnabled: boolean; + } + export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const traceEnabled = isTraceEnabled(compilerOptions, host); if (traceEnabled) { @@ -53,16 +98,7 @@ namespace ts { let moduleResolution = compilerOptions.moduleResolution; if (moduleResolution === undefined) { - if (compilerOptions.module === ModuleKind.CommonJS) { - moduleResolution = ModuleResolutionKind.NodeJs; - } - else if (compilerOptions.baseUrl !== undefined || compilerOptions.paths || compilerOptions.rootDirs) { - moduleResolution = ModuleResolutionKind.BaseUrl; - } - else { - moduleResolution = ModuleResolutionKind.Classic; - } - + moduleResolution = compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic; if (traceEnabled) { trace(host, Diagnostics.Module_resolution_kind_is_not_specified_using_0, ModuleResolutionKind[moduleResolution]); } @@ -81,9 +117,6 @@ namespace ts { case ModuleResolutionKind.Classic: result = classicNameResolver(moduleName, containingFile, compilerOptions, host); break; - case ModuleResolutionKind.BaseUrl: - result = baseUrlModuleNameResolver(moduleName, containingFile, compilerOptions, host); - break; } if (traceEnabled) { @@ -98,192 +131,184 @@ namespace ts { return result; } - // Path mapping based module resolution strategy uses base url to resolve non-absolute file names. This resolution strategy can be enabled - // by setting 'moduleResolution' option to 'baseUrl' and as it implied by the name it uses base url to resolve module names. - // Base url can be specified: - // - explicitly via command line option 'baseUrl'. If this value is relative it will be computed relative to current directory. - // - explicitly in 'tsconfig.json' via 'baseUrl' compiler option. If this value is relative it will be computed relative to the location - // of 'tsconfig.json'. - // - if value is not provided explicitly but project uses tsconfig.json then 'baseUrl' will be set of folder that contains 'tsconfig.json' - // If baseUrl is the only provided option then non-relative module names will be resolved relative to baseUrl. Relative module names - // will still be resolved relative to the folder that contains file with import. - // User can specify additional options in tsconfig.json to tweak module resolution. - // - 'paths' option allows to tune how non-relative module names will be resolved based on the content of the module name. - // Structure of 'paths' compiler options - // 'paths': { - // pattern-1: list of substitutions 1, - // pattern-2: list of substitutions 2, - // ... - // pattern-n: list of substitutions-n - // } - // Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against - // all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case. - // If pattern contains '*' then to match pattern "*" module name must start with the and end with . - // denotes part of the module name between and . - // If module name can be matches with multiple patterns then pattern with the longest prefix will be picked. - // After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module from the candidate location. - // Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every substitution in the list - // and replace '*' with string. If candidate location is not rooted it will be converted to absolute using baseUrl. - // For example: - // baseUrl: /a/b/c - // "paths": { - // // match all module names - // "*": [ - // "*", // use matched name as is, - // // will be looked as /a/b/c/ - // - // "folder1/*" // substitution will convert matched name to 'folder1/', - // // since it is not rooted then final candidate location will be /a/b/c/folder1/ - // ], - // // match module names that start with 'components/' - // "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/ to '/root/components/folder1/', - // // it is rooted so it will be final candidate location - // } - // 'paths' allows to remap locations of non-relative module names. Relative module names usually are resolved relative to the folder - // that contains import. However sometimes it might be useful to apply mappings to relative module names as well. - // Since the there might be different relative file names that refer to the same file we need to convert relative module name to non-relative - // so we can just apply path mapping to it. This conversion can be performed using 'rootDirs' compiler option - this options stores list of root directories - // for the project (if root directory is not absolute it will be converted to absolute using baseUrl as a base path). - // First - we convert relative module name to absolute using location of file that contains import. - // Then we try to find what element is rootDirs is the longest prefix for this absolute file name (respecting case): - // = - // Once it is done - value of is a be non-relative name for initially relative module name. - // Note that if element in rootDirs should always end with '/' so it will be appended automatically if value in configuration does not have it. - // For example: - // baseUrl: /a/b/c - // "paths": { - // "*": [ "*", "generated/*" ] // try to resolve module name as '/a/b/c/' then look it in '/a/b/c/generated/' - // } - // "rootDirs": [ - // "./src", // root dir is project baseUrl/src - // "./generated" // root dir is baseUrl/generated - // "/e/f" // root dir is /e/f - // ] - // @file: /a/b/c/src/form1.ts - // import {x} from "./form.content.ts" - // @file: /a/b/c/generated/form.content.ts - // export var x = ... - // first './form.content.ts' needs to be converted to non-relative name. - // 1. convert it to absolute name '/a/b/c/src/form.content.ts' -> - // find longest prefix in rootDirs that match this path, it will be './src' (after expansion '/a/b/c/src/') -> - // suffix is form.content.ts - // 2. apply path mappings to 'form1.content.ts' -> - // '*' pattern will be matched -> - // '*' substitution yields '/a/b/c/form1.content.ts' - file does not exists - // 'generated/*' substitution yields '/a/b/c/generated/form1.content' - file exists - OK - export function baseUrlModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { - const baseUrl = compilerOptions.baseUrl !== undefined ? compilerOptions.baseUrl : compilerOptions.inferredBaseUrl; - Debug.assert(baseUrl !== undefined); + /* + * Every module resolution kind can has its specific understanding how to load module from a specific path on disk + * I.e. for path '/a/b/c': + * - Node loader will first to try to check if '/a/b/c' points to a file with some supported extension and if this fails + * it will try to load module from directory: directory '/a/b/c' should exist and it should have either 'package.json' with + * 'typings' entry or file 'index' with some supported extension + * - Classic loader will only try to interpret '/a/b/c' as file. + */ + type ResolutionKindSpecificLoader = (candidate: string, extensions: string[], failedLookupLocations: string[], onlyRecordFalures: boolean, state: ModuleResolutionState) => string; - const supportedExtensions = getSupportedExtensions(compilerOptions); - // NOTE: traceEnabled check is delibirately no inside the 'trace' at evert callside to avoid runtime impact of calling vararg function - const traceEnabled = isTraceEnabled(compilerOptions, host); + /** + * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to + * mitigate differences between design time structure of the project and its runtime counterpart so the same import name + * can be resolved successfully by TypeScript compiler and runtime module loader. + * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will + * fallback to standard resolution routine. + * + * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative + * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then canditate location to resolve module name 'c/d' will + * be '/a/b/c/d' + * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names + * will be resolved based on the content of the module name. + * Structure of 'paths' compiler options + * 'paths': { + * pattern-1: [...substitutions], + * pattern-2: [...substitutions], + * ... + * pattern-n: [...substitutions] + * } + * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against + * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case. + * If pattern contains '*' then to match pattern "*" module name must start with the and end with . + * denotes part of the module name between and . + * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked. + * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module + * from the candidate location. + * Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every + * substitution in the list and replace '*' with string. If candidate location is not rooted it + * will be converted to absolute using baseUrl. + * For example: + * baseUrl: /a/b/c + * "paths": { + * // match all module names + * "*": [ + * "*", // use matched name as is, + * // will be looked as /a/b/c/ + * + * "folder1/*" // substitution will convert matched name to 'folder1/', + * // since it is not rooted then final candidate location will be /a/b/c/folder1/ + * ], + * // match module names that start with 'components/' + * "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/ to '/root/components/folder1/', + * // it is rooted so it will be final candidate location + * } + * + * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if + * they were in the same location. For example lets say there are two files + * '/local/src/content/file1.ts' + * '/shared/components/contracts/src/content/protocols/file2.ts' + * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so + * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime. + * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all + * root dirs were merged together. + * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ]. + * Compiler wil first convert './protocols/file2' into absolute path relative to the location of containing file: + * '/local/src/content/protocols/file2' and try to load it - failure. + * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will + * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remainining + * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location. + */ + function tryLoadModuleUsingOptionalResolutionSettings(moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader, + failedLookupLocations: string[], supportedExtensions: string[], state: ModuleResolutionState): string { - if (traceEnabled) { - trace(host, Diagnostics.Base_url_Colon_0, baseUrl); - } - - if (isRootedDiskPath(moduleName)) { - if (traceEnabled) { - trace(host, Diagnostics.Resolving_rooted_module_name_0_use_it_as_a_candidate_location, moduleName); - } - - const failedLookupLocations: string[] = []; - const resolvedFileName = loadModuleFromFile(supportedExtensions, moduleName, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(moduleName), host), host, traceEnabled); - return { - resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, - failedLookupLocations - }; - } - - if (nameStartsWithDotSlashOrDotDotSlash(moduleName)) { - // relative name - if (traceEnabled) { - trace(host, Diagnostics.Resolving_relative_module_name_0, moduleName); - } - return baseUrlResolveRelativeModuleName(moduleName, containingFile, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); + if (moduleHasNonRelativeName(moduleName)) { + return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state); } else { - // non-relative name - if (traceEnabled) { - trace(host, Diagnostics.Resolving_non_relative_module_name_0, moduleName); - } - return baseUrlResolveNonRelativeModuleName(moduleName, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); + return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state); } } - function baseUrlResolveRelativeModuleName(moduleName: string, containingFile: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { - const failedLookupLocations: string[] = []; + function tryLoadModuleUsingRootDirs(moduleName: string, containingDirectory: string, loader: ResolutionKindSpecificLoader, + failedLookupLocations: string[], supportedExtensions: string[], state: ModuleResolutionState): string { + + if (!state.compilerOptions.rootDirs) { + return undefined; + } + + if (state.traceEnabled) { + trace(state.host, Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName); + } - // we always pass absolute path to containing file so candidate location is also absolute - const containingDirectory = getDirectoryPath(containingFile); const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - if (traceEnabled) { - trace(host, Diagnostics.Converting_relative_module_name_0_to_absolute_using_1_as_a_base_directory_2, moduleName, containingDirectory, candidate); - } + let matchedRootDir: string; + let matchedNormalizedPrefix: string; + for (const rootDir of state.compilerOptions.rootDirs) { + // rootDirs are expected to be absolute + // in case of tsconfig.json this will happen automatically - compiler will expand relative names + // using locaton of tsconfig.json as base location + let normalizedRoot = normalizePath(rootDir); + if (!endsWith(normalizedRoot, directorySeparator)) { + normalizedRoot += directorySeparator; + } + const isLongestMatchingPrefix = + startsWith(candidate, normalizedRoot) && + (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length); - if (compilerOptions.rootDirs) { - if (traceEnabled) { - trace(host, Diagnostics.rootDirs_option_is_specified_searching_for_a_longest_matching_prefix); + if (state.traceEnabled) { + trace(state.host, Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix); } - let matchedPrefix: string; - for (const rootDir of compilerOptions.rootDirs) { - // rootDirs are expected to be absolute - let normalizedRoot = normalizePath(rootDir); - if (!endsWith(normalizedRoot, directorySeparator)) { - normalizedRoot += directorySeparator; - } - const isLongestMatchingPrefix = - startsWith(candidate, normalizedRoot) && - (matchedPrefix === undefined || matchedPrefix.length < normalizedRoot.length); - - if (traceEnabled) { - trace(host, Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix); - } - - if (isLongestMatchingPrefix) { - matchedPrefix = normalizedRoot; - } - } - - if (matchedPrefix) { - const suffix = candidate.substr(matchedPrefix.length); - if (traceEnabled) { - trace(host, Diagnostics.Found_longest_matching_rootDir_0_converted_relative_path_1_to_non_relative_path_2, matchedPrefix, moduleName, suffix); - } - - return baseUrlResolveNonRelativeModuleName(suffix, baseUrl, supportedExtensions, compilerOptions, host, traceEnabled); - } - - // rootDirs does not contain prefix for candidate - fallthrough to load file from candidate location. - } - else { - if (traceEnabled) { - trace(host, Diagnostics.rootDirs_option_is_not_specified_using_0_as_candidate_location, candidate); + if (isLongestMatchingPrefix) { + matchedNormalizedPrefix = normalizedRoot; + matchedRootDir = rootDir; } } + if (matchedNormalizedPrefix) { + if (state.traceEnabled) { + trace(state.host, Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix); + } + const suffix = candidate.substr(matchedNormalizedPrefix.length); - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), host), host, traceEnabled); - return { - resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, - failedLookupLocations - }; + // first - try to load from a initial location + if (state.traceEnabled) { + trace(state.host, Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate); + } + const resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state); + if (resolvedFileName) { + return resolvedFileName; + } + + if (state.traceEnabled) { + trace(state.host, Diagnostics.Trying_other_entries_in_rootDirs); + } + // then try to resolve using remaining entries in rootDirs + for (const rootDir of state.compilerOptions.rootDirs) { + if (rootDir === matchedRootDir) { + // skip the initially matched entry + continue; + } + const candidate = combinePaths(normalizePath(rootDir), suffix); + if (state.traceEnabled) { + trace(state.host, Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate); + } + const baseDirectory = getDirectoryPath(candidate); + const resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state); + if (resolvedFileName) { + return resolvedFileName; + } + } + if (state.traceEnabled) { + trace(state.host, Diagnostics.Module_resolution_using_rootDirs_has_failed); + } + } + return undefined; } - function baseUrlResolveNonRelativeModuleName(moduleName: string, baseUrl: string, supportedExtensions: string[], compilerOptions: CompilerOptions, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { + function tryLoadModuleUsingBaseUrl(moduleName: string, loader: ResolutionKindSpecificLoader, failedLookupLocations: string[], + supportedExtensions: string[], state: ModuleResolutionState): string { + + if (!state.compilerOptions.baseUrl) { + return undefined; + } + if (state.traceEnabled) { + trace(state.host, Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName); + } + let longestMatchPrefixLength = -1; let matchedPattern: string; let matchedStar: string; - const failedLookupLocations: string[] = []; - if (compilerOptions.paths) { - if (traceEnabled) { - trace(host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName); + if (state.compilerOptions.paths) { + if (state.traceEnabled) { + trace(state.host, Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName); } - for (const key in compilerOptions.paths) { + for (const key in state.compilerOptions.paths) { const pattern: string = key; const indexOfStar = pattern.indexOf("*"); if (indexOfStar !== -1) { @@ -311,79 +336,72 @@ namespace ts { } if (matchedPattern) { - if (traceEnabled) { - trace(host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern); + if (state.traceEnabled) { + trace(state.host, Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPattern); } - - for (const subst of compilerOptions.paths[matchedPattern]) { + for (const subst of state.compilerOptions.paths[matchedPattern]) { const path = matchedStar ? subst.replace("\*", matchedStar) : subst; - const candidate = normalizePath(combinePaths(baseUrl, path)); - - if (traceEnabled) { - trace(host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path); + const candidate = normalizePath(combinePaths(state.compilerOptions.baseUrl, path)); + if (state.traceEnabled) { + trace(state.host, Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path); } - - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), host), host, traceEnabled); + const resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), state.host), state); if (resolvedFileName) { - return { resolvedModule: { resolvedFileName }, failedLookupLocations }; + return resolvedFileName; } } - - return { resolvedModule: undefined, failedLookupLocations }; + return undefined; } else { - const candidate = normalizePath(combinePaths(baseUrl, moduleName)); + const candidate = normalizePath(combinePaths(state.compilerOptions.baseUrl, moduleName)); - if (traceEnabled) { - trace(host, Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, baseUrl, candidate); + if (state.traceEnabled) { + trace(state.host, Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate); } - const resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), host), host, traceEnabled); - return { - resolvedModule: resolvedFileName ? { resolvedFileName } : undefined, - failedLookupLocations - }; + return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(getDirectoryPath(candidate), state.host), state); } } - function startsWith(str: string, prefix: string): boolean { - return str.lastIndexOf(prefix, 0) === 0; - } - - function endsWith(str: string, suffix: string): boolean { - const expectedPos = str.length - suffix.length; - return str.indexOf(suffix, expectedPos) === expectedPos; - } - export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const containingDirectory = getDirectoryPath(containingFile); const supportedExtensions = getSupportedExtensions(compilerOptions); const traceEnabled = isTraceEnabled(compilerOptions, host); - if (isRootedDiskPath(moduleName) || nameStartsWithDotSlashOrDotDotSlash(moduleName)) { - const failedLookupLocations: string[] = []; - const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); - if (traceEnabled) { - trace(host, Diagnostics.Loading_module_0_as_file_Slash_folder_candidate_module_location_1, moduleName, candidate); - } + const failedLookupLocations: string[] = []; + const state = {compilerOptions, host, traceEnabled}; + let resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, + failedLookupLocations, supportedExtensions, state); - let resolvedFileName = loadModuleFromFile(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host, traceEnabled); - if (resolvedFileName) { - return { resolvedModule: { resolvedFileName }, failedLookupLocations }; - } - - resolvedFileName = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, /*onlyRecordFailures*/ false, host, traceEnabled); - return resolvedFileName - ? { resolvedModule: { resolvedFileName }, failedLookupLocations } - : { resolvedModule: undefined, failedLookupLocations }; + if (resolvedFileName) { + return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/false, failedLookupLocations); } - else { + + let isExternalLibraryImport = false; + if (moduleHasNonRelativeName(moduleName)) { if (traceEnabled) { trace(host, Diagnostics.Loading_module_0_from_node_modules_folder, moduleName); } - - return loadModuleFromNodeModules(moduleName, containingDirectory, host, traceEnabled); + resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state); + isExternalLibraryImport = resolvedFileName !== undefined; } + else { + const candidate = normalizePath(combinePaths(containingDirectory, moduleName)); + resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state); + } + return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations); + } + + function nodeLoadModuleByRelativeName(candidate: string, supportedExtensions: string[], failedLookupLocations: string[], + onlyRecordFailures: boolean, state: ModuleResolutionState): string { + + if (state.traceEnabled) { + trace(state.host, Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate); + } + + const resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state); + + return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state); } /* @internal */ @@ -396,20 +414,20 @@ namespace ts { * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations. */ - function loadModuleFromFile(extensions: string[], candidate: string, failedLookupLocation: string[], onlyRecordFailures: boolean, host: ModuleResolutionHost, traceEnabled: boolean): string { + function loadModuleFromFile(candidate: string, extensions: string[], failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string { return forEach(extensions, tryLoad); function tryLoad(ext: string): string { const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext; - if (!onlyRecordFailures && host.fileExists(fileName)) { - if (traceEnabled) { - trace(host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, fileName); + if (!onlyRecordFailures && state.host.fileExists(fileName)) { + if (state.traceEnabled) { + trace(state.host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, fileName); } return fileName; } else { - if (traceEnabled) { - trace(host, Diagnostics.File_0_does_not_exist, fileName); + if (state.traceEnabled) { + trace(state.host, Diagnostics.File_0_does_not_exist, fileName); } failedLookupLocation.push(fileName); return undefined; @@ -417,18 +435,18 @@ namespace ts { } } - function loadNodeModuleFromDirectory(extensions: string[], candidate: string, failedLookupLocation: string[], onlyRecordFailures: boolean, host: ModuleResolutionHost, traceEnabled: boolean): string { + function loadNodeModuleFromDirectory(extensions: string[], candidate: string, failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string { const packageJsonPath = combinePaths(candidate, "package.json"); - const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, host); - if (directoryExists && host.fileExists(packageJsonPath)) { - if (traceEnabled) { - trace(host, Diagnostics.Found_package_json_at_0, packageJsonPath); + const directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host); + if (directoryExists && state.host.fileExists(packageJsonPath)) { + if (state.traceEnabled) { + trace(state.host, Diagnostics.Found_package_json_at_0, packageJsonPath); } let jsonContent: { typings?: string }; try { - const jsonText = host.readFile(packageJsonPath); + const jsonText = state.host.readFile(packageJsonPath); jsonContent = jsonText ? <{ typings?: string }>JSON.parse(jsonText) : { typings: undefined }; } catch (e) { @@ -439,52 +457,51 @@ namespace ts { if (jsonContent.typings) { if (typeof jsonContent.typings === "string") { const typingsFile = normalizePath(combinePaths(candidate, jsonContent.typings)); - if (traceEnabled) { - trace(host, Diagnostics.package_json_has_typings_field_0_that_references_1, jsonContent.typings, typingsFile); + if (state.traceEnabled) { + trace(state.host, Diagnostics.package_json_has_typings_field_0_that_references_1, jsonContent.typings, typingsFile); } - const result = loadModuleFromFile(extensions, typingsFile, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typingsFile), host), host, traceEnabled); + const result = loadModuleFromFile(typingsFile, extensions, failedLookupLocation, !directoryProbablyExists(getDirectoryPath(typingsFile), state.host), state); if (result) { return result; } } - else if (traceEnabled) { - trace(host, Diagnostics.Expected_type_of_typings_field_in_package_json_to_be_string_got_0, typeof jsonContent.typings); + else if (state.traceEnabled) { + trace(state.host, Diagnostics.Expected_type_of_typings_field_in_package_json_to_be_string_got_0, typeof jsonContent.typings); } } else { - if (traceEnabled) { - trace(host, Diagnostics.package_json_does_not_have_typings_field); + if (state.traceEnabled) { + trace(state.host, Diagnostics.package_json_does_not_have_typings_field); } } } else { - if (traceEnabled) { - trace(host, Diagnostics.File_0_does_not_exist, packageJsonPath); + if (state.traceEnabled) { + trace(state.host, Diagnostics.File_0_does_not_exist, packageJsonPath); } // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results failedLookupLocation.push(packageJsonPath); } - return loadModuleFromFile(extensions, combinePaths(candidate, "index"), failedLookupLocation, !directoryExists, host, traceEnabled); + return loadModuleFromFile(combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state); } - function loadModuleFromNodeModules(moduleName: string, directory: string, host: ModuleResolutionHost, traceEnabled: boolean): ResolvedModuleWithFailedLookupLocations { - const failedLookupLocations: string[] = []; + function loadModuleFromNodeModules(moduleName: string, directory: string, failedLookupLocations: string[], state: ModuleResolutionState): string { directory = normalizeSlashes(directory); while (true) { const baseName = getBaseFileName(directory); if (baseName !== "node_modules") { const nodeModulesFolder = combinePaths(directory, "node_modules"); - const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, host); + const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host); const candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName)); // Load only typescript files irrespective of allowJs option if loading from node modules - let result = loadModuleFromFile(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host, traceEnabled); + let result = loadModuleFromFile(candidate, supportedTypeScriptExtensions, failedLookupLocations, !nodeModulesFolderExists, state); if (result) { - return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; + return result; } - result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, host, traceEnabled); + result = loadNodeModuleFromDirectory(supportedTypeScriptExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state); if (result) { - return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations }; + return result; } } @@ -495,34 +512,20 @@ namespace ts { directory = parentPath; } - - return { resolvedModule: undefined, failedLookupLocations }; - } - - function nameStartsWithDotSlashOrDotDotSlash(name: string) { - const i = name.lastIndexOf("./", 1); - return i === 0 || (i === 1 && name.charCodeAt(0) === CharacterCodes.dot); - } - - function hasZeroOrOneAsteriskCharacter(str: string): boolean { - let seenAsterisk = false; - for (let i = 0; i < str.length; i++) { - if (str.charCodeAt(i) === CharacterCodes.asterisk) { - if (!seenAsterisk) { - seenAsterisk = true; - } - else { - // have already seen asterisk - return false; - } - } - } - return true; + return undefined; } export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { - const traceEnabled = isTraceEnabled(compilerOptions, host); + const state = { compilerOptions, host, traceEnabled }; + const failedLookupLocations: string[] = []; + const supportedExtensions = getSupportedExtensions(compilerOptions); + let containingDirectory = getDirectoryPath(containingFile); + + const resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state); + if (resolvedFileName) { + return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/false, failedLookupLocations); + } // module names that contain '!' are used to reference resources and are not resolved to actual files on disk if (moduleName.indexOf("!") != -1) { @@ -532,46 +535,19 @@ namespace ts { return { resolvedModule: undefined, failedLookupLocations: [] }; } - let searchPath = getDirectoryPath(containingFile); - let searchName: string; - - const failedLookupLocations: string[] = []; - let referencedSourceFile: string; - const supportedExtensions = getSupportedExtensions(compilerOptions); while (true) { - searchName = normalizePath(combinePaths(searchPath, moduleName)); - referencedSourceFile = forEach(supportedExtensions, extension => { - if (extension === ".tsx" && !compilerOptions.jsx) { - // resolve .tsx files only if jsx support is enabled - // 'logical not' handles both undefined and None cases - return undefined; - } - - const candidate = searchName + extension; - if (host.fileExists(candidate)) { - if (traceEnabled) { - trace(host, Diagnostics.File_0_exist_use_it_as_a_module_resolution_result, candidate); - } - return candidate; - } - else { - if (traceEnabled) { - trace(host, Diagnostics.File_0_does_not_exist, candidate); - } - failedLookupLocations.push(candidate); - } - }); - + const searchName = normalizePath(combinePaths(containingDirectory, moduleName)); + const directoryName = getDirectoryPath(searchName); + referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, !directoryProbablyExists(directoryName, host), state); if (referencedSourceFile) { break; } - - const parentPath = getDirectoryPath(searchPath); - if (parentPath === searchPath) { + const parentPath = getDirectoryPath(containingDirectory); + if (parentPath === containingDirectory) { break; } - searchPath = parentPath; + containingDirectory = parentPath; } return referencedSourceFile @@ -1628,29 +1604,8 @@ namespace ts { } } - if (options.moduleResolution === ModuleResolutionKind.BaseUrl) { - if (options.baseUrl === undefined && options.inferredBaseUrl === undefined) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.moduleResolution_kind_baseUrl_cannot_be_used_without_specifying_baseUrl_option)); - } - } - else if (options.moduleResolution === undefined) { - // if module resolution kind is not specified it is an error to have baseUrl\paths\rootDirs and module === CommonJs - // since the former one implies moduleResolutionKind to be BaseUrl and the latter one - Node - if (options.module === ModuleKind.CommonJS && (options.baseUrl || options.paths || options.rootDirs)) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Module_resolution_kind_cannot_be_determined_automatically_Please_specify_module_resolution_explicitly_via_moduleResolution_option)); - } - } - else { - // here it is known that moduleResolution is not baseurl and is not undefined - if (options.baseUrl !== undefined) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "baseUrl")); - } - if (options.paths) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "paths")); - } - if (options.rootDirs) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_0_can_only_be_used_when_option_moduleResolution_is_baseUrl, "rootDirs")); - } + if (options.paths && options.baseUrl === undefined) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option)); } if (options.paths) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 15913bb71f0..cc94cbd9ce2 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2376,8 +2376,7 @@ namespace ts { export enum ModuleResolutionKind { Classic = 1, - NodeJs = 2, - BaseUrl = 3 + NodeJs = 2 } export type RootPaths = string[]; @@ -2442,8 +2441,6 @@ namespace ts { // Skip checking lib.d.ts to help speed up tests. /* @internal */ skipDefaultLibCheck?: boolean; - // inferred baseUrl - currently this will be set in 'parseJsonConfigFileContent' to 'baseDir' - /* @internal */ inferredBaseUrl?: string; [option: string]: string | number | boolean | TsConfigOnlyOptions; } diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 36aa6238f0e..8b199559412 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -139,6 +139,14 @@ class CompilerBaselineRunner extends RunnerBase { } }); + it (`Correct module resolution tracing for ${fileName}`, () => { + if (options.traceModuleResolution) { + Harness.Baseline.runBaseline("Correct sourcemap content for " + fileName, justName.replace(/\.tsx?$/, ".trace.json"), () => { + return JSON.stringify(result.traceResults || [], undefined, 4); + }); + } + }); + // Source maps? it("Correct sourcemap content for " + fileName, () => { if (options.sourceMap || options.inlineSourceMap) { diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 31987030c2e..2b0c95c0a61 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -985,9 +985,6 @@ namespace Harness { if (harnessSettings) { setCompilerOptionsFromHarnessSetting(harnessSettings, options); } - if (options.inferredBaseUrl) { - options.inferredBaseUrl = ts.getNormalizedAbsolutePath(options.inferredBaseUrl, currentDirectory); - } if (options.rootDirs) { options.rootDirs = ts.map(options.rootDirs, d => ts.getNormalizedAbsolutePath(d, currentDirectory)); } @@ -1025,13 +1022,19 @@ namespace Harness { useCaseSensitiveFileNames, currentDirectory, options.newLine); + + let traceResults: string[]; + if (options.traceModuleResolution) { + traceResults = []; + compilerHost.trace = text => traceResults.push(text); + } const program = ts.createProgram(programFileNames, options, compilerHost); const emitResult = program.emit(); const errors = ts.getPreEmitDiagnostics(program); - const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps); + const result = new CompilerResult(fileOutputs, errors, program, Harness.IO.getCurrentDirectory(), emitResult.sourceMaps, traceResults); return { result, options }; } @@ -1312,7 +1315,7 @@ namespace Harness { /** @param fileResults an array of strings for the fileName and an ITextWriter with its code */ constructor(fileResults: GeneratedFile[], errors: ts.Diagnostic[], public program: ts.Program, - public currentDirectoryForProgram: string, private sourceMapData: ts.SourceMapData[]) { + public currentDirectoryForProgram: string, private sourceMapData: ts.SourceMapData[], public traceResults: string[]) { for (const emittedFile of fileResults) { if (isDTS(emittedFile.fileName)) { diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index a0cac439729..6ab9cd896c1 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -547,7 +547,8 @@ namespace Harness.LanguageService { } directoryExists(path: string): boolean { - return false; + // for tests assume that directory exists + return true; } getExecutingFilePath(): string { diff --git a/src/services/services.ts b/src/services/services.ts index 28f7f848835..cb57d415c66 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2777,6 +2777,9 @@ namespace ts { return directoryProbablyExists(directoryName, host); } }; + if (host.trace) { + compilerHost.trace = message => host.trace(message); + } if (host.resolveModuleNames) { compilerHost.resolveModuleNames = (moduleNames, containingFile) => host.resolveModuleNames(moduleNames, containingFile); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.js b/tests/baselines/reference/pathMappingBasedModuleResolution1.js deleted file mode 100644 index ef296c5d1a1..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution1.ts] //// - -//// [file1.ts] - -// user defined base url - -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -// user defined base url -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols deleted file mode 100644 index 377cd6a86dc..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1.symbols +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === - -// user defined base url - -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 3, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 3, 31)) ->a : Symbol(a, Decl(file1.ts, 5, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 3, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== tests/cases/compiler/root/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1.types b/tests/baselines/reference/pathMappingBasedModuleResolution1.types deleted file mode 100644 index 68fc42a28f2..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1.types +++ /dev/null @@ -1,28 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === - -// user defined base url - -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== tests/cases/compiler/root/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.js b/tests/baselines/reference/pathMappingBasedModuleResolution10.js deleted file mode 100644 index 167a4d4e365..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10.js +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution10.ts] //// - -//// [file1.ts] -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); - -//// [file2.ts] -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -//// [file3.ts] -export var x = 1; - -//// [file3.ts] -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' -}); -//// [file1.js] -define(["require", "exports", "./file2"], function (require, exports, file2_1) { - "use strict"; - exports.z = file2_1.x.toExponential(); -}); -//// [file3.js] -define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { - "use strict"; - var z = file1_1.z.toLowerCase(); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols deleted file mode 100644 index e01d12fc7e3..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10.symbols +++ /dev/null @@ -1,29 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -export var z = x.toExponential(); ->z : Symbol(z, Decl(file1.ts, 2, 10)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== tests/cases/compiler/root/folder1/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== tests/cases/compiler/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : Symbol(y, Decl(file3.ts, 0, 8)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) - -let z = y.toLowerCase(); ->z : Symbol(z, Decl(file3.ts, 1, 3)) ->y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10.types b/tests/baselines/reference/pathMappingBasedModuleResolution10.types deleted file mode 100644 index ac3caa8b532..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10.types +++ /dev/null @@ -1,32 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : number - -export var z = x.toExponential(); ->z : string ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : number - -=== tests/cases/compiler/root/folder1/file3.ts === -export var x = 1; ->x : number ->1 : number - -=== tests/cases/compiler/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : string ->y : string - -let z = y.toLowerCase(); ->z : string ->y.toLowerCase() : string ->y.toLowerCase : () => string ->y : string ->toLowerCase : () => string - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js deleted file mode 100644 index b9dc60f053a..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.js +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts] //// - -//// [file2.ts] -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -//// [file3.ts] -export var x = 1; - -//// [file3.ts] -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - -//// [file1.ts] -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); - - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' -}); -//// [file1.js] -define(["require", "exports", "./file2"], function (require, exports, file2_1) { - "use strict"; - exports.z = file2_1.x.toExponential(); -}); -//// [file3.js] -define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { - "use strict"; - var z = file1_1.z.toLowerCase(); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols deleted file mode 100644 index dbc1fc792d4..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.symbols +++ /dev/null @@ -1,29 +0,0 @@ -=== c:/root/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== c:/root/folder1/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== c:/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : Symbol(y, Decl(file3.ts, 0, 8)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) - -let z = y.toLowerCase(); ->z : Symbol(z, Decl(file3.ts, 1, 3)) ->y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) - -=== c:/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -export var z = x.toExponential(); ->z : Symbol(z, Decl(file1.ts, 2, 10)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types deleted file mode 100644 index bf617b2b1a3..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_1.types +++ /dev/null @@ -1,32 +0,0 @@ -=== c:/root/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : number - -=== c:/root/folder1/file3.ts === -export var x = 1; ->x : number ->1 : number - -=== c:/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : string ->y : string - -let z = y.toLowerCase(); ->z : string ->y.toLowerCase() : string ->y.toLowerCase : () => string ->y : string ->toLowerCase : () => string - -=== c:/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : number - -export var z = x.toExponential(); ->z : string ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js deleted file mode 100644 index e4a83c186a1..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.js +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts] //// - -//// [file2.ts] -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -//// [file3.ts] -export var x = 1; - -//// [file3.ts] -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - -//// [file1.ts] -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); - - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' -}); -//// [file1.js] -define(["require", "exports", "./file2"], function (require, exports, file2_1) { - "use strict"; - exports.z = file2_1.x.toExponential(); -}); -//// [file3.js] -define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { - "use strict"; - var z = file1_1.z.toLowerCase(); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols deleted file mode 100644 index 64a308338c9..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.symbols +++ /dev/null @@ -1,29 +0,0 @@ -=== c:/root/src/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== c:/root/src/folder1/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== c:/root/src/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : Symbol(y, Decl(file3.ts, 0, 8)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) - -let z = y.toLowerCase(); ->z : Symbol(z, Decl(file3.ts, 1, 3)) ->y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) - -=== c:/root/src/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -export var z = x.toExponential(); ->z : Symbol(z, Decl(file1.ts, 2, 10)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types deleted file mode 100644 index 0fc9270c667..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution10_2.types +++ /dev/null @@ -1,32 +0,0 @@ -=== c:/root/src/generated/folder1/file2.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : number - -=== c:/root/src/folder1/file3.ts === -export var x = 1; ->x : number ->1 : number - -=== c:/root/src/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : string ->y : string - -let z = y.toLowerCase(); ->z : string ->y.toLowerCase() : string ->y.toLowerCase : () => string ->y : string ->toLowerCase : () => string - -=== c:/root/src/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' ->x : number - -export var z = x.toExponential(); ->z : string ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.js b/tests/baselines/reference/pathMappingBasedModuleResolution11.js deleted file mode 100644 index 614357ec53f..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution11.js +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution11.ts] //// - -//// [file1.ts] -import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' - -export var z = x.toExponential(); - -//// [file.ts] -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -//// [file3.ts] -export var x = 1; - -//// [file3.ts] -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file.js] -define(["require", "exports", "folder1/file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; // should be resolved to 'folder1/file3.ts' -}); -//// [file1.js] -define(["require", "exports", "./file2"], function (require, exports, file2_1) { - "use strict"; - exports.z = file2_1.x.toExponential(); -}); -//// [file3.js] -define(["require", "exports", "../folder1/file1"], function (require, exports, file1_1) { - "use strict"; - var z = file1_1.z.toLowerCase(); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols deleted file mode 100644 index f453dafe2a2..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution11.symbols +++ /dev/null @@ -1,29 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -export var z = x.toExponential(); ->z : Symbol(z, Decl(file1.ts, 2, 10)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/generated/folder1/file2/file.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : Symbol(x, Decl(file.ts, 0, 8)) - -=== tests/cases/compiler/root/folder1/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== tests/cases/compiler/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : Symbol(y, Decl(file3.ts, 0, 8)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) - -let z = y.toLowerCase(); ->z : Symbol(z, Decl(file3.ts, 1, 3)) ->y.toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file3.ts, 0, 8)) ->toLowerCase : Symbol(String.toLowerCase, Decl(lib.d.ts, --, --)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution11.types b/tests/baselines/reference/pathMappingBasedModuleResolution11.types deleted file mode 100644 index 45717088577..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution11.types +++ /dev/null @@ -1,32 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' ->x : number - -export var z = x.toExponential(); ->z : string ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/generated/folder1/file2/file.ts === -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' ->x : number - -=== tests/cases/compiler/root/folder1/file3.ts === -export var x = 1; ->x : number ->1 : number - -=== tests/cases/compiler/root/generated/folder2/file3.ts === -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' ->z : string ->y : string - -let z = y.toLowerCase(); ->z : string ->y.toLowerCase() : string ->y.toLowerCase : () => string ->y : string ->toLowerCase : () => string - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js deleted file mode 100644 index 1cc12f70d5a..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts] //// - -//// [file1.ts] - -// user defined base url - -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -// user defined base url -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols deleted file mode 100644 index 20f69963c76..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.symbols +++ /dev/null @@ -1,25 +0,0 @@ -=== c:/root/folder1/file1.ts === - -// user defined base url - -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 3, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 3, 31)) ->a : Symbol(a, Decl(file1.ts, 5, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 3, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/root/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== c:/root/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.errors.txt new file mode 100644 index 00000000000..85e25ec99fb --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.errors.txt @@ -0,0 +1,7 @@ +error TS5060: Option 'paths' cannot be used without specifying '--baseUrl' option. + + +!!! error TS5060: Option 'paths' cannot be used without specifying '--baseUrl' option. +==== c:/root/f1.ts (0 errors) ==== + export var x = 1; + \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js new file mode 100644 index 00000000000..1a1bd387dce --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.js @@ -0,0 +1,9 @@ +//// [f1.ts] +export var x = 1; + + +//// [f1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.x = 1; +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.trace.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_classic.trace.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.errors.txt new file mode 100644 index 00000000000..85e25ec99fb --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.errors.txt @@ -0,0 +1,7 @@ +error TS5060: Option 'paths' cannot be used without specifying '--baseUrl' option. + + +!!! error TS5060: Option 'paths' cannot be used without specifying '--baseUrl' option. +==== c:/root/f1.ts (0 errors) ==== + export var x = 1; + \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js new file mode 100644 index 00000000000..5fcaa23b976 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.js @@ -0,0 +1,7 @@ +//// [f1.ts] +export var x = 1; + + +//// [f1.js] +"use strict"; +exports.x = 1; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.trace.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_node.trace.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.js b/tests/baselines/reference/pathMappingBasedModuleResolution2.js deleted file mode 100644 index 40cdd1fdfd4..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution2.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols deleted file mode 100644 index 94f458ff1d3..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2.symbols +++ /dev/null @@ -1,22 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== tests/cases/compiler/root/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2.types b/tests/baselines/reference/pathMappingBasedModuleResolution2.types deleted file mode 100644 index ff6ef52f321..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2.types +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== tests/cases/compiler/root/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js deleted file mode 100644 index 115315fec11..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt similarity index 100% rename from tests/baselines/reference/pathMappingBasedModuleResolution6.errors.txt rename to tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js similarity index 100% rename from tests/baselines/reference/pathMappingBasedModuleResolution6.js rename to tests/baselines/reference/pathMappingBasedModuleResolution2_classic.js diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.trace.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.trace.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt new file mode 100644 index 00000000000..ad954bd142b --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt @@ -0,0 +1,8 @@ +error TS5061: Pattern '*1*' can have at most one '*' character +error TS5062: Substitution '*2*' in pattern '*1*' in can have at most one '*' character + + +!!! error TS5061: Pattern '*1*' can have at most one '*' character +!!! error TS5062: Substitution '*2*' in pattern '*1*' in can have at most one '*' character +==== tests/cases/compiler/root/src/folder1/file1.ts (0 errors) ==== + export var x = 1; \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5.js b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.js similarity index 100% rename from tests/baselines/reference/pathMappingBasedModuleResolution5.js rename to tests/baselines/reference/pathMappingBasedModuleResolution2_node.js diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.trace.json new file mode 100644 index 00000000000..0637a088a01 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.trace.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.js b/tests/baselines/reference/pathMappingBasedModuleResolution3.js deleted file mode 100644 index b7d1256da43..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution3.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols deleted file mode 100644 index b071ecec087..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3.symbols +++ /dev/null @@ -1,22 +0,0 @@ -=== tests/cases/compiler/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== tests/cases/compiler/root/src/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3.types b/tests/baselines/reference/pathMappingBasedModuleResolution3.types deleted file mode 100644 index 15428de5560..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3.types +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/compiler/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== tests/cases/compiler/root/src/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js deleted file mode 100644 index 72fe7d61726..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -"use strict"; -exports.x = 1; -//// [file2.js] -"use strict"; -var file3_1 = require("./file3"); -exports.x = file3_1.x; -//// [file1.js] -"use strict"; -var file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols deleted file mode 100644 index 835d16d46f4..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.symbols +++ /dev/null @@ -1,22 +0,0 @@ -=== c:/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== c:/root/src/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types deleted file mode 100644 index 8db89ab12b7..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_1.types +++ /dev/null @@ -1,25 +0,0 @@ -=== c:/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== c:/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== c:/root/src/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js new file mode 100644 index 00000000000..15867b085ea --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.js @@ -0,0 +1,42 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts] //// + +//// [file1.ts] + +// baseUrl set via command line + +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +//// [file2.ts] +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +//// [file3.ts] +export var x = 1; + +//// [file4.ts] +export var y = 100; + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.x = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.y = 100; +}); +//// [file2.js] +define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { + "use strict"; + exports.x = file3_1.x + file4_1.y; +}); +//// [file1.js] +// baseUrl set via command line +define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { + "use strict"; + use(file2_1.x.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols new file mode 100644 index 00000000000..97ec40d4cb4 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.symbols @@ -0,0 +1,39 @@ +=== c:/root/folder1/file1.ts === + +// baseUrl set via command line + +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file2.ts === +import {x as a} from "./file3" // found with baseurl +>x : Symbol(a, Decl(file2.ts, 0, 8)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {y as b} from "file4" // found with fallback +>y : Symbol(b, Decl(file2.ts, 1, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +export var x = a + b; +>x : Symbol(x, Decl(file2.ts, 2, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== c:/file4.ts === +export var y = 100; +>y : Symbol(y, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json new file mode 100644 index 00000000000..ac82f87bcee --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json @@ -0,0 +1,27 @@ +[ + "======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'", + "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.", + "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========", + "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.", + "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/root/folder2/file4.ts' does not exist.", + "File 'c:/root/folder2/file4.tsx' does not exist.", + "File 'c:/root/folder2/file4.d.ts' does not exist.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/file4.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types new file mode 100644 index 00000000000..359811ff3b2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types @@ -0,0 +1,44 @@ +=== c:/root/folder1/file1.ts === + +// baseUrl set via command line + +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file2.ts === +import {x as a} from "./file3" // found with baseurl +>x : number +>a : number + +import {y as b} from "file4" // found with fallback +>y : number +>b : number + +export var x = a + b; +>x : number +>a + b : number +>a : number +>b : number + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/file4.ts === +export var y = 100; +>y : number +>100 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js new file mode 100644 index 00000000000..cbff6087530 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts] //// + +//// [file1.ts] + +// baseUrl set via command line + +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +//// [file2.ts] +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +//// [file3.ts] +export var x = 1; + +//// [index.d.ts] +export var y: number; + +//// [file3.js] +"use strict"; +exports.x = 1; +//// [file2.js] +"use strict"; +var file3_1 = require("./file3"); // found with baseurl +var file4_1 = require("file4"); // found with fallback +exports.x = file3_1.x + file4_1.y; +//// [file1.js] +// baseUrl set via command line +"use strict"; +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols new file mode 100644 index 00000000000..487dea2fb89 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.symbols @@ -0,0 +1,39 @@ +=== c:/root/folder1/file1.ts === + +// baseUrl set via command line + +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 3, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>a : Symbol(a, Decl(file1.ts, 4, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 3, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 3, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file2.ts === +import {x as a} from "./file3" // found with baseurl +>x : Symbol(a, Decl(file2.ts, 0, 8)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {y as b} from "file4" // found with fallback +>y : Symbol(b, Decl(file2.ts, 1, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +export var x = a + b; +>x : Symbol(x, Decl(file2.ts, 2, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== c:/node_modules/file4/index.d.ts === +export var y: number; +>y : Symbol(y, Decl(index.d.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json new file mode 100644 index 00000000000..6d0de807bc0 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.trace.json @@ -0,0 +1,49 @@ +[ + "======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'", + "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.", + "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.", + "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========", + "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.", + "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.", + "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", + "Loading module as file / folder, candidate module location 'c:/root/file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/root/file4/package.json' does not exist.", + "File 'c:/root/file4/index.ts' does not exist.", + "File 'c:/root/file4/index.tsx' does not exist.", + "File 'c:/root/file4/index.d.ts' does not exist.", + "Loading module 'file4' from 'node_modules' folder.", + "File 'c:/root/folder2/node_modules/file4.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4.tsx' does not exist.", + "File 'c:/root/folder2/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4/package.json' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/root/node_modules/file4.ts' does not exist.", + "File 'c:/root/node_modules/file4.tsx' does not exist.", + "File 'c:/root/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/node_modules/file4/package.json' does not exist.", + "File 'c:/root/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/node_modules/file4.ts' does not exist.", + "File 'c:/node_modules/file4.tsx' does not exist.", + "File 'c:/node_modules/file4.d.ts' does not exist.", + "File 'c:/node_modules/file4/package.json' does not exist.", + "File 'c:/node_modules/file4/index.ts' does not exist.", + "File 'c:/node_modules/file4/index.tsx' does not exist.", + "File 'c:/node_modules/file4/index.d.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types new file mode 100644 index 00000000000..78597cf50ef --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types @@ -0,0 +1,43 @@ +=== c:/root/folder1/file1.ts === + +// baseUrl set via command line + +import {x} from "folder2/file2" +>x : number + +declare function use(a: any): void; +>use : (a: any) => void +>a : any + +use(x.toExponential()); +>use(x.toExponential()) : void +>use : (a: any) => void +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/folder2/file2.ts === +import {x as a} from "./file3" // found with baseurl +>x : number +>a : number + +import {y as b} from "file4" // found with fallback +>y : number +>b : number + +export var x = a + b; +>x : number +>a + b : number +>a : number +>b : number + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : number +>1 : number + +=== c:/node_modules/file4/index.d.ts === +export var y: number; +>y : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.js b/tests/baselines/reference/pathMappingBasedModuleResolution4.js deleted file mode 100644 index 4e76e43bb7d..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution4.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports", "./file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; -}); -//// [file1.js] -define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { - "use strict"; - use(file2_1.x.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols deleted file mode 100644 index b071ecec087..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4.symbols +++ /dev/null @@ -1,22 +0,0 @@ -=== tests/cases/compiler/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== tests/cases/compiler/root/src/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4.types b/tests/baselines/reference/pathMappingBasedModuleResolution4.types deleted file mode 100644 index 15428de5560..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4.types +++ /dev/null @@ -1,25 +0,0 @@ -=== tests/cases/compiler/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== tests/cases/compiler/root/src/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js deleted file mode 100644 index 56b271ec8d9..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -//// [file2.ts] -export {x} from "./file3" - -//// [file3.ts] -export var x = 1; - -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports", "./file3"], function (require, exports, file3_1) { - "use strict"; - exports.x = file3_1.x; -}); -//// [file1.js] -define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { - "use strict"; - use(file2_1.x.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols deleted file mode 100644 index 835d16d46f4..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.symbols +++ /dev/null @@ -1,22 +0,0 @@ -=== c:/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) - -=== c:/root/src/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types deleted file mode 100644 index 8db89ab12b7..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_1.types +++ /dev/null @@ -1,25 +0,0 @@ -=== c:/root/src/folder1/file1.ts === -import {x} from "folder2/file2" ->x : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -=== c:/root/src/folder2/file2.ts === -export {x} from "./file3" ->x : number - -=== c:/root/src/folder2/file3.ts === -export var x = 1; ->x : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js new file mode 100644 index 00000000000..c1de8cea6c9 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.js @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +//// [file2.ts] +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +//// [file3.ts] +export var x = 1; + +//// [file4.ts] +export var y = 100; + +//// [file3.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.x = 1; +}); +//// [file4.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + exports.y = 100; +}); +//// [file2.js] +define(["require", "exports", "./file3", "file4"], function (require, exports, file3_1, file4_1) { + "use strict"; + exports.x = file3_1.x + file4_1.y; +}); +//// [file1.js] +define(["require", "exports", "folder2/file2"], function (require, exports, file2_1) { + "use strict"; + use(file2_1.x.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols similarity index 50% rename from tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols rename to tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols index aa84fbf8cf9..7c1943dae46 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.symbols @@ -4,7 +4,7 @@ import {x} from "folder2/file2" declare function use(a: any): void; >use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 2, 21)) +>a : Symbol(a, Decl(file1.ts, 1, 21)) use(x.toExponential()); >use : Symbol(use, Decl(file1.ts, 0, 31)) @@ -13,10 +13,24 @@ use(x.toExponential()); >toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) === c:/root/folder2/file2.ts === -export {x} from "./file3" ->x : Symbol(x, Decl(file2.ts, 0, 8)) +import {x as a} from "./file3" // found with baseurl +>x : Symbol(a, Decl(file2.ts, 0, 8)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {y as b} from "file4" // found with fallback +>y : Symbol(b, Decl(file2.ts, 1, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +export var x = a + b; +>x : Symbol(x, Decl(file2.ts, 2, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) === c:/root/folder2/file3.ts === export var x = 1; >x : Symbol(x, Decl(file3.ts, 0, 10)) +=== c:/file4.ts === +export var y = 100; +>y : Symbol(y, Decl(file4.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json new file mode 100644 index 00000000000..ac82f87bcee --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json @@ -0,0 +1,27 @@ +[ + "======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'", + "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.", + "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========", + "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.", + "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/root/folder2/file4.ts' does not exist.", + "File 'c:/root/folder2/file4.tsx' does not exist.", + "File 'c:/root/folder2/file4.d.ts' does not exist.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/file4.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types similarity index 60% rename from tests/baselines/reference/pathMappingBasedModuleResolution1_1.types rename to tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types index 5b0727157ac..d225246e2f9 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution1_1.types +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types @@ -1,7 +1,4 @@ === c:/root/folder1/file1.ts === - -// user defined base url - import {x} from "folder2/file2" >x : number @@ -18,11 +15,27 @@ use(x.toExponential()); >toExponential : (fractionDigits?: number) => string === c:/root/folder2/file2.ts === -export {x} from "./file3" +import {x as a} from "./file3" // found with baseurl >x : number +>a : number + +import {y as b} from "file4" // found with fallback +>y : number +>b : number + +export var x = a + b; +>x : number +>a + b : number +>a : number +>b : number === c:/root/folder2/file3.ts === export var x = 1; >x : number >1 : number +=== c:/file4.ts === +export var y = 100; +>y : number +>100 : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js new file mode 100644 index 00000000000..c5a08d55d8b --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.js @@ -0,0 +1,30 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts] //// + +//// [file1.ts] +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +//// [file2.ts] +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +//// [file3.ts] +export var x = 1; + +//// [index.d.ts] +export var y: number; + +//// [file3.js] +"use strict"; +exports.x = 1; +//// [file2.js] +"use strict"; +var file3_1 = require("./file3"); // found with baseurl +var file4_1 = require("file4"); // found with fallback +exports.x = file3_1.x + file4_1.y; +//// [file1.js] +"use strict"; +var file2_1 = require("folder2/file2"); +use(file2_1.x.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols new file mode 100644 index 00000000000..fb1c5be9de6 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.symbols @@ -0,0 +1,36 @@ +=== c:/root/folder1/file1.ts === +import {x} from "folder2/file2" +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(a: any): void; +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>a : Symbol(a, Decl(file1.ts, 1, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 31)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/folder2/file2.ts === +import {x as a} from "./file3" // found with baseurl +>x : Symbol(a, Decl(file2.ts, 0, 8)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {y as b} from "file4" // found with fallback +>y : Symbol(b, Decl(file2.ts, 1, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +export var x = a + b; +>x : Symbol(x, Decl(file2.ts, 2, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +=== c:/root/folder2/file3.ts === +export var x = 1; +>x : Symbol(x, Decl(file3.ts, 0, 10)) + +=== c:/node_modules/file4/index.d.ts === +export var y: number; +>y : Symbol(y, Decl(index.d.ts, 0, 10)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json new file mode 100644 index 00000000000..6d0de807bc0 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.trace.json @@ -0,0 +1,49 @@ +[ + "======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'", + "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.", + "Loading module as file / folder, candidate module location 'c:/root/folder2/file2'.", + "File 'c:/root/folder2/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========", + "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "Loading module as file / folder, candidate module location 'c:/root/folder2/file3'.", + "File 'c:/root/folder2/file3.ts' exist - use it as a module resolution result.", + "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========", + "Explicitly specified module resolution kind: 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", + "Loading module as file / folder, candidate module location 'c:/root/file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/root/file4/package.json' does not exist.", + "File 'c:/root/file4/index.ts' does not exist.", + "File 'c:/root/file4/index.tsx' does not exist.", + "File 'c:/root/file4/index.d.ts' does not exist.", + "Loading module 'file4' from 'node_modules' folder.", + "File 'c:/root/folder2/node_modules/file4.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4.tsx' does not exist.", + "File 'c:/root/folder2/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4/package.json' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/folder2/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/root/node_modules/file4.ts' does not exist.", + "File 'c:/root/node_modules/file4.tsx' does not exist.", + "File 'c:/root/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/node_modules/file4/package.json' does not exist.", + "File 'c:/root/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/node_modules/file4.ts' does not exist.", + "File 'c:/node_modules/file4.tsx' does not exist.", + "File 'c:/node_modules/file4.d.ts' does not exist.", + "File 'c:/node_modules/file4/package.json' does not exist.", + "File 'c:/node_modules/file4/index.ts' does not exist.", + "File 'c:/node_modules/file4/index.tsx' does not exist.", + "File 'c:/node_modules/file4/index.d.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types similarity index 59% rename from tests/baselines/reference/pathMappingBasedModuleResolution2_1.types rename to tests/baselines/reference/pathMappingBasedModuleResolution4_node.types index de76a17e406..5478a601f02 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_1.types +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types @@ -15,11 +15,26 @@ use(x.toExponential()); >toExponential : (fractionDigits?: number) => string === c:/root/folder2/file2.ts === -export {x} from "./file3" +import {x as a} from "./file3" // found with baseurl >x : number +>a : number + +import {y as b} from "file4" // found with fallback +>y : number +>b : number + +export var x = a + b; +>x : number +>a + b : number +>a : number +>b : number === c:/root/folder2/file3.ts === export var x = 1; >x : number >1 : number +=== c:/node_modules/file4/index.d.ts === +export var y: number; +>y : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt deleted file mode 100644 index bcf7ced9509..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5.errors.txt +++ /dev/null @@ -1,6 +0,0 @@ -error TS5064: Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option. - - -!!! error TS5064: Module resolution kind cannot be determined automatically. Please specify module resolution explicitly via 'moduleResolution' option. -==== tests/cases/compiler/root/src/folder1/file1.ts (0 errors) ==== - export var x = 1; \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js similarity index 91% rename from tests/baselines/reference/pathMappingBasedModuleResolution7_2.js rename to tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js index 7c66828054e..24297f85e35 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.js @@ -1,4 +1,4 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts] //// +//// [tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts] //// //// [file1.ts] import {x} from "folder2/file1" diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.symbols similarity index 95% rename from tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols rename to tests/baselines/reference/pathMappingBasedModuleResolution5_classic.symbols index a974a238200..057b5a622a1 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.symbols @@ -51,7 +51,7 @@ export var y = 1; export var z = 1; >z : Symbol(z, Decl(file3.ts, 0, 10)) -=== c:/sharedrepo/file4.ts === +=== c:/file4.ts === export var z1 = 1; >z1 : Symbol(z1, Decl(file4.ts, 0, 10)) diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json new file mode 100644 index 00000000000..293291e4acf --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json @@ -0,0 +1,51 @@ +[ + "======== Resolving module 'folder2/file1' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file1'", + "'paths' option is specified, looking for a pattern to match module name 'folder2/file1'.", + "Module name 'folder2/file1', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'folder2/file1'.", + "File 'c:/root/folder2/file1.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========", + "======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder3/file2'", + "'paths' option is specified, looking for a pattern to match module name 'folder3/file2'.", + "Module name 'folder3/file2', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'folder3/file2'.", + "File 'c:/root/folder3/file2.ts' does not exist.", + "File 'c:/root/folder3/file2.tsx' does not exist.", + "File 'c:/root/folder3/file2.d.ts' does not exist.", + "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.", + "File 'c:/root/generated/folder3/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========", + "======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'components/file3'", + "'paths' option is specified, looking for a pattern to match module name 'components/file3'.", + "Module name 'components/file3', matched pattern 'components/*'.", + "Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'.", + "File 'c:/root/shared/components/file3.ts' exist - use it as a module resolution result.", + "======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "'paths' option is specified, looking for a pattern to match module name 'file4'.", + "Module name 'file4', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "Trying substitution 'generated/*', candidate module location: 'generated/file4'.", + "File 'c:/root/generated/file4.ts' does not exist.", + "File 'c:/root/generated/file4.tsx' does not exist.", + "File 'c:/root/generated/file4.d.ts' does not exist.", + "File 'c:/root/folder1/file4.ts' does not exist.", + "File 'c:/root/folder1/file4.tsx' does not exist.", + "File 'c:/root/folder1/file4.d.ts' does not exist.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/file4.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types similarity index 93% rename from tests/baselines/reference/pathMappingBasedModuleResolution7_2.types rename to tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types index 9a88412b623..32a1f42bc0f 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_2.types +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types @@ -62,7 +62,7 @@ export var z = 1; >z : number >1 : number -=== c:/sharedrepo/file4.ts === +=== c:/file4.ts === export var z1 = 1; >z1 : number >1 : number diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js new file mode 100644 index 00000000000..1958800f918 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.js @@ -0,0 +1,46 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts] //// + +//// [file1.ts] +import {x} from "folder2/file1" +import {y} from "folder3/file2" +import {z} from "components/file3" +import {z1} from "file4" + +declare function use(a: any): void; + +use(x.toExponential()); +use(y.toExponential()); +use(z.toExponential()); +use(z1.toExponential()); + +//// [file1.ts] +export var x = 1; + +//// [file2.ts] +export var y = 1; + +//// [index.d.ts] +export var z: number; + +//// [file4.ts] +export var z1 = 1; + +//// [file1.js] +"use strict"; +exports.x = 1; +//// [file2.js] +"use strict"; +exports.y = 1; +//// [file4.js] +"use strict"; +exports.z1 = 1; +//// [file1.js] +"use strict"; +var file1_1 = require("folder2/file1"); +var file2_1 = require("folder3/file2"); +var file3_1 = require("components/file3"); +var file4_1 = require("file4"); +use(file1_1.x.toExponential()); +use(file2_1.y.toExponential()); +use(file3_1.z.toExponential()); +use(file4_1.z1.toExponential()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.symbols similarity index 85% rename from tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols rename to tests/baselines/reference/pathMappingBasedModuleResolution5_node.symbols index 553112dde95..67bf14607dd 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.symbols +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.symbols @@ -39,19 +39,19 @@ use(z1.toExponential()); >z1 : Symbol(z1, Decl(file1.ts, 3, 8)) >toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) -=== c:/root/src/folder2/file1.ts === +=== c:/root/folder2/file1.ts === export var x = 1; >x : Symbol(x, Decl(file1.ts, 0, 10)) -=== c:/root/src/generated/folder3/file2.ts === +=== c:/root/generated/folder3/file2.ts === export var y = 1; >y : Symbol(y, Decl(file2.ts, 0, 10)) -=== c:/root/src/shared/components/file3.ts === -export var z = 1; ->z : Symbol(z, Decl(file3.ts, 0, 10)) +=== c:/root/shared/components/file3/index.d.ts === +export var z: number; +>z : Symbol(z, Decl(index.d.ts, 0, 10)) -=== c:/sharedrepo/file4.ts === +=== c:/node_modules/file4.ts === export var z1 = 1; >z1 : Symbol(z1, Decl(file4.ts, 0, 10)) diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json new file mode 100644 index 00000000000..398d15839de --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.trace.json @@ -0,0 +1,84 @@ +[ + "======== Resolving module 'folder2/file1' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file1'", + "'paths' option is specified, looking for a pattern to match module name 'folder2/file1'.", + "Module name 'folder2/file1', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'folder2/file1'.", + "Loading module as file / folder, candidate module location 'c:/root/folder2/file1'.", + "File 'c:/root/folder2/file1.ts' exist - use it as a module resolution result.", + "======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ========", + "======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder3/file2'", + "'paths' option is specified, looking for a pattern to match module name 'folder3/file2'.", + "Module name 'folder3/file2', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'folder3/file2'.", + "Loading module as file / folder, candidate module location 'c:/root/folder3/file2'.", + "File 'c:/root/folder3/file2.ts' does not exist.", + "File 'c:/root/folder3/file2.tsx' does not exist.", + "File 'c:/root/folder3/file2.d.ts' does not exist.", + "File 'c:/root/folder3/file2/package.json' does not exist.", + "File 'c:/root/folder3/file2/index.ts' does not exist.", + "File 'c:/root/folder3/file2/index.tsx' does not exist.", + "File 'c:/root/folder3/file2/index.d.ts' does not exist.", + "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.", + "Loading module as file / folder, candidate module location 'c:/root/generated/folder3/file2'.", + "File 'c:/root/generated/folder3/file2.ts' exist - use it as a module resolution result.", + "======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ========", + "======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'components/file3'", + "'paths' option is specified, looking for a pattern to match module name 'components/file3'.", + "Module name 'components/file3', matched pattern 'components/*'.", + "Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'.", + "Loading module as file / folder, candidate module location 'c:/root/shared/components/file3'.", + "File 'c:/root/shared/components/file3.ts' does not exist.", + "File 'c:/root/shared/components/file3.tsx' does not exist.", + "File 'c:/root/shared/components/file3.d.ts' does not exist.", + "File 'c:/root/shared/components/file3/package.json' does not exist.", + "File 'c:/root/shared/components/file3/index.ts' does not exist.", + "File 'c:/root/shared/components/file3/index.tsx' does not exist.", + "File 'c:/root/shared/components/file3/index.d.ts' exist - use it as a module resolution result.", + "======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3/index.d.ts'. ========", + "======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", + "'paths' option is specified, looking for a pattern to match module name 'file4'.", + "Module name 'file4', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'file4'.", + "Loading module as file / folder, candidate module location 'c:/root/file4'.", + "File 'c:/root/file4.ts' does not exist.", + "File 'c:/root/file4.tsx' does not exist.", + "File 'c:/root/file4.d.ts' does not exist.", + "File 'c:/root/file4/package.json' does not exist.", + "File 'c:/root/file4/index.ts' does not exist.", + "File 'c:/root/file4/index.tsx' does not exist.", + "File 'c:/root/file4/index.d.ts' does not exist.", + "Trying substitution 'generated/*', candidate module location: 'generated/file4'.", + "Loading module as file / folder, candidate module location 'c:/root/generated/file4'.", + "File 'c:/root/generated/file4.ts' does not exist.", + "File 'c:/root/generated/file4.tsx' does not exist.", + "File 'c:/root/generated/file4.d.ts' does not exist.", + "File 'c:/root/generated/file4/package.json' does not exist.", + "File 'c:/root/generated/file4/index.ts' does not exist.", + "File 'c:/root/generated/file4/index.tsx' does not exist.", + "File 'c:/root/generated/file4/index.d.ts' does not exist.", + "Loading module 'file4' from 'node_modules' folder.", + "File 'c:/root/folder1/node_modules/file4.ts' does not exist.", + "File 'c:/root/folder1/node_modules/file4.tsx' does not exist.", + "File 'c:/root/folder1/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/folder1/node_modules/file4/package.json' does not exist.", + "File 'c:/root/folder1/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/folder1/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/folder1/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/root/node_modules/file4.ts' does not exist.", + "File 'c:/root/node_modules/file4.tsx' does not exist.", + "File 'c:/root/node_modules/file4.d.ts' does not exist.", + "File 'c:/root/node_modules/file4/package.json' does not exist.", + "File 'c:/root/node_modules/file4/index.ts' does not exist.", + "File 'c:/root/node_modules/file4/index.tsx' does not exist.", + "File 'c:/root/node_modules/file4/index.d.ts' does not exist.", + "File 'c:/node_modules/file4.ts' exist - use it as a module resolution result.", + "======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types similarity index 83% rename from tests/baselines/reference/pathMappingBasedModuleResolution8_1.types rename to tests/baselines/reference/pathMappingBasedModuleResolution5_node.types index 61da62d4ee6..1b96e3f4f22 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.types +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types @@ -47,22 +47,21 @@ use(z1.toExponential()); >z1 : number >toExponential : (fractionDigits?: number) => string -=== c:/root/src/folder2/file1.ts === +=== c:/root/folder2/file1.ts === export var x = 1; >x : number >1 : number -=== c:/root/src/generated/folder3/file2.ts === +=== c:/root/generated/folder3/file2.ts === export var y = 1; >y : number >1 : number -=== c:/root/src/shared/components/file3.ts === -export var z = 1; +=== c:/root/shared/components/file3/index.d.ts === +export var z: number; >z : number ->1 : number -=== c:/sharedrepo/file4.ts === +=== c:/node_modules/file4.ts === export var z1 = 1; >z1 : number >1 : number diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js new file mode 100644 index 00000000000..1e8f8807e2c --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts] //// + +//// [file1.ts] +import {x} from "./project/file3"; +declare function use(x: string); +use(x.toExponential()); + +//// [file2.d.ts] +export let x: number; + +//// [file3.ts] +export {x} from "../file2"; + +//// [file3.js] +define(["require", "exports", "../file2"], function (require, exports, file2_1) { + "use strict"; + exports.x = file2_1.x; +}); +//// [file1.js] +define(["require", "exports", "./project/file3"], function (require, exports, file3_1) { + "use strict"; + use(file3_1.x.toExponential()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.symbols new file mode 100644 index 00000000000..a451ffb2584 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.symbols @@ -0,0 +1,22 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file3"; +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(x: string); +>use : Symbol(use, Decl(file1.ts, 0, 34)) +>x : Symbol(x, Decl(file1.ts, 1, 21)) + +use(x.toExponential()); +>use : Symbol(use, Decl(file1.ts, 0, 34)) +>x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) + +=== c:/root/src/file2.d.ts === +export let x: number; +>x : Symbol(x, Decl(file2.d.ts, 0, 10)) + +=== c:/root/generated/src/project/file3.ts === +export {x} from "../file2"; +>x : Symbol(x, Decl(file3.ts, 0, 8)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json new file mode 100644 index 00000000000..229ef51a924 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json @@ -0,0 +1,32 @@ +[ + "======== Resolving module './project/file3' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'rootDirs' option is set, using it to resolve relative module name './project/file3'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/src/project/file3' - 'true'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/src/project/file3' - 'false'.", + "Longest matching prefix for 'c:/root/src/project/file3' is 'c:/root/src/'", + "Loading 'project/file3' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file3'", + "File 'c:/root/src/project/file3.ts' does not exist.", + "File 'c:/root/src/project/file3.tsx' does not exist.", + "File 'c:/root/src/project/file3.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'", + "File 'c:/root/generated/src/project/file3.ts' exist - use it as a module resolution result.", + "======== Module name './project/file3' was successfully resolved to 'c:/root/generated/src/project/file3.ts'. ========", + "======== Resolving module '../file2' from 'c:/root/generated/src/project/file3.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'rootDirs' option is set, using it to resolve relative module name '../file2'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/generated/src/file2' - 'false'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/generated/src/file2' - 'true'.", + "Longest matching prefix for 'c:/root/generated/src/file2' is 'c:/root/generated/src/'", + "Loading 'file2' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file2'", + "File 'c:/root/generated/src/file2.ts' does not exist.", + "File 'c:/root/generated/src/file2.tsx' does not exist.", + "File 'c:/root/generated/src/file2.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'file2' from the root dir 'c:/root/src', candidate location 'c:/root/src/file2'", + "File 'c:/root/src/file2.ts' does not exist.", + "File 'c:/root/src/file2.tsx' does not exist.", + "File 'c:/root/src/file2.d.ts' exist - use it as a module resolution result.", + "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types new file mode 100644 index 00000000000..06d2cbdce34 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types @@ -0,0 +1,24 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file3"; +>x : number + +declare function use(x: string); +>use : (x: string) => any +>x : string + +use(x.toExponential()); +>use(x.toExponential()) : any +>use : (x: string) => any +>x.toExponential() : string +>x.toExponential : (fractionDigits?: number) => string +>x : number +>toExponential : (fractionDigits?: number) => string + +=== c:/root/src/file2.d.ts === +export let x: number; +>x : number + +=== c:/root/generated/src/project/file3.ts === +export {x} from "../file2"; +>x : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js new file mode 100644 index 00000000000..6db3fecf83f --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts] //// + +//// [file1.ts] +import {x} from "./project/file3"; +declare function use(x: string); +use(x.toFixed()); + +//// [index.d.ts] +export let x: number; + +//// [file3.ts] +export {x} from "../file2"; + +//// [file3.js] +"use strict"; +var file2_1 = require("../file2"); +exports.x = file2_1.x; +//// [file1.js] +"use strict"; +var file3_1 = require("./project/file3"); +use(file3_1.x.toFixed()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.symbols new file mode 100644 index 00000000000..06554bae039 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.symbols @@ -0,0 +1,22 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file3"; +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +declare function use(x: string); +>use : Symbol(use, Decl(file1.ts, 0, 34)) +>x : Symbol(x, Decl(file1.ts, 1, 21)) + +use(x.toFixed()); +>use : Symbol(use, Decl(file1.ts, 0, 34)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +=== c:/root/src/file2/index.d.ts === +export let x: number; +>x : Symbol(x, Decl(index.d.ts, 0, 10)) + +=== c:/root/generated/src/project/file3.ts === +export {x} from "../file2"; +>x : Symbol(x, Decl(file3.ts, 0, 8)) + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json new file mode 100644 index 00000000000..4ea2f12a63c --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.trace.json @@ -0,0 +1,48 @@ +[ + "======== Resolving module './project/file3' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'rootDirs' option is set, using it to resolve relative module name './project/file3'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/src/project/file3' - 'true'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/src/project/file3' - 'false'.", + "Longest matching prefix for 'c:/root/src/project/file3' is 'c:/root/src/'", + "Loading 'project/file3' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file3'", + "Loading module as file / folder, candidate module location 'c:/root/src/project/file3'.", + "File 'c:/root/src/project/file3.ts' does not exist.", + "File 'c:/root/src/project/file3.tsx' does not exist.", + "File 'c:/root/src/project/file3.d.ts' does not exist.", + "File 'c:/root/src/project/file3/package.json' does not exist.", + "File 'c:/root/src/project/file3/index.ts' does not exist.", + "File 'c:/root/src/project/file3/index.tsx' does not exist.", + "File 'c:/root/src/project/file3/index.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'", + "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file3'.", + "File 'c:/root/generated/src/project/file3.ts' exist - use it as a module resolution result.", + "======== Module name './project/file3' was successfully resolved to 'c:/root/generated/src/project/file3.ts'. ========", + "======== Resolving module '../file2' from 'c:/root/generated/src/project/file3.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'rootDirs' option is set, using it to resolve relative module name '../file2'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/generated/src/file2' - 'false'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/generated/src/file2' - 'true'.", + "Longest matching prefix for 'c:/root/generated/src/file2' is 'c:/root/generated/src/'", + "Loading 'file2' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file2'", + "Loading module as file / folder, candidate module location 'c:/root/generated/src/file2'.", + "File 'c:/root/generated/src/file2.ts' does not exist.", + "File 'c:/root/generated/src/file2.tsx' does not exist.", + "File 'c:/root/generated/src/file2.d.ts' does not exist.", + "File 'c:/root/generated/src/file2/package.json' does not exist.", + "File 'c:/root/generated/src/file2/index.ts' does not exist.", + "File 'c:/root/generated/src/file2/index.tsx' does not exist.", + "File 'c:/root/generated/src/file2/index.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'file2' from the root dir 'c:/root/src', candidate location 'c:/root/src/file2'", + "Loading module as file / folder, candidate module location 'c:/root/src/file2'.", + "File 'c:/root/src/file2.ts' does not exist.", + "File 'c:/root/src/file2.tsx' does not exist.", + "File 'c:/root/src/file2.d.ts' does not exist.", + "File 'c:/root/src/file2/package.json' does not exist.", + "File 'c:/root/src/file2/index.ts' does not exist.", + "File 'c:/root/src/file2/index.tsx' does not exist.", + "File 'c:/root/src/file2/index.d.ts' exist - use it as a module resolution result.", + "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2/index.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.types new file mode 100644 index 00000000000..2fd10e8e133 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.types @@ -0,0 +1,24 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file3"; +>x : number + +declare function use(x: string); +>use : (x: string) => any +>x : string + +use(x.toFixed()); +>use(x.toFixed()) : any +>use : (x: string) => any +>x.toFixed() : string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string + +=== c:/root/src/file2/index.d.ts === +export let x: number; +>x : number + +=== c:/root/generated/src/project/file3.ts === +export {x} from "../file2"; +>x : number + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.js b/tests/baselines/reference/pathMappingBasedModuleResolution7.js deleted file mode 100644 index ef79caaabc0..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7.js +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export var z = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols deleted file mode 100644 index 4b7b9c15739..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7.symbols +++ /dev/null @@ -1,44 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->a : Symbol(a, Decl(file1.ts, 4, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== tests/cases/compiler/root/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== tests/cases/compiler/root/shared/components/file3.ts === -export var z = 1; ->z : Symbol(z, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7.types b/tests/baselines/reference/pathMappingBasedModuleResolution7.types deleted file mode 100644 index 1bc1622b19f..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7.types +++ /dev/null @@ -1,53 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== tests/cases/compiler/root/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== tests/cases/compiler/root/shared/components/file3.ts === -export var z = 1; ->z : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js deleted file mode 100644 index ad2b8ef2a90..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.js +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export var z = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols deleted file mode 100644 index 097f0747b47..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.symbols +++ /dev/null @@ -1,44 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->a : Symbol(a, Decl(file1.ts, 4, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/root/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== c:/root/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== c:/root/shared/components/file3.ts === -export var z = 1; ->z : Symbol(z, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types deleted file mode 100644 index 9cc451eaa3b..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_1.types +++ /dev/null @@ -1,53 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -=== c:/root/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== c:/root/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== c:/root/shared/components/file3.ts === -export var z = 1; ->z : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js new file mode 100644 index 00000000000..5670f41be0f --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.js @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts] //// + +//// [file1.ts] +import {x} from "./project/file2"; +import {y} from "module3"; + +declare function use(x: string); +use(x.toFixed()); +use(y.toFixed()); + +//// [file2.ts] +import {a} from "module1"; +import {b} from "templates/module2"; +import {x as c} from "../file3"; +export let x = a + b + c; + +//// [module1.d.ts] +export let a: number + +//// [module2.ts] +export let b: number; + +//// [file3.d.ts] +export let x: number; + +//// [module3.d.ts] +export let y: number; + + + +//// [module2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file2.js] +define(["require", "exports", "module1", "templates/module2", "../file3"], function (require, exports, module1_1, module2_1, file3_1) { + "use strict"; + exports.x = module1_1.a + module2_1.b + file3_1.x; +}); +//// [file1.js] +define(["require", "exports", "./project/file2", "module3"], function (require, exports, file2_1, module3_1) { + "use strict"; + use(file2_1.x.toFixed()); + use(module3_1.y.toFixed()); +}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols new file mode 100644 index 00000000000..b1e4751c495 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.symbols @@ -0,0 +1,57 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file2"; +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "module3"; +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +declare function use(x: string); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>x : Symbol(x, Decl(file1.ts, 3, 21)) + +use(x.toFixed()); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +use(y.toFixed()); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>y.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +=== c:/root/generated/src/project/file2.ts === +import {a} from "module1"; +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {b} from "templates/module2"; +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +import {x as c} from "../file3"; +>x : Symbol(c, Decl(file2.ts, 2, 8)) +>c : Symbol(c, Decl(file2.ts, 2, 8)) + +export let x = a + b + c; +>x : Symbol(x, Decl(file2.ts, 3, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) +>c : Symbol(c, Decl(file2.ts, 2, 8)) + +=== c:/shared/module1.d.ts === +export let a: number +>a : Symbol(a, Decl(module1.d.ts, 0, 10)) + +=== c:/root/generated/src/templates/module2.ts === +export let b: number; +>b : Symbol(b, Decl(module2.ts, 0, 10)) + +=== c:/root/src/file3.d.ts === +export let x: number; +>x : Symbol(x, Decl(file3.d.ts, 0, 10)) + +=== c:/module3.d.ts === +export let y: number; +>y : Symbol(y, Decl(module3.d.ts, 0, 10)) + + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json new file mode 100644 index 00000000000..8242f8fb442 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json @@ -0,0 +1,77 @@ +[ + "======== Resolving module './project/file2' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'rootDirs' option is set, using it to resolve relative module name './project/file2'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'true'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'false'.", + "Longest matching prefix for 'c:/root/src/project/file2' is 'c:/root/src/'", + "Loading 'project/file2' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file2'", + "File 'c:/root/src/project/file2.ts' does not exist.", + "File 'c:/root/src/project/file2.tsx' does not exist.", + "File 'c:/root/src/project/file2.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'", + "File 'c:/root/generated/src/project/file2.ts' exist - use it as a module resolution result.", + "======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========", + "======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module3'", + "'paths' option is specified, looking for a pattern to match module name 'module3'.", + "Module name 'module3', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'module3'.", + "File 'c:/root/module3.ts' does not exist.", + "File 'c:/root/module3.tsx' does not exist.", + "File 'c:/root/module3.d.ts' does not exist.", + "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module3'.", + "File 'c:/shared/module3.ts' does not exist.", + "File 'c:/shared/module3.tsx' does not exist.", + "File 'c:/shared/module3.d.ts' does not exist.", + "File 'c:/root/src/module3.ts' does not exist.", + "File 'c:/root/src/module3.tsx' does not exist.", + "File 'c:/root/src/module3.d.ts' does not exist.", + "File 'c:/root/module3.ts' does not exist.", + "File 'c:/root/module3.tsx' does not exist.", + "File 'c:/root/module3.d.ts' does not exist.", + "File 'c:/module3.ts' does not exist.", + "File 'c:/module3.tsx' does not exist.", + "File 'c:/module3.d.ts' exist - use it as a module resolution result.", + "======== Module name 'module3' was successfully resolved to 'c:/module3.d.ts'. ========", + "======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module1'", + "'paths' option is specified, looking for a pattern to match module name 'module1'.", + "Module name 'module1', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'module1'.", + "File 'c:/root/module1.ts' does not exist.", + "File 'c:/root/module1.tsx' does not exist.", + "File 'c:/root/module1.d.ts' does not exist.", + "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module1'.", + "File 'c:/shared/module1.ts' does not exist.", + "File 'c:/shared/module1.tsx' does not exist.", + "File 'c:/shared/module1.d.ts' exist - use it as a module resolution result.", + "======== Module name 'module1' was successfully resolved to 'c:/shared/module1.d.ts'. ========", + "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'templates/module2'", + "'paths' option is specified, looking for a pattern to match module name 'templates/module2'.", + "Module name 'templates/module2', matched pattern 'templates/*'.", + "Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.", + "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a module resolution result.", + "======== Module name 'templates/module2' was successfully resolved to 'c:/root/generated/src/templates/module2.ts'. ========", + "======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'Classic'.", + "'rootDirs' option is set, using it to resolve relative module name '../file3'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'false'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'true'.", + "Longest matching prefix for 'c:/root/generated/src/file3' is 'c:/root/generated/src/'", + "Loading 'file3' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file3'", + "File 'c:/root/generated/src/file3.ts' does not exist.", + "File 'c:/root/generated/src/file3.tsx' does not exist.", + "File 'c:/root/generated/src/file3.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'file3' from the root dir 'c:/root/src', candidate location 'c:/root/src/file3'", + "File 'c:/root/src/file3.ts' does not exist.", + "File 'c:/root/src/file3.tsx' does not exist.", + "File 'c:/root/src/file3.d.ts' exist - use it as a module resolution result.", + "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types new file mode 100644 index 00000000000..26c4b425c88 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types @@ -0,0 +1,63 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file2"; +>x : number + +import {y} from "module3"; +>y : number + +declare function use(x: string); +>use : (x: string) => any +>x : string + +use(x.toFixed()); +>use(x.toFixed()) : any +>use : (x: string) => any +>x.toFixed() : string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string + +use(y.toFixed()); +>use(y.toFixed()) : any +>use : (x: string) => any +>y.toFixed() : string +>y.toFixed : (fractionDigits?: number) => string +>y : number +>toFixed : (fractionDigits?: number) => string + +=== c:/root/generated/src/project/file2.ts === +import {a} from "module1"; +>a : number + +import {b} from "templates/module2"; +>b : number + +import {x as c} from "../file3"; +>x : number +>c : number + +export let x = a + b + c; +>x : number +>a + b + c : number +>a + b : number +>a : number +>b : number +>c : number + +=== c:/shared/module1.d.ts === +export let a: number +>a : number + +=== c:/root/generated/src/templates/module2.ts === +export let b: number; +>b : number + +=== c:/root/src/file3.d.ts === +export let x: number; +>x : number + +=== c:/module3.d.ts === +export let y: number; +>y : number + + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js new file mode 100644 index 00000000000..3be48cfc85c --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.js @@ -0,0 +1,44 @@ +//// [tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts] //// + +//// [file1.ts] +import {x} from "./project/file2"; +import {y} from "module3"; + +declare function use(x: string); +use(x.toFixed()); +use(y.toFixed()); + +//// [file2.ts] +import {a} from "module1"; +import {b} from "templates/module2"; +import {x as c} from "../file3"; +export let x = a + b + c; + +//// [index.d.ts] +export let a: number + +//// [module2.ts] +export let b: number; + +//// [index.d.ts] +export let x: number; + +//// [module3.d.ts] +export let y: number; + + + +//// [module2.js] +"use strict"; +//// [file2.js] +"use strict"; +var module1_1 = require("module1"); +var module2_1 = require("templates/module2"); +var file3_1 = require("../file3"); +exports.x = module1_1.a + module2_1.b + file3_1.x; +//// [file1.js] +"use strict"; +var file2_1 = require("./project/file2"); +var module3_1 = require("module3"); +use(file2_1.x.toFixed()); +use(module3_1.y.toFixed()); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols new file mode 100644 index 00000000000..9cda76790ea --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.symbols @@ -0,0 +1,57 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file2"; +>x : Symbol(x, Decl(file1.ts, 0, 8)) + +import {y} from "module3"; +>y : Symbol(y, Decl(file1.ts, 1, 8)) + +declare function use(x: string); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>x : Symbol(x, Decl(file1.ts, 3, 21)) + +use(x.toFixed()); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>x.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>x : Symbol(x, Decl(file1.ts, 0, 8)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +use(y.toFixed()); +>use : Symbol(use, Decl(file1.ts, 1, 26)) +>y.toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) +>y : Symbol(y, Decl(file1.ts, 1, 8)) +>toFixed : Symbol(Number.toFixed, Decl(lib.d.ts, --, --)) + +=== c:/root/generated/src/project/file2.ts === +import {a} from "module1"; +>a : Symbol(a, Decl(file2.ts, 0, 8)) + +import {b} from "templates/module2"; +>b : Symbol(b, Decl(file2.ts, 1, 8)) + +import {x as c} from "../file3"; +>x : Symbol(c, Decl(file2.ts, 2, 8)) +>c : Symbol(c, Decl(file2.ts, 2, 8)) + +export let x = a + b + c; +>x : Symbol(x, Decl(file2.ts, 3, 10)) +>a : Symbol(a, Decl(file2.ts, 0, 8)) +>b : Symbol(b, Decl(file2.ts, 1, 8)) +>c : Symbol(c, Decl(file2.ts, 2, 8)) + +=== c:/shared/module1/index.d.ts === +export let a: number +>a : Symbol(a, Decl(index.d.ts, 0, 10)) + +=== c:/root/generated/src/templates/module2.ts === +export let b: number; +>b : Symbol(b, Decl(module2.ts, 0, 10)) + +=== c:/root/src/file3/index.d.ts === +export let x: number; +>x : Symbol(x, Decl(index.d.ts, 0, 10)) + +=== c:/node_modules/module3.d.ts === +export let y: number; +>y : Symbol(y, Decl(module3.d.ts, 0, 10)) + + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json new file mode 100644 index 00000000000..39d5c25c92a --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.trace.json @@ -0,0 +1,123 @@ +[ + "======== Resolving module './project/file2' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'rootDirs' option is set, using it to resolve relative module name './project/file2'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'true'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'false'.", + "Longest matching prefix for 'c:/root/src/project/file2' is 'c:/root/src/'", + "Loading 'project/file2' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file2'", + "Loading module as file / folder, candidate module location 'c:/root/src/project/file2'.", + "File 'c:/root/src/project/file2.ts' does not exist.", + "File 'c:/root/src/project/file2.tsx' does not exist.", + "File 'c:/root/src/project/file2.d.ts' does not exist.", + "File 'c:/root/src/project/file2/package.json' does not exist.", + "File 'c:/root/src/project/file2/index.ts' does not exist.", + "File 'c:/root/src/project/file2/index.tsx' does not exist.", + "File 'c:/root/src/project/file2/index.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'", + "Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file2'.", + "File 'c:/root/generated/src/project/file2.ts' exist - use it as a module resolution result.", + "======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ========", + "======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module3'", + "'paths' option is specified, looking for a pattern to match module name 'module3'.", + "Module name 'module3', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'module3'.", + "Loading module as file / folder, candidate module location 'c:/root/module3'.", + "File 'c:/root/module3.ts' does not exist.", + "File 'c:/root/module3.tsx' does not exist.", + "File 'c:/root/module3.d.ts' does not exist.", + "File 'c:/root/module3/package.json' does not exist.", + "File 'c:/root/module3/index.ts' does not exist.", + "File 'c:/root/module3/index.tsx' does not exist.", + "File 'c:/root/module3/index.d.ts' does not exist.", + "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module3'.", + "Loading module as file / folder, candidate module location 'c:/shared/module3'.", + "File 'c:/shared/module3.ts' does not exist.", + "File 'c:/shared/module3.tsx' does not exist.", + "File 'c:/shared/module3.d.ts' does not exist.", + "File 'c:/shared/module3/package.json' does not exist.", + "File 'c:/shared/module3/index.ts' does not exist.", + "File 'c:/shared/module3/index.tsx' does not exist.", + "File 'c:/shared/module3/index.d.ts' does not exist.", + "Loading module 'module3' from 'node_modules' folder.", + "File 'c:/root/src/node_modules/module3.ts' does not exist.", + "File 'c:/root/src/node_modules/module3.tsx' does not exist.", + "File 'c:/root/src/node_modules/module3.d.ts' does not exist.", + "File 'c:/root/src/node_modules/module3/package.json' does not exist.", + "File 'c:/root/src/node_modules/module3/index.ts' does not exist.", + "File 'c:/root/src/node_modules/module3/index.tsx' does not exist.", + "File 'c:/root/src/node_modules/module3/index.d.ts' does not exist.", + "File 'c:/root/node_modules/module3.ts' does not exist.", + "File 'c:/root/node_modules/module3.tsx' does not exist.", + "File 'c:/root/node_modules/module3.d.ts' does not exist.", + "File 'c:/root/node_modules/module3/package.json' does not exist.", + "File 'c:/root/node_modules/module3/index.ts' does not exist.", + "File 'c:/root/node_modules/module3/index.tsx' does not exist.", + "File 'c:/root/node_modules/module3/index.d.ts' does not exist.", + "File 'c:/node_modules/module3.ts' does not exist.", + "File 'c:/node_modules/module3.tsx' does not exist.", + "File 'c:/node_modules/module3.d.ts' exist - use it as a module resolution result.", + "======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ========", + "======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'module1'", + "'paths' option is specified, looking for a pattern to match module name 'module1'.", + "Module name 'module1', matched pattern '*'.", + "Trying substitution '*', candidate module location: 'module1'.", + "Loading module as file / folder, candidate module location 'c:/root/module1'.", + "File 'c:/root/module1.ts' does not exist.", + "File 'c:/root/module1.tsx' does not exist.", + "File 'c:/root/module1.d.ts' does not exist.", + "File 'c:/root/module1/package.json' does not exist.", + "File 'c:/root/module1/index.ts' does not exist.", + "File 'c:/root/module1/index.tsx' does not exist.", + "File 'c:/root/module1/index.d.ts' does not exist.", + "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module1'.", + "Loading module as file / folder, candidate module location 'c:/shared/module1'.", + "File 'c:/shared/module1.ts' does not exist.", + "File 'c:/shared/module1.tsx' does not exist.", + "File 'c:/shared/module1.d.ts' does not exist.", + "File 'c:/shared/module1/package.json' does not exist.", + "File 'c:/shared/module1/index.ts' does not exist.", + "File 'c:/shared/module1/index.tsx' does not exist.", + "File 'c:/shared/module1/index.d.ts' exist - use it as a module resolution result.", + "======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ========", + "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'templates/module2'", + "'paths' option is specified, looking for a pattern to match module name 'templates/module2'.", + "Module name 'templates/module2', matched pattern 'templates/*'.", + "Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'.", + "Loading module as file / folder, candidate module location 'c:/root/generated/src/templates/module2'.", + "File 'c:/root/generated/src/templates/module2.ts' exist - use it as a module resolution result.", + "======== Module name 'templates/module2' was successfully resolved to 'c:/root/generated/src/templates/module2.ts'. ========", + "======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ========", + "Module resolution kind is not specified, using 'NodeJs'.", + "'rootDirs' option is set, using it to resolve relative module name '../file3'", + "Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'false'.", + "Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'true'.", + "Longest matching prefix for 'c:/root/generated/src/file3' is 'c:/root/generated/src/'", + "Loading 'file3' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file3'", + "Loading module as file / folder, candidate module location 'c:/root/generated/src/file3'.", + "File 'c:/root/generated/src/file3.ts' does not exist.", + "File 'c:/root/generated/src/file3.tsx' does not exist.", + "File 'c:/root/generated/src/file3.d.ts' does not exist.", + "File 'c:/root/generated/src/file3/package.json' does not exist.", + "File 'c:/root/generated/src/file3/index.ts' does not exist.", + "File 'c:/root/generated/src/file3/index.tsx' does not exist.", + "File 'c:/root/generated/src/file3/index.d.ts' does not exist.", + "Trying other entries in 'rootDirs'", + "Loading 'file3' from the root dir 'c:/root/src', candidate location 'c:/root/src/file3'", + "Loading module as file / folder, candidate module location 'c:/root/src/file3'.", + "File 'c:/root/src/file3.ts' does not exist.", + "File 'c:/root/src/file3.tsx' does not exist.", + "File 'c:/root/src/file3.d.ts' does not exist.", + "File 'c:/root/src/file3/package.json' does not exist.", + "File 'c:/root/src/file3/index.ts' does not exist.", + "File 'c:/root/src/file3/index.tsx' does not exist.", + "File 'c:/root/src/file3/index.d.ts' exist - use it as a module resolution result.", + "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3/index.d.ts'. ========" +] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types new file mode 100644 index 00000000000..974f710b4c2 --- /dev/null +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types @@ -0,0 +1,63 @@ +=== c:/root/src/file1.ts === +import {x} from "./project/file2"; +>x : number + +import {y} from "module3"; +>y : number + +declare function use(x: string); +>use : (x: string) => any +>x : string + +use(x.toFixed()); +>use(x.toFixed()) : any +>use : (x: string) => any +>x.toFixed() : string +>x.toFixed : (fractionDigits?: number) => string +>x : number +>toFixed : (fractionDigits?: number) => string + +use(y.toFixed()); +>use(y.toFixed()) : any +>use : (x: string) => any +>y.toFixed() : string +>y.toFixed : (fractionDigits?: number) => string +>y : number +>toFixed : (fractionDigits?: number) => string + +=== c:/root/generated/src/project/file2.ts === +import {a} from "module1"; +>a : number + +import {b} from "templates/module2"; +>b : number + +import {x as c} from "../file3"; +>x : number +>c : number + +export let x = a + b + c; +>x : number +>a + b + c : number +>a + b : number +>a : number +>b : number +>c : number + +=== c:/shared/module1/index.d.ts === +export let a: number +>a : number + +=== c:/root/generated/src/templates/module2.ts === +export let b: number; +>b : number + +=== c:/root/src/file3/index.d.ts === +export let x: number; +>x : number + +=== c:/node_modules/module3.d.ts === +export let y: number; +>y : number + + diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.js b/tests/baselines/reference/pathMappingBasedModuleResolution8.js deleted file mode 100644 index ba2f37bdc71..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8.js +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution8.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export var z = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols deleted file mode 100644 index 214b1d30ba8..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8.symbols +++ /dev/null @@ -1,44 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->a : Symbol(a, Decl(file1.ts, 4, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/src/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== tests/cases/compiler/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== tests/cases/compiler/root/src/shared/components/file3.ts === -export var z = 1; ->z : Symbol(z, Decl(file3.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8.types b/tests/baselines/reference/pathMappingBasedModuleResolution8.types deleted file mode 100644 index 5938d95ee03..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8.types +++ /dev/null @@ -1,53 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/src/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== tests/cases/compiler/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== tests/cases/compiler/root/src/shared/components/file3.ts === -export var z = 1; ->z : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js deleted file mode 100644 index 1aa0d19a29d..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution8_1.js +++ /dev/null @@ -1,55 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export var z = 1; - -//// [file4.ts] -export var z1 = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file3.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z1 = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); - use(file4_1.z1.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.js b/tests/baselines/reference/pathMappingBasedModuleResolution9.js deleted file mode 100644 index 57e53934eed..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9.js +++ /dev/null @@ -1,52 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution9.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export {z} from "./file4" - -//// [file4.ts] -export var z = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file3.js] -define(["require", "exports", "./file4"], function (require, exports, file4_1) { - "use strict"; - exports.z = file4_1.z; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3"], function (require, exports, file1_1, file2_1, file3_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols deleted file mode 100644 index 764f878b293..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9.symbols +++ /dev/null @@ -1,48 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->a : Symbol(a, Decl(file1.ts, 4, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 2, 34)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== tests/cases/compiler/root/src/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== tests/cases/compiler/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== tests/cases/compiler/root/src/shared/components/file3.ts === -export {z} from "./file4" ->z : Symbol(z, Decl(file3.ts, 0, 8)) - -=== tests/cases/compiler/root/src/shared/components/file4.ts === -export var z = 1; ->z : Symbol(z, Decl(file4.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9.types b/tests/baselines/reference/pathMappingBasedModuleResolution9.types deleted file mode 100644 index 789e8d050b1..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9.types +++ /dev/null @@ -1,57 +0,0 @@ -=== tests/cases/compiler/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -=== tests/cases/compiler/root/src/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== tests/cases/compiler/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== tests/cases/compiler/root/src/shared/components/file3.ts === -export {z} from "./file4" ->z : number - -=== tests/cases/compiler/root/src/shared/components/file4.ts === -export var z = 1; ->z : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js deleted file mode 100644 index ff719ebc2be..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.js +++ /dev/null @@ -1,63 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "my/file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export {z} from "./file4" - -//// [file4.ts] -export var z = 1; - -//// [file4.ts] -export var z1 = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file3.js] -define(["require", "exports", "./file4"], function (require, exports, file4_1) { - "use strict"; - exports.z = file4_1.z; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z1 = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "my/file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); - use(file4_1.z1.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols deleted file mode 100644 index 6f244cf026e..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.symbols +++ /dev/null @@ -1,61 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -import {z1} from "my/file4" ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->a : Symbol(a, Decl(file1.ts, 5, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z1.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/root/src/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== c:/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== c:/root/src/shared/components/file3.ts === -export {z} from "./file4" ->z : Symbol(z, Decl(file3.ts, 0, 8)) - -=== c:/root/src/shared/components/file4.ts === -export var z = 1; ->z : Symbol(z, Decl(file4.ts, 0, 10)) - -=== c:/sharedrepo/my/file4.ts === -export var z1 = 1; ->z1 : Symbol(z1, Decl(file4.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types b/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types deleted file mode 100644 index 24e70346d2a..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_1.types +++ /dev/null @@ -1,73 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -import {z1} from "my/file4" ->z1 : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -use(z1.toExponential()); ->use(z1.toExponential()) : void ->use : (a: any) => void ->z1.toExponential() : string ->z1.toExponential : (fractionDigits?: number) => string ->z1 : number ->toExponential : (fractionDigits?: number) => string - -=== c:/root/src/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== c:/root/src/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== c:/root/src/shared/components/file3.ts === -export {z} from "./file4" ->z : number - -=== c:/root/src/shared/components/file4.ts === -export var z = 1; ->z : number ->1 : number - -=== c:/sharedrepo/my/file4.ts === -export var z1 = 1; ->z1 : number ->1 : number - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js deleted file mode 100644 index 8fb164e1d54..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.js +++ /dev/null @@ -1,63 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts] //// - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "my/file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [file3.ts] -export {z} from "./file4" - -//// [file4.ts] -export var z = 1; - -//// [file4.ts] -export var z1 = 1; - -//// [file1.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.x = 1; -}); -//// [file2.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.y = 1; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z = 1; -}); -//// [file3.js] -define(["require", "exports", "./file4"], function (require, exports, file4_1) { - "use strict"; - exports.z = file4_1.z; -}); -//// [file4.js] -define(["require", "exports"], function (require, exports) { - "use strict"; - exports.z1 = 1; -}); -//// [file1.js] -define(["require", "exports", "folder2/file1", "folder3/file2", "components/file3", "my/file4"], function (require, exports, file1_1, file2_1, file3_1, file4_1) { - "use strict"; - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); - use(file4_1.z1.toExponential()); -}); diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols deleted file mode 100644 index f9f5bc671ab..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.symbols +++ /dev/null @@ -1,61 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -import {z1} from "my/file4" ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->a : Symbol(a, Decl(file1.ts, 5, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -use(z1.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 27)) ->z1.toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.d.ts, --, --)) - -=== c:/base/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== c:/base/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== c:/base/shared/components/file3.ts === -export {z} from "./file4" ->z : Symbol(z, Decl(file3.ts, 0, 8)) - -=== c:/base/shared/components/file4.ts === -export var z = 1; ->z : Symbol(z, Decl(file4.ts, 0, 10)) - -=== c:/sharedrepo/my/file4.ts === -export var z1 = 1; ->z1 : Symbol(z1, Decl(file4.ts, 0, 10)) - diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types b/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types deleted file mode 100644 index e84babf0a79..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution9_2.types +++ /dev/null @@ -1,73 +0,0 @@ -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -import {z1} from "my/file4" ->z1 : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -use(z1.toExponential()); ->use(z1.toExponential()) : void ->use : (a: any) => void ->z1.toExponential() : string ->z1.toExponential : (fractionDigits?: number) => string ->z1 : number ->toExponential : (fractionDigits?: number) => string - -=== c:/base/folder2/file1.ts === -export var x = 1; ->x : number ->1 : number - -=== c:/base/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : number - -=== c:/base/shared/components/file3.ts === -export {z} from "./file4" ->z : number - -=== c:/base/shared/components/file4.ts === -export var z = 1; ->z : number ->1 : number - -=== c:/sharedrepo/my/file4.ts === -export var z1 = 1; ->z1 : number ->1 : number - diff --git a/tests/baselines/reference/staticInstanceResolution5.errors.txt b/tests/baselines/reference/staticInstanceResolution5.errors.txt index 3c1cee93fd5..da6f0fde143 100644 --- a/tests/baselines/reference/staticInstanceResolution5.errors.txt +++ b/tests/baselines/reference/staticInstanceResolution5.errors.txt @@ -1,15 +1,21 @@ -tests/cases/compiler/staticInstanceResolution5_1.ts(1,24): error TS2307: Cannot find module 'staticInstanceResolution5_0.ts'. +tests/cases/compiler/staticInstanceResolution5_1.ts(4,14): error TS2304: Cannot find name 'WinJS'. +tests/cases/compiler/staticInstanceResolution5_1.ts(5,23): error TS2304: Cannot find name 'WinJS'. +tests/cases/compiler/staticInstanceResolution5_1.ts(6,16): error TS2304: Cannot find name 'WinJS'. -==== tests/cases/compiler/staticInstanceResolution5_1.ts (1 errors) ==== +==== tests/cases/compiler/staticInstanceResolution5_1.ts (3 errors) ==== import WinJS = require('staticInstanceResolution5_0.ts'); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'staticInstanceResolution5_0.ts'. // these 3 should be errors var x = (w1: WinJS) => { }; + ~~~~~ +!!! error TS2304: Cannot find name 'WinJS'. var y = function (w2: WinJS) { } + ~~~~~ +!!! error TS2304: Cannot find name 'WinJS'. function z(w3: WinJS) { } + ~~~~~ +!!! error TS2304: Cannot find name 'WinJS'. ==== tests/cases/compiler/staticInstanceResolution5_0.ts (0 errors) ==== export class Promise { diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js index 58def522978..0809d1af5f0 100644 --- a/tests/baselines/reference/staticInstanceResolution5.js +++ b/tests/baselines/reference/staticInstanceResolution5.js @@ -16,6 +16,19 @@ var y = function (w2: WinJS) { } function z(w3: WinJS) { } +//// [staticInstanceResolution5_0.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var Promise = (function () { + function Promise() { + } + Promise.timeout = function (delay) { + return null; + }; + return Promise; + }()); + exports.Promise = Promise; +}); //// [staticInstanceResolution5_1.js] define(["require", "exports"], function (require, exports) { "use strict"; diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1.ts deleted file mode 100644 index d6c24d75f96..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution1.ts +++ /dev/null @@ -1,18 +0,0 @@ -// @moduleResolution: baseUrl -// @module: commonjs -// @baseUrl: root - -// user defined base url - -// @filename: root/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: root/folder2/file2.ts -export {x} from "./file3" - -// @filename: root/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10.ts deleted file mode 100644 index 2f32cf3e7cd..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution10.ts +++ /dev/null @@ -1,34 +0,0 @@ -// @module: amd - -// paths\rootDirs is defined in tsconfig.json -// baseUrl is inferred from tsconfig.json - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "paths": { - "*": [ - "*", - "generated/*" - ] - }, - "rootDirs": [ - ".", - "./generated" - ] - } -} -// @filename: root/folder1/file1.ts -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); - -// @filename: root/generated/folder1/file2.ts -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -// @filename: root/folder1/file3.ts -export var x = 1; - -// @filename: root/generated/folder2/file3.ts -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts deleted file mode 100644 index 6cc6f8e32d9..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution10_1.ts +++ /dev/null @@ -1,35 +0,0 @@ -// @module: amd - -// paths\rootDirs is defined in tsconfig.json -// baseUrl is inferred from tsconfig.json - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "paths": { - "*": [ - "*", - "generated/*" - ] - }, - "rootDirs": [ - ".", - "./generated" - ] - } -} - -// @filename: c:/root/generated/folder1/file2.ts -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -// @filename: c:/root/folder1/file3.ts -export var x = 1; - -// @filename: c:/root/generated/folder2/file3.ts -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - -// @filename: c:/root/folder1/file1.ts -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts deleted file mode 100644 index 754df23f4bf..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution10_2.ts +++ /dev/null @@ -1,36 +0,0 @@ -// @module: amd - -// paths\rootDirs is defined in tsconfig.json -// baseUrl is defined in tsconfig.json - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*": [ - "*", - "generated/*" - ] - }, - "rootDirs": [ - "./src/", - "./src/generated" - ] - } -} - -// @filename: c:/root/src/generated/folder1/file2.ts -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -// @filename: c:/root/src/folder1/file3.ts -export var x = 1; - -// @filename: c:/root/src/generated/folder2/file3.ts -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); - -// @filename: c:/root/src/folder1/file1.ts -import {x} from "./file2" // should be resolved to 'generated/folder1/file2.ts' - -export var z = x.toExponential(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution11.ts b/tests/cases/compiler/pathMappingBasedModuleResolution11.ts deleted file mode 100644 index e0504126ca1..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution11.ts +++ /dev/null @@ -1,34 +0,0 @@ -// @module: amd - -// paths\rootDirs is defined in tsconfig.json -// baseUrl is inferred from tsconfig.json - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "paths": { - "*": [ - "*", - "generated/*/file" - ] - }, - "rootDirs": [ - ".", - "./generated" - ] - } -} -// @filename: root/folder1/file1.ts -import {x} from "./file2" // should be resolved to 'generated/folder1/file2/file.ts' - -export var z = x.toExponential(); - -// @filename: root/generated/folder1/file2/file.ts -export {x} from "folder1/file3" // should be resolved to 'folder1/file3.ts' - -// @filename: root/folder1/file3.ts -export var x = 1; - -// @filename: root/generated/folder2/file3.ts -import {z as y} from "../folder1/file1" // should be resolved to 'folder1/file1.ts' -let z = y.toLowerCase(); diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts deleted file mode 100644 index fa987961cd2..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution1_1.ts +++ /dev/null @@ -1,18 +0,0 @@ -// @moduleResolution: baseUrl -// @module: commonjs -// @baseUrl: c:/root - -// user defined base url - -// @filename: c:/root/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: c:/root/folder2/file2.ts -export {x} from "./file3" - -// @filename: c:/root/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts new file mode 100644 index 00000000000..20845a49372 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution1_classic.ts @@ -0,0 +1,19 @@ +// @module: amd +// @traceModuleResolution: true + +// paths should error in the absence of baseurl + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ] + } + } +} + +// @filename: c:/root/f1.ts +export var x = 1; diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts new file mode 100644 index 00000000000..392e85bd7c3 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution1_node.ts @@ -0,0 +1,18 @@ +// @module: commonjs +// @traceModuleResolution: true + +// paths should error in the absence of baseurl +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "paths": { + "*": [ + "*", + "generated/*" + ] + } + } +} + +// @filename: c:/root/f1.ts +export var x = 1; diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2.ts deleted file mode 100644 index 84bfc36b8d1..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution2.ts +++ /dev/null @@ -1,22 +0,0 @@ -// @module: commonjs - -// location of tsconfig.json as baseurl - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "moduleResolution": "baseUrl" - } -} -// @filename: root/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: root/folder2/file2.ts -export {x} from "./file3" - -// @filename: root/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts deleted file mode 100644 index 4b94e352879..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution2_1.ts +++ /dev/null @@ -1,22 +0,0 @@ -// @module: commonjs - -// location of tsconfig.json as baseurl - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "moduleResolution": "baseUrl" - } -} -// @filename: c:/root/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: c:/root/folder2/file2.ts -export {x} from "./file3" - -// @filename: c:/root/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts similarity index 85% rename from tests/cases/compiler/pathMappingBasedModuleResolution6.ts rename to tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts index f1e51afc805..6c84a197eeb 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution6.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts @@ -1,4 +1,5 @@ // @module: amd +// @traceModuleResolution: true // baseurl is defined in tsconfig.json // paths has errors diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution5.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts similarity index 54% rename from tests/cases/compiler/pathMappingBasedModuleResolution5.ts rename to tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts index 305f7aa9c3f..78ef7215e73 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution5.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts @@ -1,13 +1,18 @@ -// @module: commonjs - -// baseurl is defined in tsconfig.json -// module resolution kind is ambiguous - error should be reported - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src" - } -} -// @filename: root/src/folder1/file1.ts +// @module: commonjs +// @traceModuleResolution: true + +// baseurl is defined in tsconfig.json +// paths has errors + +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*1*": [ "*2*" ] + } + } +} + +// @filename: root/src/folder1/file1.ts export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3.ts deleted file mode 100644 index 466e8c90d77..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution3.ts +++ /dev/null @@ -1,23 +0,0 @@ -// @module: commonjs - -// baseurl is defined in tsconfig.json - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "moduleResolution": "baseUrl", - "baseUrl": "./src" - } -} -// @filename: root/src/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: root/src/folder2/file2.ts -export {x} from "./file3" - -// @filename: root/src/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts deleted file mode 100644 index f3a8ccaf0a8..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution3_1.ts +++ /dev/null @@ -1,23 +0,0 @@ -// @module: commonjs - -// baseurl is defined in tsconfig.json - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "moduleResolution": "baseUrl", - "baseUrl": "./src" - } -} -// @filename: c:/root/src/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: c:/root/src/folder2/file2.ts -export {x} from "./file3" - -// @filename: c:/root/src/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts new file mode 100644 index 00000000000..d46308d089f --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts @@ -0,0 +1,22 @@ +// @moduleResolution: classic +// @module: amd +// @baseUrl: c:/root +// @traceModuleResolution: true + +// baseUrl set via command line + +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +// @filename: c:/root/folder2/file3.ts +export var x = 1; + +// @filename: c:/file4.ts +export var y = 100; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts new file mode 100644 index 00000000000..30e95c9303e --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts @@ -0,0 +1,22 @@ +// @moduleResolution: node +// @module: commonjs +// @baseUrl: c:/root +// @traceModuleResolution: true + +// baseUrl set via command line + +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +// @filename: c:/root/folder2/file3.ts +export var x = 1; + +// @filename: c:/node_modules/file4/index.d.ts +export var y: number; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4.ts deleted file mode 100644 index 17f8258e763..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution4.ts +++ /dev/null @@ -1,23 +0,0 @@ -// @module: amd - -// baseurl is defined in tsconfig.json -// module resolution kind is inferred from settings (baseurl is specified) - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src" - } -} -// @filename: root/src/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: root/src/folder2/file2.ts -export {x} from "./file3" - -// @filename: root/src/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts deleted file mode 100644 index df6f267da65..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution4_1.ts +++ /dev/null @@ -1,23 +0,0 @@ -// @module: amd - -// baseurl is defined in tsconfig.json -// module resolution kind is inferred from settings (baseurl is specified) - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src" - } -} -// @filename: c:/root/src/folder1/file1.ts -import {x} from "folder2/file2" - -declare function use(a: any): void; - -use(x.toExponential()); - -// @filename: c:/root/src/folder2/file2.ts -export {x} from "./file3" - -// @filename: c:/root/src/folder2/file3.ts -export var x = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts new file mode 100644 index 00000000000..723de05b70c --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts @@ -0,0 +1,28 @@ +// @moduleResolution: classic +// @module: amd +// @traceModuleResolution: true + +// baseUrl set via command line + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "." + } +} + +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +// @filename: c:/root/folder2/file3.ts +export var x = 1; + +// @filename: c:/file4.ts +export var y = 100; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts new file mode 100644 index 00000000000..e68635e205e --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts @@ -0,0 +1,28 @@ +// @moduleResolution: node +// @module: commonjs +// @traceModuleResolution: true + +// baseUrl set via command line + +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "." + } +} + +// @filename: c:/root/folder1/file1.ts +import {x} from "folder2/file2" +declare function use(a: any): void; +use(x.toExponential()); + +// @filename: c:/root/folder2/file2.ts +import {x as a} from "./file3" // found with baseurl +import {y as b} from "file4" // found with fallback +export var x = a + b; + +// @filename: c:/root/folder2/file3.ts +export var x = 1; + +// @filename: c:/node_modules/file4/index.d.ts +export var y: number; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts similarity index 70% rename from tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts rename to tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts index 16284349643..a7662688e37 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution7_2.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution5_classic.ts @@ -1,20 +1,19 @@ // @module: amd +// @traceModuleResolution: true // paths is defined in tsconfig.json -// module resolution kind is inferred from the presence of 'paths' - // @filename: c:/root/tsconfig.json { "compilerOptions": { + "baseUrl": ".", "paths": { "*": [ "*", - "generated/*", - "c:/sharedrepo/*" + "generated/*" ], - "components/*": [ - "shared/components/*" - ] + "components/*": [ + "shared/components/*" + ] } } } @@ -40,5 +39,5 @@ export var y = 1; // @filename: c:/root/shared/components/file3.ts export var z = 1; -// @filename: c:/sharedrepo/file4.ts +// @filename: c:/file4.ts export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts similarity index 57% rename from tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts rename to tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts index c64eb687764..ef5ef0afd6a 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution7_1.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts @@ -1,19 +1,19 @@ -// @module: amd +// @module: commonjs +// @traceModuleResolution: true // paths is defined in tsconfig.json -// module resolution kind is inferred from the presence of 'paths' - // @filename: c:/root/tsconfig.json { "compilerOptions": { - "paths": { + "baseUrl": ".", + "paths": { "*": [ "*", "generated/*" ], - "components/*": [ - "shared/components/*" - ] + "components/*": [ + "shared/components/*" + ] } } } @@ -21,12 +21,14 @@ import {x} from "folder2/file1" import {y} from "folder3/file2" import {z} from "components/file3" +import {z1} from "file4" declare function use(a: any): void; use(x.toExponential()); use(y.toExponential()); use(z.toExponential()); +use(z1.toExponential()); // @filename: c:/root/folder2/file1.ts export var x = 1; @@ -34,5 +36,8 @@ export var x = 1; // @filename: c:/root/generated/folder3/file2.ts export var y = 1; -// @filename: c:/root/shared/components/file3.ts -export var z = 1; \ No newline at end of file +// @filename: c:/root/shared/components/file3/index.d.ts +export var z: number; + +// @filename: c:/node_modules/file4.ts +export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts new file mode 100644 index 00000000000..adaba8478c9 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_classic.ts @@ -0,0 +1,23 @@ +// @module: amd +// @traceModuleResolution: true + +// @filename: c:/root/src/tsconfig.json +{ + "compilerOptions": { + "rootDirs": [ + ".", + "../generated/src" + ] + } +} + +// @filename: c:/root/src/file1.ts +import {x} from "./project/file3"; +declare function use(x: string); +use(x.toExponential()); + +// @filename: c:/root/src/file2.d.ts +export let x: number; + +// @filename: c:/root/generated/src/project/file3.ts +export {x} from "../file2"; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts new file mode 100644 index 00000000000..a3d0feadf7c --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution6_node.ts @@ -0,0 +1,23 @@ +// @module: commonjs +// @traceModuleResolution: true + +// @filename: c:/root/src/tsconfig.json +{ + "compilerOptions": { + "rootDirs": [ + ".", + "../generated/src" + ] + } +} + +// @filename: c:/root/src/file1.ts +import {x} from "./project/file3"; +declare function use(x: string); +use(x.toFixed()); + +// @filename: c:/root/src/file2/index.d.ts +export let x: number; + +// @filename: c:/root/generated/src/project/file3.ts +export {x} from "../file2"; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7.ts deleted file mode 100644 index f59f0701a33..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution7.ts +++ /dev/null @@ -1,38 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// module resolution kind is inferred from the presence of 'paths' - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "paths": { - "*": [ - "*", - "generated/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -// @filename: root/folder2/file1.ts -export var x = 1; - -// @filename: root/generated/folder3/file2.ts -export var y = 1; - -// @filename: root/shared/components/file3.ts -export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts new file mode 100644 index 00000000000..af092df5ce9 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_classic.ts @@ -0,0 +1,49 @@ +// @module: amd +// @traceModuleResolution: true + +// @filename: c:/root/src/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "../", + "paths": { + "*": [ + "*", + "c:/shared/*" + ], + "templates/*": [ + "generated/src/templates/*" + ] + }, + "rootDirs": [ + ".", + "../generated/src" + ] + } +} + +// @filename: c:/root/src/file1.ts +import {x} from "./project/file2"; +import {y} from "module3"; + +declare function use(x: string); +use(x.toFixed()); +use(y.toFixed()); + +// @filename: c:/root/generated/src/project/file2.ts +import {a} from "module1"; +import {b} from "templates/module2"; +import {x as c} from "../file3"; +export let x = a + b + c; + +// @filename: c:/shared/module1.d.ts +export let a: number + +// @filename: c:/root/generated/src/templates/module2.ts +export let b: number; + +// @filename: c:/root/src/file3.d.ts +export let x: number; + +// @filename: c:/module3.d.ts +export let y: number; + diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts new file mode 100644 index 00000000000..faecbe4adb9 --- /dev/null +++ b/tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts @@ -0,0 +1,49 @@ +// @module: commonjs +// @traceModuleResolution: true + +// @filename: c:/root/src/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "../", + "paths": { + "*": [ + "*", + "c:/shared/*" + ], + "templates/*": [ + "generated/src/templates/*" + ] + }, + "rootDirs": [ + ".", + "../generated/src" + ] + } +} + +// @filename: c:/root/src/file1.ts +import {x} from "./project/file2"; +import {y} from "module3"; + +declare function use(x: string); +use(x.toFixed()); +use(y.toFixed()); + +// @filename: c:/root/generated/src/project/file2.ts +import {a} from "module1"; +import {b} from "templates/module2"; +import {x as c} from "../file3"; +export let x = a + b + c; + +// @filename: c:/shared/module1/index.d.ts +export let a: number + +// @filename: c:/root/generated/src/templates/module2.ts +export let b: number; + +// @filename: c:/root/src/file3/index.d.ts +export let x: number; + +// @filename: c:/node_modules/module3.d.ts +export let y: number; + diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution8.ts b/tests/cases/compiler/pathMappingBasedModuleResolution8.ts deleted file mode 100644 index dc2be22c4ca..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution8.ts +++ /dev/null @@ -1,39 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// baseUrl is specified in tsconfig.json - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*": [ - "*", - "generated/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -// @filename: root/src/folder2/file1.ts -export var x = 1; - -// @filename: root/src/generated/folder3/file2.ts -export var y = 1; - -// @filename: root/src/shared/components/file3.ts -export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts deleted file mode 100644 index b858be9455d..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution8_1.ts +++ /dev/null @@ -1,45 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// baseUrl is specified in tsconfig.json - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*": [ - "*", - "generated/*", - "c:/sharedrepo/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: c:/root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -// @filename: c:/root/src/folder2/file1.ts -export var x = 1; - -// @filename: c:/root/src/generated/folder3/file2.ts -export var y = 1; - -// @filename: c:/root/src/shared/components/file3.ts -export var z = 1; - -// @filename: c:/sharedrepo/file4.ts -export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9.ts deleted file mode 100644 index 1b104a27251..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution9.ts +++ /dev/null @@ -1,42 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// baseUrl is specified in tsconfig.json - -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*": [ - "*", - "generated/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); - -// @filename: root/src/folder2/file1.ts -export var x = 1; - -// @filename: root/src/generated/folder3/file2.ts -export var y = 1; - -// @filename: root/src/shared/components/file3.ts -export {z} from "./file4" - -// @filename: root/src/shared/components/file4.ts -export var z = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts deleted file mode 100644 index 68a0898229c..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution9_1.ts +++ /dev/null @@ -1,48 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// baseUrl is specified in tsconfig.json - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*": [ - "*", - "generated/*", - "c:/sharedrepo/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: c:/root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "my/file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -// @filename: c:/root/src/folder2/file1.ts -export var x = 1; - -// @filename: c:/root/src/generated/folder3/file2.ts -export var y = 1; - -// @filename: c:/root/src/shared/components/file3.ts -export {z} from "./file4" - -// @filename: c:/root/src/shared/components/file4.ts -export var z = 1; - -// @filename: c:/sharedrepo/my/file4.ts -export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts b/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts deleted file mode 100644 index 83990d3c5ad..00000000000 --- a/tests/cases/compiler/pathMappingBasedModuleResolution9_2.ts +++ /dev/null @@ -1,48 +0,0 @@ -// @module: amd - -// paths is defined in tsconfig.json -// baseUrl is specified in tsconfig.json and it is absolute - -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "c:/base", - "paths": { - "*": [ - "*", - "generated/*", - "c:/sharedrepo/*" - ], - "components/*": [ - "shared/components/*" - ] - } - } -} -// @filename: c:/root/folder1/file1.ts -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "my/file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -// @filename: c:/base/folder2/file1.ts -export var x = 1; - -// @filename: c:/base/generated/folder3/file2.ts -export var y = 1; - -// @filename: c:/base/shared/components/file3.ts -export {z} from "./file4" - -// @filename: c:/base/shared/components/file4.ts -export var z = 1; - -// @filename: c:/sharedrepo/my/file4.ts -export var z1 = 1; \ No newline at end of file diff --git a/tests/cases/unittests/cachingInServerLSHost.ts b/tests/cases/unittests/cachingInServerLSHost.ts index 88b44a693b9..59f97f434e6 100644 --- a/tests/cases/unittests/cachingInServerLSHost.ts +++ b/tests/cases/unittests/cachingInServerLSHost.ts @@ -7,6 +7,10 @@ module ts { } function createDefaultServerHost(fileMap: Map): server.ServerHost { + const directories: Map = {}; + for (const f in fileMap) { + directories[getDirectoryPath(f)] = f; + } return { args: [], newLine: "\r\n", @@ -26,7 +30,7 @@ module ts { return hasProperty(fileMap, path); }, directoryExists: (path: string): boolean => { - throw new Error("NYI"); + return hasProperty(directories, path); }, createDirectory: (path: string) => { }, diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index cc5324cb44a..6bbbdcc90b4 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -459,7 +459,8 @@ import b = require("./moduleB.ts"); }) }); - describe("baseUrl module resolution", () => { + describe("baseUrl augmented module resolution", () => { + it("module resolution without path mappings/rootDirs", () => { test(/*hasDirectoryExists*/ false); test(/*hasDirectoryExists*/ true); @@ -469,42 +470,100 @@ import b = require("./moduleB.ts"); const file2: File = { name: "/root/folder2/file2.ts" }; const file3: File = { name: "/root/folder2/file3.ts" }; const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3); - const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.BaseUrl, baseUrl: "/root" }; - { - const result = baseUrlModuleNameResolver("folder2/file2", file1.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file2.name); - assert.deepEqual(result.failedLookupLocations, []); - } - { - const result = baseUrlModuleNameResolver("./file3", file2.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file3.name); - assert.deepEqual(result.failedLookupLocations, []); - } - { - const result = baseUrlModuleNameResolver(file1.name, file2.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file1.name); - assert.deepEqual(result.failedLookupLocations, []); + for (const moduleResolution of [ ModuleResolutionKind.NodeJs, ModuleResolutionKind.Classic ]) { + const options: CompilerOptions = { moduleResolution, baseUrl: "/root" }; + { + const result = resolveModuleName("folder2/file2", file1.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file2.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = resolveModuleName("./file3", file2.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file3.name); + assert.deepEqual(result.failedLookupLocations, []); + } + { + const result = resolveModuleName("/root/folder1/file1", file2.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, file1.name); + assert.deepEqual(result.failedLookupLocations, []); + } } } // add failure tests }); - - it("module resolution with path mappings", () => { + + it("node + baseUrl", () => { test(/*hasDirectoryExists*/ false); test(/*hasDirectoryExists*/ true); function test(hasDirectoryExists: boolean) { + const main: File = { name: "/root/a/b/main.ts" }; + const m1: File = { name: "/root/m1.ts" }; // load file as module + const m2: File = { name: "/root/m2/index.d.ts" }; // load folder as module + const m3: File = { name: "/root/m3/package.json", content: JSON.stringify({ typings: "dist/typings.d.ts" }) }; + const m3Typings: File = { name: "/root/m3/dist/typings.d.ts" }; + const m4: File = { name: "/root/node_modules/m4.ts" }; // fallback to node + + const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.NodeJs, baseUrl: "/root" }; + const host = createModuleResolutionHost(hasDirectoryExists, main, m1, m2, m3, m3Typings, m4); + + check("m1", main, m1); + check("m2", main, m2); + check("m3", main, m3Typings); + check("m4", main, m4); + + function check(name: string, caller: File, expected: File) { + const result = resolveModuleName(name, caller.name, options, host); + assert.isTrue(result.resolvedModule !== undefined); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + } + } + }); + + it("classic + baseUrl", () => { + test(/*hasDirectoryExists*/ false); + test(/*hasDirectoryExists*/ true); + + function test(hasDirectoryExists: boolean) { + const main: File = { name: "/root/a/b/main.ts" }; + const m1: File = { name: "/root/x/m1.ts" }; // load from base url + const m2: File = { name: "/m2.ts" }; // fallback to classic + + const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.Classic, baseUrl: "/root/x" }; + const host = createModuleResolutionHost(hasDirectoryExists, main, m1, m2); + + check("m1", main, m1); + check("m2", main, m2); + + function check(name: string, caller: File, expected: File) { + const result = resolveModuleName(name, caller.name, options, host); + assert.isTrue(result.resolvedModule !== undefined); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + } + } + }) + + it("node + baseUrl + path mappings", () => { + test(/*hasDirectoryExists*/ false); + test(/*hasDirectoryExists*/ true); + + function test(hasDirectoryExists: boolean) { + const main: File = { name: "/root/folder1/main.ts" }; + const file1: File = { name: "/root/folder1/file1.ts" }; - const file2: File = { name: "/root/folder1/file2.ts" } - const file3: File = { name: "/root/generated/folder1/file3.ts" } - const file4: File = { name: "/root/generated/folder2/file4.ts" } - const file5: File = { name: "/root/someanotherfolder/file5.ts" } - const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3, file4, file5); + const file2: File = { name: "/root/generated/folder1/file2.ts" } // load remapped file as module + const file3: File = { name: "/root/generated/folder2/file3/index.d.ts" } // load folder a module + const file4Typings: File = { name: "/root/generated/folder2/file4/package.json", content: JSON.stringify({ typings: "dist/types.d.ts" })}; + const file4: File = { name: "/root/generated/folder2/file4/dist/types.d.ts" }; // load file pointed by typings + const file5: File = { name: "/root/someanotherfolder/file5/index.d.ts" } // load remapped module from folder + const file6: File = { name: "/root/node_modules/file6.ts" }; // fallback to node + const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3, file4, file4Typings, file5, file6); + const options: CompilerOptions = { - moduleResolution: ModuleResolutionKind.BaseUrl, + moduleResolution: ModuleResolutionKind.NodeJs, baseUrl: "/root", paths: { "*": [ @@ -516,50 +575,242 @@ import b = require("./moduleB.ts"); ] } }; - { - const result = baseUrlModuleNameResolver("folder1/file2", file1.name, options, host); + check("folder1/file1", file1, []); + check("folder1/file2", file2, [ + // first try the '*' + "/root/folder1/file2.ts", + "/root/folder1/file2.tsx", + "/root/folder1/file2.d.ts", + "/root/folder1/file2/package.json", + "/root/folder1/file2/index.ts", + "/root/folder1/file2/index.tsx", + "/root/folder1/file2/index.d.ts" + // then first attempt on 'generated/*' was successful + ]); + check("folder2/file3", file3, [ + // first try '*' + "/root/folder2/file3.ts", + "/root/folder2/file3.tsx", + "/root/folder2/file3.d.ts", + "/root/folder2/file3/package.json", + "/root/folder2/file3/index.ts", + "/root/folder2/file3/index.tsx", + "/root/folder2/file3/index.d.ts", + // then use remapped location + "/root/generated/folder2/file3.ts", + "/root/generated/folder2/file3.tsx", + "/root/generated/folder2/file3.d.ts", + "/root/generated/folder2/file3/package.json", + "/root/generated/folder2/file3/index.ts", + "/root/generated/folder2/file3/index.tsx", + // success on index.d.ts + ]); + check("folder2/file4", file4, [ + // first try '*' + "/root/folder2/file4.ts", + "/root/folder2/file4.tsx", + "/root/folder2/file4.d.ts", + "/root/folder2/file4/package.json", + "/root/folder2/file4/index.ts", + "/root/folder2/file4/index.tsx", + "/root/folder2/file4/index.d.ts", + // try to load from file from remapped location + "/root/generated/folder2/file4.ts", + "/root/generated/folder2/file4.tsx", + "/root/generated/folder2/file4.d.ts" + // success on loading as from folder + ]); + check("somefolder/file5", file5, [ + // load from remapped location + // first load from fle + "/root/someanotherfolder/file5.ts", + "/root/someanotherfolder/file5.tsx", + "/root/someanotherfolder/file5.d.ts", + // load from folder + "/root/someanotherfolder/file5/package.json", + "/root/someanotherfolder/file5/index.ts", + "/root/someanotherfolder/file5/index.tsx", + // success on index.d.ts + ]); + check("file6", file6, [ + // first try * + // load from file + "/root/file6.ts", + "/root/file6.tsx", + "/root/file6.d.ts", + // load from folder + "/root/file6/package.json", + "/root/file6/index.ts", + "/root/file6/index.tsx", + "/root/file6/index.d.ts", + // then try 'generated/*' + // load from file + "/root/generated/file6.ts", + "/root/generated/file6.tsx", + "/root/generated/file6.d.ts", + // load from folder + "/root/generated/file6/package.json", + "/root/generated/file6/index.ts", + "/root/generated/file6/index.tsx", + "/root/generated/file6/index.d.ts", + // fallback to standard node behavior + // load from file + "/root/folder1/node_modules/file6.ts", + "/root/folder1/node_modules/file6.tsx", + "/root/folder1/node_modules/file6.d.ts", + // load from folder + "/root/folder1/node_modules/file6/package.json", + "/root/folder1/node_modules/file6/index.ts", + "/root/folder1/node_modules/file6/index.tsx", + "/root/folder1/node_modules/file6/index.d.ts", + // success on /root/node_modules/file6.ts + ]); + + function check(name: string, expected: File, expectedFailedLookups: string[]) { + const result = resolveModuleName(name, main.name, options, host); assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file2.name); - assert.deepEqual(result.failedLookupLocations, []); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + assert.deepEqual(result.failedLookupLocations, expectedFailedLookups); } - { - const result = baseUrlModuleNameResolver("./file2", file1.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file2.name); - assert.deepEqual(result.failedLookupLocations, []); - } - { - const result = baseUrlModuleNameResolver("folder1/file3", file1.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file3.name); - // non-empty because it tries to use '*' match first - assert.deepEqual(result.failedLookupLocations, [ - "/root/folder1/file3.ts", - "/root/folder1/file3.tsx", - "/root/folder1/file3.d.ts", - ]); - } - { - const result = baseUrlModuleNameResolver("folder2/file4", file1.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file4.name); - assert.deepEqual(result.failedLookupLocations, [ - "/root/folder2/file4.ts", - "/root/folder2/file4.tsx", - "/root/folder2/file4.d.ts", - ]); - } - { - const result = baseUrlModuleNameResolver("somefolder/file5", file1.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file5.name); - assert.deepEqual(result.failedLookupLocations, []); - } - // add failure tests } }); - it("module resolution with path mappings and root dirs", () => { + it ("classic + baseUrl + path mappings", () => { + test(/*hasDirectoryExists*/ false); + test(/*hasDirectoryExists*/ true); + + function test(hasDirectoryExists: boolean) { + const main: File = { name: "/root/folder1/main.ts" }; + + const file1: File = { name: "/root/folder1/file1.ts" }; + const file2: File = { name: "/root/generated/folder1/file2.ts" }; + const file3: File = { name: "/folder1/file3.ts" }; // fallback to classic + const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3); + + const options: CompilerOptions = { + moduleResolution: ModuleResolutionKind.Classic, + baseUrl: "/root", + paths: { + "*": [ + "*", + "generated/*" + ], + "somefolder/*": [ + "someanotherfolder/*" + ] + } + }; + check("folder1/file1", file1, []); + check("folder1/file2", file2, [ + // first try '*' + "/root/folder1/file2.ts", + "/root/folder1/file2.tsx", + "/root/folder1/file2.d.ts", + // success when using 'generated/*' + ]); + check("folder1/file3", file3, [ + // first try '*' + "/root/folder1/file3.ts", + "/root/folder1/file3.tsx", + "/root/folder1/file3.d.ts", + // then try 'generated/*' + "/root/generated/folder1/file3.ts", + "/root/generated/folder1/file3.tsx", + "/root/generated/folder1/file3.d.ts", + // fallback to classic + "/root/folder1/folder1/file3.ts", + "/root/folder1/folder1/file3.tsx", + "/root/folder1/folder1/file3.d.ts", + "/root/folder1/file3.ts", + "/root/folder1/file3.tsx", + "/root/folder1/file3.d.ts", + ]); + + function check(name: string, expected: File, expectedFailedLookups: string[]) { + const result = resolveModuleName(name, main.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + assert.deepEqual(result.failedLookupLocations, expectedFailedLookups); + } + } + }) + + it ("node + rootDirs", () => { + test(/*hasDirectoryExists*/ false); + test(/*hasDirectoryExists*/ true); + + function test(hasDirectoryExists: boolean) { + let file1: File = { name: "/root/folder1/file1.ts" }; + let file1_1: File = { name: "/root/folder1/file1_1/index.d.ts" }; + let file2: File = { name: "/root/generated/folder1/file2.ts" }; + let file3: File = { name: "/root/generated/folder2/file3.ts" }; + const host = createModuleResolutionHost(hasDirectoryExists, file1, file1_1, file2, file3); + const options: CompilerOptions = { + moduleResolution: ModuleResolutionKind.NodeJs, + rootDirs: [ + "/root", + "/root/generated/" + ] + }; + check("./file2", file1, file2, [ + // first try current location + // load from file + "/root/folder1/file2.ts", + "/root/folder1/file2.tsx", + "/root/folder1/file2.d.ts", + // load from folder + "/root/folder1/file2/package.json", + "/root/folder1/file2/index.ts", + "/root/folder1/file2/index.tsx", + "/root/folder1/file2/index.d.ts", + // success after using alternative rootDir entry + ]); + check("../folder1/file1", file3, file1, [ + // first try current location + // load from file + "/root/generated/folder1/file1.ts", + "/root/generated/folder1/file1.tsx", + "/root/generated/folder1/file1.d.ts", + // load from module + "/root/generated/folder1/file1/package.json", + "/root/generated/folder1/file1/index.ts", + "/root/generated/folder1/file1/index.tsx", + "/root/generated/folder1/file1/index.d.ts", + // success after using alternative rootDir entry + ]); + check("../folder1/file1_1", file3, file1_1, [ + // first try current location + // load from file + "/root/generated/folder1/file1_1.ts", + "/root/generated/folder1/file1_1.tsx", + "/root/generated/folder1/file1_1.d.ts", + // load from folder + "/root/generated/folder1/file1_1/package.json", + "/root/generated/folder1/file1_1/index.ts", + "/root/generated/folder1/file1_1/index.tsx", + "/root/generated/folder1/file1_1/index.d.ts", + // try alternative rootDir entry + // load from file + "/root/folder1/file1_1.ts", + "/root/folder1/file1_1.tsx", + "/root/folder1/file1_1.d.ts", + // load from directory + "/root/folder1/file1_1/package.json", + "/root/folder1/file1_1/index.ts", + "/root/folder1/file1_1/index.tsx", + // success on loading '/root/folder1/file1_1/index.d.ts' + ]); + + function check(name: string, container: File, expected: File, expectedFailedLookups: string[]) { + const result = resolveModuleName(name, container.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + assert.deepEqual(result.failedLookupLocations,expectedFailedLookups); + } + } + }); + + it ("classic + rootDirs", () => { test(/*hasDirectoryExists*/ false); test(/*hasDirectoryExists*/ true); @@ -567,39 +818,85 @@ import b = require("./moduleB.ts"); let file1: File = { name: "/root/folder1/file1.ts" }; let file2: File = { name: "/root/generated/folder1/file2.ts" }; let file3: File = { name: "/root/generated/folder2/file3.ts" }; - const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3); + let file4: File = { name: "/folder1/file1_1.ts" }; + const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3, file4); const options: CompilerOptions = { - moduleResolution: ModuleResolutionKind.BaseUrl, - baseUrl: "/root", - paths: { - "*": [ - "*", - "generated/*" - ] - }, + moduleResolution: ModuleResolutionKind.Classic, rootDirs: [ "/root", "/root/generated/" ] }; - { - const result = baseUrlModuleNameResolver("./file2", file1.name, options, host); + check("./file2", file1, file2, [ + // first load from current location + "/root/folder1/file2.ts", + "/root/folder1/file2.tsx", + "/root/folder1/file2.d.ts", + // then try alternative rootDir entry + ]); + check("../folder1/file1", file3, file1, [ + // first load from current location + "/root/generated/folder1/file1.ts", + "/root/generated/folder1/file1.tsx", + "/root/generated/folder1/file1.d.ts", + // then try alternative rootDir entry + ]); + check("../folder1/file1_1", file3, file4, [ + // load from initial location + "/root/generated/folder1/file1_1.ts", + "/root/generated/folder1/file1_1.tsx", + "/root/generated/folder1/file1_1.d.ts", + // load from alternative rootDir entry + "/root/folder1/file1_1.ts", + "/root/folder1/file1_1.tsx", + "/root/folder1/file1_1.d.ts", + // fallback to classic + // step1: initial location + "/root/generated/folder1/file1_1.ts", + "/root/generated/folder1/file1_1.tsx", + "/root/generated/folder1/file1_1.d.ts", + // step2: walk 1 level up + "/root/folder1/file1_1.ts", + "/root/folder1/file1_1.tsx", + "/root/folder1/file1_1.d.ts", + ]); + + function check(name: string, container: File, expected: File, expectedFailedLookups: string[]) { + const result = resolveModuleName(name, container.name, options, host); assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file2.name); - assert.deepEqual(result.failedLookupLocations, [ - "/root/folder1/file2.ts", - "/root/folder1/file2.tsx", - "/root/folder1/file2.d.ts", - ]); - } - { - const result = baseUrlModuleNameResolver("../folder1/file1", file3.name, options, host); - assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); - assert.equal(result.resolvedModule.resolvedFileName, file1.name); - assert.deepEqual(result.failedLookupLocations, []); + assert.equal(result.resolvedModule.resolvedFileName, expected.name); + assert.deepEqual(result.failedLookupLocations,expectedFailedLookups); } } }); + + it ("nested node module", () => { + test(/*hasDirectoryExists*/ false); + test(/*hasDirectoryExists*/ true); + + function test(hasDirectoryExists: boolean) { + const app: File = { name: "/root/src/app.ts" } + const libsPackage: File = { name: "/root/src/libs/guid/package.json", content: JSON.stringify({ typings: "dist/guid.d.ts" }) }; + const libsTypings: File = { name: "/root/src/libs/guid/dist/guid.d.ts" }; + const host = createModuleResolutionHost(hasDirectoryExists, app, libsPackage, libsTypings); + const options: CompilerOptions = { + moduleResolution: ModuleResolutionKind.NodeJs, + baseUrl: "/root", + paths: { + "libs/guid": [ "src/libs/guid" ] + } + }; + const result = resolveModuleName("libs/guid", app.name, options, host); + assert.isTrue(result.resolvedModule !== undefined, "module should be resolved"); + assert.equal(result.resolvedModule.resolvedFileName, libsTypings.name); + assert.deepEqual(result.failedLookupLocations, [ + // first try to load module as file + "/root/src/libs/guid.ts", + "/root/src/libs/guid.tsx", + "/root/src/libs/guid.d.ts", + ]); + } + }) }); function notImplemented(name: string): () => any { From bfd6ca04af5fb79815cf9c76a69fb1256a37183e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 25 Jan 2016 13:25:22 -0800 Subject: [PATCH 077/160] baseline-accept --- .../jsFileCompilationTypeAssertions.errors.txt | 9 ++++++--- .../getJavaScriptSemanticDiagnostics20.ts | 16 ---------------- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 tests/cases/fourslash/getJavaScriptSemanticDiagnostics20.ts diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt index e73ee46fb89..662eea4d405 100644 --- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt +++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt @@ -1,9 +1,12 @@ error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. -tests/cases/compiler/a.js(1,10): error TS8016: 'type assertion expressions' can only be used in a .ts file. +tests/cases/compiler/a.js(1,10): error TS17008: JSX element 'string' has no corresponding closing tag. +tests/cases/compiler/a.js(1,27): error TS1005: 'undefined; ~~~~~~ -!!! error TS8016: 'type assertion expressions' can only be used in a .ts file. \ No newline at end of file +!!! error TS17008: JSX element 'string' has no corresponding closing tag. + +!!! error TS1005: ' - -// @allowJs: true -// @Filename: a.js -//// var v = undefined; - -verify.getSyntacticDiagnostics(`[]`); -verify.getSemanticDiagnostics(`[ - { - "message": "'type assertion expressions' can only be used in a .ts file.", - "start": 9, - "length": 6, - "category": "error", - "code": 8016 - } -]`); \ No newline at end of file From c38021ffb8db7fdd081823d603cdf5af8da606e7 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 25 Jan 2016 13:38:00 -0800 Subject: [PATCH 078/160] Lint --- src/compiler/parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 16196e277dc..09df49d748c 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -546,7 +546,7 @@ namespace ts { function getLanguageVariant(fileName: string) { // .tsx and .jsx files are treated as jsx language variant. - return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, '.js') ? LanguageVariant.JSX : LanguageVariant.Standard; + return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx") || fileExtensionIs(fileName, ".js") ? LanguageVariant.JSX : LanguageVariant.Standard; } function initializeState(fileName: string, _sourceText: string, languageVersion: ScriptTarget, isJavaScriptFile: boolean, _syntaxCursor: IncrementalParser.SyntaxCursor) { From add91052bb8dbf011b7170b03dca73d211bd210b Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 25 Jan 2016 17:08:15 -0800 Subject: [PATCH 079/160] Update version --- package.json | 2 +- src/compiler/program.ts | 2 +- src/services/shims.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 261cdfa64b7..cc74bf2c27c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "http://typescriptlang.org/", - "version": "1.8.0", + "version": "1.9.0", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 398ce27ef48..3fed8dcb596 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -12,7 +12,7 @@ namespace ts { const emptyArray: any[] = []; - export const version = "1.8.0"; + export const version = "1.9.0"; export function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean): string { let fileName = "tsconfig.json"; diff --git a/src/services/shims.ts b/src/services/shims.ts index 9ca3f19244d..e836eeed3e0 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -1057,6 +1057,6 @@ namespace TypeScript.Services { // TODO: it should be moved into a namespace though. /* @internal */ -const toolsVersion = "1.8"; +const toolsVersion = "1.9"; /* tslint:enable:no-unused-variable */ \ No newline at end of file From 3e0c84e43b43bd08ce587cd08882e910a08ce9fc Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Mon, 25 Jan 2016 17:44:07 -0800 Subject: [PATCH 080/160] PR feedback --- src/compiler/checker.ts | 83 +++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 16 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ca41e509664..c628f254aba 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -376,8 +376,8 @@ namespace ts { const moduleAugmentation = moduleName.parent; if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) { // this is a combined symbol for multiple augmentations within the same file. - // its symbol already has accumulated information for all declarations - // so we need to add it just once - do the work only for first declaration + // its symbol already has accumulated information for all declarations + // so we need to add it just once - do the work only for first declaration Debug.assert(moduleAugmentation.symbol.declarations.length > 1); return; } @@ -386,7 +386,7 @@ namespace ts { mergeSymbolTable(globals, moduleAugmentation.symbol.exports); } else { - // find a module that about to be augmented + // find a module that about to be augmented let mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found); if (!mainModule) { return; @@ -810,7 +810,7 @@ namespace ts { } // No static member is present. - // Check if we're in an instance method and look for a relevant instance member. + // Check if we're in an instance method and look for a relevant instance member. if (location === container && !(location.flags & NodeFlags.Static)) { const instanceType = (getDeclaredTypeOfSymbol(classSymbol)).thisType; if (getPropertyOfType(instanceType, name)) { @@ -1161,7 +1161,7 @@ namespace ts { return getMergedSymbol(sourceFile.symbol); } if (moduleNotFoundError) { - // report errors only if it was requested + // report errors only if it was requested error(moduleReferenceLiteral, Diagnostics.File_0_is_not_a_module, sourceFile.fileName); } return undefined; @@ -7115,14 +7115,10 @@ namespace ts { return false; } - function isSuperPropertyAccess(node: Node) { - return node.kind === SyntaxKind.PropertyAccessExpression - && (node).expression.kind === SyntaxKind.SuperKeyword; - } - - function isSuperElementAccess(node: Node) { - return node.kind === SyntaxKind.ElementAccessExpression - && (node).expression.kind === SyntaxKind.SuperKeyword; + function isSuperPropertyOrElementAccess(node: Node) { + return (node.kind === SyntaxKind.PropertyAccessExpression + || node.kind === SyntaxKind.ElementAccessExpression) + && (node).expression.kind === SyntaxKind.SuperKeyword; } function checkSuperExpression(node: Node): Type { @@ -7177,8 +7173,63 @@ namespace ts { getNodeLinks(node).flags |= nodeCheckFlag; // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference. + // This is due to the fact that we emit the body of an async function inside of a generator function. As generator + // functions cannot reference `super`, we emit a helper inside of the method body, but outside of the generator. This helper + // uses an arrow function, which is permitted to reference `super`. + // + // There are two primary ways we can access `super` from within an async method. The first is getting the value of a property + // or indexed access on super, either as part of a right-hand-side expression or call expression. The second is when setting the value + // of a property or indexed access, either as part of an assignment expression or destructuring assignment. + // + // The simplest case is reading a value, in which case we will emit something like the following: + // + // // ts + // ... + // async asyncMethod() { + // let x = await super.asyncMethod(); + // return x; + // } + // ... + // + // // js + // ... + // asyncMethod() { + // const _super = name => super[name]; + // return __awaiter(this, arguments, Promise, function *() { + // let x = yield _super("asyncMethod").call(this); + // return x; + // }); + // } + // ... + // + // The more complex case is when we wish to assign a value, especially as part of a destructuring assignment. As both cases + // are legal in ES6, but also likely less frequent, we emit the same more complex helper for both scenarios: + // + // // ts + // ... + // async asyncMethod(ar: Promise) { + // [super.a, super.b] = await ar; + // } + // ... + // + // // js + // ... + // asyncMethod(ar) { + // const _super = (function (geti, seti) { + // const cache = Object.create(null); + // return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } }); + // })(name => super[name], (name, value) => super[name] = value); + // return __awaiter(this, arguments, Promise, function *() { + // [_super("a").value, _super("b").value] = yield ar; + // }); + // } + // ... + // + // This helper creates an object with a "value" property that wraps the `super` property or indexed access for both get and set. + // This is required for destructuring assignments, as a call expression cannot be used as the target of a destructuring assignment + // while a property access can. if (container.kind === SyntaxKind.MethodDeclaration && container.flags & NodeFlags.Async) { - if ((isSuperPropertyAccess(node.parent) || isSuperElementAccess(node.parent)) && isAssignmentTarget(node.parent)) { + if (isSuperPropertyOrElementAccess(node.parent) && isAssignmentTarget(node.parent)) { getNodeLinks(container).flags |= NodeCheckFlags.AsyncMethodWithSuperBinding; } else { @@ -14224,10 +14275,10 @@ namespace ts { if (isAmbientExternalModule) { if (isExternalModuleAugmentation(node)) { // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module) - // otherwise we'll be swamped in cascading errors. + // otherwise we'll be swamped in cascading errors. // We can detect if augmentation was applied using following rules: // - augmentation for a global scope is always applied - // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). + // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged); if (checkBody) { // body of ambient external module is always a module block From 910fbba1568c745e94ce32f4a27fe19a54961474 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 26 Jan 2016 10:16:46 -0800 Subject: [PATCH 081/160] break on 'this' type in hasConstraintReferenceTo --- src/compiler/checker.ts | 2 +- tests/baselines/reference/thisTypeAsConstraint.js | 14 ++++++++++++++ .../reference/thisTypeAsConstraint.symbols | 9 +++++++++ .../baselines/reference/thisTypeAsConstraint.types | 9 +++++++++ tests/cases/compiler/thisTypeAsConstraint.ts | 4 ++++ 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/thisTypeAsConstraint.js create mode 100644 tests/baselines/reference/thisTypeAsConstraint.symbols create mode 100644 tests/baselines/reference/thisTypeAsConstraint.types create mode 100644 tests/cases/compiler/thisTypeAsConstraint.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 645b3835b93..d61cde01451 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4285,7 +4285,7 @@ namespace ts { function hasConstraintReferenceTo(type: Type, target: TypeParameter): boolean { let checked: Type[]; - while (type && type.flags & TypeFlags.TypeParameter && !contains(checked, type)) { + while (type && !(type.flags & TypeFlags.ThisType) && type.flags & TypeFlags.TypeParameter && !contains(checked, type)) { if (type === target) { return true; } diff --git a/tests/baselines/reference/thisTypeAsConstraint.js b/tests/baselines/reference/thisTypeAsConstraint.js new file mode 100644 index 00000000000..b5a7113549d --- /dev/null +++ b/tests/baselines/reference/thisTypeAsConstraint.js @@ -0,0 +1,14 @@ +//// [thisTypeAsConstraint.ts] +class C { + public m() { + } +} + +//// [thisTypeAsConstraint.js] +var C = (function () { + function C() { + } + C.prototype.m = function () { + }; + return C; +}()); diff --git a/tests/baselines/reference/thisTypeAsConstraint.symbols b/tests/baselines/reference/thisTypeAsConstraint.symbols new file mode 100644 index 00000000000..020dd966cad --- /dev/null +++ b/tests/baselines/reference/thisTypeAsConstraint.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/thisTypeAsConstraint.ts === +class C { +>C : Symbol(C, Decl(thisTypeAsConstraint.ts, 0, 0)) + + public m() { +>m : Symbol(m, Decl(thisTypeAsConstraint.ts, 0, 9)) +>T : Symbol(T, Decl(thisTypeAsConstraint.ts, 1, 11)) + } +} diff --git a/tests/baselines/reference/thisTypeAsConstraint.types b/tests/baselines/reference/thisTypeAsConstraint.types new file mode 100644 index 00000000000..e55fb1f0cca --- /dev/null +++ b/tests/baselines/reference/thisTypeAsConstraint.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/thisTypeAsConstraint.ts === +class C { +>C : C + + public m() { +>m : () => void +>T : T + } +} diff --git a/tests/cases/compiler/thisTypeAsConstraint.ts b/tests/cases/compiler/thisTypeAsConstraint.ts new file mode 100644 index 00000000000..fcab82bc7cc --- /dev/null +++ b/tests/cases/compiler/thisTypeAsConstraint.ts @@ -0,0 +1,4 @@ +class C { + public m() { + } +} \ No newline at end of file From b00cae87b3f8a49cf6830ca45ea624ba90af779e Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 11:36:20 -0800 Subject: [PATCH 082/160] Moved isSuperPropertyOrElementAccess to utilities --- src/compiler/checker.ts | 6 ------ src/compiler/emitter.ts | 12 +----------- src/compiler/utilities.ts | 10 ++++++++++ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c628f254aba..0cd17debfce 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7115,12 +7115,6 @@ namespace ts { return false; } - function isSuperPropertyOrElementAccess(node: Node) { - return (node.kind === SyntaxKind.PropertyAccessExpression - || node.kind === SyntaxKind.ElementAccessExpression) - && (node).expression.kind === SyntaxKind.SuperKeyword; - } - function checkSuperExpression(node: Node): Type { const isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (node.parent).expression === node; diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 762b491155b..696ad4a591e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2294,16 +2294,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge write(")"); } - function isSuperPropertyAccess(node: Expression): node is PropertyAccessExpression { - return node.kind === SyntaxKind.PropertyAccessExpression - && (node).expression.kind === SyntaxKind.SuperKeyword; - } - - function isSuperElementAccess(node: Expression): node is ElementAccessExpression { - return node.kind === SyntaxKind.ElementAccessExpression - && (node).expression.kind === SyntaxKind.SuperKeyword; - } - function isInAsyncMethodWithSuperInES6(node: Node) { if (languageVersion === ScriptTarget.ES6) { const container = getSuperContainer(node, /*includeFunctions*/ false); @@ -2337,7 +2327,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge superCall = true; } else { - superCall = isSuperPropertyAccess(expression) || isSuperElementAccess(expression); + superCall = isSuperPropertyOrElementAccess(expression); isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node); emit(expression); } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 4636c8d144c..102364a334b 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -850,6 +850,16 @@ namespace ts { } } + /** + * Determines whether a node is a property or element access expression for super. + */ + export function isSuperPropertyOrElementAccess(node: Node) { + return (node.kind === SyntaxKind.PropertyAccessExpression + || node.kind === SyntaxKind.ElementAccessExpression) + && (node).expression.kind === SyntaxKind.SuperKeyword; + } + + export function getEntityNameFromTypeNode(node: TypeNode): EntityName | Expression { if (node) { switch (node.kind) { From 35044d1293edf8fdec5a406a8a502bf84a860e6b Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 12:47:53 -0800 Subject: [PATCH 083/160] Added error when return type is not the global Promise --- src/compiler/checker.ts | 57 ++++++++++++++++++---------- src/compiler/diagnosticMessages.json | 4 ++ 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index bc4fcb5aa1e..140099938c8 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2629,7 +2629,7 @@ namespace ts { } } else if (declaration.kind === SyntaxKind.Parameter) { - // If it's a parameter, see if the parent has a jsdoc comment with an @param + // If it's a parameter, see if the parent has a jsdoc comment with an @param // annotation. const paramTag = getCorrespondingJSDocParameterTag(declaration); if (paramTag && paramTag.typeExpression) { @@ -2644,7 +2644,7 @@ namespace ts { function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration): Type { if (declaration.parserContextFlags & ParserContextFlags.JavaScriptFile) { // If this is a variable in a JavaScript file, then use the JSDoc type (if it has - // one as its type), otherwise fallback to the below standard TS codepaths to + // one as its type), otherwise fallback to the below standard TS codepaths to // try to figure it out. const type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration); if (type && type !== unknownType) { @@ -4069,7 +4069,7 @@ namespace ts { const isJSConstructSignature = isJSDocConstructSignature(declaration); let returnType: Type = undefined; - // If this is a JSDoc construct signature, then skip the first parameter in the + // If this is a JSDoc construct signature, then skip the first parameter in the // parameter list. The first parameter represents the return type of the construct // signature. for (let i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) { @@ -4472,7 +4472,7 @@ namespace ts { } if (symbol.flags & SymbolFlags.Value && node.kind === SyntaxKind.JSDocTypeReference) { - // A JSDocTypeReference may have resolved to a value (as opposed to a type). In + // A JSDocTypeReference may have resolved to a value (as opposed to a type). In // that case, the type of this reference is just the type of the value we resolved // to. return getTypeOfSymbol(symbol); @@ -10479,7 +10479,7 @@ namespace ts { /* *TypeScript Specification 1.0 (6.3) - July 2014 - * An explicitly typed function whose return type isn't the Void type, + * An explicitly typed function whose return type isn't the Void type, * the Any type, or a union type containing the Void or Any type as a constituent * must have at least one return statement somewhere in its body. * An exception to this rule is if the function implementation consists of a single 'throw' statement. @@ -12508,6 +12508,33 @@ namespace ts { } } + /** + * Checks that the return type provided is an instantiation of the global Promise type + * and returns the awaited type of the return type. + */ + function checkCorrectPromiseType(returnType: Type, location: Node) { + if (returnType === unknownType) { + // The return type already had some other error, so we ignore and return + // the unknown type. + return unknownType; + } + + const globalPromiseType = getGlobalPromiseType(); + if (globalPromiseType === emptyGenericType + || globalPromiseType === getTargetType(returnType)) { + // Either we couldn't resolve the global promise type, which would have already + // reported an error, or we could resolve it and the return type is a valid type + // reference to the global type. In either case, we return the awaited type for + // the return type. + return checkAwaitedType(returnType, location, Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type); + } + + // The promise type was not a valid type reference to the global promise type, so we + // report an error and return the unknown type. + error(location, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T); + return unknownType; + } + /** * Checks the return type of an async function to ensure it is a compatible * Promise implementation. @@ -12522,6 +12549,11 @@ namespace ts { * callable `then` signature. */ function checkAsyncFunctionReturnType(node: FunctionLikeDeclaration): Type { + if (languageVersion >= ScriptTarget.ES6) { + const returnType = getTypeFromTypeNode(node.type); + return checkCorrectPromiseType(returnType, node.type); + } + const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType(); if (globalPromiseConstructorLikeType === emptyObjectType) { // If we couldn't resolve the global PromiseConstructorLike type we cannot verify @@ -12563,21 +12595,6 @@ namespace ts { return unknownType; } - if (languageVersion >= ScriptTarget.ES6) { - const promisedType = getPromisedType(promiseType); - if (!promisedType) { - error(node, Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeToString(promiseType)); - return unknownType; - } - - const promiseInstantiation = createPromiseType(promisedType); - if (!checkTypeAssignableTo(promiseInstantiation, promiseType, node.type, Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) { - return unknownType; - } - - return promisedType; - } - const promiseConstructor = getNodeLinks(node.type).resolvedSymbol; if (!promiseConstructor || !symbolIsValue(promiseConstructor)) { const typeName = promiseConstructor diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index b8defa6325b..f5e6254a040 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -195,6 +195,10 @@ "category": "Error", "code": 1063 }, + "The return type of an async function or method must be the global Promise.": { + "category": "Error", + "code": 1064 + }, "In ambient enum declarations member initializer must be constant expression.": { "category": "Error", "code": 1066 From 05803f528549cd5bbf953f71170e978a538a8e8d Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 12:55:03 -0800 Subject: [PATCH 084/160] Added comments for new flags in types.ts --- src/compiler/types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9da409487df..3277e7e7950 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2058,8 +2058,8 @@ namespace ts { SuperInstance = 0x00000100, // Instance 'super' reference SuperStatic = 0x00000200, // Static 'super' reference ContextChecked = 0x00000400, // Contextual types have been assigned - AsyncMethodWithSuper = 0x00000800, - AsyncMethodWithSuperBinding = 0x00001000, + AsyncMethodWithSuper = 0x00000800, // An async method that reads a value from a member of 'super'. + AsyncMethodWithSuperBinding = 0x00001000, // An async method that assigns a value to a member of 'super'. CaptureArguments = 0x00002000, // Lexical 'arguments' used in body (for async functions) // Values for enum members have been computed, and any errors have been reported for them. From c20a70529ea49574ac929e1eb49fe93ee40d962c Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 14:51:07 -0800 Subject: [PATCH 085/160] Updated baselines --- .../asyncFunctionDeclaration15_es6.errors.txt | 29 ++++++++++--------- .../asyncImportedPromise_es6.errors.txt | 13 +++++++++ .../reference/asyncImportedPromise_es6.js | 8 ++--- .../asyncImportedPromise_es6.symbols | 20 ------------- .../reference/asyncImportedPromise_es6.types | 20 ------------- .../asyncQualifiedReturnType_es6.errors.txt | 13 +++++++++ .../asyncQualifiedReturnType_es6.symbols | 17 ----------- .../asyncQualifiedReturnType_es6.types | 17 ----------- 8 files changed, 46 insertions(+), 91 deletions(-) create mode 100644 tests/baselines/reference/asyncImportedPromise_es6.errors.txt delete mode 100644 tests/baselines/reference/asyncImportedPromise_es6.symbols delete mode 100644 tests/baselines/reference/asyncImportedPromise_es6.types create mode 100644 tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt delete mode 100644 tests/baselines/reference/asyncQualifiedReturnType_es6.symbols delete mode 100644 tests/baselines/reference/asyncQualifiedReturnType_es6.types diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt index d014f9eecf3..7b682f9dcde 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt +++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt @@ -1,30 +1,33 @@ -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,16): error TS1055: Type '{}' is not a valid async function return type. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,16): error TS1055: Type 'any' is not a valid async function return type. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,16): error TS1055: Type 'number' is not a valid async function return type. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,16): error TS1055: Type 'Thenable' is not a valid async function return type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(17,16): error TS1059: Return expression in async function does not have a valid callable 'then' member. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(23,25): error TS1058: Operand for 'await' does not have a valid callable 'then' member. -==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts (6 errors) ==== +==== tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts (7 errors) ==== declare class Thenable { then(): void; } declare let a: any; declare let obj: { then: string; }; declare let thenable: Thenable; async function fn1() { } // valid: Promise async function fn2(): { } { } // error - ~~~ -!!! error TS1055: Type '{}' is not a valid async function return type. + ~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. async function fn3(): any { } // error - ~~~ -!!! error TS1055: Type 'any' is not a valid async function return type. + ~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. async function fn4(): number { } // error - ~~~ -!!! error TS1055: Type 'number' is not a valid async function return type. + ~~~~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. async function fn5(): PromiseLike { } // error + ~~~~~~~~~~~~~~~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. async function fn6(): Thenable { } // error - ~~~ -!!! error TS1055: Type 'Thenable' is not a valid async function return type. + ~~~~~~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. async function fn7() { return; } // valid: Promise async function fn8() { return 1; } // valid: Promise async function fn9() { return null; } // valid: Promise diff --git a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt new file mode 100644 index 00000000000..994445dbedd --- /dev/null +++ b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise. + + +==== tests/cases/conformance/async/es6/task.ts (0 errors) ==== + export class Task extends Promise { } + +==== tests/cases/conformance/async/es6/test.ts (1 errors) ==== + import { Task } from "./task"; + class Test { + async example(): Task { return; } + ~~~~~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. + } \ No newline at end of file diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js index a97d59f7e64..56a41b0283f 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.js +++ b/tests/baselines/reference/asyncImportedPromise_es6.js @@ -1,12 +1,12 @@ //// [tests/cases/conformance/async/es6/asyncImportedPromise_es6.ts] //// //// [task.ts] -export class Task extends Promise { } +export class Task extends Promise { } //// [test.ts] -import { Task } from "./task"; -class Test { - async example(): Task { return; } +import { Task } from "./task"; +class Test { + async example(): Task { return; } } //// [task.js] diff --git a/tests/baselines/reference/asyncImportedPromise_es6.symbols b/tests/baselines/reference/asyncImportedPromise_es6.symbols deleted file mode 100644 index 45cf47d2b45..00000000000 --- a/tests/baselines/reference/asyncImportedPromise_es6.symbols +++ /dev/null @@ -1,20 +0,0 @@ -=== tests/cases/conformance/async/es6/task.ts === -export class Task extends Promise { } ->Task : Symbol(Task, Decl(task.ts, 0, 0)) ->T : Symbol(T, Decl(task.ts, 0, 18)) ->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->T : Symbol(T, Decl(task.ts, 0, 18)) - -=== tests/cases/conformance/async/es6/test.ts === -import { Task } from "./task"; ->Task : Symbol(Task, Decl(test.ts, 0, 8)) - -class Test { ->Test : Symbol(Test, Decl(test.ts, 0, 30)) - - async example(): Task { return; } ->example : Symbol(example, Decl(test.ts, 1, 12)) ->T : Symbol(T, Decl(test.ts, 2, 18)) ->Task : Symbol(Task, Decl(test.ts, 0, 8)) ->T : Symbol(T, Decl(test.ts, 2, 18)) -} diff --git a/tests/baselines/reference/asyncImportedPromise_es6.types b/tests/baselines/reference/asyncImportedPromise_es6.types deleted file mode 100644 index 424f14b34d3..00000000000 --- a/tests/baselines/reference/asyncImportedPromise_es6.types +++ /dev/null @@ -1,20 +0,0 @@ -=== tests/cases/conformance/async/es6/task.ts === -export class Task extends Promise { } ->Task : Task ->T : T ->Promise : Promise ->T : T - -=== tests/cases/conformance/async/es6/test.ts === -import { Task } from "./task"; ->Task : typeof Task - -class Test { ->Test : Test - - async example(): Task { return; } ->example : () => Task ->T : T ->Task : Task ->T : T -} diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt new file mode 100644 index 00000000000..f1d01bb2a7a --- /dev/null +++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt @@ -0,0 +1,13 @@ +tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise. + + +==== tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts (1 errors) ==== + namespace X { + export class MyPromise extends Promise { + } + } + + async function f(): X.MyPromise { + ~~~~~~~~~~~~~~~~~ +!!! error TS1064: The return type of an async function or method must be the global Promise. + } \ No newline at end of file diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.symbols b/tests/baselines/reference/asyncQualifiedReturnType_es6.symbols deleted file mode 100644 index 5d27d04ea3b..00000000000 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.symbols +++ /dev/null @@ -1,17 +0,0 @@ -=== tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts === -namespace X { ->X : Symbol(X, Decl(asyncQualifiedReturnType_es6.ts, 0, 0)) - - export class MyPromise extends Promise { ->MyPromise : Symbol(MyPromise, Decl(asyncQualifiedReturnType_es6.ts, 0, 13)) ->T : Symbol(T, Decl(asyncQualifiedReturnType_es6.ts, 1, 27)) ->Promise : Symbol(Promise, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) ->T : Symbol(T, Decl(asyncQualifiedReturnType_es6.ts, 1, 27)) - } -} - -async function f(): X.MyPromise { ->f : Symbol(f, Decl(asyncQualifiedReturnType_es6.ts, 3, 1)) ->X : Symbol(X, Decl(asyncQualifiedReturnType_es6.ts, 0, 0)) ->MyPromise : Symbol(X.MyPromise, Decl(asyncQualifiedReturnType_es6.ts, 0, 13)) -} diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.types b/tests/baselines/reference/asyncQualifiedReturnType_es6.types deleted file mode 100644 index 3b438eb93b6..00000000000 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.types +++ /dev/null @@ -1,17 +0,0 @@ -=== tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts === -namespace X { ->X : typeof X - - export class MyPromise extends Promise { ->MyPromise : MyPromise ->T : T ->Promise : Promise ->T : T - } -} - -async function f(): X.MyPromise { ->f : () => X.MyPromise ->X : any ->MyPromise : X.MyPromise -} From 39c75fd438ba22371be0072effa9fe89731938ce Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 26 Jan 2016 15:34:53 -0800 Subject: [PATCH 086/160] Simplify giving error message and remove unnecessary error --- src/compiler/checker.ts | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 927e00faf8c..e52982576b6 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11471,25 +11471,8 @@ namespace ts { const containingClassSymbol = getSymbolOfNode(containingClassDecl); const containingClassInstanceType = getDeclaredTypeOfSymbol(containingClassSymbol); const baseConstructorType = getBaseConstructorTypeOfClass(containingClassInstanceType); - const statements = (node.body).statements; - let superCallStatement: ExpressionStatement; - let isSuperCallFirstStatment: boolean; - for (const statement of statements) { - if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((statement).expression)) { - superCallStatement = statement; - if (isSuperCallFirstStatment === undefined) { - isSuperCallFirstStatment = true; - } - } - else if (isSuperCallFirstStatment === undefined && !isPrologueDirective(statement)) { - isSuperCallFirstStatment = false; - } - } - - // The main different between looping through each statement in constructor and calling containsSuperCall is that, - // containsSuperCall will consider "super" inside computed-property for inner class declaration - if (superCallStatement || containsSuperCall(node.body)) { + if (containsSuperCall(node.body)) { if (baseConstructorType === nullType) { error(node, Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null); } @@ -11506,12 +11489,19 @@ namespace ts { // Skip past any prologue directives to find the first statement // to ensure that it was a super call. if (superCallShouldBeFirst) { - if (!isSuperCallFirstStatment) { - error(superCallStatement, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); + const statements = (node.body).statements; + let superCallStatement: ExpressionStatement; + for (const statement of statements) { + if (statement.kind === SyntaxKind.ExpressionStatement && isSuperCallExpression((statement).expression)) { + superCallStatement = statement; + break; + } + if (!isPrologueDirective(statement)) { + break; + } } - else { - // In such a required super call, it is a compile-time error for argument expressions to reference this. - markThisReferencesAsErrors(superCallStatement.expression); + if (!superCallStatement) { + error(node, Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties); } } } From f4290e1538c21baff189b813dcc0e1c64c3f9a71 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Tue, 26 Jan 2016 15:37:19 -0800 Subject: [PATCH 087/160] Update baselines --- .../baselines/reference/baseCheck.errors.txt | 11 +----- .../reference/classUpdateTests.errors.txt | 18 ++++++--- ...derivedClassParameterProperties.errors.txt | 38 +++++++++++++------ ...rivedClassSuperCallsWithThisArg.errors.txt | 8 +--- .../strictModeInConstructor.errors.txt | 10 +++-- .../thisInInvalidContexts.errors.txt | 5 +-- ...InInvalidContextsExternalModule.errors.txt | 5 +-- .../reference/thisInSuperCall.errors.txt | 8 +--- .../reference/thisInSuperCall1.errors.txt | 5 +-- .../reference/thisInSuperCall2.errors.txt | 5 +-- .../reference/thisInSuperCall3.errors.txt | 5 +-- 11 files changed, 53 insertions(+), 65 deletions(-) diff --git a/tests/baselines/reference/baseCheck.errors.txt b/tests/baselines/reference/baseCheck.errors.txt index d4af255c972..c31ba95476a 100644 --- a/tests/baselines/reference/baseCheck.errors.txt +++ b/tests/baselines/reference/baseCheck.errors.txt @@ -1,18 +1,15 @@ tests/cases/compiler/baseCheck.ts(9,18): error TS2304: Cannot find name 'loc'. tests/cases/compiler/baseCheck.ts(17,53): error TS2346: Supplied parameters do not match any signature of call target. -tests/cases/compiler/baseCheck.ts(17,59): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/baseCheck.ts(17,59): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/compiler/baseCheck.ts(18,62): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/baseCheck.ts(18,62): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/baseCheck.ts(19,59): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. -tests/cases/compiler/baseCheck.ts(19,68): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/baseCheck.ts(19,68): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/compiler/baseCheck.ts(22,9): error TS2304: Cannot find name 'x'. tests/cases/compiler/baseCheck.ts(23,7): error TS2304: Cannot find name 'x'. tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'. -==== tests/cases/compiler/baseCheck.ts (12 errors) ==== +==== tests/cases/compiler/baseCheck.ts (9 errors) ==== class C { constructor(x: number, y: number) { } } class ELoc extends C { constructor(x: number) { @@ -35,20 +32,14 @@ tests/cases/compiler/baseCheck.ts(26,9): error TS2304: Cannot find name 'x'. ~~~~~~~~~~~~~ !!! error TS2346: Supplied parameters do not match any signature of call target. ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. class E extends C { constructor(public z: number) { super(0, this.z) } } ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. class F extends C { constructor(public z: number) { super("hello", this.z) } } // first param type ~~~~~~~ !!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'. ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. function f() { diff --git a/tests/baselines/reference/classUpdateTests.errors.txt b/tests/baselines/reference/classUpdateTests.errors.txt index 55965756410..59e9bc9ced1 100644 --- a/tests/baselines/reference/classUpdateTests.errors.txt +++ b/tests/baselines/reference/classUpdateTests.errors.txt @@ -1,11 +1,11 @@ tests/cases/compiler/classUpdateTests.ts(34,2): error TS2377: Constructors for derived classes must contain a 'super' call. tests/cases/compiler/classUpdateTests.ts(43,18): error TS2335: 'super' can only be referenced in a derived class. -tests/cases/compiler/classUpdateTests.ts(59,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/classUpdateTests.ts(57,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/compiler/classUpdateTests.ts(63,7): error TS2415: Class 'L' incorrectly extends base class 'G'. Property 'p1' is private in type 'L' but not in type 'G'. tests/cases/compiler/classUpdateTests.ts(69,7): error TS2415: Class 'M' incorrectly extends base class 'G'. Property 'p1' is private in type 'M' but not in type 'G'. -tests/cases/compiler/classUpdateTests.ts(72,3): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/classUpdateTests.ts(70,2): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/compiler/classUpdateTests.ts(93,3): error TS1128: Declaration or statement expected. tests/cases/compiler/classUpdateTests.ts(95,1): error TS1128: Declaration or statement expected. tests/cases/compiler/classUpdateTests.ts(99,3): error TS1128: Declaration or statement expected. @@ -80,11 +80,14 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st class K extends G { constructor(public p1:number) { // ERROR + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var i = 0; + ~~~~~~~~~~~~ super(); - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~ } + ~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class L extends G { @@ -101,11 +104,14 @@ tests/cases/compiler/classUpdateTests.ts(113,1): error TS1128: Declaration or st !!! error TS2415: Class 'M' incorrectly extends base class 'G'. !!! error TS2415: Property 'p1' is private in type 'M' but not in type 'G'. constructor(private p1:number) { // ERROR + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var i = 0; + ~~~~~~~~~~~~ super(); - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~ } + ~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } // diff --git a/tests/baselines/reference/derivedClassParameterProperties.errors.txt b/tests/baselines/reference/derivedClassParameterProperties.errors.txt index fcaae2ecd22..27bb9af63a1 100644 --- a/tests/baselines/reference/derivedClassParameterProperties.errors.txt +++ b/tests/baselines/reference/derivedClassParameterProperties.errors.txt @@ -1,12 +1,12 @@ -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(17,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(32,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(15,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(30,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(47,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(56,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(57,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(58,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(59,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(79,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(80,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(81,9): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts(82,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. ==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassParameterProperties.ts (9 errors) ==== @@ -25,11 +25,14 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP class Derived2 extends Base { constructor(public y: string) { + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ var a = 1; + ~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~~~~~~~~~~~~~~~~ } + ~~~~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class Derived3 extends Base { @@ -42,11 +45,14 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP class Derived4 extends Base { a = 1; constructor(y: string) { + ~~~~~~~~~~~~~~~~~~~~~~~~ var b = 2; + ~~~~~~~~~~~~~~~~~~ super(); // error - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~~~~~~~~~~~~~~~~ } + ~~~~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class Derived5 extends Base { @@ -72,16 +78,20 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP a = 1; b: number; constructor(y: string) { + ~~~~~~~~~~~~~~~~~~~~~~~~ this.a = 3; + ~~~~~~~~~~~~~~~~~~~ ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. this.b = 3; + ~~~~~~~~~~~~~~~~~~~ ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. super(); // error - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~~~~~~~~~~~~~~~~ } + ~~~~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class Derived8 extends Base { @@ -101,16 +111,20 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassP a = 1; b: number; constructor(y: string) { + ~~~~~~~~~~~~~~~~~~~~~~~~ this.a = 3; + ~~~~~~~~~~~~~~~~~~~ ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. this.b = 3; + ~~~~~~~~~~~~~~~~~~~ ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. super(); // error - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~~~~~~~~~~~~~~~~ } + ~~~~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class Derived10 extends Base2 { diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt index 450d954289a..d381eff17dc 100644 --- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt +++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.errors.txt @@ -1,10 +1,8 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(8,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(14,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts(20,21): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (4 errors) ==== +==== tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassSuperCallsWithThisArg.ts (2 errors) ==== class Base { x: string; constructor(a) { } @@ -22,8 +20,6 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS constructor(public a: string) { super(this); // error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -31,8 +27,6 @@ tests/cases/conformance/classes/constructorDeclarations/superCalls/derivedClassS class Derived3 extends Base { constructor(public a: string) { super(() => this); // error - ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. } } diff --git a/tests/baselines/reference/strictModeInConstructor.errors.txt b/tests/baselines/reference/strictModeInConstructor.errors.txt index 3c38530cc12..9a80732842a 100644 --- a/tests/baselines/reference/strictModeInConstructor.errors.txt +++ b/tests/baselines/reference/strictModeInConstructor.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/strictModeInConstructor.ts(29,9): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. +tests/cases/compiler/strictModeInConstructor.ts(27,5): error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. ==== tests/cases/compiler/strictModeInConstructor.ts (1 errors) ==== @@ -29,12 +29,16 @@ tests/cases/compiler/strictModeInConstructor.ts(29,9): error TS2376: A 'super' c public s: number = 9; constructor () { + ~~~~~~~~~~~~~~~~ var x = 1; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ super(); - ~~~~~~~~ -!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. + ~~~~~~~~~~~~~~~~ "use strict"; + ~~~~~~~~~~~~~~~~~~~~~ } + ~~~~~ +!!! error TS2376: A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties. } class Bs extends A { diff --git a/tests/baselines/reference/thisInInvalidContexts.errors.txt b/tests/baselines/reference/thisInInvalidContexts.errors.txt index 6e4f665a782..d33260fa108 100644 --- a/tests/baselines/reference/thisInInvalidContexts.errors.txt +++ b/tests/baselines/reference/thisInInvalidContexts.errors.txt @@ -1,6 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(14,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(22,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -9,7 +8,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(44,9): tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): error TS2332: 'this' cannot be referenced in current location. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (9 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts (8 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -37,8 +36,6 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContexts.ts(45,9): constructor() { super(this); // Error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index 9c8d4748ed0..6c1a257b5ea 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -1,6 +1,5 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(3,16): error TS2334: 'this' cannot be referenced in a static property initializer. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(14,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(22,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(28,13): error TS2331: 'this' cannot be referenced in a module or namespace body. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(36,13): error TS2526: A 'this' type is available only in a non-static member of a class or interface. @@ -10,7 +9,7 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (10 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -38,8 +37,6 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod constructor() { super(this); // Error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall.errors.txt b/tests/baselines/reference/thisInSuperCall.errors.txt index 37a28513cd4..d1eeb1d2b2b 100644 --- a/tests/baselines/reference/thisInSuperCall.errors.txt +++ b/tests/baselines/reference/thisInSuperCall.errors.txt @@ -1,11 +1,9 @@ tests/cases/compiler/thisInSuperCall.ts(7,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/compiler/thisInSuperCall.ts(14,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall.ts(14,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/compiler/thisInSuperCall.ts(20,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall.ts(20,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall.ts (5 errors) ==== +==== tests/cases/compiler/thisInSuperCall.ts (3 errors) ==== class Base { constructor(x: any) {} } @@ -23,8 +21,6 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS17009: 'super' must be c constructor() { super(this); // error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } @@ -33,8 +29,6 @@ tests/cases/compiler/thisInSuperCall.ts(20,15): error TS17009: 'super' must be c constructor(public p) { super(this); // error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } \ No newline at end of file diff --git a/tests/baselines/reference/thisInSuperCall1.errors.txt b/tests/baselines/reference/thisInSuperCall1.errors.txt index 752b0d5c0dc..20bc502ab79 100644 --- a/tests/baselines/reference/thisInSuperCall1.errors.txt +++ b/tests/baselines/reference/thisInSuperCall1.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall1.ts (2 errors) ==== +==== tests/cases/compiler/thisInSuperCall1.ts (1 errors) ==== class Base { constructor(a: any) {} } @@ -11,8 +10,6 @@ tests/cases/compiler/thisInSuperCall1.ts(7,15): error TS17009: 'super' must be c constructor(public x: number) { super(this); ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall2.errors.txt b/tests/baselines/reference/thisInSuperCall2.errors.txt index 8e7d49aa7b9..4e4e9b50a8e 100644 --- a/tests/baselines/reference/thisInSuperCall2.errors.txt +++ b/tests/baselines/reference/thisInSuperCall2.errors.txt @@ -1,9 +1,8 @@ tests/cases/compiler/thisInSuperCall2.ts(8,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall2.ts (3 errors) ==== +==== tests/cases/compiler/thisInSuperCall2.ts (2 errors) ==== class Base { constructor(a: any) {} } @@ -23,8 +22,6 @@ tests/cases/compiler/thisInSuperCall2.ts(16,15): error TS17009: 'super' must be constructor() { super(this); // error ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } diff --git a/tests/baselines/reference/thisInSuperCall3.errors.txt b/tests/baselines/reference/thisInSuperCall3.errors.txt index dd54d689562..27a7dc8b25d 100644 --- a/tests/baselines/reference/thisInSuperCall3.errors.txt +++ b/tests/baselines/reference/thisInSuperCall3.errors.txt @@ -1,8 +1,7 @@ -tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS2332: 'this' cannot be referenced in current location. tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. -==== tests/cases/compiler/thisInSuperCall3.ts (2 errors) ==== +==== tests/cases/compiler/thisInSuperCall3.ts (1 errors) ==== class Base { constructor(a: any) {} } @@ -13,8 +12,6 @@ tests/cases/compiler/thisInSuperCall3.ts(9,15): error TS17009: 'super' must be c constructor() { super(this); ~~~~ -!!! error TS2332: 'this' cannot be referenced in current location. - ~~~~ !!! error TS17009: 'super' must be called before accessing 'this' in the constructor of a derived class. } } From 655d5c934c2bf258393457551698c7377e3f1faa Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 16:04:40 -0800 Subject: [PATCH 088/160] Comments and messages --- src/compiler/checker.ts | 5 ++++- src/compiler/diagnosticMessages.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 140099938c8..c7de964cdbd 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -12511,6 +12511,9 @@ namespace ts { /** * Checks that the return type provided is an instantiation of the global Promise type * and returns the awaited type of the return type. + * + * @param returnType The return type of a FunctionLikeDeclaration + * @param location The node on which to report the error. */ function checkCorrectPromiseType(returnType: Type, location: Node) { if (returnType === unknownType) { @@ -12967,7 +12970,7 @@ namespace ts { // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent const parent = getDeclarationContainer(node); if (parent.kind === SyntaxKind.SourceFile && isExternalOrCommonJsModule(parent) && parent.flags & NodeFlags.HasAsyncFunctions) { - // If the declaration happens to be in external module, report error that require and exports are reserved keywords + // If the declaration happens to be in external module, report error that Promise is a reserved identifier. error(name, Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, declarationNameToString(name), declarationNameToString(name)); } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index f5e6254a040..27ce11f5286 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -195,7 +195,7 @@ "category": "Error", "code": 1063 }, - "The return type of an async function or method must be the global Promise.": { + "The return type of an async function or method must be the global Promise type.": { "category": "Error", "code": 1064 }, From e4ab2db9fb88520e81427e2c6f252fdbb717dcf8 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Tue, 26 Jan 2016 10:51:10 -0800 Subject: [PATCH 089/160] Fix find all references for salsa --- src/compiler/checker.ts | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 645b3835b93..a3052d1f124 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -376,8 +376,8 @@ namespace ts { const moduleAugmentation = moduleName.parent; if (moduleAugmentation.symbol.valueDeclaration !== moduleAugmentation) { // this is a combined symbol for multiple augmentations within the same file. - // its symbol already has accumulated information for all declarations - // so we need to add it just once - do the work only for first declaration + // its symbol already has accumulated information for all declarations + // so we need to add it just once - do the work only for first declaration Debug.assert(moduleAugmentation.symbol.declarations.length > 1); return; } @@ -386,7 +386,7 @@ namespace ts { mergeSymbolTable(globals, moduleAugmentation.symbol.exports); } else { - // find a module that about to be augmented + // find a module that about to be augmented let mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found); if (!mainModule) { return; @@ -812,7 +812,7 @@ namespace ts { } // No static member is present. - // Check if we're in an instance method and look for a relevant instance member. + // Check if we're in an instance method and look for a relevant instance member. if (location === container && !(location.flags & NodeFlags.Static)) { const instanceType = (getDeclaredTypeOfSymbol(classSymbol)).thisType; if (getPropertyOfType(instanceType, name)) { @@ -1163,7 +1163,7 @@ namespace ts { return getMergedSymbol(sourceFile.symbol); } if (moduleNotFoundError) { - // report errors only if it was requested + // report errors only if it was requested error(moduleReferenceLiteral, Diagnostics.File_0_is_not_a_module, sourceFile.fileName); } return undefined; @@ -2618,7 +2618,7 @@ namespace ts { } } else if (declaration.kind === SyntaxKind.Parameter) { - // If it's a parameter, see if the parent has a jsdoc comment with an @param + // If it's a parameter, see if the parent has a jsdoc comment with an @param // annotation. const paramTag = getCorrespondingJSDocParameterTag(declaration); if (paramTag && paramTag.typeExpression) { @@ -2633,7 +2633,7 @@ namespace ts { function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration): Type { if (declaration.parserContextFlags & ParserContextFlags.JavaScriptFile) { // If this is a variable in a JavaScript file, then use the JSDoc type (if it has - // one as its type), otherwise fallback to the below standard TS codepaths to + // one as its type), otherwise fallback to the below standard TS codepaths to // try to figure it out. const type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration); if (type && type !== unknownType) { @@ -4058,7 +4058,7 @@ namespace ts { const isJSConstructSignature = isJSDocConstructSignature(declaration); let returnType: Type = undefined; - // If this is a JSDoc construct signature, then skip the first parameter in the + // If this is a JSDoc construct signature, then skip the first parameter in the // parameter list. The first parameter represents the return type of the construct // signature. for (let i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) { @@ -4461,7 +4461,7 @@ namespace ts { } if (symbol.flags & SymbolFlags.Value && node.kind === SyntaxKind.JSDocTypeReference) { - // A JSDocTypeReference may have resolved to a value (as opposed to a type). In + // A JSDocTypeReference may have resolved to a value (as opposed to a type). In // that case, the type of this reference is just the type of the value we resolved // to. return getTypeOfSymbol(symbol); @@ -10404,7 +10404,7 @@ namespace ts { /* *TypeScript Specification 1.0 (6.3) - July 2014 - * An explicitly typed function whose return type isn't the Void type, + * An explicitly typed function whose return type isn't the Void type, * the Any type, or a union type containing the Void or Any type as a constituent * must have at least one return statement somewhere in its body. * An exception to this rule is if the function implementation consists of a single 'throw' statement. @@ -14426,10 +14426,10 @@ namespace ts { if (isAmbientExternalModule) { if (isExternalModuleAugmentation(node)) { // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module) - // otherwise we'll be swamped in cascading errors. + // otherwise we'll be swamped in cascading errors. // We can detect if augmentation was applied using following rules: // - augmentation for a global scope is always applied - // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). + // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module). const checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & SymbolFlags.Merged); if (checkBody) { // body of ambient external module is always a module block @@ -15200,6 +15200,18 @@ namespace ts { return getSymbolOfNode(entityName.parent); } + if (isInJavaScriptFile(entityName) && entityName.parent.kind === SyntaxKind.PropertyAccessExpression) { + const specialPropertyAssignmentKind = getSpecialPropertyAssignmentKind(entityName.parent.parent); + switch (specialPropertyAssignmentKind) { + case SpecialPropertyAssignmentKind.ExportsProperty: + case SpecialPropertyAssignmentKind.ThisProperty: + case SpecialPropertyAssignmentKind.PrototypeProperty: + return getSymbolOfNode(entityName.parent); + case SpecialPropertyAssignmentKind.ModuleExports: + return getSymbolOfNode(entityName.parent.parent); + } + } + if (entityName.parent.kind === SyntaxKind.ExportAssignment) { return resolveEntityName(entityName, /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias); From e4c0c0028704f637a6417b67879132343532a261 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 26 Jan 2016 17:34:30 -0800 Subject: [PATCH 090/160] Fixed typo in diagnostic message name --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index c7de964cdbd..5b5196e1210 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -12534,7 +12534,7 @@ namespace ts { // The promise type was not a valid type reference to the global promise type, so we // report an error and return the unknown type. - error(location, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T); + error(location, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type); return unknownType; } From adacad326a3d023f82f076b2aa5f92334610226b Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 26 Jan 2016 21:38:12 -0800 Subject: [PATCH 091/160] addressed PR feedback --- src/compiler/commandLineParser.ts | 2 +- src/compiler/diagnosticMessages.json | 26 +++++++++++--------------- src/compiler/program.ts | 8 -------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 99a1c52913c..d5bf95a6405 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -258,7 +258,7 @@ namespace ts { "classic": ModuleResolutionKind.Classic, }, description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6, - error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_classic_or_baseUrl, + error: Diagnostics.Argument_for_moduleResolution_option_must_be_node_or_classic, }, { name: "allowUnusedLabels", diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 3bb5fb31750..2d677c90e7c 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2367,7 +2367,7 @@ "category": "Error", "code": 6062 }, - "Argument for '--moduleResolution' option must be 'node', 'classic' or 'baseUrl'.": { + "Argument for '--moduleResolution' option must be 'node' or 'classic'.": { "category": "Error", "code": 6063 }, @@ -2515,49 +2515,45 @@ "category": "Message", "code": 6101 }, - "Module name '{0}' contains '!' character.": { + "Allow javascript files to be compiled.": { "category": "Message", "code": 6102 }, - "Allow javascript files to be compiled.": { - "category": "Message", - "code": 6103 - }, "Option '{0}' should have array of strings as a value.": { "category": "Error", - "code": 6104 + "code": 6103 }, "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'.": { "category": "Message", - "code": 6105 + "code": 6104 }, "Expected type of 'typings' field in 'package.json' to be 'string', got '{0}'.": { "category": "Message", - "code": 6106 + "code": 6105 }, "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'": { "category": "Message", - "code": 6107 + "code": 6106 }, "'rootDirs' option is set, using it to resolve relative module name '{0}'": { "category": "Message", - "code": 6108 + "code": 6107 }, "Longest matching prefix for '{0}' is '{1}'": { "category": "Message", - "code": 6109 + "code": 6108 }, "Loading '{0}' from the root dir '{1}', candidate location '{2}'": { "category": "Message", - "code": 6110 + "code": 6109 }, "Trying other entries in 'rootDirs'": { "category": "Message", - "code": 6111 + "code": 6110 }, "Module resolution using 'rootDirs' has failed": { "category": "Message", - "code": 6112 + "code": 6111 }, "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 910525aa8d2..90517ab3189 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -527,14 +527,6 @@ namespace ts { return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/false, failedLookupLocations); } - // module names that contain '!' are used to reference resources and are not resolved to actual files on disk - if (moduleName.indexOf("!") != -1) { - if (traceEnabled) { - trace(host, Diagnostics.Module_name_0_contains_character, moduleName); - } - return { resolvedModule: undefined, failedLookupLocations: [] }; - } - let referencedSourceFile: string; while (true) { const searchName = normalizePath(combinePaths(containingDirectory, moduleName)); From a116b4c996aa75964bfb0009f4ad456ff0d3ec16 Mon Sep 17 00:00:00 2001 From: Noj Vek Date: Tue, 26 Jan 2016 22:59:34 -0800 Subject: [PATCH 092/160] pretty output for react jsx --- src/compiler/emitter.ts | 46 ++-- tests/baselines/reference/tsxReactEmit1.js | 6 +- tests/baselines/reference/tsxReactEmit3.js | 10 +- .../reference/tsxReactEmitNesting.js | 64 ++++++ .../reference/tsxReactEmitNesting.symbols | 139 ++++++++++++ .../reference/tsxReactEmitNesting.types | 208 ++++++++++++++++++ .../reference/tsxReactEmitWhitespace.js | 6 +- .../reference/tsxReactEmitWhitespace2.js | 16 +- .../conformance/jsx/tsxReactEmitNesting.tsx | 37 ++++ 9 files changed, 507 insertions(+), 25 deletions(-) create mode 100644 tests/baselines/reference/tsxReactEmitNesting.js create mode 100644 tests/baselines/reference/tsxReactEmitNesting.symbols create mode 100644 tests/baselines/reference/tsxReactEmitNesting.types create mode 100644 tests/cases/conformance/jsx/tsxReactEmitNesting.tsx diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 44cb0ea3ccf..86378036d65 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1257,26 +1257,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // Children if (children) { - for (let i = 0; i < children.length; i++) { - // Don't emit empty expressions - if (children[i].kind === SyntaxKind.JsxExpression && !((children[i]).expression)) { - continue; - } - - // Don't emit empty strings - if (children[i].kind === SyntaxKind.JsxText) { - const text = getTextToEmit(children[i]); - if (text !== undefined) { - write(", \""); - write(text); - write("\""); - } - } - else { + // build list of valid emittable jsx children + const emittableChildren = children.filter(isJsxChildEmittable); + if (emittableChildren.length > 0) { + // If the only child is non-jsx element, don't put it on a new line + if (emittableChildren.length == 1 && emittableChildren[0].kind !== SyntaxKind.JsxElement && emittableChildren[0].kind !== SyntaxKind.JsxSelfClosingElement) { write(", "); - emit(children[i]); + emit(emittableChildren[0]); + } + // Otherwise build a indented comma separated list + else { + increaseIndent(); + emitList(emittableChildren, 0, emittableChildren.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ true); + decreaseIndent(); } - } } @@ -7251,7 +7245,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge return result; } - function getTextToEmit(node: JsxText) { + function isJsxChildEmittable(child: JsxChild): boolean { + if (child.kind === SyntaxKind.JsxExpression) { + // Don't emit empty expressions + return !!(child).expression; + + } + else if (child.kind === SyntaxKind.JsxText) { + // Don't emit empty strings + return !!getTextToEmit(child); + } + + return true; + }; + + function getTextToEmit(node: JsxText): string { switch (compilerOptions.jsx) { case JsxEmit.React: let text = trimReactWhitespaceAndApplyEntities(node); diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js index 05781ab8530..a6eac7f4824 100644 --- a/tests/baselines/reference/tsxReactEmit1.js +++ b/tests/baselines/reference/tsxReactEmit1.js @@ -70,5 +70,9 @@ var SomeClass = (function () { return SomeClass; }()); var whitespace1 = React.createElement("div", null, " "); -var whitespace2 = React.createElement("div", null, " ", p, " "); +var whitespace2 = React.createElement("div", null, + " ", + p, + " " +); var whitespace3 = React.createElement("div", null, p); diff --git a/tests/baselines/reference/tsxReactEmit3.js b/tests/baselines/reference/tsxReactEmit3.js index bd42177e187..2163a310fc8 100644 --- a/tests/baselines/reference/tsxReactEmit3.js +++ b/tests/baselines/reference/tsxReactEmit3.js @@ -8,4 +8,12 @@ declare var Foo, Bar, baz; q s ; //// [test.js] -React.createElement(Foo, null, " ", React.createElement(Bar, null, " q "), " ", React.createElement(Bar, null), " s ", React.createElement(Bar, null), React.createElement(Bar, null)); +React.createElement(Foo, null, + " ", + React.createElement(Bar, null, " q "), + " ", + React.createElement(Bar, null), + " s ", + React.createElement(Bar, null), + React.createElement(Bar, null) +); diff --git a/tests/baselines/reference/tsxReactEmitNesting.js b/tests/baselines/reference/tsxReactEmitNesting.js new file mode 100644 index 00000000000..3f12715b98c --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitNesting.js @@ -0,0 +1,64 @@ +//// [file.tsx] + +declare var vdom: any; +declare var ctrl: any; +declare var model: any; + +// A simple render function with nesting and control statements +let render = (ctrl, model) => +

+
+

todos <x>

+ +
+
+ +
    + {model.filteredTodos.map((todo) => +
  • +
    + {(!todo.editable) ? + + : null + } + + +
    +
    +
    +
    +
    • + )} +
+
+
+ + + +//// [file.js] +// A simple render function with nesting and control statements +var render = function (ctrl, model) { + return vdom.createElement("section", {class: "todoapp"}, + vdom.createElement("header", {class: "header"}, + vdom.createElement("h1", null, "todos "), + vdom.createElement("input", {class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model)}) + ), + vdom.createElement("section", {class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" }}, + vdom.createElement("input", {class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl)}), + vdom.createElement("ul", {class: "todo-list"}, model.filteredTodos.map(function (todo) { + return vdom.createElement("li", {class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo }}, + vdom.createElement("div", {class: "view"}, + (!todo.editable) ? + vdom.createElement("input", {class: "toggle", type: "checkbox"}) + : null, + vdom.createElement("label", {onDoubleClick: function () { ctrl.editTodo(todo); }}, todo.title), + vdom.createElement("button", {class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo)}), + vdom.createElement("div", {class: "iconBorder"}, + vdom.createElement("div", {class: "icon"}) + ) + ) + ); + })) + ) + ); +}; diff --git a/tests/baselines/reference/tsxReactEmitNesting.symbols b/tests/baselines/reference/tsxReactEmitNesting.symbols new file mode 100644 index 00000000000..efccb602747 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitNesting.symbols @@ -0,0 +1,139 @@ +=== tests/cases/conformance/jsx/file.tsx === + +declare var vdom: any; +>vdom : Symbol(vdom, Decl(file.tsx, 1, 11)) + +declare var ctrl: any; +>ctrl : Symbol(ctrl, Decl(file.tsx, 2, 11)) + +declare var model: any; +>model : Symbol(model, Decl(file.tsx, 3, 11)) + +// A simple render function with nesting and control statements +let render = (ctrl, model) => +>render : Symbol(render, Decl(file.tsx, 6, 3)) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>model : Symbol(model, Decl(file.tsx, 6, 19)) + +
+>section : Symbol(unknown) +>class : Symbol(unknown) + +
+>header : Symbol(unknown) +>class : Symbol(unknown) + +

todos <x>

+>h1 : Symbol(unknown) +>h1 : Symbol(unknown) + + +>input : Symbol(unknown) +>class : Symbol(unknown) +>autofocus : Symbol(unknown) +>autocomplete : Symbol(unknown) +>placeholder : Symbol(unknown) +>value : Symbol(unknown) +>model : Symbol(model, Decl(file.tsx, 6, 19)) +>onKeyup : Symbol(unknown) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>model : Symbol(model, Decl(file.tsx, 6, 19)) + +
+>header : Symbol(unknown) + +
+>section : Symbol(unknown) +>class : Symbol(unknown) +>style : Symbol(unknown) +>display : Symbol(display, Decl(file.tsx, 12, 38)) +>model : Symbol(model, Decl(file.tsx, 6, 19)) +>model : Symbol(model, Decl(file.tsx, 6, 19)) + + +>input : Symbol(unknown) +>class : Symbol(unknown) +>type : Symbol(unknown) +>onChange : Symbol(unknown) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) + +
    +>ul : Symbol(unknown) +>class : Symbol(unknown) + + {model.filteredTodos.map((todo) => +>model : Symbol(model, Decl(file.tsx, 6, 19)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) + +
  • +>li : Symbol(unknown) +>class : Symbol(unknown) +>todo : Symbol(todo, Decl(file.tsx, 16, 32)) +>completed : Symbol(completed, Decl(file.tsx, 16, 43)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) +>editing : Symbol(editing, Decl(file.tsx, 16, 70)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) +>model : Symbol(model, Decl(file.tsx, 6, 19)) + +
    +>div : Symbol(unknown) +>class : Symbol(unknown) + + {(!todo.editable) ? +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) + + +>input : Symbol(unknown) +>class : Symbol(unknown) +>type : Symbol(unknown) +>input : Symbol(unknown) + + : null + } + +>label : Symbol(unknown) +>onDoubleClick : Symbol(unknown) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) +>label : Symbol(unknown) + + +>button : Symbol(unknown) +>class : Symbol(unknown) +>onClick : Symbol(unknown) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>ctrl : Symbol(ctrl, Decl(file.tsx, 6, 14)) +>todo : Symbol(todo, Decl(file.tsx, 15, 42)) +>button : Symbol(unknown) + +
    +>div : Symbol(unknown) +>class : Symbol(unknown) + +
    +>div : Symbol(unknown) +>class : Symbol(unknown) + +
    +>div : Symbol(unknown) + +
    +>div : Symbol(unknown) + +
    • +>li : Symbol(unknown) + + )} +
+>ul : Symbol(unknown) + +
+>section : Symbol(unknown) + +
+>section : Symbol(unknown) + + diff --git a/tests/baselines/reference/tsxReactEmitNesting.types b/tests/baselines/reference/tsxReactEmitNesting.types new file mode 100644 index 00000000000..fff29c11525 --- /dev/null +++ b/tests/baselines/reference/tsxReactEmitNesting.types @@ -0,0 +1,208 @@ +=== tests/cases/conformance/jsx/file.tsx === + +declare var vdom: any; +>vdom : any + +declare var ctrl: any; +>ctrl : any + +declare var model: any; +>model : any + +// A simple render function with nesting and control statements +let render = (ctrl, model) => +>render : (ctrl: any, model: any) => any +>(ctrl, model) =>

todos <x>

    {model.filteredTodos.map((todo) =>
  • {(!todo.editable) ? : null }
    • )}
: (ctrl: any, model: any) => any +>ctrl : any +>model : any + +
+>

todos <x>

    {model.filteredTodos.map((todo) =>
  • {(!todo.editable) ? : null }
    • )}
: any +>section : any +>class : any + +
+>

todos <x>

: any +>header : any +>class : any + +

todos <x>

+>

todos <x>

: any +>h1 : any +>h1 : any + + +> : any +>input : any +>class : any +>autofocus : any +>autocomplete : any +>placeholder : any +>value : any +>model.newTodo : any +>model : any +>newTodo : any +>onKeyup : any +>ctrl.addTodo.bind(ctrl, model) : any +>ctrl.addTodo.bind : any +>ctrl.addTodo : any +>ctrl : any +>addTodo : any +>bind : any +>ctrl : any +>model : any + +
+>header : any + +
+>
    {model.filteredTodos.map((todo) =>
  • {(!todo.editable) ? : null }
    • )}
: any +>section : any +>class : any +>style : any +>{display:(model.todos && model.todos.length) ? "block" : "none"} : { display: string; } +>display : string +>(model.todos && model.todos.length) ? "block" : "none" : string +>(model.todos && model.todos.length) : any +>model.todos && model.todos.length : any +>model.todos : any +>model : any +>todos : any +>model.todos.length : any +>model.todos : any +>model : any +>todos : any +>length : any +>"block" : string +>"none" : string + + +> : any +>input : any +>class : any +>type : any +>onChange : any +>ctrl.toggleAll.bind(ctrl) : any +>ctrl.toggleAll.bind : any +>ctrl.toggleAll : any +>ctrl : any +>toggleAll : any +>bind : any +>ctrl : any + +
    +>
      {model.filteredTodos.map((todo) =>
    • {(!todo.editable) ? : null }
      • )}
    : any +>ul : any +>class : any + + {model.filteredTodos.map((todo) => +>model.filteredTodos.map((todo) =>
  • {(!todo.editable) ? : null }
    • ) : any +>model.filteredTodos.map : any +>model.filteredTodos : any +>model : any +>filteredTodos : any +>map : any +>(todo) =>
  • {(!todo.editable) ? : null }
    • : (todo: any) => any +>todo : any + +
  • +>
  • {(!todo.editable) ? : null }
    • : any +>li : any +>class : any +>{todo: true, completed: todo.completed, editing: todo == model.editedTodo} : { todo: boolean; completed: any; editing: boolean; } +>todo : boolean +>true : boolean +>completed : any +>todo.completed : any +>todo : any +>completed : any +>editing : boolean +>todo == model.editedTodo : boolean +>todo : any +>model.editedTodo : any +>model : any +>editedTodo : any + +
    +>
    {(!todo.editable) ? : null }
    : any +>div : any +>class : any + + {(!todo.editable) ? +>(!todo.editable) ? : null : any +>(!todo.editable) : boolean +>!todo.editable : boolean +>todo.editable : any +>todo : any +>editable : any + + +> : any +>input : any +>class : any +>type : any +>input : any + + : null +>null : null + } + +> : any +>label : any +>onDoubleClick : any +>()=>{ctrl.editTodo(todo)} : () => void +>ctrl.editTodo(todo) : any +>ctrl.editTodo : any +>ctrl : any +>editTodo : any +>todo : any +>todo.title : any +>todo : any +>title : any +>label : any + + +> : any +>button : any +>class : any +>onClick : any +>ctrl.removeTodo.bind(ctrl,todo) : any +>ctrl.removeTodo.bind : any +>ctrl.removeTodo : any +>ctrl : any +>removeTodo : any +>bind : any +>ctrl : any +>todo : any +>button : any + +
    +>
    : any +>div : any +>class : any + +
    +>
    : any +>div : any +>class : any + +
    +>div : any + +
    +>div : any + + +>li : any + + )} +
+>ul : any + +
+>section : any + +
+>section : any + + diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.js b/tests/baselines/reference/tsxReactEmitWhitespace.js index 9614cbf2f2c..5db92bb33a4 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace.js @@ -59,7 +59,11 @@ var p = 0; // Emit " " React.createElement("div", null, " "); // Emit " ", p, " " -React.createElement("div", null, " ", p, " "); +React.createElement("div", null, + " ", + p, + " " +); // Emit only p React.createElement("div", null, p); // Emit only p diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.js b/tests/baselines/reference/tsxReactEmitWhitespace2.js index f649ca43ebd..61e7805fb3d 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.js @@ -18,8 +18,18 @@ declare var React: any; //// [file.js] // Emit ' word' in the last string -React.createElement("div", null, "word ", React.createElement("code", null, "code"), " word"); +React.createElement("div", null, + "word ", + React.createElement("code", null, "code"), + " word" +); // Same here -React.createElement("div", null, React.createElement("code", null, "code"), " word"); +React.createElement("div", null, + React.createElement("code", null, "code"), + " word" +); // And here -React.createElement("div", null, React.createElement("code", null), " word"); +React.createElement("div", null, + React.createElement("code", null), + " word" +); diff --git a/tests/cases/conformance/jsx/tsxReactEmitNesting.tsx b/tests/cases/conformance/jsx/tsxReactEmitNesting.tsx new file mode 100644 index 00000000000..6c56ed781a6 --- /dev/null +++ b/tests/cases/conformance/jsx/tsxReactEmitNesting.tsx @@ -0,0 +1,37 @@ +//@filename: file.tsx +//@jsx: react +//@reactNamespace: vdom + +declare var vdom: any; +declare var ctrl: any; +declare var model: any; + +// A simple render function with nesting and control statements +let render = (ctrl, model) => +
+
+

todos <x>

+ +
+
+ +
    + {model.filteredTodos.map((todo) => +
  • +
    + {(!todo.editable) ? + + : null + } + + +
    +
    +
    +
    +
    • + )} +
+
+
+ From 5282cad1007113b495c70c4114a19ec25bdd6954 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 27 Jan 2016 09:56:20 -0800 Subject: [PATCH 093/160] pin mocha version to 2.3.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc74bf2c27c..48203b2c230 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "jake": "latest", - "mocha": "latest", + "mocha": "2.3.4", "chai": "latest", "browserify": "latest", "istanbul": "latest", From cbb195b047b53e472acf919159b7db413a129576 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 27 Jan 2016 10:25:51 -0800 Subject: [PATCH 094/160] Renumbering NodeFlags to start at 1 << 0 --- src/compiler/types.ts | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 61de5f49fcc..6fd935f7ae3 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -371,32 +371,32 @@ namespace ts { export const enum NodeFlags { None = 0, - Export = 1 << 1, // Declarations - Ambient = 1 << 2, // Declarations - Public = 1 << 3, // Property/Method - Private = 1 << 4, // Property/Method - Protected = 1 << 5, // Property/Method - Static = 1 << 6, // Property/Method - Readonly = 1 << 7, // Property/Method - Abstract = 1 << 8, // Class/Method/ConstructSignature - Async = 1 << 9, // Property/Method/Function - Default = 1 << 10, // Function/Class (export default declaration) - MultiLine = 1 << 11, // Multi-line array or object literal - Synthetic = 1 << 12, // Synthetic node (for full fidelity) - DeclarationFile = 1 << 13, // Node is a .d.ts file - Let = 1 << 14, // Variable declaration - Const = 1 << 15, // Variable declaration - OctalLiteral = 1 << 16, // Octal numeric literal - Namespace = 1 << 17, // Namespace declaration - ExportContext = 1 << 18, // Export context (initialized by binding) - ContainsThis = 1 << 19, // Interface contains references to "this" - HasImplicitReturn = 1 << 20, // If function implicitly returns on one of codepaths (initialized by binding) - HasExplicitReturn = 1 << 21, // If function has explicit reachable return on one of codepaths (initialized by binding) - GlobalAugmentation = 1 << 22, // Set if module declaration is an augmentation for the global scope - HasClassExtends = 1 << 23, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding) - HasDecorators = 1 << 24, // If the file has decorators (initialized by binding) - HasParamDecorators = 1 << 25, // If the file has parameter decorators (initialized by binding) - HasAsyncFunctions = 1 << 26, // If the file has async functions (initialized by binding) + Export = 1 << 0, // Declarations + Ambient = 1 << 1, // Declarations + Public = 1 << 2, // Property/Method + Private = 1 << 3, // Property/Method + Protected = 1 << 4, // Property/Method + Static = 1 << 5, // Property/Method + Readonly = 1 << 6, // Property/Method + Abstract = 1 << 7, // Class/Method/ConstructSignature + Async = 1 << 8, // Property/Method/Function + Default = 1 << 9, // Function/Class (export default declaration) + MultiLine = 1 << 10, // Multi-line array or object literal + Synthetic = 1 << 11, // Synthetic node (for full fidelity) + DeclarationFile = 1 << 12, // Node is a .d.ts file + Let = 1 << 13, // Variable declaration + Const = 1 << 14, // Variable declaration + OctalLiteral = 1 << 15, // Octal numeric literal + Namespace = 1 << 16, // Namespace declaration + ExportContext = 1 << 17, // Export context (initialized by binding) + ContainsThis = 1 << 18, // Interface contains references to "this" + HasImplicitReturn = 1 << 19, // If function implicitly returns on one of codepaths (initialized by binding) + HasExplicitReturn = 1 << 20, // If function has explicit reachable return on one of codepaths (initialized by binding) + GlobalAugmentation = 1 << 21, // Set if module declaration is an augmentation for the global scope + HasClassExtends = 1 << 22, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding) + HasDecorators = 1 << 23, // If the file has decorators (initialized by binding) + HasParamDecorators = 1 << 24, // If the file has parameter decorators (initialized by binding) + HasAsyncFunctions = 1 << 25, // If the file has async functions (initialized by binding) Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async, AccessibilityModifier = Public | Private | Protected, From b389e9c61984f1ac303e3382b2d3ceaa9a8e0b84 Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 27 Jan 2016 12:43:31 -0800 Subject: [PATCH 095/160] Fix for thisProperty --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a3052d1f124..d590f715ed5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15204,9 +15204,9 @@ namespace ts { const specialPropertyAssignmentKind = getSpecialPropertyAssignmentKind(entityName.parent.parent); switch (specialPropertyAssignmentKind) { case SpecialPropertyAssignmentKind.ExportsProperty: - case SpecialPropertyAssignmentKind.ThisProperty: case SpecialPropertyAssignmentKind.PrototypeProperty: return getSymbolOfNode(entityName.parent); + case SpecialPropertyAssignmentKind.ThisProperty: case SpecialPropertyAssignmentKind.ModuleExports: return getSymbolOfNode(entityName.parent.parent); } From 9a6815f3c7887c757cbe5a56dc6f6b4e67f6d2bc Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 27 Jan 2016 13:26:41 -0800 Subject: [PATCH 096/160] add tests --- tests/cases/fourslash/renameJsExports.ts | 12 ++++++++++++ tests/cases/fourslash/renameJsPrototypeProperty.ts | 12 ++++++++++++ tests/cases/fourslash/renameJsThisProperty.ts | 12 ++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 tests/cases/fourslash/renameJsExports.ts create mode 100644 tests/cases/fourslash/renameJsPrototypeProperty.ts create mode 100644 tests/cases/fourslash/renameJsThisProperty.ts diff --git a/tests/cases/fourslash/renameJsExports.ts b/tests/cases/fourslash/renameJsExports.ts new file mode 100644 index 00000000000..227eebe4a0d --- /dev/null +++ b/tests/cases/fourslash/renameJsExports.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////exports.[|area|] = function (r) { return r * r; } + +// @Filename: b.js +////var mod = require('./a'); +////var t = mod./**/[|area|](10); + +goTo.marker(); +verify.renameLocations(false, false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsPrototypeProperty.ts b/tests/cases/fourslash/renameJsPrototypeProperty.ts new file mode 100644 index 00000000000..651514859cc --- /dev/null +++ b/tests/cases/fourslash/renameJsPrototypeProperty.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////function bar() { +////} +////bar.prototype.[|x|] = 10; +////var t = new bar(); +////t./**/[|x|] = 11; + +goTo.marker(); +verify.renameLocations(false, false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsThisProperty.ts b/tests/cases/fourslash/renameJsThisProperty.ts new file mode 100644 index 00000000000..aed59d298b1 --- /dev/null +++ b/tests/cases/fourslash/renameJsThisProperty.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////function bar() { +//// this.[|x|] = 10; +////} +////var t = new bar(); +////t./**/[|x|] = 11; + +goTo.marker(); +verify.renameLocations(false, false); \ No newline at end of file From 646e46e022cddbfe31655ce5f0a40b7603dcca0b Mon Sep 17 00:00:00 2001 From: zhengbli Date: Wed, 27 Jan 2016 13:38:42 -0800 Subject: [PATCH 097/160] Fix build error --- .../asyncFunctionDeclaration15_es6.errors.txt | 20 +++++++++---------- .../asyncImportedPromise_es6.errors.txt | 2 +- .../asyncQualifiedReturnType_es6.errors.txt | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt index 7b682f9dcde..e8d3e7d79b1 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt +++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise type. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(17,16): error TS1059: Return expression in async function does not have a valid callable 'then' member. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(23,25): error TS1058: Operand for 'await' does not have a valid callable 'then' member. @@ -15,19 +15,19 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1 async function fn1() { } // valid: Promise async function fn2(): { } { } // error ~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn3(): any { } // error ~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn4(): number { } // error ~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn5(): PromiseLike { } // error ~~~~~~~~~~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn6(): Thenable { } // error ~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn7() { return; } // valid: Promise async function fn8() { return 1; } // valid: Promise async function fn9() { return null; } // valid: Promise diff --git a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt index 994445dbedd..881b36704a5 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt +++ b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise type. ==== tests/cases/conformance/async/es6/task.ts (0 errors) ==== diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt index f1d01bb2a7a..205ea016736 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt +++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise type. ==== tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts (1 errors) ==== @@ -9,5 +9,5 @@ tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error T async function f(): X.MyPromise { ~~~~~~~~~~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. } \ No newline at end of file From 7259b9fd4aa29ffb83acfffd14f55e6bee8c5d87 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Wed, 27 Jan 2016 14:00:33 -0800 Subject: [PATCH 098/160] Allow multiple 'this' property assignments in Salsa Fixes issue #6645 --- src/compiler/binder.ts | 3 ++- .../getJavaScriptSemanticDiagnostics23.ts | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 88a1a62ce4c..dbfe3a5195b 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1435,7 +1435,8 @@ namespace ts { // Declare a 'member' in case it turns out the container was an ES5 class if (container.kind === SyntaxKind.FunctionExpression || container.kind === SyntaxKind.FunctionDeclaration) { container.symbol.members = container.symbol.members || {}; - declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + // It's acceptable for multiple 'this' assignments of the same identifier to occur + declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property); } } diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts new file mode 100644 index 00000000000..2524e50e668 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics23.ts @@ -0,0 +1,14 @@ +/// + +// @allowJs: true +// @Filename: a.js +//// function Person(age) { +//// if (age >= 18) { +//// this.canVote = true; +//// } else { +//// this.canVote = false; +//// } +//// } + +verify.getSyntacticDiagnostics(`[]`); +verify.getSemanticDiagnostics(`[]`); From 1b282cda1de630186e9ad4aa20f30dfd66bb9c9b Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Wed, 27 Jan 2016 14:07:32 -0800 Subject: [PATCH 099/160] Parse JSDoc comments for ES6 class constructors and methods Fixes #6646 --- src/compiler/parser.ts | 4 ++-- .../fourslash/getJavaScriptCompletions16.ts | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 tests/cases/fourslash/getJavaScriptCompletions16.ts diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 57bd9860d12..1ee74603825 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -4778,7 +4778,7 @@ namespace ts { parseExpected(SyntaxKind.ConstructorKeyword); fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node); node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, Diagnostics.or_expected); - return finishNode(node); + return addJSDocComment(finishNode(node)); } function parseMethodDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, asteriskToken: Node, name: PropertyName, questionToken: Node, diagnosticMessage?: DiagnosticMessage): MethodDeclaration { @@ -4792,7 +4792,7 @@ namespace ts { const isAsync = !!(method.flags & NodeFlags.Async); fillSignature(SyntaxKind.ColonToken, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method); method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage); - return finishNode(method); + return addJSDocComment(finishNode(method)); } function parsePropertyDeclaration(fullStart: number, decorators: NodeArray, modifiers: ModifiersArray, name: PropertyName, questionToken: Node): ClassElement { diff --git a/tests/cases/fourslash/getJavaScriptCompletions16.ts b/tests/cases/fourslash/getJavaScriptCompletions16.ts new file mode 100644 index 00000000000..07c50d3f892 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptCompletions16.ts @@ -0,0 +1,18 @@ +/// + +// @allowNonTsExtensions: true +// @Filename: file.js +//// "use strict"; +//// +//// class Something { +//// +//// /** +//// * @param {number} a +//// */ +//// constructor(a, b) { +//// a./**/ +//// } +//// } + +goTo.marker(); +verify.completionListContains('toFixed', undefined, undefined, 'method'); From 6648403a8ee56efad0bb47617fd40cee91130d02 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 27 Jan 2016 14:31:21 -0800 Subject: [PATCH 100/160] Updated test baselines --- .../asyncFunctionDeclaration15_es6.errors.txt | 20 +++++++++---------- .../asyncImportedPromise_es6.errors.txt | 4 ++-- .../asyncQualifiedReturnType_es6.errors.txt | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt index 7b682f9dcde..e8d3e7d79b1 100644 --- a/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt +++ b/tests/baselines/reference/asyncFunctionDeclaration15_es6.errors.txt @@ -1,8 +1,8 @@ -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise. -tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise type. +tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise type. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(17,16): error TS1059: Return expression in async function does not have a valid callable 'then' member. tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration15_es6.ts(23,25): error TS1058: Operand for 'await' does not have a valid callable 'then' member. @@ -15,19 +15,19 @@ tests/cases/conformance/async/es6/functionDeclarations/asyncFunctionDeclaration1 async function fn1() { } // valid: Promise async function fn2(): { } { } // error ~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn3(): any { } // error ~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn4(): number { } // error ~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn5(): PromiseLike { } // error ~~~~~~~~~~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn6(): Thenable { } // error ~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. async function fn7() { return; } // valid: Promise async function fn8() { return 1; } // valid: Promise async function fn9() { return null; } // valid: Promise diff --git a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt index 994445dbedd..43b45482644 100644 --- a/tests/baselines/reference/asyncImportedPromise_es6.errors.txt +++ b/tests/baselines/reference/asyncImportedPromise_es6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise type. ==== tests/cases/conformance/async/es6/task.ts (0 errors) ==== @@ -9,5 +9,5 @@ tests/cases/conformance/async/es6/test.ts(3,25): error TS1064: The return type o class Test { async example(): Task { return; } ~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. } \ No newline at end of file diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt index f1d01bb2a7a..205ea016736 100644 --- a/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt +++ b/tests/baselines/reference/asyncQualifiedReturnType_es6.errors.txt @@ -1,4 +1,4 @@ -tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise. +tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise type. ==== tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts (1 errors) ==== @@ -9,5 +9,5 @@ tests/cases/conformance/async/es6/asyncQualifiedReturnType_es6.ts(6,21): error T async function f(): X.MyPromise { ~~~~~~~~~~~~~~~~~ -!!! error TS1064: The return type of an async function or method must be the global Promise. +!!! error TS1064: The return type of an async function or method must be the global Promise type. } \ No newline at end of file From 5b68d6559a8e126fac23388e199be29c3dab9a97 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 27 Jan 2016 15:27:11 -0800 Subject: [PATCH 101/160] strip quotes from module names during deduplication --- src/compiler/emitter.ts | 14 ++++++-- .../deduplicateImportsInSystem.errors.txt | 32 ++++++++++++++++++ .../reference/deduplicateImportsInSystem.js | 33 +++++++++++++++++++ .../compiler/deduplicateImportsInSystem.ts | 9 +++++ 4 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/deduplicateImportsInSystem.errors.txt create mode 100644 tests/baselines/reference/deduplicateImportsInSystem.js create mode 100644 tests/cases/compiler/deduplicateImportsInSystem.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 0a40047f686..4d771bd2538 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -7068,14 +7068,22 @@ const _super = (function (geti, seti) { for (let i = 0; i < externalImports.length; i++) { const text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName); - if (hasProperty(groupIndices, text)) { + if (text === undefined) { + continue; + } + + // text should be quoted string + // for deduplication purposes in key remove leading and trailing quotes so 'a' and "a" will be considered the same + const key = text.substr(1, text.length - 2); + + if (hasProperty(groupIndices, key)) { // deduplicate/group entries in dependency list by the dependency name - const groupIndex = groupIndices[text]; + const groupIndex = groupIndices[key]; dependencyGroups[groupIndex].push(externalImports[i]); continue; } else { - groupIndices[text] = dependencyGroups.length; + groupIndices[key] = dependencyGroups.length; dependencyGroups.push([externalImports[i]]); } diff --git a/tests/baselines/reference/deduplicateImportsInSystem.errors.txt b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt new file mode 100644 index 00000000000..d1bfe88160e --- /dev/null +++ b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt @@ -0,0 +1,32 @@ +tests/cases/compiler/deduplicateImportsInSystem.ts(1,17): error TS2307: Cannot find module 'f1'. +tests/cases/compiler/deduplicateImportsInSystem.ts(2,17): error TS2307: Cannot find module 'f2'. +tests/cases/compiler/deduplicateImportsInSystem.ts(3,17): error TS2307: Cannot find module 'f3'. +tests/cases/compiler/deduplicateImportsInSystem.ts(4,17): error TS2307: Cannot find module 'f2'. +tests/cases/compiler/deduplicateImportsInSystem.ts(5,17): error TS2307: Cannot find module 'f2'. +tests/cases/compiler/deduplicateImportsInSystem.ts(6,17): error TS2307: Cannot find module 'f1'. +tests/cases/compiler/deduplicateImportsInSystem.ts(8,1): error TS2304: Cannot find name 'console'. + + +==== tests/cases/compiler/deduplicateImportsInSystem.ts (7 errors) ==== + import {A} from "f1"; + ~~~~ +!!! error TS2307: Cannot find module 'f1'. + import {B} from "f2"; + ~~~~ +!!! error TS2307: Cannot find module 'f2'. + import {C} from "f3"; + ~~~~ +!!! error TS2307: Cannot find module 'f3'. + import {D} from 'f2'; + ~~~~ +!!! error TS2307: Cannot find module 'f2'. + import {E} from "f2"; + ~~~~ +!!! error TS2307: Cannot find module 'f2'. + import {F} from 'f1'; + ~~~~ +!!! error TS2307: Cannot find module 'f1'. + + console.log(A + B + C + D + E + F) + ~~~~~~~ +!!! error TS2304: Cannot find name 'console'. \ No newline at end of file diff --git a/tests/baselines/reference/deduplicateImportsInSystem.js b/tests/baselines/reference/deduplicateImportsInSystem.js new file mode 100644 index 00000000000..956d293cad1 --- /dev/null +++ b/tests/baselines/reference/deduplicateImportsInSystem.js @@ -0,0 +1,33 @@ +//// [deduplicateImportsInSystem.ts] +import {A} from "f1"; +import {B} from "f2"; +import {C} from "f3"; +import {D} from 'f2'; +import {E} from "f2"; +import {F} from 'f1'; + +console.log(A + B + C + D + E + F) + +//// [deduplicateImportsInSystem.js] +System.register(["f1", "f2", "f3"], function(exports_1) { + "use strict"; + var f1_1, f2_1, f3_1, f2_2, f2_3, f1_2; + return { + setters:[ + function (f1_1_1) { + f1_1 = f1_1_1; + f1_2 = f1_1_1; + }, + function (f2_1_1) { + f2_1 = f2_1_1; + f2_2 = f2_1_1; + f2_3 = f2_1_1; + }, + function (f3_1_1) { + f3_1 = f3_1_1; + }], + execute: function() { + console.log(f1_1.A + f2_1.B + f3_1.C + f2_2.D + f2_3.E + f1_2.F); + } + } +}); diff --git a/tests/cases/compiler/deduplicateImportsInSystem.ts b/tests/cases/compiler/deduplicateImportsInSystem.ts new file mode 100644 index 00000000000..2fcbc16be05 --- /dev/null +++ b/tests/cases/compiler/deduplicateImportsInSystem.ts @@ -0,0 +1,9 @@ +// @module: system +import {A} from "f1"; +import {B} from "f2"; +import {C} from "f3"; +import {D} from 'f2'; +import {E} from "f2"; +import {F} from 'f1'; + +console.log(A + B + C + D + E + F) \ No newline at end of file From 1bb96555da2d6cfd0a0b5d7e6357ea50ce5c95d1 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 27 Jan 2016 16:13:51 -0800 Subject: [PATCH 102/160] Creates a class body scoped alias to the class to avoid class name double binding. Fixes #5386. --- src/compiler/checker.ts | 28 ++- src/compiler/emitter.ts | 180 ++++++++++++------ src/compiler/types.ts | 6 +- .../decoratedClassFromExternalModule.js | 2 +- .../decoratedDefaultExportsGetExportedAmd.js | 2 +- ...oratedDefaultExportsGetExportedCommonjs.js | 2 +- ...ecoratedDefaultExportsGetExportedSystem.js | 2 +- .../decoratedDefaultExportsGetExportedUmd.js | 2 +- .../reference/decoratorOnClass1.es6.js | 22 +++ .../reference/decoratorOnClass1.es6.symbols | 19 ++ .../reference/decoratorOnClass1.es6.types | 20 ++ .../reference/decoratorOnClass2.es6.js | 22 +++ .../reference/decoratorOnClass2.es6.symbols | 19 ++ .../reference/decoratorOnClass2.es6.types | 20 ++ .../reference/decoratorOnClass3.es6.js | 23 +++ .../reference/decoratorOnClass3.es6.symbols | 19 ++ .../reference/decoratorOnClass3.es6.types | 20 ++ .../reference/decoratorOnClass4.es6.js | 20 ++ .../reference/decoratorOnClass4.es6.symbols | 13 ++ .../reference/decoratorOnClass4.es6.types | 13 ++ .../reference/decoratorOnClass5.es6.js | 27 +++ .../reference/decoratorOnClass5.es6.symbols | 28 +++ .../reference/decoratorOnClass5.es6.types | 30 +++ .../reference/decoratorOnClass6.es6.js | 27 +++ .../reference/decoratorOnClass6.es6.symbols | 28 +++ .../reference/decoratorOnClass6.es6.types | 30 +++ .../reference/decoratorOnClass7.es6.js | 28 +++ .../reference/decoratorOnClass7.es6.symbols | 28 +++ .../reference/decoratorOnClass7.es6.types | 30 +++ .../reference/decoratorOnClass8.es6.js | 22 +++ .../reference/decoratorOnClass8.es6.symbols | 15 ++ .../reference/decoratorOnClass8.es6.types | 16 ++ .../reference/generatorTypeCheck39.js | 2 +- .../reference/generatorTypeCheck61.js | 2 +- .../decorators/class/decoratorOnClass1.es6.ts | 9 + .../decorators/class/decoratorOnClass2.es6.ts | 9 + .../decorators/class/decoratorOnClass3.es6.ts | 9 + .../decorators/class/decoratorOnClass4.es6.ts | 7 + .../decorators/class/decoratorOnClass5.es6.ts | 11 ++ .../decorators/class/decoratorOnClass6.es6.ts | 11 ++ .../decorators/class/decoratorOnClass7.es6.ts | 11 ++ .../decorators/class/decoratorOnClass8.es6.ts | 8 + 42 files changed, 771 insertions(+), 71 deletions(-) create mode 100644 tests/baselines/reference/decoratorOnClass1.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass1.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass1.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass2.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass2.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass2.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass3.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass3.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass3.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass4.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass4.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass4.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass5.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass5.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass5.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass6.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass6.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass6.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass7.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass7.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass7.es6.types create mode 100644 tests/baselines/reference/decoratorOnClass8.es6.js create mode 100644 tests/baselines/reference/decoratorOnClass8.es6.symbols create mode 100644 tests/baselines/reference/decoratorOnClass8.es6.types create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts create mode 100644 tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index e9211bb3e7e..2494d0db260 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7192,11 +7192,33 @@ namespace ts { markAliasSymbolAsReferenced(symbol); } + const localSymbol = getExportSymbolOfValueSymbolIfExported(symbol); + + // Due to the emit for class decorators, any reference to the class from inside of the class body + // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind + // behavior of class names in ES6. + if (languageVersion === ScriptTarget.ES6 + && localSymbol + && localSymbol.valueDeclaration + && localSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration + && nodeIsDecorated(localSymbol.valueDeclaration)) { + let container = getContainingClass(node); + while (container !== undefined) { + if (container === localSymbol.valueDeclaration && container.name !== node) { + getNodeLinks(container).flags |= NodeCheckFlags.ClassWithBodyScopedClassBinding; + getNodeLinks(node).flags |= NodeCheckFlags.BodyScopedClassBinding; + break; + } + + container = getContainingClass(container); + } + } + checkCollisionWithCapturedSuperVariable(node, node); checkCollisionWithCapturedThisVariable(node, node); checkNestedBlockScopedBinding(node, symbol); - return getNarrowedTypeOfSymbol(getExportSymbolOfValueSymbolIfExported(symbol), node); + return getNarrowedTypeOfSymbol(localSymbol, node); } function isInsideFunction(node: Node, threshold: Node): boolean { @@ -7238,7 +7260,7 @@ namespace ts { if (containedInIterationStatement) { if (usedInFunction) { - // mark iteration statement as containing block-scoped binding captured in some function + // mark iteration statement as containing block-scoped binding captured in some function getNodeLinks(current).flags |= NodeCheckFlags.LoopWithCapturedBlockScopedBinding; } // set 'declared inside loop' bit on the block-scoped binding @@ -15734,7 +15756,7 @@ namespace ts { // - binding is not top level - top level bindings never collide with anything // AND // - binding is not declared in loop, should be renamed to avoid name reuse across siblings - // let a, b + // let a, b // { let x = 1; a = () => x; } // { let x = 100; b = () => x; } // console.log(a()); // should print '1' diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 0a40047f686..a3dcf7d630e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -481,6 +481,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge let generatedNameSet: Map; let nodeToGeneratedName: string[]; let computedPropertyNamesToGeneratedNames: string[]; + let decoratedClassAliases: string[]; let convertedLoopState: ConvertedLoopState; @@ -531,6 +532,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit); generatedNameSet = {}; nodeToGeneratedName = []; + decoratedClassAliases = []; isOwnFileEmit = !isBundledEmit; // Emit helpers from all the files @@ -559,6 +561,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge exportFunctionForFile = undefined; generatedNameSet = undefined; nodeToGeneratedName = undefined; + decoratedClassAliases = undefined; computedPropertyNamesToGeneratedNames = undefined; convertedLoopState = undefined; extendsEmitted = false; @@ -1529,13 +1532,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } } - if (languageVersion !== ScriptTarget.ES6) { + if (languageVersion < ScriptTarget.ES6) { const declaration = resolver.getReferencedDeclarationWithCollidingName(node); if (declaration) { write(getGeneratedNameForNode(declaration.name)); return; } } + else if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.BodyScopedClassBinding) { + // Due to the emit for class decorators, any reference to the class from inside of the class body + // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind + // behavior of class names in ES6. + const declaration = resolver.getReferencedValueDeclaration(node); + if (declaration && declaration.kind === SyntaxKind.ClassDeclaration) { + const classAlias = decoratedClassAliases[getNodeId(declaration)]; + if (classAlias !== undefined) { + write(classAlias); + return; + } + } + } } if (nodeIsSynthesized(node)) { @@ -4067,7 +4083,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge let initializer = node.initializer; if (!initializer && languageVersion < ScriptTarget.ES6 && - // for names - binding patterns that lack initializer there is no point to emit explicit initializer + // for names - binding patterns that lack initializer there is no point to emit explicit initializer // since downlevel codegen for destructuring will fail in the absence of initializer so all binding elements will say uninitialized node.name.kind === SyntaxKind.Identifier) { @@ -4088,11 +4104,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // explicitly initialized. One particular case: non-captured binding declared inside loop body (but not in loop initializer) // let x; // for (;;) { - // let x; + // let x; // } // in downlevel codegen inner 'x' will be renamed so it won't collide with outer 'x' however it will should be reset on every iteration - // as if it was declared anew. - // * Why non-captured binding - because if loop contains block scoped binding captured in some function then loop body will be rewritten + // as if it was declared anew. + // * Why non-captured binding - because if loop contains block scoped binding captured in some function then loop body will be rewritten // to have a fresh scope on every iteration so everything will just work. // * Why loop initializer is excluded - since we've introduced a fresh name it already will be undefined. const isCapturedInFunction = flags & NodeCheckFlags.CapturedBlockScopedBinding; @@ -5106,64 +5122,114 @@ const _super = (function (geti, seti) { } function emitClassLikeDeclarationForES6AndHigher(node: ClassLikeDeclaration) { + let decoratedClassAlias: string; const thisNodeIsDecorated = nodeIsDecorated(node); if (node.kind === SyntaxKind.ClassDeclaration) { if (thisNodeIsDecorated) { - // To preserve the correct runtime semantics when decorators are applied to the class, - // the emit needs to follow one of the following rules: + // When we emit an ES6 class that has a class decorator, we must tailor the + // emit to certain specific cases. // - // * For a local class declaration: + // In the simplest case, we emit the class declaration as a let declaration, and + // evaluate decorators after the close of the class body: // - // @dec class C { - // } + // TypeScript | Javascript + // --------------------------------|------------------------------------ + // @dec | let C = class C { + // class C { | } + // } | C = __decorate([dec], C); + // --------------------------------|------------------------------------ + // @dec | export let C = class C { + // export class C { | } + // } | C = __decorate([dec], C); + // --------------------------------------------------------------------- + // [Example 1] // - // The emit should be: + // If a class declaration contains a reference to itself *inside* of the class body, + // this introduces two bindings to the class: One outside of the class body, and one + // inside of the class body. If we apply decorators as in [Example 1] above, there + // is the possibility that the decorator `dec` will return a new value for the + // constructor, which would result in the binding inside of the class no longer + // pointing to the same reference as the binding outside of the class. // - // let C = class { - // }; - // C = __decorate([dec], C); + // As a result, we must instead rewrite all references to the class *inside* of the + // class body to instead point to a local temporary alias for the class: // - // * For an exported class declaration: + // TypeScript | Javascript + // --------------------------------|------------------------------------ + // @dec | let C_1; + // class C { | let C = C_1 = class C { + // static x() { return C.y; } | static x() { return C_1.y; } + // static y = 1; | } + // } | C.y = 1; + // | C = C_1 = __decorate([dec], C); + // --------------------------------|------------------------------------ + // @dec | let C_1; + // export class C { | export let C = C_1 = class C { + // static x() { return C.y; } | static x() { return C_1.y; } + // static y = 1; | } + // } | C.y = 1; + // | C = C_1 = __decorate([dec], C); + // --------------------------------------------------------------------- + // [Example 2] // - // @dec export class C { - // } + // If a class declaration is the default export of a module, we instead emit + // the export after the decorated declaration: // - // The emit should be: + // TypeScript | Javascript + // --------------------------------|------------------------------------ + // @dec | let default_1 = class { + // export default class { | } + // } | default_1 = __decorate([dec], default_1); + // | export default default_1; + // --------------------------------|------------------------------------ + // @dec | let C = class C { + // export default class { | } + // } | C = __decorate([dec], C); + // | export default C; + // --------------------------------------------------------------------- + // [Example 3] // - // export let C = class { - // }; - // C = __decorate([dec], C); + // If the class declaration is the default export and a reference to itself + // inside of the class body, we must emit both an alias for the class *and* + // move the export after the declaration: // - // * For a default export of a class declaration with a name: - // - // @dec default export class C { - // } - // - // The emit should be: - // - // let C = class { - // } - // C = __decorate([dec], C); - // export default C; - // - // * For a default export of a class declaration without a name: - // - // @dec default export class { - // } - // - // The emit should be: - // - // let _default = class { - // } - // _default = __decorate([dec], _default); - // export default _default; + // TypeScript | Javascript + // --------------------------------|------------------------------------ + // @dec | let default_1 = class { + // export default class { | static x() { return default_1.y; } + // static x() { return C.y; } | } + // static y = 1; | default_1.y = 1; + // } | default_1 = __decorate([dec], default_1); + // | export default default_1; + // --------------------------------|------------------------------------ + // @dec | let C_1; + // export default class C { | let C = C_1 = class C { + // static x() { return C.y; } | static x() { return C_1.y; } + // static y = 1; | } + // } | C.y = 1; + // | C = C_1 = __decorate([dec], C); + // | export default C; + // --------------------------------------------------------------------- + // [Example 4] // + + if (resolver.getNodeCheckFlags(node) & NodeCheckFlags.ClassWithBodyScopedClassBinding) { + decoratedClassAlias = unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default")); + decoratedClassAliases[getNodeId(node)] = decoratedClassAlias; + write(`let ${decoratedClassAlias};`); + writeLine(); + } + if (isES6ExportedDeclaration(node) && !(node.flags & NodeFlags.Default)) { write("export "); } write("let "); emitDeclarationName(node); + if (decoratedClassAlias !== undefined) { + write(` = ${decoratedClassAlias}`); + } + write(" = "); } else if (isES6ExportedDeclaration(node)) { @@ -5202,7 +5268,7 @@ const _super = (function (geti, seti) { // emit name if // - node has a name // - this is default export with static initializers - if ((node.name || (node.flags & NodeFlags.Default && (staticProperties.length > 0 || modulekind !== ModuleKind.ES6))) && !thisNodeIsDecorated) { + if (node.name || (node.flags & NodeFlags.Default && (staticProperties.length > 0 || modulekind !== ModuleKind.ES6) && !thisNodeIsDecorated)) { write(" "); emitDeclarationName(node); } @@ -5222,16 +5288,8 @@ const _super = (function (geti, seti) { writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end); - // TODO(rbuckton): Need to go back to `let _a = class C {}` approach, removing the defineProperty call for now. - - // For a decorated class, we need to assign its name (if it has one). This is because we emit - // the class as a class expression to avoid the double-binding of the identifier: - // - // let C = class { - // } - // Object.defineProperty(C, "name", { value: "C", configurable: true }); - // if (thisNodeIsDecorated) { + decoratedClassAliases[getNodeId(node)] = undefined; write(";"); } @@ -5256,7 +5314,7 @@ const _super = (function (geti, seti) { else { writeLine(); emitPropertyDeclarations(node, staticProperties); - emitDecoratorsOfClass(node); + emitDecoratorsOfClass(node, decoratedClassAlias); } if (!(node.flags & NodeFlags.Export)) { @@ -5330,7 +5388,7 @@ const _super = (function (geti, seti) { emitMemberFunctionsForES5AndLower(node); emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true)); writeLine(); - emitDecoratorsOfClass(node); + emitDecoratorsOfClass(node, /*decoratedClassAlias*/ undefined); writeLine(); emitToken(SyntaxKind.CloseBraceToken, node.members.end, () => { write("return "); @@ -5372,13 +5430,13 @@ const _super = (function (geti, seti) { } } - function emitDecoratorsOfClass(node: ClassLikeDeclaration) { + function emitDecoratorsOfClass(node: ClassLikeDeclaration, decoratedClassAlias: string) { emitDecoratorsOfMembers(node, /*staticFlag*/ 0); emitDecoratorsOfMembers(node, NodeFlags.Static); - emitDecoratorsOfConstructor(node); + emitDecoratorsOfConstructor(node, decoratedClassAlias); } - function emitDecoratorsOfConstructor(node: ClassLikeDeclaration) { + function emitDecoratorsOfConstructor(node: ClassLikeDeclaration, decoratedClassAlias: string) { const decorators = node.decorators; const constructor = getFirstConstructorWithBody(node); const firstParameterDecorator = constructor && forEach(constructor.parameters, parameter => parameter.decorators); @@ -5402,6 +5460,10 @@ const _super = (function (geti, seti) { writeLine(); emitStart(node.decorators || firstParameterDecorator); emitDeclarationName(node); + if (decoratedClassAlias !== undefined) { + write(` = ${decoratedClassAlias}`); + } + write(" = __decorate(["); increaseIndent(); writeLine(); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index ef6ae0168b1..cb48d9a3a8a 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2068,8 +2068,10 @@ namespace ts { EnumValuesComputed = 0x00004000, LexicalModuleMergesWithClass = 0x00008000, // Instantiated lexical module declaration is merged with a previous class declaration. LoopWithCapturedBlockScopedBinding = 0x00010000, // Loop that contains block scoped variable captured in closure - CapturedBlockScopedBinding = 0x00020000, // Block-scoped binding that is captured in some function - BlockScopedBindingInLoop = 0x00040000, // Block-scoped binding with declaration nested inside iteration statement + CapturedBlockScopedBinding = 0x00020000, // Block-scoped binding that is captured in some function + BlockScopedBindingInLoop = 0x00040000, // Block-scoped binding with declaration nested inside iteration statement + ClassWithBodyScopedClassBinding = 0x00080000, // Decorated class that contains a binding to itself inside of the class body. + BodyScopedClassBinding = 0x00100000, // Binding to a decorated class inside of the class's body. } /* @internal */ diff --git a/tests/baselines/reference/decoratedClassFromExternalModule.js b/tests/baselines/reference/decoratedClassFromExternalModule.js index 000fe2f37d6..ce397323d9c 100644 --- a/tests/baselines/reference/decoratedClassFromExternalModule.js +++ b/tests/baselines/reference/decoratedClassFromExternalModule.js @@ -17,7 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; function decorate(target) { } -let Decorated = class { +let Decorated = class Decorated { }; Decorated = __decorate([ decorate diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js index dbbe72ba52c..14ede865a2f 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js @@ -23,7 +23,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, define(["require", "exports"], function (require, exports) { "use strict"; var decorator; - let Foo = class { + let Foo = class Foo { }; Foo = __decorate([ decorator diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js index ab518d73cb9..ecc04859234 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js @@ -22,7 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; var decorator; -let Foo = class { +let Foo = class Foo { }; Foo = __decorate([ decorator diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js index ed322374799..eb5d9074651 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js @@ -25,7 +25,7 @@ System.register([], function(exports_1) { return { setters:[], execute: function() { - let Foo = class { + let Foo = class Foo { }; Foo = __decorate([ decorator diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js index f8cb770f1d2..c7b59d01469 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js @@ -30,7 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, })(function (require, exports) { "use strict"; var decorator; - let Foo = class { + let Foo = class Foo { }; Foo = __decorate([ decorator diff --git a/tests/baselines/reference/decoratorOnClass1.es6.js b/tests/baselines/reference/decoratorOnClass1.es6.js new file mode 100644 index 00000000000..7a02b9f5cd8 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass1.es6.js @@ -0,0 +1,22 @@ +//// [decoratorOnClass1.es6.ts] +declare function dec(target: T): T; + +@dec +class C { +} + +let c = new C(); + +//// [decoratorOnClass1.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let C = class C { +}; +C = __decorate([ + dec +], C); +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass1.es6.symbols b/tests/baselines/reference/decoratorOnClass1.es6.symbols new file mode 100644 index 00000000000..aac2535d9cf --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass1.es6.symbols @@ -0,0 +1,19 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass1.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass1.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass1.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass1.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass1.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass1.es6.ts, 0, 0)) + +class C { +>C : Symbol(C, Decl(decoratorOnClass1.es6.ts, 0, 38)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass1.es6.ts, 6, 3)) +>C : Symbol(C, Decl(decoratorOnClass1.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass1.es6.types b/tests/baselines/reference/decoratorOnClass1.es6.types new file mode 100644 index 00000000000..fe7ef79ea62 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass1.es6.types @@ -0,0 +1,20 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +class C { +>C : C +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass2.es6.js b/tests/baselines/reference/decoratorOnClass2.es6.js new file mode 100644 index 00000000000..872f241bc9c --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass2.es6.js @@ -0,0 +1,22 @@ +//// [decoratorOnClass2.es6.ts] +declare function dec(target: T): T; + +@dec +export class C { +} + +let c = new C(); + +//// [decoratorOnClass2.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +export let C = class C { +}; +C = __decorate([ + dec +], C); +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass2.es6.symbols b/tests/baselines/reference/decoratorOnClass2.es6.symbols new file mode 100644 index 00000000000..af0dc7c1fad --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass2.es6.symbols @@ -0,0 +1,19 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass2.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass2.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass2.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass2.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass2.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass2.es6.ts, 0, 0)) + +export class C { +>C : Symbol(C, Decl(decoratorOnClass2.es6.ts, 0, 38)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass2.es6.ts, 6, 3)) +>C : Symbol(C, Decl(decoratorOnClass2.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass2.es6.types b/tests/baselines/reference/decoratorOnClass2.es6.types new file mode 100644 index 00000000000..2845ab1b977 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass2.es6.types @@ -0,0 +1,20 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export class C { +>C : C +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass3.es6.js b/tests/baselines/reference/decoratorOnClass3.es6.js new file mode 100644 index 00000000000..a6b1d6e2589 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass3.es6.js @@ -0,0 +1,23 @@ +//// [decoratorOnClass3.es6.ts] +declare function dec(target: T): T; + +@dec +export default class C { +} + +let c = new C(); + +//// [decoratorOnClass3.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let C = class C { +}; +C = __decorate([ + dec +], C); +export default C; +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass3.es6.symbols b/tests/baselines/reference/decoratorOnClass3.es6.symbols new file mode 100644 index 00000000000..d769d1c97a1 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass3.es6.symbols @@ -0,0 +1,19 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass3.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass3.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass3.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass3.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass3.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass3.es6.ts, 0, 0)) + +export default class C { +>C : Symbol(C, Decl(decoratorOnClass3.es6.ts, 0, 38)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass3.es6.ts, 6, 3)) +>C : Symbol(C, Decl(decoratorOnClass3.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass3.es6.types b/tests/baselines/reference/decoratorOnClass3.es6.types new file mode 100644 index 00000000000..7b19c4bad8e --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass3.es6.types @@ -0,0 +1,20 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export default class C { +>C : C +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass4.es6.js b/tests/baselines/reference/decoratorOnClass4.es6.js new file mode 100644 index 00000000000..0435c822da6 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass4.es6.js @@ -0,0 +1,20 @@ +//// [decoratorOnClass4.es6.ts] +declare function dec(target: T): T; + +@dec +export default class { +} + +//// [decoratorOnClass4.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let default_1 = class { +}; +default_1 = __decorate([ + dec +], default_1); +export default default_1; diff --git a/tests/baselines/reference/decoratorOnClass4.es6.symbols b/tests/baselines/reference/decoratorOnClass4.es6.symbols new file mode 100644 index 00000000000..fff39c72f1c --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass4.es6.symbols @@ -0,0 +1,13 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass4.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass4.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass4.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass4.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass4.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass4.es6.ts, 0, 0)) + +export default class { +} diff --git a/tests/baselines/reference/decoratorOnClass4.es6.types b/tests/baselines/reference/decoratorOnClass4.es6.types new file mode 100644 index 00000000000..7dfce858076 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass4.es6.types @@ -0,0 +1,13 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export default class { +} diff --git a/tests/baselines/reference/decoratorOnClass5.es6.js b/tests/baselines/reference/decoratorOnClass5.es6.js new file mode 100644 index 00000000000..58c5f0d4f29 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass5.es6.js @@ -0,0 +1,27 @@ +//// [decoratorOnClass5.es6.ts] +declare function dec(target: T): T; + +@dec +class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); + +//// [decoratorOnClass5.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let C_1; +let C = C_1 = class C { + static x() { return C_1.y; } +}; +C.y = 1; +C = C_1 = __decorate([ + dec +], C); +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass5.es6.symbols b/tests/baselines/reference/decoratorOnClass5.es6.symbols new file mode 100644 index 00000000000..aa62a593019 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass5.es6.symbols @@ -0,0 +1,28 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass5.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass5.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass5.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass5.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass5.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass5.es6.ts, 0, 0)) + +class C { +>C : Symbol(C, Decl(decoratorOnClass5.es6.ts, 0, 38)) + + static x() { return C.y; } +>x : Symbol(C.x, Decl(decoratorOnClass5.es6.ts, 3, 9)) +>C.y : Symbol(C.y, Decl(decoratorOnClass5.es6.ts, 4, 30)) +>C : Symbol(C, Decl(decoratorOnClass5.es6.ts, 0, 38)) +>y : Symbol(C.y, Decl(decoratorOnClass5.es6.ts, 4, 30)) + + static y = 1; +>y : Symbol(C.y, Decl(decoratorOnClass5.es6.ts, 4, 30)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass5.es6.ts, 8, 3)) +>C : Symbol(C, Decl(decoratorOnClass5.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass5.es6.types b/tests/baselines/reference/decoratorOnClass5.es6.types new file mode 100644 index 00000000000..5532c50fe52 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass5.es6.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +class C { +>C : C + + static x() { return C.y; } +>x : () => number +>C.y : number +>C : typeof C +>y : number + + static y = 1; +>y : number +>1 : number +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js new file mode 100644 index 00000000000..03b8ace2b5b --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass6.es6.js @@ -0,0 +1,27 @@ +//// [decoratorOnClass6.es6.ts] +declare function dec(target: T): T; + +@dec +export class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); + +//// [decoratorOnClass6.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let C_1; +export let C = C_1 = class C { + static x() { return C_1.y; } +}; +C.y = 1; +C = C_1 = __decorate([ + dec +], C); +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass6.es6.symbols b/tests/baselines/reference/decoratorOnClass6.es6.symbols new file mode 100644 index 00000000000..f778128e40b --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass6.es6.symbols @@ -0,0 +1,28 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass6.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass6.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass6.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass6.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass6.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass6.es6.ts, 0, 0)) + +export class C { +>C : Symbol(C, Decl(decoratorOnClass6.es6.ts, 0, 38)) + + static x() { return C.y; } +>x : Symbol(C.x, Decl(decoratorOnClass6.es6.ts, 3, 16)) +>C.y : Symbol(C.y, Decl(decoratorOnClass6.es6.ts, 4, 30)) +>C : Symbol(C, Decl(decoratorOnClass6.es6.ts, 0, 38)) +>y : Symbol(C.y, Decl(decoratorOnClass6.es6.ts, 4, 30)) + + static y = 1; +>y : Symbol(C.y, Decl(decoratorOnClass6.es6.ts, 4, 30)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass6.es6.ts, 8, 3)) +>C : Symbol(C, Decl(decoratorOnClass6.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass6.es6.types b/tests/baselines/reference/decoratorOnClass6.es6.types new file mode 100644 index 00000000000..0b335558400 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass6.es6.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export class C { +>C : C + + static x() { return C.y; } +>x : () => number +>C.y : number +>C : typeof C +>y : number + + static y = 1; +>y : number +>1 : number +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass7.es6.js b/tests/baselines/reference/decoratorOnClass7.es6.js new file mode 100644 index 00000000000..3ffd0f1574f --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass7.es6.js @@ -0,0 +1,28 @@ +//// [decoratorOnClass7.es6.ts] +declare function dec(target: T): T; + +@dec +export default class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); + +//// [decoratorOnClass7.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let C_1; +let C = C_1 = class C { + static x() { return C_1.y; } +}; +C.y = 1; +C = C_1 = __decorate([ + dec +], C); +export default C; +let c = new C(); diff --git a/tests/baselines/reference/decoratorOnClass7.es6.symbols b/tests/baselines/reference/decoratorOnClass7.es6.symbols new file mode 100644 index 00000000000..d010757a9df --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass7.es6.symbols @@ -0,0 +1,28 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass7.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass7.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass7.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass7.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass7.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass7.es6.ts, 0, 0)) + +export default class C { +>C : Symbol(C, Decl(decoratorOnClass7.es6.ts, 0, 38)) + + static x() { return C.y; } +>x : Symbol(C.x, Decl(decoratorOnClass7.es6.ts, 3, 24)) +>C.y : Symbol(C.y, Decl(decoratorOnClass7.es6.ts, 4, 30)) +>C : Symbol(C, Decl(decoratorOnClass7.es6.ts, 0, 38)) +>y : Symbol(C.y, Decl(decoratorOnClass7.es6.ts, 4, 30)) + + static y = 1; +>y : Symbol(C.y, Decl(decoratorOnClass7.es6.ts, 4, 30)) +} + +let c = new C(); +>c : Symbol(c, Decl(decoratorOnClass7.es6.ts, 8, 3)) +>C : Symbol(C, Decl(decoratorOnClass7.es6.ts, 0, 38)) + diff --git a/tests/baselines/reference/decoratorOnClass7.es6.types b/tests/baselines/reference/decoratorOnClass7.es6.types new file mode 100644 index 00000000000..af7ae0516e3 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass7.es6.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export default class C { +>C : C + + static x() { return C.y; } +>x : () => number +>C.y : number +>C : typeof C +>y : number + + static y = 1; +>y : number +>1 : number +} + +let c = new C(); +>c : C +>new C() : C +>C : typeof C + diff --git a/tests/baselines/reference/decoratorOnClass8.es6.js b/tests/baselines/reference/decoratorOnClass8.es6.js new file mode 100644 index 00000000000..7104098a5f5 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass8.es6.js @@ -0,0 +1,22 @@ +//// [decoratorOnClass8.es6.ts] +declare function dec(target: T): T; + +@dec +export default class { + static y = 1; +} + +//// [decoratorOnClass8.es6.js] +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +let default_1 = class { +}; +default_1.y = 1; +default_1 = __decorate([ + dec +], default_1); +export default default_1; diff --git a/tests/baselines/reference/decoratorOnClass8.es6.symbols b/tests/baselines/reference/decoratorOnClass8.es6.symbols new file mode 100644 index 00000000000..b219f50ff3d --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass8.es6.symbols @@ -0,0 +1,15 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts === +declare function dec(target: T): T; +>dec : Symbol(dec, Decl(decoratorOnClass8.es6.ts, 0, 0)) +>T : Symbol(T, Decl(decoratorOnClass8.es6.ts, 0, 21)) +>target : Symbol(target, Decl(decoratorOnClass8.es6.ts, 0, 24)) +>T : Symbol(T, Decl(decoratorOnClass8.es6.ts, 0, 21)) +>T : Symbol(T, Decl(decoratorOnClass8.es6.ts, 0, 21)) + +@dec +>dec : Symbol(dec, Decl(decoratorOnClass8.es6.ts, 0, 0)) + +export default class { + static y = 1; +>y : Symbol(default.y, Decl(decoratorOnClass8.es6.ts, 3, 22)) +} diff --git a/tests/baselines/reference/decoratorOnClass8.es6.types b/tests/baselines/reference/decoratorOnClass8.es6.types new file mode 100644 index 00000000000..045b036e335 --- /dev/null +++ b/tests/baselines/reference/decoratorOnClass8.es6.types @@ -0,0 +1,16 @@ +=== tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts === +declare function dec(target: T): T; +>dec : (target: T) => T +>T : T +>target : T +>T : T +>T : T + +@dec +>dec : (target: T) => T + +export default class { + static y = 1; +>y : number +>1 : number +} diff --git a/tests/baselines/reference/generatorTypeCheck39.js b/tests/baselines/reference/generatorTypeCheck39.js index 43df3b8e205..1e0009d24ed 100644 --- a/tests/baselines/reference/generatorTypeCheck39.js +++ b/tests/baselines/reference/generatorTypeCheck39.js @@ -20,7 +20,7 @@ function decorator(x) { return y => { }; } function* g() { - let C = class { + let C = class C { constructor() { this.x = yield 0; } diff --git a/tests/baselines/reference/generatorTypeCheck61.js b/tests/baselines/reference/generatorTypeCheck61.js index b2434ee590c..9cc157f2684 100644 --- a/tests/baselines/reference/generatorTypeCheck61.js +++ b/tests/baselines/reference/generatorTypeCheck61.js @@ -12,7 +12,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, return c > 3 && r && Object.defineProperty(target, key, r), r; }; function* g() { - let C = class { + let C = class C { }; C = __decorate([ (yield 0) diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts new file mode 100644 index 00000000000..7dccedc5d1f --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass1.es6.ts @@ -0,0 +1,9 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +class C { +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts new file mode 100644 index 00000000000..62d6a15d0bc --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass2.es6.ts @@ -0,0 +1,9 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export class C { +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts new file mode 100644 index 00000000000..cc62befe2d8 --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass3.es6.ts @@ -0,0 +1,9 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export default class C { +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts new file mode 100644 index 00000000000..050c8ae15fc --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass4.es6.ts @@ -0,0 +1,7 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export default class { +} \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts new file mode 100644 index 00000000000..daa21330c2b --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass5.es6.ts @@ -0,0 +1,11 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts new file mode 100644 index 00000000000..b28f8918495 --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass6.es6.ts @@ -0,0 +1,11 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts new file mode 100644 index 00000000000..a69b7556d97 --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass7.es6.ts @@ -0,0 +1,11 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export default class C { + static x() { return C.y; } + static y = 1; +} + +let c = new C(); \ No newline at end of file diff --git a/tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts b/tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts new file mode 100644 index 00000000000..2e85fc801f2 --- /dev/null +++ b/tests/cases/conformance/es6/decorators/class/decoratorOnClass8.es6.ts @@ -0,0 +1,8 @@ +// @target:es6 +// @experimentaldecorators: true +declare function dec(target: T): T; + +@dec +export default class { + static y = 1; +} \ No newline at end of file From 098d59c954d3ba4c48abaae5708a85246cc264e0 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 27 Jan 2016 16:33:45 -0800 Subject: [PATCH 103/160] Cleaned up variable names and conditions in checkIdentifier --- src/compiler/checker.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 2494d0db260..11f550bad5b 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7192,19 +7192,18 @@ namespace ts { markAliasSymbolAsReferenced(symbol); } - const localSymbol = getExportSymbolOfValueSymbolIfExported(symbol); + const localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol); // Due to the emit for class decorators, any reference to the class from inside of the class body // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind // behavior of class names in ES6. if (languageVersion === ScriptTarget.ES6 - && localSymbol - && localSymbol.valueDeclaration - && localSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration - && nodeIsDecorated(localSymbol.valueDeclaration)) { + && localOrExportSymbol.flags & SymbolFlags.Class + && localOrExportSymbol.valueDeclaration.kind === SyntaxKind.ClassDeclaration + && nodeIsDecorated(localOrExportSymbol.valueDeclaration)) { let container = getContainingClass(node); while (container !== undefined) { - if (container === localSymbol.valueDeclaration && container.name !== node) { + if (container === localOrExportSymbol.valueDeclaration && container.name !== node) { getNodeLinks(container).flags |= NodeCheckFlags.ClassWithBodyScopedClassBinding; getNodeLinks(node).flags |= NodeCheckFlags.BodyScopedClassBinding; break; @@ -7218,7 +7217,7 @@ namespace ts { checkCollisionWithCapturedThisVariable(node, node); checkNestedBlockScopedBinding(node, symbol); - return getNarrowedTypeOfSymbol(localSymbol, node); + return getNarrowedTypeOfSymbol(localOrExportSymbol, node); } function isInsideFunction(node: Node, threshold: Node): boolean { From c353252c8e7d914dbf23539633f07951213a1026 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Wed, 27 Jan 2016 19:51:43 -0800 Subject: [PATCH 104/160] Update authors for release 1.8 --- AUTHORS.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/AUTHORS.md b/AUTHORS.md index 486a15bf47f..0501514d758 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -2,9 +2,11 @@ TypeScript is authored by: * Adam Freidin * Ahmad Farid +* Akshar Patel * Anders Hejlsberg * Arnav Singh * Arthur Ozga +* Asad Saeeduddin * Basarat Ali Syed * Ben Duffield * Bill Ticehurst @@ -15,30 +17,39 @@ TypeScript is authored by: * Colby Russell * Colin Snover * Cyrus Najmabadi +* Dan Corder * Dan Quirk * Daniel Rosenwasser +* @dashaus * David Li * Denis Nedelyaev * Dick van den Brink * Dirk Bäumer +* Dirk Holtwick * Eyas Sharaiha +* @falsandtru * Frank Wallis * Gabriel Isenberg * Gilad Peleg * Graeme Wicksted * Guillaume Salles +* Guy Bedford * Harald Niesche +* Iain Monro * Ingvar Stepanyan * Ivo Gabe de Wolff * James Whitney * Jason Freeman +* Jason Killian * Jason Ramsay * Jed Mao +* Jeffrey Morlan * Johannes Rieken * John Vilk * Jonathan Bond-Caron * Jonathan Park * Jonathan Turner +* Jonathon Smith * Josh Kalderimis * Julian Williams * Kagami Sascha Rosylight @@ -46,21 +57,27 @@ TypeScript is authored by: * Ken Howard * Kenji Imamula * Lorant Pinter +* Lucien Greathouse * Martin Všetička * Masahiro Wakame +* Mattias Buelens * Max Deepfield * Micah Zoltu * Mohamed Hegazy * Nathan Shively-Sanders +* Nathan Yee * Oleg Mihailik * Oleksandr Chekhovskyi * Paul van Brenk +* @pcbro * Pedro Maltez * Philip Bulley * piloopin * @progre * Punya Biswal +* Richard Sentino * Ron Buckton +* Rowan Wyborn * Ryan Cavanaugh * Ryohei Ikegami * Sébastien Arod @@ -71,7 +88,9 @@ TypeScript is authored by: * Solal Pirelli * Stan Thomas * Steve Lucco +* Thomas Loubiou * Tien Hoanhtien +* Tim Perry * Tingan Ho * togru * Tomas Grubliauskas @@ -81,5 +100,6 @@ TypeScript is authored by: * Wesley Wigham * York Yao * Yui Tanglertsampan +* Yuichi Nukiyama * Zev Spitz * Zhengbo Li From 301901709336b23ee3a4762855cd516a7229b6d6 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 28 Jan 2016 10:39:54 -0800 Subject: [PATCH 105/160] Emit readonly in declaration files --- src/compiler/declarationEmitter.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 9a57b4b1a37..7a8db9f90ed 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -648,6 +648,9 @@ namespace ts { if (node.flags & NodeFlags.Static) { write("static "); } + if (node.flags & NodeFlags.Readonly) { + write("readonly "); + } if (node.flags & NodeFlags.Abstract) { write("abstract "); } @@ -1342,15 +1345,17 @@ namespace ts { const prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; - // Construct signature or constructor type write new Signature - if (node.kind === SyntaxKind.ConstructSignature || node.kind === SyntaxKind.ConstructorType) { - write("new "); - } - emitTypeParameters(node.typeParameters); if (node.kind === SyntaxKind.IndexSignature) { + // Index signature can have readonly modifier + emitClassMemberDeclarationFlags(node); write("["); } else { + // Construct signature or constructor type write new Signature + if (node.kind === SyntaxKind.ConstructSignature || node.kind === SyntaxKind.ConstructorType) { + write("new "); + } + emitTypeParameters(node.typeParameters); write("("); } From 371811ab5b795ce0abb2a0c81e96098c09768652 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 28 Jan 2016 10:40:08 -0800 Subject: [PATCH 106/160] Adding test --- .../reference/readonlyInDeclarationFile.js | 83 +++++++++++++++++++ .../readonlyInDeclarationFile.symbols | 76 +++++++++++++++++ .../reference/readonlyInDeclarationFile.types | 83 +++++++++++++++++++ .../compiler/readonlyInDeclarationFile.ts | 36 ++++++++ 4 files changed, 278 insertions(+) create mode 100644 tests/baselines/reference/readonlyInDeclarationFile.js create mode 100644 tests/baselines/reference/readonlyInDeclarationFile.symbols create mode 100644 tests/baselines/reference/readonlyInDeclarationFile.types create mode 100644 tests/cases/compiler/readonlyInDeclarationFile.ts diff --git a/tests/baselines/reference/readonlyInDeclarationFile.js b/tests/baselines/reference/readonlyInDeclarationFile.js new file mode 100644 index 00000000000..d2a20280e0f --- /dev/null +++ b/tests/baselines/reference/readonlyInDeclarationFile.js @@ -0,0 +1,83 @@ +//// [readonlyInDeclarationFile.ts] + +interface Foo { + readonly x: number; + readonly [x: string]: Object; +} + +class C { + protected readonly y: number; + readonly [x: string]: Object; + private static readonly a = "foo"; + protected static readonly b = "foo"; + public static readonly c = "foo"; +} + +var z: { + readonly a: string; + readonly [x: string]: Object; +} + +function f() { + return { + get x() { return 1; }, + get y() { return 1; }, + set y(value) { } + } +} + +function g() { + var x: { + readonly a: string; + readonly [x: string]: Object; + } + return x; +} + +//// [readonlyInDeclarationFile.js] +var C = (function () { + function C() { + } + C.a = "foo"; + C.b = "foo"; + C.c = "foo"; + return C; +}()); +var z; +function f() { + return { + get x() { return 1; }, + get y() { return 1; }, + set y(value) { } + }; +} +function g() { + var x; + return x; +} + + +//// [readonlyInDeclarationFile.d.ts] +interface Foo { + readonly x: number; + readonly [x: string]: Object; +} +declare class C { + protected readonly y: number; + readonly [x: string]: Object; + private static readonly a; + protected static readonly b: string; + static readonly c: string; +} +declare var z: { + readonly a: string; + readonly [x: string]: Object; +}; +declare function f(): { + readonly x: number; + y: number; +}; +declare function g(): { + readonly [x: string]: Object; + readonly a: string; +}; diff --git a/tests/baselines/reference/readonlyInDeclarationFile.symbols b/tests/baselines/reference/readonlyInDeclarationFile.symbols new file mode 100644 index 00000000000..f7bbf19a0ae --- /dev/null +++ b/tests/baselines/reference/readonlyInDeclarationFile.symbols @@ -0,0 +1,76 @@ +=== tests/cases/compiler/readonlyInDeclarationFile.ts === + +interface Foo { +>Foo : Symbol(Foo, Decl(readonlyInDeclarationFile.ts, 0, 0)) + + readonly x: number; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 1, 15)) + + readonly [x: string]: Object; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 3, 14)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} + +class C { +>C : Symbol(C, Decl(readonlyInDeclarationFile.ts, 4, 1)) + + protected readonly y: number; +>y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 6, 9)) + + readonly [x: string]: Object; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 8, 14)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + private static readonly a = "foo"; +>a : Symbol(C.a, Decl(readonlyInDeclarationFile.ts, 8, 33)) + + protected static readonly b = "foo"; +>b : Symbol(C.b, Decl(readonlyInDeclarationFile.ts, 9, 38)) + + public static readonly c = "foo"; +>c : Symbol(C.c, Decl(readonlyInDeclarationFile.ts, 10, 40)) +} + +var z: { +>z : Symbol(z, Decl(readonlyInDeclarationFile.ts, 14, 3)) + + readonly a: string; +>a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 14, 8)) + + readonly [x: string]: Object; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 16, 14)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +} + +function f() { +>f : Symbol(f, Decl(readonlyInDeclarationFile.ts, 17, 1)) + + return { + get x() { return 1; }, +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 20, 12)) + + get y() { return 1; }, +>y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 21, 30), Decl(readonlyInDeclarationFile.ts, 22, 30)) + + set y(value) { } +>y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 21, 30), Decl(readonlyInDeclarationFile.ts, 22, 30)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 23, 14)) + } +} + +function g() { +>g : Symbol(g, Decl(readonlyInDeclarationFile.ts, 25, 1)) + + var x: { +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 28, 7)) + + readonly a: string; +>a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 28, 12)) + + readonly [x: string]: Object; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 30, 18)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + } + return x; +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 28, 7)) +} diff --git a/tests/baselines/reference/readonlyInDeclarationFile.types b/tests/baselines/reference/readonlyInDeclarationFile.types new file mode 100644 index 00000000000..9b2f9d51d99 --- /dev/null +++ b/tests/baselines/reference/readonlyInDeclarationFile.types @@ -0,0 +1,83 @@ +=== tests/cases/compiler/readonlyInDeclarationFile.ts === + +interface Foo { +>Foo : Foo + + readonly x: number; +>x : number + + readonly [x: string]: Object; +>x : string +>Object : Object +} + +class C { +>C : C + + protected readonly y: number; +>y : number + + readonly [x: string]: Object; +>x : string +>Object : Object + + private static readonly a = "foo"; +>a : string +>"foo" : string + + protected static readonly b = "foo"; +>b : string +>"foo" : string + + public static readonly c = "foo"; +>c : string +>"foo" : string +} + +var z: { +>z : { readonly [x: string]: Object; readonly a: string; } + + readonly a: string; +>a : string + + readonly [x: string]: Object; +>x : string +>Object : Object +} + +function f() { +>f : () => { readonly x: number; y: number; } + + return { +>{ get x() { return 1; }, get y() { return 1; }, set y(value) { } } : { readonly x: number; y: number; } + + get x() { return 1; }, +>x : number +>1 : number + + get y() { return 1; }, +>y : number +>1 : number + + set y(value) { } +>y : number +>value : number + } +} + +function g() { +>g : () => { readonly [x: string]: Object; readonly a: string; } + + var x: { +>x : { readonly [x: string]: Object; readonly a: string; } + + readonly a: string; +>a : string + + readonly [x: string]: Object; +>x : string +>Object : Object + } + return x; +>x : { readonly [x: string]: Object; readonly a: string; } +} diff --git a/tests/cases/compiler/readonlyInDeclarationFile.ts b/tests/cases/compiler/readonlyInDeclarationFile.ts new file mode 100644 index 00000000000..99241b8c0c0 --- /dev/null +++ b/tests/cases/compiler/readonlyInDeclarationFile.ts @@ -0,0 +1,36 @@ +// @target: es5 +// @declaration: true + +interface Foo { + readonly x: number; + readonly [x: string]: Object; +} + +class C { + protected readonly y: number; + readonly [x: string]: Object; + private static readonly a = "foo"; + protected static readonly b = "foo"; + public static readonly c = "foo"; +} + +var z: { + readonly a: string; + readonly [x: string]: Object; +} + +function f() { + return { + get x() { return 1; }, + get y() { return 1; }, + set y(value) { } + } +} + +function g() { + var x: { + readonly a: string; + readonly [x: string]: Object; + } + return x; +} \ No newline at end of file From 364b08854bc1face5c9b38301bb83c7346f1ccce Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 11:02:49 -0800 Subject: [PATCH 107/160] Recognize the RHS of assignments as the JSDoc target expression Fixes #6552 --- src/compiler/parser.ts | 6 +++--- src/compiler/utilities.ts | 14 ++++++++++++- .../fourslash/getJavaScriptCompletions18.ts | 21 +++++++++++++++++++ 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 tests/cases/fourslash/getJavaScriptCompletions18.ts diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 57bd9860d12..7806df795d2 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -4051,7 +4051,7 @@ namespace ts { setDecoratorContext(/*val*/ true); } - return finishNode(node); + return addJSDocComment(finishNode(node)); } function parseOptionalIdentifier() { @@ -4335,13 +4335,13 @@ namespace ts { const labeledStatement = createNode(SyntaxKind.LabeledStatement, fullStart); labeledStatement.label = expression; labeledStatement.statement = parseStatement(); - return finishNode(labeledStatement); + return addJSDocComment(finishNode(labeledStatement)); } else { const expressionStatement = createNode(SyntaxKind.ExpressionStatement, fullStart); expressionStatement.expression = expression; parseSemicolon(); - return finishNode(expressionStatement); + return addJSDocComment(finishNode(expressionStatement)); } } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 4bf1422e888..0856cb55477 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1186,7 +1186,19 @@ namespace ts { node.parent.parent.parent.kind === SyntaxKind.VariableStatement; const variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined; - return variableStatementNode && variableStatementNode.jsDocComment; + if (variableStatementNode) { + return variableStatementNode.jsDocComment; + } + + // Also recognize when the node is the RHS of an assignment expression + const isSourceOfAssignmentExpressionStatement = + node.parent && node.parent.parent && + node.parent.kind === SyntaxKind.BinaryExpression && + (node.parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken && + node.parent.parent.kind === SyntaxKind.ExpressionStatement; + if (isSourceOfAssignmentExpressionStatement) { + return node.parent.parent.jsDocComment; + } } return undefined; diff --git a/tests/cases/fourslash/getJavaScriptCompletions18.ts b/tests/cases/fourslash/getJavaScriptCompletions18.ts new file mode 100644 index 00000000000..a30d4943f4f --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptCompletions18.ts @@ -0,0 +1,21 @@ +/// + +// @allowNonTsExtensions: true +// @Filename: file.js +//// /** +//// * @param {number} a +//// * @param {string} b +//// */ +//// exports.foo = function(a, b) { +//// a/*a*/; +//// b/*b*/ +//// }; + +goTo.marker('a'); +edit.insert('.'); +verify.completionListContains('toFixed', undefined, undefined, 'method'); + + +goTo.marker('b'); +edit.insert('.'); +verify.completionListContains('substr', undefined, undefined, 'method'); From bf897c29393e7e7ee92a71e123e502ca3d0ba12f Mon Sep 17 00:00:00 2001 From: zhengbli Date: Thu, 28 Jan 2016 11:26:32 -0800 Subject: [PATCH 108/160] Add more tests and comments --- src/compiler/checker.ts | 2 ++ tests/cases/fourslash/renameCrossJsTs01.ts | 12 ++++++++++++ tests/cases/fourslash/renameCrossJsTs02.ts | 12 ++++++++++++ .../{renameJsExports.ts => renameJsExports01.ts} | 2 +- tests/cases/fourslash/renameJsExports02.ts | 12 ++++++++++++ ...ypeProperty.ts => renameJsPrototypeProperty01.ts} | 2 +- tests/cases/fourslash/renameJsPrototypeProperty02.ts | 12 ++++++++++++ ...meJsThisProperty.ts => renameJsThisProperty01.ts} | 2 +- tests/cases/fourslash/renameJsThisProperty02.ts | 12 ++++++++++++ 9 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 tests/cases/fourslash/renameCrossJsTs01.ts create mode 100644 tests/cases/fourslash/renameCrossJsTs02.ts rename tests/cases/fourslash/{renameJsExports.ts => renameJsExports01.ts} (72%) create mode 100644 tests/cases/fourslash/renameJsExports02.ts rename tests/cases/fourslash/{renameJsPrototypeProperty.ts => renameJsPrototypeProperty01.ts} (69%) create mode 100644 tests/cases/fourslash/renameJsPrototypeProperty02.ts rename tests/cases/fourslash/{renameJsThisProperty.ts => renameJsThisProperty01.ts} (68%) create mode 100644 tests/cases/fourslash/renameJsThisProperty02.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b3792a97988..758c5bbb4ad 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -15367,6 +15367,8 @@ namespace ts { case SpecialPropertyAssignmentKind.ThisProperty: case SpecialPropertyAssignmentKind.ModuleExports: return getSymbolOfNode(entityName.parent.parent); + default: + // Fall through if it is not a special property assignment } } diff --git a/tests/cases/fourslash/renameCrossJsTs01.ts b/tests/cases/fourslash/renameCrossJsTs01.ts new file mode 100644 index 00000000000..52cb4c587d1 --- /dev/null +++ b/tests/cases/fourslash/renameCrossJsTs01.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////exports.[|area|] = function (r) { return r * r; } + +// @Filename: b.ts +////import { [|area|] } from './a'; +////var t = /**/[|area|](10); + +goTo.marker(); +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameCrossJsTs02.ts b/tests/cases/fourslash/renameCrossJsTs02.ts new file mode 100644 index 00000000000..7ff1ae96ff3 --- /dev/null +++ b/tests/cases/fourslash/renameCrossJsTs02.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////exports./**/[|area|] = function (r) { return r * r; } + +// @Filename: b.ts +////import { [|area|] } from './a'; +////var t = [|area|](10); + +goTo.marker(); +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsExports.ts b/tests/cases/fourslash/renameJsExports01.ts similarity index 72% rename from tests/cases/fourslash/renameJsExports.ts rename to tests/cases/fourslash/renameJsExports01.ts index 227eebe4a0d..923d30eedf9 100644 --- a/tests/cases/fourslash/renameJsExports.ts +++ b/tests/cases/fourslash/renameJsExports01.ts @@ -9,4 +9,4 @@ ////var t = mod./**/[|area|](10); goTo.marker(); -verify.renameLocations(false, false); \ No newline at end of file +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsExports02.ts b/tests/cases/fourslash/renameJsExports02.ts new file mode 100644 index 00000000000..86b0471dc1f --- /dev/null +++ b/tests/cases/fourslash/renameJsExports02.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////exports./**/[|area|] = function (r) { return r * r; } + +// @Filename: b.js +////var mod = require('./a'); +////var t = mod.[|area|](10); + +goTo.marker(); +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsPrototypeProperty.ts b/tests/cases/fourslash/renameJsPrototypeProperty01.ts similarity index 69% rename from tests/cases/fourslash/renameJsPrototypeProperty.ts rename to tests/cases/fourslash/renameJsPrototypeProperty01.ts index 651514859cc..f756f57edbf 100644 --- a/tests/cases/fourslash/renameJsPrototypeProperty.ts +++ b/tests/cases/fourslash/renameJsPrototypeProperty01.ts @@ -9,4 +9,4 @@ ////t./**/[|x|] = 11; goTo.marker(); -verify.renameLocations(false, false); \ No newline at end of file +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsPrototypeProperty02.ts b/tests/cases/fourslash/renameJsPrototypeProperty02.ts new file mode 100644 index 00000000000..721dc312eb6 --- /dev/null +++ b/tests/cases/fourslash/renameJsPrototypeProperty02.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////function bar() { +////} +////bar.prototype./**/[|x|] = 10; +////var t = new bar(); +////t.[|x|] = 11; + +goTo.marker(); +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsThisProperty.ts b/tests/cases/fourslash/renameJsThisProperty01.ts similarity index 68% rename from tests/cases/fourslash/renameJsThisProperty.ts rename to tests/cases/fourslash/renameJsThisProperty01.ts index aed59d298b1..91338e0431d 100644 --- a/tests/cases/fourslash/renameJsThisProperty.ts +++ b/tests/cases/fourslash/renameJsThisProperty01.ts @@ -9,4 +9,4 @@ ////t./**/[|x|] = 11; goTo.marker(); -verify.renameLocations(false, false); \ No newline at end of file +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file diff --git a/tests/cases/fourslash/renameJsThisProperty02.ts b/tests/cases/fourslash/renameJsThisProperty02.ts new file mode 100644 index 00000000000..8398507c9ca --- /dev/null +++ b/tests/cases/fourslash/renameJsThisProperty02.ts @@ -0,0 +1,12 @@ +/// + +// @allowJs: true +// @Filename: a.js +////function bar() { +//// this./**/[|x|] = 10; +////} +////var t = new bar(); +////t.[|x|] = 11; + +goTo.marker(); +verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false); \ No newline at end of file From da6e82f639a7cc96887fde34391a9c8c654fa301 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 11:39:19 -0800 Subject: [PATCH 109/160] Use union types in the return type of functions in the error case Fixes #6663 --- src/compiler/checker.ts | 3 ++- .../fourslash/getJavaScriptCompletions19.ts | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/getJavaScriptCompletions19.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 61c05d7688c..55587ca683c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10390,7 +10390,8 @@ namespace ts { } else { error(func, Diagnostics.No_best_common_type_exists_among_return_expressions); - return unknownType; + // Defer to unioning the return types so we get a) downstream errors earlier and b) better Salsa experience + return getUnionType(types); } } diff --git a/tests/cases/fourslash/getJavaScriptCompletions19.ts b/tests/cases/fourslash/getJavaScriptCompletions19.ts new file mode 100644 index 00000000000..5a361930e86 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptCompletions19.ts @@ -0,0 +1,25 @@ +/// + +// @allowNonTsExtensions: true +// @Filename: file.js +//// function fn() { +//// if (foo) { +//// return 0; +//// } else { +//// return '0'; +//// } +//// } +//// let x = fn(); +//// if(typeof x === 'string') { +//// x/*str*/ +//// } else { +//// x/*num*/ +//// } + +goTo.marker('str'); +edit.insert('.'); +verify.completionListContains('substr', undefined, undefined, 'method'); + +goTo.marker('num'); +edit.insert('.'); +verify.completionListContains('toFixed', undefined, undefined, 'method'); From a88ff9c2ad9a2476ede5148b67b20d70684e3af8 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 28 Jan 2016 13:28:49 -0800 Subject: [PATCH 110/160] Emit readonly in declaration file for get-only accessors in classes --- src/compiler/declarationEmitter.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index 7a8db9f90ed..ab0b16947fc 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -637,21 +637,21 @@ namespace ts { } } - function emitClassMemberDeclarationFlags(node: Declaration) { - if (node.flags & NodeFlags.Private) { + function emitClassMemberDeclarationFlags(flags: NodeFlags) { + if (flags & NodeFlags.Private) { write("private "); } - else if (node.flags & NodeFlags.Protected) { + else if (flags & NodeFlags.Protected) { write("protected "); } - if (node.flags & NodeFlags.Static) { + if (flags & NodeFlags.Static) { write("static "); } - if (node.flags & NodeFlags.Readonly) { + if (flags & NodeFlags.Readonly) { write("readonly "); } - if (node.flags & NodeFlags.Abstract) { + if (flags & NodeFlags.Abstract) { write("abstract "); } } @@ -1077,7 +1077,7 @@ namespace ts { } emitJsDocComments(node); - emitClassMemberDeclarationFlags(node); + emitClassMemberDeclarationFlags(node.flags); emitVariableDeclaration(node); write(";"); writeLine(); @@ -1230,7 +1230,7 @@ namespace ts { if (node === accessors.firstAccessor) { emitJsDocComments(accessors.getAccessor); emitJsDocComments(accessors.setAccessor); - emitClassMemberDeclarationFlags(node); + emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : NodeFlags.Readonly)); writeTextOfNode(currentText, node.name); if (!(node.flags & NodeFlags.Private)) { accessorWithTypeAnnotation = node; @@ -1317,7 +1317,7 @@ namespace ts { emitModuleElementDeclarationFlags(node); } else if (node.kind === SyntaxKind.MethodDeclaration) { - emitClassMemberDeclarationFlags(node); + emitClassMemberDeclarationFlags(node.flags); } if (node.kind === SyntaxKind.FunctionDeclaration) { write("function "); @@ -1347,7 +1347,7 @@ namespace ts { if (node.kind === SyntaxKind.IndexSignature) { // Index signature can have readonly modifier - emitClassMemberDeclarationFlags(node); + emitClassMemberDeclarationFlags(node.flags); write("["); } else { From 898797fceef1b9a5653c01091ee3647faad53977 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 28 Jan 2016 13:29:20 -0800 Subject: [PATCH 111/160] Adding more test cases --- .../compiler/readonlyInDeclarationFile.ts | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/tests/cases/compiler/readonlyInDeclarationFile.ts b/tests/cases/compiler/readonlyInDeclarationFile.ts index 99241b8c0c0..03e643782f0 100644 --- a/tests/cases/compiler/readonlyInDeclarationFile.ts +++ b/tests/cases/compiler/readonlyInDeclarationFile.ts @@ -7,11 +7,31 @@ interface Foo { } class C { - protected readonly y: number; readonly [x: string]: Object; - private static readonly a = "foo"; - protected static readonly b = "foo"; - public static readonly c = "foo"; + private readonly a1: number; + protected readonly a2: number; + public readonly a3: number; + private get b1() { return 1 } + protected get b2() { return 1 } + public get b3() { return 1 } + private get c1() { return 1 } + private set c1(value) { } + protected get c2() { return 1 } + protected set c2(value) { } + public get c3() { return 1 } + public set c3(value) { } + private static readonly s1: number; + protected static readonly s2: number; + public static readonly s3: number; + private static get t1() { return 1 } + protected static get t2() { return 1 } + public static get t3() { return 1 } + private static get u1() { return 1 } + private static set u1(value) { } + protected static get u2() { return 1 } + protected static set u2(value) { } + public static get u3() { return 1 } + public static set u3(value) { } } var z: { From c00d239c00e3785f5cd1ac3f75b26242ff3e60ba Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Thu, 28 Jan 2016 13:29:58 -0800 Subject: [PATCH 112/160] Accepting new baselines --- tests/baselines/reference/classdecl.js | 4 +- .../reference/commentsClassMembers.js | 4 +- .../reference/commentsInheritance.js | 12 +- .../baselines/reference/declFileAccessors.js | 4 +- .../reference/declFilePrivateStatic.js | 4 +- .../declarationEmit_protectedMembers.js | 4 +- tests/baselines/reference/giant.js | 24 ++-- .../isDeclarationVisibleNodeKinds.js | 2 +- tests/baselines/reference/moduledecl.js | 4 +- .../reference/readonlyInDeclarationFile.js | 119 ++++++++++++++++-- .../readonlyInDeclarationFile.symbols | 112 +++++++++++++---- .../reference/readonlyInDeclarationFile.types | 99 +++++++++++++-- .../reference/symbolDeclarationEmit13.js | 2 +- .../reference/symbolDeclarationEmit14.js | 4 +- .../reference/typeGuardOfFormThisMember.js | 2 +- .../typeGuardOfFormThisMemberErrors.js | 2 +- 16 files changed, 320 insertions(+), 82 deletions(-) diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js index 710c5166d30..a8a440fa17d 100644 --- a/tests/baselines/reference/classdecl.js +++ b/tests/baselines/reference/classdecl.js @@ -211,12 +211,12 @@ declare class a { pgF(): void; pv: any; d: number; - static p2: { + static readonly p2: { x: number; y: number; }; private static d2(); - private static p3; + private static readonly p3; private pv3; private foo(n); private foo(s); diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js index fe2dc0a63d0..dacbde7a276 100644 --- a/tests/baselines/reference/commentsClassMembers.js +++ b/tests/baselines/reference/commentsClassMembers.js @@ -568,8 +568,8 @@ declare var i1_c: typeof c1; declare class cProperties { private val; /** getter only property*/ - p1: number; - nc_p1: number; + readonly p1: number; + readonly nc_p1: number; /**setter only property*/ p2: number; nc_p2: number; diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js index b9d84b2475a..42df3cca389 100644 --- a/tests/baselines/reference/commentsInheritance.js +++ b/tests/baselines/reference/commentsInheritance.js @@ -316,19 +316,19 @@ declare class c2 { /** c2 c2_f1*/ c2_f1(): void; /** c2 c2_prop*/ - c2_prop: number; + readonly c2_prop: number; c2_nc_p1: number; c2_nc_f1(): void; - c2_nc_prop: number; + readonly c2_nc_prop: number; /** c2 p1*/ p1: number; /** c2 f1*/ f1(): void; /** c2 prop*/ - prop: number; + readonly prop: number; nc_p1: number; nc_f1(): void; - nc_prop: number; + readonly nc_prop: number; /** c2 constructor*/ constructor(a: number); } @@ -339,10 +339,10 @@ declare class c3 extends c2 { /** c3 f1*/ f1(): void; /** c3 prop*/ - prop: number; + readonly prop: number; nc_p1: number; nc_f1(): void; - nc_prop: number; + readonly nc_prop: number; } declare var c2_i: c2; declare var c3_i: c3; diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js index e3616c79e38..2bd51bfbfb2 100644 --- a/tests/baselines/reference/declFileAccessors.js +++ b/tests/baselines/reference/declFileAccessors.js @@ -284,7 +284,7 @@ export declare class c1 { nc_p3: number; private nc_pp3; static nc_s3: string; - onlyGetter: number; + readonly onlyGetter: number; onlySetter: number; } //// [declFileAccessors_1.d.ts] @@ -302,6 +302,6 @@ declare class c2 { nc_p3: number; private nc_pp3; static nc_s3: string; - onlyGetter: number; + readonly onlyGetter: number; onlySetter: number; } diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js index dd81d94b3c5..30cd85444cf 100644 --- a/tests/baselines/reference/declFilePrivateStatic.js +++ b/tests/baselines/reference/declFilePrivateStatic.js @@ -52,8 +52,8 @@ declare class C { static y: number; private static a(); static b(): void; - private static c; - static d: number; + private static readonly c; + static readonly d: number; private static e; static f: any; } diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.js b/tests/baselines/reference/declarationEmit_protectedMembers.js index 5aad004939d..192f0647ed6 100644 --- a/tests/baselines/reference/declarationEmit_protectedMembers.js +++ b/tests/baselines/reference/declarationEmit_protectedMembers.js @@ -135,7 +135,7 @@ declare class C1 { protected static sx: number; protected static sf(): number; protected static staticSetter: number; - protected static staticGetter: number; + protected static readonly staticGetter: number; } declare class C2 extends C1 { protected f(): number; @@ -146,7 +146,7 @@ declare class C3 extends C2 { static sx: number; f(): number; static sf(): number; - static staticGetter: number; + static readonly staticGetter: number; } declare class C4 { protected a: number; diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js index 2a04541ef28..149a975d413 100644 --- a/tests/baselines/reference/giant.js +++ b/tests/baselines/reference/giant.js @@ -1120,11 +1120,11 @@ export declare class eC { pF(): void; private rF(); pgF(): void; - pgF: any; + readonly pgF: any; psF(param: any): void; psF: any; private rgF(); - private rgF; + private readonly rgF; private rsF(param); private rsF; static tV: any; @@ -1132,7 +1132,7 @@ export declare class eC { static tsF(param: any): void; static tsF: any; static tgF(): void; - static tgF: any; + static readonly tgF: any; } export interface eI { (): any; @@ -1172,11 +1172,11 @@ export declare module eM { pF(): void; private rF(); pgF(): void; - pgF: any; + readonly pgF: any; psF(param: any): void; psF: any; private rgF(); - private rgF; + private readonly rgF; private rsF(param); private rsF; static tV: any; @@ -1184,7 +1184,7 @@ export declare module eM { static tsF(param: any): void; static tsF: any; static tgF(): void; - static tgF: any; + static readonly tgF: any; } interface eI { (): any; @@ -1239,11 +1239,11 @@ export declare module eM { pF(): void; private rF(); pgF(): void; - pgF: any; + readonly pgF: any; psF(param: any): void; psF: any; private rgF(); - private rgF; + private readonly rgF; private rsF(param); private rsF; static tV: any; @@ -1251,7 +1251,7 @@ export declare module eM { static tsF(param: any): void; static tsF: any; static tgF(): void; - static tgF: any; + static readonly tgF: any; } module eaM { var V: any; @@ -1281,11 +1281,11 @@ export declare class eaC { pF(): void; private rF(); pgF(): void; - pgF: any; + readonly pgF: any; psF(param: any): void; psF: any; private rgF(); - private rgF; + private readonly rgF; private rsF(param); private rsF; static tV: any; @@ -1293,7 +1293,7 @@ export declare class eaC { static tsF(param: any): void; static tsF: any; static tgF(): void; - static tgF: any; + static readonly tgF: any; } export declare module eaM { var V: any; diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js index 99e1ac72acd..e24032eb858 100644 --- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js +++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js @@ -193,7 +193,7 @@ declare module schema { } declare module schema { class T { - createValidator9: (data: T) => T; + readonly createValidator9: (data: T) => T; createValidator10: (data: T) => T; } } diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js index 2e765e512d8..f4efbadbf3e 100644 --- a/tests/baselines/reference/moduledecl.js +++ b/tests/baselines/reference/moduledecl.js @@ -459,10 +459,10 @@ declare module exportTests { class C3_public { private getC2_private(); private setC2_private(arg); - private c2; + private readonly c2; getC1_public(): C1_public; setC1_public(arg: C1_public): void; - c1: C1_public; + readonly c1: C1_public; } } declare module mAmbient { diff --git a/tests/baselines/reference/readonlyInDeclarationFile.js b/tests/baselines/reference/readonlyInDeclarationFile.js index d2a20280e0f..71e48272ecc 100644 --- a/tests/baselines/reference/readonlyInDeclarationFile.js +++ b/tests/baselines/reference/readonlyInDeclarationFile.js @@ -6,11 +6,31 @@ interface Foo { } class C { - protected readonly y: number; readonly [x: string]: Object; - private static readonly a = "foo"; - protected static readonly b = "foo"; - public static readonly c = "foo"; + private readonly a1: number; + protected readonly a2: number; + public readonly a3: number; + private get b1() { return 1 } + protected get b2() { return 1 } + public get b3() { return 1 } + private get c1() { return 1 } + private set c1(value) { } + protected get c2() { return 1 } + protected set c2(value) { } + public get c3() { return 1 } + public set c3(value) { } + private static readonly s1: number; + protected static readonly s2: number; + public static readonly s3: number; + private static get t1() { return 1 } + protected static get t2() { return 1 } + public static get t3() { return 1 } + private static get u1() { return 1 } + private static set u1(value) { } + protected static get u2() { return 1 } + protected static set u2(value) { } + public static get u3() { return 1 } + public static set u3(value) { } } var z: { @@ -38,9 +58,72 @@ function g() { var C = (function () { function C() { } - C.a = "foo"; - C.b = "foo"; - C.c = "foo"; + Object.defineProperty(C.prototype, "b1", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C.prototype, "b2", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C.prototype, "b3", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C.prototype, "c1", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C.prototype, "c2", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C.prototype, "c3", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "t1", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "t2", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "t3", { + get: function () { return 1; }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "u1", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "u2", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C, "u3", { + get: function () { return 1; }, + set: function (value) { }, + enumerable: true, + configurable: true + }); return C; }()); var z; @@ -63,11 +146,25 @@ interface Foo { readonly [x: string]: Object; } declare class C { - protected readonly y: number; readonly [x: string]: Object; - private static readonly a; - protected static readonly b: string; - static readonly c: string; + private readonly a1; + protected readonly a2: number; + readonly a3: number; + private readonly b1; + protected readonly b2: number; + readonly b3: number; + private c1; + protected c2: number; + c3: number; + private static readonly s1; + protected static readonly s2: number; + static readonly s3: number; + private static readonly t1; + protected static readonly t2: number; + static readonly t3: number; + private static u1; + protected static u2: number; + static u3: number; } declare var z: { readonly a: string; diff --git a/tests/baselines/reference/readonlyInDeclarationFile.symbols b/tests/baselines/reference/readonlyInDeclarationFile.symbols index f7bbf19a0ae..af979e4dacd 100644 --- a/tests/baselines/reference/readonlyInDeclarationFile.symbols +++ b/tests/baselines/reference/readonlyInDeclarationFile.symbols @@ -14,63 +14,129 @@ interface Foo { class C { >C : Symbol(C, Decl(readonlyInDeclarationFile.ts, 4, 1)) - protected readonly y: number; ->y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 6, 9)) - readonly [x: string]: Object; ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 8, 14)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 7, 14)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) - private static readonly a = "foo"; ->a : Symbol(C.a, Decl(readonlyInDeclarationFile.ts, 8, 33)) + private readonly a1: number; +>a1 : Symbol(a1, Decl(readonlyInDeclarationFile.ts, 7, 33)) - protected static readonly b = "foo"; ->b : Symbol(C.b, Decl(readonlyInDeclarationFile.ts, 9, 38)) + protected readonly a2: number; +>a2 : Symbol(a2, Decl(readonlyInDeclarationFile.ts, 8, 32)) - public static readonly c = "foo"; ->c : Symbol(C.c, Decl(readonlyInDeclarationFile.ts, 10, 40)) + public readonly a3: number; +>a3 : Symbol(a3, Decl(readonlyInDeclarationFile.ts, 9, 34)) + + private get b1() { return 1 } +>b1 : Symbol(b1, Decl(readonlyInDeclarationFile.ts, 10, 31)) + + protected get b2() { return 1 } +>b2 : Symbol(b2, Decl(readonlyInDeclarationFile.ts, 11, 33)) + + public get b3() { return 1 } +>b3 : Symbol(b3, Decl(readonlyInDeclarationFile.ts, 12, 35)) + + private get c1() { return 1 } +>c1 : Symbol(c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33)) + + private set c1(value) { } +>c1 : Symbol(c1, Decl(readonlyInDeclarationFile.ts, 13, 32), Decl(readonlyInDeclarationFile.ts, 14, 33)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 15, 19)) + + protected get c2() { return 1 } +>c2 : Symbol(c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35)) + + protected set c2(value) { } +>c2 : Symbol(c2, Decl(readonlyInDeclarationFile.ts, 15, 29), Decl(readonlyInDeclarationFile.ts, 16, 35)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 17, 21)) + + public get c3() { return 1 } +>c3 : Symbol(c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32)) + + public set c3(value) { } +>c3 : Symbol(c3, Decl(readonlyInDeclarationFile.ts, 17, 31), Decl(readonlyInDeclarationFile.ts, 18, 32)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 19, 18)) + + private static readonly s1: number; +>s1 : Symbol(C.s1, Decl(readonlyInDeclarationFile.ts, 19, 28)) + + protected static readonly s2: number; +>s2 : Symbol(C.s2, Decl(readonlyInDeclarationFile.ts, 20, 39)) + + public static readonly s3: number; +>s3 : Symbol(C.s3, Decl(readonlyInDeclarationFile.ts, 21, 41)) + + private static get t1() { return 1 } +>t1 : Symbol(C.t1, Decl(readonlyInDeclarationFile.ts, 22, 38)) + + protected static get t2() { return 1 } +>t2 : Symbol(C.t2, Decl(readonlyInDeclarationFile.ts, 23, 40)) + + public static get t3() { return 1 } +>t3 : Symbol(C.t3, Decl(readonlyInDeclarationFile.ts, 24, 42)) + + private static get u1() { return 1 } +>u1 : Symbol(C.u1, Decl(readonlyInDeclarationFile.ts, 25, 39), Decl(readonlyInDeclarationFile.ts, 26, 40)) + + private static set u1(value) { } +>u1 : Symbol(C.u1, Decl(readonlyInDeclarationFile.ts, 25, 39), Decl(readonlyInDeclarationFile.ts, 26, 40)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 27, 26)) + + protected static get u2() { return 1 } +>u2 : Symbol(C.u2, Decl(readonlyInDeclarationFile.ts, 27, 36), Decl(readonlyInDeclarationFile.ts, 28, 42)) + + protected static set u2(value) { } +>u2 : Symbol(C.u2, Decl(readonlyInDeclarationFile.ts, 27, 36), Decl(readonlyInDeclarationFile.ts, 28, 42)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 29, 28)) + + public static get u3() { return 1 } +>u3 : Symbol(C.u3, Decl(readonlyInDeclarationFile.ts, 29, 38), Decl(readonlyInDeclarationFile.ts, 30, 39)) + + public static set u3(value) { } +>u3 : Symbol(C.u3, Decl(readonlyInDeclarationFile.ts, 29, 38), Decl(readonlyInDeclarationFile.ts, 30, 39)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 31, 25)) } var z: { ->z : Symbol(z, Decl(readonlyInDeclarationFile.ts, 14, 3)) +>z : Symbol(z, Decl(readonlyInDeclarationFile.ts, 34, 3)) readonly a: string; ->a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 14, 8)) +>a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 34, 8)) readonly [x: string]: Object; ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 16, 14)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 36, 14)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } function f() { ->f : Symbol(f, Decl(readonlyInDeclarationFile.ts, 17, 1)) +>f : Symbol(f, Decl(readonlyInDeclarationFile.ts, 37, 1)) return { get x() { return 1; }, ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 20, 12)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 40, 12)) get y() { return 1; }, ->y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 21, 30), Decl(readonlyInDeclarationFile.ts, 22, 30)) +>y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 41, 30), Decl(readonlyInDeclarationFile.ts, 42, 30)) set y(value) { } ->y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 21, 30), Decl(readonlyInDeclarationFile.ts, 22, 30)) ->value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 23, 14)) +>y : Symbol(y, Decl(readonlyInDeclarationFile.ts, 41, 30), Decl(readonlyInDeclarationFile.ts, 42, 30)) +>value : Symbol(value, Decl(readonlyInDeclarationFile.ts, 43, 14)) } } function g() { ->g : Symbol(g, Decl(readonlyInDeclarationFile.ts, 25, 1)) +>g : Symbol(g, Decl(readonlyInDeclarationFile.ts, 45, 1)) var x: { ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 28, 7)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 48, 7)) readonly a: string; ->a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 28, 12)) +>a : Symbol(a, Decl(readonlyInDeclarationFile.ts, 48, 12)) readonly [x: string]: Object; ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 30, 18)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 50, 18)) >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) } return x; ->x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 28, 7)) +>x : Symbol(x, Decl(readonlyInDeclarationFile.ts, 48, 7)) } diff --git a/tests/baselines/reference/readonlyInDeclarationFile.types b/tests/baselines/reference/readonlyInDeclarationFile.types index 9b2f9d51d99..7a3e11577c8 100644 --- a/tests/baselines/reference/readonlyInDeclarationFile.types +++ b/tests/baselines/reference/readonlyInDeclarationFile.types @@ -14,24 +14,99 @@ interface Foo { class C { >C : C - protected readonly y: number; ->y : number - readonly [x: string]: Object; >x : string >Object : Object - private static readonly a = "foo"; ->a : string ->"foo" : string + private readonly a1: number; +>a1 : number - protected static readonly b = "foo"; ->b : string ->"foo" : string + protected readonly a2: number; +>a2 : number - public static readonly c = "foo"; ->c : string ->"foo" : string + public readonly a3: number; +>a3 : number + + private get b1() { return 1 } +>b1 : number +>1 : number + + protected get b2() { return 1 } +>b2 : number +>1 : number + + public get b3() { return 1 } +>b3 : number +>1 : number + + private get c1() { return 1 } +>c1 : number +>1 : number + + private set c1(value) { } +>c1 : number +>value : number + + protected get c2() { return 1 } +>c2 : number +>1 : number + + protected set c2(value) { } +>c2 : number +>value : number + + public get c3() { return 1 } +>c3 : number +>1 : number + + public set c3(value) { } +>c3 : number +>value : number + + private static readonly s1: number; +>s1 : number + + protected static readonly s2: number; +>s2 : number + + public static readonly s3: number; +>s3 : number + + private static get t1() { return 1 } +>t1 : number +>1 : number + + protected static get t2() { return 1 } +>t2 : number +>1 : number + + public static get t3() { return 1 } +>t3 : number +>1 : number + + private static get u1() { return 1 } +>u1 : number +>1 : number + + private static set u1(value) { } +>u1 : number +>value : number + + protected static get u2() { return 1 } +>u2 : number +>1 : number + + protected static set u2(value) { } +>u2 : number +>value : number + + public static get u3() { return 1 } +>u3 : number +>1 : number + + public static set u3(value) { } +>u3 : number +>value : number } var z: { diff --git a/tests/baselines/reference/symbolDeclarationEmit13.js b/tests/baselines/reference/symbolDeclarationEmit13.js index 8111672866a..bbd2c15cfcd 100644 --- a/tests/baselines/reference/symbolDeclarationEmit13.js +++ b/tests/baselines/reference/symbolDeclarationEmit13.js @@ -13,6 +13,6 @@ class C { //// [symbolDeclarationEmit13.d.ts] declare class C { - [Symbol.toPrimitive]: string; + readonly [Symbol.toPrimitive]: string; [Symbol.toStringTag]: any; } diff --git a/tests/baselines/reference/symbolDeclarationEmit14.js b/tests/baselines/reference/symbolDeclarationEmit14.js index b8a6b3e4092..d4ae3eeb43c 100644 --- a/tests/baselines/reference/symbolDeclarationEmit14.js +++ b/tests/baselines/reference/symbolDeclarationEmit14.js @@ -13,6 +13,6 @@ class C { //// [symbolDeclarationEmit14.d.ts] declare class C { - [Symbol.toPrimitive]: string; - [Symbol.toStringTag]: string; + readonly [Symbol.toPrimitive]: string; + readonly [Symbol.toStringTag]: string; } diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js index 2f983d2cdf8..9d71613ed8f 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMember.js +++ b/tests/baselines/reference/typeGuardOfFormThisMember.js @@ -170,7 +170,7 @@ declare namespace Test { path: string; isFSO: this is FileSystemObject; isFile: this is File; - isDirectory: this is Directory; + readonly isDirectory: this is Directory; isNetworked: this is (Networked & this); constructor(path: string); } diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js index 6f681ab09cf..5991fdd3169 100644 --- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js +++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js @@ -95,7 +95,7 @@ declare namespace Test { path: string; isFSO: this is FileSystemObject; isFile: this is File; - isDirectory: this is Directory; + readonly isDirectory: this is Directory; isNetworked: this is (Networked & this); constructor(path: string); } From 3661b66be41a9724ba08d01a2b02aec548f1f7e9 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Thu, 28 Jan 2016 14:18:23 -0800 Subject: [PATCH 113/160] add extra argument to 'isRequireCall' to check if argument is string literal --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 2 +- src/compiler/program.ts | 2 +- src/compiler/utilities.ts | 5 +++-- tests/baselines/reference/dynamicRequire.js | 10 ++++++++++ tests/baselines/reference/dynamicRequire.symbols | 10 ++++++++++ tests/baselines/reference/dynamicRequire.types | 14 ++++++++++++++ tests/cases/compiler/dynamicRequire.ts | 8 ++++++++ 8 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 tests/baselines/reference/dynamicRequire.js create mode 100644 tests/baselines/reference/dynamicRequire.symbols create mode 100644 tests/baselines/reference/dynamicRequire.types create mode 100644 tests/cases/compiler/dynamicRequire.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 88a1a62ce4c..cc81f92fbfc 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1462,7 +1462,7 @@ namespace ts { function bindCallExpression(node: CallExpression) { // We're only inspecting call expressions to detect CommonJS modules, so we can skip // this check if we've already seen the module indicator - if (!file.commonJsModuleIndicator && isRequireCall(node)) { + if (!file.commonJsModuleIndicator && isRequireCall(node, /*checkArgumentIsStringLiteral*/false)) { setCommonJsModuleIndicator(node); } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 784d3ef67e8..91f3561d829 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10239,7 +10239,7 @@ namespace ts { } // In JavaScript files, calls to any identifier 'require' are treated as external module imports - if (isInJavaScriptFile(node) && isRequireCall(node)) { + if (isInJavaScriptFile(node) && isRequireCall(node, /*checkArgumentIsStringLiteral*/true)) { return resolveExternalModuleTypeByLiteral(node.arguments[0]); } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 4187177fa48..803ae47b0fd 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1328,7 +1328,7 @@ namespace ts { } function collectRequireCalls(node: Node): void { - if (isRequireCall(node)) { + if (isRequireCall(node, /*checkArgumentIsStringLiteral*/true)) { (imports || (imports = [])).push((node).arguments[0]); } else { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 33ad24d7f56..67dd9844ca7 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1086,12 +1086,13 @@ namespace ts { * exactly one argument. * This function does not test if the node is in a JavaScript file or not. */ - export function isRequireCall(expression: Node): expression is CallExpression { + export function isRequireCall(expression: Node, checkArgumentIsStringLiteral: boolean): expression is CallExpression { // of the form 'require("name")' - return expression.kind === SyntaxKind.CallExpression && + const isRequire = expression.kind === SyntaxKind.CallExpression && (expression).expression.kind === SyntaxKind.Identifier && ((expression).expression).text === "require" && (expression).arguments.length === 1; + return isRequire && (!checkArgumentIsStringLiteral || (expression).arguments[0].kind === SyntaxKind.StringLiteral); } /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property diff --git a/tests/baselines/reference/dynamicRequire.js b/tests/baselines/reference/dynamicRequire.js new file mode 100644 index 00000000000..28b35970601 --- /dev/null +++ b/tests/baselines/reference/dynamicRequire.js @@ -0,0 +1,10 @@ +//// [a.js] + +function foo(name) { + var s = require("t/" + name) +} + +//// [a_out.js] +function foo(name) { + var s = require("t/" + name); +} diff --git a/tests/baselines/reference/dynamicRequire.symbols b/tests/baselines/reference/dynamicRequire.symbols new file mode 100644 index 00000000000..c307d578de7 --- /dev/null +++ b/tests/baselines/reference/dynamicRequire.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.js === + +function foo(name) { +>foo : Symbol(foo, Decl(a.js, 0, 0)) +>name : Symbol(name, Decl(a.js, 1, 13)) + + var s = require("t/" + name) +>s : Symbol(s, Decl(a.js, 2, 7)) +>name : Symbol(name, Decl(a.js, 1, 13)) +} diff --git a/tests/baselines/reference/dynamicRequire.types b/tests/baselines/reference/dynamicRequire.types new file mode 100644 index 00000000000..43eea88a05b --- /dev/null +++ b/tests/baselines/reference/dynamicRequire.types @@ -0,0 +1,14 @@ +=== tests/cases/compiler/a.js === + +function foo(name) { +>foo : (name: any) => void +>name : any + + var s = require("t/" + name) +>s : any +>require("t/" + name) : any +>require : any +>"t/" + name : string +>"t/" : string +>name : any +} diff --git a/tests/cases/compiler/dynamicRequire.ts b/tests/cases/compiler/dynamicRequire.ts new file mode 100644 index 00000000000..8d72a37dceb --- /dev/null +++ b/tests/cases/compiler/dynamicRequire.ts @@ -0,0 +1,8 @@ +// @allowJs: true +// @module: amd +// @out: a_out.js + +// @filename: a.js +function foo(name) { + var s = require("t/" + name) +} \ No newline at end of file From b3eaef17e9fb9675e36dad37445b41cc67d25c1e Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Thu, 28 Jan 2016 14:21:04 -0800 Subject: [PATCH 114/160] fix linter issues --- src/compiler/utilities.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 67dd9844ca7..bab66eb0688 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1089,10 +1089,11 @@ namespace ts { export function isRequireCall(expression: Node, checkArgumentIsStringLiteral: boolean): expression is CallExpression { // of the form 'require("name")' const isRequire = expression.kind === SyntaxKind.CallExpression && - (expression).expression.kind === SyntaxKind.Identifier && - ((expression).expression).text === "require" && - (expression).arguments.length === 1; - return isRequire && (!checkArgumentIsStringLiteral || (expression).arguments[0].kind === SyntaxKind.StringLiteral); + (expression).expression.kind === SyntaxKind.Identifier && + ((expression).expression).text === "require" && + (expression).arguments.length === 1; + + return isRequire && (!checkArgumentIsStringLiteral || (expression).arguments[0].kind === SyntaxKind.StringLiteral); } /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property From 124bd517e71353d8c22c0ee63f2e830c0b18004c Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 15:18:50 -0800 Subject: [PATCH 115/160] Don't show the currently-completing thing at the cursor in JS files Fixes #6693 --- src/services/services.ts | 23 +++++++++++-------- .../fourslash/getJavaScriptCompletions20.ts | 21 +++++++++++++++++ 2 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 tests/cases/fourslash/getJavaScriptCompletions20.ts diff --git a/src/services/services.ts b/src/services/services.ts index cb57d415c66..ecc0e442dd3 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -62,7 +62,7 @@ namespace ts { export interface SourceFile { /* @internal */ version: string; /* @internal */ scriptSnapshot: IScriptSnapshot; - /* @internal */ nameTable: Map; + /* @internal */ nameTable: Map; /* @internal */ getNamedDeclarations(): Map; @@ -808,7 +808,7 @@ namespace ts { public languageVersion: ScriptTarget; public languageVariant: LanguageVariant; public identifiers: Map; - public nameTable: Map; + public nameTable: Map; public resolvedModules: Map; public imports: LiteralExpression[]; public moduleAugmentations: LiteralExpression[]; @@ -1954,8 +1954,6 @@ namespace ts { const text = scriptSnapshot.getText(0, scriptSnapshot.getLength()); const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents); setSourceFileFields(sourceFile, scriptSnapshot, version); - // after full parsing we can use table with interned strings as name table - sourceFile.nameTable = sourceFile.identifiers; return sourceFile; } @@ -3834,7 +3832,7 @@ namespace ts { if (isRightOfDot && isSourceFileJavaScript(sourceFile)) { const uniqueNames = getCompletionEntriesFromSymbols(symbols, entries); - addRange(entries, getJavaScriptCompletionEntries(sourceFile, uniqueNames)); + addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames)); } else { if (!symbols || symbols.length === 0) { @@ -3867,12 +3865,17 @@ namespace ts { return { isMemberCompletion, isNewIdentifierLocation, entries }; - function getJavaScriptCompletionEntries(sourceFile: SourceFile, uniqueNames: Map): CompletionEntry[] { + function getJavaScriptCompletionEntries(sourceFile: SourceFile, position: number, uniqueNames: Map): CompletionEntry[] { const entries: CompletionEntry[] = []; const target = program.getCompilerOptions().target; const nameTable = getNameTable(sourceFile); for (const name in nameTable) { + // Skip identifiers produced only from the current location + if (nameTable[name] === position) { + continue; + } + if (!uniqueNames[name]) { uniqueNames[name] = name; const displayName = getCompletionEntryDisplayName(name, target, /*performCharacterChecks*/ true); @@ -7513,7 +7516,7 @@ namespace ts { } /* @internal */ - export function getNameTable(sourceFile: SourceFile): Map { + export function getNameTable(sourceFile: SourceFile): Map { if (!sourceFile.nameTable) { initializeNameTable(sourceFile); } @@ -7522,7 +7525,7 @@ namespace ts { } function initializeNameTable(sourceFile: SourceFile): void { - const nameTable: Map = {}; + const nameTable: Map = {}; walk(sourceFile); sourceFile.nameTable = nameTable; @@ -7530,7 +7533,7 @@ namespace ts { function walk(node: Node) { switch (node.kind) { case SyntaxKind.Identifier: - nameTable[(node).text] = (node).text; + nameTable[(node).text] = nameTable[(node).text] === undefined ? node.pos : -1; break; case SyntaxKind.StringLiteral: case SyntaxKind.NumericLiteral: @@ -7542,7 +7545,7 @@ namespace ts { node.parent.kind === SyntaxKind.ExternalModuleReference || isArgumentOfElementAccessExpression(node)) { - nameTable[(node).text] = (node).text; + nameTable[(node).text] = nameTable[(node).text] === undefined ? node.pos : -1; } break; default: diff --git a/tests/cases/fourslash/getJavaScriptCompletions20.ts b/tests/cases/fourslash/getJavaScriptCompletions20.ts new file mode 100644 index 00000000000..d254705bb91 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptCompletions20.ts @@ -0,0 +1,21 @@ +/// + +// @allowNonTsExtensions: true +// @Filename: file.js +//// /** +//// * A person +//// * @constructor +//// * @param {string} name - The name of the person. +//// * @param {number} age - The age of the person. +//// */ +//// function Person(name, age) { +//// this.name = name; +//// this.age = age; +//// } +//// +//// +//// Person.getName = 10; +//// Person.getNa/**/ = 10; + +goTo.marker(); +verify.not.memberListContains('getNa'); From 39077f686636494454d9f85b36aae07eb5736c27 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Thu, 28 Jan 2016 15:25:42 -0800 Subject: [PATCH 116/160] PR feedback --- src/compiler/emitter.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a3dcf7d630e..0a3cbd89d9e 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1544,7 +1544,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind // behavior of class names in ES6. const declaration = resolver.getReferencedValueDeclaration(node); - if (declaration && declaration.kind === SyntaxKind.ClassDeclaration) { + if (declaration) { const classAlias = decoratedClassAliases[getNodeId(declaration)]; if (classAlias !== undefined) { write(classAlias); @@ -5195,13 +5195,6 @@ const _super = (function (geti, seti) { // // TypeScript | Javascript // --------------------------------|------------------------------------ - // @dec | let default_1 = class { - // export default class { | static x() { return default_1.y; } - // static x() { return C.y; } | } - // static y = 1; | default_1.y = 1; - // } | default_1 = __decorate([dec], default_1); - // | export default default_1; - // --------------------------------|------------------------------------ // @dec | let C_1; // export default class C { | let C = C_1 = class C { // static x() { return C.y; } | static x() { return C_1.y; } From 5a845bf0fca604a9928ec8762266231ec62fafda Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 15:48:18 -0800 Subject: [PATCH 117/160] Don't crash when return type jsdoc tag is malformed Fixes #6662 --- src/compiler/checker.ts | 2 +- .../fourslash/getJavaScriptQuickInfo7.ts | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/getJavaScriptQuickInfo7.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 784d3ef67e8..43b91551a29 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10344,7 +10344,7 @@ namespace ts { function getReturnTypeFromJSDocComment(func: SignatureDeclaration | FunctionDeclaration): Type { const returnTag = getJSDocReturnTag(func); - if (returnTag) { + if (returnTag && returnTag.typeExpression) { return getTypeFromTypeNode(returnTag.typeExpression.type); } } diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo7.ts b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts new file mode 100644 index 00000000000..9faf97e7951 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts @@ -0,0 +1,19 @@ +/// + +// @allowNonTsExtensions: true +// @Filename: file.js +//// /** +//// * This is a very cool function that is very nice. +//// * @returns something +//// */ +//// function a1() { +//// try { +//// throw new Error('x'); +//// } catch (x) { x--; } +//// return 23; +//// } +//// +//// x - /**/a1() + +goTo.marker(); +verify.quickInfoExists(); \ No newline at end of file From 1231c9e145ef65cf51d5f582abfb71929892c48a Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 16:05:03 -0800 Subject: [PATCH 118/160] Fix case when position === 0 --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index ecc0e442dd3..b44a774f721 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -5490,7 +5490,7 @@ namespace ts { const nameTable = getNameTable(sourceFile); - if (lookUp(nameTable, internedName)) { + if (lookUp(nameTable, internedName) !== undefined) { result = result || []; getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex); } From 1f503f1b27fb52ee5dacd75bd9379908ce6ee68e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Thu, 28 Jan 2016 16:07:06 -0800 Subject: [PATCH 119/160] Add explicit `return undefined;` --- src/compiler/checker.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 43b91551a29..389fed35916 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10347,6 +10347,8 @@ namespace ts { if (returnTag && returnTag.typeExpression) { return getTypeFromTypeNode(returnTag.typeExpression.type); } + + return undefined; } function createPromiseType(promisedType: Type): Type { From 238fcbcee9502c869e722b9d585dc516de1f601b Mon Sep 17 00:00:00 2001 From: Noj Vek Date: Thu, 28 Jan 2016 23:29:08 -0800 Subject: [PATCH 120/160] single iteration through children array without any array allocation --- src/compiler/emitter.ts | 63 ++++++++++++++++--- tests/baselines/reference/tsxReactEmit1.js | 9 ++- tests/baselines/reference/tsxReactEmit3.js | 17 +++-- .../reference/tsxReactEmitNesting.js | 32 +++++----- .../reference/tsxReactEmitWhitespace.js | 9 ++- .../reference/tsxReactEmitWhitespace2.js | 23 +++---- 6 files changed, 94 insertions(+), 59 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 86378036d65..acf41b0a510 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1257,21 +1257,66 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // Children if (children) { - // build list of valid emittable jsx children - const emittableChildren = children.filter(isJsxChildEmittable); - if (emittableChildren.length > 0) { - // If the only child is non-jsx element, don't put it on a new line - if (emittableChildren.length == 1 && emittableChildren[0].kind !== SyntaxKind.JsxElement && emittableChildren[0].kind !== SyntaxKind.JsxSelfClosingElement) { - write(", "); - emit(emittableChildren[0]); + let firstChild:JsxChild; + let multipleEmittableChildren = false; + + for (let i = 0, n = children.length; i < n; ++i) { + let jsxChild = children[i]; + + if (isJsxChildEmittable(jsxChild)) { + // we need to decide whether to emit in single line or multiple lines as indented list + // store firstChild reference, if we see another emittable child, then emit accordingly + if (!firstChild) { + write(", "); + firstChild = jsxChild; + } + else { + // more than one emittable child, emit indented list + if(!multipleEmittableChildren){ + multipleEmittableChildren = true; + increaseIndent(); + writeLine(); + emit(firstChild); + } + + write(", "); + writeLine(); + emit(jsxChild); + } + } + } + + if (multipleEmittableChildren) { + decreaseIndent(); + } + else if (firstChild) { + if (firstChild.kind !== SyntaxKind.JsxElement && firstChild.kind !== SyntaxKind.JsxSelfClosingElement) { + emit(firstChild); } - // Otherwise build a indented comma separated list else { + // If the only child is jsx element, put it on a new indented line increaseIndent(); - emitList(emittableChildren, 0, emittableChildren.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ true); + writeLine(); + emit(firstChild); + writeLine(); decreaseIndent(); } } + + // const emittableChildren = children.filter(isJsxChildEmittable); + // if (emittableChildren.length > 0) { + // // If the only child is non-jsx element, don't put it on a new line + // if (emittableChildren.length == 1 && emittableChildren[0].kind !== SyntaxKind.JsxElement && emittableChildren[0].kind !== SyntaxKind.JsxSelfClosingElement) { + // write(", "); + // emit(emittableChildren[0]); + // } + // // Otherwise build a indented comma separated list + // else { + // increaseIndent(); + // emitList(emittableChildren, 0, emittableChildren.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ true); + // decreaseIndent(); + // } + // } } // Closing paren diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js index a6eac7f4824..f62a7bdc47d 100644 --- a/tests/baselines/reference/tsxReactEmit1.js +++ b/tests/baselines/reference/tsxReactEmit1.js @@ -70,9 +70,8 @@ var SomeClass = (function () { return SomeClass; }()); var whitespace1 = React.createElement("div", null, " "); -var whitespace2 = React.createElement("div", null, - " ", - p, - " " -); +var whitespace2 = React.createElement("div", null, + " ", + p, + " "); var whitespace3 = React.createElement("div", null, p); diff --git a/tests/baselines/reference/tsxReactEmit3.js b/tests/baselines/reference/tsxReactEmit3.js index 2163a310fc8..07a8f22761f 100644 --- a/tests/baselines/reference/tsxReactEmit3.js +++ b/tests/baselines/reference/tsxReactEmit3.js @@ -8,12 +8,11 @@ declare var Foo, Bar, baz; q s ; //// [test.js] -React.createElement(Foo, null, - " ", - React.createElement(Bar, null, " q "), - " ", - React.createElement(Bar, null), - " s ", - React.createElement(Bar, null), - React.createElement(Bar, null) -); +React.createElement(Foo, null, + " ", + React.createElement(Bar, null, " q "), + " ", + React.createElement(Bar, null), + " s ", + React.createElement(Bar, null), + React.createElement(Bar, null)); diff --git a/tests/baselines/reference/tsxReactEmitNesting.js b/tests/baselines/reference/tsxReactEmitNesting.js index 3f12715b98c..53abc04aa9b 100644 --- a/tests/baselines/reference/tsxReactEmitNesting.js +++ b/tests/baselines/reference/tsxReactEmitNesting.js @@ -38,27 +38,23 @@ let render = (ctrl, model) => //// [file.js] // A simple render function with nesting and control statements var render = function (ctrl, model) { - return vdom.createElement("section", {class: "todoapp"}, - vdom.createElement("header", {class: "header"}, - vdom.createElement("h1", null, "todos "), - vdom.createElement("input", {class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model)}) - ), - vdom.createElement("section", {class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" }}, - vdom.createElement("input", {class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl)}), + return vdom.createElement("section", {class: "todoapp"}, + vdom.createElement("header", {class: "header"}, + vdom.createElement("h1", null, "todos "), + vdom.createElement("input", {class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model)})), + vdom.createElement("section", {class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" }}, + vdom.createElement("input", {class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl)}), vdom.createElement("ul", {class: "todo-list"}, model.filteredTodos.map(function (todo) { - return vdom.createElement("li", {class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo }}, - vdom.createElement("div", {class: "view"}, + return vdom.createElement("li", {class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo }}, + vdom.createElement("div", {class: "view"}, (!todo.editable) ? vdom.createElement("input", {class: "toggle", type: "checkbox"}) - : null, - vdom.createElement("label", {onDoubleClick: function () { ctrl.editTodo(todo); }}, todo.title), - vdom.createElement("button", {class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo)}), - vdom.createElement("div", {class: "iconBorder"}, + : null, + vdom.createElement("label", {onDoubleClick: function () { ctrl.editTodo(todo); }}, todo.title), + vdom.createElement("button", {class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo)}), + vdom.createElement("div", {class: "iconBorder"}, vdom.createElement("div", {class: "icon"}) - ) - ) + )) ); - })) - ) - ); + })))); }; diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.js b/tests/baselines/reference/tsxReactEmitWhitespace.js index 5db92bb33a4..9a157d242e3 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace.js @@ -59,11 +59,10 @@ var p = 0; // Emit " " React.createElement("div", null, " "); // Emit " ", p, " " -React.createElement("div", null, - " ", - p, - " " -); +React.createElement("div", null, + " ", + p, + " "); // Emit only p React.createElement("div", null, p); // Emit only p diff --git a/tests/baselines/reference/tsxReactEmitWhitespace2.js b/tests/baselines/reference/tsxReactEmitWhitespace2.js index 61e7805fb3d..152d869fc03 100644 --- a/tests/baselines/reference/tsxReactEmitWhitespace2.js +++ b/tests/baselines/reference/tsxReactEmitWhitespace2.js @@ -18,18 +18,15 @@ declare var React: any; //// [file.js] // Emit ' word' in the last string -React.createElement("div", null, - "word ", - React.createElement("code", null, "code"), - " word" -); +React.createElement("div", null, + "word ", + React.createElement("code", null, "code"), + " word"); // Same here -React.createElement("div", null, - React.createElement("code", null, "code"), - " word" -); +React.createElement("div", null, + React.createElement("code", null, "code"), + " word"); // And here -React.createElement("div", null, - React.createElement("code", null), - " word" -); +React.createElement("div", null, + React.createElement("code", null), + " word"); From fcd96cb3d8cbb843e5c7c0fcaee8ba283672154d Mon Sep 17 00:00:00 2001 From: Noj Vek Date: Thu, 28 Jan 2016 23:33:14 -0800 Subject: [PATCH 121/160] fix tslint --- src/compiler/emitter.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index acf41b0a510..ad0f1c8bcd8 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1257,11 +1257,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // Children if (children) { - let firstChild:JsxChild; + let firstChild: JsxChild; let multipleEmittableChildren = false; - for (let i = 0, n = children.length; i < n; ++i) { - let jsxChild = children[i]; + for (let i = 0, n = children.length; i < n; i++) { + const jsxChild = children[i]; if (isJsxChildEmittable(jsxChild)) { // we need to decide whether to emit in single line or multiple lines as indented list @@ -1272,7 +1272,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else { // more than one emittable child, emit indented list - if(!multipleEmittableChildren){ + if (!multipleEmittableChildren) { multipleEmittableChildren = true; increaseIndent(); writeLine(); From 94fe3e0fb27f2b9480e98620c13ef90197ae0e8f Mon Sep 17 00:00:00 2001 From: guybedford Date: Thu, 28 Jan 2016 12:56:38 +0200 Subject: [PATCH 122/160] set __moduleName from context.id argument --- src/compiler/emitter.ts | 9 ++- .../reference/aliasesInSystemModule1.js | 3 +- .../reference/aliasesInSystemModule2.js | 3 +- .../allowSyntheticDefaultImports2.js | 6 +- .../allowSyntheticDefaultImports3.js | 6 +- .../allowSyntheticDefaultImports5.js | 3 +- .../allowSyntheticDefaultImports6.js | 3 +- .../anonymousDefaultExportsSystem.js | 6 +- .../reference/capturedLetConstInLoop4.js | 3 +- ...ecoratedDefaultExportsGetExportedSystem.js | 6 +- .../reference/deduplicateImportsInSystem.js | 3 +- .../defaultExportsGetExportedSystem.js | 6 +- tests/baselines/reference/es5-system.js | 3 +- .../exportNonInitializedVariablesSystem.js | 3 +- .../reference/exportStarForValues10.js | 9 ++- .../reference/exportStarForValues6.js | 6 +- .../reference/exportStarForValuesInSystem.js | 6 +- .../isolatedModulesPlainFile-System.js | 3 +- .../reference/modulePrologueSystem.js | 3 +- .../outFilerootDirModuleNamesSystem.js | 6 +- .../reference/outModuleConcatSystem.js | 6 +- .../reference/outModuleConcatSystem.js.map | 2 +- .../outModuleConcatSystem.sourcemap.txt | 70 ++++++++++--------- ...prefixUnaryOperatorsOnExportedVariables.js | 3 +- .../reference/systemExportAssignment.js | 3 +- .../reference/systemExportAssignment2.js | 6 +- .../reference/systemExportAssignment3.js | 3 +- tests/baselines/reference/systemModule1.js | 3 +- tests/baselines/reference/systemModule10.js | 3 +- .../baselines/reference/systemModule10_ES5.js | 3 +- tests/baselines/reference/systemModule11.js | 15 ++-- tests/baselines/reference/systemModule12.js | 3 +- tests/baselines/reference/systemModule13.js | 3 +- tests/baselines/reference/systemModule14.js | 3 +- tests/baselines/reference/systemModule15.js | 12 ++-- tests/baselines/reference/systemModule16.js | 3 +- tests/baselines/reference/systemModule17.js | 6 +- tests/baselines/reference/systemModule2.js | 3 +- tests/baselines/reference/systemModule3.js | 12 ++-- tests/baselines/reference/systemModule4.js | 3 +- tests/baselines/reference/systemModule5.js | 3 +- tests/baselines/reference/systemModule6.js | 3 +- tests/baselines/reference/systemModule7.js | 3 +- tests/baselines/reference/systemModule8.js | 3 +- tests/baselines/reference/systemModule9.js | 3 +- .../systemModuleAmbientDeclarations.js | 18 +++-- .../reference/systemModuleConstEnums.js | 3 +- ...stemModuleConstEnumsSeparateCompilation.js | 3 +- .../systemModuleDeclarationMerging.js | 3 +- .../reference/systemModuleExportDefault.js | 12 ++-- .../systemModuleNonTopLevelModuleMembers.js | 3 +- .../reference/systemModuleWithSuperClass.js | 6 +- tests/cases/unittests/transpile.ts | 8 ++- 53 files changed, 213 insertions(+), 119 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4d771bd2538..d01843eddb4 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -477,6 +477,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge // => // var x;... exporter("x", x = 1) let exportFunctionForFile: string; + let contextObjectForFile: string; let generatedNameSet: Map; let nodeToGeneratedName: string[]; @@ -557,6 +558,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge currentText = undefined; currentLineMap = undefined; exportFunctionForFile = undefined; + contextObjectForFile = undefined; generatedNameSet = undefined; nodeToGeneratedName = undefined; computedPropertyNamesToGeneratedNames = undefined; @@ -585,6 +587,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge currentText = sourceFile.text; currentLineMap = getLineStarts(sourceFile); exportFunctionForFile = undefined; + contextObjectForFile = undefined; isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"]; renamedDependencies = sourceFile.renamedDependencies; currentFileIdentifiers = sourceFile.identifiers; @@ -7058,6 +7061,7 @@ const _super = (function (geti, seti) { Debug.assert(!exportFunctionForFile); // make sure that name of 'exports' function does not conflict with existing identifiers exportFunctionForFile = makeUniqueName("exports"); + contextObjectForFile = makeUniqueName("context"); writeLine(); write("System.register("); writeModuleName(node, emitRelativePathAsModuleName); @@ -7093,10 +7097,13 @@ const _super = (function (geti, seti) { write(text); } - write(`], function(${exportFunctionForFile}) {`); + write(`], function(${exportFunctionForFile}, ${contextObjectForFile}) {`); writeLine(); increaseIndent(); const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ true); + writeLine(); + write(`var __moduleName = ${contextObjectForFile} && ${contextObjectForFile}.id;`); + writeLine(); emitEmitHelpers(node); emitCaptureThisForNodeIfNecessary(node); emitSystemModuleBody(node, dependencyGroups, startIndex); diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js index 43037c7634c..46d2b061dd3 100644 --- a/tests/baselines/reference/aliasesInSystemModule1.js +++ b/tests/baselines/reference/aliasesInSystemModule1.js @@ -17,8 +17,9 @@ module M { //// [aliasesInSystemModule1.js] -System.register(['foo'], function(exports_1) { +System.register(['foo'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var alias; var cls, cls2, x, y, z, M; return { diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js index 7effb2721be..e30ba4fea56 100644 --- a/tests/baselines/reference/aliasesInSystemModule2.js +++ b/tests/baselines/reference/aliasesInSystemModule2.js @@ -16,8 +16,9 @@ module M { } //// [aliasesInSystemModule2.js] -System.register(["foo"], function(exports_1) { +System.register(["foo"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var foo_1; var cls, cls2, x, y, z, M; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js index fcc029415cf..87e47f9c9a1 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports2.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js @@ -10,8 +10,9 @@ export class Foo { } //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var Foo; return { setters:[], @@ -26,8 +27,9 @@ System.register([], function(exports_1) { } }); //// [a.js] -System.register(["./b"], function(exports_1) { +System.register(["./b"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js index b14d25dbd61..348ce42a60a 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports3.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js @@ -11,8 +11,9 @@ export class Foo { //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var Foo; return { setters:[], @@ -27,8 +28,9 @@ System.register([], function(exports_1) { } }); //// [a.js] -System.register(["./b"], function(exports_1) { +System.register(["./b"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.js b/tests/baselines/reference/allowSyntheticDefaultImports5.js index c9121512b61..f59226e152d 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports5.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports5.js @@ -12,8 +12,9 @@ export var x = new Foo(); //// [a.js] -System.register(["./b"], function(exports_1) { +System.register(["./b"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var b_1; var x; return { diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.js b/tests/baselines/reference/allowSyntheticDefaultImports6.js index 64d52e70af9..d2f25e538c5 100644 --- a/tests/baselines/reference/allowSyntheticDefaultImports6.js +++ b/tests/baselines/reference/allowSyntheticDefaultImports6.js @@ -12,8 +12,9 @@ export var x = new Foo(); //// [a.js] -System.register(["./b"], function(exports_1) { +System.register(["./b"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var b_1; var x; return { diff --git a/tests/baselines/reference/anonymousDefaultExportsSystem.js b/tests/baselines/reference/anonymousDefaultExportsSystem.js index 74913a57a99..f9ff71dec06 100644 --- a/tests/baselines/reference/anonymousDefaultExportsSystem.js +++ b/tests/baselines/reference/anonymousDefaultExportsSystem.js @@ -7,8 +7,9 @@ export default class {} export default function() {} //// [a.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var default_1; return { setters:[], @@ -20,8 +21,9 @@ System.register([], function(exports_1) { } }); //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function default_1() { } exports_1("default", default_1); return { diff --git a/tests/baselines/reference/capturedLetConstInLoop4.js b/tests/baselines/reference/capturedLetConstInLoop4.js index 160be3ccaef..04f514b01e8 100644 --- a/tests/baselines/reference/capturedLetConstInLoop4.js +++ b/tests/baselines/reference/capturedLetConstInLoop4.js @@ -144,8 +144,9 @@ for (const y = 0; y < 1;) { //// [capturedLetConstInLoop4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var v0, v00, v1, v2, v3, v4, v5, v6, v7, v8, v0_c, v00_c, v1_c, v2_c, v3_c, v4_c, v5_c, v6_c, v7_c, v8_c; //======let function exportedFoo() { diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js index ed322374799..ca4bb52a32b 100644 --- a/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.js @@ -13,8 +13,9 @@ var decorator: ClassDecorator; export default class {} //// [a.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); @@ -35,8 +36,9 @@ System.register([], function(exports_1) { } }); //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); diff --git a/tests/baselines/reference/deduplicateImportsInSystem.js b/tests/baselines/reference/deduplicateImportsInSystem.js index 956d293cad1..accc4954e65 100644 --- a/tests/baselines/reference/deduplicateImportsInSystem.js +++ b/tests/baselines/reference/deduplicateImportsInSystem.js @@ -9,8 +9,9 @@ import {F} from 'f1'; console.log(A + B + C + D + E + F) //// [deduplicateImportsInSystem.js] -System.register(["f1", "f2", "f3"], function(exports_1) { +System.register(["f1", "f2", "f3"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var f1_1, f2_1, f3_1, f2_2, f2_3, f1_2; return { setters:[ diff --git a/tests/baselines/reference/defaultExportsGetExportedSystem.js b/tests/baselines/reference/defaultExportsGetExportedSystem.js index 67dc47f4bd5..eac3d3c7c43 100644 --- a/tests/baselines/reference/defaultExportsGetExportedSystem.js +++ b/tests/baselines/reference/defaultExportsGetExportedSystem.js @@ -8,8 +8,9 @@ export default function foo() {} //// [a.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var Foo; return { setters:[], @@ -21,8 +22,9 @@ System.register([], function(exports_1) { } }); //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { } exports_1("default", foo); return { diff --git a/tests/baselines/reference/es5-system.js b/tests/baselines/reference/es5-system.js index a9633352b8b..9cf5ea87f1f 100644 --- a/tests/baselines/reference/es5-system.js +++ b/tests/baselines/reference/es5-system.js @@ -15,8 +15,9 @@ export default class A //// [es5-system.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var A; return { setters:[], diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js index b5674bf5ce3..2a8e2022c95 100644 --- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js +++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js @@ -35,8 +35,9 @@ export let h1: D = new D; //// [exportNonInitializedVariablesSystem.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var a, b, c, d, A, e, f, B, C, a1, b1, c1, d1, D, e1, f1, g1, h1; return { setters:[], diff --git a/tests/baselines/reference/exportStarForValues10.js b/tests/baselines/reference/exportStarForValues10.js index dca5dad9b7a..d37ca3304f3 100644 --- a/tests/baselines/reference/exportStarForValues10.js +++ b/tests/baselines/reference/exportStarForValues10.js @@ -13,8 +13,9 @@ export * from "file1"; var x = 1; //// [file0.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var v; return { setters:[], @@ -24,8 +25,9 @@ System.register([], function(exports_1) { } }); //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -33,8 +35,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register(["file0"], function(exports_1) { +System.register(["file0"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; function exportStar_1(m) { var exports = {}; diff --git a/tests/baselines/reference/exportStarForValues6.js b/tests/baselines/reference/exportStarForValues6.js index 69357d87ee0..8c31f6b4d16 100644 --- a/tests/baselines/reference/exportStarForValues6.js +++ b/tests/baselines/reference/exportStarForValues6.js @@ -9,8 +9,9 @@ export * from "file1" export var x = 1; //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -18,8 +19,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; return { setters:[], diff --git a/tests/baselines/reference/exportStarForValuesInSystem.js b/tests/baselines/reference/exportStarForValuesInSystem.js index a33465f7e2e..49c6877377a 100644 --- a/tests/baselines/reference/exportStarForValuesInSystem.js +++ b/tests/baselines/reference/exportStarForValuesInSystem.js @@ -9,8 +9,9 @@ export * from "file1" var x = 1; //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -18,8 +19,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; return { setters:[], diff --git a/tests/baselines/reference/isolatedModulesPlainFile-System.js b/tests/baselines/reference/isolatedModulesPlainFile-System.js index b66bd497810..39320759740 100644 --- a/tests/baselines/reference/isolatedModulesPlainFile-System.js +++ b/tests/baselines/reference/isolatedModulesPlainFile-System.js @@ -5,8 +5,9 @@ run(1); //// [isolatedModulesPlainFile-System.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js index 80a46fb27fc..13f7d35b001 100644 --- a/tests/baselines/reference/modulePrologueSystem.js +++ b/tests/baselines/reference/modulePrologueSystem.js @@ -4,8 +4,9 @@ export class Foo {} //// [modulePrologueSystem.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var Foo; return { setters:[], diff --git a/tests/baselines/reference/outFilerootDirModuleNamesSystem.js b/tests/baselines/reference/outFilerootDirModuleNamesSystem.js index 298ad52689f..eb1ef2a4a54 100644 --- a/tests/baselines/reference/outFilerootDirModuleNamesSystem.js +++ b/tests/baselines/reference/outFilerootDirModuleNamesSystem.js @@ -11,8 +11,9 @@ export default function foo() { new Foo(); } //// [output.js] -System.register("b", ["a"], function(exports_1) { +System.register("b", ["a"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var a_1; function foo() { new a_1.default(); } exports_1("default", foo); @@ -25,8 +26,9 @@ System.register("b", ["a"], function(exports_1) { } } }); -System.register("a", ["b"], function(exports_2) { +System.register("a", ["b"], function(exports_2, context_2) { "use strict"; + var __moduleName = context_2 && context_2.id; var b_1; var Foo; return { diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js index d4552d33167..59bbb363022 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js +++ b/tests/baselines/reference/outModuleConcatSystem.js @@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || function (d, b) { function __() { this.constructor = d; } d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; -System.register("ref/a", [], function(exports_1) { +System.register("ref/a", [], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var A; return { setters:[], @@ -29,8 +30,9 @@ System.register("ref/a", [], function(exports_1) { } } }); -System.register("b", ["ref/a"], function(exports_2) { +System.register("b", ["ref/a"], function(exports_2, context_2) { "use strict"; + var __moduleName = context_2 && context_2.id; var a_1; var B; return { diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map index 47d3ba2d39c..be6e66c3cf4 100644 --- a/tests/baselines/reference/outModuleConcatSystem.js.map +++ b/tests/baselines/reference/outModuleConcatSystem.js.map @@ -1,2 +1,2 @@ //// [all.js.map] -{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;YAA5B,iBAA4B,CAAA"} \ No newline at end of file +{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;YAA5B,iBAA4B,CAAA"} \ No newline at end of file diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt index e3f521c828c..0281bdec5bd 100644 --- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt +++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt @@ -13,8 +13,9 @@ sourceFile:tests/cases/compiler/ref/a.ts >>> function __() { this.constructor = d; } >>> d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); >>>}; ->>>System.register("ref/a", [], function(exports_1) { +>>>System.register("ref/a", [], function(exports_1, context_1) { >>> "use strict"; +>>> var __moduleName = context_1 && context_1.id; >>> var A; >>> return { >>> setters:[], @@ -24,13 +25,13 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > ^^^^^^^^^^^^^^^^^^^-> 1 > > -1 >Emitted(12, 13) Source(2, 1) + SourceIndex(0) +1 >Emitted(13, 13) Source(2, 1) + SourceIndex(0) --- >>> function A() { 1->^^^^^^^^^^^^^^^^ 2 > ^^-> 1-> -1->Emitted(13, 17) Source(2, 1) + SourceIndex(0) +1->Emitted(14, 17) Source(2, 1) + SourceIndex(0) --- >>> } 1->^^^^^^^^^^^^^^^^ @@ -38,16 +39,16 @@ sourceFile:tests/cases/compiler/ref/a.ts 3 > ^^^^^^^^^-> 1->export class A { 2 > } -1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) -2 >Emitted(14, 18) Source(2, 19) + SourceIndex(0) +1->Emitted(15, 17) Source(2, 18) + SourceIndex(0) +2 >Emitted(15, 18) Source(2, 19) + SourceIndex(0) --- >>> return A; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(15, 17) Source(2, 18) + SourceIndex(0) -2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0) +1->Emitted(16, 17) Source(2, 18) + SourceIndex(0) +2 >Emitted(16, 25) Source(2, 19) + SourceIndex(0) --- >>> }()); 1 >^^^^^^^^^^^^ @@ -59,10 +60,10 @@ sourceFile:tests/cases/compiler/ref/a.ts 2 > } 3 > 4 > export class A { } -1 >Emitted(16, 13) Source(2, 18) + SourceIndex(0) -2 >Emitted(16, 14) Source(2, 19) + SourceIndex(0) -3 >Emitted(16, 14) Source(2, 1) + SourceIndex(0) -4 >Emitted(16, 18) Source(2, 19) + SourceIndex(0) +1 >Emitted(17, 13) Source(2, 18) + SourceIndex(0) +2 >Emitted(17, 14) Source(2, 19) + SourceIndex(0) +3 >Emitted(17, 14) Source(2, 1) + SourceIndex(0) +4 >Emitted(17, 18) Source(2, 19) + SourceIndex(0) --- >>> exports_1("A", A); 1->^^^^^^^^^^^^ @@ -71,9 +72,9 @@ sourceFile:tests/cases/compiler/ref/a.ts 1-> 2 > export class A { } 3 > -1->Emitted(17, 13) Source(2, 1) + SourceIndex(0) -2 >Emitted(17, 30) Source(2, 19) + SourceIndex(0) -3 >Emitted(17, 31) Source(2, 19) + SourceIndex(0) +1->Emitted(18, 13) Source(2, 1) + SourceIndex(0) +2 >Emitted(18, 30) Source(2, 19) + SourceIndex(0) +3 >Emitted(18, 31) Source(2, 19) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:all.js @@ -82,8 +83,9 @@ sourceFile:tests/cases/compiler/b.ts >>> } >>> } >>>}); ->>>System.register("b", ["ref/a"], function(exports_2) { +>>>System.register("b", ["ref/a"], function(exports_2, context_2) { >>> "use strict"; +>>> var __moduleName = context_2 && context_2.id; >>> var a_1; >>> var B; >>> return { @@ -97,29 +99,29 @@ sourceFile:tests/cases/compiler/b.ts 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 >import {A} from "./ref/a"; > -1 >Emitted(31, 13) Source(2, 1) + SourceIndex(1) +1 >Emitted(33, 13) Source(2, 1) + SourceIndex(1) --- >>> __extends(B, _super); 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(32, 17) Source(2, 24) + SourceIndex(1) -2 >Emitted(32, 38) Source(2, 25) + SourceIndex(1) +1->Emitted(34, 17) Source(2, 24) + SourceIndex(1) +2 >Emitted(34, 38) Source(2, 25) + SourceIndex(1) --- >>> function B() { 1 >^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(33, 17) Source(2, 1) + SourceIndex(1) +1 >Emitted(35, 17) Source(2, 1) + SourceIndex(1) --- >>> _super.apply(this, arguments); 1->^^^^^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 1->export class B extends 2 > A -1->Emitted(34, 21) Source(2, 24) + SourceIndex(1) -2 >Emitted(34, 51) Source(2, 25) + SourceIndex(1) +1->Emitted(36, 21) Source(2, 24) + SourceIndex(1) +2 >Emitted(36, 51) Source(2, 25) + SourceIndex(1) --- >>> } 1 >^^^^^^^^^^^^^^^^ @@ -127,16 +129,16 @@ sourceFile:tests/cases/compiler/b.ts 3 > ^^^^^^^^^-> 1 > { 2 > } -1 >Emitted(35, 17) Source(2, 28) + SourceIndex(1) -2 >Emitted(35, 18) Source(2, 29) + SourceIndex(1) +1 >Emitted(37, 17) Source(2, 28) + SourceIndex(1) +2 >Emitted(37, 18) Source(2, 29) + SourceIndex(1) --- >>> return B; 1->^^^^^^^^^^^^^^^^ 2 > ^^^^^^^^ 1-> 2 > } -1->Emitted(36, 17) Source(2, 28) + SourceIndex(1) -2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1) +1->Emitted(38, 17) Source(2, 28) + SourceIndex(1) +2 >Emitted(38, 25) Source(2, 29) + SourceIndex(1) --- >>> }(a_1.A)); 1 >^^^^^^^^^^^^ @@ -152,12 +154,12 @@ sourceFile:tests/cases/compiler/b.ts 4 > export class B extends 5 > A 6 > { } -1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1) -2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1) -3 >Emitted(37, 14) Source(2, 1) + SourceIndex(1) -4 >Emitted(37, 15) Source(2, 24) + SourceIndex(1) -5 >Emitted(37, 20) Source(2, 25) + SourceIndex(1) -6 >Emitted(37, 23) Source(2, 29) + SourceIndex(1) +1 >Emitted(39, 13) Source(2, 28) + SourceIndex(1) +2 >Emitted(39, 14) Source(2, 29) + SourceIndex(1) +3 >Emitted(39, 14) Source(2, 1) + SourceIndex(1) +4 >Emitted(39, 15) Source(2, 24) + SourceIndex(1) +5 >Emitted(39, 20) Source(2, 25) + SourceIndex(1) +6 >Emitted(39, 23) Source(2, 29) + SourceIndex(1) --- >>> exports_2("B", B); 1->^^^^^^^^^^^^ @@ -166,9 +168,9 @@ sourceFile:tests/cases/compiler/b.ts 1-> 2 > export class B extends A { } 3 > -1->Emitted(38, 13) Source(2, 1) + SourceIndex(1) -2 >Emitted(38, 30) Source(2, 29) + SourceIndex(1) -3 >Emitted(38, 31) Source(2, 29) + SourceIndex(1) +1->Emitted(40, 13) Source(2, 1) + SourceIndex(1) +2 >Emitted(40, 30) Source(2, 29) + SourceIndex(1) +3 >Emitted(40, 31) Source(2, 29) + SourceIndex(1) --- >>> } >>> } diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js index 5d414c97d05..cf88f4e9ba6 100644 --- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js +++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.js @@ -31,8 +31,9 @@ if (++y) { } //// [prefixUnaryOperatorsOnExportedVariables.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y; return { setters:[], diff --git a/tests/baselines/reference/systemExportAssignment.js b/tests/baselines/reference/systemExportAssignment.js index 72962cf835c..1e87af1ca22 100644 --- a/tests/baselines/reference/systemExportAssignment.js +++ b/tests/baselines/reference/systemExportAssignment.js @@ -10,8 +10,9 @@ import * as a from "a"; //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemExportAssignment2.js b/tests/baselines/reference/systemExportAssignment2.js index 0f4dd712493..177f36f23d2 100644 --- a/tests/baselines/reference/systemExportAssignment2.js +++ b/tests/baselines/reference/systemExportAssignment2.js @@ -10,8 +10,9 @@ import * as a from "a"; //// [a.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var a; return { setters:[], @@ -21,8 +22,9 @@ System.register([], function(exports_1) { } }); //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemExportAssignment3.js b/tests/baselines/reference/systemExportAssignment3.js index ca2492a54e1..78e330c6467 100644 --- a/tests/baselines/reference/systemExportAssignment3.js +++ b/tests/baselines/reference/systemExportAssignment3.js @@ -12,8 +12,9 @@ import * as a from "a"; //// [b.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModule1.js b/tests/baselines/reference/systemModule1.js index 52f3b482069..2b7e3e2c4dc 100644 --- a/tests/baselines/reference/systemModule1.js +++ b/tests/baselines/reference/systemModule1.js @@ -3,8 +3,9 @@ export var x = 1; //// [systemModule1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; return { setters:[], diff --git a/tests/baselines/reference/systemModule10.js b/tests/baselines/reference/systemModule10.js index ac32c4948e7..0c171ab6cc1 100644 --- a/tests/baselines/reference/systemModule10.js +++ b/tests/baselines/reference/systemModule10.js @@ -10,8 +10,9 @@ export {n2} export {n2 as n3} //// [systemModule10.js] -System.register(['file1', 'file2'], function(exports_1) { +System.register(['file1', 'file2'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var file1_1, n2; return { setters:[ diff --git a/tests/baselines/reference/systemModule10_ES5.js b/tests/baselines/reference/systemModule10_ES5.js index 0c98df6ba99..711ca3ed7a3 100644 --- a/tests/baselines/reference/systemModule10_ES5.js +++ b/tests/baselines/reference/systemModule10_ES5.js @@ -10,8 +10,9 @@ export {n2} export {n2 as n3} //// [systemModule10_ES5.js] -System.register(['file1', 'file2'], function(exports_1) { +System.register(['file1', 'file2'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var file1_1, n2; return { setters:[ diff --git a/tests/baselines/reference/systemModule11.js b/tests/baselines/reference/systemModule11.js index 92b0576b919..f7d47db1d7f 100644 --- a/tests/baselines/reference/systemModule11.js +++ b/tests/baselines/reference/systemModule11.js @@ -42,8 +42,9 @@ export * from 'a'; //// [file1.js] // set of tests cases that checks generation of local storage for exported names -System.register(['bar'], function(exports_1) { +System.register(['bar'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; function foo() { } exports_1("foo", foo); @@ -68,8 +69,9 @@ System.register(['bar'], function(exports_1) { } }); //// [file2.js] -System.register(['bar'], function(exports_1) { +System.register(['bar'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y; var exportedNames_1 = { 'x': true, @@ -94,8 +96,9 @@ System.register(['bar'], function(exports_1) { } }); //// [file3.js] -System.register(['a', 'bar'], function(exports_1) { +System.register(['a', 'bar'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { } exports_1("default", foo); var exportedNames_1 = { @@ -125,8 +128,9 @@ System.register(['a', 'bar'], function(exports_1) { } }); //// [file4.js] -System.register(['a'], function(exports_1) { +System.register(['a'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, z, z1; function foo() { } exports_1("foo", foo); @@ -147,8 +151,9 @@ System.register(['a'], function(exports_1) { } }); //// [file5.js] -System.register(['a'], function(exports_1) { +System.register(['a'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { } function exportStar_1(m) { var exports = {}; diff --git a/tests/baselines/reference/systemModule12.js b/tests/baselines/reference/systemModule12.js index d8961c3b001..45e7beaf218 100644 --- a/tests/baselines/reference/systemModule12.js +++ b/tests/baselines/reference/systemModule12.js @@ -5,8 +5,9 @@ import n from 'file1' //// [systemModule12.js] -System.register("NamedModule", [], function(exports_1) { +System.register("NamedModule", [], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModule13.js b/tests/baselines/reference/systemModule13.js index 0b81a946de4..e3ed2daf3a6 100644 --- a/tests/baselines/reference/systemModule13.js +++ b/tests/baselines/reference/systemModule13.js @@ -5,8 +5,9 @@ export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}}; for ([x] of [[1]]) {} //// [systemModule13.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y, z, z0, z1; return { setters:[], diff --git a/tests/baselines/reference/systemModule14.js b/tests/baselines/reference/systemModule14.js index 2ec8fc600f4..5eaafd9ba6b 100644 --- a/tests/baselines/reference/systemModule14.js +++ b/tests/baselines/reference/systemModule14.js @@ -11,8 +11,9 @@ var x = 1; export {foo as b} //// [systemModule14.js] -System.register(["foo"], function(exports_1) { +System.register(["foo"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var foo_1; var x; function foo() { diff --git a/tests/baselines/reference/systemModule15.js b/tests/baselines/reference/systemModule15.js index f8dc11b0ac7..f2fefb344ac 100644 --- a/tests/baselines/reference/systemModule15.js +++ b/tests/baselines/reference/systemModule15.js @@ -34,8 +34,9 @@ export default value; export var value2 = "v"; //// [file3.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var value; return { setters:[], @@ -46,8 +47,9 @@ System.register([], function(exports_1) { } }); //// [file4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var value2; return { setters:[], @@ -57,8 +59,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register(["./file3"], function(exports_1) { +System.register(["./file3"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var moduleCStar, file3_1, file3_2; return { setters:[ @@ -75,8 +78,9 @@ System.register(["./file3"], function(exports_1) { } }); //// [file1.js] -System.register(["./file2"], function(exports_1) { +System.register(["./file2"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var moduleB; return { setters:[ diff --git a/tests/baselines/reference/systemModule16.js b/tests/baselines/reference/systemModule16.js index 76fb85cd3ae..27fa77b9c76 100644 --- a/tests/baselines/reference/systemModule16.js +++ b/tests/baselines/reference/systemModule16.js @@ -13,8 +13,9 @@ x,y,a1,b1,d1; //// [systemModule16.js] -System.register(["foo", "bar"], function(exports_1) { +System.register(["foo", "bar"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y, foo_1; var exportedNames_1 = { 'x': true, diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js index 6daa119d287..6bf1ce25b84 100644 --- a/tests/baselines/reference/systemModule17.js +++ b/tests/baselines/reference/systemModule17.js @@ -42,8 +42,9 @@ export {II}; export {II as II1}; //// [f1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var A; return { setters:[], @@ -58,8 +59,9 @@ System.register([], function(exports_1) { } }); //// [f2.js] -System.register(["f1"], function(exports_1) { +System.register(["f1"], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var f1_1; var x, N, IX; return { diff --git a/tests/baselines/reference/systemModule2.js b/tests/baselines/reference/systemModule2.js index ee3dfd327ec..95755421eaa 100644 --- a/tests/baselines/reference/systemModule2.js +++ b/tests/baselines/reference/systemModule2.js @@ -4,8 +4,9 @@ var x = 1; export = x; //// [systemModule2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x; return { setters:[], diff --git a/tests/baselines/reference/systemModule3.js b/tests/baselines/reference/systemModule3.js index dbef74f3036..7800c8c220e 100644 --- a/tests/baselines/reference/systemModule3.js +++ b/tests/baselines/reference/systemModule3.js @@ -18,8 +18,9 @@ export default class C {} export default class {} //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function default_1() { } exports_1("default", default_1); return { @@ -29,8 +30,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function f() { } exports_1("default", f); return { @@ -40,8 +42,9 @@ System.register([], function(exports_1) { } }); //// [file3.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var C; return { setters:[], @@ -56,8 +59,9 @@ System.register([], function(exports_1) { } }); //// [file4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var default_1; return { setters:[], diff --git a/tests/baselines/reference/systemModule4.js b/tests/baselines/reference/systemModule4.js index 192c87d49ea..67990c63a58 100644 --- a/tests/baselines/reference/systemModule4.js +++ b/tests/baselines/reference/systemModule4.js @@ -4,8 +4,9 @@ export var x = 1; export var y; //// [systemModule4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y; return { setters:[], diff --git a/tests/baselines/reference/systemModule5.js b/tests/baselines/reference/systemModule5.js index 4a455f25b13..d0b1f79b2f7 100644 --- a/tests/baselines/reference/systemModule5.js +++ b/tests/baselines/reference/systemModule5.js @@ -4,8 +4,9 @@ export function foo() {} //// [systemModule5.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { } exports_1("foo", foo); return { diff --git a/tests/baselines/reference/systemModule6.js b/tests/baselines/reference/systemModule6.js index 51c8fbc68fb..4848c82f738 100644 --- a/tests/baselines/reference/systemModule6.js +++ b/tests/baselines/reference/systemModule6.js @@ -7,8 +7,9 @@ function foo() { //// [systemModule6.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var C; function foo() { new C(); diff --git a/tests/baselines/reference/systemModule7.js b/tests/baselines/reference/systemModule7.js index d76d86a3b0f..60114b54400 100644 --- a/tests/baselines/reference/systemModule7.js +++ b/tests/baselines/reference/systemModule7.js @@ -11,8 +11,9 @@ export module M { } //// [systemModule7.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var M; return { setters:[], diff --git a/tests/baselines/reference/systemModule8.js b/tests/baselines/reference/systemModule8.js index b6cdd677f00..f099628facb 100644 --- a/tests/baselines/reference/systemModule8.js +++ b/tests/baselines/reference/systemModule8.js @@ -31,8 +31,9 @@ export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}}; for ([x] of [[1]]) {} //// [systemModule8.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var x, y, z0, z1; function foo() { exports_1("x", x = 100); diff --git a/tests/baselines/reference/systemModule9.js b/tests/baselines/reference/systemModule9.js index 137dd019a02..940b9e5975b 100644 --- a/tests/baselines/reference/systemModule9.js +++ b/tests/baselines/reference/systemModule9.js @@ -22,8 +22,9 @@ export {x}; export {y as z}; //// [systemModule9.js] -System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'], function(exports_1) { +System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var ns, file2_1, file3_1, file5_1, ns3; var x, y; var exportedNames_1 = { diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.js b/tests/baselines/reference/systemModuleAmbientDeclarations.js index 9bdde23a842..91bad620b77 100644 --- a/tests/baselines/reference/systemModuleAmbientDeclarations.js +++ b/tests/baselines/reference/systemModuleAmbientDeclarations.js @@ -29,8 +29,9 @@ export declare module M { var v: number; } //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var promise, foo, c, e; return { setters:[], @@ -44,8 +45,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -53,8 +55,9 @@ System.register([], function(exports_1) { } }); //// [file3.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -62,8 +65,9 @@ System.register([], function(exports_1) { } }); //// [file4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -71,8 +75,9 @@ System.register([], function(exports_1) { } }); //// [file5.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { @@ -80,8 +85,9 @@ System.register([], function(exports_1) { } }); //// [file6.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; return { setters:[], execute: function() { diff --git a/tests/baselines/reference/systemModuleConstEnums.js b/tests/baselines/reference/systemModuleConstEnums.js index 8b8707768d9..08df549a87b 100644 --- a/tests/baselines/reference/systemModuleConstEnums.js +++ b/tests/baselines/reference/systemModuleConstEnums.js @@ -13,8 +13,9 @@ module M { } //// [systemModuleConstEnums.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { use(0 /* X */); use(0 /* X */); diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js index 8466d399ac9..be2f07cc59e 100644 --- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js +++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.js @@ -13,8 +13,9 @@ module M { } //// [systemModuleConstEnumsSeparateCompilation.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var TopLevelConstEnum, M; function foo() { use(TopLevelConstEnum.X); diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js index 5ed029a769a..1196aa8898d 100644 --- a/tests/baselines/reference/systemModuleDeclarationMerging.js +++ b/tests/baselines/reference/systemModuleDeclarationMerging.js @@ -10,8 +10,9 @@ export enum E {} export module E { var x; } //// [systemModuleDeclarationMerging.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var F, C, E; function F() { } exports_1("F", F); diff --git a/tests/baselines/reference/systemModuleExportDefault.js b/tests/baselines/reference/systemModuleExportDefault.js index cf1a99a4ad7..eaa4e6ddaa7 100644 --- a/tests/baselines/reference/systemModuleExportDefault.js +++ b/tests/baselines/reference/systemModuleExportDefault.js @@ -16,8 +16,9 @@ export default class C {} //// [file1.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function default_1() { } exports_1("default", default_1); return { @@ -27,8 +28,9 @@ System.register([], function(exports_1) { } }); //// [file2.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; function foo() { } exports_1("default", foo); return { @@ -38,8 +40,9 @@ System.register([], function(exports_1) { } }); //// [file3.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var default_1; return { setters:[], @@ -54,8 +57,9 @@ System.register([], function(exports_1) { } }); //// [file4.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var C; return { setters:[], diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js index ee9858a7fec..1cf993baec0 100644 --- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js +++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js @@ -13,8 +13,9 @@ export module TopLevelModule2 { } //// [systemModuleNonTopLevelModuleMembers.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var TopLevelClass, TopLevelModule, TopLevelEnum, TopLevelModule2; function TopLevelFunction() { } exports_1("TopLevelFunction", TopLevelFunction); diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js index fe9c2742f2d..0aab851cc57 100644 --- a/tests/baselines/reference/systemModuleWithSuperClass.js +++ b/tests/baselines/reference/systemModuleWithSuperClass.js @@ -13,8 +13,9 @@ export class Bar extends Foo { } //// [foo.js] -System.register([], function(exports_1) { +System.register([], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var Foo; return { setters:[], @@ -29,8 +30,9 @@ System.register([], function(exports_1) { } }); //// [bar.js] -System.register(['./foo'], function(exports_1) { +System.register(['./foo'], function(exports_1, context_1) { "use strict"; + var __moduleName = context_1 && context_1.id; var __extends = (this && this.__extends) || function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; function __() { this.constructor = d; } diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index 513d37673bb..d9fdaeb32ec 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -134,7 +134,10 @@ var x = 0;`, it("Sets module name", () => { let output = - `System.register("NamedModule", [], function(exports_1) {\n "use strict";\n var x;\n` + + `System.register("NamedModule", [], function(exports_1, context_1) {\n` + + ` "use strict";\n` + + ` var __moduleName = context_1 && context_1.id;\n` + + ` var x;\n` + ` return {\n` + ` setters:[],\n` + ` execute: function() {\n` + @@ -159,8 +162,9 @@ var x = 0;`, `declare function use(a: any);\n` + `use(foo);` let output = - `System.register(["SomeOtherName"], function(exports_1) {\n` + + `System.register(["SomeOtherName"], function(exports_1, context_1) {\n` + ` "use strict";\n` + + ` var __moduleName = context_1 && context_1.id;\n` + ` var SomeName_1;\n` + ` return {\n` + ` setters:[\n` + From 56355d1d17545084f1c77c32997481d073e81d45 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 29 Jan 2016 13:28:27 -0800 Subject: [PATCH 123/160] fix access check issues when declaration is in multiple files --- src/compiler/checker.ts | 2 +- .../reference/declarationMerging1.js | 21 ++++++++++++ .../reference/declarationMerging1.symbols | 21 ++++++++++++ .../reference/declarationMerging1.types | 21 ++++++++++++ .../reference/declarationMerging2.js | 32 +++++++++++++++++++ .../reference/declarationMerging2.symbols | 25 +++++++++++++++ .../reference/declarationMerging2.types | 25 +++++++++++++++ tests/cases/compiler/declarationMerging1.ts | 10 ++++++ tests/cases/compiler/declarationMerging2.ts | 15 +++++++++ 9 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/declarationMerging1.js create mode 100644 tests/baselines/reference/declarationMerging1.symbols create mode 100644 tests/baselines/reference/declarationMerging1.types create mode 100644 tests/baselines/reference/declarationMerging2.js create mode 100644 tests/baselines/reference/declarationMerging2.symbols create mode 100644 tests/baselines/reference/declarationMerging2.types create mode 100644 tests/cases/compiler/declarationMerging1.ts create mode 100644 tests/cases/compiler/declarationMerging2.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a0040982356..9f4845fae02 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -8776,7 +8776,7 @@ namespace ts { */ function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean { const flags = getDeclarationFlagsFromSymbol(prop); - const declaringClass = getDeclaredTypeOfSymbol(prop.parent); + const declaringClass = getDeclaredTypeOfSymbol(getMergedSymbol(prop.parent)); if (left.kind === SyntaxKind.SuperKeyword) { const errorNode = node.kind === SyntaxKind.PropertyAccessExpression ? diff --git a/tests/baselines/reference/declarationMerging1.js b/tests/baselines/reference/declarationMerging1.js new file mode 100644 index 00000000000..6b863def1c7 --- /dev/null +++ b/tests/baselines/reference/declarationMerging1.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/declarationMerging1.ts] //// + +//// [file1.ts] +class A { + protected _f: number; + getF() { return this._f; } +} + +//// [file2.ts] +interface A { + run(); +} + +//// [file1.js] +var A = (function () { + function A() { + } + A.prototype.getF = function () { return this._f; }; + return A; +}()); +//// [file2.js] diff --git a/tests/baselines/reference/declarationMerging1.symbols b/tests/baselines/reference/declarationMerging1.symbols new file mode 100644 index 00000000000..08fe0d4c1fd --- /dev/null +++ b/tests/baselines/reference/declarationMerging1.symbols @@ -0,0 +1,21 @@ +=== tests/cases/compiler/file1.ts === +class A { +>A : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0)) + + protected _f: number; +>_f : Symbol(_f, Decl(file1.ts, 0, 9)) + + getF() { return this._f; } +>getF : Symbol(getF, Decl(file1.ts, 1, 25)) +>this._f : Symbol(_f, Decl(file1.ts, 0, 9)) +>this : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0)) +>_f : Symbol(_f, Decl(file1.ts, 0, 9)) +} + +=== tests/cases/compiler/file2.ts === +interface A { +>A : Symbol(A, Decl(file1.ts, 0, 0), Decl(file2.ts, 0, 0)) + + run(); +>run : Symbol(run, Decl(file2.ts, 0, 13)) +} diff --git a/tests/baselines/reference/declarationMerging1.types b/tests/baselines/reference/declarationMerging1.types new file mode 100644 index 00000000000..9802d2ab542 --- /dev/null +++ b/tests/baselines/reference/declarationMerging1.types @@ -0,0 +1,21 @@ +=== tests/cases/compiler/file1.ts === +class A { +>A : A + + protected _f: number; +>_f : number + + getF() { return this._f; } +>getF : () => number +>this._f : number +>this : this +>_f : number +} + +=== tests/cases/compiler/file2.ts === +interface A { +>A : A + + run(); +>run : () => any +} diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js new file mode 100644 index 00000000000..3157445fa36 --- /dev/null +++ b/tests/baselines/reference/declarationMerging2.js @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/declarationMerging2.ts] //// + +//// [a.ts] + +export class A { + protected _f: number; + getF() { return this._f; } +} + +//// [b.ts] +export {} +declare module "./a" { + interface A { + run(); + } +} + +//// [a.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var A = (function () { + function A() { + } + A.prototype.getF = function () { return this._f; }; + return A; + }()); + exports.A = A; +}); +//// [b.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); diff --git a/tests/baselines/reference/declarationMerging2.symbols b/tests/baselines/reference/declarationMerging2.symbols new file mode 100644 index 00000000000..b3891374d32 --- /dev/null +++ b/tests/baselines/reference/declarationMerging2.symbols @@ -0,0 +1,25 @@ +=== tests/cases/compiler/a.ts === + +export class A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22)) + + protected _f: number; +>_f : Symbol(_f, Decl(a.ts, 1, 16)) + + getF() { return this._f; } +>getF : Symbol(getF, Decl(a.ts, 2, 25)) +>this._f : Symbol(_f, Decl(a.ts, 1, 16)) +>this : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22)) +>_f : Symbol(_f, Decl(a.ts, 1, 16)) +} + +=== tests/cases/compiler/b.ts === +export {} +declare module "./a" { + interface A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 1, 22)) + + run(); +>run : Symbol(run, Decl(b.ts, 2, 17)) + } +} diff --git a/tests/baselines/reference/declarationMerging2.types b/tests/baselines/reference/declarationMerging2.types new file mode 100644 index 00000000000..79e2818cf52 --- /dev/null +++ b/tests/baselines/reference/declarationMerging2.types @@ -0,0 +1,25 @@ +=== tests/cases/compiler/a.ts === + +export class A { +>A : A + + protected _f: number; +>_f : number + + getF() { return this._f; } +>getF : () => number +>this._f : number +>this : this +>_f : number +} + +=== tests/cases/compiler/b.ts === +export {} +declare module "./a" { + interface A { +>A : A + + run(); +>run : () => any + } +} diff --git a/tests/cases/compiler/declarationMerging1.ts b/tests/cases/compiler/declarationMerging1.ts new file mode 100644 index 00000000000..256cacf4a52 --- /dev/null +++ b/tests/cases/compiler/declarationMerging1.ts @@ -0,0 +1,10 @@ +// @filename: file1.ts +class A { + protected _f: number; + getF() { return this._f; } +} + +// @filename: file2.ts +interface A { + run(); +} \ No newline at end of file diff --git a/tests/cases/compiler/declarationMerging2.ts b/tests/cases/compiler/declarationMerging2.ts new file mode 100644 index 00000000000..6be5f4d0e4d --- /dev/null +++ b/tests/cases/compiler/declarationMerging2.ts @@ -0,0 +1,15 @@ +// @module: amd + +// @filename: a.ts +export class A { + protected _f: number; + getF() { return this._f; } +} + +// @filename: b.ts +export {} +declare module "./a" { + interface A { + run(); + } +} \ No newline at end of file From f89ebb8fd80e28e74cdbfb4f3585b3f1d7bdbe39 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 29 Jan 2016 16:01:41 -0800 Subject: [PATCH 124/160] Fixes bug #6673 #6673 --- src/compiler/binder.ts | 16 +++++++++--- tests/cases/fourslash/javaScriptModules13.ts | 4 ++- tests/cases/fourslash/javaScriptModules19.ts | 26 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 tests/cases/fourslash/javaScriptModules19.ts diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index 88a1a62ce4c..4a611ff2db3 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1384,7 +1384,7 @@ namespace ts { // Export assignment in some sort of block construct bindAnonymousDeclaration(node, SymbolFlags.Alias, getDeclarationName(node)); } - else if (boundExpression.kind === SyntaxKind.Identifier) { + else if (boundExpression.kind === SyntaxKind.Identifier && node.kind === SyntaxKind.ExportAssignment) { // An export default clause with an identifier exports all meanings of that identifier declareSymbol(container.symbol.exports, container.symbol, node, SymbolFlags.Alias, SymbolFlags.PropertyExcludes | SymbolFlags.AliasExcludes); } @@ -1444,8 +1444,16 @@ namespace ts { // Look up the function in the local scope, since prototype assignments should // follow the function declaration - const classId = ((node.left).expression).expression; - const funcSymbol = container.locals[classId.text]; + const leftSideOfAssignment = node.left as PropertyAccessExpression; + const classPrototype = leftSideOfAssignment.expression as PropertyAccessExpression; + const constructorFunction = classPrototype.expression as Identifier; + + // Fix up parent pointers since we're going to use these nodes before we bind into them + leftSideOfAssignment.parent = node; + constructorFunction.parent = classPrototype; + classPrototype.parent = leftSideOfAssignment; + + const funcSymbol = container.locals[constructorFunction.text]; if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function)) { return; } @@ -1456,7 +1464,7 @@ namespace ts { } // Declare the method/property - declareSymbol(funcSymbol.members, funcSymbol, node.left, SymbolFlags.Property, SymbolFlags.PropertyExcludes); + declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, SymbolFlags.Property, SymbolFlags.PropertyExcludes); } function bindCallExpression(node: CallExpression) { diff --git a/tests/cases/fourslash/javaScriptModules13.ts b/tests/cases/fourslash/javaScriptModules13.ts index 4eed369836f..cb3ef36783f 100644 --- a/tests/cases/fourslash/javaScriptModules13.ts +++ b/tests/cases/fourslash/javaScriptModules13.ts @@ -23,4 +23,6 @@ verify.completionListContains('y'); verify.not.completionListContains('invisible'); edit.insert('x.'); -verify.completionListContains('a'); +verify.memberListContains('a', undefined, undefined, 'property'); +edit.insert('a.'); +verify.memberListContains('toFixed', undefined, undefined, 'method'); diff --git a/tests/cases/fourslash/javaScriptModules19.ts b/tests/cases/fourslash/javaScriptModules19.ts new file mode 100644 index 00000000000..91e2439dcc9 --- /dev/null +++ b/tests/cases/fourslash/javaScriptModules19.ts @@ -0,0 +1,26 @@ +/// + +// Assignments to 'module.exports' create an external module + +// @allowJs: true +// @Filename: myMod.js +//// var x = { a: 10 }; +//// module.exports = x; + +// @Filename: isGlobal.js +//// var y = 10; + +// @Filename: consumer.js +//// var x = require('myMod'); +//// /**/; + +goTo.file('consumer.js'); +goTo.marker(); + +verify.completionListContains('y'); +verify.not.completionListContains('invisible'); + +edit.insert('x.'); +verify.memberListContains('a', undefined, undefined, 'property'); +edit.insert('a.'); +verify.memberListContains('toFixed', undefined, undefined, 'method'); From 5d22d18a70c24cac8fc45ecabb2d877018eae3fb Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 29 Jan 2016 16:27:34 -0800 Subject: [PATCH 125/160] allow augmentation for entities exported via 'export=' --- src/compiler/checker.ts | 29 ++- src/compiler/diagnosticMessages.json | 4 + .../reference/augmentExportEquals1.errors.txt | 26 +++ .../reference/augmentExportEquals1.js | 36 ++++ .../augmentExportEquals1_1.errors.txt | 29 +++ .../reference/augmentExportEquals1_1.js | 33 +++ .../reference/augmentExportEquals2.errors.txt | 25 +++ .../reference/augmentExportEquals2.js | 35 ++++ .../augmentExportEquals2_1.errors.txt | 29 +++ .../reference/augmentExportEquals2_1.js | 33 +++ .../reference/augmentExportEquals3.errors.txt | 31 +++ .../reference/augmentExportEquals3.js | 47 +++++ .../augmentExportEquals3_1.errors.txt | 34 +++ .../reference/augmentExportEquals3_1.js | 40 ++++ .../reference/augmentExportEquals4.errors.txt | 31 +++ .../reference/augmentExportEquals4.js | 51 +++++ .../augmentExportEquals4_1.errors.txt | 35 ++++ .../reference/augmentExportEquals4_1.js | 41 ++++ .../reference/augmentExportEquals5.js | 94 +++++++++ .../reference/augmentExportEquals5.symbols | 194 ++++++++++++++++++ .../reference/augmentExportEquals5.types | 194 ++++++++++++++++++ .../reference/augmentExportEquals6.js | 64 ++++++ .../reference/augmentExportEquals6.symbols | 67 ++++++ .../reference/augmentExportEquals6.types | 69 +++++++ .../reference/augmentExportEquals6_1.js | 38 ++++ .../reference/augmentExportEquals6_1.symbols | 45 ++++ .../reference/augmentExportEquals6_1.types | 45 ++++ tests/cases/compiler/augmentExportEquals1.ts | 19 ++ .../cases/compiler/augmentExportEquals1_1.ts | 22 ++ tests/cases/compiler/augmentExportEquals2.ts | 19 ++ .../cases/compiler/augmentExportEquals2_1.ts | 22 ++ tests/cases/compiler/augmentExportEquals3.ts | 24 +++ .../cases/compiler/augmentExportEquals3_1.ts | 27 +++ tests/cases/compiler/augmentExportEquals4.ts | 24 +++ .../cases/compiler/augmentExportEquals4_1.ts | 28 +++ tests/cases/compiler/augmentExportEquals5.ts | 82 ++++++++ tests/cases/compiler/augmentExportEquals6.ts | 28 +++ .../cases/compiler/augmentExportEquals6_1.ts | 26 +++ 38 files changed, 1709 insertions(+), 11 deletions(-) create mode 100644 tests/baselines/reference/augmentExportEquals1.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals1.js create mode 100644 tests/baselines/reference/augmentExportEquals1_1.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals1_1.js create mode 100644 tests/baselines/reference/augmentExportEquals2.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals2.js create mode 100644 tests/baselines/reference/augmentExportEquals2_1.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals2_1.js create mode 100644 tests/baselines/reference/augmentExportEquals3.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals3.js create mode 100644 tests/baselines/reference/augmentExportEquals3_1.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals3_1.js create mode 100644 tests/baselines/reference/augmentExportEquals4.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals4.js create mode 100644 tests/baselines/reference/augmentExportEquals4_1.errors.txt create mode 100644 tests/baselines/reference/augmentExportEquals4_1.js create mode 100644 tests/baselines/reference/augmentExportEquals5.js create mode 100644 tests/baselines/reference/augmentExportEquals5.symbols create mode 100644 tests/baselines/reference/augmentExportEquals5.types create mode 100644 tests/baselines/reference/augmentExportEquals6.js create mode 100644 tests/baselines/reference/augmentExportEquals6.symbols create mode 100644 tests/baselines/reference/augmentExportEquals6.types create mode 100644 tests/baselines/reference/augmentExportEquals6_1.js create mode 100644 tests/baselines/reference/augmentExportEquals6_1.symbols create mode 100644 tests/baselines/reference/augmentExportEquals6_1.types create mode 100644 tests/cases/compiler/augmentExportEquals1.ts create mode 100644 tests/cases/compiler/augmentExportEquals1_1.ts create mode 100644 tests/cases/compiler/augmentExportEquals2.ts create mode 100644 tests/cases/compiler/augmentExportEquals2_1.ts create mode 100644 tests/cases/compiler/augmentExportEquals3.ts create mode 100644 tests/cases/compiler/augmentExportEquals3_1.ts create mode 100644 tests/cases/compiler/augmentExportEquals4.ts create mode 100644 tests/cases/compiler/augmentExportEquals4_1.ts create mode 100644 tests/cases/compiler/augmentExportEquals5.ts create mode 100644 tests/cases/compiler/augmentExportEquals6.ts create mode 100644 tests/cases/compiler/augmentExportEquals6_1.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9f4845fae02..a280be5f22f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -395,10 +395,17 @@ namespace ts { if (!mainModule) { return; } - // if module symbol has already been merged - it is safe to use it. - // otherwise clone it - mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule); - mergeSymbol(mainModule, moduleAugmentation.symbol); + // obtain item referenced by 'export=' + mainModule = resolveExternalModuleSymbol(mainModule); + if (mainModule.flags & SymbolFlags.Namespace) { + // if module symbol has already been merged - it is safe to use it. + // otherwise clone it + mainModule = mainModule.flags & SymbolFlags.Merged ? mainModule : cloneSymbol(mainModule); + mergeSymbol(mainModule, moduleAugmentation.symbol); + } + else { + error(moduleName, Diagnostics.Cannot_augment_module_0_that_resolves_to_a_non_module_entity, moduleName.text); + } } } @@ -891,7 +898,7 @@ namespace ts { error(node.name, Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol)); } else if (!exportDefaultSymbol && allowSyntheticDefaultImports) { - return resolveSymbol(moduleSymbol.exports["export="]) || resolveSymbol(moduleSymbol); + return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol); } return exportDefaultSymbol; } @@ -1182,7 +1189,7 @@ namespace ts { // An external module with an 'export =' declaration resolves to the target of the 'export =' declaration, // and an external module with no 'export =' declaration resolves to the module itself. function resolveExternalModuleSymbol(moduleSymbol: Symbol): Symbol { - return moduleSymbol && resolveSymbol(moduleSymbol.exports["export="]) || moduleSymbol; + return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol; } // An external module with an 'export =' declaration may be referenced as an ES6 module provided the 'export =' @@ -1197,8 +1204,8 @@ namespace ts { return symbol; } - function getExportAssignmentSymbol(moduleSymbol: Symbol): Symbol { - return moduleSymbol.exports["export="]; + function hasExportAssignmentSymbol(moduleSymbol: Symbol): boolean { + return moduleSymbol.exports["export="] !== undefined; } function getExportsOfModuleAsArray(moduleSymbol: Symbol): Symbol[] { @@ -14845,7 +14852,7 @@ namespace ts { else { // export * from "foo" const moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier); - if (moduleSymbol && moduleSymbol.exports["export="]) { + if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) { error(node.moduleSpecifier, Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol)); } } @@ -15683,7 +15690,7 @@ namespace ts { return true; } - const hasExportAssignment = getExportAssignmentSymbol(moduleSymbol) !== undefined; + const hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol); // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment // otherwise it will return moduleSymbol itself moduleSymbol = resolveExternalModuleSymbol(moduleSymbol); @@ -16042,7 +16049,7 @@ namespace ts { if (!isExternalOrCommonJsModule(file)) { mergeSymbolTable(globals, file.locals); } - if (file.moduleAugmentations) { + if (file.moduleAugmentations.length) { (augmentations || (augmentations = [])).push(file.moduleAugmentations); } }); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index ca5a6d9d415..082077de01b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1819,6 +1819,10 @@ "category": "Error", "code": 2670 }, + "Cannot augment module '{0}' that resolves to a non-module entity.": { + "category": "Error", + "code": 2671 + }, "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", "code": 4000 diff --git a/tests/baselines/reference/augmentExportEquals1.errors.txt b/tests/baselines/reference/augmentExportEquals1.errors.txt new file mode 100644 index 00000000000..ca3cc82cce8 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals1.errors.txt @@ -0,0 +1,26 @@ +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. + + +==== tests/cases/compiler/file3.ts (1 errors) ==== + import x = require("./file1"); + import "./file2"; + let a: x.A; // should not work + ~ +!!! error TS2503: Cannot find namespace 'x'. +==== tests/cases/compiler/file1.ts (0 errors) ==== + var x = 1; + export = x; + +==== tests/cases/compiler/file2.ts (1 errors) ==== + + import x = require("./file1"); + + // augmentation for './file1' + // should error since './file1' does not have namespace meaning + declare module "./file1" { + ~~~~~~~~~ +!!! error TS2671: Cannot augment module './file1' that resolves to a non-module entity. + interface A { a } + } + \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js new file mode 100644 index 00000000000..98322c01a34 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals1.js @@ -0,0 +1,36 @@ +//// [tests/cases/compiler/augmentExportEquals1.ts] //// + +//// [file1.ts] +var x = 1; +export = x; + +//// [file2.ts] + +import x = require("./file1"); + +// augmentation for './file1' +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +//// [file3.ts] +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var x = 1; + return x; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file3.js] +define(["require", "exports", "./file2"], function (require, exports) { + "use strict"; + var a; // should not work +}); diff --git a/tests/baselines/reference/augmentExportEquals1_1.errors.txt b/tests/baselines/reference/augmentExportEquals1_1.errors.txt new file mode 100644 index 00000000000..013bffc4504 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals1_1.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. + + +==== tests/cases/compiler/file3.ts (1 errors) ==== + import x = require("file1"); + import "file2"; + let a: x.A; // should not work + ~ +!!! error TS2503: Cannot find namespace 'x'. +==== tests/cases/compiler/file1.d.ts (0 errors) ==== + + declare module "file1" { + var x: number; + export = x; + } + +==== tests/cases/compiler/file2.ts (1 errors) ==== + /// + import x = require("file1"); + + // augmentation for 'file1' + // should error since 'file1' does not have namespace meaning + declare module "file1" { + ~~~~~~~ +!!! error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. + interface A { a } + } + \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js new file mode 100644 index 00000000000..08f032ff33f --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals1_1.js @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/augmentExportEquals1_1.ts] //// + +//// [file1.d.ts] + +declare module "file1" { + var x: number; + export = x; +} + +//// [file2.ts] +/// +import x = require("file1"); + +// augmentation for 'file1' +// should error since 'file1' does not have namespace meaning +declare module "file1" { + interface A { a } +} + +//// [file3.ts] +import x = require("file1"); +import "file2"; +let a: x.A; // should not work + +//// [file2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file3.js] +define(["require", "exports", "file2"], function (require, exports) { + "use strict"; + var a; // should not work +}); diff --git a/tests/baselines/reference/augmentExportEquals2.errors.txt b/tests/baselines/reference/augmentExportEquals2.errors.txt new file mode 100644 index 00000000000..89c0778a3c9 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals2.errors.txt @@ -0,0 +1,25 @@ +tests/cases/compiler/file2.ts(4,16): error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. + + +==== tests/cases/compiler/file3.ts (1 errors) ==== + import x = require("./file1"); + import "./file2"; + let a: x.A; // should not work + ~ +!!! error TS2503: Cannot find namespace 'x'. +==== tests/cases/compiler/file1.ts (0 errors) ==== + + function foo() {} + export = foo; + +==== tests/cases/compiler/file2.ts (1 errors) ==== + import x = require("./file1"); + + // should error since './file1' does not have namespace meaning + declare module "./file1" { + ~~~~~~~~~ +!!! error TS2671: Cannot augment module './file1' that resolves to a non-module entity. + interface A { a } + } + \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js new file mode 100644 index 00000000000..fc373173e3c --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals2.js @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/augmentExportEquals2.ts] //// + +//// [file1.ts] + +function foo() {} +export = foo; + +//// [file2.ts] +import x = require("./file1"); + +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +//// [file3.ts] +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + function foo() { } + return foo; +}); +//// [file2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file3.js] +define(["require", "exports", "./file2"], function (require, exports) { + "use strict"; + var a; // should not work +}); diff --git a/tests/baselines/reference/augmentExportEquals2_1.errors.txt b/tests/baselines/reference/augmentExportEquals2_1.errors.txt new file mode 100644 index 00000000000..f0f571af5c4 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals2_1.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. + + +==== tests/cases/compiler/file3.ts (1 errors) ==== + import x = require("file1"); + import "file2"; + let a: x.A; // should not work + ~ +!!! error TS2503: Cannot find namespace 'x'. +==== tests/cases/compiler/file1.d.ts (0 errors) ==== + + declare module "file1" { + function foo(): void; + export = foo; + } + +==== tests/cases/compiler/file2.ts (1 errors) ==== + + /// + import x = require("file1"); + + // should error since './file1' does not have namespace meaning + declare module "file1" { + ~~~~~~~ +!!! error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. + interface A { a } + } + \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js new file mode 100644 index 00000000000..9046157bb26 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals2_1.js @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/augmentExportEquals2_1.ts] //// + +//// [file1.d.ts] + +declare module "file1" { + function foo(): void; + export = foo; +} + +//// [file2.ts] + +/// +import x = require("file1"); + +// should error since './file1' does not have namespace meaning +declare module "file1" { + interface A { a } +} + +//// [file3.ts] +import x = require("file1"); +import "file2"; +let a: x.A; // should not work + +//// [file2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file3.js] +define(["require", "exports", "file2"], function (require, exports) { + "use strict"; + var a; // should not work +}); diff --git a/tests/baselines/reference/augmentExportEquals3.errors.txt b/tests/baselines/reference/augmentExportEquals3.errors.txt new file mode 100644 index 00000000000..9fe63d84fb6 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals3.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/file2.ts(6,15): error TS2665: Module augmentation cannot introduce new names in the top level scope. +tests/cases/compiler/file2.ts(7,9): error TS2665: Module augmentation cannot introduce new names in the top level scope. + + +==== tests/cases/compiler/file1.ts (0 errors) ==== + + function foo() {} + namespace foo { + export var v = 1; + } + export = foo; + +==== tests/cases/compiler/file2.ts (2 errors) ==== + import x = require("./file1"); + x.b = 1; + + // OK - './file1' is a namespace + declare module "./file1" { + interface A { a } + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + let b: number; + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + } + +==== tests/cases/compiler/file3.ts (0 errors) ==== + import * as x from "./file1"; + import "./file2"; + let a: x.A; + let b = x.b; \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js new file mode 100644 index 00000000000..82cfa5f2166 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals3.js @@ -0,0 +1,47 @@ +//// [tests/cases/compiler/augmentExportEquals3.ts] //// + +//// [file1.ts] + +function foo() {} +namespace foo { + export var v = 1; +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + function foo() { } + var foo; + (function (foo) { + foo.v = 1; + })(foo || (foo = {})); + return foo; +}); +//// [file2.js] +define(["require", "exports", "./file1"], function (require, exports, x) { + "use strict"; + x.b = 1; +}); +//// [file3.js] +define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { + "use strict"; + var a; + var b = x.b; +}); diff --git a/tests/baselines/reference/augmentExportEquals3_1.errors.txt b/tests/baselines/reference/augmentExportEquals3_1.errors.txt new file mode 100644 index 00000000000..9fb0ce5f169 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals3_1.errors.txt @@ -0,0 +1,34 @@ +tests/cases/compiler/file2.ts(7,15): error TS2665: Module augmentation cannot introduce new names in the top level scope. +tests/cases/compiler/file2.ts(8,9): error TS2665: Module augmentation cannot introduce new names in the top level scope. + + +==== tests/cases/compiler/file1.d.ts (0 errors) ==== + declare module "file1" { + function foo(): void; + namespace foo { + export var v: number; + } + export = foo; + } + + +==== tests/cases/compiler/file2.ts (2 errors) ==== + /// + import x = require("file1"); + x.b = 1; + + // OK - './file1' is a namespace + declare module "file1" { + interface A { a } + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + let b: number; + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + } + +==== tests/cases/compiler/file3.ts (0 errors) ==== + import * as x from "file1"; + import "file2"; + let a: x.A; + let b = x.b; \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js new file mode 100644 index 00000000000..fc6b7b1cec3 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals3_1.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/augmentExportEquals3_1.ts] //// + +//// [file1.d.ts] +declare module "file1" { + function foo(): void; + namespace foo { + export var v: number; + } + export = foo; +} + + +//// [file2.ts] +/// +import x = require("file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = x.b; + +//// [file2.js] +define(["require", "exports", "file1"], function (require, exports, x) { + "use strict"; + x.b = 1; +}); +//// [file3.js] +define(["require", "exports", "file1", "file2"], function (require, exports, x) { + "use strict"; + var a; + var b = x.b; +}); diff --git a/tests/baselines/reference/augmentExportEquals4.errors.txt b/tests/baselines/reference/augmentExportEquals4.errors.txt new file mode 100644 index 00000000000..20f7cc32d9f --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals4.errors.txt @@ -0,0 +1,31 @@ +tests/cases/compiler/file2.ts(6,15): error TS2665: Module augmentation cannot introduce new names in the top level scope. +tests/cases/compiler/file2.ts(7,9): error TS2665: Module augmentation cannot introduce new names in the top level scope. + + +==== tests/cases/compiler/file1.ts (0 errors) ==== + + class foo {} + namespace foo { + export var v = 1; + } + export = foo; + +==== tests/cases/compiler/file2.ts (2 errors) ==== + import x = require("./file1"); + x.b = 1; + + // OK - './file1' is a namespace + declare module "./file1" { + interface A { a } + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + let b: number; + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + } + +==== tests/cases/compiler/file3.ts (0 errors) ==== + import * as x from "./file1"; + import "./file2"; + let a: x.A; + let b = x.b; \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js new file mode 100644 index 00000000000..ee0fc1892c2 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals4.js @@ -0,0 +1,51 @@ +//// [tests/cases/compiler/augmentExportEquals4.ts] //// + +//// [file1.ts] + +class foo {} +namespace foo { + export var v = 1; +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var foo = (function () { + function foo() { + } + return foo; + }()); + var foo; + (function (foo) { + foo.v = 1; + })(foo || (foo = {})); + return foo; +}); +//// [file2.js] +define(["require", "exports", "./file1"], function (require, exports, x) { + "use strict"; + x.b = 1; +}); +//// [file3.js] +define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { + "use strict"; + var a; + var b = x.b; +}); diff --git a/tests/baselines/reference/augmentExportEquals4_1.errors.txt b/tests/baselines/reference/augmentExportEquals4_1.errors.txt new file mode 100644 index 00000000000..a401f7a24cf --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals4_1.errors.txt @@ -0,0 +1,35 @@ +tests/cases/compiler/file2.ts(7,15): error TS2665: Module augmentation cannot introduce new names in the top level scope. +tests/cases/compiler/file2.ts(8,9): error TS2665: Module augmentation cannot introduce new names in the top level scope. + + +==== tests/cases/compiler/file1.d.ts (0 errors) ==== + + declare module "file1" { + class foo {} + namespace foo { + export var v: number; + } + export = foo; + } + + +==== tests/cases/compiler/file2.ts (2 errors) ==== + /// + import x = require("file1"); + x.b = 1; + + // OK - './file1' is a namespace + declare module "file1" { + interface A { a } + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + let b: number; + ~ +!!! error TS2665: Module augmentation cannot introduce new names in the top level scope. + } + +==== tests/cases/compiler/file3.ts (0 errors) ==== + import * as x from "file1"; + import "file2"; + let a: x.A; + let b = x.b; \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js new file mode 100644 index 00000000000..b4ba932d44b --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals4_1.js @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/augmentExportEquals4_1.ts] //// + +//// [file1.d.ts] + +declare module "file1" { + class foo {} + namespace foo { + export var v: number; + } + export = foo; +} + + +//// [file2.ts] +/// +import x = require("file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = x.b; + +//// [file2.js] +define(["require", "exports", "file1"], function (require, exports, x) { + "use strict"; + x.b = 1; +}); +//// [file3.js] +define(["require", "exports", "file1", "file2"], function (require, exports, x) { + "use strict"; + var a; + var b = x.b; +}); diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js new file mode 100644 index 00000000000..49b6c3fed56 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals5.js @@ -0,0 +1,94 @@ +//// [tests/cases/compiler/augmentExportEquals5.ts] //// + +//// [express.d.ts] + + +declare module Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { + function e(): e.Express; + namespace e { + interface IRoute { + all(...handler: RequestHandler[]): IRoute; + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; + } + + export function Router(options?: any): Router; + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } + + interface Request extends Express.Request { + + get (name: string): string; + } + + interface Response extends Express.Response { + charset: string; + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; + } + + interface Application extends IRouter, Express.Application { + routes: any; + } + + interface Express extends Application { + createApplication(): Application; + } + + var static: any; + } + + export = e; +} + +//// [augmentation.ts] +/// +import * as e from "express"; +declare module "express" { + interface Request { + id: number; + } +} + +//// [consumer.ts] +import { Request } from "express"; +import "./augmentation"; +let x: Request; +const y = x.id; + +//// [augmentation.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [consumer.js] +define(["require", "exports", "./augmentation"], function (require, exports) { + "use strict"; + var x; + var y = x.id; +}); diff --git a/tests/baselines/reference/augmentExportEquals5.symbols b/tests/baselines/reference/augmentExportEquals5.symbols new file mode 100644 index 00000000000..f255bf8c065 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals5.symbols @@ -0,0 +1,194 @@ +=== tests/cases/compiler/express.d.ts === + + +declare module Express { +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) + + export interface Request { } +>Request : Symbol(Request, Decl(express.d.ts, 2, 24)) + + export interface Response { } +>Response : Symbol(Response, Decl(express.d.ts, 3, 32)) + + export interface Application { } +>Application : Symbol(Application, Decl(express.d.ts, 4, 33)) +} + +declare module "express" { + function e(): e.Express; +>e : Symbol(, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28), Decl(augmentation.ts, 1, 29)) +>e : Symbol(e, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28)) +>Express : Symbol(Express, Decl(express.d.ts, 54, 9)) + + namespace e { +>e : Symbol(, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28), Decl(augmentation.ts, 1, 29)) + + interface IRoute { +>IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17)) + + all(...handler: RequestHandler[]): IRoute; +>all : Symbol(all, Decl(express.d.ts, 11, 26)) +>handler : Symbol(handler, Decl(express.d.ts, 12, 16)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9)) +>IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17)) + } + + interface IRouterMatcher { +>IRouterMatcher : Symbol(IRouterMatcher, Decl(express.d.ts, 13, 9)) +>T : Symbol(T, Decl(express.d.ts, 15, 33)) + + (name: string|RegExp, ...handlers: RequestHandler[]): T; +>name : Symbol(name, Decl(express.d.ts, 16, 13)) +>RegExp : Symbol(RegExp, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>handlers : Symbol(handlers, Decl(express.d.ts, 16, 33)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9)) +>T : Symbol(T, Decl(express.d.ts, 15, 33)) + } + + interface IRouter extends RequestHandler { +>IRouter : Symbol(IRouter, Decl(express.d.ts, 17, 9)) +>T : Symbol(T, Decl(express.d.ts, 19, 26)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9)) + + route(path: string): IRoute; +>route : Symbol(route, Decl(express.d.ts, 19, 53)) +>path : Symbol(path, Decl(express.d.ts, 20, 18)) +>IRoute : Symbol(IRoute, Decl(express.d.ts, 10, 17)) + } + + export function Router(options?: any): Router; +>Router : Symbol(Router, Decl(express.d.ts, 21, 9), Decl(express.d.ts, 23, 54)) +>options : Symbol(options, Decl(express.d.ts, 23, 31)) +>Router : Symbol(Router, Decl(express.d.ts, 21, 9), Decl(express.d.ts, 23, 54)) + + export interface Router extends IRouter {} +>Router : Symbol(Router, Decl(express.d.ts, 21, 9), Decl(express.d.ts, 23, 54)) +>IRouter : Symbol(IRouter, Decl(express.d.ts, 17, 9)) +>Router : Symbol(Router, Decl(express.d.ts, 21, 9), Decl(express.d.ts, 23, 54)) + + interface Errback { (err: Error): void; } +>Errback : Symbol(Errback, Decl(express.d.ts, 25, 58)) +>err : Symbol(err, Decl(express.d.ts, 27, 29)) +>Error : Symbol(Error, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + + interface Request extends Express.Request { +>Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) +>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 2, 24)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Request : Symbol(Express.Request, Decl(express.d.ts, 2, 24)) + + get (name: string): string; +>get : Symbol(get, Decl(express.d.ts, 29, 51)) +>name : Symbol(name, Decl(express.d.ts, 31, 17)) + } + + interface Response extends Express.Response { +>Response : Symbol(Response, Decl(express.d.ts, 32, 9)) +>Express.Response : Symbol(Express.Response, Decl(express.d.ts, 3, 32)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Response : Symbol(Express.Response, Decl(express.d.ts, 3, 32)) + + charset: string; +>charset : Symbol(charset, Decl(express.d.ts, 34, 53)) + } + + interface ErrorRequestHandler { +>ErrorRequestHandler : Symbol(ErrorRequestHandler, Decl(express.d.ts, 36, 9)) + + (err: any, req: Request, res: Response, next: Function): any; +>err : Symbol(err, Decl(express.d.ts, 39, 13)) +>req : Symbol(req, Decl(express.d.ts, 39, 22)) +>Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 39, 36)) +>Response : Symbol(Response, Decl(express.d.ts, 32, 9)) +>next : Symbol(next, Decl(express.d.ts, 39, 51)) +>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + } + + interface RequestHandler { +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9)) + + (req: Request, res: Response, next: Function): any; +>req : Symbol(req, Decl(express.d.ts, 43, 13)) +>Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 43, 26)) +>Response : Symbol(Response, Decl(express.d.ts, 32, 9)) +>next : Symbol(next, Decl(express.d.ts, 43, 41)) +>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) + } + + interface Handler extends RequestHandler {} +>Handler : Symbol(Handler, Decl(express.d.ts, 44, 9)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 40, 9)) + + interface RequestParamHandler { +>RequestParamHandler : Symbol(RequestParamHandler, Decl(express.d.ts, 46, 51)) + + (req: Request, res: Response, next: Function, param: any): any; +>req : Symbol(req, Decl(express.d.ts, 49, 13)) +>Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 49, 26)) +>Response : Symbol(Response, Decl(express.d.ts, 32, 9)) +>next : Symbol(next, Decl(express.d.ts, 49, 41)) +>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>param : Symbol(param, Decl(express.d.ts, 49, 57)) + } + + interface Application extends IRouter, Express.Application { +>Application : Symbol(Application, Decl(express.d.ts, 50, 9)) +>IRouter : Symbol(IRouter, Decl(express.d.ts, 17, 9)) +>Application : Symbol(Application, Decl(express.d.ts, 50, 9)) +>Express.Application : Symbol(Express.Application, Decl(express.d.ts, 4, 33)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Application : Symbol(Express.Application, Decl(express.d.ts, 4, 33)) + + routes: any; +>routes : Symbol(routes, Decl(express.d.ts, 52, 81)) + } + + interface Express extends Application { +>Express : Symbol(Express, Decl(express.d.ts, 54, 9)) +>Application : Symbol(Application, Decl(express.d.ts, 50, 9)) + + createApplication(): Application; +>createApplication : Symbol(createApplication, Decl(express.d.ts, 56, 47)) +>Application : Symbol(Application, Decl(express.d.ts, 50, 9)) + } + + var static: any; +>static : Symbol(static, Decl(express.d.ts, 60, 11)) + } + + export = e; +>e : Symbol(e, Decl(express.d.ts, 8, 26), Decl(express.d.ts, 9, 28)) +} + +=== tests/cases/compiler/augmentation.ts === +/// +import * as e from "express"; +>e : Symbol(e, Decl(augmentation.ts, 1, 6)) + +declare module "express" { + interface Request { +>Request : Symbol(Request, Decl(express.d.ts, 27, 49), Decl(augmentation.ts, 2, 26)) + + id: number; +>id : Symbol(id, Decl(augmentation.ts, 3, 23)) + } +} + +=== tests/cases/compiler/consumer.ts === +import { Request } from "express"; +>Request : Symbol(Request, Decl(consumer.ts, 0, 8)) + +import "./augmentation"; +let x: Request; +>x : Symbol(x, Decl(consumer.ts, 2, 3)) +>Request : Symbol(Request, Decl(consumer.ts, 0, 8)) + +const y = x.id; +>y : Symbol(y, Decl(consumer.ts, 3, 5)) +>x.id : Symbol(Request.id, Decl(augmentation.ts, 3, 23)) +>x : Symbol(x, Decl(consumer.ts, 2, 3)) +>id : Symbol(Request.id, Decl(augmentation.ts, 3, 23)) + diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types new file mode 100644 index 00000000000..42b79674dfd --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals5.types @@ -0,0 +1,194 @@ +=== tests/cases/compiler/express.d.ts === + + +declare module Express { +>Express : any + + export interface Request { } +>Request : Request + + export interface Response { } +>Response : Response + + export interface Application { } +>Application : Application +} + +declare module "express" { + function e(): e.Express; +>e : typeof +>e : any +>Express : Express + + namespace e { +>e : typeof + + interface IRoute { +>IRoute : IRoute + + all(...handler: RequestHandler[]): IRoute; +>all : (...handler: RequestHandler[]) => IRoute +>handler : RequestHandler[] +>RequestHandler : RequestHandler +>IRoute : IRoute + } + + interface IRouterMatcher { +>IRouterMatcher : IRouterMatcher +>T : T + + (name: string|RegExp, ...handlers: RequestHandler[]): T; +>name : string | RegExp +>RegExp : RegExp +>handlers : RequestHandler[] +>RequestHandler : RequestHandler +>T : T + } + + interface IRouter extends RequestHandler { +>IRouter : IRouter +>T : T +>RequestHandler : RequestHandler + + route(path: string): IRoute; +>route : (path: string) => IRoute +>path : string +>IRoute : IRoute + } + + export function Router(options?: any): Router; +>Router : (options?: any) => Router +>options : any +>Router : Router + + export interface Router extends IRouter {} +>Router : Router +>IRouter : IRouter +>Router : Router + + interface Errback { (err: Error): void; } +>Errback : Errback +>err : Error +>Error : Error + + interface Request extends Express.Request { +>Request : Request +>Express.Request : any +>Express : any +>Request : Express.Request + + get (name: string): string; +>get : (name: string) => string +>name : string + } + + interface Response extends Express.Response { +>Response : Response +>Express.Response : any +>Express : any +>Response : Express.Response + + charset: string; +>charset : string + } + + interface ErrorRequestHandler { +>ErrorRequestHandler : ErrorRequestHandler + + (err: any, req: Request, res: Response, next: Function): any; +>err : any +>req : Request +>Request : Request +>res : Response +>Response : Response +>next : Function +>Function : Function + } + + interface RequestHandler { +>RequestHandler : RequestHandler + + (req: Request, res: Response, next: Function): any; +>req : Request +>Request : Request +>res : Response +>Response : Response +>next : Function +>Function : Function + } + + interface Handler extends RequestHandler {} +>Handler : Handler +>RequestHandler : RequestHandler + + interface RequestParamHandler { +>RequestParamHandler : RequestParamHandler + + (req: Request, res: Response, next: Function, param: any): any; +>req : Request +>Request : Request +>res : Response +>Response : Response +>next : Function +>Function : Function +>param : any + } + + interface Application extends IRouter, Express.Application { +>Application : Application +>IRouter : IRouter +>Application : Application +>Express.Application : any +>Express : any +>Application : Express.Application + + routes: any; +>routes : any + } + + interface Express extends Application { +>Express : Express +>Application : Application + + createApplication(): Application; +>createApplication : () => Application +>Application : Application + } + + var static: any; +>static : any + } + + export = e; +>e : typeof e +} + +=== tests/cases/compiler/augmentation.ts === +/// +import * as e from "express"; +>e : typeof e + +declare module "express" { + interface Request { +>Request : Request + + id: number; +>id : number + } +} + +=== tests/cases/compiler/consumer.ts === +import { Request } from "express"; +>Request : any + +import "./augmentation"; +let x: Request; +>x : Request +>Request : Request + +const y = x.id; +>y : number +>x.id : number +>x : Request +>id : number + diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js new file mode 100644 index 00000000000..94dfa389c6d --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6.js @@ -0,0 +1,64 @@ +//// [tests/cases/compiler/augmentExportEquals6.ts] //// + +//// [file1.ts] + +class foo {} +namespace foo { + export class A {} + export namespace B { export let a; } +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.B.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a: number } + namespace B { + export let b: number; + } +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = a.a; +let c = x.B.b; + +//// [file1.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var foo = (function () { + function foo() { + } + return foo; + }()); + var foo; + (function (foo) { + var A = (function () { + function A() { + } + return A; + }()); + foo.A = A; + var B; + (function (B) { + })(B = foo.B || (foo.B = {})); + })(foo || (foo = {})); + return foo; +}); +//// [file2.js] +define(["require", "exports", "./file1"], function (require, exports, x) { + "use strict"; + x.B.b = 1; +}); +//// [file3.js] +define(["require", "exports", "./file1", "./file2"], function (require, exports, x) { + "use strict"; + var a; + var b = a.a; + var c = x.B.b; +}); diff --git a/tests/baselines/reference/augmentExportEquals6.symbols b/tests/baselines/reference/augmentExportEquals6.symbols new file mode 100644 index 00000000000..24f8ef7c903 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6.symbols @@ -0,0 +1,67 @@ +=== tests/cases/compiler/file1.ts === + +class foo {} +>foo : Symbol(, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 10)) + +namespace foo { +>foo : Symbol(, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 12), Decl(file2.ts, 1, 10)) + + export class A {} +>A : Symbol(A, Decl(file1.ts, 2, 15), Decl(file2.ts, 4, 26)) + + export namespace B { export let a; } +>B : Symbol(B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) +>a : Symbol(a, Decl(file1.ts, 4, 35)) +} +export = foo; +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 1, 12)) + +=== tests/cases/compiler/file2.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +x.B.b = 1; +>x.B.b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) +>x.B : Symbol(x.B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) +>x : Symbol(x, Decl(file2.ts, 0, 0)) +>B : Symbol(x.B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) +>b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a: number } +>A : Symbol(A, Decl(file1.ts, 2, 15), Decl(file2.ts, 4, 26)) +>a : Symbol(a, Decl(file2.ts, 5, 17)) + + namespace B { +>B : Symbol(B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) + + export let b: number; +>b : Symbol(b, Decl(file2.ts, 7, 18)) + } +} + +=== tests/cases/compiler/file3.ts === +import * as x from "./file1"; +>x : Symbol(x, Decl(file3.ts, 0, 6)) + +import "./file2"; +let a: x.A; +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>A : Symbol(x.A, Decl(file1.ts, 2, 15), Decl(file2.ts, 4, 26)) + +let b = a.a; +>b : Symbol(b, Decl(file3.ts, 3, 3)) +>a.a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) + +let c = x.B.b; +>c : Symbol(c, Decl(file3.ts, 4, 3)) +>x.B.b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) +>x.B : Symbol(x.B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>B : Symbol(x.B, Decl(file1.ts, 3, 21), Decl(file2.ts, 5, 29)) +>b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) + diff --git a/tests/baselines/reference/augmentExportEquals6.types b/tests/baselines/reference/augmentExportEquals6.types new file mode 100644 index 00000000000..1a2b2b22ccb --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6.types @@ -0,0 +1,69 @@ +=== tests/cases/compiler/file1.ts === + +class foo {} +>foo : + +namespace foo { +>foo : typeof + + export class A {} +>A : A + + export namespace B { export let a; } +>B : typeof B +>a : any +} +export = foo; +>foo : foo + +=== tests/cases/compiler/file2.ts === +import x = require("./file1"); +>x : typeof x + +x.B.b = 1; +>x.B.b = 1 : number +>x.B.b : number +>x.B : typeof x.B +>x : typeof x +>B : typeof x.B +>b : number +>1 : number + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a: number } +>A : A +>a : number + + namespace B { +>B : typeof B + + export let b: number; +>b : number + } +} + +=== tests/cases/compiler/file3.ts === +import * as x from "./file1"; +>x : typeof x + +import "./file2"; +let a: x.A; +>a : x.A +>x : any +>A : x.A + +let b = a.a; +>b : number +>a.a : number +>a : x.A +>a : number + +let c = x.B.b; +>c : number +>x.B.b : number +>x.B : typeof x.B +>x : typeof x +>B : typeof x.B +>b : number + diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js new file mode 100644 index 00000000000..c7c560183cc --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6_1.js @@ -0,0 +1,38 @@ +//// [tests/cases/compiler/augmentExportEquals6_1.ts] //// + +//// [file1.d.ts] + +declare module "file1" { + class foo {} + namespace foo { + class A {} + } + export = foo; +} + + +//// [file2.ts] +/// +import x = require("file1"); + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a: number } +} + +//// [file3.ts] +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = a.a; + +//// [file2.js] +define(["require", "exports"], function (require, exports) { + "use strict"; +}); +//// [file3.js] +define(["require", "exports", "file2"], function (require, exports) { + "use strict"; + var a; + var b = a.a; +}); diff --git a/tests/baselines/reference/augmentExportEquals6_1.symbols b/tests/baselines/reference/augmentExportEquals6_1.symbols new file mode 100644 index 00000000000..5c45af00a48 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6_1.symbols @@ -0,0 +1,45 @@ +=== tests/cases/compiler/file1.d.ts === + +declare module "file1" { + class foo {} +>foo : Symbol(, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 1, 28)) + + namespace foo { +>foo : Symbol(, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16), Decl(file2.ts, 1, 28)) + + class A {} +>A : Symbol(A, Decl(file1.d.ts, 3, 19), Decl(file2.ts, 4, 24)) + } + export = foo; +>foo : Symbol(foo, Decl(file1.d.ts, 1, 24), Decl(file1.d.ts, 2, 16)) +} + + +=== tests/cases/compiler/file2.ts === +/// +import x = require("file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a: number } +>A : Symbol(A, Decl(file1.d.ts, 3, 19), Decl(file2.ts, 4, 24)) +>a : Symbol(a, Decl(file2.ts, 5, 17)) +} + +=== tests/cases/compiler/file3.ts === +import * as x from "file1"; +>x : Symbol(x, Decl(file3.ts, 0, 6)) + +import "file2"; +let a: x.A; +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>A : Symbol(x.A, Decl(file1.d.ts, 3, 19), Decl(file2.ts, 4, 24)) + +let b = a.a; +>b : Symbol(b, Decl(file3.ts, 3, 3)) +>a.a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) + diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types new file mode 100644 index 00000000000..a9cc78056c8 --- /dev/null +++ b/tests/baselines/reference/augmentExportEquals6_1.types @@ -0,0 +1,45 @@ +=== tests/cases/compiler/file1.d.ts === + +declare module "file1" { + class foo {} +>foo : + + namespace foo { +>foo : typeof + + class A {} +>A : A + } + export = foo; +>foo : foo +} + + +=== tests/cases/compiler/file2.ts === +/// +import x = require("file1"); +>x : typeof x + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a: number } +>A : A +>a : number +} + +=== tests/cases/compiler/file3.ts === +import * as x from "file1"; +>x : typeof x + +import "file2"; +let a: x.A; +>a : x.A +>x : any +>A : x.A + +let b = a.a; +>b : number +>a.a : number +>a : x.A +>a : number + diff --git a/tests/cases/compiler/augmentExportEquals1.ts b/tests/cases/compiler/augmentExportEquals1.ts new file mode 100644 index 00000000000..4479fd063b9 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals1.ts @@ -0,0 +1,19 @@ +// @module: amd +// @filename: file1.ts +var x = 1; +export = x; + +// @filename: file2.ts + +import x = require("./file1"); + +// augmentation for './file1' +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +// @filename: file3.ts +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals1_1.ts b/tests/cases/compiler/augmentExportEquals1_1.ts new file mode 100644 index 00000000000..6afc6e70910 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals1_1.ts @@ -0,0 +1,22 @@ +// @module: amd + +// @filename: file1.d.ts +declare module "file1" { + var x: number; + export = x; +} + +// @filename: file2.ts +/// +import x = require("file1"); + +// augmentation for 'file1' +// should error since 'file1' does not have namespace meaning +declare module "file1" { + interface A { a } +} + +// @filename: file3.ts +import x = require("file1"); +import "file2"; +let a: x.A; // should not work \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals2.ts b/tests/cases/compiler/augmentExportEquals2.ts new file mode 100644 index 00000000000..1d4c1fae35c --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals2.ts @@ -0,0 +1,19 @@ +// @module: amd + +// @filename: file1.ts +function foo() {} +export = foo; + +// @filename: file2.ts +import x = require("./file1"); + +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +// @filename: file3.ts +// @filename: file3.ts +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals2_1.ts b/tests/cases/compiler/augmentExportEquals2_1.ts new file mode 100644 index 00000000000..b6aeb21efd0 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals2_1.ts @@ -0,0 +1,22 @@ +// @module: amd + +// @filename: file1.d.ts +declare module "file1" { + function foo(): void; + export = foo; +} + +// @filename: file2.ts + +/// +import x = require("file1"); + +// should error since './file1' does not have namespace meaning +declare module "file1" { + interface A { a } +} + +// @filename: file3.ts +import x = require("file1"); +import "file2"; +let a: x.A; // should not work \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals3.ts b/tests/cases/compiler/augmentExportEquals3.ts new file mode 100644 index 00000000000..81a0e1d5448 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals3.ts @@ -0,0 +1,24 @@ +// @module: amd + +// @filename: file1.ts +function foo() {} +namespace foo { + export var v = 1; +} +export = foo; + +// @filename: file2.ts +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +// @filename: file3.ts +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals3_1.ts b/tests/cases/compiler/augmentExportEquals3_1.ts new file mode 100644 index 00000000000..ad329643fa5 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals3_1.ts @@ -0,0 +1,27 @@ +// @module: amd +// @filename: file1.d.ts +declare module "file1" { + function foo(): void; + namespace foo { + export var v: number; + } + export = foo; +} + + +// @filename: file2.ts +/// +import x = require("file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a } + let b: number; +} + +// @filename: file3.ts +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = x.b; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals4.ts b/tests/cases/compiler/augmentExportEquals4.ts new file mode 100644 index 00000000000..85294682f5c --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals4.ts @@ -0,0 +1,24 @@ +// @module: amd + +// @filename: file1.ts +class foo {} +namespace foo { + export var v = 1; +} +export = foo; + +// @filename: file2.ts +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +// @filename: file3.ts +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals4_1.ts b/tests/cases/compiler/augmentExportEquals4_1.ts new file mode 100644 index 00000000000..467d0af38ef --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals4_1.ts @@ -0,0 +1,28 @@ +// @module: amd + +// @filename: file1.d.ts +declare module "file1" { + class foo {} + namespace foo { + export var v: number; + } + export = foo; +} + + +// @filename: file2.ts +/// +import x = require("file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a } + let b: number; +} + +// @filename: file3.ts +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = x.b; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals5.ts b/tests/cases/compiler/augmentExportEquals5.ts new file mode 100644 index 00000000000..3250a40f131 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals5.ts @@ -0,0 +1,82 @@ +// @module: amd + +// @filename: express.d.ts + +declare module Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { + function e(): e.Express; + namespace e { + interface IRoute { + all(...handler: RequestHandler[]): IRoute; + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; + } + + export function Router(options?: any): Router; + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } + + interface Request extends Express.Request { + + get (name: string): string; + } + + interface Response extends Express.Response { + charset: string; + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; + } + + interface Application extends IRouter, Express.Application { + routes: any; + } + + interface Express extends Application { + createApplication(): Application; + } + + var static: any; + } + + export = e; +} + +// @filename: augmentation.ts +/// +import * as e from "express"; +declare module "express" { + interface Request { + id: number; + } +} + +// @filename: consumer.ts +import { Request } from "express"; +import "./augmentation"; +let x: Request; +const y = x.id; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals6.ts b/tests/cases/compiler/augmentExportEquals6.ts new file mode 100644 index 00000000000..a0dd50c53f0 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals6.ts @@ -0,0 +1,28 @@ +// @module: amd + +// @filename: file1.ts +class foo {} +namespace foo { + export class A {} + export namespace B { export let a; } +} +export = foo; + +// @filename: file2.ts +import x = require("./file1"); +x.B.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a: number } + namespace B { + export let b: number; + } +} + +// @filename: file3.ts +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = a.a; +let c = x.B.b; \ No newline at end of file diff --git a/tests/cases/compiler/augmentExportEquals6_1.ts b/tests/cases/compiler/augmentExportEquals6_1.ts new file mode 100644 index 00000000000..aaee43bae74 --- /dev/null +++ b/tests/cases/compiler/augmentExportEquals6_1.ts @@ -0,0 +1,26 @@ +// @module: amd + +// @filename: file1.d.ts +declare module "file1" { + class foo {} + namespace foo { + class A {} + } + export = foo; +} + + +// @filename: file2.ts +/// +import x = require("file1"); + +// OK - './file1' is a namespace +declare module "file1" { + interface A { a: number } +} + +// @filename: file3.ts +import * as x from "file1"; +import "file2"; +let a: x.A; +let b = a.a; \ No newline at end of file From 55ce1d0eb68ad835bf26a5ebb08076de30ff6c7c Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Fri, 29 Jan 2016 17:23:17 -0800 Subject: [PATCH 126/160] unpin mocha version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48203b2c230..cc74bf2c27c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "devDependencies": { "jake": "latest", - "mocha": "2.3.4", + "mocha": "latest", "chai": "latest", "browserify": "latest", "istanbul": "latest", From 992dd05bc0d56aec1ebc4c1cc795a088bd94b94c Mon Sep 17 00:00:00 2001 From: Prayag Verma Date: Sat, 30 Jan 2016 10:04:27 +0530 Subject: [PATCH 127/160] Typo fixes in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9941d92e87..1dba1281dd7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,7 +30,7 @@ You can try out the nightly build of TypeScript (`npm install typescript@next`) We also accept suggestions in the issue tracker. Be sure to [check the FAQ](https://github.com/Microsoft/TypeScript/wiki/FAQ) and [search](https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=is%3Aissue) first. -In general, things we find useful when reviewing suggestins are: +In general, things we find useful when reviewing suggestions are: * A description of the problem you're trying to solve * An overview of the suggested solution * Examples of how the suggestion would work in various places @@ -71,7 +71,7 @@ Your pull request should: * Tests should include reasonable permutations of the target fix/change * Include baseline changes with your change * All changed code must have 100% code coverage -* Follow the code conventions descriped in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines) +* Follow the code conventions described in [Coding guidelines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines) * To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration ## Contributing `lib.d.ts` fixes From bd86e2ec8042ef1f152ae6e0e221222b000e793c Mon Sep 17 00:00:00 2001 From: Noj Vek Date: Sat, 30 Jan 2016 11:31:43 -0800 Subject: [PATCH 128/160] remove uncommented lines --- src/compiler/emitter.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ad0f1c8bcd8..067900217e5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1302,21 +1302,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge decreaseIndent(); } } - - // const emittableChildren = children.filter(isJsxChildEmittable); - // if (emittableChildren.length > 0) { - // // If the only child is non-jsx element, don't put it on a new line - // if (emittableChildren.length == 1 && emittableChildren[0].kind !== SyntaxKind.JsxElement && emittableChildren[0].kind !== SyntaxKind.JsxSelfClosingElement) { - // write(", "); - // emit(emittableChildren[0]); - // } - // // Otherwise build a indented comma separated list - // else { - // increaseIndent(); - // emitList(emittableChildren, 0, emittableChildren.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ true); - // decreaseIndent(); - // } - // } } // Closing paren From f04f93c41462ece162df0122287d605273de55e4 Mon Sep 17 00:00:00 2001 From: Noj Vek Date: Sat, 30 Jan 2016 11:37:02 -0800 Subject: [PATCH 129/160] Fix typo in compiler reactNamespace error string --- src/compiler/diagnosticMessages.json | 2 +- src/compiler/program.ts | 50 +++++++++---------- .../reactNamespaceInvalidInput.errors.txt | 4 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index ca5a6d9d415..aacb791486f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -2171,7 +2171,7 @@ "category": "Error", "code": 5058 }, - "Invalide value for '--reactNamespace'. '{0}' is not a valid identifier.": { + "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier.": { "category": "Error", "code": 5059 }, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 803ae47b0fd..6d4d7b54253 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -142,17 +142,17 @@ namespace ts { type ResolutionKindSpecificLoader = (candidate: string, extensions: string[], failedLookupLocations: string[], onlyRecordFalures: boolean, state: ModuleResolutionState) => string; /** - * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to - * mitigate differences between design time structure of the project and its runtime counterpart so the same import name - * can be resolved successfully by TypeScript compiler and runtime module loader. + * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to + * mitigate differences between design time structure of the project and its runtime counterpart so the same import name + * can be resolved successfully by TypeScript compiler and runtime module loader. * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will * fallback to standard resolution routine. - * + * * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then canditate location to resolve module name 'c/d' will * be '/a/b/c/d' - * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names - * will be resolved based on the content of the module name. + * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names + * will be resolved based on the content of the module name. * Structure of 'paths' compiler options * 'paths': { * pattern-1: [...substitutions], @@ -160,37 +160,37 @@ namespace ts { * ... * pattern-n: [...substitutions] * } - * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against + * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case. - * If pattern contains '*' then to match pattern "*" module name must start with the and end with . - * denotes part of the module name between and . + * If pattern contains '*' then to match pattern "*" module name must start with the and end with . + * denotes part of the module name between and . * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked. - * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module - * from the candidate location. - * Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every - * substitution in the list and replace '*' with string. If candidate location is not rooted it + * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module + * from the candidate location. + * Substitiution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every + * substitution in the list and replace '*' with string. If candidate location is not rooted it * will be converted to absolute using baseUrl. * For example: * baseUrl: /a/b/c * "paths": { * // match all module names - * "*": [ + * "*": [ * "*", // use matched name as is, * // will be looked as /a/b/c/ * * "folder1/*" // substitution will convert matched name to 'folder1/', - * // since it is not rooted then final candidate location will be /a/b/c/folder1/ + * // since it is not rooted then final candidate location will be /a/b/c/folder1/ * ], * // match module names that start with 'components/' * "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/ to '/root/components/folder1/', * // it is rooted so it will be final candidate location * } * - * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if + * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if * they were in the same location. For example lets say there are two files * '/local/src/content/file1.ts' * '/shared/components/contracts/src/content/protocols/file2.ts' - * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so + * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime. * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all * root dirs were merged together. @@ -229,7 +229,7 @@ namespace ts { let matchedNormalizedPrefix: string; for (const rootDir of state.compilerOptions.rootDirs) { // rootDirs are expected to be absolute - // in case of tsconfig.json this will happen automatically - compiler will expand relative names + // in case of tsconfig.json this will happen automatically - compiler will expand relative names // using locaton of tsconfig.json as base location let normalizedRoot = normalizePath(rootDir); if (!endsWith(normalizedRoot, directorySeparator)) { @@ -269,7 +269,7 @@ namespace ts { // then try to resolve using remaining entries in rootDirs for (const rootDir of state.compilerOptions.rootDirs) { if (rootDir === matchedRootDir) { - // skip the initially matched entry + // skip the initially matched entry continue; } const candidate = combinePaths(normalizePath(rootDir), suffix); @@ -412,7 +412,7 @@ namespace ts { /** * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary - * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations. + * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations. */ function loadModuleFromFile(candidate: string, extensions: string[], failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string { return forEach(extensions, tryLoad); @@ -450,7 +450,7 @@ namespace ts { jsonContent = jsonText ? <{ typings?: string }>JSON.parse(jsonText) : { typings: undefined }; } catch (e) { - // gracefully handle if readFile fails or returns not JSON + // gracefully handle if readFile fails or returns not JSON jsonContent = { typings: undefined }; } @@ -719,7 +719,7 @@ namespace ts { const filesByName = createFileMap(); // stores 'filename -> file association' ignoring case - // used to track cases when two file names differ only in casing + // used to track cases when two file names differ only in casing const filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? createFileMap(fileName => fileName.toLowerCase()) : undefined; if (oldProgram) { @@ -1295,7 +1295,7 @@ namespace ts { } // TypeScript 1.0 spec (April 2014): 12.1.6 - // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules + // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules // only through top - level external module names. Relative external module names are not permitted. if (!inAmbientModule || !isExternalModuleNameRelative((moduleNameExpr).text)) { (imports || (imports = [])).push(moduleNameExpr); @@ -1313,7 +1313,7 @@ namespace ts { (moduleAugmentations || (moduleAugmentations = [])).push(moduleName); } else if (!inAmbientModule) { - // An AmbientExternalModuleDeclaration declares an external module. + // An AmbientExternalModuleDeclaration declares an external module. // This type of declaration is permitted only in the global module. // The StringLiteral must specify a top - level external module name. // Relative external module names are not permitted @@ -1713,7 +1713,7 @@ namespace ts { } if (options.reactNamespace && !isIdentifier(options.reactNamespace, languageVersion)) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalide_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace)); + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace)); } // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files diff --git a/tests/baselines/reference/reactNamespaceInvalidInput.errors.txt b/tests/baselines/reference/reactNamespaceInvalidInput.errors.txt index e08ec520867..2e72775fe9c 100644 --- a/tests/baselines/reference/reactNamespaceInvalidInput.errors.txt +++ b/tests/baselines/reference/reactNamespaceInvalidInput.errors.txt @@ -1,8 +1,8 @@ -error TS5059: Invalide value for '--reactNamespace'. 'my-React-Lib' is not a valid identifier. +error TS5059: Invalid value for '--reactNamespace'. 'my-React-Lib' is not a valid identifier. tests/cases/compiler/reactNamespaceInvalidInput.tsx(2,2): error TS2304: Cannot find name 'my-React-Lib'. -!!! error TS5059: Invalide value for '--reactNamespace'. 'my-React-Lib' is not a valid identifier. +!!! error TS5059: Invalid value for '--reactNamespace'. 'my-React-Lib' is not a valid identifier. ==== tests/cases/compiler/reactNamespaceInvalidInput.tsx (1 errors) ==== ; From ac528cc948a3f9b81a910d133ba39092c5d3c7d8 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 30 Jan 2016 16:20:48 -0800 Subject: [PATCH 130/160] addressed PR feedback --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 2 +- tests/baselines/reference/augmentExportEquals1.errors.txt | 4 ++-- tests/baselines/reference/augmentExportEquals1_1.errors.txt | 4 ++-- tests/baselines/reference/augmentExportEquals2.errors.txt | 4 ++-- tests/baselines/reference/augmentExportEquals2_1.errors.txt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a280be5f22f..8a17ff77f24 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -404,7 +404,7 @@ namespace ts { mergeSymbol(mainModule, moduleAugmentation.symbol); } else { - error(moduleName, Diagnostics.Cannot_augment_module_0_that_resolves_to_a_non_module_entity, moduleName.text); + error(moduleName, Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text); } } } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 082077de01b..cb333e9036b 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1819,7 +1819,7 @@ "category": "Error", "code": 2670 }, - "Cannot augment module '{0}' that resolves to a non-module entity.": { + "Cannot augment module '{0}' because it resolves to a non-module entity.": { "category": "Error", "code": 2671 }, diff --git a/tests/baselines/reference/augmentExportEquals1.errors.txt b/tests/baselines/reference/augmentExportEquals1.errors.txt index ca3cc82cce8..2d15e6d622a 100644 --- a/tests/baselines/reference/augmentExportEquals1.errors.txt +++ b/tests/baselines/reference/augmentExportEquals1.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. @@ -20,7 +20,7 @@ tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. // should error since './file1' does not have namespace meaning declare module "./file1" { ~~~~~~~~~ -!!! error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +!!! error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. interface A { a } } \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals1_1.errors.txt b/tests/baselines/reference/augmentExportEquals1_1.errors.txt index 013bffc4504..aa89aa0c1d3 100644 --- a/tests/baselines/reference/augmentExportEquals1_1.errors.txt +++ b/tests/baselines/reference/augmentExportEquals1_1.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity. tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. @@ -23,7 +23,7 @@ tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. // should error since 'file1' does not have namespace meaning declare module "file1" { ~~~~~~~ -!!! error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +!!! error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity. interface A { a } } \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals2.errors.txt b/tests/baselines/reference/augmentExportEquals2.errors.txt index 89c0778a3c9..b078a6623d7 100644 --- a/tests/baselines/reference/augmentExportEquals2.errors.txt +++ b/tests/baselines/reference/augmentExportEquals2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/file2.ts(4,16): error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +tests/cases/compiler/file2.ts(4,16): error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. @@ -19,7 +19,7 @@ tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. // should error since './file1' does not have namespace meaning declare module "./file1" { ~~~~~~~~~ -!!! error TS2671: Cannot augment module './file1' that resolves to a non-module entity. +!!! error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. interface A { a } } \ No newline at end of file diff --git a/tests/baselines/reference/augmentExportEquals2_1.errors.txt b/tests/baselines/reference/augmentExportEquals2_1.errors.txt index f0f571af5c4..8e02f21176a 100644 --- a/tests/baselines/reference/augmentExportEquals2_1.errors.txt +++ b/tests/baselines/reference/augmentExportEquals2_1.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +tests/cases/compiler/file2.ts(6,16): error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity. tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. @@ -23,7 +23,7 @@ tests/cases/compiler/file3.ts(3,8): error TS2503: Cannot find namespace 'x'. // should error since './file1' does not have namespace meaning declare module "file1" { ~~~~~~~ -!!! error TS2671: Cannot augment module 'file1' that resolves to a non-module entity. +!!! error TS2671: Cannot augment module 'file1' because it resolves to a non-module entity. interface A { a } } \ No newline at end of file From e5aa9cbc6f29fb2da2d9bf9a7852faaec83c8c1c Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sat, 30 Jan 2016 19:58:29 -0800 Subject: [PATCH 131/160] properly handle merged declarations across files --- src/compiler/checker.ts | 8 +-- .../reference/mergedDeclarations5.js | 34 +++++++++++ .../reference/mergedDeclarations5.symbols | 18 ++++++ .../reference/mergedDeclarations5.types | 18 ++++++ .../reference/mergedDeclarations6.js | 57 +++++++++++++++++++ .../reference/mergedDeclarations6.symbols | 38 +++++++++++++ .../reference/mergedDeclarations6.types | 39 +++++++++++++ tests/cases/compiler/mergedDeclarations5.ts | 10 ++++ tests/cases/compiler/mergedDeclarations6.ts | 23 ++++++++ 9 files changed, 241 insertions(+), 4 deletions(-) create mode 100644 tests/baselines/reference/mergedDeclarations5.js create mode 100644 tests/baselines/reference/mergedDeclarations5.symbols create mode 100644 tests/baselines/reference/mergedDeclarations5.types create mode 100644 tests/baselines/reference/mergedDeclarations6.js create mode 100644 tests/baselines/reference/mergedDeclarations6.symbols create mode 100644 tests/baselines/reference/mergedDeclarations6.types create mode 100644 tests/cases/compiler/mergedDeclarations5.ts create mode 100644 tests/cases/compiler/mergedDeclarations6.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index db3517970d9..9ac7241f14c 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2487,7 +2487,7 @@ namespace ts { // Every class automatically contains a static property member named 'prototype', // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter. // It is an error to explicitly declare a static property member with the name 'prototype'. - const classType = getDeclaredTypeOfSymbol(getMergedSymbol(prototype.parent)); + const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype)); return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, _ => anyType)) : classType; } @@ -5803,8 +5803,8 @@ namespace ts { } else if (targetPropFlags & NodeFlags.Protected) { const sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & SymbolFlags.Class; - const sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(sourceProp.parent) : undefined; - const targetClass = getDeclaredTypeOfSymbol(targetProp.parent); + const sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined; + const targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp)); if (!sourceClass || !hasBaseType(sourceClass, targetClass)) { if (reportErrors) { reportError(Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, @@ -8797,7 +8797,7 @@ namespace ts { */ function checkClassPropertyAccess(node: PropertyAccessExpression | QualifiedName, left: Expression | QualifiedName, type: Type, prop: Symbol): boolean { const flags = getDeclarationFlagsFromSymbol(prop); - const declaringClass = getDeclaredTypeOfSymbol(getMergedSymbol(prop.parent)); + const declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop)); if (left.kind === SyntaxKind.SuperKeyword) { const errorNode = node.kind === SyntaxKind.PropertyAccessExpression ? diff --git a/tests/baselines/reference/mergedDeclarations5.js b/tests/baselines/reference/mergedDeclarations5.js new file mode 100644 index 00000000000..ce4b929c7f9 --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations5.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/mergedDeclarations5.ts] //// + +//// [a.ts] +class A { + protected foo() {} +} +//// [b.ts] +interface A { } + +class B extends A { + protected foo() {} +} + +//// [a.js] +var A = (function () { + function A() { + } + A.prototype.foo = function () { }; + return A; +}()); +//// [b.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + B.prototype.foo = function () { }; + return B; +}(A)); diff --git a/tests/baselines/reference/mergedDeclarations5.symbols b/tests/baselines/reference/mergedDeclarations5.symbols new file mode 100644 index 00000000000..abe1743de1c --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations5.symbols @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.ts === +class A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) + + protected foo() {} +>foo : Symbol(foo, Decl(a.ts, 0, 9)) +} +=== tests/cases/compiler/b.ts === +interface A { } +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) + +class B extends A { +>B : Symbol(B, Decl(b.ts, 0, 15)) +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) + + protected foo() {} +>foo : Symbol(foo, Decl(b.ts, 2, 19)) +} diff --git a/tests/baselines/reference/mergedDeclarations5.types b/tests/baselines/reference/mergedDeclarations5.types new file mode 100644 index 00000000000..5c31617a92b --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations5.types @@ -0,0 +1,18 @@ +=== tests/cases/compiler/a.ts === +class A { +>A : A + + protected foo() {} +>foo : () => void +} +=== tests/cases/compiler/b.ts === +interface A { } +>A : A + +class B extends A { +>B : B +>A : A + + protected foo() {} +>foo : () => void +} diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js new file mode 100644 index 00000000000..696ad27b2a6 --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations6.js @@ -0,0 +1,57 @@ +//// [tests/cases/compiler/mergedDeclarations6.ts] //// + +//// [a.ts] + +export class A { + protected protected: any; + + protected setProtected(val: any) { + this.protected = val; + } +} + +//// [b.ts] +import {A} from './a'; + +declare module "./a" { + interface A { } +} + +export class B extends A { + protected setProtected() { + + } +} + +//// [a.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + var A = (function () { + function A() { + } + A.prototype.setProtected = function (val) { + this.protected = val; + }; + return A; + }()); + exports.A = A; +}); +//// [b.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +define(["require", "exports", './a'], function (require, exports, a_1) { + "use strict"; + var B = (function (_super) { + __extends(B, _super); + function B() { + _super.apply(this, arguments); + } + B.prototype.setProtected = function () { + }; + return B; + }(a_1.A)); + exports.B = B; +}); diff --git a/tests/baselines/reference/mergedDeclarations6.symbols b/tests/baselines/reference/mergedDeclarations6.symbols new file mode 100644 index 00000000000..b0d49532384 --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations6.symbols @@ -0,0 +1,38 @@ +=== tests/cases/compiler/a.ts === + +export class A { +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22)) + + protected protected: any; +>protected : Symbol(protected, Decl(a.ts, 1, 16)) + + protected setProtected(val: any) { +>setProtected : Symbol(setProtected, Decl(a.ts, 2, 29)) +>val : Symbol(val, Decl(a.ts, 4, 27)) + + this.protected = val; +>this.protected : Symbol(protected, Decl(a.ts, 1, 16)) +>this : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22)) +>protected : Symbol(protected, Decl(a.ts, 1, 16)) +>val : Symbol(val, Decl(a.ts, 4, 27)) + } +} + +=== tests/cases/compiler/b.ts === +import {A} from './a'; +>A : Symbol(A, Decl(b.ts, 0, 8)) + +declare module "./a" { + interface A { } +>A : Symbol(A, Decl(a.ts, 0, 0), Decl(b.ts, 2, 22)) +} + +export class B extends A { +>B : Symbol(B, Decl(b.ts, 4, 1)) +>A : Symbol(A, Decl(b.ts, 0, 8)) + + protected setProtected() { +>setProtected : Symbol(setProtected, Decl(b.ts, 6, 26)) + + } +} diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types new file mode 100644 index 00000000000..6198c08f6b5 --- /dev/null +++ b/tests/baselines/reference/mergedDeclarations6.types @@ -0,0 +1,39 @@ +=== tests/cases/compiler/a.ts === + +export class A { +>A : A + + protected protected: any; +>protected : any + + protected setProtected(val: any) { +>setProtected : (val: any) => void +>val : any + + this.protected = val; +>this.protected = val : any +>this.protected : any +>this : this +>protected : any +>val : any + } +} + +=== tests/cases/compiler/b.ts === +import {A} from './a'; +>A : typeof A + +declare module "./a" { + interface A { } +>A : A +} + +export class B extends A { +>B : B +>A : A + + protected setProtected() { +>setProtected : () => void + + } +} diff --git a/tests/cases/compiler/mergedDeclarations5.ts b/tests/cases/compiler/mergedDeclarations5.ts new file mode 100644 index 00000000000..df5734453d3 --- /dev/null +++ b/tests/cases/compiler/mergedDeclarations5.ts @@ -0,0 +1,10 @@ +// @filename: a.ts +class A { + protected foo() {} +} +// @filename: b.ts +interface A { } + +class B extends A { + protected foo() {} +} \ No newline at end of file diff --git a/tests/cases/compiler/mergedDeclarations6.ts b/tests/cases/compiler/mergedDeclarations6.ts new file mode 100644 index 00000000000..406bed518c1 --- /dev/null +++ b/tests/cases/compiler/mergedDeclarations6.ts @@ -0,0 +1,23 @@ +// @module: amd + +// @filename: a.ts +export class A { + protected protected: any; + + protected setProtected(val: any) { + this.protected = val; + } +} + +// @filename: b.ts +import {A} from './a'; + +declare module "./a" { + interface A { } +} + +export class B extends A { + protected setProtected() { + + } +} \ No newline at end of file From f0abb861589a6e66f79ade5970091e8f1becd727 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 31 Jan 2016 08:08:19 -0800 Subject: [PATCH 132/160] Removing MultiLine, Synthetic, DeclarationFile, and OctalLiteral flags --- src/compiler/binder.ts | 2 +- src/compiler/checker.ts | 6 +++--- src/compiler/emitter.ts | 6 +++--- src/compiler/parser.ts | 10 ++++++---- src/compiler/types.ts | 8 ++++---- src/compiler/utilities.ts | 5 ++--- src/services/breakpoints.ts | 2 +- src/services/services.ts | 5 +++-- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts index cc81f92fbfc..6401c7ed872 100644 --- a/src/compiler/binder.ts +++ b/src/compiler/binder.ts @@ -1110,7 +1110,7 @@ namespace ts { } function checkStrictModeNumericLiteral(node: LiteralExpression) { - if (inStrictMode && node.flags & NodeFlags.OctalLiteral) { + if (inStrictMode && node.isOctalLiteral) { file.bindDiagnostics.push(createDiagnosticForNode(node, Diagnostics.Octal_literals_are_not_allowed_in_strict_mode)); } } diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index db3517970d9..88f000c5a74 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -16749,7 +16749,7 @@ namespace ts { // Grammar checking for computedPropertName and shorthandPropertyAssignment checkGrammarForInvalidQuestionMark(prop, (prop).questionToken, Diagnostics.An_object_member_cannot_be_declared_optional); if (name.kind === SyntaxKind.NumericLiteral) { - checkGrammarNumericLiteral(name); + checkGrammarNumericLiteral(name); } currentKind = Property; } @@ -17250,9 +17250,9 @@ namespace ts { } } - function checkGrammarNumericLiteral(node: Identifier): boolean { + function checkGrammarNumericLiteral(node: LiteralExpression): boolean { // Grammar checking - if (node.flags & NodeFlags.OctalLiteral && languageVersion >= ScriptTarget.ES5) { + if (node.isOctalLiteral && languageVersion >= ScriptTarget.ES5) { return grammarErrorOnNode(node, Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher); } } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a62739e1334..7e4b81db07a 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1780,7 +1780,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge write("]"); } else { - emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/(node.flags & NodeFlags.MultiLine) !== 0, + emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ node.multiLine, /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true); } } @@ -1803,7 +1803,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= ScriptTarget.ES5, /*spacesBetweenBraces*/ true); } else { - const multiLine = (node.flags & NodeFlags.MultiLine) !== 0; + const multiLine = node.multiLine; if (!multiLine) { write(" "); } @@ -1826,7 +1826,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } function emitDownlevelObjectLiteralWithComputedProperties(node: ObjectLiteralExpression, firstComputedPropertyIndex: number) { - const multiLine = (node.flags & NodeFlags.MultiLine) !== 0; + const multiLine = node.multiLine; const properties = node.properties; write("("); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 787a022140f..4fd81ed246f 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -666,8 +666,8 @@ namespace ts { sourceFile.bindDiagnostics = []; sourceFile.languageVersion = languageVersion; sourceFile.fileName = normalizePath(fileName); - sourceFile.flags = fileExtensionIs(sourceFile.fileName, ".d.ts") ? NodeFlags.DeclarationFile : 0; sourceFile.languageVariant = getLanguageVariant(sourceFile.fileName); + sourceFile.isDeclarationFile = fileExtensionIs(sourceFile.fileName, ".d.ts"); return sourceFile; } @@ -1922,7 +1922,7 @@ namespace ts { && sourceText.charCodeAt(tokenPos) === CharacterCodes._0 && isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) { - node.flags |= NodeFlags.OctalLiteral; + node.isOctalLiteral = true; } return node; @@ -3907,7 +3907,9 @@ namespace ts { function parseArrayLiteralExpression(): ArrayLiteralExpression { const node = createNode(SyntaxKind.ArrayLiteralExpression); parseExpected(SyntaxKind.OpenBracketToken); - if (scanner.hasPrecedingLineBreak()) node.flags |= NodeFlags.MultiLine; + if (scanner.hasPrecedingLineBreak()) { + node.multiLine = true; + } node.elements = parseDelimitedList(ParsingContext.ArrayLiteralMembers, parseArgumentOrArrayLiteralElement); parseExpected(SyntaxKind.CloseBracketToken); return finishNode(node); @@ -3978,7 +3980,7 @@ namespace ts { const node = createNode(SyntaxKind.ObjectLiteralExpression); parseExpected(SyntaxKind.OpenBraceToken); if (scanner.hasPrecedingLineBreak()) { - node.flags |= NodeFlags.MultiLine; + node.multiLine = true; } node.properties = parseDelimitedList(ParsingContext.ObjectLiteralMembers, parseObjectLiteralElement, /*considerSemicolonAsDelimeter*/ true); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5cba4283857..4421a882121 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -381,12 +381,8 @@ namespace ts { Abstract = 1 << 7, // Class/Method/ConstructSignature Async = 1 << 8, // Property/Method/Function Default = 1 << 9, // Function/Class (export default declaration) - MultiLine = 1 << 10, // Multi-line array or object literal - Synthetic = 1 << 11, // Synthetic node (for full fidelity) - DeclarationFile = 1 << 12, // Node is a .d.ts file Let = 1 << 13, // Variable declaration Const = 1 << 14, // Variable declaration - OctalLiteral = 1 << 15, // Octal numeric literal Namespace = 1 << 16, // Namespace declaration ExportContext = 1 << 17, // Export context (initialized by binding) ContainsThis = 1 << 18, // Interface contains references to "this" @@ -938,6 +934,7 @@ namespace ts { text: string; isUnterminated?: boolean; hasExtendedUnicodeEscape?: boolean; + isOctalLiteral?: boolean; } // The text property of a LiteralExpression stores the interpreted value of the literal in text form. For a StringLiteral, @@ -979,6 +976,7 @@ namespace ts { // @kind(SyntaxKind.ArrayLiteralExpression) export interface ArrayLiteralExpression extends PrimaryExpression { elements: NodeArray; + multiLine?: boolean; } // @kind(SyntaxKind.SpreadElementExpression) @@ -990,6 +988,7 @@ namespace ts { // @kind(SyntaxKind.ObjectLiteralExpression) export interface ObjectLiteralExpression extends PrimaryExpression, Declaration { properties: NodeArray; + multiLine?: boolean; } // @kind(SyntaxKind.PropertyAccessExpression) @@ -1546,6 +1545,7 @@ namespace ts { moduleName: string; referencedFiles: FileReference[]; languageVariant: LanguageVariant; + isDeclarationFile: boolean; // this map is used by transpiler to supply alternative names for dependencies (i.e. in case of bundling) /* @internal */ diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index bab66eb0688..7042200ba8e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -414,7 +414,7 @@ namespace ts { } export function isDeclarationFile(file: SourceFile): boolean { - return (file.flags & NodeFlags.DeclarationFile) !== 0; + return file.isDeclarationFile; } export function isConstEnumDeclaration(node: Node): boolean { @@ -1309,10 +1309,9 @@ namespace ts { export function isInAmbientContext(node: Node): boolean { while (node) { - if (node.flags & (NodeFlags.Ambient | NodeFlags.DeclarationFile)) { + if (node.flags & NodeFlags.Ambient || (node.kind === SyntaxKind.SourceFile && (node as SourceFile).isDeclarationFile)) { return true; } - node = node.parent; } return false; diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts index b7e909f69d8..4cd361734e3 100644 --- a/src/services/breakpoints.ts +++ b/src/services/breakpoints.ts @@ -10,7 +10,7 @@ namespace ts.BreakpointResolver { */ export function spanInSourceFileAtLocation(sourceFile: SourceFile, position: number) { // Cannot set breakpoint in dts file - if (sourceFile.flags & NodeFlags.DeclarationFile) { + if (sourceFile.isDeclarationFile) { return undefined; } diff --git a/src/services/services.ts b/src/services/services.ts index cb57d415c66..bbc61a533b1 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -237,14 +237,14 @@ namespace ts { while (pos < end) { const token = scanner.scan(); const textPos = scanner.getTextPos(); - nodes.push(createNode(token, pos, textPos, NodeFlags.Synthetic, this)); + nodes.push(createNode(token, pos, textPos, 0, this)); pos = textPos; } return pos; } private createSyntaxList(nodes: NodeArray): Node { - const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, NodeFlags.Synthetic, this); + const list = createNode(SyntaxKind.SyntaxList, nodes.pos, nodes.end, 0, this); list._children = []; let pos = nodes.pos; @@ -797,6 +797,7 @@ namespace ts { public parseDiagnostics: Diagnostic[]; public bindDiagnostics: Diagnostic[]; + public isDeclarationFile: boolean; public isDefaultLib: boolean; public hasNoDefaultLib: boolean; public externalModuleIndicator: Node; // The first node that causes this file to be an external module From 064de382cf347bae70b5e998b9b094aaab0522eb Mon Sep 17 00:00:00 2001 From: zhengbli Date: Sun, 31 Jan 2016 08:13:26 -0800 Subject: [PATCH 133/160] Routine update of lib.d.ts 20160131 --- src/lib/dom.generated.d.ts | 18 ++++++++++++------ src/lib/webworker.generated.d.ts | 11 ++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts index 9970749e5a8..ec71fa78e8d 100644 --- a/src/lib/dom.generated.d.ts +++ b/src/lib/dom.generated.d.ts @@ -378,6 +378,8 @@ interface AudioNode extends EventTarget { numberOfOutputs: number; connect(destination: AudioNode, output?: number, input?: number): void; disconnect(output?: number): void; + disconnect(destination: AudioNode, output?: number, input?: number): void; + disconnect(destination: AudioParam, output?: number): void; } declare var AudioNode: { @@ -6894,7 +6896,7 @@ interface IDBCursor { direction: string; key: any; primaryKey: any; - source: any; + source: IDBObjectStore | IDBIndex; advance(count: number): void; continue(key?: any): void; delete(): IDBRequest; @@ -6932,7 +6934,7 @@ interface IDBDatabase extends EventTarget { close(): void; createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; - transaction(storeNames: any, mode?: string): IDBTransaction; + transaction(storeNames: string | string[], mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -6990,9 +6992,10 @@ declare var IDBKeyRange: { interface IDBObjectStore { indexNames: DOMStringList; - keyPath: string; + keyPath: string | string[]; name: string; transaction: IDBTransaction; + autoIncrement: boolean; add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; @@ -7031,7 +7034,7 @@ interface IDBRequest extends EventTarget { onsuccess: (ev: Event) => any; readyState: string; result: any; - source: any; + source: IDBObjectStore | IDBIndex | IDBCursor; transaction: IDBTransaction; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; @@ -10218,11 +10221,14 @@ declare var SVGViewElement: { } interface SVGZoomAndPan { + zoomAndPan: number; +} + +declare var SVGZoomAndPan: { SVG_ZOOMANDPAN_DISABLE: number; SVG_ZOOMANDPAN_MAGNIFY: number; SVG_ZOOMANDPAN_UNKNOWN: number; } -declare var SVGZoomAndPan: SVGZoomAndPan; interface SVGZoomEvent extends UIEvent { newScale: number; @@ -12685,7 +12691,7 @@ interface DecodeSuccessCallback { (decodedData: AudioBuffer): void; } interface DecodeErrorCallback { - (): void; + (error: DOMException): void; } interface FunctionStringCallback { (data: string): void; diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts index d2008542cc6..cd49a565f12 100644 --- a/src/lib/webworker.generated.d.ts +++ b/src/lib/webworker.generated.d.ts @@ -275,7 +275,7 @@ interface IDBCursor { direction: string; key: any; primaryKey: any; - source: any; + source: IDBObjectStore | IDBIndex; advance(count: number): void; continue(key?: any): void; delete(): IDBRequest; @@ -313,7 +313,7 @@ interface IDBDatabase extends EventTarget { close(): void; createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; - transaction(storeNames: any, mode?: string): IDBTransaction; + transaction(storeNames: string | string[], mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -371,9 +371,10 @@ declare var IDBKeyRange: { interface IDBObjectStore { indexNames: DOMStringList; - keyPath: string; + keyPath: string | string[]; name: string; transaction: IDBTransaction; + autoIncrement: boolean; add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; @@ -412,7 +413,7 @@ interface IDBRequest extends EventTarget { onsuccess: (ev: Event) => any; readyState: string; result: any; - source: any; + source: IDBObjectStore | IDBIndex | IDBCursor; transaction: IDBTransaction; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; @@ -959,7 +960,7 @@ interface DecodeSuccessCallback { (decodedData: AudioBuffer): void; } interface DecodeErrorCallback { - (): void; + (error: DOMException): void; } interface FunctionStringCallback { (data: string): void; From 83859c0d91b3fb23ed5e7588d79de3a6bbae6b00 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 31 Jan 2016 08:45:14 -0800 Subject: [PATCH 134/160] Merge ParserContextFlags into NodeFlags --- src/compiler/checker.ts | 16 ++++----- src/compiler/parser.ts | 58 ++++++++++++++++---------------- src/compiler/types.ts | 69 ++++++++++++--------------------------- src/compiler/utilities.ts | 14 ++++---- src/harness/harness.ts | 2 +- 5 files changed, 66 insertions(+), 93 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 88f000c5a74..fafcffbe582 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2634,7 +2634,7 @@ namespace ts { // Return the inferred type for a variable, parameter, or property declaration function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration): Type { - if (declaration.parserContextFlags & ParserContextFlags.JavaScriptFile) { + if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { // If this is a variable in a JavaScript file, then use the JSDoc type (if it has // one as its type), otherwise fallback to the below standard TS codepaths to // try to figure it out. @@ -3981,7 +3981,7 @@ namespace ts { } function getTypeParametersFromJSDocTemplate(declaration: SignatureDeclaration): TypeParameter[] { - if (declaration.parserContextFlags & ParserContextFlags.JavaScriptFile) { + if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { const templateTag = getJSDocTemplateTag(declaration); if (templateTag) { return getTypeParametersFromDeclaration(templateTag.typeParameters); @@ -4015,7 +4015,7 @@ namespace ts { } function isOptionalParameter(node: ParameterDeclaration) { - if (node.parserContextFlags & ParserContextFlags.JavaScriptFile) { + if (node.parserContextFlags & NodeFlags.JavaScriptFile) { if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) { return true; } @@ -4124,7 +4124,7 @@ namespace ts { returnType = getTypeFromTypeNode(declaration.type); } else { - if (declaration.parserContextFlags & ParserContextFlags.JavaScriptFile) { + if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { const type = getReturnTypeFromJSDocComment(declaration); if (type && type !== unknownType) { returnType = type; @@ -7183,7 +7183,7 @@ namespace ts { } } - if (node.parserContextFlags & ParserContextFlags.Await) { + if (node.parserContextFlags & NodeFlags.Await) { getNodeLinks(container).flags |= NodeCheckFlags.CaptureArguments; } } @@ -10783,7 +10783,7 @@ namespace ts { function checkAwaitExpression(node: AwaitExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & ParserContextFlags.Await)) { + if (!(node.parserContextFlags & NodeFlags.Await)) { grammarErrorOnFirstToken(node, Diagnostics.await_expression_is_only_allowed_within_an_async_function); } @@ -11239,7 +11239,7 @@ namespace ts { function checkYieldExpression(node: YieldExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & ParserContextFlags.Yield) || isYieldExpressionInClass(node)) { + if (!(node.parserContextFlags & NodeFlags.Yield) || isYieldExpressionInClass(node)) { grammarErrorOnFirstToken(node, Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body); } @@ -13701,7 +13701,7 @@ namespace ts { function checkWithStatement(node: WithStatement) { // Grammar checking for withStatement if (!checkGrammarStatementInAmbientContext(node)) { - if (node.parserContextFlags & ParserContextFlags.Await) { + if (node.parserContextFlags & NodeFlags.Await) { grammarErrorOnFirstToken(node, Diagnostics.with_statements_are_not_allowed_in_an_async_function_block); } } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 4fd81ed246f..bbf1c2bddac 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -438,7 +438,7 @@ namespace ts { // Share a single scanner across all calls to parse a source file. This helps speed things // up by avoiding the cost of creating/compiling scanners over and over again. const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - const disallowInAndDecoratorContext = ParserContextFlags.DisallowIn | ParserContextFlags.Decorator; + const disallowInAndDecoratorContext = NodeFlags.DisallowIn | NodeFlags.Decorator; // capture constructors in 'initializeState' to avoid null checks let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; @@ -502,7 +502,7 @@ namespace ts { // Note: it should not be necessary to save/restore these flags during speculative/lookahead // parsing. These context flags are naturally stored and restored through normal recursive // descent parsing and unwinding. - let contextFlags: ParserContextFlags; + let contextFlags: NodeFlags; // Whether or not we've had a parse error since creating the last AST node. If we have // encountered an error, it will be stored on the next AST node we create. Parse errors @@ -562,7 +562,7 @@ namespace ts { identifierCount = 0; nodeCount = 0; - contextFlags = isJavaScriptFile ? ParserContextFlags.JavaScriptFile : ParserContextFlags.None; + contextFlags = isJavaScriptFile ? NodeFlags.JavaScriptFile : NodeFlags.None; parseErrorBeforeNextFinishedNode = false; // Initialize and prime the scanner before parsing the source elements. @@ -588,8 +588,8 @@ namespace ts { function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean): SourceFile { sourceFile = createSourceFile(fileName, languageVersion); - if (contextFlags & ParserContextFlags.JavaScriptFile) { - sourceFile.parserContextFlags = ParserContextFlags.JavaScriptFile; + if (contextFlags & NodeFlags.JavaScriptFile) { + sourceFile.parserContextFlags = NodeFlags.JavaScriptFile; } // Prime the scanner. @@ -616,7 +616,7 @@ namespace ts { function addJSDocComment(node: T): T { - if (contextFlags & ParserContextFlags.JavaScriptFile) { + if (contextFlags & NodeFlags.JavaScriptFile) { const comments = getLeadingCommentRangesOfNode(node, sourceFile); if (comments) { for (const comment of comments) { @@ -672,7 +672,7 @@ namespace ts { return sourceFile; } - function setContextFlag(val: boolean, flag: ParserContextFlags) { + function setContextFlag(val: boolean, flag: NodeFlags) { if (val) { contextFlags |= flag; } @@ -682,22 +682,22 @@ namespace ts { } function setDisallowInContext(val: boolean) { - setContextFlag(val, ParserContextFlags.DisallowIn); + setContextFlag(val, NodeFlags.DisallowIn); } function setYieldContext(val: boolean) { - setContextFlag(val, ParserContextFlags.Yield); + setContextFlag(val, NodeFlags.Yield); } function setDecoratorContext(val: boolean) { - setContextFlag(val, ParserContextFlags.Decorator); + setContextFlag(val, NodeFlags.Decorator); } function setAwaitContext(val: boolean) { - setContextFlag(val, ParserContextFlags.Await); + setContextFlag(val, NodeFlags.Await); } - function doOutsideOfContext(context: ParserContextFlags, func: () => T): T { + function doOutsideOfContext(context: NodeFlags, func: () => T): T { // contextFlagsToClear will contain only the context flags that are // currently set that we need to temporarily clear // We don't just blindly reset to the previous flags to ensure @@ -718,7 +718,7 @@ namespace ts { return func(); } - function doInsideOfContext(context: ParserContextFlags, func: () => T): T { + function doInsideOfContext(context: NodeFlags, func: () => T): T { // contextFlagsToSet will contain only the context flags that // are not currently set that we need to temporarily enable. // We don't just blindly reset to the previous flags to ensure @@ -740,51 +740,51 @@ namespace ts { } function allowInAnd(func: () => T): T { - return doOutsideOfContext(ParserContextFlags.DisallowIn, func); + return doOutsideOfContext(NodeFlags.DisallowIn, func); } function disallowInAnd(func: () => T): T { - return doInsideOfContext(ParserContextFlags.DisallowIn, func); + return doInsideOfContext(NodeFlags.DisallowIn, func); } function doInYieldContext(func: () => T): T { - return doInsideOfContext(ParserContextFlags.Yield, func); + return doInsideOfContext(NodeFlags.Yield, func); } function doInDecoratorContext(func: () => T): T { - return doInsideOfContext(ParserContextFlags.Decorator, func); + return doInsideOfContext(NodeFlags.Decorator, func); } function doInAwaitContext(func: () => T): T { - return doInsideOfContext(ParserContextFlags.Await, func); + return doInsideOfContext(NodeFlags.Await, func); } function doOutsideOfAwaitContext(func: () => T): T { - return doOutsideOfContext(ParserContextFlags.Await, func); + return doOutsideOfContext(NodeFlags.Await, func); } function doInYieldAndAwaitContext(func: () => T): T { - return doInsideOfContext(ParserContextFlags.Yield | ParserContextFlags.Await, func); + return doInsideOfContext(NodeFlags.Yield | NodeFlags.Await, func); } - function inContext(flags: ParserContextFlags) { + function inContext(flags: NodeFlags) { return (contextFlags & flags) !== 0; } function inYieldContext() { - return inContext(ParserContextFlags.Yield); + return inContext(NodeFlags.Yield); } function inDisallowInContext() { - return inContext(ParserContextFlags.DisallowIn); + return inContext(NodeFlags.DisallowIn); } function inDecoratorContext() { - return inContext(ParserContextFlags.Decorator); + return inContext(NodeFlags.Decorator); } function inAwaitContext() { - return inContext(ParserContextFlags.Await); + return inContext(NodeFlags.Await); } function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void { @@ -1004,7 +1004,7 @@ namespace ts { // flag so that we don't mark any subsequent nodes. if (parseErrorBeforeNextFinishedNode) { parseErrorBeforeNextFinishedNode = false; - node.parserContextFlags |= ParserContextFlags.ThisNodeHasError; + node.parserContextFlags |= NodeFlags.ThisNodeHasError; } return node; @@ -1453,7 +1453,7 @@ namespace ts { // differently depending on what mode it is in. // // This also applies to all our other context flags as well. - const nodeContextFlags = node.parserContextFlags & ParserContextFlags.ParserGeneratedFlags; + const nodeContextFlags = node.parserContextFlags & NodeFlags.ParserGeneratedFlags; if (nodeContextFlags !== contextFlags) { return undefined; } @@ -2512,7 +2512,7 @@ namespace ts { function parseType(): TypeNode { // The rules about 'yield' only apply to actual code/expression contexts. They don't // apply to 'type' contexts. So we disable these parameters here before moving on. - return doOutsideOfContext(ParserContextFlags.TypeExcludesFlags, parseTypeWorker); + return doOutsideOfContext(NodeFlags.TypeExcludesFlags, parseTypeWorker); } function parseTypeWorker(): TypeNode { @@ -4785,7 +4785,7 @@ namespace ts { // The checker may still error in the static case to explicitly disallow the yield expression. property.initializer = modifiers && modifiers.flags & NodeFlags.Static ? allowInAnd(parseNonParameterInitializer) - : doOutsideOfContext(ParserContextFlags.Yield | ParserContextFlags.DisallowIn, parseNonParameterInitializer); + : doOutsideOfContext(NodeFlags.Yield | NodeFlags.DisallowIn, parseNonParameterInitializer); parseSemicolon(); return finishNode(property); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4421a882121..4b619041cb8 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -381,18 +381,26 @@ namespace ts { Abstract = 1 << 7, // Class/Method/ConstructSignature Async = 1 << 8, // Property/Method/Function Default = 1 << 9, // Function/Class (export default declaration) - Let = 1 << 13, // Variable declaration - Const = 1 << 14, // Variable declaration - Namespace = 1 << 16, // Namespace declaration - ExportContext = 1 << 17, // Export context (initialized by binding) - ContainsThis = 1 << 18, // Interface contains references to "this" - HasImplicitReturn = 1 << 19, // If function implicitly returns on one of codepaths (initialized by binding) - HasExplicitReturn = 1 << 20, // If function has explicit reachable return on one of codepaths (initialized by binding) - GlobalAugmentation = 1 << 21, // Set if module declaration is an augmentation for the global scope - HasClassExtends = 1 << 22, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding) - HasDecorators = 1 << 23, // If the file has decorators (initialized by binding) - HasParamDecorators = 1 << 24, // If the file has parameter decorators (initialized by binding) - HasAsyncFunctions = 1 << 25, // If the file has async functions (initialized by binding) + Let = 1 << 10, // Variable declaration + Const = 1 << 11, // Variable declaration + Namespace = 1 << 12, // Namespace declaration + ExportContext = 1 << 13, // Export context (initialized by binding) + ContainsThis = 1 << 14, // Interface contains references to "this" + HasImplicitReturn = 1 << 15, // If function implicitly returns on one of codepaths (initialized by binding) + HasExplicitReturn = 1 << 16, // If function has explicit reachable return on one of codepaths (initialized by binding) + GlobalAugmentation = 1 << 17, // Set if module declaration is an augmentation for the global scope + HasClassExtends = 1 << 18, // If the file has a non-ambient class with an extends clause in ES5 or lower (initialized by binding) + HasDecorators = 1 << 19, // If the file has decorators (initialized by binding) + HasParamDecorators = 1 << 20, // If the file has parameter decorators (initialized by binding) + HasAsyncFunctions = 1 << 21, // If the file has async functions (initialized by binding) + DisallowIn = 1 << 22, // If node was parsed in a context where 'in-expressions' are not allowed + Yield = 1 << 23, // If node was parsed in the 'yield' context created when parsing a generator + Decorator = 1 << 24, // If node was parsed as part of a decorator + Await = 1 << 25, // If node was parsed in the 'await' context created when parsing an async function + ThisNodeHasError = 1 << 26, // If the parser encountered an error when parsing the code that created this node + JavaScriptFile = 1 << 27, // If node was parsed in a JavaScript + ThisNodeOrAnySubNodesHasError = 1 << 28, // If this node or any of its children had an error + HasAggregatedChildData = 1 << 29, // If we've computed data from children and cached it in this node Modifier = Export | Ambient | Public | Private | Protected | Static | Abstract | Default | Async, AccessibilityModifier = Public | Private | Protected, @@ -400,47 +408,12 @@ namespace ts { ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn, EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions, - } - - /* @internal */ - export const enum ParserContextFlags { - None = 0, - - // If this node was parsed in a context where 'in-expressions' are not allowed. - DisallowIn = 1 << 0, - - // If this node was parsed in the 'yield' context created when parsing a generator. - Yield = 1 << 1, - - // If this node was parsed as part of a decorator - Decorator = 1 << 2, - - // If this node was parsed in the 'await' context created when parsing an async function. - Await = 1 << 3, - - // If the parser encountered an error when parsing the code that created this node. Note - // the parser only sets this directly on the node it creates right after encountering the - // error. - ThisNodeHasError = 1 << 4, - - // This node was parsed in a JavaScript file and can be processed differently. For example - // its type can be specified usign a JSDoc comment. - JavaScriptFile = 1 << 5, // Context flags set directly by the parser. ParserGeneratedFlags = DisallowIn | Yield | Decorator | ThisNodeHasError | Await, // Exclude these flags when parsing a Type TypeExcludesFlags = Yield | Await, - - // Context flags computed by aggregating child flags upwards. - - // Used during incremental parsing to determine if this node or any of its children had an - // error. Computed only once and then cached. - ThisNodeOrAnySubNodesHasError = 1 << 6, - - // Used to know if we've computed data from children and cached it in this node. - HasAggregatedChildData = 1 << 7 } export const enum JsxFlags { @@ -470,7 +443,7 @@ namespace ts { flags: NodeFlags; // Specific context the parser was in when this node was created. Normally undefined. // Only set when the parser was in some interesting context (like async/yield). - /* @internal */ parserContextFlags?: ParserContextFlags; + /* @internal */ parserContextFlags?: NodeFlags; decorators?: NodeArray; // Array of decorators (in document order) modifiers?: ModifiersArray; // Array of modifiers /* @internal */ id?: number; // Unique id (used to look up NodeLinks) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 7042200ba8e..9cb1b7e784e 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -121,26 +121,26 @@ namespace ts { // Returns true if this node contains a parse error anywhere underneath it. export function containsParseError(node: Node): boolean { aggregateChildData(node); - return (node.parserContextFlags & ParserContextFlags.ThisNodeOrAnySubNodesHasError) !== 0; + return (node.parserContextFlags & NodeFlags.ThisNodeOrAnySubNodesHasError) !== 0; } function aggregateChildData(node: Node): void { - if (!(node.parserContextFlags & ParserContextFlags.HasAggregatedChildData)) { + if (!(node.parserContextFlags & NodeFlags.HasAggregatedChildData)) { // A node is considered to contain a parse error if: // a) the parser explicitly marked that it had an error // b) any of it's children reported that it had an error. - const thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & ParserContextFlags.ThisNodeHasError) !== 0) || + const thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & NodeFlags.ThisNodeHasError) !== 0) || forEachChild(node, containsParseError); // If so, mark ourselves accordingly. if (thisNodeOrAnySubNodesHasError) { - node.parserContextFlags |= ParserContextFlags.ThisNodeOrAnySubNodesHasError; + node.parserContextFlags |= NodeFlags.ThisNodeOrAnySubNodesHasError; } // Also mark that we've propogated the child information to this node. This way we can // always consult the bit directly on this node without needing to check its children // again. - node.parserContextFlags |= ParserContextFlags.HasAggregatedChildData; + node.parserContextFlags |= NodeFlags.HasAggregatedChildData; } } @@ -1078,7 +1078,7 @@ namespace ts { } export function isInJavaScriptFile(node: Node): boolean { - return node && !!(node.parserContextFlags & ParserContextFlags.JavaScriptFile); + return node && !!(node.parserContextFlags & NodeFlags.JavaScriptFile); } /** @@ -1266,7 +1266,7 @@ namespace ts { export function isRestParameter(node: ParameterDeclaration) { if (node) { - if (node.parserContextFlags & ParserContextFlags.JavaScriptFile) { + if (node.parserContextFlags & NodeFlags.JavaScriptFile) { if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) { return true; } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 2b0c95c0a61..6bc46667fed 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -284,7 +284,7 @@ namespace Utils { // Clear the flag that are produced by aggregating child values.. That is ephemeral // data we don't care about in the dump. We only care what the parser set directly // on the ast. - let value = n.parserContextFlags & ts.ParserContextFlags.ParserGeneratedFlags; + let value = n.parserContextFlags & ts.NodeFlags.ParserGeneratedFlags; if (value) { o[propertyName] = getParserContextFlagName(value); } From f4ee49f24e05a4a0f946194eb3890d39690f1c59 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 31 Jan 2016 08:57:32 -0800 Subject: [PATCH 135/160] Renaming parsing context flags to NodeFlags.xxxContext --- src/compiler/checker.ts | 8 ++++---- src/compiler/parser.ts | 34 +++++++++++++++++----------------- src/compiler/types.ts | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index fafcffbe582..91ce1be5d74 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -7183,7 +7183,7 @@ namespace ts { } } - if (node.parserContextFlags & NodeFlags.Await) { + if (node.parserContextFlags & NodeFlags.AwaitContext) { getNodeLinks(container).flags |= NodeCheckFlags.CaptureArguments; } } @@ -10783,7 +10783,7 @@ namespace ts { function checkAwaitExpression(node: AwaitExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & NodeFlags.Await)) { + if (!(node.parserContextFlags & NodeFlags.AwaitContext)) { grammarErrorOnFirstToken(node, Diagnostics.await_expression_is_only_allowed_within_an_async_function); } @@ -11239,7 +11239,7 @@ namespace ts { function checkYieldExpression(node: YieldExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & NodeFlags.Yield) || isYieldExpressionInClass(node)) { + if (!(node.parserContextFlags & NodeFlags.YieldContext) || isYieldExpressionInClass(node)) { grammarErrorOnFirstToken(node, Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body); } @@ -13701,7 +13701,7 @@ namespace ts { function checkWithStatement(node: WithStatement) { // Grammar checking for withStatement if (!checkGrammarStatementInAmbientContext(node)) { - if (node.parserContextFlags & NodeFlags.Await) { + if (node.parserContextFlags & NodeFlags.AwaitContext) { grammarErrorOnFirstToken(node, Diagnostics.with_statements_are_not_allowed_in_an_async_function_block); } } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index bbf1c2bddac..d52d1272697 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -438,7 +438,7 @@ namespace ts { // Share a single scanner across all calls to parse a source file. This helps speed things // up by avoiding the cost of creating/compiling scanners over and over again. const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); - const disallowInAndDecoratorContext = NodeFlags.DisallowIn | NodeFlags.Decorator; + const disallowInAndDecoratorContext = NodeFlags.DisallowInContext | NodeFlags.DecoratorContext; // capture constructors in 'initializeState' to avoid null checks let NodeConstructor: new (kind: SyntaxKind, pos: number, end: number) => Node; @@ -682,19 +682,19 @@ namespace ts { } function setDisallowInContext(val: boolean) { - setContextFlag(val, NodeFlags.DisallowIn); + setContextFlag(val, NodeFlags.DisallowInContext); } function setYieldContext(val: boolean) { - setContextFlag(val, NodeFlags.Yield); + setContextFlag(val, NodeFlags.YieldContext); } function setDecoratorContext(val: boolean) { - setContextFlag(val, NodeFlags.Decorator); + setContextFlag(val, NodeFlags.DecoratorContext); } function setAwaitContext(val: boolean) { - setContextFlag(val, NodeFlags.Await); + setContextFlag(val, NodeFlags.AwaitContext); } function doOutsideOfContext(context: NodeFlags, func: () => T): T { @@ -740,31 +740,31 @@ namespace ts { } function allowInAnd(func: () => T): T { - return doOutsideOfContext(NodeFlags.DisallowIn, func); + return doOutsideOfContext(NodeFlags.DisallowInContext, func); } function disallowInAnd(func: () => T): T { - return doInsideOfContext(NodeFlags.DisallowIn, func); + return doInsideOfContext(NodeFlags.DisallowInContext, func); } function doInYieldContext(func: () => T): T { - return doInsideOfContext(NodeFlags.Yield, func); + return doInsideOfContext(NodeFlags.YieldContext, func); } function doInDecoratorContext(func: () => T): T { - return doInsideOfContext(NodeFlags.Decorator, func); + return doInsideOfContext(NodeFlags.DecoratorContext, func); } function doInAwaitContext(func: () => T): T { - return doInsideOfContext(NodeFlags.Await, func); + return doInsideOfContext(NodeFlags.AwaitContext, func); } function doOutsideOfAwaitContext(func: () => T): T { - return doOutsideOfContext(NodeFlags.Await, func); + return doOutsideOfContext(NodeFlags.AwaitContext, func); } function doInYieldAndAwaitContext(func: () => T): T { - return doInsideOfContext(NodeFlags.Yield | NodeFlags.Await, func); + return doInsideOfContext(NodeFlags.YieldContext | NodeFlags.AwaitContext, func); } function inContext(flags: NodeFlags) { @@ -772,19 +772,19 @@ namespace ts { } function inYieldContext() { - return inContext(NodeFlags.Yield); + return inContext(NodeFlags.YieldContext); } function inDisallowInContext() { - return inContext(NodeFlags.DisallowIn); + return inContext(NodeFlags.DisallowInContext); } function inDecoratorContext() { - return inContext(NodeFlags.Decorator); + return inContext(NodeFlags.DecoratorContext); } function inAwaitContext() { - return inContext(NodeFlags.Await); + return inContext(NodeFlags.AwaitContext); } function parseErrorAtCurrentToken(message: DiagnosticMessage, arg0?: any): void { @@ -4785,7 +4785,7 @@ namespace ts { // The checker may still error in the static case to explicitly disallow the yield expression. property.initializer = modifiers && modifiers.flags & NodeFlags.Static ? allowInAnd(parseNonParameterInitializer) - : doOutsideOfContext(NodeFlags.Yield | NodeFlags.DisallowIn, parseNonParameterInitializer); + : doOutsideOfContext(NodeFlags.YieldContext | NodeFlags.DisallowInContext, parseNonParameterInitializer); parseSemicolon(); return finishNode(property); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 4b619041cb8..3e5ac5094dd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -393,10 +393,10 @@ namespace ts { HasDecorators = 1 << 19, // If the file has decorators (initialized by binding) HasParamDecorators = 1 << 20, // If the file has parameter decorators (initialized by binding) HasAsyncFunctions = 1 << 21, // If the file has async functions (initialized by binding) - DisallowIn = 1 << 22, // If node was parsed in a context where 'in-expressions' are not allowed - Yield = 1 << 23, // If node was parsed in the 'yield' context created when parsing a generator - Decorator = 1 << 24, // If node was parsed as part of a decorator - Await = 1 << 25, // If node was parsed in the 'await' context created when parsing an async function + DisallowInContext = 1 << 22, // If node was parsed in a context where 'in-expressions' are not allowed + YieldContext = 1 << 23, // If node was parsed in the 'yield' context created when parsing a generator + DecoratorContext = 1 << 24, // If node was parsed as part of a decorator + AwaitContext = 1 << 25, // If node was parsed in the 'await' context created when parsing an async function ThisNodeHasError = 1 << 26, // If the parser encountered an error when parsing the code that created this node JavaScriptFile = 1 << 27, // If node was parsed in a JavaScript ThisNodeOrAnySubNodesHasError = 1 << 28, // If this node or any of its children had an error @@ -410,10 +410,10 @@ namespace ts { EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions, // Context flags set directly by the parser. - ParserGeneratedFlags = DisallowIn | Yield | Decorator | ThisNodeHasError | Await, + ParserGeneratedFlags = DisallowInContext | YieldContext | DecoratorContext | ThisNodeHasError | AwaitContext, // Exclude these flags when parsing a Type - TypeExcludesFlags = Yield | Await, + TypeExcludesFlags = YieldContext | AwaitContext, } export const enum JsxFlags { From 4d2cd6f88bc0e1c4fde15e9fe5494136428b4b37 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Sun, 31 Jan 2016 12:10:33 -0800 Subject: [PATCH 136/160] properly dotted namespace names in System modules --- src/compiler/emitter.ts | 4 +-- .../reference/dottedNamesInSystem.js | 35 +++++++++++++++++++ .../reference/dottedNamesInSystem.symbols | 22 ++++++++++++ .../reference/dottedNamesInSystem.types | 23 ++++++++++++ tests/cases/compiler/dottedNamesInSystem.ts | 8 +++++ 5 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/dottedNamesInSystem.js create mode 100644 tests/baselines/reference/dottedNamesInSystem.symbols create mode 100644 tests/baselines/reference/dottedNamesInSystem.types create mode 100644 tests/cases/compiler/dottedNamesInSystem.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a62739e1334..98ad7c874d6 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -2583,12 +2583,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge return false; } - let current: Node = node; + let current = getRootDeclaration(node).parent; while (current) { if (current.kind === SyntaxKind.SourceFile) { return !isExported || ((getCombinedNodeFlags(node) & NodeFlags.Export) !== 0); } - else if (isFunctionLike(current) || current.kind === SyntaxKind.ModuleBlock) { + else if (isDeclaration(current)) { return false; } else { diff --git a/tests/baselines/reference/dottedNamesInSystem.js b/tests/baselines/reference/dottedNamesInSystem.js new file mode 100644 index 00000000000..4f1814f393d --- /dev/null +++ b/tests/baselines/reference/dottedNamesInSystem.js @@ -0,0 +1,35 @@ +//// [dottedNamesInSystem.ts] +export namespace A.B.C { + export function foo() {} +} + +export function bar() { + return A.B.C.foo(); +} + +//// [dottedNamesInSystem.js] +System.register([], function(exports_1, context_1) { + "use strict"; + var __moduleName = context_1 && context_1.id; + var A; + function bar() { + return A.B.C.foo(); + } + exports_1("bar", bar); + return { + setters:[], + execute: function() { + (function (A) { + var B; + (function (B) { + var C; + (function (C) { + function foo() { } + C.foo = foo; + })(C = B.C || (B.C = {})); + })(B = A.B || (A.B = {})); + })(A = A || (A = {})); + exports_1("A", A); + } + } +}); diff --git a/tests/baselines/reference/dottedNamesInSystem.symbols b/tests/baselines/reference/dottedNamesInSystem.symbols new file mode 100644 index 00000000000..bfbc57ed1ba --- /dev/null +++ b/tests/baselines/reference/dottedNamesInSystem.symbols @@ -0,0 +1,22 @@ +=== tests/cases/compiler/dottedNamesInSystem.ts === +export namespace A.B.C { +>A : Symbol(A, Decl(dottedNamesInSystem.ts, 0, 0)) +>B : Symbol(B, Decl(dottedNamesInSystem.ts, 0, 19)) +>C : Symbol(C, Decl(dottedNamesInSystem.ts, 0, 21)) + + export function foo() {} +>foo : Symbol(foo, Decl(dottedNamesInSystem.ts, 0, 24)) +} + +export function bar() { +>bar : Symbol(bar, Decl(dottedNamesInSystem.ts, 2, 1)) + + return A.B.C.foo(); +>A.B.C.foo : Symbol(A.B.C.foo, Decl(dottedNamesInSystem.ts, 0, 24)) +>A.B.C : Symbol(A.B.C, Decl(dottedNamesInSystem.ts, 0, 21)) +>A.B : Symbol(A.B, Decl(dottedNamesInSystem.ts, 0, 19)) +>A : Symbol(A, Decl(dottedNamesInSystem.ts, 0, 0)) +>B : Symbol(A.B, Decl(dottedNamesInSystem.ts, 0, 19)) +>C : Symbol(A.B.C, Decl(dottedNamesInSystem.ts, 0, 21)) +>foo : Symbol(A.B.C.foo, Decl(dottedNamesInSystem.ts, 0, 24)) +} diff --git a/tests/baselines/reference/dottedNamesInSystem.types b/tests/baselines/reference/dottedNamesInSystem.types new file mode 100644 index 00000000000..78de0e33883 --- /dev/null +++ b/tests/baselines/reference/dottedNamesInSystem.types @@ -0,0 +1,23 @@ +=== tests/cases/compiler/dottedNamesInSystem.ts === +export namespace A.B.C { +>A : typeof A +>B : typeof B +>C : typeof C + + export function foo() {} +>foo : () => void +} + +export function bar() { +>bar : () => void + + return A.B.C.foo(); +>A.B.C.foo() : void +>A.B.C.foo : () => void +>A.B.C : typeof A.B.C +>A.B : typeof A.B +>A : typeof A +>B : typeof A.B +>C : typeof A.B.C +>foo : () => void +} diff --git a/tests/cases/compiler/dottedNamesInSystem.ts b/tests/cases/compiler/dottedNamesInSystem.ts new file mode 100644 index 00000000000..43b8eb233b9 --- /dev/null +++ b/tests/cases/compiler/dottedNamesInSystem.ts @@ -0,0 +1,8 @@ +// @module: system +export namespace A.B.C { + export function foo() {} +} + +export function bar() { + return A.B.C.foo(); +} \ No newline at end of file From 4421c52b83db2e747b53e623c1994d31c393e3b0 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sun, 31 Jan 2016 14:00:54 -0800 Subject: [PATCH 137/160] Remove parserContextFlags from Node type --- src/compiler/checker.ts | 16 ++++++++-------- src/compiler/parser.ts | 11 ++++------- src/compiler/types.ts | 7 ++----- src/compiler/utilities.ts | 14 +++++++------- src/harness/harness.ts | 23 +++++++---------------- 5 files changed, 28 insertions(+), 43 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 91ce1be5d74..afbb77a08a4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2634,7 +2634,7 @@ namespace ts { // Return the inferred type for a variable, parameter, or property declaration function getTypeForVariableLikeDeclaration(declaration: VariableLikeDeclaration): Type { - if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { + if (declaration.flags & NodeFlags.JavaScriptFile) { // If this is a variable in a JavaScript file, then use the JSDoc type (if it has // one as its type), otherwise fallback to the below standard TS codepaths to // try to figure it out. @@ -3981,7 +3981,7 @@ namespace ts { } function getTypeParametersFromJSDocTemplate(declaration: SignatureDeclaration): TypeParameter[] { - if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { + if (declaration.flags & NodeFlags.JavaScriptFile) { const templateTag = getJSDocTemplateTag(declaration); if (templateTag) { return getTypeParametersFromDeclaration(templateTag.typeParameters); @@ -4015,7 +4015,7 @@ namespace ts { } function isOptionalParameter(node: ParameterDeclaration) { - if (node.parserContextFlags & NodeFlags.JavaScriptFile) { + if (node.flags & NodeFlags.JavaScriptFile) { if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) { return true; } @@ -4124,7 +4124,7 @@ namespace ts { returnType = getTypeFromTypeNode(declaration.type); } else { - if (declaration.parserContextFlags & NodeFlags.JavaScriptFile) { + if (declaration.flags & NodeFlags.JavaScriptFile) { const type = getReturnTypeFromJSDocComment(declaration); if (type && type !== unknownType) { returnType = type; @@ -7183,7 +7183,7 @@ namespace ts { } } - if (node.parserContextFlags & NodeFlags.AwaitContext) { + if (node.flags & NodeFlags.AwaitContext) { getNodeLinks(container).flags |= NodeCheckFlags.CaptureArguments; } } @@ -10783,7 +10783,7 @@ namespace ts { function checkAwaitExpression(node: AwaitExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & NodeFlags.AwaitContext)) { + if (!(node.flags & NodeFlags.AwaitContext)) { grammarErrorOnFirstToken(node, Diagnostics.await_expression_is_only_allowed_within_an_async_function); } @@ -11239,7 +11239,7 @@ namespace ts { function checkYieldExpression(node: YieldExpression): Type { // Grammar checking if (produceDiagnostics) { - if (!(node.parserContextFlags & NodeFlags.YieldContext) || isYieldExpressionInClass(node)) { + if (!(node.flags & NodeFlags.YieldContext) || isYieldExpressionInClass(node)) { grammarErrorOnFirstToken(node, Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body); } @@ -13701,7 +13701,7 @@ namespace ts { function checkWithStatement(node: WithStatement) { // Grammar checking for withStatement if (!checkGrammarStatementInAmbientContext(node)) { - if (node.parserContextFlags & NodeFlags.AwaitContext) { + if (node.flags & NodeFlags.AwaitContext) { grammarErrorOnFirstToken(node, Diagnostics.with_statements_are_not_allowed_in_an_async_function_block); } } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index d52d1272697..4ec83277e3e 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -587,10 +587,7 @@ namespace ts { function parseSourceFileWorker(fileName: string, languageVersion: ScriptTarget, setParentNodes: boolean): SourceFile { sourceFile = createSourceFile(fileName, languageVersion); - - if (contextFlags & NodeFlags.JavaScriptFile) { - sourceFile.parserContextFlags = NodeFlags.JavaScriptFile; - } + sourceFile.flags = contextFlags; // Prime the scanner. token = nextToken(); @@ -996,7 +993,7 @@ namespace ts { node.end = end === undefined ? scanner.getStartPos() : end; if (contextFlags) { - node.parserContextFlags = contextFlags; + node.flags |= contextFlags; } // Keep track on the node if we encountered an error while parsing it. If we did, then @@ -1004,7 +1001,7 @@ namespace ts { // flag so that we don't mark any subsequent nodes. if (parseErrorBeforeNextFinishedNode) { parseErrorBeforeNextFinishedNode = false; - node.parserContextFlags |= NodeFlags.ThisNodeHasError; + node.flags |= NodeFlags.ThisNodeHasError; } return node; @@ -1453,7 +1450,7 @@ namespace ts { // differently depending on what mode it is in. // // This also applies to all our other context flags as well. - const nodeContextFlags = node.parserContextFlags & NodeFlags.ParserGeneratedFlags; + const nodeContextFlags = node.flags & NodeFlags.ContextFlags; if (nodeContextFlags !== contextFlags) { return undefined; } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 3e5ac5094dd..5e09c792f91 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -409,8 +409,8 @@ namespace ts { ReachabilityCheckFlags = HasImplicitReturn | HasExplicitReturn, EmitHelperFlags = HasClassExtends | HasDecorators | HasParamDecorators | HasAsyncFunctions, - // Context flags set directly by the parser. - ParserGeneratedFlags = DisallowInContext | YieldContext | DecoratorContext | ThisNodeHasError | AwaitContext, + // Parsing context flags + ContextFlags = DisallowInContext | YieldContext | DecoratorContext | AwaitContext, // Exclude these flags when parsing a Type TypeExcludesFlags = YieldContext | AwaitContext, @@ -441,9 +441,6 @@ namespace ts { export interface Node extends TextRange { kind: SyntaxKind; flags: NodeFlags; - // Specific context the parser was in when this node was created. Normally undefined. - // Only set when the parser was in some interesting context (like async/yield). - /* @internal */ parserContextFlags?: NodeFlags; decorators?: NodeArray; // Array of decorators (in document order) modifiers?: ModifiersArray; // Array of modifiers /* @internal */ id?: number; // Unique id (used to look up NodeLinks) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 9cb1b7e784e..02b8385d0ff 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -121,26 +121,26 @@ namespace ts { // Returns true if this node contains a parse error anywhere underneath it. export function containsParseError(node: Node): boolean { aggregateChildData(node); - return (node.parserContextFlags & NodeFlags.ThisNodeOrAnySubNodesHasError) !== 0; + return (node.flags & NodeFlags.ThisNodeOrAnySubNodesHasError) !== 0; } function aggregateChildData(node: Node): void { - if (!(node.parserContextFlags & NodeFlags.HasAggregatedChildData)) { + if (!(node.flags & NodeFlags.HasAggregatedChildData)) { // A node is considered to contain a parse error if: // a) the parser explicitly marked that it had an error // b) any of it's children reported that it had an error. - const thisNodeOrAnySubNodesHasError = ((node.parserContextFlags & NodeFlags.ThisNodeHasError) !== 0) || + const thisNodeOrAnySubNodesHasError = ((node.flags & NodeFlags.ThisNodeHasError) !== 0) || forEachChild(node, containsParseError); // If so, mark ourselves accordingly. if (thisNodeOrAnySubNodesHasError) { - node.parserContextFlags |= NodeFlags.ThisNodeOrAnySubNodesHasError; + node.flags |= NodeFlags.ThisNodeOrAnySubNodesHasError; } // Also mark that we've propogated the child information to this node. This way we can // always consult the bit directly on this node without needing to check its children // again. - node.parserContextFlags |= NodeFlags.HasAggregatedChildData; + node.flags |= NodeFlags.HasAggregatedChildData; } } @@ -1078,7 +1078,7 @@ namespace ts { } export function isInJavaScriptFile(node: Node): boolean { - return node && !!(node.parserContextFlags & NodeFlags.JavaScriptFile); + return node && !!(node.flags & NodeFlags.JavaScriptFile); } /** @@ -1266,7 +1266,7 @@ namespace ts { export function isRestParameter(node: ParameterDeclaration) { if (node) { - if (node.parserContextFlags & NodeFlags.JavaScriptFile) { + if (node.flags & NodeFlags.JavaScriptFile) { if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) { return true; } diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 6bc46667fed..848b0d4e063 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -245,7 +245,6 @@ namespace Utils { } function getNodeFlagName(f: number) { return getFlagName((ts).NodeFlags, f); } - function getParserContextFlagName(f: number) { return getFlagName((ts).ParserContextFlags, f); } function serializeNode(n: ts.Node): any { const o: any = { kind: getKindName(n.kind) }; @@ -274,19 +273,12 @@ namespace Utils { break; case "flags": - // Print out flags with their enum names. - if (n.flags) { - o[propertyName] = getNodeFlagName(n.flags); - } - break; - - case "parserContextFlags": - // Clear the flag that are produced by aggregating child values.. That is ephemeral - // data we don't care about in the dump. We only care what the parser set directly - // on the ast. - let value = n.parserContextFlags & ts.NodeFlags.ParserGeneratedFlags; - if (value) { - o[propertyName] = getParserContextFlagName(value); + // Clear the flags that are produced by aggregating child values. That is ephemeral + // data we don't care about in the dump. We only care what the parser set directly + // on the AST. + const flags = n.flags & ~(ts.NodeFlags.JavaScriptFile | ts.NodeFlags.HasAggregatedChildData); + if (flags) { + o[propertyName] = getNodeFlagName(flags); } break; @@ -353,12 +345,11 @@ namespace Utils { assert.equal(node1.pos, node2.pos, "node1.pos !== node2.pos"); assert.equal(node1.end, node2.end, "node1.end !== node2.end"); assert.equal(node1.kind, node2.kind, "node1.kind !== node2.kind"); - assert.equal(node1.flags, node2.flags, "node1.flags !== node2.flags"); // call this on both nodes to ensure all propagated flags have been set (and thus can be // compared). assert.equal(ts.containsParseError(node1), ts.containsParseError(node2)); - assert.equal(node1.parserContextFlags, node2.parserContextFlags, "node1.parserContextFlags !== node2.parserContextFlags"); + assert.equal(node1.flags, node2.flags, "node1.flags !== node2.flags"); ts.forEachChild(node1, child1 => { From dc657b869609b42c273b9b4d2944943208d93386 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Mon, 1 Feb 2016 06:55:53 -0800 Subject: [PATCH 138/160] Adding /*@internal*/ directives --- src/compiler/types.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 5e09c792f91..60f9e0d0cef 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -904,6 +904,7 @@ namespace ts { text: string; isUnterminated?: boolean; hasExtendedUnicodeEscape?: boolean; + /* @internal */ isOctalLiteral?: boolean; } @@ -946,6 +947,7 @@ namespace ts { // @kind(SyntaxKind.ArrayLiteralExpression) export interface ArrayLiteralExpression extends PrimaryExpression { elements: NodeArray; + /* @internal */ multiLine?: boolean; } @@ -958,6 +960,7 @@ namespace ts { // @kind(SyntaxKind.ObjectLiteralExpression) export interface ObjectLiteralExpression extends PrimaryExpression, Declaration { properties: NodeArray; + /* @internal */ multiLine?: boolean; } From 95196886f7fb37078ddcbc2b85c8d171fc9e5a6e Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 1 Feb 2016 10:14:14 -0800 Subject: [PATCH 139/160] Fix lint --- src/compiler/checker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 389fed35916..5adcbcf5906 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -10347,7 +10347,7 @@ namespace ts { if (returnTag && returnTag.typeExpression) { return getTypeFromTypeNode(returnTag.typeExpression.type); } - + return undefined; } From b0b0712c73d75b49ae6f374ab51574825a44be14 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 1 Feb 2016 10:36:47 -0800 Subject: [PATCH 140/160] suppress validation of output paths in transpile scenarios --- src/compiler/program.ts | 2 +- src/compiler/types.ts | 2 ++ src/services/services.ts | 3 +++ tests/cases/unittests/transpile.ts | 9 +++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 6d4d7b54253..8ec821cb665 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1717,7 +1717,7 @@ namespace ts { } // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files - if (!options.noEmit) { + if (!options.noEmit && !options.suppressOutputPathCheck) { const emitHost = getEmitHost(); const emitFilesSeen = createFileMap(!host.useCaseSensitiveFileNames() ? key => key.toLocaleLowerCase() : undefined); forEachExpectedEmitFile(emitHost, (emitFileNames, sourceFiles, isBundledEmit) => { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 60f9e0d0cef..5545fbd162e 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2426,6 +2426,8 @@ namespace ts { // Skip checking lib.d.ts to help speed up tests. /* @internal */ skipDefaultLibCheck?: boolean; + // Do not perform validation of output file name in transpile scenarios + /* @internal */ suppressOutputPathCheck?: boolean; [option: string]: string | number | boolean | TsConfigOnlyOptions; } diff --git a/src/services/services.ts b/src/services/services.ts index 6d12f29d508..96d09fd0603 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1876,6 +1876,9 @@ namespace ts { options.isolatedModules = true; + // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths. + options.suppressOutputPathCheck = true; + // Filename can be non-ts file. options.allowNonTsExtensions = true; diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index d9fdaeb32ec..6f46bb53405 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -291,5 +291,14 @@ var x = 0;`, options: { compilerOptions: { jsx: JsxEmit.React, newLine: NewLineKind.LineFeed } } }) }); + it("transpile .js files", () => { + const input = "const a = 10;"; + const output = `"use strict";\nvar a = 10;\n`; + test(input, { + expectedOutput: output, + options: { compilerOptions: { newLine: NewLineKind.LineFeed, module: ModuleKind.CommonJS }, fileName: "input.js", reportDiagnostics: true }, + expectedDiagnosticCodes: [] + }); + }) }); } From e6c6d3090a85efeab90f8b755882d8c8010c9846 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 1 Feb 2016 13:35:57 -0800 Subject: [PATCH 141/160] properly classify dotted tag names in jsx --- src/services/services.ts | 76 +++++++++++-------- .../fourslash/syntacticClassificationsJsx2.ts | 27 +++++++ 2 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 tests/cases/fourslash/syntacticClassificationsJsx2.ts diff --git a/src/services/services.ts b/src/services/services.ts index 6d12f29d508..fdc578b33fd 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -6860,21 +6860,58 @@ namespace ts { } } - function classifyTokenOrJsxText(token: Node): void { - if (nodeIsMissing(token)) { - return; + /** + * Returns true if node should be treated as classified and no further processing is required. + * False will mean that node is not classified and traverse routine should recurse into node contents. + */ + function tryClassifyNode(node: Node): boolean { + if (nodeIsMissing(node)) { + return true; } - const tokenStart = token.kind === SyntaxKind.JsxText ? token.pos : classifyLeadingTriviaAndGetTokenStart(token); + const classifiedElementName = tryClassifyJsxElementName(node); + if (!isToken(node) && node.kind !== SyntaxKind.JsxText && classifiedElementName === undefined) { + return false; + } - const tokenWidth = token.end - tokenStart; + const tokenStart = node.kind === SyntaxKind.JsxText ? node.pos : classifyLeadingTriviaAndGetTokenStart(node); + + const tokenWidth = node.end - tokenStart; Debug.assert(tokenWidth >= 0); if (tokenWidth > 0) { - const type = classifyTokenType(token.kind, token); + const type = classifiedElementName || classifyTokenType(node.kind, node); if (type) { pushClassification(tokenStart, tokenWidth, type); } } + + return true; + } + + function tryClassifyJsxElementName(token: Node): ClassificationType { + switch (token.parent && token.parent.kind) { + case SyntaxKind.JsxOpeningElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxOpenTagName; + } + break; + case SyntaxKind.JsxClosingElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxCloseTagName; + } + break; + case SyntaxKind.JsxSelfClosingElement: + if ((token.parent).tagName === token) { + return ClassificationType.jsxSelfClosingTagName; + } + break; + case SyntaxKind.JsxAttribute: + if ((token.parent).name === token) { + return ClassificationType.jsxAttribute; + } + break; + } + return undefined; } // for accurate classification, the actual token should be passed in. however, for @@ -6967,28 +7004,6 @@ namespace ts { return ClassificationType.parameterName; } return; - - case SyntaxKind.JsxOpeningElement: - if ((token.parent).tagName === token) { - return ClassificationType.jsxOpenTagName; - } - return; - - case SyntaxKind.JsxClosingElement: - if ((token.parent).tagName === token) { - return ClassificationType.jsxCloseTagName; - } - return; - - case SyntaxKind.JsxSelfClosingElement: - if ((token.parent).tagName === token) { - return ClassificationType.jsxSelfClosingTagName; - } - return; - case SyntaxKind.JsxAttribute: - if ((token.parent).name === token) { - return ClassificationType.jsxAttribute; - } } } return ClassificationType.identifier; @@ -7007,10 +7022,7 @@ namespace ts { const children = element.getChildren(sourceFile); for (let i = 0, n = children.length; i < n; i++) { const child = children[i]; - if (isToken(child) || child.kind === SyntaxKind.JsxText) { - classifyTokenOrJsxText(child); - } - else { + if (!tryClassifyNode(child)) { // Recurse into our child nodes. processElement(child); } diff --git a/tests/cases/fourslash/syntacticClassificationsJsx2.ts b/tests/cases/fourslash/syntacticClassificationsJsx2.ts new file mode 100644 index 00000000000..9110c6ce4b9 --- /dev/null +++ b/tests/cases/fourslash/syntacticClassificationsJsx2.ts @@ -0,0 +1,27 @@ +/// + +// @Filename: file1.tsx +////let x = +//// some jsx text +////; +//// +////let y = + +const c = classification; +verify.syntacticClassificationsAre( + c.keyword("let"), c.identifier("x"), c.operator("="), + c.punctuation("<"), + c.jsxOpenTagName("div.name"), + c.jsxAttribute("b"), c.operator("="), c.jsxAttributeStringLiteralValue(`"some-value"`), + c.jsxAttribute("c"), c.operator("="), c.punctuation("{"), c.numericLiteral("1"), c.punctuation("}"), + c.punctuation(">"), + c.jsxText(` + some jsx text +`), + c.punctuation("<"), c.punctuation("/"), c.jsxCloseTagName("div.name"), c.punctuation(">"), c.punctuation(";"), + c.keyword("let"), c.identifier("y"), c.operator("="), + c.punctuation("<"), + c.jsxSelfClosingTagName("element.name"), + c.jsxAttribute("attr"), c.operator("="), c.jsxAttributeStringLiteralValue(`"123"`), + c.punctuation("/"), c.punctuation(">") +) \ No newline at end of file From dd0a2e0340dd83d7bc3d19ec9f7be3bddf8de76e Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 1 Feb 2016 13:21:02 -0800 Subject: [PATCH 142/160] Added tests. --- tests/cases/conformance/salsa/exportDefaultInJsFile01.ts | 6 ++++++ tests/cases/conformance/salsa/exportDefaultInJsFile02.ts | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 tests/cases/conformance/salsa/exportDefaultInJsFile01.ts create mode 100644 tests/cases/conformance/salsa/exportDefaultInJsFile02.ts diff --git a/tests/cases/conformance/salsa/exportDefaultInJsFile01.ts b/tests/cases/conformance/salsa/exportDefaultInJsFile01.ts new file mode 100644 index 00000000000..bf2f3a4e99b --- /dev/null +++ b/tests/cases/conformance/salsa/exportDefaultInJsFile01.ts @@ -0,0 +1,6 @@ +// @allowJS: true +// @target: es3 +// @module: commonjs + +// @filename: myFile01.js +export default "hello"; \ No newline at end of file diff --git a/tests/cases/conformance/salsa/exportDefaultInJsFile02.ts b/tests/cases/conformance/salsa/exportDefaultInJsFile02.ts new file mode 100644 index 00000000000..1075b135f17 --- /dev/null +++ b/tests/cases/conformance/salsa/exportDefaultInJsFile02.ts @@ -0,0 +1,6 @@ +// @allowJS: true +// @target: es2015 +// @module: es2015 + +// @filename: myFile02.js +export default "hello"; \ No newline at end of file From bf4b63d3ba0e318ada17ae05ccdda5a007c11405 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 1 Feb 2016 13:28:58 -0800 Subject: [PATCH 143/160] Only error on 'export =' declarations. --- src/compiler/program.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 8ec821cb665..9a06a49370e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1071,8 +1071,11 @@ namespace ts { diagnostics.push(createDiagnosticForNode(node, Diagnostics.import_can_only_be_used_in_a_ts_file)); return true; case SyntaxKind.ExportAssignment: - diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file)); - return true; + if ((node).isExportEquals) { + diagnostics.push(createDiagnosticForNode(node, Diagnostics.export_can_only_be_used_in_a_ts_file)); + return true; + } + break; case SyntaxKind.ClassDeclaration: let classDeclaration = node; if (checkModifiers(classDeclaration.modifiers) || From 25d21406263452517f949c796bc11b62b6c0b176 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 1 Feb 2016 13:29:49 -0800 Subject: [PATCH 144/160] Accepted baselines. --- .../baselines/reference/exportDefaultInJsFile01.errors.txt | 7 +++++++ .../baselines/reference/exportDefaultInJsFile02.errors.txt | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 tests/baselines/reference/exportDefaultInJsFile01.errors.txt create mode 100644 tests/baselines/reference/exportDefaultInJsFile02.errors.txt diff --git a/tests/baselines/reference/exportDefaultInJsFile01.errors.txt b/tests/baselines/reference/exportDefaultInJsFile01.errors.txt new file mode 100644 index 00000000000..34035e1e14e --- /dev/null +++ b/tests/baselines/reference/exportDefaultInJsFile01.errors.txt @@ -0,0 +1,7 @@ +error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file. + + +!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile01.js' because it would overwrite input file. +==== tests/cases/conformance/salsa/myFile01.js (0 errors) ==== + + export default "hello"; \ No newline at end of file diff --git a/tests/baselines/reference/exportDefaultInJsFile02.errors.txt b/tests/baselines/reference/exportDefaultInJsFile02.errors.txt new file mode 100644 index 00000000000..5e17306e066 --- /dev/null +++ b/tests/baselines/reference/exportDefaultInJsFile02.errors.txt @@ -0,0 +1,7 @@ +error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file. + + +!!! error TS5055: Cannot write file 'tests/cases/conformance/salsa/myFile02.js' because it would overwrite input file. +==== tests/cases/conformance/salsa/myFile02.js (0 errors) ==== + + export default "hello"; \ No newline at end of file From 73d9a941c8a848f40cd5b5216e8cbee9b985d11f Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 1 Feb 2016 14:15:52 -0800 Subject: [PATCH 145/160] Accepted that other baseline. --- .../jsFileCompilationBindMultipleDefaultExports.errors.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt b/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt index 733f66922ab..05fecf03d30 100644 --- a/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt +++ b/tests/baselines/reference/jsFileCompilationBindMultipleDefaultExports.errors.txt @@ -1,10 +1,9 @@ tests/cases/compiler/a.js(1,22): error TS2528: A module cannot have multiple default exports. tests/cases/compiler/a.js(3,1): error TS2528: A module cannot have multiple default exports. -tests/cases/compiler/a.js(3,1): error TS8003: 'export=' can only be used in a .ts file. tests/cases/compiler/a.js(3,16): error TS1109: Expression expected. -==== tests/cases/compiler/a.js (4 errors) ==== +==== tests/cases/compiler/a.js (3 errors) ==== export default class a { ~ !!! error TS2528: A module cannot have multiple default exports. @@ -12,7 +11,5 @@ tests/cases/compiler/a.js(3,16): error TS1109: Expression expected. export default var a = 10; ~~~~~~~~~~~~~~ !!! error TS2528: A module cannot have multiple default exports. - ~~~~~~~~~~~~~~ -!!! error TS8003: 'export=' can only be used in a .ts file. ~~~ !!! error TS1109: Expression expected. \ No newline at end of file From 4f2cd6c4a2813e57bc2822251d569a881d0ef8e0 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 1 Feb 2016 15:19:13 -0800 Subject: [PATCH 146/160] don't do 'directoryExists' check in classic resolution scheme --- src/compiler/program.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 8ec821cb665..dc0c04bd930 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -88,6 +88,8 @@ namespace ts { host: ModuleResolutionHost; compilerOptions: CompilerOptions; traceEnabled: boolean; + // skip .tsx files if jsx is not enabled + skipTsx: boolean; } export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { @@ -369,7 +371,7 @@ namespace ts { const traceEnabled = isTraceEnabled(compilerOptions, host); const failedLookupLocations: string[] = []; - const state = {compilerOptions, host, traceEnabled}; + const state = {compilerOptions, host, traceEnabled, skipTsx: false}; let resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state); @@ -418,6 +420,9 @@ namespace ts { return forEach(extensions, tryLoad); function tryLoad(ext: string): string { + if (ext === ".tsx" && state.skipTsx) { + return undefined; + } const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext; if (!onlyRecordFailures && state.host.fileExists(fileName)) { if (state.traceEnabled) { @@ -517,7 +522,7 @@ namespace ts { export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations { const traceEnabled = isTraceEnabled(compilerOptions, host); - const state = { compilerOptions, host, traceEnabled }; + const state = { compilerOptions, host, traceEnabled, skipTsx: !compilerOptions.jsx }; const failedLookupLocations: string[] = []; const supportedExtensions = getSupportedExtensions(compilerOptions); let containingDirectory = getDirectoryPath(containingFile); @@ -531,7 +536,7 @@ namespace ts { while (true) { const searchName = normalizePath(combinePaths(containingDirectory, moduleName)); const directoryName = getDirectoryPath(searchName); - referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, !directoryProbablyExists(directoryName, host), state); + referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state); if (referencedSourceFile) { break; } From 1f1f4d2442c4380062faa92786cb4198ebe960ec Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 1 Feb 2016 15:34:03 -0800 Subject: [PATCH 147/160] fix linter issues --- src/compiler/program.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compiler/program.ts b/src/compiler/program.ts index dc0c04bd930..0a88365ede3 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -535,7 +535,6 @@ namespace ts { let referencedSourceFile: string; while (true) { const searchName = normalizePath(combinePaths(containingDirectory, moduleName)); - const directoryName = getDirectoryPath(searchName); referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state); if (referencedSourceFile) { break; From f94c7202d224a1042428498087880324a64b4341 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Mon, 1 Feb 2016 15:54:14 -0800 Subject: [PATCH 148/160] update baselines --- ...athMappingBasedModuleResolution3_classic.trace.json | 3 --- ...athMappingBasedModuleResolution4_classic.trace.json | 3 --- ...athMappingBasedModuleResolution5_classic.trace.json | 5 ----- ...athMappingBasedModuleResolution6_classic.trace.json | 3 --- ...athMappingBasedModuleResolution7_classic.trace.json | 10 ---------- tests/cases/unittests/moduleResolution.ts | 7 +++++-- 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json index ac82f87bcee..513198c50b0 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.trace.json @@ -14,13 +14,10 @@ "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/root/folder2/file4.ts' does not exist.", - "File 'c:/root/folder2/file4.tsx' does not exist.", "File 'c:/root/folder2/file4.d.ts' does not exist.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/file4.ts' exist - use it as a module resolution result.", "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json index ac82f87bcee..513198c50b0 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json @@ -14,13 +14,10 @@ "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'", "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/root/folder2/file4.ts' does not exist.", - "File 'c:/root/folder2/file4.tsx' does not exist.", "File 'c:/root/folder2/file4.d.ts' does not exist.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/file4.ts' exist - use it as a module resolution result.", "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json index 293291e4acf..099acae2aca 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.trace.json @@ -14,7 +14,6 @@ "Module name 'folder3/file2', matched pattern '*'.", "Trying substitution '*', candidate module location: 'folder3/file2'.", "File 'c:/root/folder3/file2.ts' does not exist.", - "File 'c:/root/folder3/file2.tsx' does not exist.", "File 'c:/root/folder3/file2.d.ts' does not exist.", "Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'.", "File 'c:/root/generated/folder3/file2.ts' exist - use it as a module resolution result.", @@ -34,17 +33,13 @@ "Module name 'file4', matched pattern '*'.", "Trying substitution '*', candidate module location: 'file4'.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "Trying substitution 'generated/*', candidate module location: 'generated/file4'.", "File 'c:/root/generated/file4.ts' does not exist.", - "File 'c:/root/generated/file4.tsx' does not exist.", "File 'c:/root/generated/file4.d.ts' does not exist.", "File 'c:/root/folder1/file4.ts' does not exist.", - "File 'c:/root/folder1/file4.tsx' does not exist.", "File 'c:/root/folder1/file4.d.ts' does not exist.", "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/file4.ts' exist - use it as a module resolution result.", "======== Module name 'file4' was successfully resolved to 'c:/file4.ts'. ========" diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json index 229ef51a924..0493e9c216b 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.trace.json @@ -7,7 +7,6 @@ "Longest matching prefix for 'c:/root/src/project/file3' is 'c:/root/src/'", "Loading 'project/file3' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file3'", "File 'c:/root/src/project/file3.ts' does not exist.", - "File 'c:/root/src/project/file3.tsx' does not exist.", "File 'c:/root/src/project/file3.d.ts' does not exist.", "Trying other entries in 'rootDirs'", "Loading 'project/file3' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file3'", @@ -21,12 +20,10 @@ "Longest matching prefix for 'c:/root/generated/src/file2' is 'c:/root/generated/src/'", "Loading 'file2' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file2'", "File 'c:/root/generated/src/file2.ts' does not exist.", - "File 'c:/root/generated/src/file2.tsx' does not exist.", "File 'c:/root/generated/src/file2.d.ts' does not exist.", "Trying other entries in 'rootDirs'", "Loading 'file2' from the root dir 'c:/root/src', candidate location 'c:/root/src/file2'", "File 'c:/root/src/file2.ts' does not exist.", - "File 'c:/root/src/file2.tsx' does not exist.", "File 'c:/root/src/file2.d.ts' exist - use it as a module resolution result.", "======== Module name '../file2' was successfully resolved to 'c:/root/src/file2.d.ts'. ========" ] \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json index 8242f8fb442..b45cd4754c7 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.trace.json @@ -7,7 +7,6 @@ "Longest matching prefix for 'c:/root/src/project/file2' is 'c:/root/src/'", "Loading 'project/file2' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file2'", "File 'c:/root/src/project/file2.ts' does not exist.", - "File 'c:/root/src/project/file2.tsx' does not exist.", "File 'c:/root/src/project/file2.d.ts' does not exist.", "Trying other entries in 'rootDirs'", "Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'", @@ -20,20 +19,15 @@ "Module name 'module3', matched pattern '*'.", "Trying substitution '*', candidate module location: 'module3'.", "File 'c:/root/module3.ts' does not exist.", - "File 'c:/root/module3.tsx' does not exist.", "File 'c:/root/module3.d.ts' does not exist.", "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module3'.", "File 'c:/shared/module3.ts' does not exist.", - "File 'c:/shared/module3.tsx' does not exist.", "File 'c:/shared/module3.d.ts' does not exist.", "File 'c:/root/src/module3.ts' does not exist.", - "File 'c:/root/src/module3.tsx' does not exist.", "File 'c:/root/src/module3.d.ts' does not exist.", "File 'c:/root/module3.ts' does not exist.", - "File 'c:/root/module3.tsx' does not exist.", "File 'c:/root/module3.d.ts' does not exist.", "File 'c:/module3.ts' does not exist.", - "File 'c:/module3.tsx' does not exist.", "File 'c:/module3.d.ts' exist - use it as a module resolution result.", "======== Module name 'module3' was successfully resolved to 'c:/module3.d.ts'. ========", "======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ========", @@ -43,11 +37,9 @@ "Module name 'module1', matched pattern '*'.", "Trying substitution '*', candidate module location: 'module1'.", "File 'c:/root/module1.ts' does not exist.", - "File 'c:/root/module1.tsx' does not exist.", "File 'c:/root/module1.d.ts' does not exist.", "Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module1'.", "File 'c:/shared/module1.ts' does not exist.", - "File 'c:/shared/module1.tsx' does not exist.", "File 'c:/shared/module1.d.ts' exist - use it as a module resolution result.", "======== Module name 'module1' was successfully resolved to 'c:/shared/module1.d.ts'. ========", "======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ========", @@ -66,12 +58,10 @@ "Longest matching prefix for 'c:/root/generated/src/file3' is 'c:/root/generated/src/'", "Loading 'file3' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file3'", "File 'c:/root/generated/src/file3.ts' does not exist.", - "File 'c:/root/generated/src/file3.tsx' does not exist.", "File 'c:/root/generated/src/file3.d.ts' does not exist.", "Trying other entries in 'rootDirs'", "Loading 'file3' from the root dir 'c:/root/src', candidate location 'c:/root/src/file3'", "File 'c:/root/src/file3.ts' does not exist.", - "File 'c:/root/src/file3.tsx' does not exist.", "File 'c:/root/src/file3.d.ts' exist - use it as a module resolution result.", "======== Module name '../file3' was successfully resolved to 'c:/root/src/file3.d.ts'. ========" ] \ No newline at end of file diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts index 6bbbdcc90b4..1173f579f2c 100644 --- a/tests/cases/unittests/moduleResolution.ts +++ b/tests/cases/unittests/moduleResolution.ts @@ -532,7 +532,7 @@ import b = require("./moduleB.ts"); const m1: File = { name: "/root/x/m1.ts" }; // load from base url const m2: File = { name: "/m2.ts" }; // fallback to classic - const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.Classic, baseUrl: "/root/x" }; + const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.Classic, baseUrl: "/root/x", jsx: JsxEmit.React }; const host = createModuleResolutionHost(hasDirectoryExists, main, m1, m2); check("m1", main, m1); @@ -565,6 +565,7 @@ import b = require("./moduleB.ts"); const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.NodeJs, baseUrl: "/root", + jsx: JsxEmit.React, paths: { "*": [ "*", @@ -676,8 +677,8 @@ import b = require("./moduleB.ts"); }); it ("classic + baseUrl + path mappings", () => { + // classic mode does not use directoryExists test(/*hasDirectoryExists*/ false); - test(/*hasDirectoryExists*/ true); function test(hasDirectoryExists: boolean) { const main: File = { name: "/root/folder1/main.ts" }; @@ -690,6 +691,7 @@ import b = require("./moduleB.ts"); const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.Classic, baseUrl: "/root", + jsx: JsxEmit.React, paths: { "*": [ "*", @@ -822,6 +824,7 @@ import b = require("./moduleB.ts"); const host = createModuleResolutionHost(hasDirectoryExists, file1, file2, file3, file4); const options: CompilerOptions = { moduleResolution: ModuleResolutionKind.Classic, + jsx: JsxEmit.React, rootDirs: [ "/root", "/root/generated/" From bcf22157d8934ca31836a75c6c00e8ddb78125b8 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 29 Jan 2016 18:20:05 -0800 Subject: [PATCH 149/160] Fix lastEncodedSourceMapSpan from being set to undefined --- src/compiler/sourcemap.ts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index 8abf1432b0c..86bad38cb6e 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -16,6 +16,14 @@ namespace ts { } let nullSourceMapWriter: SourceMapWriter; + // Used for initialize lastEncodedSourceMapSpan and reset lastEncodedSourceMapSpan when updateLastEncodedAndRecordedSpans + const defaultLastEncodedSourceMapSpan: SourceMapSpan = { + emittedLine: 1, + emittedColumn: 1, + sourceLine: 1, + sourceColumn: 1, + sourceIndex: 0 + }; export function getNullSourceMapWriter(): SourceMapWriter { if (nullSourceMapWriter === undefined) { @@ -79,13 +87,7 @@ namespace ts { // Last recorded and encoded spans lastRecordedSourceMapSpan = undefined; - lastEncodedSourceMapSpan = { - emittedLine: 1, - emittedColumn: 1, - sourceLine: 1, - sourceColumn: 1, - sourceIndex: 0 - }; + lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan; lastEncodedNameIndex = 0; // Initialize source map data @@ -159,10 +161,12 @@ namespace ts { // Pop sourceMapDecodedMappings to remove last entry sourceMapData.sourceMapDecodedMappings.pop(); - // Change the last encoded source map + // Point the lastEncodedSourceMapSpace to the previous encoded sourceMapSpan + // If the list is empty which indicates that we are at the beginning of the file, + // we have to reset it to default value (same value when we first initialize sourceMapWriter) lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ? sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] : - undefined; + defaultLastEncodedSourceMapSpan; // TODO: Update lastEncodedNameIndex // Since we dont support this any more, lets not worry about it right now. From 8ce886c4369e0289a61a2a261308e3e2e5872c5e Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Fri, 29 Jan 2016 18:20:17 -0800 Subject: [PATCH 150/160] Update baselines --- ...ationDestructuringObjectBindingPattern1.js | 7 +++ ...nDestructuringObjectBindingPattern1.js.map | 2 + ...cturingObjectBindingPattern1.sourcemap.txt | 24 +++++++++ ...DestructuringObjectBindingPattern1.symbols | 6 +++ ...onDestructuringObjectBindingPattern1.types | 8 +++ ...ationDestructuringObjectBindingPattern2.js | 9 ++++ ...nDestructuringObjectBindingPattern2.js.map | 2 + ...cturingObjectBindingPattern2.sourcemap.txt | 52 +++++++++++++++++++ ...DestructuringObjectBindingPattern2.symbols | 12 +++++ ...onDestructuringObjectBindingPattern2.types | 17 ++++++ 10 files changed, 139 insertions(+) create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js new file mode 100644 index 00000000000..c4e56eefe1e --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringObjectBindingPattern1.ts] + +var {x} = { x: 20 }; + +//// [sourceMapValidationDestructuringObjectBindingPattern1.js] +var x = { x: 20 }.x; +//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map new file mode 100644 index 00000000000..c428ab3f5fc --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringObjectBindingPattern1.js.map] +{"version":3,"file":"sourceMapValidationDestructuringObjectBindingPattern1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringObjectBindingPattern1.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt new file mode 100644 index 00000000000..5dd6c7410dd --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt @@ -0,0 +1,24 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringObjectBindingPattern1.js +mapUrl: sourceMapValidationDestructuringObjectBindingPattern1.js.map +sourceRoot: +sources: sourceMapValidationDestructuringObjectBindingPattern1.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.js +sourceFile:sourceMapValidationDestructuringObjectBindingPattern1.ts +------------------------------------------------------------------- +>>>var x = { x: 20 }.x; +1 > +2 >^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var { +2 >x +3 > } = { x: 20 }; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols new file mode 100644 index 00000000000..b504acdb9b0 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.ts === + +var {x} = { x: 20 }; +>x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern1.ts, 1, 5)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern1.ts, 1, 11)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types new file mode 100644 index 00000000000..0c051f80c45 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.ts === + +var {x} = { x: 20 }; +>x : number +>{ x: 20 } : { x: number; } +>x : number +>20 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js new file mode 100644 index 00000000000..38cc7985925 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js @@ -0,0 +1,9 @@ +//// [sourceMapValidationDestructuringObjectBindingPattern2.ts] + +var {x} = { x: 20 }; +var { a, b } = { a: 30, b: 40 }; + +//// [sourceMapValidationDestructuringObjectBindingPattern2.js] +var x = { x: 20 }.x; +var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; +//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map new file mode 100644 index 00000000000..af59ee6fae0 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringObjectBindingPattern2.js.map] +{"version":3,"file":"sourceMapValidationDestructuringObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringObjectBindingPattern2.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc;AACpB,IAAA,qBAA+B,EAAzB,QAAC,EAAE,QAAC,CAAsB"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt new file mode 100644 index 00000000000..38dc23ba462 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt @@ -0,0 +1,52 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringObjectBindingPattern2.js +mapUrl: sourceMapValidationDestructuringObjectBindingPattern2.js.map +sourceRoot: +sources: sourceMapValidationDestructuringObjectBindingPattern2.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.js +sourceFile:sourceMapValidationDestructuringObjectBindingPattern2.ts +------------------------------------------------------------------- +>>>var x = { x: 20 }.x; +1 > +2 >^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var { +2 >x +3 > } = { x: 20 }; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) +--- +>>>var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; +1-> +2 >^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^ +4 > ^^ +5 > ^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^ +8 > ^ +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1-> + > +2 > +3 > var { a, b } = { a: 30, b: 40 } +4 > +5 > a +6 > , +7 > b +8 > } = { a: 30, b: 40 }; +1->Emitted(2, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0) +3 >Emitted(2, 26) Source(3, 32) + SourceIndex(0) +4 >Emitted(2, 28) Source(3, 7) + SourceIndex(0) +5 >Emitted(2, 36) Source(3, 8) + SourceIndex(0) +6 >Emitted(2, 38) Source(3, 10) + SourceIndex(0) +7 >Emitted(2, 46) Source(3, 11) + SourceIndex(0) +8 >Emitted(2, 47) Source(3, 33) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols new file mode 100644 index 00000000000..dcc213f135c --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols @@ -0,0 +1,12 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.ts === + +var {x} = { x: 20 }; +>x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 1, 5)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 1, 11)) + +var { a, b } = { a: 30, b: 40 }; +>a : Symbol(a, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 5)) +>b : Symbol(b, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 8)) +>a : Symbol(a, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 16)) +>b : Symbol(b, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 23)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types new file mode 100644 index 00000000000..bbec608f686 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types @@ -0,0 +1,17 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.ts === + +var {x} = { x: 20 }; +>x : number +>{ x: 20 } : { x: number; } +>x : number +>20 : number + +var { a, b } = { a: 30, b: 40 }; +>a : number +>b : number +>{ a: 30, b: 40 } : { a: number; b: number; } +>a : number +>30 : number +>b : number +>40 : number + From d81565398801e83e41e4392d8f8f325e099611b0 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 1 Feb 2016 09:45:27 -0800 Subject: [PATCH 151/160] Rename test cases so they are consistent with the rest --- ...tionDestructuringVariableStatementObjectBindingPattern1.ts | 3 +++ ...tionDestructuringVariableStatementObjectBindingPattern2.ts | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts new file mode 100644 index 00000000000..80adb1cf0c1 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts @@ -0,0 +1,3 @@ +// @sourcemap: true + +var {x} = { x: 20 }; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts new file mode 100644 index 00000000000..93465864cd6 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts @@ -0,0 +1,4 @@ +// @sourcemap: true + +var {x} = { x: 20 }; +var { a, b } = { a: 30, b: 40 }; \ No newline at end of file From c7bbda8a3e23c35c76d748b74d2136671ea88ed2 Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 1 Feb 2016 11:23:03 -0800 Subject: [PATCH 152/160] Remove old baselines --- ...ationDestructuringObjectBindingPattern1.js | 7 --- ...nDestructuringObjectBindingPattern1.js.map | 2 - ...cturingObjectBindingPattern1.sourcemap.txt | 24 --------- ...DestructuringObjectBindingPattern1.symbols | 6 --- ...onDestructuringObjectBindingPattern1.types | 8 --- ...ationDestructuringObjectBindingPattern2.js | 9 ---- ...nDestructuringObjectBindingPattern2.js.map | 2 - ...cturingObjectBindingPattern2.sourcemap.txt | 52 ------------------- ...DestructuringObjectBindingPattern2.symbols | 12 ----- ...onDestructuringObjectBindingPattern2.types | 17 ------ 10 files changed, 139 deletions(-) delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols delete mode 100644 tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js deleted file mode 100644 index c4e56eefe1e..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js +++ /dev/null @@ -1,7 +0,0 @@ -//// [sourceMapValidationDestructuringObjectBindingPattern1.ts] - -var {x} = { x: 20 }; - -//// [sourceMapValidationDestructuringObjectBindingPattern1.js] -var x = { x: 20 }.x; -//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map deleted file mode 100644 index c428ab3f5fc..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.js.map +++ /dev/null @@ -1,2 +0,0 @@ -//// [sourceMapValidationDestructuringObjectBindingPattern1.js.map] -{"version":3,"file":"sourceMapValidationDestructuringObjectBindingPattern1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringObjectBindingPattern1.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt deleted file mode 100644 index 5dd6c7410dd..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.sourcemap.txt +++ /dev/null @@ -1,24 +0,0 @@ -=================================================================== -JsFile: sourceMapValidationDestructuringObjectBindingPattern1.js -mapUrl: sourceMapValidationDestructuringObjectBindingPattern1.js.map -sourceRoot: -sources: sourceMapValidationDestructuringObjectBindingPattern1.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.js -sourceFile:sourceMapValidationDestructuringObjectBindingPattern1.ts -------------------------------------------------------------------- ->>>var x = { x: 20 }.x; -1 > -2 >^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >var { -2 >x -3 > } = { x: 20 }; -1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) -2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) ---- ->>>//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols deleted file mode 100644 index b504acdb9b0..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.symbols +++ /dev/null @@ -1,6 +0,0 @@ -=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.ts === - -var {x} = { x: 20 }; ->x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern1.ts, 1, 5)) ->x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern1.ts, 1, 11)) - diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types deleted file mode 100644 index 0c051f80c45..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern1.types +++ /dev/null @@ -1,8 +0,0 @@ -=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern1.ts === - -var {x} = { x: 20 }; ->x : number ->{ x: 20 } : { x: number; } ->x : number ->20 : number - diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js deleted file mode 100644 index 38cc7985925..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js +++ /dev/null @@ -1,9 +0,0 @@ -//// [sourceMapValidationDestructuringObjectBindingPattern2.ts] - -var {x} = { x: 20 }; -var { a, b } = { a: 30, b: 40 }; - -//// [sourceMapValidationDestructuringObjectBindingPattern2.js] -var x = { x: 20 }.x; -var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; -//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map deleted file mode 100644 index af59ee6fae0..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.js.map +++ /dev/null @@ -1,2 +0,0 @@ -//// [sourceMapValidationDestructuringObjectBindingPattern2.js.map] -{"version":3,"file":"sourceMapValidationDestructuringObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringObjectBindingPattern2.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc;AACpB,IAAA,qBAA+B,EAAzB,QAAC,EAAE,QAAC,CAAsB"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt deleted file mode 100644 index 38dc23ba462..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.sourcemap.txt +++ /dev/null @@ -1,52 +0,0 @@ -=================================================================== -JsFile: sourceMapValidationDestructuringObjectBindingPattern2.js -mapUrl: sourceMapValidationDestructuringObjectBindingPattern2.js.map -sourceRoot: -sources: sourceMapValidationDestructuringObjectBindingPattern2.ts -=================================================================== -------------------------------------------------------------------- -emittedFile:tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.js -sourceFile:sourceMapValidationDestructuringObjectBindingPattern2.ts -------------------------------------------------------------------- ->>>var x = { x: 20 }.x; -1 > -2 >^^^^^^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >var { -2 >x -3 > } = { x: 20 }; -1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) -2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) -3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) ---- ->>>var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; -1-> -2 >^^^^ -3 > ^^^^^^^^^^^^^^^^^^^^^ -4 > ^^ -5 > ^^^^^^^^ -6 > ^^ -7 > ^^^^^^^^ -8 > ^ -9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1-> - > -2 > -3 > var { a, b } = { a: 30, b: 40 } -4 > -5 > a -6 > , -7 > b -8 > } = { a: 30, b: 40 }; -1->Emitted(2, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0) -3 >Emitted(2, 26) Source(3, 32) + SourceIndex(0) -4 >Emitted(2, 28) Source(3, 7) + SourceIndex(0) -5 >Emitted(2, 36) Source(3, 8) + SourceIndex(0) -6 >Emitted(2, 38) Source(3, 10) + SourceIndex(0) -7 >Emitted(2, 46) Source(3, 11) + SourceIndex(0) -8 >Emitted(2, 47) Source(3, 33) + SourceIndex(0) ---- ->>>//# sourceMappingURL=sourceMapValidationDestructuringObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols deleted file mode 100644 index dcc213f135c..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.symbols +++ /dev/null @@ -1,12 +0,0 @@ -=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.ts === - -var {x} = { x: 20 }; ->x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 1, 5)) ->x : Symbol(x, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 1, 11)) - -var { a, b } = { a: 30, b: 40 }; ->a : Symbol(a, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 5)) ->b : Symbol(b, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 8)) ->a : Symbol(a, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 16)) ->b : Symbol(b, Decl(sourceMapValidationDestructuringObjectBindingPattern2.ts, 2, 23)) - diff --git a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types deleted file mode 100644 index bbec608f686..00000000000 --- a/tests/baselines/reference/sourceMapValidationDestructuringObjectBindingPattern2.types +++ /dev/null @@ -1,17 +0,0 @@ -=== tests/cases/compiler/sourceMapValidationDestructuringObjectBindingPattern2.ts === - -var {x} = { x: 20 }; ->x : number ->{ x: 20 } : { x: number; } ->x : number ->20 : number - -var { a, b } = { a: 30, b: 40 }; ->a : number ->b : number ->{ a: 30, b: 40 } : { a: number; b: number; } ->a : number ->30 : number ->b : number ->40 : number - From 0db90b786986c99770b35a280547f967153a7daa Mon Sep 17 00:00:00 2001 From: Kanchalai Tanglertsampan Date: Mon, 1 Feb 2016 11:23:17 -0800 Subject: [PATCH 153/160] Add more tests and baselines --- ...ngVariableStatementArrayBindingPattern4.js | 7 +++ ...riableStatementArrayBindingPattern4.js.map | 2 + ...tatementArrayBindingPattern4.sourcemap.txt | 24 +++++++++ ...iableStatementArrayBindingPattern4.symbols | 5 ++ ...ariableStatementArrayBindingPattern4.types | 8 +++ ...ngVariableStatementArrayBindingPattern5.js | 9 ++++ ...riableStatementArrayBindingPattern5.js.map | 2 + ...tatementArrayBindingPattern5.sourcemap.txt | 52 +++++++++++++++++++ ...iableStatementArrayBindingPattern5.symbols | 9 ++++ ...ariableStatementArrayBindingPattern5.types | 15 ++++++ ...ngVariableStatementArrayBindingPattern6.js | 7 +++ ...riableStatementArrayBindingPattern6.js.map | 2 + ...tatementArrayBindingPattern6.sourcemap.txt | 30 +++++++++++ ...iableStatementArrayBindingPattern6.symbols | 5 ++ ...ariableStatementArrayBindingPattern6.types | 9 ++++ ...ngVariableStatementArrayBindingPattern7.js | 7 +++ ...riableStatementArrayBindingPattern7.js.map | 2 + ...tatementArrayBindingPattern7.sourcemap.txt | 45 ++++++++++++++++ ...iableStatementArrayBindingPattern7.symbols | 6 +++ ...ariableStatementArrayBindingPattern7.types | 10 ++++ ...gVariableStatementObjectBindingPattern1.js | 7 +++ ...iableStatementObjectBindingPattern1.js.map | 2 + ...atementObjectBindingPattern1.sourcemap.txt | 24 +++++++++ ...ableStatementObjectBindingPattern1.symbols | 6 +++ ...riableStatementObjectBindingPattern1.types | 8 +++ ...gVariableStatementObjectBindingPattern2.js | 9 ++++ ...iableStatementObjectBindingPattern2.js.map | 2 + ...atementObjectBindingPattern2.sourcemap.txt | 52 +++++++++++++++++++ ...ableStatementObjectBindingPattern2.symbols | 12 +++++ ...riableStatementObjectBindingPattern2.types | 17 ++++++ ...gVariableStatementObjectBindingPattern3.js | 7 +++ ...iableStatementObjectBindingPattern3.js.map | 2 + ...atementObjectBindingPattern3.sourcemap.txt | 30 +++++++++++ ...ableStatementObjectBindingPattern3.symbols | 6 +++ ...riableStatementObjectBindingPattern3.types | 9 ++++ ...gVariableStatementObjectBindingPattern4.js | 8 +++ ...iableStatementObjectBindingPattern4.js.map | 2 + ...atementObjectBindingPattern4.sourcemap.txt | 47 +++++++++++++++++ ...ableStatementObjectBindingPattern4.symbols | 10 ++++ ...riableStatementObjectBindingPattern4.types | 14 +++++ ...ngVariableStatementArrayBindingPattern4.ts | 3 ++ ...ngVariableStatementArrayBindingPattern5.ts | 4 ++ ...ngVariableStatementArrayBindingPattern6.ts | 3 ++ ...ngVariableStatementArrayBindingPattern7.ts | 3 ++ ...gVariableStatementObjectBindingPattern3.ts | 3 ++ ...gVariableStatementObjectBindingPattern4.ts | 4 ++ 46 files changed, 550 insertions(+) create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.types create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.symbols create mode 100644 tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.types create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts create mode 100644 tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js new file mode 100644 index 00000000000..d4c419278c7 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts] + +var [x] = [1, 2]; + +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js] +var x = [1, 2][0]; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map new file mode 100644 index 00000000000..96fd86faa4e --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts"],"names":[],"mappings":"AACK,iBAAC,CAAW"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt new file mode 100644 index 00000000000..a52c7701db2 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.sourcemap.txt @@ -0,0 +1,24 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js +mapUrl: sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js +sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts +------------------------------------------------------------------- +>>>var x = [1, 2][0]; +1 > +2 >^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var [ +2 >x +3 > ] = [1, 2]; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 18) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 19) Source(2, 18) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.symbols new file mode 100644 index 00000000000..4695a8cd598 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts === + +var [x] = [1, 2]; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts, 1, 5)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.types new file mode 100644 index 00000000000..461939a11aa --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts === + +var [x] = [1, 2]; +>x : number +>[1, 2] : [number, number] +>1 : number +>2 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js new file mode 100644 index 00000000000..10df853c220 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js @@ -0,0 +1,9 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts] + +var [x] = [1, 2]; +var [y, z] = [1, 2]; + +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js] +var x = [1, 2][0]; +var _a = [1, 2], y = _a[0], z = _a[1]; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map new file mode 100644 index 00000000000..337a73240b9 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts"],"names":[],"mappings":"AACK,iBAAC,CAAW;AACjB,IAAA,WAAmB,EAAd,SAAC,EAAE,SAAC,CAAW"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt new file mode 100644 index 00000000000..338b6424185 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.sourcemap.txt @@ -0,0 +1,52 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js +mapUrl: sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js +sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts +------------------------------------------------------------------- +>>>var x = [1, 2][0]; +1 > +2 >^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var [ +2 >x +3 > ] = [1, 2]; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 18) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 19) Source(2, 18) + SourceIndex(0) +--- +>>>var _a = [1, 2], y = _a[0], z = _a[1]; +1-> +2 >^^^^ +3 > ^^^^^^^^^^^ +4 > ^^ +5 > ^^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^^ +8 > ^ +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1-> + > +2 > +3 > var [y, z] = [1, 2] +4 > +5 > y +6 > , +7 > z +8 > ] = [1, 2]; +1->Emitted(2, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0) +3 >Emitted(2, 16) Source(3, 20) + SourceIndex(0) +4 >Emitted(2, 18) Source(3, 6) + SourceIndex(0) +5 >Emitted(2, 27) Source(3, 7) + SourceIndex(0) +6 >Emitted(2, 29) Source(3, 9) + SourceIndex(0) +7 >Emitted(2, 38) Source(3, 10) + SourceIndex(0) +8 >Emitted(2, 39) Source(3, 21) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.symbols new file mode 100644 index 00000000000..59543290772 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts === + +var [x] = [1, 2]; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts, 1, 5)) + +var [y, z] = [1, 2]; +>y : Symbol(y, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts, 2, 5)) +>z : Symbol(z, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts, 2, 7)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.types new file mode 100644 index 00000000000..1ef747517e4 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts === + +var [x] = [1, 2]; +>x : number +>[1, 2] : [number, number] +>1 : number +>2 : number + +var [y, z] = [1, 2]; +>y : number +>z : number +>[1, 2] : [number, number] +>1 : number +>2 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js new file mode 100644 index 00000000000..d4baadb6562 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts] + +var [x = 20] = [1, 2]; + +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js] +var _a = [1, 2][0], x = _a === void 0 ? 20 : _a; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map new file mode 100644 index 00000000000..9594cc22809 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts"],"names":[],"mappings":"AACK,kBAAM,EAAN,2BAAM,CAAW"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt new file mode 100644 index 00000000000..90ebe4dc9ac --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.sourcemap.txt @@ -0,0 +1,30 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js +mapUrl: sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js +sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts +------------------------------------------------------------------- +>>>var _a = [1, 2][0], x = _a === void 0 ? 20 : _a; +1 > +2 >^^^^^^^^^^^^^^^^^^ +3 > ^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +5 > ^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var [ +2 >x = 20 +3 > +4 > x = 20 +5 > ] = [1, 2]; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 19) Source(2, 12) + SourceIndex(0) +3 >Emitted(1, 21) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 48) Source(2, 12) + SourceIndex(0) +5 >Emitted(1, 49) Source(2, 23) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.symbols new file mode 100644 index 00000000000..6c368f4996e --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.symbols @@ -0,0 +1,5 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts === + +var [x = 20] = [1, 2]; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts, 1, 5)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.types new file mode 100644 index 00000000000..1b94874ae7c --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts === + +var [x = 20] = [1, 2]; +>x : number +>20 : number +>[1, 2] : [number, number] +>1 : number +>2 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js new file mode 100644 index 00000000000..73d2e85e9da --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts] + +var [x = 20, j] = [1, 2]; + +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js] +var _a = [1, 2], _b = _a[0], x = _b === void 0 ? 20 : _b, j = _a[1]; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map new file mode 100644 index 00000000000..0def6b1a730 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts"],"names":[],"mappings":"AACA,IAAA,WAAwB,EAAnB,UAAM,EAAN,2BAAM,EAAE,SAAC,CAAW"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt new file mode 100644 index 00000000000..f2a95375f2a --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.sourcemap.txt @@ -0,0 +1,45 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js +mapUrl: sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js +sourceFile:sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts +------------------------------------------------------------------- +>>>var _a = [1, 2], _b = _a[0], x = _b === void 0 ? 20 : _b, j = _a[1]; +1 > +2 >^^^^ +3 > ^^^^^^^^^^^ +4 > ^^ +5 > ^^^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^ +9 > ^^^^^^^^^ +10> ^ +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + > +2 > +3 > var [x = 20, j] = [1, 2] +4 > +5 > x = 20 +6 > +7 > x = 20 +8 > , +9 > j +10> ] = [1, 2]; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0) +3 >Emitted(1, 16) Source(2, 25) + SourceIndex(0) +4 >Emitted(1, 18) Source(2, 6) + SourceIndex(0) +5 >Emitted(1, 28) Source(2, 12) + SourceIndex(0) +6 >Emitted(1, 30) Source(2, 6) + SourceIndex(0) +7 >Emitted(1, 57) Source(2, 12) + SourceIndex(0) +8 >Emitted(1, 59) Source(2, 14) + SourceIndex(0) +9 >Emitted(1, 68) Source(2, 15) + SourceIndex(0) +10>Emitted(1, 69) Source(2, 26) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.symbols new file mode 100644 index 00000000000..4f57dffff26 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts === + +var [x = 20, j] = [1, 2]; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts, 1, 5)) +>j : Symbol(j, Decl(sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts, 1, 12)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.types new file mode 100644 index 00000000000..9b369e410a4 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts === + +var [x = 20, j] = [1, 2]; +>x : number +>20 : number +>j : number +>[1, 2] : [number, number] +>1 : number +>2 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js new file mode 100644 index 00000000000..8259981857c --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts] + +var {x} = { x: 20 }; + +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js] +var x = { x: 20 }.x; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map new file mode 100644 index 00000000000..5ecd5985927 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt new file mode 100644 index 00000000000..8e5860c7a77 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.sourcemap.txt @@ -0,0 +1,24 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js +mapUrl: sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js +sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts +------------------------------------------------------------------- +>>>var x = { x: 20 }.x; +1 > +2 >^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var { +2 >x +3 > } = { x: 20 }; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.symbols new file mode 100644 index 00000000000..950fca4eb00 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts === + +var {x} = { x: 20 }; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts, 1, 5)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts, 1, 11)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.types new file mode 100644 index 00000000000..c975a9eaae5 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern1.ts === + +var {x} = { x: 20 }; +>x : number +>{ x: 20 } : { x: number; } +>x : number +>20 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js new file mode 100644 index 00000000000..d4d52e5e8d9 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js @@ -0,0 +1,9 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts] + +var {x} = { x: 20 }; +var { a, b } = { a: 30, b: 40 }; + +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js] +var x = { x: 20 }.x; +var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map new file mode 100644 index 00000000000..6d3a8b40d22 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts"],"names":[],"mappings":"AACK,mBAAC,CAAc;AACpB,IAAA,qBAA+B,EAAzB,QAAC,EAAE,QAAC,CAAsB"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt new file mode 100644 index 00000000000..e9454cb2bfa --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.sourcemap.txt @@ -0,0 +1,52 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js +mapUrl: sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js +sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts +------------------------------------------------------------------- +>>>var x = { x: 20 }.x; +1 > +2 >^^^^^^^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var { +2 >x +3 > } = { x: 20 }; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 20) Source(2, 7) + SourceIndex(0) +3 >Emitted(1, 21) Source(2, 21) + SourceIndex(0) +--- +>>>var _a = { a: 30, b: 40 }, a = _a.a, b = _a.b; +1-> +2 >^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^ +4 > ^^ +5 > ^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^ +8 > ^ +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1-> + > +2 > +3 > var { a, b } = { a: 30, b: 40 } +4 > +5 > a +6 > , +7 > b +8 > } = { a: 30, b: 40 }; +1->Emitted(2, 1) Source(3, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(3, 1) + SourceIndex(0) +3 >Emitted(2, 26) Source(3, 32) + SourceIndex(0) +4 >Emitted(2, 28) Source(3, 7) + SourceIndex(0) +5 >Emitted(2, 36) Source(3, 8) + SourceIndex(0) +6 >Emitted(2, 38) Source(3, 10) + SourceIndex(0) +7 >Emitted(2, 46) Source(3, 11) + SourceIndex(0) +8 >Emitted(2, 47) Source(3, 33) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.symbols new file mode 100644 index 00000000000..4fa80ecf05e --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.symbols @@ -0,0 +1,12 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts === + +var {x} = { x: 20 }; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 1, 5)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 1, 11)) + +var { a, b } = { a: 30, b: 40 }; +>a : Symbol(a, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 2, 5)) +>b : Symbol(b, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 2, 8)) +>a : Symbol(a, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 2, 16)) +>b : Symbol(b, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts, 2, 23)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.types new file mode 100644 index 00000000000..a694d4ecd29 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.types @@ -0,0 +1,17 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern2.ts === + +var {x} = { x: 20 }; +>x : number +>{ x: 20 } : { x: number; } +>x : number +>20 : number + +var { a, b } = { a: 30, b: 40 }; +>a : number +>b : number +>{ a: 30, b: 40 } : { a: number; b: number; } +>a : number +>30 : number +>b : number +>40 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js new file mode 100644 index 00000000000..f146e4bb8a7 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js @@ -0,0 +1,7 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts] + +var {x = 500} = { x: 20 }; + +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js] +var _a = { x: 20 }.x, x = _a === void 0 ? 500 : _a; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map new file mode 100644 index 00000000000..975a48aa0ee --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts"],"names":[],"mappings":"AACK,oBAAO,EAAP,4BAAO,CAAc"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt new file mode 100644 index 00000000000..2fa0c81199b --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.sourcemap.txt @@ -0,0 +1,30 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js +mapUrl: sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js +sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts +------------------------------------------------------------------- +>>>var _a = { x: 20 }.x, x = _a === void 0 ? 500 : _a; +1 > +2 >^^^^^^^^^^^^^^^^^^^^ +3 > ^^ +4 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +5 > ^ +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +1 > + >var { +2 >x = 500 +3 > +4 > x = 500 +5 > } = { x: 20 }; +1 >Emitted(1, 1) Source(2, 6) + SourceIndex(0) +2 >Emitted(1, 21) Source(2, 13) + SourceIndex(0) +3 >Emitted(1, 23) Source(2, 6) + SourceIndex(0) +4 >Emitted(1, 51) Source(2, 13) + SourceIndex(0) +5 >Emitted(1, 52) Source(2, 27) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.symbols new file mode 100644 index 00000000000..a668ab8e733 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts === + +var {x = 500} = { x: 20 }; +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts, 1, 5)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts, 1, 17)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.types new file mode 100644 index 00000000000..bec1b195c98 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.types @@ -0,0 +1,9 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts === + +var {x = 500} = { x: 20 }; +>x : number +>500 : number +>{ x: 20 } : { x?: number; } +>x : number +>20 : number + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js new file mode 100644 index 00000000000..d785d2dd1fd --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js @@ -0,0 +1,8 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts] + +var {x = 500, + y} = { x: 20, y: "hi" }; + +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js] +var _a = { x: 20, y: "hi" }, _b = _a.x, x = _b === void 0 ? 500 : _b, y = _a.y; +//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map new file mode 100644 index 00000000000..e0b108863b0 --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map @@ -0,0 +1,2 @@ +//// [sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map] +{"version":3,"file":"sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js","sourceRoot":"","sources":["sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts"],"names":[],"mappings":"AACA,IAAA,uBAC4B,EADvB,SAAO,EAAP,4BAAO,EACP,QAAC,CAAuB"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt new file mode 100644 index 00000000000..6ae979f8ade --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.sourcemap.txt @@ -0,0 +1,47 @@ +=================================================================== +JsFile: sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js +mapUrl: sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map +sourceRoot: +sources: sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts +=================================================================== +------------------------------------------------------------------- +emittedFile:tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js +sourceFile:sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts +------------------------------------------------------------------- +>>>var _a = { x: 20, y: "hi" }, _b = _a.x, x = _b === void 0 ? 500 : _b, y = _a.y; +1 > +2 >^^^^ +3 > ^^^^^^^^^^^^^^^^^^^^^^^ +4 > ^^ +5 > ^^^^^^^^^ +6 > ^^ +7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +8 > ^^ +9 > ^^^^^^^^ +10> ^ +11> ^^^^^^^^^^^^^^^^^^-> +1 > + > +2 > +3 > var {x = 500, + > y} = { x: 20, y: "hi" } +4 > +5 > x = 500 +6 > +7 > x = 500 +8 > , + > +9 > y +10> } = { x: 20, y: "hi" }; +1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0) +2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0) +3 >Emitted(1, 28) Source(3, 29) + SourceIndex(0) +4 >Emitted(1, 30) Source(2, 6) + SourceIndex(0) +5 >Emitted(1, 39) Source(2, 13) + SourceIndex(0) +6 >Emitted(1, 41) Source(2, 6) + SourceIndex(0) +7 >Emitted(1, 69) Source(2, 13) + SourceIndex(0) +8 >Emitted(1, 71) Source(3, 6) + SourceIndex(0) +9 >Emitted(1, 79) Source(3, 7) + SourceIndex(0) +10>Emitted(1, 80) Source(3, 30) + SourceIndex(0) +--- +>>>//# sourceMappingURL=sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.symbols b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.symbols new file mode 100644 index 00000000000..8404c342c0b --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts === + +var {x = 500, +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts, 1, 5)) + + y} = { x: 20, y: "hi" }; +>y : Symbol(y, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts, 1, 13)) +>x : Symbol(x, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts, 2, 11)) +>y : Symbol(y, Decl(sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts, 2, 18)) + diff --git a/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.types b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.types new file mode 100644 index 00000000000..1d00ac2d56b --- /dev/null +++ b/tests/baselines/reference/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.types @@ -0,0 +1,14 @@ +=== tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts === + +var {x = 500, +>x : number +>500 : number + + y} = { x: 20, y: "hi" }; +>y : string +>{ x: 20, y: "hi" } : { x?: number; y: string; } +>x : number +>20 : number +>y : string +>"hi" : string + diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts new file mode 100644 index 00000000000..da41b8ca49f --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern4.ts @@ -0,0 +1,3 @@ +// @sourcemap: true + +var [x] = [1, 2]; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts new file mode 100644 index 00000000000..8e9d05fadd5 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern5.ts @@ -0,0 +1,4 @@ +// @sourcemap: true + +var [x] = [1, 2]; +var [y, z] = [1, 2]; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts new file mode 100644 index 00000000000..6c3ea7bedd7 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern6.ts @@ -0,0 +1,3 @@ +// @sourcemap: true + +var [x = 20] = [1, 2]; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts new file mode 100644 index 00000000000..d9d91eb578b --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementArrayBindingPattern7.ts @@ -0,0 +1,3 @@ +// @sourcemap: true + +var [x = 20, j] = [1, 2]; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts new file mode 100644 index 00000000000..5af6b55272f --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern3.ts @@ -0,0 +1,3 @@ +// @sourcemap: true + +var {x = 500} = { x: 20 }; \ No newline at end of file diff --git a/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts new file mode 100644 index 00000000000..e0afcb60c27 --- /dev/null +++ b/tests/cases/compiler/sourceMapValidationDestructuringVariableStatementObjectBindingPattern4.ts @@ -0,0 +1,4 @@ +// @sourcemap: true + +var {x = 500, + y} = { x: 20, y: "hi" }; \ No newline at end of file From a4c6f666862d14e187bb7e09615fdfc0c92ab875 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 1 Feb 2016 20:59:37 -0800 Subject: [PATCH 154/160] Treat multiple prototype property assignments as union property declarations --- src/compiler/checker.ts | 2 +- .../getJavaScriptSemanticDiagnostics24.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/getJavaScriptSemanticDiagnostics24.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 61c05d7688c..5cce092febe 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2827,7 +2827,7 @@ namespace ts { } // Handle module.exports = expr if (declaration.kind === SyntaxKind.BinaryExpression) { - return links.type = checkExpression((declaration).right); + return links.type = getUnionType(map(symbol.declarations, (decl: BinaryExpression) => checkExpressionCached(decl.right))); } if (declaration.kind === SyntaxKind.PropertyAccessExpression) { // Declarations only exist for property access expressions for certain diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics24.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics24.ts new file mode 100644 index 00000000000..cf70f883e99 --- /dev/null +++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics24.ts @@ -0,0 +1,16 @@ +/// + +// @allowJs: true +// @Filename: a.js +//// function Person(age) { +//// if (age >= 18) { +//// this.canVote = true; +//// } else { +//// this.canVote = 23; +//// } +//// } +//// let x = new Person(100); +//// x.canVote/**/; + +goTo.marker(); +verify.quickInfoIs('(property) Person.canVote: boolean | number'); From 3dfd378b7e0cf6fb685c63410439fdd12a672fb9 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 1 Feb 2016 21:20:37 -0800 Subject: [PATCH 155/160] Add some tests --- .../fourslash/getJavaScriptCompletions16.ts | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/cases/fourslash/getJavaScriptCompletions16.ts b/tests/cases/fourslash/getJavaScriptCompletions16.ts index 07c50d3f892..4d4b76d98d6 100644 --- a/tests/cases/fourslash/getJavaScriptCompletions16.ts +++ b/tests/cases/fourslash/getJavaScriptCompletions16.ts @@ -10,9 +10,26 @@ //// * @param {number} a //// */ //// constructor(a, b) { -//// a./**/ +//// a/*body*/ +//// } +//// +//// /** +//// * @param {number} a +//// */ +//// method(a) { +//// a/*method*/ //// } //// } +//// let x = new Something(/*sig*/); -goTo.marker(); +goTo.marker('body'); +edit.insert('.'); +verify.completionListContains('toFixed', undefined, undefined, 'method'); +edit.backspace(); + +goTo.marker('sig'); +verify.currentSignatureHelpIs('Something(a: number, b: any): Something'); + +goTo.marker('method'); +edit.insert('.'); verify.completionListContains('toFixed', undefined, undefined, 'method'); From b15ff81384f33e17bb8e10e10d5992cd6727e68c Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Mon, 1 Feb 2016 21:48:16 -0800 Subject: [PATCH 156/160] Add malformed parameter test --- tests/cases/fourslash/getJavaScriptQuickInfo7.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cases/fourslash/getJavaScriptQuickInfo7.ts b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts index 9faf97e7951..5aa8474757d 100644 --- a/tests/cases/fourslash/getJavaScriptQuickInfo7.ts +++ b/tests/cases/fourslash/getJavaScriptQuickInfo7.ts @@ -5,8 +5,9 @@ //// /** //// * This is a very cool function that is very nice. //// * @returns something +//// * @param p anotherthing //// */ -//// function a1() { +//// function a1(p) { //// try { //// throw new Error('x'); //// } catch (x) { x--; } From dbfc269e42a04cd8be5262a4f8a8b5c1c4b38343 Mon Sep 17 00:00:00 2001 From: T18970237136 Date: Tue, 2 Feb 2016 08:54:07 +0100 Subject: [PATCH 157/160] Add missing semicolon when emitting return statement. Fixes #6824. --- src/compiler/emitter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 337a480f36a..e86d86603b4 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3162,7 +3162,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge } else { // top level converted loop - return unwrapped value - write(`return ${loopResult}.value`); + write(`return ${loopResult}.value;`); } writeLine(); } From 757f4703a9d1bd205d727a9a1efeca9326f57dbb Mon Sep 17 00:00:00 2001 From: T18970237136 Date: Tue, 2 Feb 2016 10:30:39 +0100 Subject: [PATCH 158/160] Update test files. --- .../reference/capturedLetConstInLoop11.js | 2 +- .../reference/capturedLetConstInLoop5.js | 40 +++++++++---------- .../reference/capturedLetConstInLoop8.js | 4 +- .../reference/capturedLetConstInLoop9.js | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/baselines/reference/capturedLetConstInLoop11.js b/tests/baselines/reference/capturedLetConstInLoop11.js index fa295739d02..9190dd3ec02 100644 --- a/tests/baselines/reference/capturedLetConstInLoop11.js +++ b/tests/baselines/reference/capturedLetConstInLoop11.js @@ -30,6 +30,6 @@ function foo() { }; for (;;) { var state_2 = _loop_2(); - if (typeof state_2 === "object") return state_2.value + if (typeof state_2 === "object") return state_2.value; } } diff --git a/tests/baselines/reference/capturedLetConstInLoop5.js b/tests/baselines/reference/capturedLetConstInLoop5.js index 7807edd122e..a1a4d4b0a8f 100644 --- a/tests/baselines/reference/capturedLetConstInLoop5.js +++ b/tests/baselines/reference/capturedLetConstInLoop5.js @@ -294,7 +294,7 @@ function foo0(x) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var x_1 = _a[_i]; var state_1 = _loop_1(x_1); - if (typeof state_1 === "object") return state_1.value + if (typeof state_1 === "object") return state_1.value; } use(v); } @@ -310,7 +310,7 @@ function foo00(x) { var v; for (var x_2 in []) { var state_2 = _loop_2(x_2); - if (typeof state_2 === "object") return state_2.value + if (typeof state_2 === "object") return state_2.value; } use(v); } @@ -326,7 +326,7 @@ function foo1(x) { var v; for (var x_3 = 0; x_3 < 1; ++x_3) { var state_3 = _loop_3(x_3); - if (typeof state_3 === "object") return state_3.value + if (typeof state_3 === "object") return state_3.value; } use(v); } @@ -343,7 +343,7 @@ function foo2(x) { var v; while (1 === 1) { var state_4 = _loop_4(); - if (typeof state_4 === "object") return state_4.value + if (typeof state_4 === "object") return state_4.value; } use(v); } @@ -359,7 +359,7 @@ function foo3(x) { var v; do { var state_5 = _loop_5(); - if (typeof state_5 === "object") return state_5.value + if (typeof state_5 === "object") return state_5.value; } while (1 === 1); use(v); } @@ -376,7 +376,7 @@ function foo4(x) { var v; for (var y = 0; y < 1; ++y) { var state_6 = _loop_6(y); - if (typeof state_6 === "object") return state_6.value + if (typeof state_6 === "object") return state_6.value; } use(v); } @@ -392,7 +392,7 @@ function foo5(x) { var v; for (var x_7 = 0, y = 1; x_7 < 1; ++x_7) { var state_7 = _loop_7(x_7, y); - if (typeof state_7 === "object") return state_7.value + if (typeof state_7 === "object") return state_7.value; } use(v); } @@ -409,7 +409,7 @@ function foo6(x) { var v; while (1 === 1) { var state_8 = _loop_8(); - if (typeof state_8 === "object") return state_8.value + if (typeof state_8 === "object") return state_8.value; } ; use(v); @@ -427,7 +427,7 @@ function foo7(x) { var v; do { var state_9 = _loop_9(); - if (typeof state_9 === "object") return state_9.value + if (typeof state_9 === "object") return state_9.value; } while (1 === 1); use(v); } @@ -444,7 +444,7 @@ function foo8(x) { var v; for (var y = 0; y < 1; ++y) { var state_10 = _loop_10(y); - if (typeof state_10 === "object") return state_10.value + if (typeof state_10 === "object") return state_10.value; } use(v); } @@ -462,7 +462,7 @@ function foo0_c(x) { for (var _i = 0, _a = []; _i < _a.length; _i++) { var x_11 = _a[_i]; var state_11 = _loop_11(x_11); - if (typeof state_11 === "object") return state_11.value + if (typeof state_11 === "object") return state_11.value; } use(v); } @@ -478,7 +478,7 @@ function foo00_c(x) { var v; for (var x_12 in []) { var state_12 = _loop_12(x_12); - if (typeof state_12 === "object") return state_12.value + if (typeof state_12 === "object") return state_12.value; } use(v); } @@ -494,7 +494,7 @@ function foo1_c(x) { var v; for (var x_13 = 0; x_13 < 1;) { var state_13 = _loop_13(x_13); - if (typeof state_13 === "object") return state_13.value + if (typeof state_13 === "object") return state_13.value; } use(v); } @@ -511,7 +511,7 @@ function foo2_c(x) { var v; while (1 === 1) { var state_14 = _loop_14(); - if (typeof state_14 === "object") return state_14.value + if (typeof state_14 === "object") return state_14.value; } use(v); } @@ -527,7 +527,7 @@ function foo3_c(x) { var v; do { var state_15 = _loop_15(); - if (typeof state_15 === "object") return state_15.value + if (typeof state_15 === "object") return state_15.value; } while (1 === 1); use(v); } @@ -544,7 +544,7 @@ function foo4_c(x) { var v; for (var y = 0; y < 1;) { var state_16 = _loop_16(y); - if (typeof state_16 === "object") return state_16.value + if (typeof state_16 === "object") return state_16.value; } use(v); } @@ -560,7 +560,7 @@ function foo5_c(x) { var v; for (var x_17 = 0, y = 1; x_17 < 1;) { var state_17 = _loop_17(x_17, y); - if (typeof state_17 === "object") return state_17.value + if (typeof state_17 === "object") return state_17.value; } use(v); } @@ -577,7 +577,7 @@ function foo6_c(x) { var v; while (1 === 1) { var state_18 = _loop_18(); - if (typeof state_18 === "object") return state_18.value + if (typeof state_18 === "object") return state_18.value; } use(v); } @@ -594,7 +594,7 @@ function foo7_c(x) { var v; do { var state_19 = _loop_19(); - if (typeof state_19 === "object") return state_19.value + if (typeof state_19 === "object") return state_19.value; } while (1 === 1); use(v); } @@ -611,7 +611,7 @@ function foo8_c(x) { var v; for (var y = 0; y < 1;) { var state_20 = _loop_20(y); - if (typeof state_20 === "object") return state_20.value + if (typeof state_20 === "object") return state_20.value; } use(v); } diff --git a/tests/baselines/reference/capturedLetConstInLoop8.js b/tests/baselines/reference/capturedLetConstInLoop8.js index b10beb7b44e..560b99bb566 100644 --- a/tests/baselines/reference/capturedLetConstInLoop8.js +++ b/tests/baselines/reference/capturedLetConstInLoop8.js @@ -198,7 +198,7 @@ function foo() { }; l1: for (var x = 0; x < 1; ++x) { var state_2 = _loop_1(x); - if (typeof state_2 === "object") return state_2.value + if (typeof state_2 === "object") return state_2.value; if (state_2 === "break") break; if (state_2 === "continue") continue; switch(state_2) { @@ -280,7 +280,7 @@ function foo_c() { }; l1: for (var x = 0; x < 1;) { var state_4 = _loop_3(x); - if (typeof state_4 === "object") return state_4.value + if (typeof state_4 === "object") return state_4.value; if (state_4 === "break") break; if (state_4 === "continue") continue; switch(state_4) { diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js index cbd4f7efe79..1f79b1694cb 100644 --- a/tests/baselines/reference/capturedLetConstInLoop9.js +++ b/tests/baselines/reference/capturedLetConstInLoop9.js @@ -225,7 +225,7 @@ function foo() { l0: for (var _f = 0, _g = []; _f < _g.length; _f++) { var a = _g[_f]; var state_4 = _loop_3(a); - if (typeof state_4 === "object") return state_4.value + if (typeof state_4 === "object") return state_4.value; if (state_4 === "break") break; switch(state_4) { case "break-l0": break l0; From fb99a6697d10d3b6143fef06ec33278a94ecbcb6 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Tue, 2 Feb 2016 11:36:38 -0800 Subject: [PATCH 159/160] do not error if typings for external library is empty .d.ts file --- src/compiler/program.ts | 2 +- tests/baselines/reference/noErrorOnEmptyDts.js | 13 +++++++++++++ tests/baselines/reference/noErrorOnEmptyDts.symbols | 8 ++++++++ tests/baselines/reference/noErrorOnEmptyDts.types | 8 ++++++++ tests/cases/compiler/noErrorOnEmptyDts.ts | 8 ++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/noErrorOnEmptyDts.js create mode 100644 tests/baselines/reference/noErrorOnEmptyDts.symbols create mode 100644 tests/baselines/reference/noErrorOnEmptyDts.types create mode 100644 tests/cases/compiler/noErrorOnEmptyDts.ts diff --git a/src/compiler/program.ts b/src/compiler/program.ts index fd3d44ff3f0..9852b2354e2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1490,7 +1490,7 @@ namespace ts { if (importedFile && resolution.isExternalLibraryImport) { // Since currently irrespective of allowJs, we only look for supportedTypeScript extension external module files, // this check is ok. Otherwise this would be never true for javascript file - if (!isExternalModule(importedFile)) { + if (!isExternalModule(importedFile) && importedFile.statements.length) { const start = getTokenPosOfNode(file.imports[i], file); fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition, importedFile.fileName)); } diff --git a/tests/baselines/reference/noErrorOnEmptyDts.js b/tests/baselines/reference/noErrorOnEmptyDts.js new file mode 100644 index 00000000000..83595e3d2ad --- /dev/null +++ b/tests/baselines/reference/noErrorOnEmptyDts.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/noErrorOnEmptyDts.ts] //// + +//// [test.d.ts] + + +// comment + +//// [main.ts] +import "test" + +//// [main.js] +"use strict"; +require("test"); diff --git a/tests/baselines/reference/noErrorOnEmptyDts.symbols b/tests/baselines/reference/noErrorOnEmptyDts.symbols new file mode 100644 index 00000000000..78446a19fb8 --- /dev/null +++ b/tests/baselines/reference/noErrorOnEmptyDts.symbols @@ -0,0 +1,8 @@ +=== c:/node_modules/test.d.ts === + +No type information for this code. +No type information for this code.// comment +No type information for this code. +No type information for this code.=== c:/app/main.ts === +import "test" +No type information for this code. \ No newline at end of file diff --git a/tests/baselines/reference/noErrorOnEmptyDts.types b/tests/baselines/reference/noErrorOnEmptyDts.types new file mode 100644 index 00000000000..78446a19fb8 --- /dev/null +++ b/tests/baselines/reference/noErrorOnEmptyDts.types @@ -0,0 +1,8 @@ +=== c:/node_modules/test.d.ts === + +No type information for this code. +No type information for this code.// comment +No type information for this code. +No type information for this code.=== c:/app/main.ts === +import "test" +No type information for this code. \ No newline at end of file diff --git a/tests/cases/compiler/noErrorOnEmptyDts.ts b/tests/cases/compiler/noErrorOnEmptyDts.ts new file mode 100644 index 00000000000..1266ea2bd75 --- /dev/null +++ b/tests/cases/compiler/noErrorOnEmptyDts.ts @@ -0,0 +1,8 @@ +// @module: commonjs + +// @filename: c:/node_modules/test.d.ts + +// comment + +// @filename: c:/app/main.ts +import "test" \ No newline at end of file From 8e472db66f78e32bfba57a9c873f2525499864b7 Mon Sep 17 00:00:00 2001 From: Tim Viiding-Spader Date: Tue, 2 Feb 2016 15:44:47 -0600 Subject: [PATCH 160/160] Delete mention of nonexistent watcherPath param It doesn't exist now. It didn't exist in the commit that first mentioned it. --- src/compiler/sys.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index bf25d39aa43..9c3972b2756 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -373,9 +373,6 @@ namespace ts { } } - /** - * @param watcherPath is the path from which the watcher is triggered. - */ function fileEventHandler(eventName: string, relativeFileName: string, baseDirPath: Path) { // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined" const filePath = typeof relativeFileName !== "string"