Skip to content

Fix cross-file merge of assignment decl valueDeclaration #26918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 16, 2018
Merged

Fix cross-file merge of assignment decl valueDeclaration #26918

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e948e6e
Fix cross-file merge of assignment decl valueDeclaration
sandersn Sep 5, 2018
a279c61
Merge branch 'master' into fix-assignment-decl-cross-file-merge
sandersn Sep 14, 2018
a669d97
Update baselines
sandersn Sep 14, 2018
cb9fefe
Add a fix for #27099
sandersn Sep 14, 2018
a6d77fa
Add a separate jsGlobalAugmentations table
sandersn Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ namespace ts {
target.flags |= source.flags;
if (source.valueDeclaration &&
(!target.valueDeclaration ||
isAssignmentDeclaration(target.valueDeclaration) ||
isAssignmentDeclaration(target.valueDeclaration) && !isAssignmentDeclaration(source.valueDeclaration) ||
isEffectiveModuleDeclaration(target.valueDeclaration) && !isEffectiveModuleDeclaration(source.valueDeclaration))) {
// other kinds of value declarations take precedence over modules and assignment declarations
target.valueDeclaration = source.valueDeclaration;
Expand Down Expand Up @@ -923,6 +923,14 @@ namespace ts {
return combined;
}

/** CommonJS is *almost* a module -- no merges -- except that assignment declarations need to merge with globals. */
function mergeCommonJsSymbolTable(target: SymbolTable, source: SymbolTable) {
source.forEach((sourceSymbol, id) => {
if (target.has(id) && sourceSymbol.flags & SymbolFlags.Assignment) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Talking with @weswigham, he pointed out that it would be better to store all the identifier-unbound declarations in a separate per-file commonJSGlobalAugmentations property that gets merged into globals instead of trying to filter here (there are plenty of symbols marked with Assignment that shouldn't necessarily merge with globals).

target.set(id, mergeSymbol(target.get(id)!, sourceSymbol));
}
});
}
function mergeSymbolTable(target: SymbolTable, source: SymbolTable) {
source.forEach((sourceSymbol, id) => {
target.set(id, target.has(id) ? mergeSymbol(target.get(id)!, sourceSymbol) : sourceSymbol);
Expand Down Expand Up @@ -28588,8 +28596,13 @@ namespace ts {
if (file.redirectInfo) {
continue;
}
if (!isExternalOrCommonJsModule(file)) {
mergeSymbolTable(globals, file.locals!);
if (!isExternalModule(file)) {
if(file.commonJsModuleIndicator) {
mergeCommonJsSymbolTable(globals, file.locals!);
}
else {
mergeSymbolTable(globals, file.locals!);
}
}
if (file.patternAmbientModules && file.patternAmbientModules.length) {
patternAmbientModules = concatenate(patternAmbientModules, file.patternAmbientModules);
Expand Down
11 changes: 11 additions & 0 deletions tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
tests/cases/conformance/salsa/bug27099.js(1,1): error TS2322: Type '1' is not assignable to type 'string'.


==== tests/cases/conformance/salsa/bug27099.js (1 errors) ====
window.name = 1;
~~~~~~~~~~~
!!! error TS2322: Type '1' is not assignable to type 'string'.
window.console; // should not have error: Property 'console' does not exist on type 'typeof window'.
module.exports = 'anything';


17 changes: 17 additions & 0 deletions tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
=== tests/cases/conformance/salsa/bug27099.js ===
window.name = 1;
>window.name : Symbol(Window.name, Decl(lib.dom.d.ts, --, --))
>window : Symbol(window, Decl(bug27099.js, 0, 0))
>name : Symbol(Window.name, Decl(lib.dom.d.ts, --, --))

window.console; // should not have error: Property 'console' does not exist on type 'typeof window'.
>window.console : Symbol(WindowConsole.console, Decl(lib.dom.d.ts, --, --))
>window : Symbol(window, Decl(bug27099.js, 0, 0))
>console : Symbol(WindowConsole.console, Decl(lib.dom.d.ts, --, --))

module.exports = 'anything';
>module.exports : Symbol("tests/cases/conformance/salsa/bug27099", Decl(bug27099.js, 0, 0))
>module : Symbol(export=, Decl(bug27099.js, 1, 15))
>exports : Symbol(export=, Decl(bug27099.js, 1, 15))


21 changes: 21 additions & 0 deletions tests/baselines/reference/globalMergeWithCommonJSAssignmentDeclaration.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
=== tests/cases/conformance/salsa/bug27099.js ===
window.name = 1;
>window.name = 1 : 1
>window.name : string
>window : Window
>name : string
>1 : 1

window.console; // should not have error: Property 'console' does not exist on type 'typeof window'.
>window.console : Console
>window : Window
>console : Console

module.exports = 'anything';
>module.exports = 'anything' : string
>module.exports : string
>module : { "tests/cases/conformance/salsa/bug27099": string; }
>exports : string
>'anything' : "anything"


8 changes: 4 additions & 4 deletions tests/baselines/reference/jsContainerMergeJsContainer.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ const a = {};

a.d = function() {};
>a.d = function() {} : { (): void; prototype: {}; }
>a.d : typeof a.d
>a.d : { (): void; prototype: {}; }
>a : typeof a
>d : typeof a.d
>d : { (): void; prototype: {}; }
>function() {} : { (): void; prototype: {}; }

=== tests/cases/conformance/salsa/b.js ===
a.d.prototype = {};
>a.d.prototype = {} : {}
>a.d.prototype : {}
>a.d : typeof a.d
>a.d : { (): void; prototype: {}; }
>a : typeof a
>d : typeof a.d
>d : { (): void; prototype: {}; }
>prototype : {}
>{} : {}

51 changes: 51 additions & 0 deletions tests/baselines/reference/typeFromPropertyAssignment35.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
=== tests/cases/conformance/salsa/bug26877.js ===
/** @param {Emu.D} x */
function ollKorrect(x) {
>ollKorrect : Symbol(ollKorrect, Decl(bug26877.js, 0, 0))
>x : Symbol(x, Decl(bug26877.js, 1, 20))

x._model
>x._model : Symbol(D._model, Decl(bug26877.js, 7, 19))
>x : Symbol(x, Decl(bug26877.js, 1, 20))
>_model : Symbol(D._model, Decl(bug26877.js, 7, 19))

const y = new Emu.D()
>y : Symbol(y, Decl(bug26877.js, 3, 9))
>Emu.D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>Emu : Symbol(Emu, Decl(bug26877.js, 5, 1), Decl(second.js, 0, 3), Decl(second.js, 0, 12))
>D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))

const z = Emu.D._wrapperInstance;
>z : Symbol(z, Decl(bug26877.js, 4, 9))
>Emu.D._wrapperInstance : Symbol(Emu.D._wrapperInstance, Decl(second.js, 0, 12))
>Emu.D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>Emu : Symbol(Emu, Decl(bug26877.js, 5, 1), Decl(second.js, 0, 3), Decl(second.js, 0, 12))
>D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>_wrapperInstance : Symbol(Emu.D._wrapperInstance, Decl(second.js, 0, 12))
}
Emu.D = class {
>Emu.D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>Emu : Symbol(Emu, Decl(bug26877.js, 5, 1), Decl(second.js, 0, 3), Decl(second.js, 0, 12))
>D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))

constructor() {
this._model = 1
>this._model : Symbol(D._model, Decl(bug26877.js, 7, 19))
>this : Symbol(D, Decl(bug26877.js, 6, 7))
>_model : Symbol(D._model, Decl(bug26877.js, 7, 19))
}
}

=== tests/cases/conformance/salsa/second.js ===
var Emu = {}
>Emu : Symbol(Emu, Decl(bug26877.js, 5, 1), Decl(second.js, 0, 3), Decl(second.js, 0, 12))

/** @type {string} */
Emu.D._wrapperInstance;
>Emu.D._wrapperInstance : Symbol(Emu.D._wrapperInstance, Decl(second.js, 0, 12))
>Emu.D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>Emu : Symbol(Emu, Decl(bug26877.js, 5, 1), Decl(second.js, 0, 3), Decl(second.js, 0, 12))
>D : Symbol(Emu.D, Decl(bug26877.js, 5, 1), Decl(second.js, 2, 4))
>_wrapperInstance : Symbol(Emu.D._wrapperInstance, Decl(second.js, 0, 12))


57 changes: 57 additions & 0 deletions tests/baselines/reference/typeFromPropertyAssignment35.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
=== tests/cases/conformance/salsa/bug26877.js ===
/** @param {Emu.D} x */
function ollKorrect(x) {
>ollKorrect : (x: D) => void
>x : D

x._model
>x._model : number
>x : D
>_model : number

const y = new Emu.D()
>y : D
>new Emu.D() : D
>Emu.D : typeof D
>Emu : typeof Emu
>D : typeof D

const z = Emu.D._wrapperInstance;
>z : string
>Emu.D._wrapperInstance : string
>Emu.D : typeof D
>Emu : typeof Emu
>D : typeof D
>_wrapperInstance : string
}
Emu.D = class {
>Emu.D = class { constructor() { this._model = 1 }} : typeof D
>Emu.D : typeof D
>Emu : typeof Emu
>D : typeof D
>class { constructor() { this._model = 1 }} : typeof D

constructor() {
this._model = 1
>this._model = 1 : 1
>this._model : number
>this : this
>_model : number
>1 : 1
}
}

=== tests/cases/conformance/salsa/second.js ===
var Emu = {}
>Emu : typeof Emu
>{} : {}

/** @type {string} */
Emu.D._wrapperInstance;
>Emu.D._wrapperInstance : string
>Emu.D : typeof D
>Emu : typeof Emu
>D : typeof D
>_wrapperInstance : string


8 changes: 8 additions & 0 deletions tests/cases/conformance/salsa/globalMergeWithCommonJSAssignmentDeclaration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @noEmit: true
// @allowJs: true
// @checkJs: true
// @Filename: bug27099.js
window.name = 1;
window.console; // should not have error: Property 'console' does not exist on type 'typeof window'.
module.exports = 'anything';

22 changes: 22 additions & 0 deletions tests/cases/conformance/salsa/typeFromPropertyAssignment35.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// @noEmit: true
// @allowJs: true
// @checkJs: true

// @Filename: bug26877.js
/** @param {Emu.D} x */
function ollKorrect(x) {
x._model
const y = new Emu.D()
const z = Emu.D._wrapperInstance;
}
Emu.D = class {
constructor() {
this._model = 1
}
}

// @Filename: second.js
var Emu = {}
/** @type {string} */
Emu.D._wrapperInstance;