Merge pull request #20406 from emberjs/goodbye-autolocation

[CLEANUP] Remove deprecated auto-location
emberjs · Mar 20, 2023 · 76e069a · 76e069a
2 parents 0ea4b81 + 72bf784
commit 76e069a
Show file tree

Hide file tree

Showing 29 changed files with 205 additions and 1,183 deletions.
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
@@ -72,19 +72,28 @@ export type FullName<
   @private
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DIRegistry extends Record<string, Record<string, unknown>> {}
+export interface DIRegistry {}
 
 // Convenience utility for pulling a specific factory manager off `DIRegistry`
 // if one exists, or falling back to the default definition otherwise.
 /**
   @private
  */
-type ResolveFactoryManager<
-  Type extends string,
-  Name extends string
-> = DIRegistry[Type][Name] extends infer RegistryEntry extends object
-  ? FactoryManager<RegistryEntry>
-  : FactoryManager<object> | undefined;
+type ResolveFactoryManager<Type extends string, Name extends string> = Type extends ValidType
+  ? Name extends ValidName<Type>
+    ? DIRegistry[Type][Name] extends infer RegistryEntry extends object
+      ? FactoryManager<RegistryEntry>
+      : FactoryManagerDefault
+    : FactoryManagerDefault
+  : FactoryManagerDefault;
+
+type FactoryManagerDefault = FactoryManager<object> | undefined;
+
+type Lookup<Type extends string, Name extends string> = Type extends ValidType
+  ? Name extends ValidName<Type>
+    ? DIRegistry[Type][Name]
+    : unknown
+  : unknown;
 
 /**
   The common interface for the ability to `register()` an item, shared by the
@@ -230,10 +239,10 @@ interface BasicContainer {
    @param {RegisterOptions} options
    @return {any}
    */
-  lookup<Type extends ValidType, Name extends ValidName<Type>>(
+  lookup<Type extends string, Name extends string>(
     fullName: FullName<Type, Name>,
     options?: RegisterOptions
-  ): DIRegistry[Type][Name];
+  ): Lookup<Type, Name>;
 
   /**
     Given a `FullName`, of the form `"type:name"` return a `FactoryManager`.
@@ -277,7 +286,7 @@ interface BasicContainer {
     @param {string} fullName
     @return {FactoryManager}
   */
-  factoryFor<Type extends ValidType, Name extends ValidName<Type>>(
+  factoryFor<Type extends string, Name extends string>(
     fullName: FullName<Type, Name>
   ): ResolveFactoryManager<Type, Name>;
 }

diff --git a/packages/@ember/-internals/owner/type-tests/owner.test.ts b/packages/@ember/-internals/owner/type-tests/owner.test.ts
@@ -99,7 +99,7 @@ owner.lookup('non-namespace-string');
 expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
 
 // Arbitrary registration patterns work, as here.
-declare module '@ember/-internals/owner' {
+declare module '@ember/owner' {
   export interface DIRegistry {
     etc: {
       'my-type-test': ConstructThis;

diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
@@ -15,7 +15,6 @@ import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
-import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
 import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
@@ -1205,7 +1204,6 @@ function commonSetupRegistry(registry: Registry) {
   registry.register('route:basic', Route);
   registry.register('event_dispatcher:main', EventDispatcher);
 
-  registry.register('location:auto', AutoLocation);
   registry.register('location:hash', HashLocation);
   registry.register('location:history', HistoryLocation);
   registry.register('location:none', NoneLocation);

diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
@@ -128,7 +128,6 @@ moduleFor(
       verifyRegistration(assert, application, 'route:basic');
       verifyRegistration(assert, application, 'event_dispatcher:main');
 
-      verifyRegistration(assert, application, 'location:auto');
       verifyRegistration(assert, application, 'location:hash');
       verifyRegistration(assert, application, 'location:history');
       verifyRegistration(assert, application, 'location:none');