Fix duplicate variable declaration

launch-darkly-variation-helper.js

@@ -50,26 +50,19 @@ module.exports = function launchDarklyVariationHelperPlugin({ types: t }) {
 
           let { parent, type } = _findParent(parentCallExpression, t);
 
-          switch (type) {
-            case 'computed-property': {
-              let dependentKey = `${SERVICE_PROPERTY_NAME}.${key}`;
+          let fn = parent;
+          if (type === 'computed-property') {
+            let dependentKey = `${SERVICE_PROPERTY_NAME}.${key}`;
 
-              if (_shouldInjectDependentKey(key, parent, t)) {
-                parent.node.arguments.unshift(t.stringLiteral(dependentKey));
-              }
-
-              let fn = parent.get('arguments').find(a => t.isFunctionExpression(a));
+            if (_shouldInjectDependentKey(key, parent, t)) {
+              parent.node.arguments.unshift(t.stringLiteral(dependentKey));
+            }
 
-              if (fn && !_containsServiceDeclaration(fn, t)) {
-                _insertServiceDeclaration(fn, t);
-              }
+            fn = parent.get('arguments').find(a => t.isFunctionExpression(a));
+          }
 
-              return;
-            }
-            case 'function': {
-              _insertServiceDeclaration(parent, t);
-              return;
-            }
+          if (fn && !_containsServiceDeclaration(fn, t)) {
+            _insertServiceDeclaration(fn, t);
           }
         }
       },

nodetests/launch-darkly-variation-helper-plugin-test.js

@@ -344,6 +344,55 @@ pluginTester({
   ]
 });
 
+pluginTester({
+  plugin,
+  title: 'New new module imports',
+  snapshot: false,
+  filename: __filename,
+  tests: [
+    {
+      title: 'Import computed from @ember/object',
+      code: `
+      import Component from '@ember/component';
+      import { variation } from 'ember-launch-darkly';
+
+      export default Component.extend({
+        boo() {
+          if(variation('bar')) {
+            return null;
+          }
+
+          if(variation('baz')) {
+            return null;
+          }
+        }
+      });
+      `,
+      output: `
+      import { default as launchDarklyService } from 'ember-service/inject';
+      import Component from '@ember/component';
+
+
+      export default Component.extend({
+        launchDarkly: launchDarklyService(),
+
+        boo() {
+          const launchDarkly = this.get('launchDarkly');
+
+          if (launchDarkly.get('bar')) {
+            return null;
+          }
+
+          if (launchDarkly.get('baz')) {
+            return null;
+          }
+        }
+      });
+      `
+    }
+  ]
+});
+
 pluginTester({
   plugin,
   title: 'Code that should not be transformed',