Merge pull request #19107 from emberjs/refactor/monomorphic-reference

Author: rwjblue

package.json

@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.59.0",
+    "@glimmer/compiler": "^0.60.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.59.0",
-    "@glimmer/interfaces": "^0.59.0",
-    "@glimmer/node": "^0.59.0",
-    "@glimmer/opcode-compiler": "^0.59.0",
-    "@glimmer/program": "^0.59.0",
-    "@glimmer/reference": "^0.59.0",
-    "@glimmer/runtime": "^0.59.0",
-    "@glimmer/validator": "^0.59.0",
+    "@glimmer/global-context": "^0.60.0",
+    "@glimmer/interfaces": "^0.60.0",
+    "@glimmer/node": "^0.60.0",
+    "@glimmer/opcode-compiler": "^0.60.0",
+    "@glimmer/program": "^0.60.0",
+    "@glimmer/reference": "^0.60.0",
+    "@glimmer/runtime": "^0.60.0",
+    "@glimmer/validator": "^0.60.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",

packages/@ember/-internals/glimmer/index.ts

@@ -400,7 +400,7 @@ export { default as AbstractComponentManager } from './lib/component-managers/ab
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
-export { INVOKE } from './lib/helpers/mut';
+export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export { capabilities } from './lib/component-managers/custom';

packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts

@@ -7,9 +7,10 @@ import {
   ElementOperations,
   Option,
   PreparedArguments,
+  VM,
   VMArguments,
 } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { Reference } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
 import { EmberVMEnvironment } from '../environment';
 
@@ -18,7 +19,7 @@ import { EmberVMEnvironment } from '../environment';
 // https://github.com/glimmerjs/glimmer-vm/blob/v0.24.0-beta.4/packages/%40glimmer/runtime/lib/component/interfaces.ts#L21
 
 export default abstract class AbstractManager<T, U> implements ComponentManager<T, U> {
-  prepareArgs(_state: U, _args: VMArguments): Option<PreparedArguments> {
+  prepareArgs(_state: U, _args: VMArguments, _vm: VM): Option<PreparedArguments> {
     return null;
   }
 
@@ -29,11 +30,11 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
     definition: U,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    caller: PathReference<void | {}>,
+    caller: Reference<void | {}>,
     hasDefaultBlock: boolean
   ): T;
 
-  abstract getSelf(component: T): PathReference<unknown>;
+  abstract getSelf(component: T): Reference;
   abstract getCapabilities(state: U): ComponentCapabilities;
 
   didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void {

packages/@ember/-internals/glimmer/lib/component-managers/curly.ts

@@ -21,8 +21,14 @@ import {
   WithJitDynamicLayout,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { PathReference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference, registerDestructor, ReifyPositionalReference } from '@glimmer/runtime';
+import {
+  childRefFor,
+  createComputeRef,
+  createPrimitiveRef,
+  Reference,
+  valueForRef,
+} from '@glimmer/reference';
+import { registerDestructor, reifyPositional } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import {
   beginTrackFrame,
@@ -40,18 +46,20 @@ import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
 import { Factory as TemplateFactory, isTemplateFactory, OwnedTemplate } from '../template';
 import {
-  AttributeBinding,
-  ClassNameBinding,
+  createClassNameBindingRef,
+  createSimpleClassNameBindingRef,
+  installAttributeBinding,
   installIsVisibleBinding,
-  referenceForKey,
-  SimpleClassNameBindingReference,
+  parseAttributeBinding,
 } from '../utils/bindings';
 
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
 import AbstractManager from './abstract';
 import DefinitionState from './definition-state';
 
+const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
+
 function aliasIdToElementId(args: VMArguments, props: any) {
   if (args.named.has('id')) {
     // tslint:disable-next-line:max-line-length
@@ -69,28 +77,28 @@ function aliasIdToElementId(args: VMArguments, props: any) {
 function applyAttributeBindings(
   attributeBindings: Array<string>,
   component: Component,
-  rootRef: RootReference<Component>,
+  rootRef: Reference<Component>,
   operations: ElementOperations
 ) {
   let seen: string[] = [];
   let i = attributeBindings.length - 1;
 
   while (i !== -1) {
     let binding = attributeBindings[i];
-    let parsed: [string, string, boolean] = AttributeBinding.parse(binding);
+    let parsed: [string, string, boolean] = parseAttributeBinding(binding);
     let attribute = parsed[1];
 
     if (seen.indexOf(attribute) === -1) {
       seen.push(attribute);
-      AttributeBinding.install(component, rootRef, parsed, operations);
+      installAttributeBinding(component, rootRef, parsed, operations);
     }
 
     i--;
   }
 
   if (seen.indexOf('id') === -1) {
     let id = component.elementId ? component.elementId : guidFor(component);
-    operations.setAttribute('id', PrimitiveReference.create(id), false, null);
+    operations.setAttribute('id', createPrimitiveRef(id), false, null);
   }
 
   if (
@@ -103,7 +111,7 @@ function applyAttributeBindings(
 }
 
 const DEFAULT_LAYOUT = P`template:components/-default`;
-const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -174,7 +182,7 @@ export default class CurlyComponentManager
         positional: EMPTY_POSITIONAL_ARGS,
         named: {
           ...rest,
-          ...(__ARGS__.value() as { [key: string]: PathReference<unknown> }),
+          ...(valueForRef(__ARGS__) as { [key: string]: Reference }),
         },
       };
 
@@ -199,7 +207,10 @@ export default class CurlyComponentManager
         `You cannot specify positional parameters and the hash argument \`${positionalParams}\`.`,
         !args.named.has(positionalParams)
       );
-      named = { [positionalParams]: new ReifyPositionalReference(args.positional.capture()) };
+      let captured = args.positional.capture();
+      named = {
+        [positionalParams]: createComputeRef(() => reifyPositional(captured)),
+      };
       assign(named, args.named.capture());
     } else if (Array.isArray(positionalParams) && positionalParams.length > 0) {
       const count = Math.min(positionalParams.length, args.positional.length);
@@ -234,7 +245,7 @@ export default class CurlyComponentManager
     state: DefinitionState,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    callerSelfRef: PathReference,
+    callerSelfRef: Reference,
     hasBlock: boolean
   ): ComponentStateBucket {
     // Get the nearest concrete component instance from the scope. "Virtual"
@@ -266,7 +277,7 @@ export default class CurlyComponentManager
 
     // Save the current `this` context of the template as the component's
     // `_target`, so bubbled actions are routed to the right place.
-    props._target = callerSelfRef.value();
+    props._target = valueForRef(callerSelfRef);
 
     // static layout asserts CurriedDefinition
     if (state.template) {
@@ -363,7 +374,7 @@ export default class CurlyComponentManager
     return name;
   }
 
-  getSelf({ rootRef }: ComponentStateBucket): PathReference {
+  getSelf({ rootRef }: ComponentStateBucket): Reference {
     return rootRef;
   }
 
@@ -381,32 +392,32 @@ export default class CurlyComponentManager
       applyAttributeBindings(attributeBindings, component, rootRef, operations);
     } else {
       let id = component.elementId ? component.elementId : guidFor(component);
-      operations.setAttribute('id', PrimitiveReference.create(id), false, null);
+      operations.setAttribute('id', createPrimitiveRef(id), false, null);
       if (EMBER_COMPONENT_IS_VISIBLE) {
         installIsVisibleBinding!(rootRef, operations);
       }
     }
 
     if (classRef) {
-      const ref = new SimpleClassNameBindingReference(classRef, classRef['propertyKey']);
+      const ref = createSimpleClassNameBindingRef(classRef);
       operations.setAttribute('class', ref, false, null);
     }
 
     if (classNames && classNames.length) {
       classNames.forEach((name: string) => {
-        operations.setAttribute('class', PrimitiveReference.create(name), false, null);
+        operations.setAttribute('class', createPrimitiveRef(name), false, null);
       });
     }
 
     if (classNameBindings && classNameBindings.length) {
       classNameBindings.forEach((binding: string) => {
-        ClassNameBinding.install(element, rootRef, binding, operations);
+        createClassNameBindingRef(rootRef, binding, operations);
       });
     }
-    operations.setAttribute('class', PrimitiveReference.create('ember-view'), false, null);
+    operations.setAttribute('class', EMBER_VIEW_REF, false, null);
 
     if ('ariaRole' in component) {
-      operations.setAttribute('role', referenceForKey(rootRef, 'ariaRole'), false, null);
+      operations.setAttribute('role', childRefFor(rootRef, 'ariaRole'), false, null);
     }
 
     component._transitionTo('hasElement');

packages/@ember/-internals/glimmer/lib/component-managers/custom.ts

@@ -16,7 +16,7 @@ import {
   VMArguments,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, PathReference } from '@glimmer/reference';
+import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor, reifyArgs, reifyPositional } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { track } from '@glimmer/validator';
@@ -194,7 +194,7 @@ export default class CustomComponentManager<ComponentInstance>
 
     if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
       let getTag = (key: string) => {
-        return track(() => namedArgs[key].value());
+        return track(() => valueForRef(namedArgs[key]));
       };
 
       if (HAS_NATIVE_PROXY) {
@@ -203,7 +203,7 @@ export default class CustomComponentManager<ComponentInstance>
             let ref = namedArgs[prop as string];
 
             if (ref !== undefined) {
-              return ref.value();
+              return valueForRef(ref);
             } else if (prop === CUSTOM_TAG_FOR) {
               return getTag;
             }
@@ -255,7 +255,7 @@ export default class CustomComponentManager<ComponentInstance>
             enumerable: true,
             configurable: true,
             get() {
-              return namedArgs[name].value();
+              return valueForRef(namedArgs[name]);
             },
           });
         });
@@ -333,11 +333,8 @@ export default class CustomComponentManager<ComponentInstance>
     delegate.getContext(component);
   }
 
-  getSelf({
-    delegate,
-    component,
-  }: CustomComponentState<ComponentInstance>): PathReference<unknown> {
-    return new ComponentRootReference(delegate.getContext(component));
+  getSelf({ delegate, component }: CustomComponentState<ComponentInstance>): Reference {
+    return createConstRef(delegate.getContext(component), 'this');
   }
 
   getDestroyable(bucket: CustomComponentState<ComponentInstance>): Option<Destroyable> {

packages/@ember/-internals/glimmer/lib/component-managers/input.ts

@@ -11,7 +11,7 @@ import {
   PreparedArguments,
   VMArguments,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, ConstReference, PathReference } from '@glimmer/reference';
+import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { EmberVMEnvironment } from '../environment';
 import InternalComponentManager, { InternalDefinitionState } from './internal';
@@ -33,11 +33,11 @@ const CAPABILITIES: ComponentCapabilities = {
 
 export interface InputComponentState {
   env: EmberVMEnvironment;
-  type: PathReference;
+  type: Reference;
   instance: Destroyable;
 }
 
-const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -52,12 +52,12 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
       args.positional.length === 0
     );
 
-    let __ARGS__: Dict<PathReference> = args.named.capture();
+    let __ARGS__: Dict<Reference> = args.named.capture();
 
     return {
       positional: EMPTY_POSITIONAL_ARGS,
       named: {
-        __ARGS__: new ConstReference(__ARGS__),
+        __ARGS__: createConstRef(__ARGS__, 'args'),
         type: args.named.get('type'),
       },
     };
@@ -68,15 +68,15 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     { ComponentClass, layout }: InternalDefinitionState,
     args: VMArguments,
     _dynamicScope: DynamicScope,
-    caller: PathReference
+    caller: Reference
   ): InputComponentState {
-    assert('caller must be const', caller.isConst());
+    assert('caller must be const', isConstRef(caller));
 
     let type = args.named.get('type');
 
     let instance = ComponentClass.create({
-      caller: caller.value(),
-      type: type.value(),
+      caller: valueForRef(caller),
+      type: valueForRef(type),
     });
 
     let state = { env, type, instance };
@@ -100,8 +100,8 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     return 'input';
   }
 
-  getSelf({ instance }: InputComponentState): PathReference {
-    return new ComponentRootReference(instance);
+  getSelf({ instance }: InputComponentState): Reference {
+    return createConstRef(instance, 'this');
   }
 
   didRenderLayout(state: InputComponentState, bounds: Bounds): void {
@@ -111,7 +111,7 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
   }
 
   update(state: InputComponentState): void {
-    set(state.instance, 'type', state.type.value());
+    set(state.instance, 'type', valueForRef(state.type));
 
     if (ENV._DEBUG_RENDER_TREE) {
       state.env.extra.debugRenderTree.update(state);