refactor(lifecycle): use default registration

aurelia · Oct 12, 2020 · 77c88a2 · 77c88a2
1 parent 71ed8e5
commit 77c88a2
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 24 deletions.
diff --git a/packages/runtime/src/configuration.ts b/packages/runtime/src/configuration.ts
@@ -3,8 +3,6 @@ import {
   IContainer,
   IRegistry
 } from '@aurelia/kernel';
-import { Lifecycle } from './lifecycle';
-import { ObserverLocator } from './observation/observer-locator';
 import {
   CallBindingRenderer,
   CustomAttributeRenderer,
@@ -59,7 +57,6 @@ export const RefAttributePatternRegistration = RefAttributePattern as unknown as
 export const DotSeparatedAttributePatternRegistration = DotSeparatedAttributePattern as unknown as IRegistry;
 
 export const IExpressionParserRegistration = ExpressionParser as IRegistry;
-export const ILifecycleRegistration = Lifecycle as IRegistry;
 export const IRendererRegistration = Renderer as IRegistry;
 export const IViewLocatorRegistration = ViewLocator as IRegistry;
 export const IProjectionProviderRegistration = ProjectionProvider as IRegistry;
@@ -121,7 +118,6 @@ export const DefaultBindingLanguage = [
  */
 export const DefaultComponents = [
   IExpressionParserRegistration,
-  ILifecycleRegistration,
   IRendererRegistration,
   IViewLocatorRegistration,
   Now,

diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
@@ -386,7 +386,6 @@ export {
 
   DefaultResources,
   IExpressionParserRegistration,
-  ILifecycleRegistration,
   IRendererRegistration,
   IViewLocatorRegistration,
   IProjectionProviderRegistration,

diff --git a/packages/runtime/src/lifecycle.ts b/packages/runtime/src/lifecycle.ts
@@ -586,12 +586,6 @@ export interface IHydratedCustomAttributeViewModel<T extends INode = INode> exte
   readonly $controller: ICustomAttributeController<T, this>;
 }
 
-export interface ILifecycle {
-  readonly batch: IAutoProcessingQueue<IBatchable>;
-}
-
-export const ILifecycle = DI.createInterface<ILifecycle>('ILifecycle').withDefault(x => x.singleton(Lifecycle));
-
 export interface IProcessingQueue<T> {
   add(requestor: T): void;
   process(flags: LifecycleFlags): void;
@@ -654,10 +648,9 @@ export class BatchQueue implements IAutoProcessingQueue<IBatchable> {
   }
 }
 
-export class Lifecycle implements ILifecycle {
-  public readonly batch: IAutoProcessingQueue<IBatchable> = new BatchQueue(this);
+export interface ILifecycle extends Lifecycle {}
+export const ILifecycle = DI.createInterface<ILifecycle>('ILifecycle').withDefault(x => x.singleton(Lifecycle));
 
-  public static register(container: IContainer): IResolver<ILifecycle> {
-    return Registration.singleton(ILifecycle, this).register(container);
-  }
+export class Lifecycle  {
+  public readonly batch: IAutoProcessingQueue<IBatchable> = new BatchQueue(this);
 }
diff --git a/packages/testing/src/test-builder.ts b/packages/testing/src/test-builder.ts
@@ -7,7 +7,6 @@ import {
   IDirtyChecker,
 
   ILifecycle,
-  ILifecycleRegistration,
   IObserverLocator,
   Scope,
   ITargetAccessorLocator,
@@ -458,7 +457,6 @@ export function createObserverLocator(containerOrLifecycle?: IContainer | ILifec
   let container: IContainer;
   if (containerOrLifecycle === undefined || !('get' in containerOrLifecycle)) {
     container = DI.createContainer();
-    container.register(ILifecycleRegistration);
   } else {
     container = containerOrLifecycle;
   }

diff --git a/test/js-framework-benchmark/frameworks/keyed/aurelia2-local/src/main.ts b/test/js-framework-benchmark/frameworks/keyed/aurelia2-local/src/main.ts
@@ -1,6 +1,5 @@
 import {
   IExpressionParserRegistration,
-  ILifecycleRegistration,
   IRendererRegistration,
   IProjectionProviderRegistration,
 
@@ -42,7 +41,6 @@ import { App } from './app';
 global['Aurelia'] = new Aurelia()
   .register(
     IExpressionParserRegistration,
-    ILifecycleRegistration,
     IRendererRegistration,
     IProjectionProviderRegistration,
 

diff --git a/test/js-framework-benchmark/frameworks/keyed/aurelia2-npm/src/main.ts b/test/js-framework-benchmark/frameworks/keyed/aurelia2-npm/src/main.ts
@@ -1,6 +1,5 @@
 import {
   IExpressionParserRegistration,
-  ILifecycleRegistration,
   IRendererRegistration,
   IStartTaskManagerRegistration,
   IProjectionProviderRegistration,
@@ -43,7 +42,6 @@ import { App } from './app';
 global['Aurelia'] = new Aurelia()
   .register(
     IExpressionParserRegistration,
-    ILifecycleRegistration,
     IRendererRegistration,
     IStartTaskManagerRegistration,
     IProjectionProviderRegistration,

diff --git a/test/kitchen-sink/src/startup.ts b/test/kitchen-sink/src/startup.ts
@@ -2,7 +2,6 @@ import * as faker from 'faker';
 import { TraceConfiguration, DebugConfiguration } from '@aurelia/debug';
 import {
   Aurelia,
-  ILifecycleRegistration,
   IRendererRegistration,
   IfRegistration,
   ElseRegistration,
@@ -67,7 +66,6 @@ Tracer.enableLiveLogging({
 // to use (yet)
 const container = DI.createContainer().register(
   // runtime components
-  ILifecycleRegistration,
   IRendererRegistration,
 
   // runtime resources