[REFACTOR] Moves UpdatableRootReference to integration tests

Moves UpdatableRootReference to integration tests, which is where it is primarily used, and creates alternative references for usage in other tests. Also removes the "autotracking" tests from the `@glimmer/reference` package, since those don't really match up with reality anymore, and their test scenarios are covered by other tests in the `@glimmer/validator` package.
glimmerjs · Mar 23, 2020 · c2a4b20 · c2a4b20
1 parent 8396a24
commit c2a4b20
Show file tree

Hide file tree

Showing 20 changed files with 82 additions and 433 deletions.
diff --git a/packages/@glimmer/integration-tests/index.ts b/packages/@glimmer/integration-tests/index.ts
@@ -1,4 +1,5 @@
 export * from './lib/compile';
+export * from './lib/reference';
 export * from './lib/compile/macros';
 export * from './lib/components';
 export * from './lib/dom/assertions';

diff --git a/packages/@glimmer/integration-tests/lib/components/basic.ts b/packages/@glimmer/integration-tests/lib/components/basic.ts
@@ -11,8 +11,9 @@ import {
 } from '@glimmer/interfaces';
 import { TestComponentDefinitionState } from './test-component';
 import { unreachable, expect, unwrapTemplate } from '@glimmer/util';
-import { VersionedPathReference, UpdatableRootReference } from '@glimmer/reference';
+import { VersionedPathReference } from '@glimmer/reference';
 import { Tag, CONSTANT_TAG } from '@glimmer/validator';
+import { UpdatableRootReference } from '../reference';
 
 export interface BasicComponentFactory {
   new (): BasicComponent;

diff --git a/packages/@glimmer/integration-tests/lib/components/emberish-curly.ts b/packages/@glimmer/integration-tests/lib/components/emberish-curly.ts
@@ -21,14 +21,15 @@ import {
   JitRuntimeResolver,
 } from '@glimmer/interfaces';
 import { Attrs, AttrsDiff } from './emberish-glimmer';
-import { VersionedPathReference, UpdatableRootReference, PathReference } from '@glimmer/reference';
+import { VersionedPathReference, PathReference } from '@glimmer/reference';
 import { combine, createTag, dirty, DirtyableTag, Tag } from '@glimmer/validator';
 import { keys, EMPTY_ARRAY, assign } from '@glimmer/util';
 import { TestComponentDefinitionState } from './test-component';
 import { PrimitiveReference } from '@glimmer/runtime';
 import { TestComponentConstructor } from './types';
 import TestJitRuntimeResolver from '../modes/jit/resolver';
 import { TestJitRegistry } from '../modes/jit/registry';
+import { UpdatableRootReference } from '../reference';
 
 export interface EmberishCurlyComponentFactory
   extends TestComponentConstructor<EmberishCurlyComponent> {

diff --git a/packages/@glimmer/integration-tests/lib/components/emberish-glimmer.ts b/packages/@glimmer/integration-tests/lib/components/emberish-glimmer.ts
@@ -1,4 +1,4 @@
-import { PathReference, UpdatableRootReference } from '@glimmer/reference';
+import { PathReference } from '@glimmer/reference';
 import { combine, createUpdatableTag, UpdatableTag, Tag } from '@glimmer/validator';
 import {
   Dict,
@@ -23,6 +23,7 @@ import { BASIC_CAPABILITIES } from './capabilities';
 import { TestComponentDefinitionState } from './test-component';
 import { TestComponentConstructor } from './types';
 import { EmberishCurlyComponentFactory } from './emberish-curly';
+import { UpdatableRootReference } from '../reference';
 
 export type Attrs = Dict;
 export type AttrsDiff = { oldAttrs: Option<Attrs>; newAttrs: Attrs };

diff --git a/packages/@glimmer/integration-tests/lib/components/emberish-root-view.ts b/packages/@glimmer/integration-tests/lib/components/emberish-root-view.ts
@@ -1,10 +1,10 @@
 import { preprocess } from '../compile';
 import { JitRuntimeContext, SyntaxCompilationContext, Template, Option } from '@glimmer/interfaces';
 import { assertElement, firstElementChild } from '../dom/simple-utils';
-import { UpdatableRootReference } from '@glimmer/reference';
 import { renderJitMain, clientBuilder } from '@glimmer/runtime';
 import { SimpleElement } from '@simple-dom/interface';
 import { assign, unwrapTemplate, unwrapHandle } from '@glimmer/util';
+import { UpdatableRootReference } from '../reference';
 
 export class EmberishRootView {
   private template: Template;

diff --git a/packages/@glimmer/integration-tests/lib/modes/aot/delegate.ts b/packages/@glimmer/integration-tests/lib/modes/aot/delegate.ts
@@ -22,7 +22,7 @@ import {
   DynamicScope,
 } from '@glimmer/interfaces';
 import { WrappedBuilder, PartialDefinitionImpl } from '@glimmer/opcode-compiler';
-import { PathReference, UpdatableRootReference, StableState } from '@glimmer/reference';
+import { PathReference } from '@glimmer/reference';
 import {
   clientBuilder,
   getDynamicVar,
@@ -65,6 +65,7 @@ import AotRuntimeResolverImpl from './resolver';
 import { TestMacros } from '../../compile/macros';
 import AotCompilerDelegate from './compiler-delegate';
 import { preprocess } from '../../compile';
+import { UpdatableRootReference, StableState } from '../../reference';
 
 export type RenderDelegateComponentDefinition = ComponentDefinition<TestComponentDefinitionState>;
 

diff --git a/packages/@glimmer/integration-tests/lib/modes/jit/delegate.ts b/packages/@glimmer/integration-tests/lib/modes/jit/delegate.ts
@@ -46,11 +46,12 @@ import { EmberishCurlyComponentFactory } from '../../components/emberish-curly';
 import { EmberishGlimmerComponentFactory } from '../../components/emberish-glimmer';
 import { TestModifierConstructor } from '../../modifiers';
 import { UserHelper } from '../../helpers';
-import { UpdatableRootReference, ConstReference } from '@glimmer/reference';
+import { ConstReference } from '@glimmer/reference';
 import { renderTemplate } from './render';
 import { JitContext } from '@glimmer/opcode-compiler';
 import { preprocess } from '../../compile';
 import { unwrapTemplate } from '@glimmer/util';
+import { UpdatableRootReference } from '../../reference';
 
 export interface JitTestDelegateContext {
   runtime: JitRuntimeContext;

diff --git a/packages/@glimmer/integration-tests/lib/modes/rehydration/delegate.ts b/packages/@glimmer/integration-tests/lib/modes/rehydration/delegate.ts
@@ -8,7 +8,6 @@ import {
   Helper,
 } from '@glimmer/interfaces';
 import { serializeBuilder } from '@glimmer/node';
-import { UpdatableRootReference } from '@glimmer/reference';
 import createHTMLDocument from '@simple-dom/document';
 import {
   SimpleDocument,
@@ -35,6 +34,7 @@ import { TestJitRegistry } from '../jit/registry';
 import { renderTemplate } from '../jit/render';
 import TestJitRuntimeResolver from '../jit/resolver';
 import { debugRehydration, DebugRehydrationBuilder } from './builder';
+import { UpdatableRootReference } from '../../reference';
 
 export interface RehydrationStats {
   clearedNodes: SimpleNode[];

diff --git a/packages/@glimmer/reference/lib/state.ts → ...limmer/integration-tests/lib/reference.ts b/packages/@glimmer/reference/lib/state.ts → ...limmer/integration-tests/lib/reference.ts
@@ -1,4 +1,4 @@
-import { RootReference, TemplateReferenceEnvironment } from './template';
+import { RootReference, TemplateReferenceEnvironment } from '@glimmer/reference';
 import { createUpdatableTag, dirty, UpdatableTag } from '@glimmer/validator';
 import { Dict } from '@glimmer/interfaces';
 

diff --git a/packages/@glimmer/integration-tests/lib/render-delegate.ts b/packages/@glimmer/integration-tests/lib/render-delegate.ts
@@ -16,8 +16,9 @@ import {
   ElementBuilder,
   Helper,
 } from '@glimmer/interfaces';
-import { UpdatableRootReference, ConstReference } from '@glimmer/reference';
+import { ConstReference } from '@glimmer/reference';
 import { EnvironmentDelegate } from '@glimmer/runtime';
+import { UpdatableRootReference } from './reference';
 
 export interface RenderDelegateOptions {
   doc?: SimpleDocument;

diff --git a/packages/@glimmer/integration-tests/lib/render-test.ts b/packages/@glimmer/integration-tests/lib/render-test.ts
@@ -1,5 +1,4 @@
 import { Dict, Maybe, Option, RenderResult, Helper } from '@glimmer/interfaces';
-import { UpdatableRootReference } from '@glimmer/reference';
 import { bump, isConst } from '@glimmer/validator';
 import { clearElement, dict, expect, assign } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
@@ -17,6 +16,7 @@ import { UserHelper } from './helpers';
 import { TestModifierConstructor } from './modifiers';
 import RenderDelegate from './render-delegate';
 import { equalTokens, isServerMarker, NodesSnapshot, normalizeSnapshot } from './snapshot';
+import { UpdatableRootReference } from './reference';
 
 export interface IRenderTest {
   readonly count: Count;

diff --git a/packages/@glimmer/integration-tests/test/updating-test.ts b/packages/@glimmer/integration-tests/test/updating-test.ts
@@ -1,5 +1,4 @@
 import { Option, HandleResult, ErrHandle, EncoderError } from '@glimmer/interfaces';
-import { UpdatableRootReference } from '@glimmer/reference';
 import { ConstReference } from '@glimmer/reference';
 import { RenderTest, test, jitSuite, JitRenderDelegate } from '..';
 import { PrimitiveReference, SafeString } from '@glimmer/runtime';
@@ -9,6 +8,7 @@ import {
   getElementsByTagName,
   stripTight,
   trimLines,
+  UpdatableRootReference,
 } from '..';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
 import { assert } from './support';

diff --git a/packages/@glimmer/reference/index.ts b/packages/@glimmer/reference/index.ts
@@ -17,7 +17,6 @@ export { ConstReference } from './lib/const';
 export { ListItem, END } from './lib/iterable';
 
 export * from './lib/template';
-export * from './lib/state';
 
 export {
   IterationItem,

diff --git a/packages/@glimmer/reference/lib/iterable.ts b/packages/@glimmer/reference/lib/iterable.ts
@@ -1,6 +1,6 @@
 import { LinkedList, ListNode, Option, symbol } from '@glimmer/util';
 import { Tag } from '@glimmer/validator';
-import { VersionedPathReference as PathReference } from './reference';
+import { VersionedPathReference as PathReference } from '..';
 
 export interface IterationItem<T, U> {
   key: unknown;