Merge pull request #21326 from NullVoxPopuli-ai-agent/strict-resolver-review-cleanup

Address review: drop cache, simplify pluralize, collapse setup-resolver

Author: NullVoxPopuli

package.json

@@ -230,8 +230,6 @@
       "@ember/engine/instance.js": "ember-source/@ember/engine/instance.js",
       "@ember/engine/lib/engine-parent.js": "ember-source/@ember/engine/lib/engine-parent.js",
       "@ember/engine/lib/strict-resolver.js": "ember-source/@ember/engine/lib/strict-resolver.js",
-      "@ember/engine/lib/strict-resolver/cache.js": "ember-source/@ember/engine/lib/strict-resolver/cache.js",
-      "@ember/engine/lib/strict-resolver/string.js": "ember-source/@ember/engine/lib/strict-resolver/string.js",
       "@ember/engine/parent.js": "ember-source/@ember/engine/parent.js",
       "@ember/enumerable/index.js": "ember-source/@ember/enumerable/index.js",
       "@ember/enumerable/mutable.js": "ember-source/@ember/enumerable/mutable.js",

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

@@ -1,5 +1,4 @@
 import type { Factory, Resolver } from '@ember/owner';
-import { dasherize } from './strict-resolver/string';
 
 export class StrictResolver implements Resolver {
   // Ember's router uses this flag to decide whether to auto-generate
@@ -36,7 +35,7 @@ export class StrictResolver implements Resolver {
   }
 
   #plural(s: string) {
-    return this.#plurals.get(s) ?? pluralize(s);
+    return this.#plurals.get(s) ?? s + 's';
   }
 
   resolve(fullName: string): Factory<object> | object | undefined {
@@ -128,38 +127,14 @@ export class StrictResolver implements Resolver {
   }
 }
 
-// Handle the common irregular English plurals plus the standard -s / -es
-// suffix rules. Users can override any type via the `plurals` constructor
-// option (including overriding these defaults).
-const IRREGULAR_PLURALS: Record<string, string> = Object.freeze({
-  child: 'children',
-  man: 'men',
-  woman: 'women',
-  person: 'people',
-  mouse: 'mice',
-  tooth: 'teeth',
-  foot: 'feet',
-});
-
-const NEEDS_ES_SUFFIX = /(s|ss|sh|ch|x|z)$/;
-const ENDS_IN_CONSONANT_Y = /([^aeiou])y$/;
-
-function pluralize(singular: string): string {
-  let irregular = IRREGULAR_PLURALS[singular];
-  if (irregular) {
-    return irregular;
-  }
-  if (ENDS_IN_CONSONANT_Y.test(singular)) {
-    return singular.replace(ENDS_IN_CONSONANT_Y, '$1ies');
-  }
-  if (NEEDS_ES_SUFFIX.test(singular)) {
-    return singular + 'es';
-  }
-  return singular + 's';
-}
-
 const fileExtension = /\.\w{1,4}$/;
 const leadingDotSlash = /^\.\//;
+const camelCaseBoundary = /([a-z\d])([A-Z])/g;
+const spacesAndUnderscores = /[ _]/g;
+
+function dasherize(str: string): string {
+  return str.replace(camelCaseBoundary, '$1_$2').toLowerCase().replace(spacesAndUnderscores, '-');
+}
 
 type Result =
   | {

packages/@ember/engine/lib/strict-resolver/cache.js

@@ -1,13 +1,13 @@
 import { module, test } from 'qunit';
 import { StrictResolver } from '@ember/engine/lib/strict-resolver';
-import { setupResolver } from './-setup-resolver';
 
 module('strict-resolver | basic', function (hooks) {
   let resolver;
   let modules;
 
   hooks.beforeEach(function () {
-    ({ resolver, modules } = setupResolver());
+    modules = {};
+    resolver = new StrictResolver(modules);
   });
 
   test('can lookup something', function (assert) {
@@ -356,49 +356,11 @@ module('strict-resolver | basic', function (hooks) {
     assert.strictEqual(result, 'whatever', 'super-duper-config/environment is found');
   });
 
-  test('default plural handles -s / -ss / -sh / -ch / -x / -z suffixes', function (assert) {
-    let cases = {
-      './buses/red': 'bus:red',
-      './brushes/broom': 'brush:broom',
-      './benches/park': 'bench:park',
-      './boxes/cardboard': 'box:cardboard',
-      './buzzes/loud': 'buzz:loud',
-      './classes/math': 'class:math',
-    };
-
-    for (let [modulePath, lookup] of Object.entries(cases)) {
-      let r = new StrictResolver({ [modulePath]: modulePath });
-      assert.strictEqual(r.resolve(lookup), modulePath, `${lookup} -> ${modulePath}`);
-    }
-  });
-
-  test('default plural handles consonant + y suffix (y -> ies)', function (assert) {
-    let r = new StrictResolver({ './categories/widgets': 'widgets-cat' });
-
-    assert.strictEqual(r.resolve('category:widgets'), 'widgets-cat');
-  });
-
-  test('default plural handles common irregular nouns', function (assert) {
-    let cases = {
-      './children/alice': 'child:alice',
-      './people/bob': 'person:bob',
-      './men/carl': 'man:carl',
-      './women/dana': 'woman:dana',
-      './mice/squeaky': 'mouse:squeaky',
-      './teeth/molar': 'tooth:molar',
-      './feet/left': 'foot:left',
-    };
-
-    for (let [modulePath, lookup] of Object.entries(cases)) {
-      let r = new StrictResolver({ [modulePath]: modulePath });
-      assert.strictEqual(r.resolve(lookup), modulePath, `${lookup} -> ${modulePath}`);
-    }
-  });
-
-  test('custom plural overrides irregular default', function (assert) {
-    // a user who insists on "childs" should be able to opt out of the
-    // built-in irregular plural
-    let r = new StrictResolver({ './childs/alice': 'alice' }, { child: 'childs' });
+  test('irregular plurals must be opted into via the plurals option', function (assert) {
+    // Default pluralization is naive (type + 's'), matching ember-resolver's
+    // behavior. A consumer that wants proper English irregulars registers
+    // them up-front via the plurals map.
+    let r = new StrictResolver({ './children/alice': 'alice' }, { child: 'children' });
 
     assert.strictEqual(r.resolve('child:alice'), 'alice');
   });

packages/@ember/engine/lib/strict-resolver/string.js

@@ -21,6 +21,34 @@ function embroiderWebpack(project: Project) {
 
 function embroiderVite(project: Project) {}
 
+// Swap the v2-app-template's default app.js for a strict-resolver variant:
+// no ember-resolver, no compatModules, no modulePrefix — just a `modules =
+// {...import.meta.glob(...)}` literal. Making this a variant of
+// v2AppScenarios means every test that runs against v2AppScenarios also
+// runs against this configuration.
+function strictResolver(project: Project) {
+  project.mergeFiles({
+    app: {
+      'app.js': `
+        import Application from '@ember/application';
+        import Router from './router';
+
+        export default class App extends Application {
+          modules = {
+            './router': { default: Router },
+            ...import.meta.glob('./services/**/*.{js,ts}', { eager: true }),
+            ...import.meta.glob('./controllers/**/*.{js,ts}', { eager: true }),
+            ...import.meta.glob('./routes/**/*.{js,ts}', { eager: true }),
+            ...import.meta.glob('./components/**/*.{gjs,gts,js,ts}', { eager: true }),
+            ...import.meta.glob('./helpers/**/*.{js,ts}', { eager: true }),
+            ...import.meta.glob('./templates/**/*.{hbs,gjs,gts}', { eager: true }),
+          };
+        }
+      `,
+    },
+  });
+}
+
 export const v1AppScenarios = Scenarios.fromProject(() =>
   Project.fromDir(dirname(require.resolve('../app-template/package.json')), { linkDevDeps: true })
 ).expand({
@@ -36,8 +64,6 @@ export const v2AppScenarios = Scenarios.fromProject(() =>
   embroiderVite,
 });
 
-function strictResolver(project: Project) {}
-
 export const strictAppScenarios = Scenarios.fromProject(() =>
   Project.fromDir(dirname(require.resolve('../v2-app-template/package.json')), {
     linkDevDeps: true,