From 5d77da6ee4d544479a49bb192ae79a2e5c309fd3 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:40:02 -0800 Subject: [PATCH 01/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60615=20(fix?= =?UTF-8?q?=20missing=20react=20error=20with=20fragme...)=20into=20release?= =?UTF-8?q?-5.7=20(#60618)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Isabel Duan --- src/compiler/checker.ts | 24 ++++++++++++++++--- ...xFragReactReferenceErrors(jsx=preserve).js | 18 ++++++++++++++ ...ReactReferenceErrors(jsx=preserve).symbols | 11 +++++++++ ...agReactReferenceErrors(jsx=preserve).types | 15 ++++++++++++ ...gReactReferenceErrors(jsx=react-native).js | 18 ++++++++++++++ ...tReferenceErrors(jsx=react-native).symbols | 11 +++++++++ ...actReferenceErrors(jsx=react-native).types | 15 ++++++++++++ .../compiler/jsxFragReactReferenceErrors.tsx | 14 +++++++++++ 8 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).symbols create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).types create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).symbols create mode 100644 tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).types create mode 100644 tests/cases/compiler/jsxFragReactReferenceErrors.tsx diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index ce0291367b510..858acf404c329 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -29882,7 +29882,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { // #38720/60122, allow null as jsxFragmentFactory let jsxFactorySym: Symbol | undefined; if (!(isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) { - jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, compilerOptions.jsx === JsxEmit.Preserve ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, jsxFactoryRefErr, /*isUse*/ true); + jsxFactorySym = resolveName( + jsxFactoryLocation, + jsxFactoryNamespace, + (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + jsxFactoryRefErr, + /*isUse*/ true, + ); } if (jsxFactorySym) { @@ -29901,7 +29907,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const file = getSourceFileOfNode(node); const localJsxNamespace = getLocalJsxNamespace(file); if (localJsxNamespace) { - resolveName(jsxFactoryLocation, localJsxNamespace, compilerOptions.jsx === JsxEmit.Preserve ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, jsxFactoryRefErr, /*isUse*/ true); + resolveName( + jsxFactoryLocation, + localJsxNamespace, + (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + jsxFactoryRefErr, + /*isUse*/ true, + ); } } } @@ -36655,7 +36667,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : undefined; const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? - resolveName(node, jsxFragmentFactoryName, compilerOptions.jsx === JsxEmit.Preserve ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, /*nameNotFoundMessage*/ jsxFactoryRefErr, /*isUse*/ true); + resolveName( + node, + jsxFragmentFactoryName, + (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + /*nameNotFoundMessage*/ jsxFactoryRefErr, + /*isUse*/ true, + ); if (jsxFactorySymbol === undefined) return sourceFileLinks.jsxFragmentType = errorType; if (jsxFactorySymbol.escapedName === ReactNames.Fragment) return sourceFileLinks.jsxFragmentType = getTypeOfSymbol(jsxFactorySymbol); diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js new file mode 100644 index 0000000000000..29e499dbf98ea --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +//// [jsxFragReactReferenceErrors.tsx] +/// +/// +export function Component(){ + +return <> + +} + +//// [jsxFragReactReferenceErrors.jsx] +/// +/// +export function Component() { + return <> + ; +} diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).symbols b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).symbols new file mode 100644 index 0000000000000..df63a975364b0 --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).symbols @@ -0,0 +1,11 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +=== jsxFragReactReferenceErrors.tsx === +/// +/// +export function Component(){ +>Component : Symbol(Component, Decl(jsxFragReactReferenceErrors.tsx, 0, 0)) + +return <> + +} diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).types b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).types new file mode 100644 index 0000000000000..64a3cab0824cf --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=preserve).types @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +=== jsxFragReactReferenceErrors.tsx === +/// +/// +export function Component(){ +>Component : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ + +return <> +><> : JSX.Element +> : ^^^^^^^^^^^ + + +} diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js new file mode 100644 index 0000000000000..9ccb21875c4e4 --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +//// [jsxFragReactReferenceErrors.tsx] +/// +/// +export function Component(){ + +return <> + +} + +//// [jsxFragReactReferenceErrors.js] +/// +/// +export function Component() { + return <> + ; +} diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).symbols b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).symbols new file mode 100644 index 0000000000000..df63a975364b0 --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).symbols @@ -0,0 +1,11 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +=== jsxFragReactReferenceErrors.tsx === +/// +/// +export function Component(){ +>Component : Symbol(Component, Decl(jsxFragReactReferenceErrors.tsx, 0, 0)) + +return <> + +} diff --git a/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).types b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).types new file mode 100644 index 0000000000000..64a3cab0824cf --- /dev/null +++ b/tests/baselines/reference/jsxFragReactReferenceErrors(jsx=react-native).types @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/jsxFragReactReferenceErrors.tsx] //// + +=== jsxFragReactReferenceErrors.tsx === +/// +/// +export function Component(){ +>Component : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ + +return <> +><> : JSX.Element +> : ^^^^^^^^^^^ + + +} diff --git a/tests/cases/compiler/jsxFragReactReferenceErrors.tsx b/tests/cases/compiler/jsxFragReactReferenceErrors.tsx new file mode 100644 index 0000000000000..92f4725d51bc3 --- /dev/null +++ b/tests/cases/compiler/jsxFragReactReferenceErrors.tsx @@ -0,0 +1,14 @@ +// @jsx: react-native, preserve +// @strict: true +// @skipLibCheck: true +// @target: ES2017 +// @module: ESNext +// @esModuleInterop: true + +/// +/// +export function Component(){ + +return <> + +} \ No newline at end of file From 97fa2165f325633fb138e1d9f08b3e0d0e084011 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:59:35 -0800 Subject: [PATCH 02/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60673=20(Do?= =?UTF-8?q?=20not=20require=20import=20attributes=20fo...)=20into=20releas?= =?UTF-8?q?e-5.7=20(#60674)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrew Branch --- src/compiler/checker.ts | 3 +- .../nodeModulesJson(module=node16).errors.txt | 81 +++++++++++ ...=> nodeModulesJson(module=node16).symbols} | 6 +- ...s => nodeModulesJson(module=node16).types} | 6 +- ...deModulesJson(module=nodenext).errors.txt} | 6 +- .../nodeModulesJson(module=nodenext).symbols | 79 +++++++++++ .../nodeModulesJson(module=nodenext).types | 129 ++++++++++++++++++ .../cases/conformance/node/nodeModulesJson.ts | 8 +- 8 files changed, 304 insertions(+), 14 deletions(-) create mode 100644 tests/baselines/reference/nodeModulesJson(module=node16).errors.txt rename tests/baselines/reference/{nodeModulesJson.symbols => nodeModulesJson(module=node16).symbols} (89%) rename tests/baselines/reference/{nodeModulesJson.types => nodeModulesJson(module=node16).types} (89%) rename tests/baselines/reference/{nodeModulesJson.errors.txt => nodeModulesJson(module=nodenext).errors.txt} (92%) create mode 100644 tests/baselines/reference/nodeModulesJson(module=nodenext).symbols create mode 100644 tests/baselines/reference/nodeModulesJson(module=nodenext).types diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 858acf404c329..f817b9b16e8dc 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -47649,7 +47649,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } - if (isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { + if (moduleKind === ModuleKind.NodeNext && isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { + // Import attributes/assertions are not allowed in --module node16, so don't suggest adding one error(node.moduleSpecifier, Diagnostics.Importing_a_JSON_file_into_an_ECMAScript_module_requires_a_type_Colon_json_import_attribute_when_module_is_set_to_0, ModuleKind[moduleKind]); } } diff --git a/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt b/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt new file mode 100644 index 0000000000000..989bb7dcf9a58 --- /dev/null +++ b/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt @@ -0,0 +1,81 @@ +/loosey.cts(1,36): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/loosey.cts(6,9): error TS2339: Property 'default' does not exist on type '{ version: number; }'. +/main.mts(5,36): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(6,52): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(8,10): error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'Node16'. +/main.mts(8,41): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(9,42): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(10,9): error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. + + +==== /node_modules/not.json/package.json (0 errors) ==== + { + "name": "not.json", + "version": "1.0.0", + "type": "module", + "exports": "./index.js" + } + +==== /node_modules/not.json/index.d.ts (0 errors) ==== + export function oops(json: string): any; + +==== /node_modules/actually-json/package.json (0 errors) ==== + { + "name": "actually-json", + "version": "1.0.0", + "type": "module", + "exports": { + ".": "./index.json", + "./typed": "./typed.d.json.ts" + } + } + +==== /node_modules/actually-json/index.json (0 errors) ==== + {} + +==== /node_modules/actually-json/typed.d.json.ts (0 errors) ==== + declare const _default: {}; + export default _default; + +==== /config.json (0 errors) ==== + { + "version": 1 + } + +==== /main.mts (6 errors) ==== + import { oops } from "not.json"; // Ok + import moreOops from "actually-json"; // Error in nodenext + import typed from "actually-json/typed"; // Error in nodenext + + import config from "./config.json" with { type: "json" }; // Ok + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. + import { default as config1 } from "./config.json" with { type: "json" }; // Ok + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. + import config2 from "./config.json"; // Error in nodenext, no attribute + import { version } from "./config.json" with { type: "json" }; // Error, named import + ~~~~~~~ +!!! error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'Node16'. + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. + import * as config3 from "./config.json" with { type: "json" }; + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. + config3.version; // Error + ~~~~~~~ +!!! error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. + config3.default; // Ok + +==== /loosey.cts (2 errors) ==== + import config from "./config.json" with { type: "json" }; // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. + import config2 from "./config.json"; // Ok + import { version } from "./config.json"; // Ok + import * as config3 from "./config.json"; + config3.version; // Ok + config3.default; // Error + ~~~~~~~ +!!! error TS2339: Property 'default' does not exist on type '{ version: number; }'. + \ No newline at end of file diff --git a/tests/baselines/reference/nodeModulesJson.symbols b/tests/baselines/reference/nodeModulesJson(module=node16).symbols similarity index 89% rename from tests/baselines/reference/nodeModulesJson.symbols rename to tests/baselines/reference/nodeModulesJson(module=node16).symbols index 5f26b469ae9f3..42c68c640a2e7 100644 --- a/tests/baselines/reference/nodeModulesJson.symbols +++ b/tests/baselines/reference/nodeModulesJson(module=node16).symbols @@ -26,10 +26,10 @@ export default _default; import { oops } from "not.json"; // Ok >oops : Symbol(oops, Decl(main.mts, 0, 8)) -import moreOops from "actually-json"; // Error +import moreOops from "actually-json"; // Error in nodenext >moreOops : Symbol(moreOops, Decl(main.mts, 1, 6)) -import typed from "actually-json/typed"; // Error +import typed from "actually-json/typed"; // Error in nodenext >typed : Symbol(typed, Decl(main.mts, 2, 6)) import config from "./config.json" with { type: "json" }; // Ok @@ -39,7 +39,7 @@ import { default as config1 } from "./config.json" with { type: "json" }; // Ok >default : Symbol(config, Decl(config.json, 0, 0)) >config1 : Symbol(config1, Decl(main.mts, 5, 8)) -import config2 from "./config.json"; // Error, no attribute +import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : Symbol(config2, Decl(main.mts, 6, 6)) import { version } from "./config.json" with { type: "json" }; // Error, named import diff --git a/tests/baselines/reference/nodeModulesJson.types b/tests/baselines/reference/nodeModulesJson(module=node16).types similarity index 89% rename from tests/baselines/reference/nodeModulesJson.types rename to tests/baselines/reference/nodeModulesJson(module=node16).types index 2c992f8548a03..2c41926af320a 100644 --- a/tests/baselines/reference/nodeModulesJson.types +++ b/tests/baselines/reference/nodeModulesJson(module=node16).types @@ -38,11 +38,11 @@ import { oops } from "not.json"; // Ok >oops : (json: string) => any > : ^ ^^ ^^^^^ -import moreOops from "actually-json"; // Error +import moreOops from "actually-json"; // Error in nodenext >moreOops : {} > : ^^ -import typed from "actually-json/typed"; // Error +import typed from "actually-json/typed"; // Error in nodenext >typed : typeof typed > : ^^^^^^^^^^^^ @@ -60,7 +60,7 @@ import { default as config1 } from "./config.json" with { type: "json" }; // Ok >type : any > : ^^^ -import config2 from "./config.json"; // Error, no attribute +import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : { version: number; } > : ^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/baselines/reference/nodeModulesJson.errors.txt b/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt similarity index 92% rename from tests/baselines/reference/nodeModulesJson.errors.txt rename to tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt index 8e9a050cffbce..bf355357b0905 100644 --- a/tests/baselines/reference/nodeModulesJson.errors.txt +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt @@ -43,16 +43,16 @@ ==== /main.mts (5 errors) ==== import { oops } from "not.json"; // Ok - import moreOops from "actually-json"; // Error + import moreOops from "actually-json"; // Error in nodenext ~~~~~~~~~~~~~~~ !!! error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. - import typed from "actually-json/typed"; // Error + import typed from "actually-json/typed"; // Error in nodenext ~~~~~~~~~~~~~~~~~~~~~ !!! error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. import config from "./config.json" with { type: "json" }; // Ok import { default as config1 } from "./config.json" with { type: "json" }; // Ok - import config2 from "./config.json"; // Error, no attribute + import config2 from "./config.json"; // Error in nodenext, no attribute ~~~~~~~~~~~~~~~ !!! error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. import { version } from "./config.json" with { type: "json" }; // Error, named import diff --git a/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols b/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols new file mode 100644 index 0000000000000..42c68c640a2e7 --- /dev/null +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols @@ -0,0 +1,79 @@ +//// [tests/cases/conformance/node/nodeModulesJson.ts] //// + +=== /node_modules/not.json/index.d.ts === +export function oops(json: string): any; +>oops : Symbol(oops, Decl(index.d.ts, 0, 0)) +>json : Symbol(json, Decl(index.d.ts, 0, 21)) + +=== /node_modules/actually-json/index.json === + +{} + +=== /node_modules/actually-json/typed.d.json.ts === +declare const _default: {}; +>_default : Symbol(_default, Decl(typed.d.json.ts, 0, 13)) + +export default _default; +>_default : Symbol(_default, Decl(typed.d.json.ts, 0, 13)) + +=== /config.json === +{ + "version": 1 +>"version" : Symbol("version", Decl(config.json, 0, 1)) +} + +=== /main.mts === +import { oops } from "not.json"; // Ok +>oops : Symbol(oops, Decl(main.mts, 0, 8)) + +import moreOops from "actually-json"; // Error in nodenext +>moreOops : Symbol(moreOops, Decl(main.mts, 1, 6)) + +import typed from "actually-json/typed"; // Error in nodenext +>typed : Symbol(typed, Decl(main.mts, 2, 6)) + +import config from "./config.json" with { type: "json" }; // Ok +>config : Symbol(config, Decl(main.mts, 4, 6)) + +import { default as config1 } from "./config.json" with { type: "json" }; // Ok +>default : Symbol(config, Decl(config.json, 0, 0)) +>config1 : Symbol(config1, Decl(main.mts, 5, 8)) + +import config2 from "./config.json"; // Error in nodenext, no attribute +>config2 : Symbol(config2, Decl(main.mts, 6, 6)) + +import { version } from "./config.json" with { type: "json" }; // Error, named import +>version : Symbol(version, Decl(main.mts, 7, 8)) + +import * as config3 from "./config.json" with { type: "json" }; +>config3 : Symbol(config3, Decl(main.mts, 8, 6)) + +config3.version; // Error +>config3 : Symbol(config3, Decl(main.mts, 8, 6)) + +config3.default; // Ok +>config3.default : Symbol("/config") +>config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>default : Symbol("/config") + +=== /loosey.cts === +import config from "./config.json" with { type: "json" }; // Error +>config : Symbol(config, Decl(loosey.cts, 0, 6)) + +import config2 from "./config.json"; // Ok +>config2 : Symbol(config2, Decl(loosey.cts, 1, 6)) + +import { version } from "./config.json"; // Ok +>version : Symbol(version, Decl(loosey.cts, 2, 8)) + +import * as config3 from "./config.json"; +>config3 : Symbol(config3, Decl(loosey.cts, 3, 6)) + +config3.version; // Ok +>config3.version : Symbol(version, Decl(config.json, 0, 1)) +>config3 : Symbol(config3, Decl(loosey.cts, 3, 6)) +>version : Symbol(version, Decl(config.json, 0, 1)) + +config3.default; // Error +>config3 : Symbol(config3, Decl(loosey.cts, 3, 6)) + diff --git a/tests/baselines/reference/nodeModulesJson(module=nodenext).types b/tests/baselines/reference/nodeModulesJson(module=nodenext).types new file mode 100644 index 0000000000000..2c41926af320a --- /dev/null +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).types @@ -0,0 +1,129 @@ +//// [tests/cases/conformance/node/nodeModulesJson.ts] //// + +=== /node_modules/not.json/index.d.ts === +export function oops(json: string): any; +>oops : (json: string) => any +> : ^ ^^ ^^^^^ +>json : string +> : ^^^^^^ + +=== /node_modules/actually-json/index.json === +{} +>{} : {} +> : ^^ + +=== /node_modules/actually-json/typed.d.json.ts === +declare const _default: {}; +>_default : {} +> : ^^ + +export default _default; +>_default : {} +> : ^^ + +=== /config.json === +{ +>{ "version": 1} : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ + + "version": 1 +>"version" : number +> : ^^^^^^ +>1 : 1 +> : ^ +} + +=== /main.mts === +import { oops } from "not.json"; // Ok +>oops : (json: string) => any +> : ^ ^^ ^^^^^ + +import moreOops from "actually-json"; // Error in nodenext +>moreOops : {} +> : ^^ + +import typed from "actually-json/typed"; // Error in nodenext +>typed : typeof typed +> : ^^^^^^^^^^^^ + +import config from "./config.json" with { type: "json" }; // Ok +>config : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>type : any +> : ^^^ + +import { default as config1 } from "./config.json" with { type: "json" }; // Ok +>default : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>config1 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>type : any +> : ^^^ + +import config2 from "./config.json"; // Error in nodenext, no attribute +>config2 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ + +import { version } from "./config.json" with { type: "json" }; // Error, named import +>version : number +> : ^^^^^^ +>type : any +> : ^^^ + +import * as config3 from "./config.json" with { type: "json" }; +>config3 : { default: { version: number; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>type : any +> : ^^^ + +config3.version; // Error +>config3.version : any +> : ^^^ +>config3 : { default: { version: number; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>version : any +> : ^^^ + +config3.default; // Ok +>config3.default : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>config3 : { default: { version: number; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>default : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ + +=== /loosey.cts === +import config from "./config.json" with { type: "json" }; // Error +>config : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>type : any +> : ^^^ + +import config2 from "./config.json"; // Ok +>config2 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ + +import { version } from "./config.json"; // Ok +>version : number +> : ^^^^^^ + +import * as config3 from "./config.json"; +>config3 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ + +config3.version; // Ok +>config3.version : number +> : ^^^^^^ +>config3 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>version : number +> : ^^^^^^ + +config3.default; // Error +>config3.default : any +> : ^^^ +>config3 : { version: number; } +> : ^^^^^^^^^^^^^^^^^^^^ +>default : any +> : ^^^ + diff --git a/tests/cases/conformance/node/nodeModulesJson.ts b/tests/cases/conformance/node/nodeModulesJson.ts index c983d561cdfd9..e231ec9b0aa1d 100644 --- a/tests/cases/conformance/node/nodeModulesJson.ts +++ b/tests/cases/conformance/node/nodeModulesJson.ts @@ -1,4 +1,4 @@ -// @module: nodenext +// @module: node16,nodenext // @resolveJsonModule: true // @noEmit: true @@ -38,12 +38,12 @@ export default _default; // @Filename: /main.mts import { oops } from "not.json"; // Ok -import moreOops from "actually-json"; // Error -import typed from "actually-json/typed"; // Error +import moreOops from "actually-json"; // Error in nodenext +import typed from "actually-json/typed"; // Error in nodenext import config from "./config.json" with { type: "json" }; // Ok import { default as config1 } from "./config.json" with { type: "json" }; // Ok -import config2 from "./config.json"; // Error, no attribute +import config2 from "./config.json"; // Error in nodenext, no attribute import { version } from "./config.json" with { type: "json" }; // Error, named import import * as config3 from "./config.json" with { type: "json" }; config3.version; // Error From 68b84f0bad36bd62ca225ac82c6f1ed008f21314 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:21:10 -0800 Subject: [PATCH 03/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60683=20(Cach?= =?UTF-8?q?e=20started=20nonexistent=20property=20...)=20into=20release-5.?= =?UTF-8?q?7=20(#60686)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wesley Wigham --- src/compiler/checker.ts | 7 +++++ src/compiler/types.ts | 1 + ...ctWithThisInNamePositionNoCrash.errors.txt | 16 ++++++++++ ...kingObjectWithThisInNamePositionNoCrash.js | 31 +++++++++++++++++++ ...bjectWithThisInNamePositionNoCrash.symbols | 16 ++++++++++ ...gObjectWithThisInNamePositionNoCrash.types | 31 +++++++++++++++++++ ...kingObjectWithThisInNamePositionNoCrash.ts | 9 ++++++ 7 files changed, 111 insertions(+) create mode 100644 tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.errors.txt create mode 100644 tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.js create mode 100644 tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.symbols create mode 100644 tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.types create mode 100644 tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f817b9b16e8dc..6ffb0fb010714 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -34315,6 +34315,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } function reportNonexistentProperty(propNode: Identifier | PrivateIdentifier, containingType: Type, isUncheckedJS: boolean) { + const links = getNodeLinks(propNode); + const cache = (links.nonExistentPropCheckCache ||= new Set()); + const key = `${getTypeId(containingType)}|${isUncheckedJS}`; + if (cache.has(key)) { + return; + } + cache.add(key); let errorInfo: DiagnosticMessageChain | undefined; let relatedInfo: Diagnostic | undefined; if (!isPrivateIdentifier(propNode) && containingType.flags & TypeFlags.Union && !(containingType.flags & TypeFlags.Primitive)) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9b5908d71d9bc..92af593d2651c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -6243,6 +6243,7 @@ export interface NodeLinks { potentialUnusedRenamedBindingElementsInTypes?: BindingElement[]; externalHelpersModule?: Symbol; // Resolved symbol for the external helpers module instantiationExpressionTypes?: Map; // Cache of instantiation expression types for the node + nonExistentPropCheckCache?: Set; } /** @internal */ diff --git a/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.errors.txt b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.errors.txt new file mode 100644 index 0000000000000..e59c81e953e16 --- /dev/null +++ b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.errors.txt @@ -0,0 +1,16 @@ +checkingObjectWithThisInNamePositionNoCrash.ts(2,5): error TS7023: 'doit' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions. +checkingObjectWithThisInNamePositionNoCrash.ts(4,19): error TS2339: Property 'a' does not exist on type '{ doit(): { [x: number]: string; }; }'. + + +==== checkingObjectWithThisInNamePositionNoCrash.ts (2 errors) ==== + export const thing = { + doit() { + ~~~~ +!!! error TS7023: 'doit' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions. + return { + [this.a]: "", // should refer to the outer object with the doit method, notably not present + ~ +!!! error TS2339: Property 'a' does not exist on type '{ doit(): { [x: number]: string; }; }'. + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.js b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.js new file mode 100644 index 0000000000000..462afe05d5fda --- /dev/null +++ b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.js @@ -0,0 +1,31 @@ +//// [tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts] //// + +//// [checkingObjectWithThisInNamePositionNoCrash.ts] +export const thing = { + doit() { + return { + [this.a]: "", // should refer to the outer object with the doit method, notably not present + } + } +} + +//// [checkingObjectWithThisInNamePositionNoCrash.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.thing = void 0; +exports.thing = { + doit: function () { + var _a; + return _a = {}, + _a[this.a] = "", + _a; + } +}; + + +//// [checkingObjectWithThisInNamePositionNoCrash.d.ts] +export declare const thing: { + doit(): { + [x: number]: string; + }; +}; diff --git a/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.symbols b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.symbols new file mode 100644 index 0000000000000..6622b9f23682e --- /dev/null +++ b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.symbols @@ -0,0 +1,16 @@ +//// [tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts] //// + +=== checkingObjectWithThisInNamePositionNoCrash.ts === +export const thing = { +>thing : Symbol(thing, Decl(checkingObjectWithThisInNamePositionNoCrash.ts, 0, 12)) + + doit() { +>doit : Symbol(doit, Decl(checkingObjectWithThisInNamePositionNoCrash.ts, 0, 22)) + + return { + [this.a]: "", // should refer to the outer object with the doit method, notably not present +>[this.a] : Symbol([this.a], Decl(checkingObjectWithThisInNamePositionNoCrash.ts, 2, 16)) +>this : Symbol(thing, Decl(checkingObjectWithThisInNamePositionNoCrash.ts, 0, 20)) + } + } +} diff --git a/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.types b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.types new file mode 100644 index 0000000000000..cf00ba84fd1f2 --- /dev/null +++ b/tests/baselines/reference/checkingObjectWithThisInNamePositionNoCrash.types @@ -0,0 +1,31 @@ +//// [tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts] //// + +=== checkingObjectWithThisInNamePositionNoCrash.ts === +export const thing = { +>thing : { doit(): { [x: number]: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>{ doit() { return { [this.a]: "", // should refer to the outer object with the doit method, notably not present } }} : { doit(): { [x: number]: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + doit() { +>doit : () => { [x: number]: string; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + return { +>{ [this.a]: "", // should refer to the outer object with the doit method, notably not present } : { [x: number]: string; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^ + + [this.a]: "", // should refer to the outer object with the doit method, notably not present +>[this.a] : string +> : ^^^^^^ +>this.a : any +> : ^^^ +>this : { doit(): { [x: number]: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>a : any +> : ^^^ +>"" : "" +> : ^^ + } + } +} diff --git a/tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts b/tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts new file mode 100644 index 0000000000000..db6a56d346fbb --- /dev/null +++ b/tests/cases/compiler/checkingObjectWithThisInNamePositionNoCrash.ts @@ -0,0 +1,9 @@ +// @strict: true +// @declaration: true +export const thing = { + doit() { + return { + [this.a]: "", // should refer to the outer object with the doit method, notably not present + } + } +} \ No newline at end of file From c765dcef9ae0195b72fea5ab8738f8ff66fec19d Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:47:21 -0800 Subject: [PATCH 04/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60622=20(Fix?= =?UTF-8?q?=20library=20inclusions=20for=20ES2024=20t...)=20into=20release?= =?UTF-8?q?-5.7=20(#60681)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Billy Janitsch --- src/compiler/commandLineParser.ts | 4 +- src/compiler/transformers/esnext.ts | 4 +- src/compiler/types.ts | 8 +- src/compiler/utilities.ts | 4 +- src/compiler/utilitiesPublic.ts | 6 + ...-style-sibling-packages-symlinked-Linux.js | 78 ++++++------ ...packages-symlinked-package1-built-Linux.js | 64 +++++----- .../packages-outside-project-folder-Linux.js | 104 ++++++++-------- .../packages-outside-project-folder-MacOs.js | 88 +++++++------- ...ages-outside-project-folder-built-Linux.js | 100 ++++++++-------- ...ages-outside-project-folder-built-MacOs.js | 86 +++++++------- ...stamp-true-useFsEventsOnParentDirectory.js | 4 +- .../fsWatch/fsWatchWithTimestamp-true.js | 4 +- ...inode-when-rename-event-ends-with-tilde.js | 16 +-- ...e-occurs-when-file-is-still-on-the-disk.js | 18 +-- ...when-using-file-watching-thats-on-inode.js | 16 +-- ...polling-when-renaming-file-in-subfolder.js | 8 +- ...rectory-when-renaming-file-in-subfolder.js | 8 +- ...tchFile-when-renaming-file-in-subfolder.js | 8 +- ...-folders-with-synchronousWatchDirectory.js | 4 +- ...ymlinks-to-folders-in-recursive-folders.js | 4 +- ...hronous-watch-directory-renaming-a-file.js | 20 ++-- ...ory-with-outDir-and-declaration-enabled.js | 16 +-- .../with-non-synchronous-watch-directory.js | 20 ++-- ...-directory-watching-extendedDiagnostics.js | 4 +- ...ption-with-recursive-directory-watching.js | 4 +- .../with-fallbackPolling-option.js | 4 +- .../with-watchDirectory-option.js | 4 +- .../projectErrors/file-rename-on-wsl2.js | 4 +- ...-location-with-currentDirectory-at-root.js | 8 +- ...lution-fails-in-global-typings-location.js | 10 +- ...e-failing-with-currentDirectory-at-root.js | 10 +- ...with-import-from-the-cache-file-failing.js | 14 +-- ...ache-file-with-currentDirectory-at-root.js | 10 +- ...ocation-with-import-from-the-cache-file.js | 14 +-- ...ache-file-with-currentDirectory-at-root.js | 10 +- ...ith-relative-import-from-the-cache-file.js | 14 +-- ...kages-symlinked-Linux-canUseWatchEvents.js | 18 +-- ...-style-sibling-packages-symlinked-Linux.js | 54 ++++----- ...-package1-built-Linux-canUseWatchEvents.js | 18 +-- ...packages-symlinked-package1-built-Linux.js | 48 ++++---- ...-project-folder-Linux-canUseWatchEvents.js | 56 ++++----- .../packages-outside-project-folder-Linux.js | 112 +++++++++--------- ...-project-folder-MacOs-canUseWatchEvents.js | 56 ++++----- .../packages-outside-project-folder-MacOs.js | 88 +++++++------- ...ct-folder-built-Linux-canUseWatchEvents.js | 56 ++++----- ...ages-outside-project-folder-built-Linux.js | 110 ++++++++--------- ...ct-folder-built-MacOs-canUseWatchEvents.js | 56 ++++----- ...ages-outside-project-folder-built-MacOs.js | 88 +++++++------- ...files-starting-with-dot-in-node_modules.js | 10 +- ...polling-when-file-is-added-to-subfolder.js | 4 +- ...rectory-when-file-is-added-to-subfolder.js | 4 +- ...tchFile-when-file-is-added-to-subfolder.js | 4 +- ...ere-workspaces-folder-is-hosted-at-root.js | 16 +-- 54 files changed, 803 insertions(+), 797 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index b3c10e3c84951..e4fb6e7a834e7 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -147,8 +147,8 @@ export const inverseJsxOptionMap: Map = new Map(mapIterator(jsxO // augmented in another lib. // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, -// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each -// lib/esnext.*.d.ts file. +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. const libEntries: [string, string][] = [ // JavaScript only ["es5", "lib.es5.d.ts"], diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 1871e67c6f788..eace2e2c28057 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -74,8 +74,8 @@ const enum UsingKind { export function transformESNext(context: TransformationContext): (x: SourceFile | Bundle) => SourceFile | Bundle { // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, - // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each - // lib/esnext.*.d.ts file. + // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, + // compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. const { factory, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 92af593d2651c..04855abd9f053 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -7581,8 +7581,8 @@ export const enum ScriptKind { // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, -// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each -// lib/esnext.*.d.ts file. +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. export const enum ScriptTarget { /** @deprecated */ ES3 = 0, @@ -8390,8 +8390,8 @@ export type LanugageFeatures = // Upcoming Features // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, - // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each - // lib/esnext.*.d.ts file. + // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, + // compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. | "UsingAndAwaitUsing" // `using x = y`, `await using x = y` | "ClassAndClassElementDecorators" // `@dec class C {}`, `class C { @dec m() {} }` ; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index d12ae297b81ad..debbf655c9947 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1374,8 +1374,8 @@ export type ScriptTargetFeatures = ReadonlyMap ScriptTargetFeatures = /* @__PURE__ */ memoize((): ScriptTargetFeatures => new Map(Object.entries({ diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts index 02e22b94c895e..02623678a0cf0 100644 --- a/src/compiler/utilitiesPublic.ts +++ b/src/compiler/utilitiesPublic.ts @@ -305,8 +305,13 @@ export function sortAndDeduplicateDiagnostics(diagnostics: } /** @internal */ +// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in +// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. export const targetToLibMap: Map = new Map([ [ScriptTarget.ESNext, "lib.esnext.full.d.ts"], + [ScriptTarget.ES2024, "lib.es2024.full.d.ts"], [ScriptTarget.ES2023, "lib.es2023.full.d.ts"], [ScriptTarget.ES2022, "lib.es2022.full.d.ts"], [ScriptTarget.ES2021, "lib.es2021.full.d.ts"], @@ -322,6 +327,7 @@ export function getDefaultLibFileName(options: CompilerOptions): string { const target = getEmitScriptTarget(options); switch (target) { case ScriptTarget.ESNext: + case ScriptTarget.ES2024: case ScriptTarget.ES2023: case ScriptTarget.ES2022: case ScriptTarget.ES2021: diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js index 291315e9d3295..ea1e4a342b7b8 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -200,14 +200,14 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 30 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 117 +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 118 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 119 export {}; @@ -242,7 +242,7 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -250,7 +250,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":30} + {"inode":31} Program root files: [ "/home/src/projects/project/packages/package2/src/index.ts" @@ -290,20 +290,20 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -355,7 +355,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -363,7 +363,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -371,7 +371,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 8: timerToInvalidateFailedLookupResolutions *new* @@ -436,8 +436,8 @@ packages/package2/src/index.ts -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules/@types: @@ -465,9 +465,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -475,7 +475,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -483,7 +483,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ @@ -568,7 +568,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -576,13 +576,13 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} + {"inode":122} Timeout callback:: count: 2 10: timerToUpdateProgram *new* @@ -690,8 +690,8 @@ Scheduling invalidateFailedLookup, Cancelled earlier one Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_modules/package1 :: WatchInfo: /home/src/projects/project/node_modules/package1 1 undefined Failed Lookup Locations -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules: *new* @@ -729,7 +729,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -737,7 +737,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 16: timerToInvalidateFailedLookupResolutions *new* @@ -927,14 +927,14 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -981,7 +981,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -989,7 +989,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -997,7 +997,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 21: timerToInvalidateFailedLookupResolutions *new* @@ -1062,8 +1062,8 @@ packages/package2/src/index.ts -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules/@types: @@ -1091,9 +1091,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1101,7 +1101,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -1109,7 +1109,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index 652834a606f30..7062b1a8bf54d 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -82,22 +82,22 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 30 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 117 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 118 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 118 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 119 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 119 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 120 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 120 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 121 { "root": [ "./src/index.ts" @@ -173,12 +173,12 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 122 +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 123 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 124 export {}; @@ -205,9 +205,9 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":118} + {"inode":119} /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -215,7 +215,7 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -223,7 +223,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":30} + {"inode":31} Program root files: [ "/home/src/projects/project/packages/package2/src/index.ts" @@ -309,7 +309,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -317,13 +317,13 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":118} + {"inode":119} Timeout callback:: count: 2 1: timerToUpdateProgram *new* @@ -434,8 +434,8 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_ sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 124 PolledWatches:: /home/src/projects/node_modules: *new* @@ -473,7 +473,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -481,7 +481,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 7: timerToInvalidateFailedLookupResolutions *new* @@ -671,14 +671,14 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 119 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 120 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 120 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -725,7 +725,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -733,7 +733,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -741,7 +741,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 12: timerToInvalidateFailedLookupResolutions *new* @@ -806,8 +806,8 @@ packages/package2/src/index.ts -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 124 PolledWatches:: /home/src/projects/node_modules/@types: @@ -835,9 +835,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -845,7 +845,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -853,7 +853,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js index 3472f0b5d6634..a42a35a3e1c84 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js @@ -206,7 +206,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -284,7 +284,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 export const a = 10; @@ -302,7 +302,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -320,18 +320,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -351,14 +351,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 { "root": [ "../src/c.ts", @@ -368,18 +368,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -400,15 +400,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 { "root": [ "../src/a.ts", @@ -460,7 +460,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -593,7 +593,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -621,11 +621,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":152} + {"inode":153} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -639,11 +639,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":145} + {"inode":146} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -698,7 +698,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -716,7 +716,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -856,17 +856,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":152} + {"inode":153} /home/src/projects/c/3/c-impl/c/lib: - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":145} + {"inode":146} Timeout callback:: count: 2 18: timerToUpdateProgram *new* @@ -984,7 +984,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1099,18 +1099,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1130,14 +1130,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -1147,18 +1147,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1179,15 +1179,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1239,7 +1239,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1370,7 +1370,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1398,11 +1398,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} + {"inode":169} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1416,11 +1416,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":157} + {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js index 479198be1400e..cd178e641f3ea 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js @@ -206,7 +206,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -280,7 +280,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 export const a = 10; @@ -298,7 +298,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -316,18 +316,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -347,14 +347,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 { "root": [ "../src/c.ts", @@ -364,18 +364,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -396,15 +396,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 { "root": [ "../src/a.ts", @@ -552,7 +552,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -580,9 +580,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":152} + {"inode":153} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -590,9 +590,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":145} + {"inode":146} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -659,7 +659,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -688,7 +688,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -827,13 +827,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":152} + {"inode":153} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":145} + {"inode":146} FsWatchesRecursive:: /home/src/projects/a: @@ -963,7 +963,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1059,18 +1059,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1090,14 +1090,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -1107,18 +1107,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1139,15 +1139,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1293,7 +1293,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1321,9 +1321,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} + {"inode":169} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1331,9 +1331,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js index f175af64aa0a8..c1eb87e9d0906 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js @@ -88,18 +88,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 140 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 141 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -119,14 +119,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 142 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 143 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 144 { "root": [ "../src/c.ts", @@ -136,18 +136,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 146 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 147 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 148 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -168,15 +168,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 149 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 150 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 151 { "root": [ "../src/a.ts", @@ -291,7 +291,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 153 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -313,11 +313,11 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":144} + {"inode":145} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -331,11 +331,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":137} + {"inode":138} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -383,7 +383,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 export const a = 10; @@ -401,7 +401,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -419,7 +419,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -437,7 +437,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -577,17 +577,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":144} + {"inode":145} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":148} + {"inode":149} /home/src/projects/c/3/c-impl/c/lib: - {"inode":137} + {"inode":138} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":141} + {"inode":142} Timeout callback:: count: 2 13: timerToUpdateProgram *new* @@ -705,7 +705,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -820,18 +820,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -851,14 +851,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -868,18 +868,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -900,15 +900,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -960,7 +960,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1091,7 +1091,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1119,11 +1119,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} + {"inode":169} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1137,11 +1137,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":157} + {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js index 8107787ffc5a5..e4e2bd9cd6ef9 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js @@ -88,18 +88,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 140 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 141 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -119,14 +119,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 142 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 143 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 144 { "root": [ "../src/c.ts", @@ -136,18 +136,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 146 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 147 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 148 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -168,15 +168,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 149 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 150 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 151 { "root": [ "../src/a.ts", @@ -291,7 +291,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 153 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -313,9 +313,9 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: *new* @@ -323,9 +323,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -385,7 +385,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 export const a = 10; @@ -414,7 +414,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -443,7 +443,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -472,7 +472,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -611,13 +611,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":148} + {"inode":149} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":141} + {"inode":142} FsWatchesRecursive:: /home/src/projects/a: @@ -747,7 +747,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -843,18 +843,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -874,14 +874,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -891,18 +891,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -923,15 +923,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1077,7 +1077,7 @@ src/index.ts -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1105,9 +1105,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} + {"inode":169} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1115,9 +1115,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js index 2cc3b82b7228d..529f77d063d79 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js @@ -46,7 +46,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -//// [/user/username/projects/myproject/main.js] Inode:: 107 +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -132,7 +132,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] Inode:: 107 +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js index d3b49c2edd440..03e0b738bdc7a 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js @@ -46,7 +46,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -//// [/user/username/projects/myproject/main.js] Inode:: 107 +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -134,7 +134,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] Inode:: 107 +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js index f23c8d534772c..e2f5092527000 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js @@ -58,7 +58,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec -//// [/user/username/projects/myproject/main.js] Inode:: 108 +//// [/user/username/projects/myproject/main.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -114,7 +114,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 export function foo2(): string; @@ -163,7 +163,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: - {"inode":109} *new* + {"inode":110} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -204,7 +204,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 9: timerToInvalidateFailedLookupResolutions *deleted* @@ -238,7 +238,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 export function foo(): string; @@ -287,7 +287,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: - {"inode":110} *new* + {"inode":111} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -295,7 +295,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: - {"inode":109} + {"inode":110} Timeout callback:: count: 2 16: timerToUpdateProgram *new* @@ -318,7 +318,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 18: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js index 87af2b062e27b..a7e75b38541e6 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js @@ -54,12 +54,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -//// [/user/username/projects/myproject/foo.js] Inode:: 108 +//// [/user/username/projects/myproject/foo.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/user/username/projects/myproject/main.js] Inode:: 109 +//// [/user/username/projects/myproject/main.js] Inode:: 110 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -113,7 +113,7 @@ exitCode:: ExitStatus.undefined Change:: Introduce error such that when callback happens file is already appeared Input:: -//// [/user/username/projects/myproject/foo.ts] Inode:: 110 +//// [/user/username/projects/myproject/foo.ts] Inode:: 111 export declare function foo2(): string; @@ -173,8 +173,8 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 Program root files: [ @@ -205,7 +205,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -//// [/user/username/projects/myproject/foo.ts] Inode:: 111 +//// [/user/username/projects/myproject/foo.ts] Inode:: 112 export declare function foo(): string; @@ -234,7 +234,7 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":13} /user/username/projects/myproject/foo.ts: - {"inode":111} *new* + {"inode":112} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -263,8 +263,8 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 Program root files: [ diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js index 115d2b37cfebe..7bf3603ccdffa 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js @@ -58,7 +58,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec -//// [/user/username/projects/myproject/main.js] Inode:: 108 +//// [/user/username/projects/myproject/main.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -114,7 +114,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 export function foo2(): string; @@ -151,7 +151,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: - {"inode":109} *new* + {"inode":110} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -192,7 +192,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 5: timerToInvalidateFailedLookupResolutions *deleted* @@ -226,7 +226,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 export function foo(): string; @@ -263,7 +263,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: - {"inode":110} *new* + {"inode":111} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -271,7 +271,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: - {"inode":109} + {"inode":110} Timeout callback:: count: 2 9: timerToUpdateProgram *new* @@ -294,7 +294,7 @@ CreatingProgramWith:: -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 10: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js index 81e7880d0e808..73df3b79f64c4 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js @@ -35,7 +35,7 @@ Output:: -//// [/a/username/projects/project/src/file1.js] Inode:: 108 +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -75,7 +75,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +129,7 @@ Output:: -//// [/a/username/projects/project/src/file2.js] Inode:: 110 +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -139,7 +139,7 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* - {"inode":109} + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js index 32207a707ecf6..a42416c7d1cb8 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js @@ -35,7 +35,7 @@ Output:: -//// [/a/username/projects/project/src/file1.js] Inode:: 108 +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -82,7 +82,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +129,7 @@ Output:: -//// [/a/username/projects/project/src/file2.js] Inode:: 110 +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -149,7 +149,7 @@ FsWatches:: /a/username/projects/project/src: {"inode":5} /a/username/projects/project/src/file2.ts: *new* - {"inode":109} + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js index 8258a63830faf..6f37e99c0ea28 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js @@ -35,7 +35,7 @@ Output:: -//// [/a/username/projects/project/src/file1.js] Inode:: 108 +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -82,7 +82,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +129,7 @@ Output:: -//// [/a/username/projects/project/src/file2.js] Inode:: 110 +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -149,7 +149,7 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* - {"inode":109} + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js index 3eccc5cff938f..ce9d0b341d227 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js @@ -100,7 +100,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchron Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchronousWatchDirectory":true} Wild card directory -//// [/home/user/projects/myproject/src/file.js] Inode:: 118 +//// [/home/user/projects/myproject/src/file.js] Inode:: 119 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -315,7 +315,7 @@ FileWatcher:: Close:: WatchInfo: /home/user/projects/package.json 2000 {"synchro -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 119 PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js index 4ce59ebe5e320..afc7cc6d67471 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js @@ -95,7 +95,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory -//// [/home/user/projects/myproject/src/file.js] Inode:: 118 +//// [/home/user/projects/myproject/src/file.js] Inode:: 119 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -321,7 +321,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/user/projects/myproject/no sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 119 PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js index b303ed835d6c2..26d544a743fea 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js @@ -38,14 +38,14 @@ Output:: -//// [/user/username/projects/myproject/dist/file2.js] Inode:: 110 +//// [/user/username/projects/myproject/dist/file2.js] Inode:: 111 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; exports.x = 10; -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 111 +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 112 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -63,7 +63,7 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* - {"inode":109} + {"inode":110} /user/username/projects/myproject/src: *new* {"inode":5} /user/username/projects/myproject/src/file1.ts: *new* @@ -110,7 +110,7 @@ exitCode:: ExitStatus.undefined Change:: rename the file Input:: -//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 112 +//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 113 export const x = 10; //// [/user/username/projects/myproject/src/file2.ts] deleted @@ -133,7 +133,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: - {"inode":109} + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -167,7 +167,7 @@ Output:: -//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 111 +//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -187,7 +187,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: - {"inode":109} + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -250,7 +250,7 @@ Output:: -//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 113 +//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 114 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -274,13 +274,13 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: - {"inode":109} + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/renamed.ts: *new* - {"inode":112} + {"inode":113} /user/username/projects/myproject/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js index d751628e34076..578cc12c41415 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js @@ -39,12 +39,12 @@ Output:: -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 112 +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 113 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 113 +//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 114 export {}; @@ -69,7 +69,7 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* - {"inode":111} + {"inode":112} /user/username/projects/myproject/node_modules: *new* {"inode":7} /user/username/projects/myproject/node_modules/file2: *new* @@ -120,7 +120,7 @@ exitCode:: ExitStatus.undefined Change:: Add new file, should schedule and run timeout to update directory watcher Input:: -//// [/user/username/projects/myproject/src/file3.ts] Inode:: 114 +//// [/user/username/projects/myproject/src/file3.ts] Inode:: 115 export const y = 10; @@ -158,14 +158,14 @@ Output:: -//// [/user/username/projects/myproject/dist/file3.js] Inode:: 115 +//// [/user/username/projects/myproject/dist/file3.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = void 0; exports.y = 10; -//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 116 +//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 117 export declare const y = 10; @@ -190,7 +190,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: - {"inode":111} + {"inode":112} /user/username/projects/myproject/node_modules: {"inode":7} /user/username/projects/myproject/node_modules/file2: @@ -202,7 +202,7 @@ FsWatches:: /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/file3.ts: *new* - {"inode":114} + {"inode":115} /user/username/projects/myproject/tsconfig.json: {"inode":10} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js index c87d331a9b696..95bcc66b5cf11 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js @@ -34,7 +34,7 @@ Output:: -//// [/user/username/projects/myproject/src/file1.js] Inode:: 111 +//// [/user/username/projects/myproject/src/file1.js] Inode:: 112 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -187,7 +187,7 @@ Output:: -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules: @@ -337,7 +337,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: *new* - {"inode":112} + {"inode":113} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -365,7 +365,7 @@ exitCode:: ExitStatus.undefined Change:: npm install index file in file2 Input:: -//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 114 +//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 115 export const x = 10; @@ -395,9 +395,9 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: - {"inode":112} -/user/username/projects/myproject/node_modules/file2: *new* {"inode":113} +/user/username/projects/myproject/node_modules/file2: *new* + {"inode":114} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -447,7 +447,7 @@ Output:: -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -473,11 +473,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: - {"inode":112} -/user/username/projects/myproject/node_modules/file2: {"inode":113} -/user/username/projects/myproject/node_modules/file2/index.d.ts: *new* +/user/username/projects/myproject/node_modules/file2: {"inode":114} +/user/username/projects/myproject/node_modules/file2/index.d.ts: *new* + {"inode":115} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js index 93f6972ad89d2..8a49616b9b82c 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js @@ -75,7 +75,7 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excl Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory -//// [/user/username/projects/myproject/src/main.js] Inode:: 115 +//// [/user/username/projects/myproject/src/main.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -175,7 +175,7 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 118 export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js index 18a874270511a..9aea9607c9c2a 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js @@ -52,7 +52,7 @@ Output:: -//// [/user/username/projects/myproject/src/main.js] Inode:: 115 +//// [/user/username/projects/myproject/src/main.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -140,7 +140,7 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 118 export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js index c762692af8bef..40d9e621d30ff 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js @@ -43,11 +43,11 @@ sysLog:: /home/src/tslibs/TS/Lib/lib.d.ts:: Changing to watchFile sysLog:: /user/username/projects/project:: Changing to watchFile -//// [/user/username/projects/project/commonFile1.js] Inode:: 108 +//// [/user/username/projects/project/commonFile1.js] Inode:: 109 var x = 1; -//// [/user/username/projects/project/commonFile2.js] Inode:: 109 +//// [/user/username/projects/project/commonFile2.js] Inode:: 110 var y = 1; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js index 742ed8e259f5e..a76bc0caf6f85 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js @@ -38,11 +38,11 @@ Output:: -//// [/user/username/projects/project/commonFile1.js] Inode:: 108 +//// [/user/username/projects/project/commonFile1.js] Inode:: 109 var x = 1; -//// [/user/username/projects/project/commonFile2.js] Inode:: 109 +//// [/user/username/projects/project/commonFile2.js] Inode:: 110 var y = 1; diff --git a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js index 56db835489810..2e5a5bbc6b625 100644 --- a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js +++ b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js @@ -217,7 +217,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/username/workspaces/project/tsconfig.j Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/username/workspaces/project/src/b.ts 2:: WatchInfo: /home/username/workspaces/project/src/b.ts 500 undefined WatchType: Closed Script info Before request -//// [/home/username/workspaces/project/src/c.ts] Inode:: 111 +//// [/home/username/workspaces/project/src/c.ts] Inode:: 112 export const b = 10; //// [/home/username/workspaces/project/src/b.ts] deleted @@ -495,7 +495,7 @@ FsWatches:: /home/username/workspaces/project/src: {"inode":5} /home/username/workspaces/project/src/c.ts: *new* - {"inode":111} + {"inode":112} /home/username/workspaces/project/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js index 0c4f2df2a14f1..255a3a9c06359 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js @@ -87,12 +87,12 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 11 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 12 FsWatches:: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":11} + {"inode":12} Projects:: /dev/null/inferredProject1* (Inferred) *new* @@ -119,10 +119,10 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 104 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 105 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 107 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 108 { "entries": {} } diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js index e2cfb906f89da..8ef7f18090647 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js @@ -122,7 +122,7 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 14 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 15 PolledWatches:: @@ -149,7 +149,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":5} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":14} + {"inode":15} Projects:: /dev/null/inferredProject1* (Inferred) *new* @@ -176,10 +176,10 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 107 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 108 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 { "entries": {} } @@ -342,7 +342,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":5} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":14} + {"inode":15} Projects:: /dev/null/inferredProject1* (Inferred) *changed* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js index a5f9cc8d0c37f..38b0383db1ae4 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js @@ -23,10 +23,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 108 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 { "entries": {} } @@ -140,7 +140,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 18 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 19 PolledWatches:: @@ -153,9 +153,9 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":108} + {"inode":109} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":18} + {"inode":19} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js index cb0c065e02db4..2d060082c19ac 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js @@ -23,10 +23,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 { "entries": {} } @@ -175,7 +175,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 21 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 22 PolledWatches:: @@ -202,7 +202,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":111} + {"inode":112} /home/src/Vscode: *new* {"inode":10} /home/src/Vscode/Projects: *new* @@ -210,7 +210,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":21} + {"inode":22} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -402,7 +402,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: - {"inode":111} + {"inode":112} /home/src/Vscode: {"inode":10} /home/src/Vscode/Projects: @@ -410,7 +410,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":12} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":21} + {"inode":22} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js index d5e37d65b9a5c..5a8497fc4244e 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,10 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 { "entries": {} } @@ -147,7 +147,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 20 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 21 PolledWatches:: @@ -162,9 +162,9 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":110} + {"inode":111} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":20} + {"inode":21} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js index eac5007ecd783..9ea8cbf5a575d 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js @@ -27,10 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 114 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 116 { "entries": {} } @@ -182,7 +182,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 23 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 24 PolledWatches:: @@ -211,7 +211,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":113} + {"inode":114} /home/src/Vscode: *new* {"inode":12} /home/src/Vscode/Projects: *new* @@ -219,7 +219,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":14} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":23} + {"inode":24} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -407,7 +407,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: - {"inode":113} + {"inode":114} /home/src/Vscode: {"inode":12} /home/src/Vscode/Projects: @@ -415,7 +415,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":14} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":23} + {"inode":24} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js index 62e13123ffb57..c5b71def1c0e7 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,10 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 { "entries": {} } @@ -136,7 +136,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 19 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 20 PolledWatches:: @@ -149,9 +149,9 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":109} + {"inode":110} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":19} + {"inode":20} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js index b72c021fd75d4..7a2f77169e31b 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js @@ -27,10 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 { "entries": {} } @@ -171,7 +171,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 22 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 23 PolledWatches:: @@ -198,7 +198,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* - {"inode":112} + {"inode":113} /home/src/Vscode: *new* {"inode":11} /home/src/Vscode/Projects: *new* @@ -206,7 +206,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":22} + {"inode":23} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -392,7 +392,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: - {"inode":112} + {"inode":113} /home/src/Vscode: {"inode":11} /home/src/Vscode/Projects: @@ -400,7 +400,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":22} + {"inode":23} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js index 1cd3213fdf675..8010df12f0062 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js @@ -508,7 +508,7 @@ Info seq [hh:mm:ss:mss] response: } } After request -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 PolledWatches:: @@ -707,20 +707,20 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt created Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -1470,14 +1470,14 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js index dc7b78dfd921c..187e4387e1f9f 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -325,7 +325,7 @@ Info seq [hh:mm:ss:mss] response: } } After request -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 PolledWatches:: @@ -364,7 +364,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *new* @@ -517,20 +517,20 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 7: timerToUpdateChildWatches -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -576,7 +576,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -590,7 +590,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 9: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -718,9 +718,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -734,7 +734,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* @@ -925,13 +925,13 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} + {"inode":122} Timeout callback:: count: 3 13: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -1124,7 +1124,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 20: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1411,14 +1411,14 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 25: timerToUpdateChildWatches -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -1452,7 +1452,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1466,7 +1466,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 25: timerToUpdateChildWatches *new* @@ -1518,9 +1518,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1534,7 +1534,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 27: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1660,9 +1660,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1676,7 +1676,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js index dc2aec616bba6..4609806402805 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js @@ -85,22 +85,22 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -1066,14 +1066,14 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index deb512494aa9c..115b711ed40d9 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -85,22 +85,22 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -327,9 +327,9 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} + {"inode":122} /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -343,7 +343,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *new* @@ -533,13 +533,13 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} + {"inode":122} Timeout callback:: count: 3 2: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -736,7 +736,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 9: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1024,14 +1024,14 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 14: timerToUpdateChildWatches -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -1065,7 +1065,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1079,7 +1079,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 14: timerToUpdateChildWatches *new* @@ -1131,9 +1131,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1147,7 +1147,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 16: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1273,9 +1273,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: - {"inode":124} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1289,7 +1289,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js index 53b893d025e61..0c627935951ff 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js @@ -602,7 +602,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -732,7 +732,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -882,18 +882,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -913,14 +913,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -930,18 +930,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -962,15 +962,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -1483,7 +1483,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1599,7 +1599,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -2295,18 +2295,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2326,14 +2326,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -2343,18 +2343,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2375,15 +2375,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js index 1d8bfa858d3fa..a19f0fd0cd93d 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js @@ -424,7 +424,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -554,7 +554,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -685,18 +685,18 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 5: timerToUpdateChildWatches -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -716,14 +716,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -733,18 +733,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -765,15 +765,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -819,7 +819,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -970,11 +970,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} + {"inode":154} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -986,11 +986,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} + {"inode":147} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1143,7 +1143,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1259,7 +1259,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1493,17 +1493,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} + {"inode":154} /home/src/projects/c/3/c-impl/c/lib: - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} + {"inode":147} Timeout callback:: count: 3 28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1829,18 +1829,18 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 37: timerToUpdateChildWatches -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1860,14 +1860,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1877,18 +1877,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1909,15 +1909,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1962,9 +1962,9 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1980,9 +1980,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2051,11 +2051,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":165} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2071,9 +2071,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2205,11 +2205,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":165} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2221,11 +2221,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":158} + {"inode":159} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js index 735aedbaf9be1..6daf2abc71149 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js @@ -602,7 +602,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -732,7 +732,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -869,18 +869,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -900,14 +900,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -917,18 +917,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -949,15 +949,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -1470,7 +1470,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1586,7 +1586,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -2269,18 +2269,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2300,14 +2300,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -2317,18 +2317,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2349,15 +2349,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js index e100b95bb0be2..8838800aa1c80 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js @@ -420,7 +420,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -550,7 +550,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -702,18 +702,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 10: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -733,14 +733,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -750,18 +750,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -782,15 +782,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -931,17 +931,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} + {"inode":154} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} + {"inode":147} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1110,7 +1110,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 14: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1234,7 +1234,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 16: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1462,13 +1462,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} + {"inode":154} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} + {"inode":147} FsWatchesRecursive:: /home/src/projects/a: @@ -1827,18 +1827,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1858,14 +1858,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1875,18 +1875,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1907,15 +1907,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1958,17 +1958,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2135,17 +2135,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js index d05ebaf4a847a..ce8a90c7da91d 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js @@ -91,18 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,14 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -139,18 +139,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -771,7 +771,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -887,7 +887,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -1003,7 +1003,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1119,7 +1119,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1817,18 +1817,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1848,14 +1848,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1865,18 +1865,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1897,15 +1897,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js index c8db0a8ccdd91..e47b094ef5f3a 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js @@ -91,18 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,14 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -139,18 +139,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -377,11 +377,11 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":147} + {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -393,11 +393,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":140} + {"inode":141} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -541,7 +541,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -657,7 +657,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -773,7 +773,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -889,7 +889,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1123,17 +1123,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":147} + {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":151} + {"inode":152} /home/src/projects/c/3/c-impl/c/lib: - {"inode":140} + {"inode":141} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":144} + {"inode":145} Timeout callback:: count: 3 21: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1461,18 +1461,18 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 30: timerToUpdateChildWatches -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1492,14 +1492,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1509,18 +1509,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1541,15 +1541,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1594,9 +1594,9 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1612,9 +1612,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1683,11 +1683,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* - {"inode":165} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1703,9 +1703,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1837,11 +1837,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: - {"inode":165} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1853,11 +1853,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* - {"inode":158} + {"inode":159} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js index d87341e7c4bd9..1fe1ab61d7ff1 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js @@ -91,18 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,14 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -139,18 +139,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -771,7 +771,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -887,7 +887,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -1003,7 +1003,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1119,7 +1119,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1804,18 +1804,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1835,14 +1835,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1852,18 +1852,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1884,15 +1884,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js index a65c6507369fa..e2c84313250ba 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js @@ -91,18 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,14 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -139,18 +139,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -377,17 +377,17 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":151} + {"inode":152} /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -547,7 +547,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 2: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -671,7 +671,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 4: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -795,7 +795,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 6: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -919,7 +919,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 8: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1147,13 +1147,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":149} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":151} + {"inode":152} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":144} + {"inode":145} FsWatchesRecursive:: /home/src/projects/a: @@ -1514,18 +1514,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1545,14 +1545,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1562,18 +1562,18 @@ export * from './c'; "size": 68 } -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1594,15 +1594,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1645,17 +1645,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1822,17 +1822,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js index b06255e2053a7..2ceae269d429c 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js @@ -217,26 +217,26 @@ ScriptInfos:: /a/username/workspace/project/tsconfig.json After writing ignored file or folder -//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 115 +//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 116 After writing ignored file or folder -//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 116 +//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 117 After writing ignored file or folder -//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 118 +//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 119 After writing ignored file or folder -//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 119 +//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 120 After writing ignored file or folder -//// [/a/username/workspace/project/src/.#field.ts] Inode:: 120 +//// [/a/username/workspace/project/src/.#field.ts] Inode:: 121 diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js index 90971e4fa5dfc..7f686b274959c 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js @@ -243,7 +243,7 @@ After request Before running Timeout callback:: count: 1 1: pollPollingIntervalQueue -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -357,7 +357,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* - {"inode":112} + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js index ede1f356109f6..46defc73cad3d 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js @@ -259,7 +259,7 @@ Before running Timeout callback:: count: 3 1: /a/username/workspace/project/tsconfig.json 2: *ensureProjectForOpenFiles* 3: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -343,7 +343,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* - {"inode":112} + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js index b90188ad9bd88..da104ef3024c8 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js @@ -262,7 +262,7 @@ Before running Timeout callback:: count: 3 3: /a/username/workspace/project/tsconfig.json 4: *ensureProjectForOpenFiles* 5: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -333,7 +333,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* - {"inode":112} + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js index 3c9742decf01a..3af7065f46640 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js @@ -654,7 +654,7 @@ Projects:: dirty: true *changed* Before request -//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 116 +//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 117 export function randomSeed(): string; @@ -674,9 +674,9 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: *new* - {"inode":113} -/workspaces/somerepo/node_modules/@types: *new* {"inode":114} +/workspaces/somerepo/node_modules/@types: *new* + {"inode":115} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -770,9 +770,9 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: - {"inode":113} -/workspaces/somerepo/node_modules/@types: {"inode":114} +/workspaces/somerepo/node_modules/@types: + {"inode":115} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -902,11 +902,11 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: - {"inode":113} -/workspaces/somerepo/node_modules/@types: {"inode":114} -/workspaces/somerepo/node_modules/@types/random-seed: *new* +/workspaces/somerepo/node_modules/@types: {"inode":115} +/workspaces/somerepo/node_modules/@types/random-seed: *new* + {"inode":116} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: From 2d11280633fca6842a96436873ef227d242d4767 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:41:19 -0800 Subject: [PATCH 05/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60687=20(Remo?= =?UTF-8?q?ve=20reference=20not=20found=20errors=20f...)=20into=20release-?= =?UTF-8?q?5.7=20(#60721)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Isabel Duan --- src/compiler/checker.ts | 12 +- ...mentFactoryReference(jsx=react).errors.txt | 15 ++ ...FactoryReference(jsx=react-jsx).errors.txt | 12 ++ ...toryReference(jsx=react-jsxdev).errors.txt | 12 ++ ...formCustomImport(jsx=react-jsx).errors.txt | 5 +- ...mCustomImport(jsx=react-jsxdev).errors.txt | 5 +- ...stomImportPragma(jsx=react-jsx).errors.txt | 5 +- ...mImportPragma(jsx=react-jsxdev).errors.txt | 5 +- .../jsxRuntimePragma(jsx=preserve).js | 88 +++++++++ .../jsxRuntimePragma(jsx=preserve).symbols | 95 +++++++++ .../jsxRuntimePragma(jsx=preserve).types | 183 ++++++++++++++++++ ...ExpressionNoTypeAssertionInJsx2.errors.txt | 5 +- ...ExpressionNoTypeAssertionInJsx4.errors.txt | 5 +- .../compiler/jsxFragmentFactoryReference.tsx | 14 ++ tests/cases/compiler/jsxRuntimePragma.ts | 2 +- 15 files changed, 434 insertions(+), 29 deletions(-) create mode 100644 tests/baselines/reference/jsxFragmentFactoryReference(jsx=react).errors.txt create mode 100644 tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt create mode 100644 tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt create mode 100644 tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js create mode 100644 tests/baselines/reference/jsxRuntimePragma(jsx=preserve).symbols create mode 100644 tests/baselines/reference/jsxRuntimePragma(jsx=preserve).types create mode 100644 tests/cases/compiler/jsxFragmentFactoryReference.tsx diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6ffb0fb010714..61f372e4d55e1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -29878,6 +29878,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { const jsxFactoryRefErr = diagnostics && compilerOptions.jsx === JsxEmit.React ? Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found : undefined; const jsxFactoryNamespace = getJsxNamespace(node); const jsxFactoryLocation = isJsxOpeningLikeElement(node) ? node.tagName : node; + const shouldFactoryRefErr = compilerOptions.jsx !== JsxEmit.Preserve && compilerOptions.jsx !== JsxEmit.ReactNative; // #38720/60122, allow null as jsxFragmentFactory let jsxFactorySym: Symbol | undefined; @@ -29885,7 +29886,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { jsxFactorySym = resolveName( jsxFactoryLocation, jsxFactoryNamespace, - (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + shouldFactoryRefErr ? SymbolFlags.Value : SymbolFlags.Value & ~SymbolFlags.Enum, jsxFactoryRefErr, /*isUse*/ true, ); @@ -29910,7 +29911,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { resolveName( jsxFactoryLocation, localJsxNamespace, - (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + shouldFactoryRefErr ? SymbolFlags.Value : SymbolFlags.Value & ~SymbolFlags.Enum, jsxFactoryRefErr, /*isUse*/ true, ); @@ -36669,15 +36670,18 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { if (sourceFileLinks.jsxFragmentType !== undefined) return sourceFileLinks.jsxFragmentType; const jsxFragmentFactoryName = getJsxNamespace(node); + // #38720/60122, allow null as jsxFragmentFactory - if (jsxFragmentFactoryName === "null") return sourceFileLinks.jsxFragmentType = anyType; + const shouldResolveFactoryReference = (compilerOptions.jsx === JsxEmit.React || compilerOptions.jsxFragmentFactory !== undefined) && jsxFragmentFactoryName !== "null"; + if (!shouldResolveFactoryReference) return sourceFileLinks.jsxFragmentType = anyType; + const shouldModuleRefErr = compilerOptions.jsx !== JsxEmit.Preserve && compilerOptions.jsx !== JsxEmit.ReactNative; const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : undefined; const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? resolveName( node, jsxFragmentFactoryName, - (compilerOptions.jsx === JsxEmit.Preserve || compilerOptions.jsx === JsxEmit.ReactNative) ? SymbolFlags.Value & ~SymbolFlags.Enum : SymbolFlags.Value, + shouldModuleRefErr ? SymbolFlags.Value : SymbolFlags.Value & ~SymbolFlags.Enum, /*nameNotFoundMessage*/ jsxFactoryRefErr, /*isUse*/ true, ); diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react).errors.txt new file mode 100644 index 0000000000000..a32738b88ce84 --- /dev/null +++ b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react).errors.txt @@ -0,0 +1,15 @@ +jsxFragmentFactoryReference.tsx(3,9): error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. +jsxFragmentFactoryReference.tsx(3,9): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. + + +==== jsxFragmentFactoryReference.tsx (2 errors) ==== + export class LoggedOut { + content = () => ( + <> + ~~ +!!! error TS2874: This JSX tag requires 'React' to be in scope, but it could not be found. + ~~ +!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. + ) + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt new file mode 100644 index 0000000000000..11dd272e65c7f --- /dev/null +++ b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt @@ -0,0 +1,12 @@ +jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? + + +==== jsxFragmentFactoryReference.tsx (1 errors) ==== + export class LoggedOut { + content = () => ( + <> + ~~ +!!! error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? + ) + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt new file mode 100644 index 0000000000000..b9185baa77ec7 --- /dev/null +++ b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt @@ -0,0 +1,12 @@ +jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? + + +==== jsxFragmentFactoryReference.tsx (1 errors) ==== + export class LoggedOut { + content = () => ( + <> + ~~ +!!! error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? + ) + } + \ No newline at end of file diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).errors.txt b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).errors.txt index 2b8fbaf4e46f0..248540ed384da 100644 --- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).errors.txt +++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsx).errors.txt @@ -1,14 +1,11 @@ jsxJsxsCjsTransformCustomImport.tsx(2,11): error TS2875: This JSX tag requires the module path 'preact/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. -jsxJsxsCjsTransformCustomImport.tsx(2,11): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. -==== jsxJsxsCjsTransformCustomImport.tsx (2 errors) ==== +==== jsxJsxsCjsTransformCustomImport.tsx (1 errors) ==== /// const a = <> ~~ !!! error TS2875: This JSX tag requires the module path 'preact/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found.

text
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).errors.txt b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).errors.txt index 31af5093deb3a..e66480f8dce2f 100644 --- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).errors.txt +++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImport(jsx=react-jsxdev).errors.txt @@ -1,14 +1,11 @@ jsxJsxsCjsTransformCustomImport.tsx(2,11): error TS2875: This JSX tag requires the module path 'preact/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. -jsxJsxsCjsTransformCustomImport.tsx(2,11): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. -==== jsxJsxsCjsTransformCustomImport.tsx (2 errors) ==== +==== jsxJsxsCjsTransformCustomImport.tsx (1 errors) ==== /// const a = <> ~~ !!! error TS2875: This JSX tag requires the module path 'preact/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found.

text
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).errors.txt b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).errors.txt index 7155c43a5dad4..c37e010cab834 100644 --- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).errors.txt +++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsx).errors.txt @@ -1,5 +1,4 @@ preact.tsx(3,11): error TS2875: This JSX tag requires the module path 'preact/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. -preact.tsx(3,11): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. ==== react.tsx (0 errors) ==== @@ -13,14 +12,12 @@ preact.tsx(3,11): error TS2879: Using JSX fragments requires fragment factory 'R export {}; -==== preact.tsx (2 errors) ==== +==== preact.tsx (1 errors) ==== /// /* @jsxImportSource preact */ const a = <> ~~ !!! error TS2875: This JSX tag requires the module path 'preact/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found.

text
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).errors.txt b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).errors.txt index ad4bb3c20b12a..79e8e02a87b2f 100644 --- a/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).errors.txt +++ b/tests/baselines/reference/jsxJsxsCjsTransformCustomImportPragma(jsx=react-jsxdev).errors.txt @@ -1,5 +1,4 @@ preact.tsx(3,11): error TS2875: This JSX tag requires the module path 'preact/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. -preact.tsx(3,11): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. ==== react.tsx (0 errors) ==== @@ -13,14 +12,12 @@ preact.tsx(3,11): error TS2879: Using JSX fragments requires fragment factory 'R export {}; -==== preact.tsx (2 errors) ==== +==== preact.tsx (1 errors) ==== /// /* @jsxImportSource preact */ const a = <> ~~ !!! error TS2875: This JSX tag requires the module path 'preact/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found.

text
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js new file mode 100644 index 0000000000000..6310cf21524b4 --- /dev/null +++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js @@ -0,0 +1,88 @@ +//// [tests/cases/compiler/jsxRuntimePragma.ts] //// + +//// [one.tsx] +/// +/* @jsxRuntime classic */ +import * as React from "react"; +export const HelloWorld = () =>

Hello world

; +export const frag = <>
; +export const selfClosing = ; +//// [two.tsx] +/// +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +export const frag = <>
; +export const selfClosing = ; +//// [three.tsx] +/// +/* @jsxRuntime classic */ +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +export const frag = <>
; +export const selfClosing = ; +//// [four.tsx] +/// +/* @jsxRuntime automatic */ +/* @jsxRuntime classic */ +import * as React from "react"; +export const HelloWorld = () =>

Hello world

; +export const frag = <>
; +export const selfClosing = ; +//// [index.ts] +export * as one from "./one.js"; +export * as two from "./two.js"; +export * as three from "./three.js"; +export * as four from "./four.js"; + +//// [one.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.selfClosing = exports.frag = exports.HelloWorld = void 0; +/// +/* @jsxRuntime classic */ +var React = require("react"); +var HelloWorld = function () { return

Hello world

; }; +exports.HelloWorld = HelloWorld; +exports.frag = <>
; +exports.selfClosing = ; +//// [two.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.selfClosing = exports.frag = exports.HelloWorld = void 0; +/// +/* @jsxRuntime automatic */ +var HelloWorld = function () { return

Hello world

; }; +exports.HelloWorld = HelloWorld; +exports.frag = <>
; +exports.selfClosing = ; +//// [three.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.selfClosing = exports.frag = exports.HelloWorld = void 0; +/// +/* @jsxRuntime classic */ +/* @jsxRuntime automatic */ +var HelloWorld = function () { return

Hello world

; }; +exports.HelloWorld = HelloWorld; +exports.frag = <>
; +exports.selfClosing = ; +//// [four.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.selfClosing = exports.frag = exports.HelloWorld = void 0; +/// +/* @jsxRuntime automatic */ +/* @jsxRuntime classic */ +var React = require("react"); +var HelloWorld = function () { return

Hello world

; }; +exports.HelloWorld = HelloWorld; +exports.frag = <>
; +exports.selfClosing = ; +//// [index.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.four = exports.three = exports.two = exports.one = void 0; +exports.one = require("./one.js"); +exports.two = require("./two.js"); +exports.three = require("./three.js"); +exports.four = require("./four.js"); diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).symbols b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).symbols new file mode 100644 index 0000000000000..0060411a1a943 --- /dev/null +++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).symbols @@ -0,0 +1,95 @@ +//// [tests/cases/compiler/jsxRuntimePragma.ts] //// + +=== one.tsx === +/// +/* @jsxRuntime classic */ +import * as React from "react"; +>React : Symbol(React, Decl(one.tsx, 2, 6)) + +export const HelloWorld = () =>

Hello world

; +>HelloWorld : Symbol(HelloWorld, Decl(one.tsx, 3, 12)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) + +export const frag = <>
; +>frag : Symbol(frag, Decl(one.tsx, 4, 12)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + +export const selfClosing = ; +>selfClosing : Symbol(selfClosing, Decl(one.tsx, 5, 12)) +>img : Symbol(JSX.IntrinsicElements.img, Decl(react16.d.ts, 2569, 114)) +>src : Symbol(src, Decl(one.tsx, 5, 31)) + +=== two.tsx === +/// +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +>HelloWorld : Symbol(HelloWorld, Decl(two.tsx, 2, 12)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) + +export const frag = <>
; +>frag : Symbol(frag, Decl(two.tsx, 3, 12)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + +export const selfClosing = ; +>selfClosing : Symbol(selfClosing, Decl(two.tsx, 4, 12)) +>img : Symbol(JSX.IntrinsicElements.img, Decl(react16.d.ts, 2569, 114)) +>src : Symbol(src, Decl(two.tsx, 4, 31)) + +=== three.tsx === +/// +/* @jsxRuntime classic */ +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +>HelloWorld : Symbol(HelloWorld, Decl(three.tsx, 3, 12)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) + +export const frag = <>
; +>frag : Symbol(frag, Decl(three.tsx, 4, 12)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + +export const selfClosing = ; +>selfClosing : Symbol(selfClosing, Decl(three.tsx, 5, 12)) +>img : Symbol(JSX.IntrinsicElements.img, Decl(react16.d.ts, 2569, 114)) +>src : Symbol(src, Decl(three.tsx, 5, 31)) + +=== four.tsx === +/// +/* @jsxRuntime automatic */ +/* @jsxRuntime classic */ +import * as React from "react"; +>React : Symbol(React, Decl(four.tsx, 3, 6)) + +export const HelloWorld = () =>

Hello world

; +>HelloWorld : Symbol(HelloWorld, Decl(four.tsx, 4, 12)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) +>h1 : Symbol(JSX.IntrinsicElements.h1, Decl(react16.d.ts, 2556, 106)) + +export const frag = <>
; +>frag : Symbol(frag, Decl(four.tsx, 5, 12)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react16.d.ts, 2546, 114)) + +export const selfClosing = ; +>selfClosing : Symbol(selfClosing, Decl(four.tsx, 6, 12)) +>img : Symbol(JSX.IntrinsicElements.img, Decl(react16.d.ts, 2569, 114)) +>src : Symbol(src, Decl(four.tsx, 6, 31)) + +=== index.ts === +export * as one from "./one.js"; +>one : Symbol(one, Decl(index.ts, 0, 6)) + +export * as two from "./two.js"; +>two : Symbol(two, Decl(index.ts, 1, 6)) + +export * as three from "./three.js"; +>three : Symbol(three, Decl(index.ts, 2, 6)) + +export * as four from "./four.js"; +>four : Symbol(four, Decl(index.ts, 3, 6)) + diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).types b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).types new file mode 100644 index 0000000000000..87eb419fb5327 --- /dev/null +++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).types @@ -0,0 +1,183 @@ +//// [tests/cases/compiler/jsxRuntimePragma.ts] //// + +=== Performance Stats === +Assignability cache: 2,500 +Type Count: 5,000 +Instantiation count: 50,000 +Symbol count: 50,000 + +=== one.tsx === +/// +/* @jsxRuntime classic */ +import * as React from "react"; +>React : typeof React +> : ^^^^^^^^^^^^ + +export const HelloWorld = () =>

Hello world

; +>HelloWorld : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>() =>

Hello world

: () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>

Hello world

: JSX.Element +> : ^^^^^^^^^^^ +>h1 : any +> : ^^^ +>h1 : any +> : ^^^ + +export const frag = <>
; +>frag : JSX.Element +> : ^^^^^^^^^^^ +><>
: JSX.Element +> : ^^^^^^^^^^^ +>
: JSX.Element +> : ^^^^^^^^^^^ +>div : any +> : ^^^ +>div : any +> : ^^^ + +export const selfClosing = ; +>selfClosing : JSX.Element +> : ^^^^^^^^^^^ +> : JSX.Element +> : ^^^^^^^^^^^ +>img : any +> : ^^^ +>src : string +> : ^^^^^^ + +=== two.tsx === +/// +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +>HelloWorld : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>() =>

Hello world

: () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>

Hello world

: JSX.Element +> : ^^^^^^^^^^^ +>h1 : any +> : ^^^ +>h1 : any +> : ^^^ + +export const frag = <>
; +>frag : JSX.Element +> : ^^^^^^^^^^^ +><>
: JSX.Element +> : ^^^^^^^^^^^ +>
: JSX.Element +> : ^^^^^^^^^^^ +>div : any +> : ^^^ +>div : any +> : ^^^ + +export const selfClosing = ; +>selfClosing : JSX.Element +> : ^^^^^^^^^^^ +> : JSX.Element +> : ^^^^^^^^^^^ +>img : any +> : ^^^ +>src : string +> : ^^^^^^ + +=== three.tsx === +/// +/* @jsxRuntime classic */ +/* @jsxRuntime automatic */ +export const HelloWorld = () =>

Hello world

; +>HelloWorld : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>() =>

Hello world

: () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>

Hello world

: JSX.Element +> : ^^^^^^^^^^^ +>h1 : any +> : ^^^ +>h1 : any +> : ^^^ + +export const frag = <>
; +>frag : JSX.Element +> : ^^^^^^^^^^^ +><>
: JSX.Element +> : ^^^^^^^^^^^ +>
: JSX.Element +> : ^^^^^^^^^^^ +>div : any +> : ^^^ +>div : any +> : ^^^ + +export const selfClosing = ; +>selfClosing : JSX.Element +> : ^^^^^^^^^^^ +> : JSX.Element +> : ^^^^^^^^^^^ +>img : any +> : ^^^ +>src : string +> : ^^^^^^ + +=== four.tsx === +/// +/* @jsxRuntime automatic */ +/* @jsxRuntime classic */ +import * as React from "react"; +>React : typeof React +> : ^^^^^^^^^^^^ + +export const HelloWorld = () =>

Hello world

; +>HelloWorld : () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>() =>

Hello world

: () => JSX.Element +> : ^^^^^^^^^^^^^^^^^ +>

Hello world

: JSX.Element +> : ^^^^^^^^^^^ +>h1 : any +> : ^^^ +>h1 : any +> : ^^^ + +export const frag = <>
; +>frag : JSX.Element +> : ^^^^^^^^^^^ +><>
: JSX.Element +> : ^^^^^^^^^^^ +>
: JSX.Element +> : ^^^^^^^^^^^ +>div : any +> : ^^^ +>div : any +> : ^^^ + +export const selfClosing = ; +>selfClosing : JSX.Element +> : ^^^^^^^^^^^ +> : JSX.Element +> : ^^^^^^^^^^^ +>img : any +> : ^^^ +>src : string +> : ^^^^^^ + +=== index.ts === +export * as one from "./one.js"; +>one : typeof import("one") +> : ^^^^^^^^^^^^^^^^^^^^ + +export * as two from "./two.js"; +>two : typeof import("two") +> : ^^^^^^^^^^^^^^^^^^^^ + +export * as three from "./three.js"; +>three : typeof import("three") +> : ^^^^^^^^^^^^^^^^^^^^^^ + +export * as four from "./four.js"; +>four : typeof import("four") +> : ^^^^^^^^^^^^^^^^^^^^^ + diff --git a/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx2.errors.txt b/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx2.errors.txt index b4fb215aaed6f..69e07e52360a5 100644 --- a/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx2.errors.txt +++ b/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx2.errors.txt @@ -1,17 +1,14 @@ index.js(2,12): error TS17014: JSX fragment has no corresponding closing tag. -index.js(2,13): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. index.js(2,13): error TS17004: Cannot use JSX unless the '--jsx' flag is provided. index.js(3,1): error TS1005: ' x; ~~~ !!! error TS17014: JSX fragment has no corresponding closing tag. ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. - ~~ !!! error TS17004: Cannot use JSX unless the '--jsx' flag is provided. diff --git a/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx4.errors.txt b/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx4.errors.txt index 403885082355f..2c200912716c1 100644 --- a/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx4.errors.txt +++ b/tests/baselines/reference/parseUnaryExpressionNoTypeAssertionInJsx4.errors.txt @@ -1,12 +1,11 @@ index.tsx(3,14): error TS17008: JSX element 'number' has no corresponding closing tag. -index.tsx(4,13): error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. index.tsx(4,13): error TS17014: JSX fragment has no corresponding closing tag. index.tsx(5,14): error TS1003: Identifier expected. index.tsx(5,18): error TS1382: Unexpected token. Did you mean `{'>'}` or `>`? index.tsx(6,1): error TS1005: ' x; @@ -14,8 +13,6 @@ index.tsx(6,1): error TS1005: ' x; ~~ -!!! error TS2879: Using JSX fragments requires fragment factory 'React' to be in scope, but it could not be found. - ~~ !!! error TS17014: JSX fragment has no corresponding closing tag. const c = + <1234> x; ~~~~ diff --git a/tests/cases/compiler/jsxFragmentFactoryReference.tsx b/tests/cases/compiler/jsxFragmentFactoryReference.tsx new file mode 100644 index 0000000000000..99f2fc118de87 --- /dev/null +++ b/tests/cases/compiler/jsxFragmentFactoryReference.tsx @@ -0,0 +1,14 @@ +// @noTypesAndSymbols: true +// @noEmit: true +// @jsx: preserve, react, react-jsx, react-jsxdev, react-native +// @strict: true +// @skipLibCheck: true +// @target: ES2017 +// @module: ESNext +// @esModuleInterop: true + +export class LoggedOut { + content = () => ( + <> + ) +} diff --git a/tests/cases/compiler/jsxRuntimePragma.ts b/tests/cases/compiler/jsxRuntimePragma.ts index c3d1829b3861d..0a14e9503e79d 100644 --- a/tests/cases/compiler/jsxRuntimePragma.ts +++ b/tests/cases/compiler/jsxRuntimePragma.ts @@ -1,4 +1,4 @@ -// @jsx: react,react-jsx,react-jsxdev +// @jsx: react,react-jsx,react-jsxdev,preserve // @filename: one.tsx /// /* @jsxRuntime classic */ From b82fd16484225ba6d0798cd5595407ec65555ab6 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:03:46 -0800 Subject: [PATCH 06/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60576=20(Avoi?= =?UTF-8?q?d=20incorrectly=20reusing=20assertion...)=20into=20release-5.7?= =?UTF-8?q?=20(#60679)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mateusz Burzyński --- src/compiler/expressionToTypeNode.ts | 6 +- ...tionNodeNotReusedWhenTypeNotEquivalent1.js | 34 ++++++++ ...odeNotReusedWhenTypeNotEquivalent1.symbols | 78 +++++++++++++++++++ ...nNodeNotReusedWhenTypeNotEquivalent1.types | 74 ++++++++++++++++++ ...tionNodeNotReusedWhenTypeNotEquivalent1.ts | 27 +++++++ ...tionNodeNotReusedWhenTypeNotEquivalent1.ts | 36 +++++++++ 6 files changed, 252 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.js create mode 100644 tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.symbols create mode 100644 tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.types create mode 100644 tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts create mode 100644 tests/cases/fourslash/quickInfoAssertionNodeNotReusedWhenTypeNotEquivalent1.ts diff --git a/src/compiler/expressionToTypeNode.ts b/src/compiler/expressionToTypeNode.ts index 30a154f636960..83f0a0f0d9a6b 100644 --- a/src/compiler/expressionToTypeNode.ts +++ b/src/compiler/expressionToTypeNode.ts @@ -706,12 +706,12 @@ export function createSyntacticTypeNodeBuilder( } if (!result && node.kind === SyntaxKind.PropertyAssignment) { const initializer = node.initializer; - const type = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : + const assertionNode = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : initializer.kind === SyntaxKind.AsExpression || initializer.kind === SyntaxKind.TypeAssertionExpression ? (initializer as AsExpression | TypeAssertion).type : undefined; - if (type && !isConstTypeReference(type)) { - result = serializeExistingTypeNode(type, context); + if (assertionNode && !isConstTypeReference(assertionNode) && resolver.canReuseTypeNodeAnnotation(context, node, assertionNode, symbol)) { + result = serializeExistingTypeNode(assertionNode, context); } } return result ?? inferTypeOfDeclaration(node, symbol, context, /*reportFallback*/ false); diff --git a/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.js b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.js new file mode 100644 index 0000000000000..dc81a99aa63d7 --- /dev/null +++ b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts] //// + +//// [declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts] +type Wrapper = { + _type: T; +}; + +declare function stringWrapper(): Wrapper; + +declare function objWrapper>>( + obj: T, +): Wrapper; + +const value = objWrapper({ + prop1: stringWrapper() as Wrapper<"hello">, +}); + +type Unwrap = T extends Wrapper + ? T["_type"] extends Record> + ? { [Key in keyof T["_type"]]: Unwrap } + : T["_type"] + : never; + +declare function unwrap(wrapper: T): Unwrap; + +export const unwrapped = unwrap(value); + + + + +//// [declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.d.ts] +export declare const unwrapped: { + prop1: "hello"; +}; diff --git a/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.symbols b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.symbols new file mode 100644 index 0000000000000..fcfc2f0f54962 --- /dev/null +++ b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.symbols @@ -0,0 +1,78 @@ +//// [tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts] //// + +=== declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts === +type Wrapper = { +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 13)) + + _type: T; +>_type : Symbol(_type, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 19)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 13)) + +}; + +declare function stringWrapper(): Wrapper; +>stringWrapper : Symbol(stringWrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 2, 2)) +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) + +declare function objWrapper>>( +>objWrapper : Symbol(objWrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 4, 50)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 6, 28)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) + + obj: T, +>obj : Symbol(obj, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 6, 68)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 6, 28)) + +): Wrapper; +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 6, 28)) + +const value = objWrapper({ +>value : Symbol(value, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 10, 5)) +>objWrapper : Symbol(objWrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 4, 50)) + + prop1: stringWrapper() as Wrapper<"hello">, +>prop1 : Symbol(prop1, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 10, 26)) +>stringWrapper : Symbol(stringWrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 2, 2)) +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) + +}); + +type Unwrap = T extends Wrapper +>Unwrap : Symbol(Unwrap, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 12, 3)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) + + ? T["_type"] extends Record> +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) +>Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) +>Wrapper : Symbol(Wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 0, 0)) + + ? { [Key in keyof T["_type"]]: Unwrap } +>Key : Symbol(Key, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 16, 9)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) +>Unwrap : Symbol(Unwrap, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 12, 3)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) +>Key : Symbol(Key, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 16, 9)) + + : T["_type"] +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 14, 12)) + + : never; + +declare function unwrap(wrapper: T): Unwrap; +>unwrap : Symbol(unwrap, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 18, 10)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 20, 24)) +>wrapper : Symbol(wrapper, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 20, 27)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 20, 24)) +>Unwrap : Symbol(Unwrap, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 12, 3)) +>T : Symbol(T, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 20, 24)) + +export const unwrapped = unwrap(value); +>unwrapped : Symbol(unwrapped, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 22, 12)) +>unwrap : Symbol(unwrap, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 18, 10)) +>value : Symbol(value, Decl(declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts, 10, 5)) + diff --git a/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.types b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.types new file mode 100644 index 0000000000000..d432618693d4f --- /dev/null +++ b/tests/baselines/reference/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.types @@ -0,0 +1,74 @@ +//// [tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts] //// + +=== declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts === +type Wrapper = { +>Wrapper : Wrapper +> : ^^^^^^^^^^ + + _type: T; +>_type : T +> : ^ + +}; + +declare function stringWrapper(): Wrapper; +>stringWrapper : () => Wrapper +> : ^^^^^^ + +declare function objWrapper>>( +>objWrapper : >>(obj: T) => Wrapper +> : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ + + obj: T, +>obj : T +> : ^ + +): Wrapper; + +const value = objWrapper({ +>value : Wrapper<{ prop1: Wrapper<"hello">; }> +> : ^^^^^^^^^^^^^^^^^ ^^^^ +>objWrapper({ prop1: stringWrapper() as Wrapper<"hello">,}) : Wrapper<{ prop1: Wrapper<"hello">; }> +> : ^^^^^^^^^^^^^^^^^ ^^^^ +>objWrapper : >>(obj: T) => Wrapper +> : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ +>{ prop1: stringWrapper() as Wrapper<"hello">,} : { prop1: Wrapper<"hello">; } +> : ^^^^^^^^^ ^^^ + + prop1: stringWrapper() as Wrapper<"hello">, +>prop1 : Wrapper<"hello"> +> : ^^^^^^^^^^^^^^^^ +>stringWrapper() as Wrapper<"hello"> : Wrapper<"hello"> +> : ^^^^^^^^^^^^^^^^ +>stringWrapper() : Wrapper +> : ^^^^^^^^^^^^^^^ +>stringWrapper : () => Wrapper +> : ^^^^^^ + +}); + +type Unwrap = T extends Wrapper +>Unwrap : Unwrap +> : ^^^^^^^^^ + + ? T["_type"] extends Record> + ? { [Key in keyof T["_type"]]: Unwrap } + : T["_type"] + : never; + +declare function unwrap(wrapper: T): Unwrap; +>unwrap : (wrapper: T) => Unwrap +> : ^ ^^ ^^ ^^^^^ +>wrapper : T +> : ^ + +export const unwrapped = unwrap(value); +>unwrapped : { prop1: "hello"; } +> : ^^^^^^^^^^^^^^^^^^^ +>unwrap(value) : { prop1: "hello"; } +> : ^^^^^^^^^^^^^^^^^^^ +>unwrap : (wrapper: T) => Unwrap +> : ^ ^^ ^^ ^^^^^ +>value : Wrapper<{ prop1: Wrapper<"hello">; }> +> : ^^^^^^^^^^^^^^^^^ ^^^^ + diff --git a/tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts b/tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts new file mode 100644 index 0000000000000..05cedc8b10aba --- /dev/null +++ b/tests/cases/compiler/declarationAssertionNodeNotReusedWhenTypeNotEquivalent1.ts @@ -0,0 +1,27 @@ +// @strict: true +// @declaration: true +// @emitDeclarationOnly: true + +type Wrapper = { + _type: T; +}; + +declare function stringWrapper(): Wrapper; + +declare function objWrapper>>( + obj: T, +): Wrapper; + +const value = objWrapper({ + prop1: stringWrapper() as Wrapper<"hello">, +}); + +type Unwrap = T extends Wrapper + ? T["_type"] extends Record> + ? { [Key in keyof T["_type"]]: Unwrap } + : T["_type"] + : never; + +declare function unwrap(wrapper: T): Unwrap; + +export const unwrapped = unwrap(value); diff --git a/tests/cases/fourslash/quickInfoAssertionNodeNotReusedWhenTypeNotEquivalent1.ts b/tests/cases/fourslash/quickInfoAssertionNodeNotReusedWhenTypeNotEquivalent1.ts new file mode 100644 index 0000000000000..aa14e0fa5eb1b --- /dev/null +++ b/tests/cases/fourslash/quickInfoAssertionNodeNotReusedWhenTypeNotEquivalent1.ts @@ -0,0 +1,36 @@ +/// + +// https://github.com/microsoft/TypeScript/issues/60573 + +// @strict: true + +//// type Wrapper = { +//// _type: T; +//// }; +//// +//// function stringWrapper(): Wrapper { +//// return { _type: "" }; +//// } +//// +//// function objWrapper>>( +//// obj: T, +//// ): Wrapper { +//// return { _type: obj }; +//// } +//// +//// const value = objWrapper({ +//// prop1: stringWrapper() as Wrapper<"hello">, +//// }); +//// +//// type Unwrap> = T["_type"] extends Record< +//// string, +//// Wrapper +//// > +//// ? { [Key in keyof T["_type"]]: Unwrap } +//// : T["_type"]; +//// +//// type Test/*1*/ = Unwrap; + +verify.quickInfoAt("1", `type Test = { + prop1: "hello"; +}`) From 21b02a1e1f19852790c36e550631e8083c67fc1c Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:53:12 -0800 Subject: [PATCH 07/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60749=20(Do?= =?UTF-8?q?=20not=20require=20import=20attribute=20on=20...)=20into=20rele?= =?UTF-8?q?ase-5.7=20(#60750)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrew Branch --- src/compiler/checker.ts | 2 +- .../nodeModulesJson(module=node16).errors.txt | 15 ++++++++++----- .../nodeModulesJson(module=node16).symbols | 14 ++++++++++---- .../nodeModulesJson(module=node16).types | 10 ++++++++++ .../nodeModulesJson(module=nodenext).errors.txt | 11 ++++++++--- .../nodeModulesJson(module=nodenext).symbols | 14 ++++++++++---- .../nodeModulesJson(module=nodenext).types | 10 ++++++++++ tests/cases/conformance/node/nodeModulesJson.ts | 2 ++ 8 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 61f372e4d55e1..f4cdc626c270f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -47660,7 +47660,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { } } - if (moduleKind === ModuleKind.NodeNext && isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { + if (!importClause.isTypeOnly && moduleKind === ModuleKind.NodeNext && isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { // Import attributes/assertions are not allowed in --module node16, so don't suggest adding one error(node.moduleSpecifier, Diagnostics.Importing_a_JSON_file_into_an_ECMAScript_module_requires_a_type_Colon_json_import_attribute_when_module_is_set_to_0, ModuleKind[moduleKind]); } diff --git a/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt b/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt index 989bb7dcf9a58..ec8512329307c 100644 --- a/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt +++ b/tests/baselines/reference/nodeModulesJson(module=node16).errors.txt @@ -2,10 +2,11 @@ /loosey.cts(6,9): error TS2339: Property 'default' does not exist on type '{ version: number; }'. /main.mts(5,36): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. /main.mts(6,52): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. -/main.mts(8,10): error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'Node16'. -/main.mts(8,41): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. -/main.mts(9,42): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. -/main.mts(10,9): error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. +/main.mts(9,47): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(10,10): error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'Node16'. +/main.mts(10,41): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(11,42): error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. +/main.mts(12,9): error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. ==== /node_modules/not.json/package.json (0 errors) ==== @@ -42,7 +43,7 @@ "version": 1 } -==== /main.mts (6 errors) ==== +==== /main.mts (7 errors) ==== import { oops } from "not.json"; // Ok import moreOops from "actually-json"; // Error in nodenext import typed from "actually-json/typed"; // Error in nodenext @@ -54,6 +55,10 @@ ~~~~~~~~~~~~~~~~~~~~~ !!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. import config2 from "./config.json"; // Error in nodenext, no attribute + import type config2Type from "./config.json"; // Ok, type-only + import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2823: Import attributes are only supported when the '--module' option is set to 'esnext', 'nodenext', or 'preserve'. import { version } from "./config.json" with { type: "json" }; // Error, named import ~~~~~~~ !!! error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'Node16'. diff --git a/tests/baselines/reference/nodeModulesJson(module=node16).symbols b/tests/baselines/reference/nodeModulesJson(module=node16).symbols index 42c68c640a2e7..52d983d5b9516 100644 --- a/tests/baselines/reference/nodeModulesJson(module=node16).symbols +++ b/tests/baselines/reference/nodeModulesJson(module=node16).symbols @@ -42,18 +42,24 @@ import { default as config1 } from "./config.json" with { type: "json" }; // Ok import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : Symbol(config2, Decl(main.mts, 6, 6)) +import type config2Type from "./config.json"; // Ok, type-only +>config2Type : Symbol(config2Type, Decl(main.mts, 7, 6)) + +import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports +>config2Type2 : Symbol(config2Type2, Decl(main.mts, 8, 6)) + import { version } from "./config.json" with { type: "json" }; // Error, named import ->version : Symbol(version, Decl(main.mts, 7, 8)) +>version : Symbol(version, Decl(main.mts, 9, 8)) import * as config3 from "./config.json" with { type: "json" }; ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) config3.version; // Error ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) config3.default; // Ok >config3.default : Symbol("/config") ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) >default : Symbol("/config") === /loosey.cts === diff --git a/tests/baselines/reference/nodeModulesJson(module=node16).types b/tests/baselines/reference/nodeModulesJson(module=node16).types index 2c41926af320a..37ac9a196dd4e 100644 --- a/tests/baselines/reference/nodeModulesJson(module=node16).types +++ b/tests/baselines/reference/nodeModulesJson(module=node16).types @@ -64,6 +64,16 @@ import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : { version: number; } > : ^^^^^^^^^^^^^^^^^^^^ +import type config2Type from "./config.json"; // Ok, type-only +>config2Type : any +> : ^^^ + +import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports +>config2Type2 : any +> : ^^^ +>type : any +> : ^^^ + import { version } from "./config.json" with { type: "json" }; // Error, named import >version : number > : ^^^^^^ diff --git a/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt b/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt index bf355357b0905..04e6a649d3f25 100644 --- a/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).errors.txt @@ -3,8 +3,9 @@ /main.mts(2,22): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. /main.mts(3,19): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. /main.mts(7,21): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. -/main.mts(8,10): error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'NodeNext'. -/main.mts(10,9): error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. +/main.mts(9,47): error TS2857: Import attributes cannot be used with type-only imports or exports. +/main.mts(10,10): error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'NodeNext'. +/main.mts(12,9): error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. ==== /node_modules/not.json/package.json (0 errors) ==== @@ -41,7 +42,7 @@ "version": 1 } -==== /main.mts (5 errors) ==== +==== /main.mts (6 errors) ==== import { oops } from "not.json"; // Ok import moreOops from "actually-json"; // Error in nodenext ~~~~~~~~~~~~~~~ @@ -55,6 +56,10 @@ import config2 from "./config.json"; // Error in nodenext, no attribute ~~~~~~~~~~~~~~~ !!! error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'NodeNext'. + import type config2Type from "./config.json"; // Ok, type-only + import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports + ~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2857: Import attributes cannot be used with type-only imports or exports. import { version } from "./config.json" with { type: "json" }; // Error, named import ~~~~~~~ !!! error TS1544: Named imports from a JSON file into an ECMAScript module are not allowed when 'module' is set to 'NodeNext'. diff --git a/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols b/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols index 42c68c640a2e7..52d983d5b9516 100644 --- a/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).symbols @@ -42,18 +42,24 @@ import { default as config1 } from "./config.json" with { type: "json" }; // Ok import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : Symbol(config2, Decl(main.mts, 6, 6)) +import type config2Type from "./config.json"; // Ok, type-only +>config2Type : Symbol(config2Type, Decl(main.mts, 7, 6)) + +import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports +>config2Type2 : Symbol(config2Type2, Decl(main.mts, 8, 6)) + import { version } from "./config.json" with { type: "json" }; // Error, named import ->version : Symbol(version, Decl(main.mts, 7, 8)) +>version : Symbol(version, Decl(main.mts, 9, 8)) import * as config3 from "./config.json" with { type: "json" }; ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) config3.version; // Error ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) config3.default; // Ok >config3.default : Symbol("/config") ->config3 : Symbol(config3, Decl(main.mts, 8, 6)) +>config3 : Symbol(config3, Decl(main.mts, 10, 6)) >default : Symbol("/config") === /loosey.cts === diff --git a/tests/baselines/reference/nodeModulesJson(module=nodenext).types b/tests/baselines/reference/nodeModulesJson(module=nodenext).types index 2c41926af320a..37ac9a196dd4e 100644 --- a/tests/baselines/reference/nodeModulesJson(module=nodenext).types +++ b/tests/baselines/reference/nodeModulesJson(module=nodenext).types @@ -64,6 +64,16 @@ import config2 from "./config.json"; // Error in nodenext, no attribute >config2 : { version: number; } > : ^^^^^^^^^^^^^^^^^^^^ +import type config2Type from "./config.json"; // Ok, type-only +>config2Type : any +> : ^^^ + +import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports +>config2Type2 : any +> : ^^^ +>type : any +> : ^^^ + import { version } from "./config.json" with { type: "json" }; // Error, named import >version : number > : ^^^^^^ diff --git a/tests/cases/conformance/node/nodeModulesJson.ts b/tests/cases/conformance/node/nodeModulesJson.ts index e231ec9b0aa1d..44469097d0d06 100644 --- a/tests/cases/conformance/node/nodeModulesJson.ts +++ b/tests/cases/conformance/node/nodeModulesJson.ts @@ -44,6 +44,8 @@ import typed from "actually-json/typed"; // Error in nodenext import config from "./config.json" with { type: "json" }; // Ok import { default as config1 } from "./config.json" with { type: "json" }; // Ok import config2 from "./config.json"; // Error in nodenext, no attribute +import type config2Type from "./config.json"; // Ok, type-only +import type config2Type2 from "./config.json" with { type: "json" }; // Error, import attributes not allowed on type-only imports import { version } from "./config.json" with { type: "json" }; // Error, named import import * as config3 from "./config.json" with { type: "json" }; config3.version; // Error From e844dc305e09029d417a8daf84a816532d2ed4f3 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:26:13 -0800 Subject: [PATCH 08/15] Cherry-pick #60402, #60440, #60616 into release-5.7 (#60777) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mateusz Burzyński Co-authored-by: Ryan Cavanaugh --- src/compiler/checker.ts | 4 + .../reference/predicateSemantics.errors.txt | 47 +++++- .../baselines/reference/predicateSemantics.js | 56 ++++++- .../reference/predicateSemantics.symbols | 58 +++++++ .../reference/predicateSemantics.types | 141 ++++++++++++++++++ tests/cases/compiler/predicateSemantics.ts | 29 +++- 6 files changed, 330 insertions(+), 5 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f4cdc626c270f..9aa454547e3d9 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -39783,7 +39783,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { switch (node.kind) { case SyntaxKind.AwaitExpression: case SyntaxKind.CallExpression: + case SyntaxKind.TaggedTemplateExpression: case SyntaxKind.ElementAccessExpression: + case SyntaxKind.MetaProperty: case SyntaxKind.NewExpression: case SyntaxKind.PropertyAccessExpression: case SyntaxKind.YieldExpression: @@ -39801,6 +39803,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { case SyntaxKind.AmpersandAmpersandToken: case SyntaxKind.AmpersandAmpersandEqualsToken: return PredicateSemantics.Sometimes; + case SyntaxKind.CommaToken: + return getSyntacticNullishnessSemantics((node as BinaryExpression).right); } return PredicateSemantics.Never; case SyntaxKind.ConditionalExpression: diff --git a/tests/baselines/reference/predicateSemantics.errors.txt b/tests/baselines/reference/predicateSemantics.errors.txt index 14251121358c4..c80dd47d19357 100644 --- a/tests/baselines/reference/predicateSemantics.errors.txt +++ b/tests/baselines/reference/predicateSemantics.errors.txt @@ -9,9 +9,14 @@ predicateSemantics.ts(33,8): error TS2872: This kind of expression is always tru predicateSemantics.ts(34,11): error TS2872: This kind of expression is always truthy. predicateSemantics.ts(35,8): error TS2872: This kind of expression is always truthy. predicateSemantics.ts(36,8): error TS2872: This kind of expression is always truthy. +predicateSemantics.ts(51,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. +predicateSemantics.ts(52,14): error TS2695: Left side of comma operator is unused and has no side effects. +predicateSemantics.ts(52,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. +predicateSemantics.ts(70,1): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. +predicateSemantics.ts(71,1): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. -==== predicateSemantics.ts (11 errors) ==== +==== predicateSemantics.ts (16 errors) ==== declare let cond: any; // OK: One or other operand is possibly nullish @@ -77,4 +82,42 @@ predicateSemantics.ts(36,8): error TS2872: This kind of expression is always tru function foo(this: Object | undefined) { // Should be OK return this ?? 0; - } \ No newline at end of file + } + + // https://github.com/microsoft/TypeScript/issues/60401 + { + const maybe = null as true | null; + let i = 0; + const d = (i++, maybe) ?? true; // ok + const e = (i++, i++) ?? true; // error + ~~~~~~~~ +!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. + const f = (maybe, i++) ?? true; // error + ~~~~~ +!!! error TS2695: Left side of comma operator is unused and has no side effects. + ~~~~~~~~~~ +!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. + } + + // https://github.com/microsoft/TypeScript/issues/60439 + class X { + constructor() { + const p = new.target ?? 32; + } + } + + // https://github.com/microsoft/TypeScript/issues/60614 + declare function tag( + strings: TemplateStringsArray, + ...values: number[] + ): T | null; + + tag`foo${1}` ?? 32; // ok + + `foo${1}` ?? 32; // error + ~~~~~~~~~ +!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. + `foo` ?? 32; // error + ~~~~~ +!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish. + \ No newline at end of file diff --git a/tests/baselines/reference/predicateSemantics.js b/tests/baselines/reference/predicateSemantics.js index eb0b66516b62c..30ada0d514d02 100644 --- a/tests/baselines/reference/predicateSemantics.js +++ b/tests/baselines/reference/predicateSemantics.js @@ -44,10 +44,42 @@ console.log((cond || undefined) && 1 / cond); function foo(this: Object | undefined) { // Should be OK return this ?? 0; -} +} + +// https://github.com/microsoft/TypeScript/issues/60401 +{ + const maybe = null as true | null; + let i = 0; + const d = (i++, maybe) ?? true; // ok + const e = (i++, i++) ?? true; // error + const f = (maybe, i++) ?? true; // error +} + +// https://github.com/microsoft/TypeScript/issues/60439 +class X { + constructor() { + const p = new.target ?? 32; + } +} + +// https://github.com/microsoft/TypeScript/issues/60614 +declare function tag( + strings: TemplateStringsArray, + ...values: number[] +): T | null; + +tag`foo${1}` ?? 32; // ok + +`foo${1}` ?? 32; // error +`foo` ?? 32; // error + //// [predicateSemantics.js] -var _a, _b, _c, _d, _e, _f; +var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { + if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } + return cooked; +}; +var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l; // OK: One or other operand is possibly nullish var test1 = (_a = (cond ? undefined : 32)) !== null && _a !== void 0 ? _a : "possibly reached"; // Not OK: Both operands nullish @@ -88,3 +120,23 @@ function foo() { // Should be OK return this !== null && this !== void 0 ? this : 0; } +// https://github.com/microsoft/TypeScript/issues/60401 +{ + var maybe = null; + var i = 0; + var d = (_g = (i++, maybe)) !== null && _g !== void 0 ? _g : true; // ok + var e = (_h = (i++, i++)) !== null && _h !== void 0 ? _h : true; // error + var f = (_j = (maybe, i++)) !== null && _j !== void 0 ? _j : true; // error +} +// https://github.com/microsoft/TypeScript/issues/60439 +var X = /** @class */ (function () { + function X() { + var _newTarget = this.constructor; + var _a; + var p = (_a = _newTarget) !== null && _a !== void 0 ? _a : 32; + } + return X; +}()); +(_k = tag(__makeTemplateObject(["foo", ""], ["foo", ""]), 1)) !== null && _k !== void 0 ? _k : 32; // ok +(_l = "foo".concat(1)) !== null && _l !== void 0 ? _l : 32; // error +"foo" !== null && "foo" !== void 0 ? "foo" : 32; // error diff --git a/tests/baselines/reference/predicateSemantics.symbols b/tests/baselines/reference/predicateSemantics.symbols index 790e965f988cc..f8ddf0fe5db87 100644 --- a/tests/baselines/reference/predicateSemantics.symbols +++ b/tests/baselines/reference/predicateSemantics.symbols @@ -79,3 +79,61 @@ function foo(this: Object | undefined) { return this ?? 0; >this : Symbol(this, Decl(predicateSemantics.ts, 40, 13)) } + +// https://github.com/microsoft/TypeScript/issues/60401 +{ + const maybe = null as true | null; +>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7)) + + let i = 0; +>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5)) + + const d = (i++, maybe) ?? true; // ok +>d : Symbol(d, Decl(predicateSemantics.ts, 49, 7)) +>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5)) +>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7)) + + const e = (i++, i++) ?? true; // error +>e : Symbol(e, Decl(predicateSemantics.ts, 50, 7)) +>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5)) +>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5)) + + const f = (maybe, i++) ?? true; // error +>f : Symbol(f, Decl(predicateSemantics.ts, 51, 7)) +>maybe : Symbol(maybe, Decl(predicateSemantics.ts, 47, 7)) +>i : Symbol(i, Decl(predicateSemantics.ts, 48, 5)) +} + +// https://github.com/microsoft/TypeScript/issues/60439 +class X { +>X : Symbol(X, Decl(predicateSemantics.ts, 52, 1)) + + constructor() { + const p = new.target ?? 32; +>p : Symbol(p, Decl(predicateSemantics.ts, 57, 9)) +>new.target : Symbol(X, Decl(predicateSemantics.ts, 52, 1)) +>target : Symbol(X, Decl(predicateSemantics.ts, 52, 1)) + } +} + +// https://github.com/microsoft/TypeScript/issues/60614 +declare function tag( +>tag : Symbol(tag, Decl(predicateSemantics.ts, 59, 1)) +>T : Symbol(T, Decl(predicateSemantics.ts, 62, 21)) + + strings: TemplateStringsArray, +>strings : Symbol(strings, Decl(predicateSemantics.ts, 62, 24)) +>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --)) + + ...values: number[] +>values : Symbol(values, Decl(predicateSemantics.ts, 63, 32)) + +): T | null; +>T : Symbol(T, Decl(predicateSemantics.ts, 62, 21)) + +tag`foo${1}` ?? 32; // ok +>tag : Symbol(tag, Decl(predicateSemantics.ts, 59, 1)) + +`foo${1}` ?? 32; // error +`foo` ?? 32; // error + diff --git a/tests/baselines/reference/predicateSemantics.types b/tests/baselines/reference/predicateSemantics.types index 3d3eba6683e25..b054c66ad43e7 100644 --- a/tests/baselines/reference/predicateSemantics.types +++ b/tests/baselines/reference/predicateSemantics.types @@ -234,3 +234,144 @@ function foo(this: Object | undefined) { >0 : 0 > : ^ } + +// https://github.com/microsoft/TypeScript/issues/60401 +{ + const maybe = null as true | null; +>maybe : true +> : ^^^^ +>null as true | null : true +> : ^^^^ +>true : true +> : ^^^^ + + let i = 0; +>i : number +> : ^^^^^^ +>0 : 0 +> : ^ + + const d = (i++, maybe) ?? true; // ok +>d : true +> : ^^^^ +>(i++, maybe) ?? true : true +> : ^^^^ +>(i++, maybe) : true +> : ^^^^ +>i++, maybe : true +> : ^^^^ +>i++ : number +> : ^^^^^^ +>i : number +> : ^^^^^^ +>maybe : true +> : ^^^^ +>true : true +> : ^^^^ + + const e = (i++, i++) ?? true; // error +>e : number | true +> : ^^^^^^^^^^^^^ +>(i++, i++) ?? true : number | true +> : ^^^^^^^^^^^^^ +>(i++, i++) : number +> : ^^^^^^ +>i++, i++ : number +> : ^^^^^^ +>i++ : number +> : ^^^^^^ +>i : number +> : ^^^^^^ +>i++ : number +> : ^^^^^^ +>i : number +> : ^^^^^^ +>true : true +> : ^^^^ + + const f = (maybe, i++) ?? true; // error +>f : number | true +> : ^^^^^^^^^^^^^ +>(maybe, i++) ?? true : number | true +> : ^^^^^^^^^^^^^ +>(maybe, i++) : number +> : ^^^^^^ +>maybe, i++ : number +> : ^^^^^^ +>maybe : true +> : ^^^^ +>i++ : number +> : ^^^^^^ +>i : number +> : ^^^^^^ +>true : true +> : ^^^^ +} + +// https://github.com/microsoft/TypeScript/issues/60439 +class X { +>X : X +> : ^ + + constructor() { + const p = new.target ?? 32; +>p : 32 | typeof X +> : ^^^^^^^^^^^^^ +>new.target ?? 32 : 32 | typeof X +> : ^^^^^^^^^^^^^ +>new.target : typeof X +> : ^^^^^^^^ +>target : typeof X +> : ^^^^^^^^ +>32 : 32 +> : ^^ + } +} + +// https://github.com/microsoft/TypeScript/issues/60614 +declare function tag( +>tag : (strings: TemplateStringsArray, ...values: number[]) => T | null +> : ^ ^^ ^^ ^^^^^ ^^ ^^^^^ + + strings: TemplateStringsArray, +>strings : TemplateStringsArray +> : ^^^^^^^^^^^^^^^^^^^^ + + ...values: number[] +>values : number[] +> : ^^^^^^^^ + +): T | null; + +tag`foo${1}` ?? 32; // ok +>tag`foo${1}` ?? 32 : unknown +> : ^^^^^^^ +>tag`foo${1}` : unknown +> : ^^^^^^^ +>tag : (strings: TemplateStringsArray, ...values: number[]) => T | null +> : ^ ^^ ^^ ^^^^^ ^^ ^^^^^ +>`foo${1}` : string +> : ^^^^^^ +>1 : 1 +> : ^ +>32 : 32 +> : ^^ + +`foo${1}` ?? 32; // error +>`foo${1}` ?? 32 : 32 | "foo1" +> : ^^^^^^^^^^^ +>`foo${1}` : "foo1" +> : ^^^^^^ +>1 : 1 +> : ^ +>32 : 32 +> : ^^ + +`foo` ?? 32; // error +>`foo` ?? 32 : 32 | "foo" +> : ^^^^^^^^^^ +>`foo` : "foo" +> : ^^^^^ +>32 : 32 +> : ^^ + diff --git a/tests/cases/compiler/predicateSemantics.ts b/tests/cases/compiler/predicateSemantics.ts index d6e12b297b25b..a22b34341e7d5 100644 --- a/tests/cases/compiler/predicateSemantics.ts +++ b/tests/cases/compiler/predicateSemantics.ts @@ -41,4 +41,31 @@ console.log((cond || undefined) && 1 / cond); function foo(this: Object | undefined) { // Should be OK return this ?? 0; -} \ No newline at end of file +} + +// https://github.com/microsoft/TypeScript/issues/60401 +{ + const maybe = null as true | null; + let i = 0; + const d = (i++, maybe) ?? true; // ok + const e = (i++, i++) ?? true; // error + const f = (maybe, i++) ?? true; // error +} + +// https://github.com/microsoft/TypeScript/issues/60439 +class X { + constructor() { + const p = new.target ?? 32; + } +} + +// https://github.com/microsoft/TypeScript/issues/60614 +declare function tag( + strings: TemplateStringsArray, + ...values: number[] +): T | null; + +tag`foo${1}` ?? 32; // ok + +`foo${1}` ?? 32; // error +`foo` ?? 32; // error From 4b7441a8bee1f0cbc861a3ad23f72769fb518df1 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:26:58 -0800 Subject: [PATCH 09/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60680=20(Mark?= =?UTF-8?q?=20the=20inherited=20any-based=20index=20...)=20into=20release-?= =?UTF-8?q?5.7=20(#60776)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wesley Wigham --- src/compiler/checker.ts | 6 ++- .../declarationEmitClassInherritsAny.js | 45 +++++++++++++++++++ .../declarationEmitClassInherritsAny.symbols | 10 +++++ .../declarationEmitClassInherritsAny.types | 14 ++++++ .../declarationEmitClassInherritsAny.ts | 3 ++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/declarationEmitClassInherritsAny.js create mode 100644 tests/baselines/reference/declarationEmitClassInherritsAny.symbols create mode 100644 tests/baselines/reference/declarationEmitClassInherritsAny.types create mode 100644 tests/cases/compiler/declarationEmitClassInherritsAny.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9aa454547e3d9..df45bdc1a6008 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2150,6 +2150,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { var silentNeverSignature = createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, SignatureFlags.None); var enumNumberIndexInfo = createIndexInfo(numberType, stringType, /*isReadonly*/ true); + var anyBaseTypeIndexInfo = createIndexInfo(stringType, anyType, /*isReadonly*/ false); var iterationTypesCache = new Map(); // cache for common IterationTypes instances var noIterationTypes: IterationTypes = { @@ -13385,7 +13386,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType)); callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Call)); constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, SignatureKind.Construct)); - const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [createIndexInfo(stringType, anyType, /*isReadonly*/ false)]; + const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [anyBaseTypeIndexInfo]; indexInfos = concatenate(indexInfos, filter(inheritedIndexInfos, info => !findIndexInfo(indexInfos, info.keyType))); } } @@ -13917,7 +13918,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { addInheritedMembers(members, getPropertiesOfType(baseConstructorType)); } else if (baseConstructorType === anyType) { - baseConstructorIndexInfo = createIndexInfo(stringType, anyType, /*isReadonly*/ false); + baseConstructorIndexInfo = anyBaseTypeIndexInfo; } } @@ -50345,6 +50346,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { result ||= []; for (const info of infoList!) { if (info.declaration) continue; + if (info === anyBaseTypeIndexInfo) continue; // inherited, but looks like a late-bound signature because it has no declarations const node = nodeBuilder.indexInfoToIndexSignatureDeclaration(info, enclosing, flags, internalFlags, tracker); if (node && infoList === staticInfos) { (((node as Mutable).modifiers ||= factory.createNodeArray()) as MutableNodeArray).unshift(factory.createModifier(SyntaxKind.StaticKeyword)); diff --git a/tests/baselines/reference/declarationEmitClassInherritsAny.js b/tests/baselines/reference/declarationEmitClassInherritsAny.js new file mode 100644 index 0000000000000..8c4103422b2e9 --- /dev/null +++ b/tests/baselines/reference/declarationEmitClassInherritsAny.js @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/declarationEmitClassInherritsAny.ts] //// + +//// [declarationEmitClassInherritsAny.ts] +const anyThing = class {} as any; +export class Foo extends anyThing {} + +//// [declarationEmitClassInherritsAny.js] +"use strict"; +var __extends = (this && this.__extends) || (function () { + var extendStatics = function (d, b) { + extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; }; + return extendStatics(d, b); + }; + return function (d, b) { + if (typeof b !== "function" && b !== null) + throw new TypeError("Class extends value " + String(b) + " is not a constructor or null"); + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Foo = void 0; +var anyThing = /** @class */ (function () { + function class_1() { + } + return class_1; +}()); +var Foo = /** @class */ (function (_super) { + __extends(Foo, _super); + function Foo() { + return _super !== null && _super.apply(this, arguments) || this; + } + return Foo; +}(anyThing)); +exports.Foo = Foo; + + +//// [declarationEmitClassInherritsAny.d.ts] +declare const anyThing: any; +export declare class Foo extends anyThing { +} +export {}; diff --git a/tests/baselines/reference/declarationEmitClassInherritsAny.symbols b/tests/baselines/reference/declarationEmitClassInherritsAny.symbols new file mode 100644 index 0000000000000..81b11da2ee0b7 --- /dev/null +++ b/tests/baselines/reference/declarationEmitClassInherritsAny.symbols @@ -0,0 +1,10 @@ +//// [tests/cases/compiler/declarationEmitClassInherritsAny.ts] //// + +=== declarationEmitClassInherritsAny.ts === +const anyThing = class {} as any; +>anyThing : Symbol(anyThing, Decl(declarationEmitClassInherritsAny.ts, 0, 5)) + +export class Foo extends anyThing {} +>Foo : Symbol(Foo, Decl(declarationEmitClassInherritsAny.ts, 0, 33)) +>anyThing : Symbol(anyThing, Decl(declarationEmitClassInherritsAny.ts, 0, 5)) + diff --git a/tests/baselines/reference/declarationEmitClassInherritsAny.types b/tests/baselines/reference/declarationEmitClassInherritsAny.types new file mode 100644 index 0000000000000..39d65e433f824 --- /dev/null +++ b/tests/baselines/reference/declarationEmitClassInherritsAny.types @@ -0,0 +1,14 @@ +//// [tests/cases/compiler/declarationEmitClassInherritsAny.ts] //// + +=== declarationEmitClassInherritsAny.ts === +const anyThing = class {} as any; +>anyThing : any +>class {} as any : any +>class {} : typeof (Anonymous class) +> : ^^^^^^^^^^^^^^^^^^^^^^^^ + +export class Foo extends anyThing {} +>Foo : Foo +> : ^^^ +>anyThing : any + diff --git a/tests/cases/compiler/declarationEmitClassInherritsAny.ts b/tests/cases/compiler/declarationEmitClassInherritsAny.ts new file mode 100644 index 0000000000000..7749e21320c14 --- /dev/null +++ b/tests/cases/compiler/declarationEmitClassInherritsAny.ts @@ -0,0 +1,3 @@ +// @declaration: true +const anyThing = class {} as any; +export class Foo extends anyThing {} \ No newline at end of file From 9ba364c55a5c5cc378e89bf0de9559398926c0d3 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Tue, 17 Dec 2024 09:27:11 -0800 Subject: [PATCH 10/15] Fix coverage build on release-5.7 (#60792) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b30351dc24db6..27cd506fd6514 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: runs-on: - 'self-hosted' - '1ES.Pool=TypeScript-1ES-GitHub-Large' - - '1ES.ImageOverride=ubuntu-22.04' + - '1ES.ImageOverride=mariner-2.0' permissions: id-token: write From e167412fe07905b6324bf5f36a918c28050ebfac Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Tue, 17 Dec 2024 13:35:46 -0800 Subject: [PATCH 11/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60794=20(Hard?= =?UTF-8?q?en=20`sanitizeLog`=20against=20incorr...)=20into=20release-5.7?= =?UTF-8?q?=20(#60798)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Rosenwasser Co-authored-by: Andrew Branch --- src/harness/tsserverLogger.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/harness/tsserverLogger.ts b/src/harness/tsserverLogger.ts index 1ac20125b8df0..5eceaff711711 100644 --- a/src/harness/tsserverLogger.ts +++ b/src/harness/tsserverLogger.ts @@ -111,7 +111,7 @@ export function sanitizeLog(s: string): string { s = s.replace(/Elapsed::?\s*\d+(?:\.\d+)?ms/g, "Elapsed:: *ms"); s = s.replace(/"updateGraphDurationMs":\s*\d+(?:\.\d+)?/g, `"updateGraphDurationMs": *`); s = s.replace(/"createAutoImportProviderProgramDurationMs":\s*\d+(?:\.\d+)?/g, `"createAutoImportProviderProgramDurationMs": *`); - s = replaceAll(s, ts.version, "FakeVersion"); + s = s.replace(new RegExp(`\\b${ts.regExpEscape(ts.version)}\\b`, "g"), "FakeVersion"); s = s.replace(/getCompletionData: Get current token: \d+(?:\.\d+)?/g, `getCompletionData: Get current token: *`); s = s.replace(/getCompletionData: Is inside comment: \d+(?:\.\d+)?/g, `getCompletionData: Is inside comment: *`); s = s.replace(/getCompletionData: Get previous token: \d+(?:\.\d+)?/g, `getCompletionData: Get previous token: *`); @@ -130,7 +130,8 @@ export function sanitizeLog(s: string): string { s = s.replace(/"semanticDiag":\s*\d+(?:.\d+)?/g, `"semanticDiag": *`); s = s.replace(/"suggestionDiag":\s*\d+(?:.\d+)?/g, `"suggestionDiag": *`); s = s.replace(/"regionSemanticDiag":\s*\d+(?:.\d+)?/g, `"regionSemanticDiag": *`); - s = replaceAll(s, `@ts${ts.versionMajorMinor}`, `@tsFakeMajor.Minor`); + s = s.replace(new RegExp(`\\b@ts${ts.regExpEscape(ts.versionMajorMinor)}\\b`, "g"), `@tsFakeMajor.Minor`); + s = sanitizeHarnessLSException(s); return s; } From 9df7c36aa960086a403bb83c5a4fafaf5871acf6 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Tue, 17 Dec 2024 21:49:53 +0000 Subject: [PATCH 12/15] Bump version to 5.7.3 and LKG --- lib/_tsc.js | 55 +++++++++++++++++++++++--------------- lib/typescript.js | 55 +++++++++++++++++++++++--------------- package-lock.json | 4 +-- package.json | 2 +- src/compiler/corePublic.ts | 2 +- 5 files changed, 72 insertions(+), 46 deletions(-) diff --git a/lib/_tsc.js b/lib/_tsc.js index 3bcdbf7ae59ec..ffb38a01be4fa 100644 --- a/lib/_tsc.js +++ b/lib/_tsc.js @@ -18,7 +18,7 @@ and limitations under the License. // src/compiler/corePublic.ts var versionMajorMinor = "5.7"; -var version = "5.7.2"; +var version = "5.7.3"; // src/compiler/core.ts var emptyArray = []; @@ -11143,6 +11143,7 @@ function sortAndDeduplicateDiagnostics(diagnostics) { } var targetToLibMap = /* @__PURE__ */ new Map([ [99 /* ESNext */, "lib.esnext.full.d.ts"], + [11 /* ES2024 */, "lib.es2024.full.d.ts"], [10 /* ES2023 */, "lib.es2023.full.d.ts"], [9 /* ES2022 */, "lib.es2022.full.d.ts"], [8 /* ES2021 */, "lib.es2021.full.d.ts"], @@ -11158,6 +11159,7 @@ function getDefaultLibFileName(options) { const target = getEmitScriptTarget(options); switch (target) { case 99 /* ESNext */: + case 11 /* ES2024 */: case 10 /* ES2023 */: case 9 /* ES2022 */: case 8 /* ES2021 */: @@ -46776,6 +46778,12 @@ function createTypeChecker(host) { /*isReadonly*/ true ); + var anyBaseTypeIndexInfo = createIndexInfo( + stringType, + anyType, + /*isReadonly*/ + false + ); var iterationTypesCache = /* @__PURE__ */ new Map(); var noIterationTypes = { get yieldType() { @@ -56577,12 +56585,7 @@ function createTypeChecker(host) { addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType)); callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */)); constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */)); - const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [createIndexInfo( - stringType, - anyType, - /*isReadonly*/ - false - )]; + const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [anyBaseTypeIndexInfo]; indexInfos = concatenate(indexInfos, filter(inheritedIndexInfos, (info) => !findIndexInfo(indexInfos, info.keyType))); } } @@ -57108,12 +57111,7 @@ function createTypeChecker(host) { members = createSymbolTable(getNamedOrIndexSignatureMembers(members)); addInheritedMembers(members, getPropertiesOfType(baseConstructorType)); } else if (baseConstructorType === anyType) { - baseConstructorIndexInfo = createIndexInfo( - stringType, - anyType, - /*isReadonly*/ - false - ); + baseConstructorIndexInfo = anyBaseTypeIndexInfo; } } const indexSymbol = getIndexSymbolFromSymbolTable(members); @@ -70460,12 +70458,13 @@ function createTypeChecker(host) { const jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found : void 0; const jsxFactoryNamespace = getJsxNamespace(node); const jsxFactoryLocation = isJsxOpeningLikeElement(node) ? node.tagName : node; + const shouldFactoryRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */; let jsxFactorySym; if (!(isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) { jsxFactorySym = resolveName( jsxFactoryLocation, jsxFactoryNamespace, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, jsxFactoryRefErr, /*isUse*/ true @@ -70484,7 +70483,7 @@ function createTypeChecker(host) { resolveName( jsxFactoryLocation, localJsxNamespace, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, jsxFactoryRefErr, /*isUse*/ true @@ -74045,6 +74044,13 @@ function createTypeChecker(host) { return getIntersectionType(x); } function reportNonexistentProperty(propNode, containingType, isUncheckedJS) { + const links = getNodeLinks(propNode); + const cache = links.nonExistentPropCheckCache || (links.nonExistentPropCheckCache = /* @__PURE__ */ new Set()); + const key = `${getTypeId(containingType)}|${isUncheckedJS}`; + if (cache.has(key)) { + return; + } + cache.add(key); let errorInfo; let relatedInfo; if (!isPrivateIdentifier(propNode) && containingType.flags & 1048576 /* Union */ && !(containingType.flags & 402784252 /* Primitive */)) { @@ -76003,12 +76009,14 @@ function createTypeChecker(host) { const sourceFileLinks = getNodeLinks(getSourceFileOfNode(node)); if (sourceFileLinks.jsxFragmentType !== void 0) return sourceFileLinks.jsxFragmentType; const jsxFragmentFactoryName = getJsxNamespace(node); - if (jsxFragmentFactoryName === "null") return sourceFileLinks.jsxFragmentType = anyType; + const shouldResolveFactoryReference = (compilerOptions.jsx === 2 /* React */ || compilerOptions.jsxFragmentFactory !== void 0) && jsxFragmentFactoryName !== "null"; + if (!shouldResolveFactoryReference) return sourceFileLinks.jsxFragmentType = anyType; + const shouldModuleRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */; const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : void 0; const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? resolveName( node, jsxFragmentFactoryName, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldModuleRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, /*nameNotFoundMessage*/ jsxFactoryRefErr, /*isUse*/ @@ -78574,7 +78582,9 @@ function createTypeChecker(host) { switch (node.kind) { case 223 /* AwaitExpression */: case 213 /* CallExpression */: + case 215 /* TaggedTemplateExpression */: case 212 /* ElementAccessExpression */: + case 236 /* MetaProperty */: case 214 /* NewExpression */: case 211 /* PropertyAccessExpression */: case 229 /* YieldExpression */: @@ -78590,6 +78600,8 @@ function createTypeChecker(host) { case 56 /* AmpersandAmpersandToken */: case 77 /* AmpersandAmpersandEqualsToken */: return 3 /* Sometimes */; + case 28 /* CommaToken */: + return getSyntacticNullishnessSemantics(node.right); } return 2 /* Never */; case 227 /* ConditionalExpression */: @@ -84702,7 +84714,7 @@ function createTypeChecker(host) { } } } - if (isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { + if (!importClause.isTypeOnly && moduleKind === 199 /* NodeNext */ && isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { error(node.moduleSpecifier, Diagnostics.Importing_a_JSON_file_into_an_ECMAScript_module_requires_a_type_Colon_json_import_attribute_when_module_is_set_to_0, ModuleKind[moduleKind]); } } else if (noUncheckedSideEffectImports && !importClause) { @@ -86986,6 +86998,7 @@ function createTypeChecker(host) { result || (result = []); for (const info of infoList) { if (info.declaration) continue; + if (info === anyBaseTypeIndexInfo) continue; const node = nodeBuilder.indexInfoToIndexSignatureDeclaration(info, enclosing, flags, internalFlags, tracker); if (node && infoList === staticInfos) { (node.modifiers || (node.modifiers = factory.createNodeArray())).unshift(factory.createModifier(126 /* StaticKeyword */)); @@ -131703,9 +131716,9 @@ function createSyntacticTypeNodeBuilder(options, resolver) { } if (!result && node.kind === 303 /* PropertyAssignment */) { const initializer = node.initializer; - const type = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : initializer.kind === 234 /* AsExpression */ || initializer.kind === 216 /* TypeAssertionExpression */ ? initializer.type : void 0; - if (type && !isConstTypeReference(type)) { - result = serializeExistingTypeNode(type, context); + const assertionNode = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : initializer.kind === 234 /* AsExpression */ || initializer.kind === 216 /* TypeAssertionExpression */ ? initializer.type : void 0; + if (assertionNode && !isConstTypeReference(assertionNode) && resolver.canReuseTypeNodeAnnotation(context, node, assertionNode, symbol)) { + result = serializeExistingTypeNode(assertionNode, context); } } return result ?? inferTypeOfDeclaration( diff --git a/lib/typescript.js b/lib/typescript.js index 33387eadeb847..23672a730afdc 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -2278,7 +2278,7 @@ module.exports = __toCommonJS(typescript_exports); // src/compiler/corePublic.ts var versionMajorMinor = "5.7"; -var version = "5.7.2"; +var version = "5.7.3"; var Comparison = /* @__PURE__ */ ((Comparison3) => { Comparison3[Comparison3["LessThan"] = -1] = "LessThan"; Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo"; @@ -14547,6 +14547,7 @@ function sortAndDeduplicateDiagnostics(diagnostics) { } var targetToLibMap = /* @__PURE__ */ new Map([ [99 /* ESNext */, "lib.esnext.full.d.ts"], + [11 /* ES2024 */, "lib.es2024.full.d.ts"], [10 /* ES2023 */, "lib.es2023.full.d.ts"], [9 /* ES2022 */, "lib.es2022.full.d.ts"], [8 /* ES2021 */, "lib.es2021.full.d.ts"], @@ -14562,6 +14563,7 @@ function getDefaultLibFileName(options) { const target = getEmitScriptTarget(options); switch (target) { case 99 /* ESNext */: + case 11 /* ES2024 */: case 10 /* ES2023 */: case 9 /* ES2022 */: case 8 /* ES2021 */: @@ -51379,6 +51381,12 @@ function createTypeChecker(host) { /*isReadonly*/ true ); + var anyBaseTypeIndexInfo = createIndexInfo( + stringType, + anyType, + /*isReadonly*/ + false + ); var iterationTypesCache = /* @__PURE__ */ new Map(); var noIterationTypes = { get yieldType() { @@ -61180,12 +61188,7 @@ function createTypeChecker(host) { addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType)); callSignatures = concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */)); constructSignatures = concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */)); - const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [createIndexInfo( - stringType, - anyType, - /*isReadonly*/ - false - )]; + const inheritedIndexInfos = instantiatedBaseType !== anyType ? getIndexInfosOfType(instantiatedBaseType) : [anyBaseTypeIndexInfo]; indexInfos = concatenate(indexInfos, filter(inheritedIndexInfos, (info) => !findIndexInfo(indexInfos, info.keyType))); } } @@ -61711,12 +61714,7 @@ function createTypeChecker(host) { members = createSymbolTable(getNamedOrIndexSignatureMembers(members)); addInheritedMembers(members, getPropertiesOfType(baseConstructorType)); } else if (baseConstructorType === anyType) { - baseConstructorIndexInfo = createIndexInfo( - stringType, - anyType, - /*isReadonly*/ - false - ); + baseConstructorIndexInfo = anyBaseTypeIndexInfo; } } const indexSymbol = getIndexSymbolFromSymbolTable(members); @@ -75063,12 +75061,13 @@ function createTypeChecker(host) { const jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? Diagnostics.This_JSX_tag_requires_0_to_be_in_scope_but_it_could_not_be_found : void 0; const jsxFactoryNamespace = getJsxNamespace(node); const jsxFactoryLocation = isJsxOpeningLikeElement(node) ? node.tagName : node; + const shouldFactoryRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */; let jsxFactorySym; if (!(isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) { jsxFactorySym = resolveName( jsxFactoryLocation, jsxFactoryNamespace, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, jsxFactoryRefErr, /*isUse*/ true @@ -75087,7 +75086,7 @@ function createTypeChecker(host) { resolveName( jsxFactoryLocation, localJsxNamespace, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldFactoryRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, jsxFactoryRefErr, /*isUse*/ true @@ -78648,6 +78647,13 @@ function createTypeChecker(host) { return getIntersectionType(x); } function reportNonexistentProperty(propNode, containingType, isUncheckedJS) { + const links = getNodeLinks(propNode); + const cache = links.nonExistentPropCheckCache || (links.nonExistentPropCheckCache = /* @__PURE__ */ new Set()); + const key = `${getTypeId(containingType)}|${isUncheckedJS}`; + if (cache.has(key)) { + return; + } + cache.add(key); let errorInfo; let relatedInfo; if (!isPrivateIdentifier(propNode) && containingType.flags & 1048576 /* Union */ && !(containingType.flags & 402784252 /* Primitive */)) { @@ -80606,12 +80612,14 @@ function createTypeChecker(host) { const sourceFileLinks = getNodeLinks(getSourceFileOfNode(node)); if (sourceFileLinks.jsxFragmentType !== void 0) return sourceFileLinks.jsxFragmentType; const jsxFragmentFactoryName = getJsxNamespace(node); - if (jsxFragmentFactoryName === "null") return sourceFileLinks.jsxFragmentType = anyType; + const shouldResolveFactoryReference = (compilerOptions.jsx === 2 /* React */ || compilerOptions.jsxFragmentFactory !== void 0) && jsxFragmentFactoryName !== "null"; + if (!shouldResolveFactoryReference) return sourceFileLinks.jsxFragmentType = anyType; + const shouldModuleRefErr = compilerOptions.jsx !== 1 /* Preserve */ && compilerOptions.jsx !== 3 /* ReactNative */; const jsxFactoryRefErr = diagnostics ? Diagnostics.Using_JSX_fragments_requires_fragment_factory_0_to_be_in_scope_but_it_could_not_be_found : void 0; const jsxFactorySymbol = getJsxNamespaceContainerForImplicitImport(node) ?? resolveName( node, jsxFragmentFactoryName, - compilerOptions.jsx === 1 /* Preserve */ ? 111551 /* Value */ & ~384 /* Enum */ : 111551 /* Value */, + shouldModuleRefErr ? 111551 /* Value */ : 111551 /* Value */ & ~384 /* Enum */, /*nameNotFoundMessage*/ jsxFactoryRefErr, /*isUse*/ @@ -83177,7 +83185,9 @@ function createTypeChecker(host) { switch (node.kind) { case 223 /* AwaitExpression */: case 213 /* CallExpression */: + case 215 /* TaggedTemplateExpression */: case 212 /* ElementAccessExpression */: + case 236 /* MetaProperty */: case 214 /* NewExpression */: case 211 /* PropertyAccessExpression */: case 229 /* YieldExpression */: @@ -83193,6 +83203,8 @@ function createTypeChecker(host) { case 56 /* AmpersandAmpersandToken */: case 77 /* AmpersandAmpersandEqualsToken */: return 3 /* Sometimes */; + case 28 /* CommaToken */: + return getSyntacticNullishnessSemantics(node.right); } return 2 /* Never */; case 227 /* ConditionalExpression */: @@ -89305,7 +89317,7 @@ function createTypeChecker(host) { } } } - if (isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { + if (!importClause.isTypeOnly && moduleKind === 199 /* NodeNext */ && isOnlyImportableAsDefault(node.moduleSpecifier, resolvedModule) && !hasTypeJsonImportAttribute(node)) { error2(node.moduleSpecifier, Diagnostics.Importing_a_JSON_file_into_an_ECMAScript_module_requires_a_type_Colon_json_import_attribute_when_module_is_set_to_0, ModuleKind[moduleKind]); } } else if (noUncheckedSideEffectImports && !importClause) { @@ -91589,6 +91601,7 @@ function createTypeChecker(host) { result || (result = []); for (const info of infoList) { if (info.declaration) continue; + if (info === anyBaseTypeIndexInfo) continue; const node = nodeBuilder.indexInfoToIndexSignatureDeclaration(info, enclosing, flags, internalFlags, tracker); if (node && infoList === staticInfos) { (node.modifiers || (node.modifiers = factory.createNodeArray())).unshift(factory.createModifier(126 /* StaticKeyword */)); @@ -136663,9 +136676,9 @@ function createSyntacticTypeNodeBuilder(options, resolver) { } if (!result && node.kind === 303 /* PropertyAssignment */) { const initializer = node.initializer; - const type = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : initializer.kind === 234 /* AsExpression */ || initializer.kind === 216 /* TypeAssertionExpression */ ? initializer.type : void 0; - if (type && !isConstTypeReference(type)) { - result = serializeExistingTypeNode(type, context); + const assertionNode = isJSDocTypeAssertion(initializer) ? getJSDocTypeAssertionType(initializer) : initializer.kind === 234 /* AsExpression */ || initializer.kind === 216 /* TypeAssertionExpression */ ? initializer.type : void 0; + if (assertionNode && !isConstTypeReference(assertionNode) && resolver.canReuseTypeNodeAnnotation(context, node, assertionNode, symbol)) { + result = serializeExistingTypeNode(assertionNode, context); } } return result ?? inferTypeOfDeclaration( diff --git a/package-lock.json b/package-lock.json index 009efa478a176..abc281de52fde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typescript", - "version": "5.7.2", + "version": "5.7.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "typescript", - "version": "5.7.2", + "version": "5.7.3", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index fbf62429c6cf9..cd9f24a123ea3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "typescript", "author": "Microsoft Corp.", "homepage": "https://www.typescriptlang.org/", - "version": "5.7.2", + "version": "5.7.3", "license": "Apache-2.0", "description": "TypeScript is a language for application scale JavaScript development", "keywords": [ diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts index 7b82bca47e571..d8f6c9c339fee 100644 --- a/src/compiler/corePublic.ts +++ b/src/compiler/corePublic.ts @@ -3,7 +3,7 @@ export const versionMajorMinor = "5.7"; // The following is baselined as a literal template type without intervention /** The version of the TypeScript compiler release */ -export const version = "5.7.2" as string; +export const version = "5.7.3" as string; /** * Type of objects whose values are all of the same type. From 7aa63df74c2cc02dd171771623238dc40f352b7e Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:28:07 -0800 Subject: [PATCH 13/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60393=20(Don'?= =?UTF-8?q?t=20try=20to=20add=20an=20implicit=20undefi...)=20into=20releas?= =?UTF-8?q?e-5.7=20(#60825)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mateusz Burzyński --- src/compiler/checker.ts | 2 +- ...alMappedTypePropertyNoStrictNullChecks1.js | 48 ++++++++++++ ...pedTypePropertyNoStrictNullChecks1.symbols | 63 ++++++++++++++++ ...appedTypePropertyNoStrictNullChecks1.types | 73 +++++++++++++++++++ ...alMappedTypePropertyNoStrictNullChecks2.js | 48 ++++++++++++ ...pedTypePropertyNoStrictNullChecks2.symbols | 63 ++++++++++++++++ ...appedTypePropertyNoStrictNullChecks2.types | 73 +++++++++++++++++++ ...alMappedTypePropertyNoStrictNullChecks3.js | 48 ++++++++++++ ...pedTypePropertyNoStrictNullChecks3.symbols | 63 ++++++++++++++++ ...appedTypePropertyNoStrictNullChecks3.types | 73 +++++++++++++++++++ ...alMappedTypePropertyNoStrictNullChecks4.js | 17 +++++ ...pedTypePropertyNoStrictNullChecks4.symbols | 22 ++++++ ...appedTypePropertyNoStrictNullChecks4.types | 29 ++++++++ ...alMappedTypePropertyNoStrictNullChecks1.ts | 30 ++++++++ ...alMappedTypePropertyNoStrictNullChecks2.ts | 30 ++++++++ ...alMappedTypePropertyNoStrictNullChecks3.ts | 30 ++++++++ ...alMappedTypePropertyNoStrictNullChecks4.ts | 10 +++ 17 files changed, 721 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.js create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.symbols create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.types create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.js create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.symbols create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.types create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.js create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.symbols create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.types create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.js create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.symbols create mode 100644 tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.types create mode 100644 tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts create mode 100644 tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts create mode 100644 tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts create mode 100644 tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index df45bdc1a6008..0ba770c6764e1 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -6249,7 +6249,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker { return true; } if (requiresAddingUndefined && annotationType) { - annotationType = getOptionalType(annotationType, !isParameter(node)); + annotationType = addOptionality(annotationType, !isParameter(node)); } return !!annotationType && typeNodeIsEquivalentToType(node, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type); }, diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.js b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.js new file mode 100644 index 0000000000000..fcd8a982b4615 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.js @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts] //// + +//// [createApi.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: undefined; + }>; +}; + +//// [index.ts] +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; + + + + +//// [createApi.d.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; +export declare function createApi(_: { + endpoints: Definitions; +}): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: undefined; + }>; +}; +export {}; +//// [index.d.ts] +export declare const useTestQuery: () => { + status: "uninitialized"; + originalArgs?: undefined; +}; diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.symbols b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.symbols new file mode 100644 index 0000000000000..085152b6aedec --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.symbols @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts] //// + +=== createApi.ts === +type Id = { +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(createApi.ts, 1, 3)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>K : Symbol(K, Decl(createApi.ts, 1, 3)) + +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : Symbol(createApi, Decl(createApi.ts, 2, 7)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>_ : Symbol(_, Decl(createApi.ts, 4, 47)) +>endpoints : Symbol(endpoints, Decl(createApi.ts, 4, 51)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>Capitalize : Symbol(Capitalize, Decl(lib.es5.d.ts, --, --)) +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) + + status: "uninitialized"; +>status : Symbol(status, Decl(createApi.ts, 5, 77)) + + originalArgs?: undefined; +>originalArgs : Symbol(originalArgs, Decl(createApi.ts, 6, 28)) + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + +const slice = createApi({ +>slice : Symbol(slice, Decl(index.ts, 2, 5)) +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + + endpoints: { +>endpoints : Symbol(endpoints, Decl(index.ts, 2, 25)) + + test: { +>test : Symbol(test, Decl(index.ts, 3, 14)) + + url: `/user`, +>url : Symbol(url, Decl(index.ts, 4, 11)) + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : Symbol(useTestQuery, Decl(index.ts, 10, 14)) +>slice : Symbol(slice, Decl(index.ts, 2, 5)) + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.types b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.types new file mode 100644 index 0000000000000..6037c9c4e7342 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.types @@ -0,0 +1,73 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts] //// + +=== createApi.ts === +type Id = { +>Id : { [K in keyof T]: T[K]; } +> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ + + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ status: "uninitialized"; originalArgs?: undefined; }>; } +> : ^ ^^ ^^ ^^^^^ +>_ : { endpoints: Definitions; } +> : ^^^^^^^^^^^^^ ^^^ +>endpoints : Definitions +> : ^^^^^^^^^^^ + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; +>status : "uninitialized" +> : ^^^^^^^^^^^^^^^ + + originalArgs?: undefined; +>originalArgs : undefined +> : ^^^^^^^^^ + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: undefined; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ + +const slice = createApi({ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: undefined; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi({ endpoints: { test: { url: `/user`, }, },}) : { useTestQuery: () => { status: "uninitialized"; originalArgs?: undefined; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: undefined; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>{ endpoints: { test: { url: `/user`, }, },} : { endpoints: { test: { url: string; }; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + endpoints: { +>endpoints : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>{ test: { url: `/user`, }, } : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + test: { +>test : { url: string; } +> : ^^^^^^^^^^^^^^^^ +>{ url: `/user`, } : { url: string; } +> : ^^^^^^^^^^^^^^^^ + + url: `/user`, +>url : string +> : ^^^^^^ +>`/user` : "/user" +> : ^^^^^^^ + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : () => { status: "uninitialized"; originalArgs?: undefined; } +> : ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: undefined; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.js b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.js new file mode 100644 index 0000000000000..e677e091d747e --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.js @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts] //// + +//// [createApi.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: any[]; + }>; +}; + +//// [index.ts] +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; + + + + +//// [createApi.d.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; +export declare function createApi(_: { + endpoints: Definitions; +}): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: any[]; + }>; +}; +export {}; +//// [index.d.ts] +export declare const useTestQuery: () => { + status: "uninitialized"; + originalArgs?: any[]; +}; diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.symbols b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.symbols new file mode 100644 index 0000000000000..cca1208d49189 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.symbols @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts] //// + +=== createApi.ts === +type Id = { +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(createApi.ts, 1, 3)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>K : Symbol(K, Decl(createApi.ts, 1, 3)) + +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : Symbol(createApi, Decl(createApi.ts, 2, 7)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>_ : Symbol(_, Decl(createApi.ts, 4, 47)) +>endpoints : Symbol(endpoints, Decl(createApi.ts, 4, 51)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>Capitalize : Symbol(Capitalize, Decl(lib.es5.d.ts, --, --)) +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) + + status: "uninitialized"; +>status : Symbol(status, Decl(createApi.ts, 5, 77)) + + originalArgs?: any[]; +>originalArgs : Symbol(originalArgs, Decl(createApi.ts, 6, 28)) + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + +const slice = createApi({ +>slice : Symbol(slice, Decl(index.ts, 2, 5)) +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + + endpoints: { +>endpoints : Symbol(endpoints, Decl(index.ts, 2, 25)) + + test: { +>test : Symbol(test, Decl(index.ts, 3, 14)) + + url: `/user`, +>url : Symbol(url, Decl(index.ts, 4, 11)) + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : Symbol(useTestQuery, Decl(index.ts, 10, 14)) +>slice : Symbol(slice, Decl(index.ts, 2, 5)) + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.types b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.types new file mode 100644 index 0000000000000..c6b38f9716c0a --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.types @@ -0,0 +1,73 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts] //// + +=== createApi.ts === +type Id = { +>Id : { [K in keyof T]: T[K]; } +> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ + + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ status: "uninitialized"; originalArgs?: any[]; }>; } +> : ^ ^^ ^^ ^^^^^ +>_ : { endpoints: Definitions; } +> : ^^^^^^^^^^^^^ ^^^ +>endpoints : Definitions +> : ^^^^^^^^^^^ + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; +>status : "uninitialized" +> : ^^^^^^^^^^^^^^^ + + originalArgs?: any[]; +>originalArgs : any[] +> : ^^^^^ + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: any[]; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ + +const slice = createApi({ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: any[]; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi({ endpoints: { test: { url: `/user`, }, },}) : { useTestQuery: () => { status: "uninitialized"; originalArgs?: any[]; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: any[]; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>{ endpoints: { test: { url: `/user`, }, },} : { endpoints: { test: { url: string; }; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + endpoints: { +>endpoints : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>{ test: { url: `/user`, }, } : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + test: { +>test : { url: string; } +> : ^^^^^^^^^^^^^^^^ +>{ url: `/user`, } : { url: string; } +> : ^^^^^^^^^^^^^^^^ + + url: `/user`, +>url : string +> : ^^^^^^ +>`/user` : "/user" +> : ^^^^^^^ + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : () => { status: "uninitialized"; originalArgs?: any[]; } +> : ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: any[]; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.js b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.js new file mode 100644 index 0000000000000..6e11f34b52877 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.js @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts] //// + +//// [createApi.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: never; + }>; +}; + +//// [index.ts] +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; + + + + +//// [createApi.d.ts] +type Id = { + [K in keyof T]: T[K]; +} & {}; +export declare function createApi(_: { + endpoints: Definitions; +}): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: never; + }>; +}; +export {}; +//// [index.d.ts] +export declare const useTestQuery: () => { + status: "uninitialized"; + originalArgs?: never; +}; diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.symbols b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.symbols new file mode 100644 index 0000000000000..bf7ad1bab1421 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.symbols @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts] //// + +=== createApi.ts === +type Id = { +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) + + [K in keyof T]: T[K]; +>K : Symbol(K, Decl(createApi.ts, 1, 3)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>T : Symbol(T, Decl(createApi.ts, 0, 8)) +>K : Symbol(K, Decl(createApi.ts, 1, 3)) + +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : Symbol(createApi, Decl(createApi.ts, 2, 7)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>_ : Symbol(_, Decl(createApi.ts, 4, 47)) +>endpoints : Symbol(endpoints, Decl(createApi.ts, 4, 51)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Definitions : Symbol(Definitions, Decl(createApi.ts, 4, 34)) +>Capitalize : Symbol(Capitalize, Decl(lib.es5.d.ts, --, --)) +>K : Symbol(K, Decl(createApi.ts, 5, 3)) +>Id : Symbol(Id, Decl(createApi.ts, 0, 0)) + + status: "uninitialized"; +>status : Symbol(status, Decl(createApi.ts, 5, 77)) + + originalArgs?: never; +>originalArgs : Symbol(originalArgs, Decl(createApi.ts, 6, 28)) + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + +const slice = createApi({ +>slice : Symbol(slice, Decl(index.ts, 2, 5)) +>createApi : Symbol(createApi, Decl(index.ts, 0, 8)) + + endpoints: { +>endpoints : Symbol(endpoints, Decl(index.ts, 2, 25)) + + test: { +>test : Symbol(test, Decl(index.ts, 3, 14)) + + url: `/user`, +>url : Symbol(url, Decl(index.ts, 4, 11)) + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : Symbol(useTestQuery, Decl(index.ts, 10, 14)) +>slice : Symbol(slice, Decl(index.ts, 2, 5)) + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.types b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.types new file mode 100644 index 0000000000000..f1bd8df7f79f6 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.types @@ -0,0 +1,73 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts] //// + +=== createApi.ts === +type Id = { +>Id : { [K in keyof T]: T[K]; } +> : ^^^ ^^^^^^^^^^^^^^^^^^^^^ + + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ status: "uninitialized"; originalArgs?: never; }>; } +> : ^ ^^ ^^ ^^^^^ +>_ : { endpoints: Definitions; } +> : ^^^^^^^^^^^^^ ^^^ +>endpoints : Definitions +> : ^^^^^^^^^^^ + + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; +>status : "uninitialized" +> : ^^^^^^^^^^^^^^^ + + originalArgs?: never; +>originalArgs : never +> : ^^^^^ + + }>; +}; + +=== index.ts === +import { createApi } from "./createApi"; +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: never; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ + +const slice = createApi({ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: never; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi({ endpoints: { test: { url: `/user`, }, },}) : { useTestQuery: () => { status: "uninitialized"; originalArgs?: never; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ +>createApi : (_: { endpoints: Definitions; }) => { [K in keyof Definitions as `use${Capitalize}Query`]: () => { status: "uninitialized"; originalArgs?: never; }; } +> : ^ ^^ ^^ ^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>{ endpoints: { test: { url: `/user`, }, },} : { endpoints: { test: { url: string; }; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + endpoints: { +>endpoints : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>{ test: { url: `/user`, }, } : { test: { url: string; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + test: { +>test : { url: string; } +> : ^^^^^^^^^^^^^^^^ +>{ url: `/user`, } : { url: string; } +> : ^^^^^^^^^^^^^^^^ + + url: `/user`, +>url : string +> : ^^^^^^ +>`/user` : "/user" +> : ^^^^^^^ + + }, + }, +}); + +export const { useTestQuery } = slice; +>useTestQuery : () => { status: "uninitialized"; originalArgs?: never; } +> : ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^ +>slice : { useTestQuery: () => { status: "uninitialized"; originalArgs?: never; }; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ ^^^^^^ + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.js b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.js new file mode 100644 index 0000000000000..4f4ef2d3066e1 --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts] //// + +//// [declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts] +type InputType = { enable_member_receipts?: boolean }; +type AsEmptyObject = { [K in keyof T]?: undefined }; + +export const test = { + ...({} as AsEmptyObject), +}; + + + + +//// [declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.d.ts] +export declare const test: { + enable_member_receipts?: undefined; +}; diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.symbols b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.symbols new file mode 100644 index 0000000000000..b032cfac5e39b --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.symbols @@ -0,0 +1,22 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts] //// + +=== declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts === +type InputType = { enable_member_receipts?: boolean }; +>InputType : Symbol(InputType, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 0, 0)) +>enable_member_receipts : Symbol(enable_member_receipts, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 0, 18)) + +type AsEmptyObject = { [K in keyof T]?: undefined }; +>AsEmptyObject : Symbol(AsEmptyObject, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 0, 54)) +>T : Symbol(T, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 1, 19)) +>K : Symbol(K, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 1, 27)) +>T : Symbol(T, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 1, 19)) + +export const test = { +>test : Symbol(test, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 3, 12)) + + ...({} as AsEmptyObject), +>AsEmptyObject : Symbol(AsEmptyObject, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 0, 54)) +>InputType : Symbol(InputType, Decl(declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts, 0, 0)) + +}; + diff --git a/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.types b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.types new file mode 100644 index 0000000000000..9f902fa6dda7f --- /dev/null +++ b/tests/baselines/reference/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.types @@ -0,0 +1,29 @@ +//// [tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts] //// + +=== declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts === +type InputType = { enable_member_receipts?: boolean }; +>InputType : InputType +> : ^^^^^^^^^ +>enable_member_receipts : boolean +> : ^^^^^^^ + +type AsEmptyObject = { [K in keyof T]?: undefined }; +>AsEmptyObject : AsEmptyObject +> : ^^^^^^^^^^^^^^^^ + +export const test = { +>test : { enable_member_receipts?: undefined; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +>{ ...({} as AsEmptyObject),} : { enable_member_receipts?: undefined; } +> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + ...({} as AsEmptyObject), +>({} as AsEmptyObject) : AsEmptyObject +> : ^^^^^^^^^^^^^^^^^^^^^^^^ +>{} as AsEmptyObject : AsEmptyObject +> : ^^^^^^^^^^^^^^^^^^^^^^^^ +>{} : {} +> : ^^ + +}; + diff --git a/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts new file mode 100644 index 0000000000000..8f0f6b5ae9bfb --- /dev/null +++ b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks1.ts @@ -0,0 +1,30 @@ +// @strictNullChecks: false +// @declaration: true +// @emitDeclarationOnly: true + +// @filename: createApi.ts + +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: undefined; + }>; +}; + +// @filename: index.ts + +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; diff --git a/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts new file mode 100644 index 0000000000000..5add666bcbabe --- /dev/null +++ b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks2.ts @@ -0,0 +1,30 @@ +// @strictNullChecks: false +// @declaration: true +// @emitDeclarationOnly: true + +// @filename: createApi.ts + +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: any[]; + }>; +}; + +// @filename: index.ts + +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; diff --git a/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts new file mode 100644 index 0000000000000..b9320bc838046 --- /dev/null +++ b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks3.ts @@ -0,0 +1,30 @@ +// @strictNullChecks: false +// @declaration: true +// @emitDeclarationOnly: true + +// @filename: createApi.ts + +type Id = { + [K in keyof T]: T[K]; +} & {}; + +export declare function createApi(_: { endpoints: Definitions }): { + [K in keyof Definitions as `use${Capitalize}Query`]: () => Id<{ + status: "uninitialized"; + originalArgs?: never; + }>; +}; + +// @filename: index.ts + +import { createApi } from "./createApi"; + +const slice = createApi({ + endpoints: { + test: { + url: `/user`, + }, + }, +}); + +export const { useTestQuery } = slice; diff --git a/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts new file mode 100644 index 0000000000000..170989a6b8d4a --- /dev/null +++ b/tests/cases/compiler/declarationEmitOptionalMappedTypePropertyNoStrictNullChecks4.ts @@ -0,0 +1,10 @@ +// @strictNullChecks: false +// @declaration: true +// @emitDeclarationOnly: true + +type InputType = { enable_member_receipts?: boolean }; +type AsEmptyObject = { [K in keyof T]?: undefined }; + +export const test = { + ...({} as AsEmptyObject), +}; From 8bc02048a2a78d1b8f0e89d8260d76c440fdbc08 Mon Sep 17 00:00:00 2001 From: TypeScript Bot <23042052+typescript-bot@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:48:13 -0800 Subject: [PATCH 14/15] =?UTF-8?q?=F0=9F=A4=96=20Pick=20PR=20#60828=20(Fix?= =?UTF-8?q?=20CodeQL=20configuration,=20releases)=20into=20release-5.7=20(?= =?UTF-8?q?#60923)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com> --- .github/codeql/codeql-configuration.yml | 5 +---- azure-pipelines.release.yml | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/codeql/codeql-configuration.yml b/.github/codeql/codeql-configuration.yml index 5012a8c080e48..dbe5b23a53c56 100644 --- a/.github/codeql/codeql-configuration.yml +++ b/.github/codeql/codeql-configuration.yml @@ -1,8 +1,5 @@ name: CodeQL Configuration -paths: - - src - - scripts - - Herebyfile.mjs paths-ignore: - src/lib + - tests diff --git a/azure-pipelines.release.yml b/azure-pipelines.release.yml index 64e2da5f5b8e8..fdf1415501094 100644 --- a/azure-pipelines.release.yml +++ b/azure-pipelines.release.yml @@ -10,6 +10,9 @@ resources: name: 1ESPipelineTemplates/1ESPipelineTemplates ref: refs/tags/release +variables: + Codeql.InitParameters: '--codescanning-config=$(Build.SourcesDirectory)/.github/codeql/codeql-configuration.yml' + extends: template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: From a5e123d9e0690fcea92878ea8a0a382922009fc9 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Wed, 8 Jan 2025 00:16:22 +0000 Subject: [PATCH 15/15] Update LKG --- lib/_tsc.js | 2 +- lib/typescript.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/_tsc.js b/lib/_tsc.js index ffb38a01be4fa..d1ea13710bd93 100644 --- a/lib/_tsc.js +++ b/lib/_tsc.js @@ -50327,7 +50327,7 @@ function createTypeChecker(host) { return true; } if (requiresAddingUndefined && annotationType) { - annotationType = getOptionalType(annotationType, !isParameter(node)); + annotationType = addOptionality(annotationType, !isParameter(node)); } return !!annotationType && typeNodeIsEquivalentToType(node, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type); } diff --git a/lib/typescript.js b/lib/typescript.js index 23672a730afdc..fa7c62f9a01aa 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -54930,7 +54930,7 @@ function createTypeChecker(host) { return true; } if (requiresAddingUndefined && annotationType) { - annotationType = getOptionalType(annotationType, !isParameter(node)); + annotationType = addOptionality(annotationType, !isParameter(node)); } return !!annotationType && typeNodeIsEquivalentToType(node, type, annotationType) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type); }