fix: the projection plumbing via scope

aurelia · Jul 12, 2020 · e79194b · e79194b
1 parent 25dcc83
commit e79194b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/packages/jit-html/src/template-compiler.ts b/packages/jit-html/src/template-compiler.ts
@@ -34,6 +34,9 @@ import {
   BindingMode,
   Bindable,
   CustomElement,
+  IProjections,
+  SlotInfo,
+  AuSlotContentType,
 } from '@aurelia/runtime';
 import {
   HTMLAttributeInstruction,
@@ -60,7 +63,6 @@ import {
   TemplateControllerSymbol,
   TextSymbol
 } from './semantic-model';
-import { IProjections, SlotInfo, AuSlotContentType } from '@aurelia/runtime/dist/resources/custom-elements/au-slot';
 
 class CustomElementCompilationUnit {
   public readonly instructions: ITargetedInstruction[][] = [];

diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
@@ -252,6 +252,9 @@ export {
 
 export {
   AuSlot,
+  IProjections,
+  SlotInfo,
+  AuSlotContentType,
 } from './resources/custom-elements/au-slot';
 
 export {

diff --git a/packages/runtime/src/observation.ts b/packages/runtime/src/observation.ts
@@ -348,7 +348,7 @@ export interface IScope {
   readonly bindingContext: IBindingContext;
   readonly overrideContext: IOverrideContext;
   readonly isComponentScope: boolean;
-  readonly providedProjections: WeakMap<ITargetedInstruction, IProjections> | null;
+  providedProjections: WeakMap<ITargetedInstruction, IProjections> | null;
 }
 
 export type ObserversLookup = IIndexable<{

diff --git a/packages/runtime/src/observation/binding-context.ts b/packages/runtime/src/observation/binding-context.ts
@@ -171,15 +171,15 @@ export class BindingContext implements IBindingContext {
 export class Scope implements IScope {
   public parentScope: IScope | null;
   public scopeParts: readonly string[];
-  public projections: readonly CustomElementDefinition[];
+  public projections: readonly CustomElementDefinition[]; // TODO remove
   public bindingContext: IBindingContext;
   public overrideContext: IOverrideContext;
 
   private constructor(
     parentScope: IScope | null,
     bindingContext: IBindingContext,
     overrideContext: IOverrideContext,
-    public readonly providedProjections: WeakMap<ITargetedInstruction, IProjections> | null,
+    public providedProjections: WeakMap<ITargetedInstruction, IProjections> | null,
     public readonly isComponentScope: boolean,
   ) {
     this.parentScope = parentScope;
@@ -207,7 +207,7 @@ export class Scope implements IScope {
    * during binding, it will traverse up via the `parentOverrideContext` of the `OverrideContext` until
    * it finds the property.
    */
-  public static create(flags: LifecycleFlags, bc: object, oc: IOverrideContext, providedProjections: WeakMap<ITargetedInstruction, IProjections> | null, isComponentScope?: boolean): Scope;
+  public static create(flags: LifecycleFlags, bc: object, oc: IOverrideContext, isComponentScope?: boolean): Scope;
   /**
    * Create a new `Scope` backed by the provided `BindingContext` and `OverrideContext`.
    *
@@ -217,15 +217,14 @@ export class Scope implements IScope {
    * @param bc - The `BindingContext` to back the `Scope` with.
    * @param oc - null. This overload is functionally equivalent to not passing this argument at all.
    */
-  public static create(flags: LifecycleFlags, bc: object, oc: null, providedProjections?: WeakMap<ITargetedInstruction, IProjections> | null, isComponentScope?: boolean): Scope;
+  public static create(flags: LifecycleFlags, bc: object, oc: null, isComponentScope?: boolean): Scope;
   public static create(
     flags: LifecycleFlags,
     bc: object,
     oc?: IOverrideContext | null,
-    providedProjections: WeakMap<ITargetedInstruction, IProjections> | null = null,
     isComponentScope: boolean = false
   ): Scope {
-    return new Scope(null, bc as IBindingContext, oc == null ? OverrideContext.create(flags, bc, oc as null) : oc, providedProjections, isComponentScope);
+    return new Scope(null, bc as IBindingContext, oc == null ? OverrideContext.create(flags, bc, oc as null) : oc, null, isComponentScope);
   }
 
   public static fromOverride(flags: LifecycleFlags, oc: IOverrideContext): Scope {

diff --git a/packages/runtime/src/resources/custom-element.ts b/packages/runtime/src/resources/custom-element.ts
@@ -17,7 +17,6 @@ import {
   fromAnnotationOrDefinitionOrTypeOrDefault,
   Injectable,
   IResolver,
-  mergeObjects,
 } from '@aurelia/kernel';
 import {
   registerAliases,
@@ -276,7 +275,7 @@ export class CustomElementDefinition<T extends Constructable = Constructable> im
         mergeArrays(def.scopeParts),
         fromDefinitionOrDefault('enhance', def, () => false),
         mergeArrays(def.projections),
-        mergeObjects(def.projectionsMap!),
+        fromDefinitionOrDefault('projectionsMap', def as CustomElementDefinition, () => null),
       );
     }
 
@@ -316,7 +315,7 @@ export class CustomElementDefinition<T extends Constructable = Constructable> im
         mergeArrays(CustomElement.getAnnotation(Type, 'scopeParts'), Type.scopeParts),
         fromAnnotationOrTypeOrDefault('enhance', Type, () => false),
         mergeArrays(CustomElement.getAnnotation(Type, 'projections'), Type.projections),
-        mergeObjects(CustomElement.getAnnotation(Type, 'projectionsMap')!, Type.projectionsMap!),
+        fromAnnotationOrTypeOrDefault('projectionsMap', Type, () => null),
       );
     }
 
@@ -361,7 +360,7 @@ export class CustomElementDefinition<T extends Constructable = Constructable> im
       mergeArrays(CustomElement.getAnnotation(Type, 'scopeParts'), nameOrDef.scopeParts, Type.scopeParts),
       fromAnnotationOrDefinitionOrTypeOrDefault('enhance', nameOrDef, Type, () => false),
       mergeArrays(CustomElement.getAnnotation(Type, 'projections'), nameOrDef.projections, Type.projections),
-      mergeObjects(CustomElement.getAnnotation(Type, 'projectionsMap')!, nameOrDef.projectionsMap!, Type.projectionsMap!),
+      fromAnnotationOrDefinitionOrTypeOrDefault('projectionsMap', nameOrDef, Type, () => null),
     );
   }
 

diff --git a/packages/runtime/src/templating/controller.ts b/packages/runtime/src/templating/controller.ts
@@ -317,7 +317,7 @@ export class Controller<
     createObservers(this.lifecycle, definition, flags, instance);
     createChildrenObservers(this as unknown as IDryCustomElementController<T, NonNullable<C>>, definition, flags, instance);
 
-    this.scope = Scope.create(flags, this.bindingContext!, null, definition.projectionsMap, true);
+    const scope = this.scope = Scope.create(flags, this.bindingContext!, null, true);
 
     const hooks = this.hooks;
     if (hooks.hasCreate) {
@@ -349,6 +349,7 @@ export class Controller<
     const compiledContext = context.compile(targetedProjections);
     const compiledDefinition = compiledContext.compiledDefinition;
 
+    scope.providedProjections = compiledDefinition.projectionsMap;
     this.scopeParts = compiledDefinition.scopeParts;
     this.projections = compiledDefinition.projections;
     this.isStrictBinding = compiledDefinition.isStrictBinding;