Cleanup

Author: NullVoxPopuli

packages/@ember/engine/lib/strict-resolver.ts

@@ -1,4 +1,15 @@
-import type { Factory, Resolver } from '@ember/owner';
+import type { Factory, Resolver } from '@ember/-internals/owner';
+
+const KNOWN_EASY_PLURALS = new Set([
+  'adapter',
+  'component',
+  'controller',
+  'model',
+  'modifier',
+  'route',
+  'serializer',
+  'template',
+]);
 
 export class StrictResolver implements Resolver {
   // Ember's router uses this flag to decide whether to auto-generate
@@ -8,16 +19,6 @@ export class StrictResolver implements Resolver {
   moduleBasedResolver = true;
 
   #modules = new Map<string, unknown>();
-  #plurals = new Map<string, string>([
-    ['component', 'components'],
-    ['config', 'config'],
-    ['controller', 'controllers'],
-    ['helper', 'helpers'],
-    ['model', 'models'],
-    ['modifier', 'modifiers'],
-    ['route', 'routes'],
-    ['template', 'templates'],
-  ]);
   original: any;
 
   constructor(modules: Record<string, unknown>) {
@@ -34,12 +35,12 @@ export class StrictResolver implements Resolver {
     return moduleName.replace(fileExtension, '').replace(leadingDotSlash, '');
   }
 
-  /**
-   * We only support plurals for the well known things (for historical reasons)
-   * (see the hard-coded map of plurals in #plurals)
-   */
-  #plural(s: string) {
-    return this.#plurals.get(s) ?? s;
+  #plural(word: string) {
+    if (KNOWN_EASY_PLURALS.has(word)) {
+      return word + 's';
+    }
+
+    return word;
   }
 
   resolve(fullName: string): Factory<object> | object | undefined {

packages/@ember/engine/tests/resolver/basic-test.js

@@ -1,6 +1,8 @@
-import { module, test } from 'qunit';
 import { StrictResolver } from '@ember/engine/lib/strict-resolver';
 
+import * as QUnit from 'qunit';
+const { module, test } = QUnit;
+
 module('StrictResolver', function (hooks) {
   let resolver;
   let modules;
@@ -21,7 +23,6 @@ module('StrictResolver', function (hooks) {
         { fullName: 'component:my-widget', key: './components/my-widget' },
         { fullName: 'modifier:auto-focus', key: './modifiers/auto-focus' },
         { fullName: 'template:application', key: './templates/application' },
-        { fullName: 'view:queue-list', key: './views/queue-list' },
         { fullName: 'route:index', key: './routes/index' },
         { fullName: 'controller:application', key: './controllers/application' },
       ];

packages/@ember/engine/tests/resolver/registry_test.ts

@@ -1,9 +1,11 @@
-import { module, test } from 'qunit';
+import * as QUnit from 'qunit';
 import Application from '@ember/application';
 import Service from '@ember/service';
 import { run } from '@ember/runloop';
 import type ApplicationInstance from '@ember/application/instance';
 
+const { module, test } = QUnit;
+
 module('strict-resolver | Application with modules', function (hooks) {
   let app: Application | undefined;
   let instance: ApplicationInstance | undefined;