Merge pull request #239 from glimmerjs/refactor/remove-custom-references

[REFACTOR] Removes most of the remaining custom reference code.
glimmerjs · Feb 14, 2020 · 421500e · 421500e
2 parents c94a52c + eb66ed8
commit 421500e
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 423 deletions.
diff --git a/packages/@glimmer/core/index.ts b/packages/@glimmer/core/index.ts
@@ -20,5 +20,3 @@ export {
 export { templateOnlyComponent } from './src/managers/component/template-only';
 
 export { createTemplate, setComponentTemplate } from './src/template';
-
-export * from './src/references';
diff --git a/packages/@glimmer/core/src/managers/component/custom.ts b/packages/@glimmer/core/src/managers/component/custom.ts
@@ -14,10 +14,9 @@ import {
   Environment,
   CompilableProgram,
 } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { PathReference, ComponentRootReference } from '@glimmer/reference';
 import { Tag, isConst, createTag, consume } from '@glimmer/validator';
 
-import { RootReference } from '../../references';
 import { unwrapTemplate } from '@glimmer/opcode-compiler';
 
 export const VM_CAPABILITIES: VMComponentCapabilities = {
@@ -185,7 +184,7 @@ export default class CustomComponentManager<ComponentInstance>
       JitRuntimeResolver
     > {
   create(
-    _env: Environment,
+    env: Environment,
     definition: CustomComponentDefinitionState<ComponentInstance>,
     args: VMArguments
   ): CustomComponentState<ComponentInstance> {
@@ -248,7 +247,7 @@ export default class CustomComponentManager<ComponentInstance>
       value
     );
 
-    return new CustomComponentState(delegate, component, capturedArgs, namedArgsProxy);
+    return new CustomComponentState(env, delegate, component, capturedArgs, namedArgsProxy);
   }
 
   update({ delegate, component, args, namedArgsProxy }: CustomComponentState<ComponentInstance>): void {
@@ -279,10 +278,11 @@ export default class CustomComponentManager<ComponentInstance>
   }
 
   getSelf({
+    env,
     delegate,
     component,
   }: CustomComponentState<ComponentInstance>): PathReference<unknown> {
-    return new RootReference(delegate.getContext(component) as object);
+    return new ComponentRootReference(delegate.getContext(component) as object, env);
   }
 
   getDestructor(state: CustomComponentState<ComponentInstance>): Option<Destroyable> {
@@ -325,6 +325,7 @@ export default class CustomComponentManager<ComponentInstance>
  */
 export class CustomComponentState<ComponentInstance> {
   constructor(
+    public env: Environment,
     public delegate: ComponentManager<ComponentInstance>,
     public component: ComponentInstance,
     public args: CapturedArguments,

diff --git a/packages/@glimmer/core/src/managers/component/template-only.ts b/packages/@glimmer/core/src/managers/component/template-only.ts
@@ -14,7 +14,6 @@ import { CONSTANT_TAG, Tag } from '@glimmer/validator';
 import { DEBUG } from '@glimmer/env';
 
 import { unwrapTemplate } from '@glimmer/opcode-compiler';
-import { RootReference } from '../../references';
 import { TemplateMeta } from './custom';
 
 export const CAPABILITIES: ComponentCapabilities = {
@@ -38,7 +37,7 @@ export class ComponentStateBucket {
   constructor(public args: CapturedArguments) {}
 }
 
-const EMPTY_SELF = new RootReference({});
+const EMPTY_SELF = new ConstReference(null);
 
 let TemplateOnlyComponentDebugReference:
   | undefined

diff --git a/packages/@glimmer/core/src/references.ts b/packages/@glimmer/core/src/references.ts
diff --git a/packages/@glimmer/core/test/non-interactive/index.ts b/packages/@glimmer/core/test/non-interactive/index.ts
@@ -2,4 +2,3 @@ import './component-template-test';
 import './manager-test';
 import './render-test';
 import './each-test';
-import './track-property-test';