Merge pull request #211 from patocallaghan/patoc/class-bugs

Don't append object name when type is already at the end of the filename

Author: gitKrystan

transforms/ember-object/__testfixtures__/-mock-telemetry.json

@@ -41,6 +41,9 @@
   "types/services/basic": {
     "type": "Service"
   },
+  "types/services/some-service": {
+    "type": "Service"
+  },
   "types/pods/foo/controller": {
     "type": "Controller"
   },

transforms/ember-object/__testfixtures__/injecting-service.output.js

@@ -2,7 +2,7 @@ import classic from 'ember-classic-decorator';
 import Service, { service as injectService } from '@ember/service';
 
 @classic
-export default class InjectingServiceService extends Service {
+export default class InjectingService extends Service {
   @injectService()
   something;
 

transforms/ember-object/__testfixtures__/types/services/some-service.input.js

@@ -0,0 +1,3 @@
+import Service from '@ember/service';
+
+export default Service.extend();

transforms/ember-object/__testfixtures__/types/services/some-service.output.js

@@ -0,0 +1,5 @@
+import classic from 'ember-classic-decorator';
+import Service from '@ember/service';
+
+@classic
+export default class SomeService extends Service {}

transforms/helpers/parse-helper.ts

@@ -104,7 +104,10 @@ export function getClassName(
     );
   }
 
-  if (!['Component', 'Helper', 'EmberObject'].includes(type)) {
+  if (
+    !['Component', 'Helper', 'EmberObject'].includes(type) &&
+    !className.endsWith(type)
+  ) {
     className = `${className}${capitalizedType}`;
   }