Add es3.d.ts

src/compiler/commandLineParser.ts

@@ -8,6 +8,7 @@ namespace ts {
     //       augmented in another lib.
     const libEntries: [string, string][] = [
         // JavaScript only
+        ["es3", "lib.es3.d.ts"],
         ["es5", "lib.es5.d.ts"],
         ["es6", "lib.es2015.d.ts"],
         ["es2015", "lib.es2015.d.ts"],

src/harness/fourslash.ts

@@ -317,8 +317,20 @@ namespace FourSlash {
                     }
                 });
                 if (!compilationOptions.noLib) {
-                    this.languageServiceAdapterHost.addScript(Harness.Compiler.defaultLibFileName,
-                        Harness.Compiler.getDefaultLibrarySourceFile()!.text, /*isRootFile*/ false);
+                    const libs = compilationOptions.lib || [Harness.Compiler.defaultLibFileName];
+                    const libFiles = libs.map(lib => {
+                        const sourceFile = Harness.Compiler.getDefaultLibrarySourceFile(lib)!;
+                        this.languageServiceAdapterHost.addScript(lib, sourceFile.text, /*isRootFile*/ false);
+                        return sourceFile;
+                    });
+                    for (const libFile of libFiles) {
+                        const resolvedResult = ts.preProcessFile(libFile.text);
+                        for (const libReference of resolvedResult.libReferenceDirectives) {
+                            const mapped = ts.libMap.get(libReference.fileName.toLowerCase())!;
+                            this.languageServiceAdapterHost.addScript(mapped,
+                                Harness.Compiler.getDefaultLibrarySourceFile(mapped)!.text, /*isRootFile*/ false);
+                        }
+                    }
                 }
             }
 
@@ -3649,7 +3661,7 @@ namespace FourSlashInterface {
     }
 
     export class Plugins {
-        constructor (private state: FourSlash.TestState) {
+        constructor(private state: FourSlash.TestState) {
         }
 
         public configurePlugin(pluginName: string, configuration: any): void {
@@ -4719,7 +4731,6 @@ namespace FourSlashInterface {
             functionEntry("encodeURIComponent"),
             functionEntry("escape"),
             functionEntry("unescape"),
-            varEntry("NaN"),
             varEntry("Infinity"),
             varEntry("Object"),
             varEntry("Function"),
@@ -4750,6 +4761,7 @@ namespace FourSlashInterface {
             varEntry("Float32Array"),
             varEntry("Float64Array"),
             moduleEntry("Intl"),
+            varEntry("NaN"),
         ];
 
         const globalKeywordsInsideFunction: ReadonlyArray<ExpectedCompletionEntryObject> = [

src/lib/es3.d.ts

@@ -0,0 +1 @@
+declare var NaN: number;

src/lib/es3.full.d.ts

@@ -0,0 +1,4 @@
+/// <reference lib="es3" />
+/// <reference lib="dom" />
+/// <reference lib="webworker.importscripts" />
+/// <reference lib="scripthost" />

src/lib/es5.d.ts

@@ -1,8 +1,8 @@
+/// <reference lib="es3" />
 /////////////////////////////
 /// ECMAScript APIs
 /////////////////////////////
 
-declare var NaN: number;
 declare var Infinity: number;
 
 /**

src/lib/libs.json

@@ -1,6 +1,7 @@
 {
     "libs": [
         // JavaScript only
+        "es3",
         "es5",
         "es2015",
         "es2016",
@@ -44,6 +45,7 @@
         "esnext.bigint",
         "esnext.intl",
         // Default libraries
+        "es3.full",
         "es5.full",
         "es2015.full",
         "es2016.full",

src/testRunner/unittests/config/commandLineParsing.ts

@@ -57,7 +57,7 @@ namespace ts {
             assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
+                        messageText: "Argument for '--lib' option must be: 'es3', 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         file: undefined,
@@ -259,7 +259,7 @@ namespace ts {
             assertParseResult(["--lib", "es5,", "es7", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
+                        messageText: "Argument for '--lib' option must be: 'es3', 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         file: undefined,
@@ -278,7 +278,7 @@ namespace ts {
             assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
                 {
                     errors: [{
-                        messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
+                        messageText: "Argument for '--lib' option must be: 'es3', 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', 'esnext', 'dom', 'dom.iterable', 'webworker', 'webworker.importscripts', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object', 'es2017.sharedmemory', 'es2017.string', 'es2017.intl', 'es2017.typedarrays', 'es2018.asynciterable', 'es2018.intl', 'es2018.promise', 'es2018.regexp', 'es2019.array', 'es2019.object', 'es2019.string', 'es2019.symbol', 'es2020.string', 'es2020.symbol.wellknown', 'esnext.array', 'esnext.symbol', 'esnext.asynciterable', 'esnext.intl', 'esnext.bigint'.",
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
                         file: undefined,

tests/baselines/reference/enumConstantMembers.symbols

@@ -58,7 +58,7 @@ enum E5 {
 
     e = NaN,
 >e : Symbol(E5.e, Decl(enumConstantMembers.ts, 24, 18))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
     f = Infinity,
 >f : Symbol(E5.f, Decl(enumConstantMembers.ts, 25, 12))
@@ -86,7 +86,7 @@ const enum E6 {
 
     e = NaN,
 >e : Symbol(E6.e, Decl(enumConstantMembers.ts, 34, 18))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
     f = Infinity,
 >f : Symbol(E6.f, Decl(enumConstantMembers.ts, 35, 12))

tests/baselines/reference/fixSignatureCaching.symbols

@@ -1179,7 +1179,7 @@ define(function () {
 >version : Symbol(version, Decl(fixSignatureCaching.ts, 431, 11))
 >impl : Symbol(impl, Decl(fixSignatureCaching.ts, 6, 7))
 >version : Symbol(version, Decl(fixSignatureCaching.ts, 431, 11))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
     };
 

tests/baselines/reference/moduleScoping.symbols

@@ -38,7 +38,7 @@ var v4 = {a: true, b: NaN};  // Should shadow global v2 in this module
 >v4 : Symbol(v4, Decl(file4.ts, 4, 3))
 >a : Symbol(a, Decl(file4.ts, 4, 10))
 >b : Symbol(b, Decl(file4.ts, 4, 18))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
 === tests/cases/conformance/externalModules/file5.ts ===
 var x = v2; // Should be global v2 of type number again

tests/baselines/reference/noImplicitAnyIndexing.symbols

@@ -81,7 +81,7 @@ var m: MyMap<number> = {
 
     "Okay that's enough for today.": NaN
 >"Okay that's enough for today." : Symbol("Okay that's enough for today.", Decl(noImplicitAnyIndexing.ts, 39, 11))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
 };
 

tests/baselines/reference/noImplicitAnyIndexingSuppressed.symbols

@@ -80,7 +80,7 @@ var m: MyMap<number> = {
 
     "Okay that's enough for today.": NaN
 >"Okay that's enough for today." : Symbol("Okay that's enough for today.", Decl(noImplicitAnyIndexingSuppressed.ts, 38, 11))
->NaN : Symbol(NaN, Decl(lib.es5.d.ts, --, --))
+>NaN : Symbol(NaN, Decl(lib.es3.d.ts, --, --))
 
 };
 

tests/baselines/reference/project/baseline/amd/baseline.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "emit.ts"

tests/baselines/reference/project/baseline/node/baseline.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "emit.ts"

tests/baselines/reference/project/baseline2/amd/baseline2.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "dont_emit.ts"

tests/baselines/reference/project/baseline2/node/baseline2.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "dont_emit.ts"

tests/baselines/reference/project/baseline3/amd/baseline3.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "nestedModule.ts"
     ],

tests/baselines/reference/project/baseline3/node/baseline3.json

@@ -7,6 +7,7 @@
     "baselineCheck": true,
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "nestedModule.ts"
     ],

tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json

@@ -5,6 +5,7 @@
         "decl.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts"
     ],

tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json

@@ -5,6 +5,7 @@
         "decl.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts"
     ],

tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json

@@ -5,6 +5,7 @@
         "consume.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "consume.ts"

tests/baselines/reference/project/circularReferencing/node/circularReferencing.json

@@ -5,6 +5,7 @@
         "consume.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.ts",
         "consume.ts"

tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json

@@ -6,6 +6,7 @@
     ],
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "b.ts",
         "c.ts",

tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json

@@ -6,6 +6,7 @@
     ],
     "runTest": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "b.ts",
         "c.ts",

tests/baselines/reference/project/declarationDir/amd/declarationDir.json

@@ -10,6 +10,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationDir/node/declarationDir.json

@@ -10,6 +10,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationDir2/amd/declarationDir2.json

@@ -11,6 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationDir2/node/declarationDir2.json

@@ -11,6 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json

@@ -11,6 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationDir3/node/declarationDir3.json

@@ -11,6 +11,7 @@
     "declarationDir": "declarations",
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "subfolder/b.ts",
         "a.ts",

tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.json

@@ -12,6 +12,7 @@
         "useModule.d.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.d.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.json

@@ -12,6 +12,7 @@
         "useModule.d.ts"
     ],
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "decl.d.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "glo_m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "glo_m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "private_m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "private_m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "fncOnly_m4.ts",
         "useModule.ts"

tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json

@@ -7,6 +7,7 @@
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
+        "lib.es3.d.ts",
         "lib.es5.d.ts",
         "fncOnly_m4.ts",
         "useModule.ts"