Skip to content

Do not emit extra var decls for merged enums/namespaces#11286

Merged
rbuckton merged 2 commits into
masterfrom
noEmitExtraVars
Sep 30, 2016
Merged

Do not emit extra var decls for merged enums/namespaces#11286
rbuckton merged 2 commits into
masterfrom
noEmitExtraVars

Conversation

@rbuckton
Copy link
Copy Markdown
Contributor

@rbuckton rbuckton commented Sep 30, 2016

This change removes the unnecessary extra var declarations when we merge enums or namespaces with preceding declarations. This also helps to avoid the extra export var declarations in #11258.

Given the following source:

// @module: es6
// @target: es5
export class C { }
export namespace C {
  export const x = 1;
}

enum E { x = 0 }
enum E { y = 1 }

Previously we would emit:

export var C = (function () { 
  function C() {
  }
  return C;
})();
export var C;
(function (C) {
  C.x = 1;
})(C || (C = {}));
var E;
(function (E) {
  E[E["x"] = 0] = "x";
})(E || (E = {}));
var E;
(function (E) {
  E[E["y"] = 1] = "y";
})(E || (E = {}));

With this change we now emit:

export var C = (function () { 
  function C() {
  }
  return C;
})();
(function (C) {
  C.x = 1;
})(C || (C = {}));
var E;
(function (E) {
  E[E["x"] = 0] = "x";
})(E || (E = {}));
(function (E) {
  E[E["y"] = 1] = "y";
})(E || (E = {}));

Fixes #11258

@mhegazy
Copy link
Copy Markdown
Contributor

mhegazy commented Sep 30, 2016

Fixes #5553

@mhegazy mhegazy mentioned this pull request Sep 30, 2016
Open
@rbuckton rbuckton merged commit c302893 into master Sep 30, 2016
@rbuckton rbuckton deleted the noEmitExtraVars branch September 30, 2016 22:10
@mihailik
Copy link
Copy Markdown
Contributor

mihailik commented Oct 3, 2016

Does it 'merges' var declarations in case of outFile emit?

@rbuckton
Copy link
Copy Markdown
Contributor Author

rbuckton commented Oct 3, 2016

No, it will not remove var declarations for namespaces or enums merged across files when emitting to a single file, just from within a single source file.

@microsoft microsoft locked and limited conversation to collaborators Jun 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@mhegazy mhegazy mhegazy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rbuckton @mhegazy @mihailik @msftclas