Skip to content

Commit 4f860d4

Browse files
authored
Merge pull request #18 from ssutar/import_local_name
Fix bug of having duplicate local specifier name
2 parents 7890314 + 6364447 commit 4f860d4

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

transforms/ember-object/__testfixtures__/decorators.output.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { sum as add, alias } from "@ember-decorators/object/computed";
22
import { get, set } from "@ember/object";
33
import { computed, observes as watcher } from "@ember-decorators/object";
4-
import { controller as controller } from "@ember-decorators/controller";
5-
import { service as service } from "@ember-decorators/service";
4+
import { controller } from "@ember-decorators/controller";
5+
import { service } from "@ember-decorators/service";
66
import { on } from "@ember-decorators/object/evented";
77
import layout from "components/templates/foo";
88

transforms/helpers/parse-helper.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,16 @@ function isSpecifierDecorator(specifier, importPropDecoratorMap) {
133133
* @returns {ImportSpecifier}
134134
*/
135135
function setSpecifierProps(specifier, importPropDecoratorMap) {
136-
const importedName = get(specifier, "imported.name");
137-
if (importPropDecoratorMap) {
138-
specifier.imported.name = importPropDecoratorMap[importedName];
139-
}
140-
if (importedName === get(specifier, "local.name")) {
141-
specifier.local = null;
136+
const decoratorImportedName = get(
137+
importPropDecoratorMap,
138+
get(specifier, "imported.name")
139+
);
140+
if (decoratorImportedName) {
141+
specifier.imported.name = decoratorImportedName;
142+
143+
if (decoratorImportedName === get(specifier, "local.name")) {
144+
specifier.local = null;
145+
}
142146
}
143147
return specifier;
144148
}

0 commit comments

Comments
 (0)