Merge pull request #2540 from johanrd/issue/2030-service-import-order-in-rules

[BUGFIX]: Recognize `import { service }` in order-in-* rules and `no-implicit-injections`

Author: NullVoxPopuli

lib/rules/no-implicit-injections.js

@@ -191,7 +191,9 @@ module.exports = {
       ImportDeclaration(node) {
         if (node.source.value === '@ember/service') {
           serviceInjectImportName =
-            serviceInjectImportName || getImportIdentifier(node, '@ember/service', 'inject');
+            serviceInjectImportName ||
+            getImportIdentifier(node, '@ember/service', 'inject') ||
+            getImportIdentifier(node, '@ember/service', 'service');
         }
       },
 

lib/rules/order-in-components.js

@@ -101,7 +101,9 @@ module.exports = {
         }
         if (node.source.value === '@ember/service') {
           importedInjectName =
-            importedInjectName || getImportIdentifier(node, '@ember/service', 'inject');
+            importedInjectName ||
+            getImportIdentifier(node, '@ember/service', 'inject') ||
+            getImportIdentifier(node, '@ember/service', 'service');
         }
         if (node.source.value === '@ember/object') {
           importedObserverName =

lib/rules/order-in-controllers.js

@@ -73,7 +73,9 @@ module.exports = {
         }
         if (node.source.value === '@ember/service') {
           importedInjectName =
-            importedInjectName || getImportIdentifier(node, '@ember/service', 'inject');
+            importedInjectName ||
+            getImportIdentifier(node, '@ember/service', 'inject') ||
+            getImportIdentifier(node, '@ember/service', 'service');
         }
         if (node.source.value === '@ember/object') {
           importedObserverName =

lib/rules/order-in-models.js

@@ -68,7 +68,9 @@ module.exports = {
         }
         if (node.source.value === '@ember/service') {
           importedInjectName =
-            importedInjectName || getImportIdentifier(node, '@ember/service', 'inject');
+            importedInjectName ||
+            getImportIdentifier(node, '@ember/service', 'inject') ||
+            getImportIdentifier(node, '@ember/service', 'service');
         }
         if (node.source.value === '@ember/object') {
           importedObserverName =

lib/rules/order-in-routes.js

@@ -96,7 +96,9 @@ module.exports = {
         }
         if (node.source.value === '@ember/service') {
           importedInjectName =
-            importedInjectName || getImportIdentifier(node, '@ember/service', 'inject');
+            importedInjectName ||
+            getImportIdentifier(node, '@ember/service', 'inject') ||
+            getImportIdentifier(node, '@ember/service', 'service');
         }
         if (node.source.value === '@ember/object') {
           importedObserverName =

tests/lib/rules/order-in-routes.js

@@ -57,6 +57,14 @@ eslintTester.run('order-in-routes', rule, {
         _customAction2: function() {},
         tSomeTask: task(function* () {})
       });`,
+    `import {service} from '@ember/service';
+      export default Route.extend({
+        currentUser: service(),
+        queryParams: {},
+        customProp: "test",
+        model() {},
+        actions: {},
+      });`,
     `export default Route.extend({
         levelOfHappiness: computed("attitude", "health", () => {
         }),