diff --git a/broccoli/packages.js b/broccoli/packages.js index b037810bd0e..05f352c239d 100644 --- a/broccoli/packages.js +++ b/broccoli/packages.js @@ -284,7 +284,12 @@ module.exports.glimmerCompilerES = () => { }; module.exports.glimmerES = function glimmerES(environment) { - let glimmerEntries = ['@glimmer/node', '@glimmer/opcode-compiler', '@glimmer/runtime']; + let glimmerEntries = [ + '@glimmer/node', + '@glimmer/compiler', + '@glimmer/opcode-compiler', + '@glimmer/runtime', + ]; if (environment === 'development') { let hasGlimmerDebug = true; diff --git a/package.json b/package.json index 13ddb690e72..509412c5230 100644 --- a/package.json +++ b/package.json @@ -74,14 +74,14 @@ }, "devDependencies": { "@babel/preset-env": "^7.6.0", - "@glimmer/compiler": "0.38.5-alpha.3", + "@glimmer/compiler": "0.44.0", "@glimmer/env": "^0.1.7", - "@glimmer/interfaces": "0.38.5-alpha.3", - "@glimmer/node": "0.38.5-alpha.3", - "@glimmer/opcode-compiler": "0.38.5-alpha.3", - "@glimmer/program": "0.38.5-alpha.3", - "@glimmer/reference": "0.38.5-alpha.3", - "@glimmer/runtime": "0.38.5-alpha.3", + "@glimmer/interfaces": "0.44.0", + "@glimmer/node": "0.44.0", + "@glimmer/opcode-compiler": "0.44.0", + "@glimmer/program": "0.44.0", + "@glimmer/reference": "0.44.0", + "@glimmer/runtime": "0.44.0", "@types/qunit": "^2.5.4", "@types/rsvp": "^4.0.3", "auto-dist-tag": "^1.0.0", diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts index e824f71332b..7072a29a14e 100644 --- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts +++ b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts @@ -5,8 +5,10 @@ import { ComponentCapabilities, Option, ProgramSymbolTable, + ComponentDefinition, + ComponentManager, } from '@glimmer/interfaces'; -import { ComponentDefinition, ComponentManager, WithStaticLayout } from '@glimmer/runtime'; +import { WithStaticLayout } from '@glimmer/runtime'; import RuntimeResolver from './resolver'; interface StaticComponentManager diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts index cf5d7012ac0..450c7046221 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts @@ -1,15 +1,18 @@ -import { ComponentCapabilities, Simple } from '@glimmer/interfaces'; -import { Tag, VersionedPathReference } from '@glimmer/reference'; import { - Arguments, + ComponentCapabilities, + DynamicScope, + VMArguments as Arguments, Bounds, + PreparedArguments, ComponentManager, - DynamicScope, - ElementOperations, Environment, - PreparedArguments, -} from '@glimmer/runtime'; -import { Destroyable, Opaque, Option } from '@glimmer/util'; + ElementOperations, + Destroyable, +} from '@glimmer/interfaces'; +import { VersionedPathReference } from '@glimmer/reference'; +import { Tag } from '@glimmer/validator'; +import { Option } from '@glimmer/util'; +import { SimpleElement } from '@simple-dom/interface'; import { DebugStack } from '../utils/debug-stack'; // implements the ComponentManager interface as defined in glimmer: @@ -36,10 +39,10 @@ export default abstract class AbstractManager implements ComponentManager< hasDefaultBlock: boolean ): T; - abstract getSelf(component: T): VersionedPathReference; + abstract getSelf(component: T): VersionedPathReference; abstract getCapabilities(state: U): ComponentCapabilities; - didCreateElement(_component: T, _element: Simple.Element, _operations: ElementOperations): void { + didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void { // noop } diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts index 7a1dcfd5a0a..5090d84e4a9 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts @@ -18,23 +18,25 @@ import { Dict, Option, ProgramSymbolTable, - Simple, VMHandle, -} from '@glimmer/interfaces'; -import { combine, Tag, validate, value, VersionedPathReference } from '@glimmer/reference'; -import { - Arguments, + VMArguments as Arguments, Bounds, + PreparedArguments, ComponentDefinition, ElementOperations, Invocation, - PreparedArguments, + Destroyable, +} from '@glimmer/interfaces'; +import { VersionedPathReference } from '@glimmer/reference'; +import { combine, Tag, validate, value } from '@glimmer/validator'; +import { PrimitiveReference, WithDynamicLayout, WithDynamicTagName, WithStaticLayout, } from '@glimmer/runtime'; -import { Destroyable, EMPTY_ARRAY } from '@glimmer/util'; +import { EMPTY_ARRAY } from '@glimmer/util'; +import { SimpleElement } from '@simple-dom/interface'; import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS, ROOT_REF } from '../component'; import Environment from '../environment'; import { DynamicScope } from '../renderer'; @@ -67,7 +69,7 @@ function aliasIdToElementId(args: Arguments, props: any) { // what has already been applied. This is essentially refining the concatenated // properties applying right to left. function applyAttributeBindings( - element: Simple.Element, + element: SimpleElement, attributeBindings: Array, component: Component, operations: ElementOperations @@ -360,7 +362,7 @@ export default class CurlyComponentManager didCreateElement( { component, classRef, environment }: ComponentStateBucket, - element: Simple.Element, + element: SimpleElement, operations: ElementOperations ): void { setViewElement(component, element); diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts index 8db08de87c2..d637439e28a 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts @@ -8,27 +8,25 @@ import { DEBUG } from '@glimmer/env'; import { ComponentCapabilities, Dict, - Opaque, Option, ProgramSymbolTable, -} from '@glimmer/interfaces'; -import { createTag, isConst, PathReference, Tag } from '@glimmer/reference'; -import { - Arguments, - Bounds, + VMArguments as Arguments, CapturedArguments, + Bounds, ComponentDefinition, Invocation, - WithStaticLayout, -} from '@glimmer/runtime'; -import { Destroyable } from '@glimmer/util'; - + Destroyable, +} from '@glimmer/interfaces'; +import { PathReference } from '@glimmer/reference'; +import { isConst, Tag } from '@glimmer/validator'; +import { WithStaticLayout } from '@glimmer/runtime'; import { ENV } from '@ember/-internals/environment'; import Environment from '../environment'; import RuntimeResolver from '../resolver'; import { OwnedTemplate } from '../template'; import { RootReference } from '../utils/references'; import AbstractComponentManager from './abstract'; +import { createTag } from '@glimmer/validator'; const CAPABILITIES = { dynamicLayout: false, @@ -88,14 +86,14 @@ export interface Capabilities { // TODO: export ICapturedArgumentsValue from glimmer and replace this export interface Args { - named: Dict; - positional: Opaque[]; + named: Dict; + positional: unknown[]; } export interface ManagerDelegate { capabilities: Capabilities; - createComponent(factory: Opaque, args: Args): ComponentInstance; - getContext(instance: ComponentInstance): Opaque; + createComponent(factory: unknown, args: Args): ComponentInstance; + getContext(instance: ComponentInstance): unknown; } export function hasAsyncLifeCycleCallbacks( @@ -144,8 +142,8 @@ export interface ManagerDelegateWithDestructors } export interface ComponentArguments { - positional: Opaque[]; - named: Dict; + positional: unknown[]; + named: Dict; } /** @@ -322,7 +320,10 @@ export default class CustomComponentManager delegate.getContext(component); } - getSelf({ delegate, component }: CustomComponentState): PathReference { + getSelf({ + delegate, + component, + }: CustomComponentState): PathReference { return RootReference.create(delegate.getContext(component)); } diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts index fa0de7ad7f7..4690f88857c 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts @@ -2,13 +2,21 @@ import { ENV } from '@ember/-internals/environment'; import { set } from '@ember/-internals/metal'; import { Owner } from '@ember/-internals/owner'; import { assert, debugFreeze } from '@ember/debug'; -import { ComponentCapabilities, Dict } from '@glimmer/interfaces'; -import { CONSTANT_TAG, createTag, isConst, VersionedPathReference } from '@glimmer/reference'; -import { Arguments, Bounds, DynamicScope, PreparedArguments } from '@glimmer/runtime'; -import { Destroyable } from '@glimmer/util'; +import { + ComponentCapabilities, + Dict, + DynamicScope, + VMArguments as Arguments, + Bounds, + PreparedArguments, + Destroyable, +} from '@glimmer/interfaces'; +import { VersionedPathReference } from '@glimmer/reference'; +import { CONSTANT_TAG, isConst } from '@glimmer/validator'; import Environment from '../environment'; import { RootReference } from '../utils/references'; import InternalComponentManager, { InternalDefinitionState } from './internal'; +import { createTag } from '@glimmer/validator'; const CAPABILITIES: ComponentCapabilities = { dynamicLayout: false, diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts index c1378b601ab..9146b7bef32 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts @@ -1,6 +1,7 @@ import { Factory, Owner } from '@ember/-internals/owner'; import { OwnedTemplateMeta } from '@ember/-internals/views'; -import { ComponentDefinition, Invocation, WithStaticLayout } from '@glimmer/runtime'; +import { WithStaticLayout } from '@glimmer/runtime'; +import { ComponentDefinition, Invocation } from '@glimmer/interfaces'; import RuntimeResolver from '../resolver'; import { OwnedTemplate } from '../template'; import AbstractComponentManager from './abstract'; diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts index 0f9c7ae1a0d..47a7afb3ad0 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts @@ -1,20 +1,16 @@ import { DEBUG } from '@glimmer/env'; -import { ComponentCapabilities } from '@glimmer/interfaces'; import { - CONSTANT_TAG, - createTag, - isConstTag, - Tag, - VersionedPathReference, -} from '@glimmer/reference'; -import { - Arguments, + ComponentCapabilities, + VMArguments as Arguments, Bounds, ComponentDefinition, - Invocation, - WithDynamicLayout, -} from '@glimmer/runtime'; -import { Destroyable, Opaque, Option } from '@glimmer/util'; + Destroyable, +} from '@glimmer/interfaces'; +import { VersionedPathReference } from '@glimmer/reference'; +import { CONSTANT_TAG, isConstTag, Tag } from '@glimmer/validator'; +import { Invocation } from '@glimmer/interfaces'; +import { WithDynamicLayout } from '@glimmer/runtime'; +import { Option } from '@glimmer/util'; import { generateControllerFactory } from '@ember/-internals/routing'; import { OwnedTemplateMeta } from '@ember/-internals/views'; @@ -27,13 +23,14 @@ import Environment from '../environment'; import RuntimeResolver from '../resolver'; import { RootReference } from '../utils/references'; import AbstractManager from './abstract'; +import { createTag } from '@glimmer/validator'; interface EngineState { engine: EngineInstance; controller: any; self: RootReference; environment: Environment; - modelRef?: VersionedPathReference; + modelRef?: VersionedPathReference; } interface EngineDefinitionState { @@ -130,7 +127,7 @@ class MountManager extends AbstractManager return bucket; } - getSelf({ self }: EngineState): VersionedPathReference { + getSelf({ self }: EngineState): VersionedPathReference { return self; } diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts index 097733c7cde..963738ae1ad 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts @@ -6,19 +6,20 @@ import EngineInstance from '@ember/engine/instance'; import { _instrumentStart } from '@ember/instrumentation'; import { assign } from '@ember/polyfills'; import { DEBUG } from '@glimmer/env'; -import { ComponentCapabilities, Option, Simple } from '@glimmer/interfaces'; -import { CONSTANT_TAG, createTag, Tag, VersionedPathReference } from '@glimmer/reference'; import { - Arguments, + ComponentCapabilities, + Option, + VMArguments as Arguments, Bounds, ComponentDefinition, - ElementOperations, - EMPTY_ARGS, Invocation, - WithDynamicTagName, - WithStaticLayout, -} from '@glimmer/runtime'; -import { Destroyable } from '@glimmer/util'; + ElementOperations, + Destroyable, +} from '@glimmer/interfaces'; +import { VersionedPathReference } from '@glimmer/reference'; +import { CONSTANT_TAG, Tag } from '@glimmer/validator'; +import { EMPTY_ARGS, WithDynamicTagName, WithStaticLayout } from '@glimmer/runtime'; +import { SimpleElement } from '@simple-dom/interface'; import Environment from '../environment'; import { DynamicScope } from '../renderer'; import RuntimeResolver from '../resolver'; @@ -27,6 +28,7 @@ import { OutletState } from '../utils/outlet'; import { RootReference } from '../utils/references'; import OutletView from '../views/outlet'; import AbstractManager from './abstract'; +import { createTag } from '@glimmer/validator'; function instrumentationPayload(def: OutletDefinitionState) { return { object: `${def.name}:${def.outlet}` }; @@ -261,7 +263,7 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit didCreateElement( component: OutletInstanceState, - element: Simple.Element, + element: SimpleElement, _operations: ElementOperations ): void { // to add GUID id and class diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts index d21ce11bbd3..b7227a5db3b 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts @@ -3,8 +3,13 @@ import { ENV } from '@ember/-internals/environment'; import { Factory } from '@ember/-internals/owner'; import { _instrumentStart } from '@ember/instrumentation'; import { DEBUG } from '@glimmer/env'; -import { ComponentCapabilities, Option } from '@glimmer/interfaces'; -import { Arguments, ComponentDefinition, EMPTY_ARGS } from '@glimmer/runtime'; +import { + ComponentCapabilities, + Option, + VMArguments as Arguments, + ComponentDefinition, +} from '@glimmer/interfaces'; +import { EMPTY_ARGS } from '@glimmer/runtime'; import { DIRTY_TAG } from '../component'; import Environment from '../environment'; import { DynamicScope } from '../renderer'; diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts index acc159c07df..bb09344aaf2 100644 --- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts +++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts @@ -1,19 +1,20 @@ import { ENV } from '@ember/-internals/environment'; import { OwnedTemplateMeta } from '@ember/-internals/views'; -import { ComponentCapabilities, Option } from '@glimmer/interfaces'; -import { CONSTANT_TAG, createTag } from '@glimmer/reference'; import { - Arguments, + ComponentCapabilities, + Option, + VMArguments as Arguments, Bounds, ComponentDefinition, Invocation, - NULL_REFERENCE, - WithStaticLayout, -} from '@glimmer/runtime'; +} from '@glimmer/interfaces'; +import { CONSTANT_TAG } from '@glimmer/validator'; +import { NULL_REFERENCE, WithStaticLayout } from '@glimmer/runtime'; import Environment from '../environment'; import RuntimeResolver from '../resolver'; import { OwnedTemplate } from '../template'; import AbstractManager from './abstract'; +import { createTag } from '@glimmer/validator'; const CAPABILITIES: ComponentCapabilities = { dynamicLayout: false, diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts index 5086f71b45c..9eabeed5e1b 100644 --- a/packages/@ember/-internals/glimmer/lib/component.ts +++ b/packages/@ember/-internals/glimmer/lib/component.ts @@ -13,7 +13,7 @@ import { } from '@ember/-internals/views'; import { assert, deprecate } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { createTag, dirty } from '@glimmer/reference'; +import { dirty, createTag } from '@glimmer/validator'; import { normalizeProperty, SVG_NAMESPACE } from '@glimmer/runtime'; import { RootReference, UPDATE } from './utils/references'; diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts index 09ad3910b05..21bae2dac45 100644 --- a/packages/@ember/-internals/glimmer/lib/environment.ts +++ b/packages/@ember/-internals/glimmer/lib/environment.ts @@ -2,14 +2,11 @@ import { OWNER, Owner } from '@ember/-internals/owner'; import { constructStyleDeprecationMessage } from '@ember/-internals/views'; import { warn } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Option, Simple } from '@glimmer/interfaces'; +import { Option, Destroyable } from '@glimmer/interfaces'; import { OpaqueIterable, VersionedReference } from '@glimmer/reference'; -import { - ElementBuilder, - Environment as GlimmerEnvironment, - SimpleDynamicAttribute, -} from '@glimmer/runtime'; -import { Destroyable, Opaque } from '@glimmer/util'; +import { SimpleDynamicAttribute } from '@glimmer/runtime'; +import { Environment as GlimmerEnvironment, ElementBuilder } from '@glimmer/interfaces'; +import { AttrNamespace } from '@simple-dom/interface'; import getDebugStack, { DebugStack } from './utils/debug-stack'; import createIterable from './utils/iterable'; import { ConditionalReference, UpdatableReference } from './utils/references'; @@ -143,7 +140,7 @@ export default class Environment extends GlimmerEnvironment { if (DEBUG) { class StyleAttributeManager extends SimpleDynamicAttribute { - set(dom: ElementBuilder, value: Opaque, env: GlimmerEnvironment): void { + set(dom: ElementBuilder, value: unknown, env: GlimmerEnvironment): void { warn( constructStyleDeprecationMessage(value), (() => { @@ -156,7 +153,7 @@ if (DEBUG) { ); super.set(dom, value, env); } - update(value: Opaque, env: GlimmerEnvironment): void { + update(value: unknown, env: GlimmerEnvironment): void { warn( constructStyleDeprecationMessage(value), (() => { @@ -175,7 +172,7 @@ if (DEBUG) { element, attribute: string, isTrusting: boolean, - namespace: Option + namespace: Option ) { if (attribute === 'style' && !isTrusting) { return new StyleAttributeManager({ element, name: attribute, namespace }); diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts index 89c12b798eb..cda97ea6b28 100644 --- a/packages/@ember/-internals/glimmer/lib/helper.ts +++ b/packages/@ember/-internals/glimmer/lib/helper.ts @@ -6,12 +6,12 @@ import { Factory } from '@ember/-internals/owner'; import { FrameworkObject, setFrameworkClass } from '@ember/-internals/runtime'; import { symbol } from '@ember/-internals/utils'; import { join } from '@ember/runloop'; -import { Dict, Opaque } from '@glimmer/interfaces'; -import { createTag, dirty } from '@glimmer/reference'; +import { Dict } from '@glimmer/interfaces'; +import { dirty, createTag } from '@glimmer/validator'; export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG'); -export type HelperFunction = (positional: Opaque[], named: Dict) => Opaque; +export type HelperFunction = (positional: unknown[], named: Dict) => unknown; export type SimpleHelperFactory = Factory>; export type ClassHelperFactory = Factory>; @@ -22,7 +22,7 @@ export interface HelperFactory { } export interface HelperInstance { - compute(positional: Opaque[], named: Dict): Opaque; + compute(positional: unknown[], named: Dict): unknown; destroy(): void; } diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts index 3d6a0b6bd5c..fc2eaf109de 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts @@ -1,20 +1,20 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Opaque } from '@glimmer/interfaces'; -import { Tag, VersionedPathReference } from '@glimmer/reference'; -import { Arguments, Helper, VM } from '@glimmer/runtime'; +import { VersionedPathReference } from '@glimmer/reference'; +import { Tag } from '@glimmer/validator'; +import { VMArguments as Arguments, VM, Helper } from '@glimmer/interfaces'; let helper: Helper; if (DEBUG) { - class ComponentAssertionReference implements VersionedPathReference { + class ComponentAssertionReference implements VersionedPathReference { public tag: Tag; - constructor(private component: VersionedPathReference, private message: string) { + constructor(private component: VersionedPathReference, private message: string) { this.tag = component.tag; } - value(): Opaque { + value(): unknown { let value = this.component.value(); assert(this.message, typeof value !== 'string'); @@ -22,7 +22,7 @@ if (DEBUG) { return value; } - get(property: string): VersionedPathReference { + get(property: string): VersionedPathReference { return this.component.get(property); } } diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-class.ts index 992666f90bb..1ffa04c6a5a 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-class.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-class.ts @@ -1,5 +1,5 @@ import { dasherize } from '@ember/string'; -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; function classHelper({ positional }: any) { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts b/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts index 70a0efaf751..fcf8b685287 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts @@ -1,4 +1,4 @@ -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; function inputTypeHelper({ positional }: any) { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts index 57f0903d4ce..884aee02914 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts @@ -1,5 +1,5 @@ import { dasherize } from '@ember/string'; -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; function normalizeClass({ positional }: any) { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts index 9167b39281e..e278456caf4 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts @@ -6,9 +6,9 @@ import { assert } from '@ember/debug'; import { flaggedInstrument } from '@ember/instrumentation'; import { join } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import { isConst, VersionedPathReference } from '@glimmer/reference'; -import { Arguments, VM } from '@glimmer/runtime'; -import { Opaque } from '@glimmer/util'; +import { VersionedPathReference } from '@glimmer/reference'; +import { isConst } from '@glimmer/validator'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { ACTION, INVOKE, UnboundReference } from '../utils/references'; /** @@ -311,8 +311,8 @@ function NOOP(args: Arguments) { } function makeArgsProcessor( - valuePathRef: VersionedPathReference | false, - actionArgsRef: Array> + valuePathRef: VersionedPathReference | false, + actionArgsRef: Array> ) { let mergeArgs: any; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts index 48a181720a5..3768d00f289 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts @@ -1,6 +1,5 @@ import { PathReference } from '@glimmer/reference'; -import { Arguments, VM } from '@glimmer/runtime'; -import { Opaque } from '@glimmer/util'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; /** @module ember @@ -42,6 +41,6 @@ import { Opaque } from '@glimmer/util'; @public */ -export default function(_vm: VM, args: Arguments): PathReference { +export default function(_vm: VM, args: Arguments): PathReference { return args.positional.capture(); } diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts index 375b4d29ce4..61a1c5be375 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts @@ -1,4 +1,4 @@ -import { Arguments, CapturedArguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, CapturedArguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; const isEmpty = (value: any): boolean => { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts index 3118403040d..38b0920f67a 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts @@ -2,9 +2,9 @@ @module ember */ import { symbol } from '@ember/-internals/utils'; -import { Tag, VersionedPathReference } from '@glimmer/reference'; -import { Arguments, VM } from '@glimmer/runtime'; -import { Opaque } from '@glimmer/util'; +import { VersionedPathReference } from '@glimmer/reference'; +import { Tag } from '@glimmer/validator'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; /** The `{{#each}}` helper loops over elements in a collection. It is an extension @@ -152,7 +152,7 @@ class EachInReference implements VersionedPathReference { this[EACH_IN_REFERENCE] = true; } - value(): Opaque { + value(): unknown { return this.inner.value(); } @@ -161,7 +161,7 @@ class EachInReference implements VersionedPathReference { } } -export function isEachIn(ref: Opaque): ref is VersionedPathReference { +export function isEachIn(ref: unknown): ref is VersionedPathReference { return ref !== null && typeof ref === 'object' && ref[EACH_IN_REFERENCE]; } diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts index 443258afca6..88b4e10127f 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts @@ -1,8 +1,10 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Arguments, VM } from '@glimmer/runtime'; -import { ICapturedArguments } from '@glimmer/runtime/dist/types/lib/vm/arguments'; -import { Opaque } from '@glimmer/util'; +import { + VMArguments as Arguments, + VM, + CapturedArguments as ICapturedArguments, +} from '@glimmer/interfaces'; import { InternalHelperReference, INVOKE } from '../utils/references'; import buildUntouchableThis from '../utils/untouchable-this'; @@ -92,7 +94,7 @@ function fnHelper({ positional }: ICapturedArguments) { ); } - return (...invocationArgs: Opaque[]) => { + return (...invocationArgs: unknown[]) => { let [fn, ...args] = positional.value(); if (typeof callbackRef[INVOKE] === 'function') { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts index a57119a6ea8..cb9400c7961 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts @@ -1,16 +1,15 @@ import { set } from '@ember/-internals/metal'; -import { Opaque } from '@glimmer/interfaces'; +import { PathReference, VersionedPathReference } from '@glimmer/reference'; import { - combine, - createUpdatableTag, - isConst, - PathReference, Tag, UpdatableTag, update, - VersionedPathReference, -} from '@glimmer/reference'; -import { Arguments, NULL_REFERENCE, VM } from '@glimmer/runtime'; + combine, + createUpdatableTag, + isConst, +} from '@glimmer/validator'; +import { NULL_REFERENCE } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { CachedReference, referenceFromParts, UPDATE } from '../utils/references'; /** @@ -66,9 +65,9 @@ export default function(_vm: VM, args: Arguments) { } function referenceFromPath( - source: VersionedPathReference, + source: VersionedPathReference, path: string -): VersionedPathReference { +): VersionedPathReference { let innerReference; if (path === undefined || path === null || path === '') { innerReference = NULL_REFERENCE; @@ -81,15 +80,15 @@ function referenceFromPath( } class GetHelperReference extends CachedReference { - public sourceReference: VersionedPathReference; + public sourceReference: VersionedPathReference; public pathReference: PathReference; public lastPath: string | null; - public innerReference: VersionedPathReference; + public innerReference: VersionedPathReference; public innerTag: UpdatableTag; public tag: Tag; static create( - sourceReference: VersionedPathReference, + sourceReference: VersionedPathReference, pathReference: PathReference ) { if (isConst(pathReference)) { @@ -101,7 +100,7 @@ class GetHelperReference extends CachedReference { } constructor( - sourceReference: VersionedPathReference, + sourceReference: VersionedPathReference, pathReference: PathReference ) { super(); diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts index 4a7c124cbf0..167cdb67197 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts @@ -1,6 +1,5 @@ import { PathReference } from '@glimmer/reference'; -import { Arguments, VM } from '@glimmer/runtime'; -import { Dict, Opaque } from '@glimmer/util'; +import { VMArguments as Arguments, VM, Dict } from '@glimmer/interfaces'; /** @module ember @@ -45,6 +44,6 @@ import { Dict, Opaque } from '@glimmer/util'; @public */ -export default function(_vm: VM, args: Arguments): PathReference> { +export default function(_vm: VM, args: Arguments): PathReference> { return args.named.capture(); } diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts index 832b308041a..f98e78edaa1 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts @@ -3,8 +3,9 @@ */ import { assert } from '@ember/debug'; -import { combine, createUpdatableTag, isConst, UpdatableTag, update } from '@glimmer/reference'; -import { Arguments, PrimitiveReference, VM } from '@glimmer/runtime'; +import { combine, createUpdatableTag, isConst, UpdatableTag, update } from '@glimmer/validator'; +import { PrimitiveReference } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { CachedReference, ConditionalReference } from '../utils/references'; class ConditionalHelperReference extends CachedReference { diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts index c31a1511828..3a6577fde23 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts @@ -1,4 +1,4 @@ -import { Arguments, CapturedArguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, CapturedArguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; /** @module ember diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts index 5ef02420a04..d83a07190a8 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts @@ -3,7 +3,7 @@ */ import { symbol } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { INVOKE, UPDATE } from '../utils/references'; /** diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts index ffc40e16b84..f744c576130 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts @@ -4,7 +4,7 @@ import { QueryParams } from '@ember/-internals/routing'; import { assert } from '@ember/debug'; import { assign } from '@ember/polyfills'; -import { Arguments, CapturedArguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, CapturedArguments, VM } from '@glimmer/interfaces'; import { InternalHelperReference } from '../utils/references'; /** diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts index ef1bc21546b..88268c4b619 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts @@ -1,7 +1,7 @@ /** @module ember */ -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { ReadonlyReference } from '../utils/references'; import { unMut } from './mut'; diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts index 19ccfbdf240..20cd1024747 100644 --- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts +++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts @@ -3,7 +3,7 @@ */ import { assert } from '@ember/debug'; -import { Arguments, VM } from '@glimmer/runtime'; +import { VMArguments as Arguments, VM } from '@glimmer/interfaces'; import { UnboundReference } from '../utils/references'; /** diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts index 10d8b177b40..cb0412a6f3b 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts @@ -3,16 +3,16 @@ import { ActionManager, isSimpleClick } from '@ember/-internals/views'; import { assert, deprecate } from '@ember/debug'; import { flaggedInstrument } from '@ember/instrumentation'; import { join } from '@ember/runloop'; -import { Opaque, Simple } from '@glimmer/interfaces'; -import { Tag } from '@glimmer/reference'; import { - Arguments, + DynamicScope, + VMArguments as Arguments, CapturedNamedArguments, CapturedPositionalArguments, - DynamicScope, ModifierManager, -} from '@glimmer/runtime'; -import { Destroyable } from '@glimmer/util'; + Destroyable, +} from '@glimmer/interfaces'; +import { Tag } from '@glimmer/validator'; +import { SimpleElement } from '@simple-dom/interface'; import { INVOKE } from '../utils/references'; const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl']; @@ -61,7 +61,7 @@ export let ActionHelper = { }; export class ActionState { - public element: Simple.Element; + public element: SimpleElement; public actionId: number; public actionName: any; public actionArgs: any; @@ -73,7 +73,7 @@ export class ActionState { public tag: Tag; constructor( - element: Simple.Element, + element: SimpleElement, actionId: number, actionName: any, actionArgs: any[], @@ -186,10 +186,10 @@ export class ActionState { } // implements ModifierManager -export default class ActionModifierManager implements ModifierManager { +export default class ActionModifierManager implements ModifierManager { create( - element: Simple.Element, - _state: Opaque, + element: SimpleElement, + _state: unknown, args: Arguments, _dynamicScope: DynamicScope, dom: any diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts index bec47a083b5..fdde0e9c1d4 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts @@ -1,9 +1,14 @@ import { track, untrack } from '@ember/-internals/metal'; import { Factory } from '@ember/-internals/owner'; import { assert, deprecate } from '@ember/debug'; -import { Dict, Opaque, Simple } from '@glimmer/interfaces'; -import { combine, CONSTANT_TAG, createUpdatableTag, Tag, update } from '@glimmer/reference'; -import { Arguments, CapturedArguments, ModifierManager } from '@glimmer/runtime'; +import { + Dict, + VMArguments as Arguments, + CapturedArguments, + ModifierManager, +} from '@glimmer/interfaces'; +import { Tag, update, combine, CONSTANT_TAG, createUpdatableTag } from '@glimmer/validator'; +import { SimpleElement } from '@simple-dom/interface'; export interface CustomModifierDefinitionState { ModifierClass: Factory; @@ -69,7 +74,7 @@ export class CustomModifierState { public tag = createUpdatableTag(); constructor( - public element: Simple.Element, + public element: SimpleElement, public delegate: ModifierManagerDelegate, public modifier: ModifierInstance, public args: CapturedArguments @@ -83,14 +88,14 @@ export class CustomModifierState { // TODO: export ICapturedArgumentsValue from glimmer and replace this export interface Args { - named: Dict; - positional: Opaque[]; + named: Dict; + positional: unknown[]; } export interface ModifierManagerDelegate { capabilities: Capabilities; - createModifier(factory: Opaque, args: Args): ModifierInstance; - installModifier(instance: ModifierInstance, element: Simple.Element, args: Args): void; + createModifier(factory: unknown, args: Args): ModifierInstance; + installModifier(instance: ModifierInstance, element: SimpleElement, args: Args): void; updateModifier(instance: ModifierInstance, args: Args): void; destroyModifier(instance: ModifierInstance, args: Args): void; } @@ -126,7 +131,7 @@ class InteractiveCustomModifierManager CustomModifierDefinitionState > { create( - element: Simple.Element, + element: SimpleElement, definition: CustomModifierDefinitionState, args: Arguments ) { diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts index d74bc39ae38..2cb985441e5 100644 --- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts +++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts @@ -1,9 +1,13 @@ import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Opaque, Simple } from '@glimmer/interfaces'; -import { CONSTANT_TAG, Tag } from '@glimmer/reference'; -import { Arguments, CapturedArguments, ModifierManager } from '@glimmer/runtime'; -import { Destroyable } from '@glimmer/util'; +import { + VMArguments as Arguments, + CapturedArguments, + ModifierManager, + Destroyable, +} from '@glimmer/interfaces'; +import { CONSTANT_TAG, Tag } from '@glimmer/validator'; +import { SimpleElement } from '@simple-dom/interface'; import buildUntouchableThis from '../utils/untouchable-this'; const untouchableContext = buildUntouchableThis('`on` modifier'); @@ -301,7 +305,7 @@ function addEventListener( @public @since 3.11.0 */ -export default class OnModifierManager implements ModifierManager { +export default class OnModifierManager implements ModifierManager { public SUPPORTS_EVENT_OPTIONS: boolean = SUPPORTS_EVENT_OPTIONS; public isInteractive: boolean; @@ -313,7 +317,7 @@ export default class OnModifierManager implements ModifierManager, - parentElement: Simple.Element, + self: VersionedPathReference, + parentElement: SimpleElement, dynamicScope: DynamicScope, builder: IBuilder ) { @@ -119,7 +122,7 @@ class RootState { }; } - isFor(possibleRoot: Opaque): boolean { + isFor(possibleRoot: unknown): boolean { return this.root === possibleRoot; } @@ -242,7 +245,7 @@ backburner.on('begin', loopBegin); backburner.on('end', loopEnd); interface ViewRegistry { - [viewId: string]: Opaque; + [viewId: string]: unknown; } export abstract class Renderer { @@ -278,12 +281,12 @@ export abstract class Renderer { // renderer HOOKS - appendOutletView(view: OutletView, target: Simple.Element) { + appendOutletView(view: OutletView, target: SimpleElement) { let definition = createRootOutlet(view); this._appendDefinition(view, curry(definition), target); } - appendTo(view: Component, target: Simple.Element) { + appendTo(view: Component, target: SimpleElement) { let definition = new RootComponentDefinition(view); this._appendDefinition(view, curry(definition), target); } @@ -291,7 +294,7 @@ export abstract class Renderer { _appendDefinition( root: OutletView | Component, definition: CurriedComponentDefinition, - target: Simple.Element + target: SimpleElement ) { let self = new UnboundReference(definition); let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE); @@ -334,7 +337,7 @@ export abstract class Renderer { } } - cleanupRootFor(view: Opaque) { + cleanupRootFor(view: unknown) { // no need to cleanup roots if we have already been destroyed if (this._destroyed) { return; @@ -362,11 +365,11 @@ export abstract class Renderer { this._clearAllRoots(); } - abstract getElement(view: Opaque): Option; + abstract getElement(view: unknown): Option; getBounds( view: object - ): { parentElement: Simple.Element; firstNode: Simple.Node; lastNode: Simple.Node } { + ): { parentElement: SimpleElement; firstNode: SimpleNode; lastNode: SimpleNode } { let bounds: Bounds = view[BOUNDS]; assert('object passed to getBounds must have the BOUNDS symbol as a property', Boolean(bounds)); @@ -378,7 +381,7 @@ export abstract class Renderer { return { parentElement, firstNode, lastNode }; } - createElement(tagName: string): Simple.Element { + createElement(tagName: string): SimpleElement { return this._env.getAppendOperations().createElement(tagName); } @@ -529,7 +532,7 @@ export class InertRenderer extends Renderer { return new this(env, rootTemplate, _viewRegistry, false, builder); } - getElement(_view: Opaque): Option { + getElement(_view: unknown): Option { throw new Error( 'Accessing `this.element` is not allowed in non-interactive environments (such as FastBoot).' ); @@ -551,7 +554,7 @@ export class InteractiveRenderer extends Renderer { return new this(env, rootTemplate, _viewRegistry, true, builder); } - getElement(view: Opaque): Option { + getElement(view: unknown): Option { return getViewElement(view); } } diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts index 3df374f1ea8..790715d5de4 100644 --- a/packages/@ember/-internals/glimmer/lib/resolver.ts +++ b/packages/@ember/-internals/glimmer/lib/resolver.ts @@ -13,12 +13,12 @@ import EmberError from '@ember/error'; import { _instrumentStart } from '@ember/instrumentation'; import { ComponentDefinition, - Opaque, Option, RuntimeResolver as IRuntimeResolver, + Helper, } from '@glimmer/interfaces'; import { LazyCompiler, Macros, PartialDefinition } from '@glimmer/opcode-compiler'; -import { getDynamicVar, Helper, ModifierDefinition } from '@glimmer/runtime'; +import { getDynamicVar, ModifierDefinition } from '@glimmer/runtime'; import CompileTimeLookup from './compile-time-lookup'; import { CurlyComponentDefinition } from './component-managers/curly'; import { CustomManagerDefinition, ManagerDelegate } from './component-managers/custom'; @@ -375,7 +375,7 @@ export default class RuntimeResolver implements IRuntimeResolver(`modifier:${name}`); if (modifier !== undefined) { - let managerFactory = getModifierManager>(modifier.class); + let managerFactory = getModifierManager>(modifier.class); let manager = managerFactory!(owner); return new CustomModifierDefinition(name, modifier, manager, this.isInteractive); @@ -520,7 +520,7 @@ export default class RuntimeResolver implements IRuntimeResolver, + factory(owner) as InternalComponentManager, ComponentClass as Factory, layout! ); @@ -528,7 +528,7 @@ export default class RuntimeResolver implements IRuntimeResolver, + factory(owner) as ManagerDelegate, layout !== null ? layout : owner.lookup(P`template:components/-default`)!(owner) diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts index 3840d809a40..307751a160f 100644 --- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts +++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts @@ -1,7 +1,7 @@ import { hasDOM } from '@ember/-internals/browser-environment'; import { privatize as P, Registry } from '@ember/-internals/container'; import { ENV } from '@ember/-internals/environment'; -import { Simple } from '@glimmer/interfaces'; +import { SimpleDocument } from '@simple-dom/interface'; import Component from './component'; import Checkbox from './components/checkbox'; import Input from './components/input'; @@ -65,13 +65,13 @@ export function setupApplicationRegistry(registry: Registry) { } registry.register('service:-dom-changes', { - create({ document }: { document: Simple.Document }) { + create({ document }: { document: SimpleDocument }) { return new DOMChanges(document); }, }); registry.register('service:-dom-tree-construction', { - create({ document }: { document: Simple.Document }) { + create({ document }: { document: SimpleDocument }) { let Implementation = hasDOM ? DOMTreeConstruction : NodeDOMTreeConstruction; return new Implementation(document); }, diff --git a/packages/@ember/-internals/glimmer/lib/simple-dom.d.ts b/packages/@ember/-internals/glimmer/lib/simple-dom.d.ts index 65d755144dc..f5e53665db4 100644 --- a/packages/@ember/-internals/glimmer/lib/simple-dom.d.ts +++ b/packages/@ember/-internals/glimmer/lib/simple-dom.d.ts @@ -1,4 +1,4 @@ declare module 'simple-dom' { - import { Simple } from '@glimmer/interfaces'; - export interface Document extends Simple.Document {} + import { SimpleDocument } from '@simple-dom/interface'; + export interface Document extends SimpleDocument {} } diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts index 9a4b7516a06..4da07ab726e 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax.ts @@ -1,9 +1,8 @@ import { OwnedTemplateMeta } from '@ember/-internals/views'; import { assert } from '@ember/debug'; -import { CompilableBlock } from '@glimmer/interfaces'; +import { CompilableBlock, Core } from '@glimmer/interfaces'; import { Macros, OpcodeBuilder } from '@glimmer/opcode-compiler'; import { Option } from '@glimmer/util'; -import { Core } from '@glimmer/wire-format'; import CompileTimeLookup from './compile-time-lookup'; import { blockLetMacro } from './syntax/let'; import { mountMacro } from './syntax/mount'; diff --git a/packages/@ember/-internals/glimmer/lib/syntax/let.ts b/packages/@ember/-internals/glimmer/lib/syntax/let.ts index ea87e55346b..93901ce53ae 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/let.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/let.ts @@ -1,7 +1,6 @@ import { OwnedTemplateMeta } from '@ember/-internals/views'; -import { CompilableBlock, Option } from '@glimmer/interfaces'; +import { CompilableBlock, Option, Core } from '@glimmer/interfaces'; import { OpcodeBuilder } from '@glimmer/opcode-compiler'; -import * as WireFormat from '@glimmer/wire-format'; /** @module ember @@ -57,8 +56,8 @@ import * as WireFormat from '@glimmer/wire-format'; @public */ export function blockLetMacro( - params: WireFormat.Core.Params, - _hash: WireFormat.Core.Hash, + params: Core.Params, + _hash: Core.Hash, template: Option, _inverse: Option, builder: OpcodeBuilder diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts index 0a6385ee21a..c783a0fba46 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts @@ -4,17 +4,15 @@ import { OwnedTemplateMeta } from '@ember/-internals/views'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Option } from '@glimmer/interfaces'; +import { Option, VMArguments as Arguments, CapturedArguments, VM, Core } from '@glimmer/interfaces'; import { OpcodeBuilder } from '@glimmer/opcode-compiler'; -import { Tag, VersionedPathReference } from '@glimmer/reference'; +import { VersionedPathReference } from '@glimmer/reference'; +import { Tag } from '@glimmer/validator'; import { - Arguments, - CapturedArguments, CurriedComponentDefinition, curry, EMPTY_ARGS, UNDEFINED_REFERENCE, - VM, } from '@glimmer/runtime'; import * as WireFormat from '@glimmer/wire-format'; import { MODEL_ARG_NAME, MountDefinition } from '../component-managers/mount'; @@ -102,8 +100,8 @@ export function mountHelper( */ export function mountMacro( _name: string, - params: Option, - hash: Option, + params: Option, + hash: Option, builder: OpcodeBuilder ) { assert( diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts index 09be6a326bf..51bd19e3237 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts @@ -1,19 +1,26 @@ import { OwnedTemplateMeta } from '@ember/-internals/views'; import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features'; import { DEBUG } from '@glimmer/env'; -import { Option, unsafe } from '@glimmer/interfaces'; -import { OpcodeBuilder } from '@glimmer/opcode-compiler'; -import { ConstReference, Reference, Tag, VersionedPathReference } from '@glimmer/reference'; import { - Arguments, + Option, + unsafe, + VMArguments as Arguments, CapturedArguments, + VM, + Dict, + Core, + Expressions, +} from '@glimmer/interfaces'; +import { OpcodeBuilder } from '@glimmer/opcode-compiler'; +import { ConstReference, Reference, VersionedPathReference } from '@glimmer/reference'; +import { Tag } from '@glimmer/validator'; +import { CurriedComponentDefinition, curry, EMPTY_ARGS, UNDEFINED_REFERENCE, - VM, } from '@glimmer/runtime'; -import { Dict, dict, Opaque } from '@glimmer/util'; +import { dict } from '@glimmer/util'; import * as WireFormat from '@glimmer/wire-format'; import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet'; import { DynamicScope } from '../renderer'; @@ -82,11 +89,11 @@ export function outletHelper(vm: VM, args: Arguments) { export function outletMacro( _name: string, - params: Option, - hash: Option, + params: Option, + hash: Option, builder: OpcodeBuilder ) { - let expr: WireFormat.Expressions.Helper = [WireFormat.Ops.Helper, '-outlet', params || [], hash]; + let expr: Expressions.Helper = [WireFormat.Ops.Helper, '-outlet', params || [], hash]; builder.dynamicComponent(expr, null, [], null, false, null, null); return true; } @@ -98,7 +105,7 @@ class OutletModelReference implements VersionedPathReference { this.tag = parent.tag; } - value(): Opaque { + value(): unknown { let state = this.parent.value(); if (state === undefined) { @@ -111,7 +118,7 @@ class OutletModelReference implements VersionedPathReference { return undefined; } - return render.model as Opaque; + return render.model as unknown; } get(property: string): VersionedPathReference { @@ -164,7 +171,7 @@ class OutletComponentReference get(key: string): T { return (key === 'model' ? modelRef : UNDEFINED_REFERENCE) as unsafe; }, - value(): Dict { + value(): Dict { let model = modelRef.value(); return { model }; }, diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts index 4cdf934920d..73d2e9216fc 100644 --- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts +++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts @@ -1,5 +1,5 @@ import { Option } from '@glimmer/util'; -import { Core } from '@glimmer/wire-format'; +import { Core } from '@glimmer/interfaces'; export function hashToArgs(hash: Option): Option { if (hash === null) return null; diff --git a/packages/@ember/-internals/glimmer/lib/template-compiler.ts b/packages/@ember/-internals/glimmer/lib/template-compiler.ts index cedd4d93acd..1fe17533bdb 100644 --- a/packages/@ember/-internals/glimmer/lib/template-compiler.ts +++ b/packages/@ember/-internals/glimmer/lib/template-compiler.ts @@ -1,4 +1,4 @@ -import { Compiler } from '@glimmer/interfaces'; +import { CompileOp } from '@glimmer/interfaces'; import RuntimeResolver from './resolver'; export interface ICompilerOptions { @@ -9,7 +9,7 @@ export interface ICompilerOptions { // factory for DI export default { - create({ environment }: ICompilerOptions): Compiler { + create({ environment }: ICompilerOptions): CompileOp { return new RuntimeResolver(environment.isInteractive).compiler; }, }; diff --git a/packages/@ember/-internals/glimmer/lib/template.ts b/packages/@ember/-internals/glimmer/lib/template.ts index 301dd6866e0..6b09813d95b 100644 --- a/packages/@ember/-internals/glimmer/lib/template.ts +++ b/packages/@ember/-internals/glimmer/lib/template.ts @@ -1,9 +1,8 @@ import { privatize as P } from '@ember/-internals/container'; import { Owner } from '@ember/-internals/owner'; import { OwnedTemplateMeta, StaticTemplateMeta } from '@ember/-internals/views'; -import { Template } from '@glimmer/interfaces'; +import { Template, SerializedTemplateWithLazyBlock } from '@glimmer/interfaces'; import { LazyCompiler, templateFactory } from '@glimmer/opcode-compiler'; -import { SerializedTemplateWithLazyBlock } from '@glimmer/wire-format'; export type StaticTemplate = SerializedTemplateWithLazyBlock; export type OwnedTemplate = Template; diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts index e57ae01589f..403c641ee4e 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts @@ -2,10 +2,12 @@ import { get } from '@ember/-internals/metal'; import { assert, deprecate } from '@ember/debug'; import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features'; import { dasherize } from '@ember/string'; -import { Opaque, Option, Simple } from '@glimmer/interfaces'; -import { CachedReference, combine, map, Reference, Tag } from '@glimmer/reference'; -import { ElementOperations, PrimitiveReference } from '@glimmer/runtime'; -import { Core, Ops } from '@glimmer/wire-format'; +import { Option, ElementOperations, Core } from '@glimmer/interfaces'; +import { CachedReference, map, Reference } from '@glimmer/reference'; +import { combine, Tag } from '@glimmer/validator'; +import { PrimitiveReference } from '@glimmer/runtime'; +import { isGet, isMaybeLocal, Ops } from '@glimmer/wire-format'; +import { SimpleElement } from '@simple-dom/interface'; import { ROOT_REF } from '../component'; import { Component } from './curly-component-state-bucket'; import { referenceFromParts } from './references'; @@ -47,7 +49,7 @@ export function wrapComponentClassAttribute(hash: Core.Hash) { let [type] = value; - if (type === Ops.Get || type === Ops.MaybeLocal) { + if (isGet(type) || isMaybeLocal(type)) { let path = value[value.length - 1]; let propName = path[path.length - 1]; values[index] = [Ops.Helper, '-class', [value, propName], null]; @@ -79,7 +81,7 @@ export const AttributeBinding = { }, install( - _element: Simple.Element, + _element: SimpleElement, component: Component, parsed: [string, string, boolean], operations: ElementOperations @@ -137,7 +139,7 @@ if (EMBER_COMPONENT_IS_VISIBLE) { private component: Component; constructor( private inner: Reference, - private isVisible: Reference, + private isVisible: Reference, component: Component ) { super(); @@ -179,13 +181,13 @@ if (EMBER_COMPONENT_IS_VISIBLE) { export let IsVisibleBinding: | undefined | { - install(element: Simple.Element, component: Component, operations: ElementOperations): void; + install(element: SimpleElement, component: Component, operations: ElementOperations): void; mapStyleValue(isVisible: boolean, component: Component): SafeString | null; }; if (EMBER_COMPONENT_IS_VISIBLE) { IsVisibleBinding = { - install(_element: Simple.Element, component: Component, operations: ElementOperations) { + install(_element: SimpleElement, component: Component, operations: ElementOperations) { let componentMapStyleValue = (isVisible: boolean) => { return this.mapStyleValue(isVisible, component); }; @@ -218,7 +220,7 @@ if (EMBER_COMPONENT_IS_VISIBLE) { export const ClassNameBinding = { install( - _element: Simple.Element, + _element: SimpleElement, component: Component, microsyntax: string, operations: ElementOperations @@ -253,7 +255,7 @@ export class SimpleClassNameBindingReference extends CachedReference; - constructor(private inner: Reference, private path: string) { + constructor(private inner: Reference, private path: string) { super(); this.tag = inner.tag; @@ -280,7 +282,7 @@ class ColonClassNameBindingReference extends CachedReference> { public tag: Tag; constructor( - private inner: Reference, + private inner: Reference, private truthy: Option = null, private falsy: Option = null ) { diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts index 8cedbeeb202..e730833c474 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts @@ -1,7 +1,7 @@ import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views'; -import { Revision, value, VersionedReference } from '@glimmer/reference'; -import { CapturedNamedArguments } from '@glimmer/runtime'; -import { Opaque } from '@glimmer/util'; +import { VersionedReference } from '@glimmer/reference'; +import { Revision, value } from '@glimmer/validator'; +import { CapturedNamedArguments } from '@glimmer/interfaces'; import Environment from '../environment'; import { Factory as TemplateFactory, OwnedTemplate } from '../template'; @@ -37,7 +37,7 @@ function NOOP() {} @private */ export default class ComponentStateBucket { - public classRef: VersionedReference | null = null; + public classRef: VersionedReference | null = null; public argsRevision: Revision; constructor( diff --git a/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts b/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts index a0900e6bc3f..e4ab147e8cc 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts @@ -1,15 +1,14 @@ import { Owner } from '@ember/-internals/owner'; import { deprecate } from '@ember/debug'; import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features'; -import { Opaque } from '@glimmer/interfaces'; import { ManagerDelegate } from '../component-managers/custom'; import { getManager, ManagerFactory, setManager } from './managers'; export function setComponentManager( - stringOrFunction: string | ManagerFactory>, + stringOrFunction: string | ManagerFactory>, obj: any ) { - let factory: ManagerFactory; + let factory: ManagerFactory; if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') { deprecate( 'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.', @@ -24,7 +23,7 @@ export function setComponentManager( return owner.lookup(`component-manager:${stringOrFunction}`); }; } else { - factory = stringOrFunction as ManagerFactory; + factory = stringOrFunction as ManagerFactory; } return setManager({ factory, internal: false, type: 'component' }, obj); diff --git a/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts b/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts index dc8e734590f..8a31a370720 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts @@ -1,7 +1,6 @@ -import { Opaque } from '@glimmer/util'; import { getManager, ManagerFactory, setManager } from './managers'; -export function setModifierManager(factory: ManagerFactory, obj: any) { +export function setModifierManager(factory: ManagerFactory, obj: any) { return setManager({ factory, internal: false, type: 'modifier' }, obj); } diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts index e70e929a643..be5e7ca97d2 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts @@ -1,7 +1,7 @@ import { assert } from '@ember/debug'; -import { Simple } from '@glimmer/interfaces'; -import { Bounds, CapturedArguments } from '@glimmer/runtime'; +import { CapturedArguments, Bounds } from '@glimmer/interfaces'; import { expect, Option, Stack } from '@glimmer/util'; +import { SimpleElement, SimpleNode } from '@simple-dom/interface'; export type RenderNodeType = 'outlet' | 'engine' | 'route-template' | 'component'; @@ -24,9 +24,9 @@ export interface CapturedRenderNode { args: ReturnType; instance: unknown; bounds: Option<{ - parentElement: Simple.Element; - firstNode: Simple.Node; - lastNode: Simple.Node; + parentElement: SimpleElement; + firstNode: SimpleNode; + lastNode: SimpleNode; }>; children: CapturedRenderNode[]; } diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterable.ts b/packages/@ember/-internals/glimmer/lib/utils/iterable.ts index 55c4a98411b..f5af6d0df15 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/iterable.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/iterable.ts @@ -12,25 +12,22 @@ import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { assert } from '@ember/debug'; import { AbstractIterable, - combine, - createUpdatableTag, IterationItem, OpaqueIterator, - Tag, - update, VersionedReference, } from '@glimmer/reference'; -import { Opaque, Option } from '@glimmer/util'; +import { Tag, combine, createUpdatableTag, update } from '@glimmer/validator'; +import { Option } from '@glimmer/util'; import { isEachIn } from '../helpers/each-in'; import { UpdatableReference } from './references'; const ITERATOR_KEY_GUID = 'be277757-bbbe-4620-9fcb-213ef433cca2'; // FIXME: export this from Glimmer -type OpaqueIterationItem = IterationItem; +type OpaqueIterationItem = IterationItem; type EmberIterable = AbstractIterable< - Opaque, - Opaque, + unknown, + unknown, OpaqueIterationItem, UpdatableReference, UpdatableReference @@ -56,9 +53,9 @@ abstract class BoundedIterator implements OpaqueIterator { return false; } - abstract valueFor(position: number): Opaque; + abstract valueFor(position: number): unknown; - memoFor(position: number): Opaque { + memoFor(position: number): unknown { return position; } @@ -80,7 +77,7 @@ abstract class BoundedIterator implements OpaqueIterator { } class ArrayIterator extends BoundedIterator { - static from(array: Opaque[], keyFor: KeyFor): OpaqueIterator { + static from(array: unknown[], keyFor: KeyFor): OpaqueIterator { let { length } = array; if (length === 0) { @@ -91,22 +88,22 @@ class ArrayIterator extends BoundedIterator { } static fromForEachable(object: ForEachable, keyFor: KeyFor): OpaqueIterator { - let array: Opaque[] = []; + let array: unknown[] = []; object.forEach(item => array.push(item)); return this.from(array, keyFor); } - constructor(private array: Opaque[], length: number, keyFor: KeyFor) { + constructor(private array: unknown[], length: number, keyFor: KeyFor) { super(length, keyFor); } - valueFor(position: number): Opaque { + valueFor(position: number): unknown { return this.array[position]; } } class EmberArrayIterator extends BoundedIterator { - static from(array: Opaque[], keyFor: KeyFor): OpaqueIterator { + static from(array: unknown[], keyFor: KeyFor): OpaqueIterator { let { length } = array; if (length === 0) { @@ -116,11 +113,11 @@ class EmberArrayIterator extends BoundedIterator { } } - constructor(private array: Opaque, length: number, keyFor: KeyFor) { + constructor(private array: unknown, length: number, keyFor: KeyFor) { super(length, keyFor); } - valueFor(position: number): Opaque { + valueFor(position: number): unknown { return objectAt(this.array as any, position); } } @@ -133,7 +130,7 @@ class ObjectIterator extends BoundedIterator { if (length === 0) { return EMPTY_ITERATOR; } else { - let values: Opaque[] = []; + let values: unknown[] = []; for (let i = 0; i < length; i++) { let value: any; let key = keys[i]; @@ -157,12 +154,12 @@ class ObjectIterator extends BoundedIterator { } static fromForEachable(obj: ForEachable, keyFor: KeyFor): OpaqueIterator { - let keys: Opaque[] = []; - let values: Opaque[] = []; + let keys: unknown[] = []; + let values: unknown[] = []; let length = 0; let isMapLike = false; - obj.forEach((value: Opaque, key: Opaque) => { + obj.forEach((value: unknown, key: unknown) => { isMapLike = isMapLike || arguments.length >= 2; if (isMapLike) { @@ -182,24 +179,24 @@ class ObjectIterator extends BoundedIterator { } } - constructor(private keys: Opaque[], private values: Opaque[], length: number, keyFor: KeyFor) { + constructor(private keys: unknown[], private values: unknown[], length: number, keyFor: KeyFor) { super(length, keyFor); } - valueFor(position: number): Opaque { + valueFor(position: number): unknown { return this.values[position]; } - memoFor(position: number): Opaque { + memoFor(position: number): unknown { return this.keys[position]; } } -interface NativeIteratorConstructor { +interface NativeIteratorConstructor { new (iterable: Iterator, result: IteratorResult, keyFor: KeyFor): NativeIterator; } -abstract class NativeIterator implements OpaqueIterator { +abstract class NativeIterator implements OpaqueIterator { static from( this: NativeIteratorConstructor, iterable: Iterable, @@ -230,8 +227,8 @@ abstract class NativeIterator implements OpaqueIterator { return false; } - abstract valueFor(result: IteratorResult, position: number): Opaque; - abstract memoFor(result: IteratorResult, position: number): Opaque; + abstract valueFor(result: IteratorResult, position: number): unknown; + abstract memoFor(result: IteratorResult, position: number): unknown; next(): Option { let { iterable, result, position, keyFor } = this; @@ -252,21 +249,21 @@ abstract class NativeIterator implements OpaqueIterator { } class ArrayLikeNativeIterator extends NativeIterator { - valueFor(result: IteratorResult): Opaque { + valueFor(result: IteratorResult): unknown { return result.value; } - memoFor(_result: IteratorResult, position: number): Opaque { + memoFor(_result: IteratorResult, position: number): unknown { return position; } } -class MapLikeNativeIterator extends NativeIterator<[Opaque, Opaque]> { - valueFor(result: IteratorResult<[Opaque, Opaque]>): Opaque { +class MapLikeNativeIterator extends NativeIterator<[unknown, unknown]> { + valueFor(result: IteratorResult<[unknown, unknown]>): unknown { return result.value[1]; } - memoFor(result: IteratorResult<[Opaque, Opaque]>): Opaque { + memoFor(result: IteratorResult<[unknown, unknown]>): unknown { return result.value[0]; } } @@ -310,7 +307,7 @@ class EachInIterable implements EmberIterable { if (Array.isArray(iterable) || isEmberArray(iterable)) { return ObjectIterator.fromIndexable(iterable, this.keyFor(true)); - } else if (HAS_NATIVE_SYMBOL && isNativeIterable<[Opaque, Opaque]>(iterable)) { + } else if (HAS_NATIVE_SYMBOL && isNativeIterable<[unknown, unknown]>(iterable)) { return MapLikeNativeIterator.from(iterable, this.keyFor()); } else if (hasForEach(iterable)) { return ObjectIterator.fromForEachable(iterable, this.keyFor()); @@ -376,10 +373,10 @@ class EachIterable implements EmberIterable { if (Array.isArray(iterable)) { return ArrayIterator.from(iterable, keyFor); } else if (isEmberArray(iterable)) { - return EmberArrayIterator.from(iterable as Opaque[], keyFor); - } else if (HAS_NATIVE_SYMBOL && isNativeIterable(iterable)) { + return EmberArrayIterator.from(iterable as unknown[], keyFor); + } else if (HAS_NATIVE_SYMBOL && isNativeIterable(iterable!)) { return ArrayLikeNativeIterator.from(iterable, keyFor); - } else if (hasForEach(iterable)) { + } else if (hasForEach(iterable!)) { return ArrayIterator.fromForEachable(iterable, keyFor); } else { return EMPTY_ITERATOR; @@ -418,43 +415,43 @@ class EachIterable implements EmberIterable { } interface ForEachable { - forEach(callback: (item: Opaque, key: Opaque) => void): void; + forEach(callback: (item: unknown, key: unknown) => void): void; } function hasForEach(value: object): value is ForEachable { return typeof value['forEach'] === 'function'; } -function isNativeIterable(value: object): value is Iterable { +function isNativeIterable(value: object): value is Iterable { return typeof value[Symbol.iterator] === 'function'; } interface Indexable { - readonly [key: string]: Opaque; + readonly [key: string]: unknown; } -function isIndexable(value: Opaque): value is Indexable { +function isIndexable(value: unknown): value is Indexable { return value !== null && (typeof value === 'object' || typeof value === 'function'); } -type KeyFor = (value: Opaque, memo: Opaque, position: number) => string; +type KeyFor = (value: unknown, memo: unknown, position: number) => string; // Position in an array is guarenteed to be unique -function Index(_value: Opaque, _memo: Opaque, position: number): string { +function Index(_value: unknown, _memo: unknown, position: number): string { return String(position); } // Object.keys(...) is guarenteed to be strings and unique -function ObjectKey(_value: Opaque, memo: Opaque): string { +function ObjectKey(_value: unknown, memo: unknown): string { return memo as string; } // Map keys can be any objects -function MapKey(_value: Opaque, memo: Opaque): string { +function MapKey(_value: unknown, memo: unknown): string { return Identity(memo); } -function Identity(value: Opaque): string { +function Identity(value: unknown): string { switch (typeof value) { case 'string': return value as string; @@ -466,13 +463,13 @@ function Identity(value: Opaque): string { } function KeyPath(keyPath: string): KeyFor { - return (value: Opaque) => String(get(value as any, keyPath)); + return (value: unknown) => String(get(value as any, keyPath)); } function Unique(func: KeyFor): KeyFor { let seen = {}; - return (value: Opaque, memo: Opaque, position: number) => { + return (value: unknown, memo: unknown, position: number) => { let key = func(value, memo, position); let count = seen[key]; diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts index a415c5cf1cb..2e611961f8e 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts @@ -1,13 +1,6 @@ import { Owner } from '@ember/-internals/owner'; -import { Opaque } from '@glimmer/interfaces'; -import { - combine, - createTag, - dirty, - Reference, - Tag, - VersionedPathReference, -} from '@glimmer/reference'; +import { Reference, VersionedPathReference } from '@glimmer/reference'; +import { combine, Tag, createTag, dirty } from '@glimmer/validator'; import { Factory as TemplateFactory, OwnedTemplate } from '../template'; export interface RenderState { @@ -79,7 +72,7 @@ export class RootOutletReference implements VersionedPathReference constructor(public outletState: OutletState) {} - get(key: string): VersionedPathReference { + get(key: string): VersionedPathReference { return new PathReference(this, key); } @@ -112,7 +105,7 @@ export class OutletReference implements VersionedPathReference { + get(key: string): VersionedPathReference { return new PathReference(this, key); } } @@ -121,22 +114,22 @@ export class OutletReference implements VersionedPathReference { - public parent: VersionedPathReference; +class PathReference implements VersionedPathReference { + public parent: VersionedPathReference; public key: string; public tag: Tag; - constructor(parent: VersionedPathReference, key: string) { + constructor(parent: VersionedPathReference, key: string) { this.parent = parent; this.key = key; this.tag = parent.tag; } - get(key: string): VersionedPathReference { + get(key: string): VersionedPathReference { return new PathReference(this, key); } - value(): Opaque { + value(): unknown { let parent = this.parent.value(); return parent && parent[this.key]; } diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts index 2f10f68d87d..d274ecf8dfa 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts @@ -1,6 +1,6 @@ import { symbol } from '@ember/-internals/utils'; import { MUTABLE_CELL } from '@ember/-internals/views'; -import { CapturedNamedArguments } from '@glimmer/runtime'; +import { CapturedNamedArguments } from '@glimmer/interfaces'; import { ARGS } from '../component'; import { ACTION, UPDATE } from './references'; diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts index 87d91364960..deebc32f3f8 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/references.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/references.ts @@ -12,15 +12,13 @@ import { isProxy, symbol } from '@ember/-internals/utils'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { assert, debugFreeze } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { Dict, Opaque } from '@glimmer/interfaces'; +import { Dict, CapturedArguments } from '@glimmer/interfaces'; +import { ConstReference, VersionedPathReference, VersionedReference } from '@glimmer/reference'; import { combine, COMPUTE, - ConstReference, - createTag, - createUpdatableTag, - dirty, DirtyableTag, + dirty, isConst, Revision, Tag, @@ -28,11 +26,10 @@ import { update, validate, value, - VersionedPathReference, - VersionedReference, -} from '@glimmer/reference'; + createUpdatableTag, + createTag, +} from '@glimmer/validator'; import { - CapturedArguments, ConditionalReference as GlimmerConditionalReference, PrimitiveReference, UNDEFINED_REFERENCE, @@ -45,20 +42,20 @@ export const UPDATE = symbol('UPDATE'); export const INVOKE = symbol('INVOKE'); export const ACTION = symbol('ACTION'); -abstract class EmberPathReference implements VersionedPathReference { +abstract class EmberPathReference implements VersionedPathReference { abstract tag: Tag; - get(key: string): VersionedPathReference { + get(key: string): VersionedPathReference { return PropertyReference.create(this, key); } - abstract value(): Opaque; + abstract value(): unknown; } export abstract class CachedReference extends EmberPathReference { abstract tag: Tag; private lastRevision: Option; - private lastValue: Opaque; + private lastValue: unknown; constructor() { super(); @@ -66,9 +63,9 @@ export abstract class CachedReference extends EmberPathReference { this.lastValue = null; } - abstract compute(): Opaque; + abstract compute(): unknown; - value(): Opaque { + value(): unknown { let { tag, lastRevision, lastValue } = this; if (lastRevision === null || !validate(tag, lastRevision)) { @@ -86,14 +83,14 @@ export class RootReference extends ConstReference return valueToRef(value); } - private children: Dict>; + private children: Dict>; constructor(value: T) { super(value); this.children = Object.create(null); } - get(propertyKey: string): VersionedPathReference { + get(propertyKey: string): VersionedPathReference { let ref = this.children[propertyKey]; if (ref === undefined) { @@ -105,26 +102,26 @@ export class RootReference extends ConstReference } let TwoWayFlushDetectionTag: { - create(tag: Tag, key: string, ref: VersionedPathReference): Tag; + create(tag: Tag, key: string, ref: VersionedPathReference): Tag; }; if (DEBUG) { TwoWayFlushDetectionTag = class TwoWayFlushDetectionTag { - static create(tag: Tag, key: string, ref: VersionedPathReference): Tag { + static create(tag: Tag, key: string, ref: VersionedPathReference): Tag { return (new TwoWayFlushDetectionTag(tag, key, ref) as unknown) as Tag; } constructor( private tag: Tag, private key: string, - private ref: VersionedPathReference + private ref: VersionedPathReference ) {} [COMPUTE](): Revision { return this.tag[COMPUTE](); } - didCompute(parent: Opaque): void { + didCompute(parent: unknown): void { didRender(parent, this.key, this.ref); } }; @@ -133,7 +130,7 @@ if (DEBUG) { export abstract class PropertyReference extends CachedReference { abstract tag: Tag; - static create(parentReference: VersionedPathReference, propertyKey: string) { + static create(parentReference: VersionedPathReference, propertyKey: string) { if (isConst(parentReference)) { return valueKeyToRef(parentReference.value(), propertyKey); } else { @@ -141,13 +138,13 @@ export abstract class PropertyReference extends CachedReference { } } - get(key: string): VersionedPathReference { + get(key: string): VersionedPathReference { return new NestedPropertyReference(this, key); } } export class RootPropertyReference extends PropertyReference - implements VersionedPathReference { + implements VersionedPathReference { public tag: Tag; private propertyTag: UpdatableTag; @@ -172,7 +169,7 @@ export class RootPropertyReference extends PropertyReference } } - compute(): Opaque { + compute(): unknown { let { parentValue, propertyKey } = this; if (DEBUG) { @@ -195,7 +192,7 @@ export class RootPropertyReference extends PropertyReference return ret; } - [UPDATE](value: Opaque): void { + [UPDATE](value: unknown): void { set(this.parentValue, this.propertyKey, value); } } @@ -211,7 +208,7 @@ export class NestedPropertyReference extends PropertyReference { private propertyTag: UpdatableTag; constructor( - private parentReference: VersionedPathReference, + private parentReference: VersionedPathReference, private propertyKey: string ) { super(); @@ -227,7 +224,7 @@ export class NestedPropertyReference extends PropertyReference { } } - compute(): Opaque { + compute(): unknown { let { parentReference, propertyTag, propertyKey } = this; let _parentValue = parentReference.value(); @@ -269,7 +266,7 @@ export class NestedPropertyReference extends PropertyReference { } } - [UPDATE](value: Opaque): void { + [UPDATE](value: unknown): void { set( this.parentReference.value() as object /* let the other side handle the error */, this.propertyKey, @@ -294,20 +291,20 @@ if (DEBUG) { export class UpdatableReference extends EmberPathReference { public tag: DirtyableTag; - private _value: Opaque; + private _value: unknown; - constructor(value: Opaque) { + constructor(value: unknown) { super(); this.tag = createTag(); this._value = value; } - value(): Opaque { + value(): unknown { return this._value; } - update(value: Opaque): void { + update(value: unknown): void { let { _value } = this; if (value !== _value) { @@ -320,7 +317,7 @@ export class UpdatableReference extends EmberPathReference { export class ConditionalReference extends GlimmerConditionalReference implements VersionedReference { public objectTag: UpdatableTag; - static create(reference: VersionedReference): VersionedReference { + static create(reference: VersionedReference): VersionedReference { if (isConst(reference)) { let value = reference.value(); @@ -332,13 +329,13 @@ export class ConditionalReference extends GlimmerConditionalReference return new ConditionalReference(reference); } - constructor(reference: VersionedReference) { + constructor(reference: VersionedReference) { super(reference); this.objectTag = createUpdatableTag(); this.tag = combine([reference.tag, this.objectTag]); } - toBool(predicate: Opaque): boolean { + private toBool(predicate: unknown): boolean { if (isProxy(predicate)) { update(this.objectTag, tagForProperty(predicate, 'isTruthy')); return Boolean(get(predicate, 'isTruthy')); @@ -379,7 +376,7 @@ export class SimpleHelperReference extends CachedReference { this.tag = combine([args.tag, computeTag]); } - compute(): Opaque { + compute(): unknown { let { helper, computeTag, @@ -418,7 +415,7 @@ export class ClassBasedHelperReference extends CachedReference { this.tag = combine([instance[RECOMPUTE_TAG], args.tag, computeTag]); } - compute(): Opaque { + compute(): unknown { let { instance, computeTag, @@ -448,14 +445,14 @@ export class InternalHelperReference extends CachedReference { public tag: Tag; constructor( - private helper: (args: CapturedArguments) => Opaque, + private helper: (args: CapturedArguments) => unknown, private args: CapturedArguments ) { super(); this.tag = args.tag; } - compute(): Opaque { + compute(): unknown { let { helper, args } = this; return helper(args); } @@ -466,7 +463,7 @@ export class UnboundReference extends ConstReference { return valueToRef(value, false); } - get(key: string): VersionedPathReference { + get(key: string): VersionedPathReference { return valueToRef(this.inner[key], false); } } @@ -474,7 +471,7 @@ export class UnboundReference extends ConstReference { export class ReadonlyReference extends CachedReference { public tag: Tag; - constructor(private inner: VersionedPathReference) { + constructor(private inner: VersionedPathReference) { super(); this.tag = inner.tag; } @@ -483,7 +480,7 @@ export class ReadonlyReference extends CachedReference { return this.inner[INVOKE]; } - compute(): Opaque { + compute(): unknown { return this.inner.value(); } @@ -493,9 +490,9 @@ export class ReadonlyReference extends CachedReference { } export function referenceFromParts( - root: VersionedPathReference, + root: VersionedPathReference, parts: string[] -): VersionedPathReference { +): VersionedPathReference { let reference = root; for (let i = 0; i < parts.length; i++) { @@ -567,7 +564,7 @@ function valueToRef(value: T, bound = true): VersionedPathReference } } -function valueKeyToRef(value: unknown, key: string): VersionedPathReference { +function valueKeyToRef(value: unknown, key: string): VersionedPathReference { if (isObject(value)) { // root of interop with ember objects return new RootPropertyReference(value, key); diff --git a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts index eec6b59865c..0dd89d70ed7 100644 --- a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts +++ b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts @@ -1,7 +1,6 @@ import { isArray } from '@ember/-internals/runtime'; -import { Opaque } from '@glimmer/interfaces'; -export default function toBool(predicate: Opaque): boolean { +export default function toBool(predicate: unknown): boolean { if (isArray(predicate)) { return (predicate as { length: number }).length !== 0; } else { diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts index ae4eaf7226b..2e871d687cc 100644 --- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts +++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts @@ -1,7 +1,7 @@ import { OWNER, Owner } from '@ember/-internals/owner'; import { assign } from '@ember/polyfills'; import { schedule } from '@ember/runloop'; -import { Simple } from '@glimmer/interfaces'; +import { SimpleElement } from '@simple-dom/interface'; import { OutletDefinitionState } from '../component-managers/outlet'; import { Renderer } from '../renderer'; import { OwnedTemplate } from '../template'; @@ -71,7 +71,7 @@ export default class OutletView { }; } - appendTo(selector: string | Simple.Element) { + appendTo(selector: string | SimpleElement) { let target; if (this._environment.hasDOM) { diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts index a527c6de7e6..3873b8eec9e 100644 --- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts +++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts @@ -15,15 +15,15 @@ import Controller from '@ember/controller'; import { captureRenderTree } from '@ember/debug'; import Engine from '@ember/engine'; import EngineInstance from '@ember/engine/instance'; -import { Simple } from '@glimmer/interfaces'; import { expect } from '@glimmer/util'; +import { SimpleElement, SimpleNode } from '@simple-dom/interface'; import { compile } from 'ember-template-compiler'; import { runTask } from 'internal-test-helpers/lib/run'; interface CapturedBounds { - parentElement: Simple.Element; - firstNode: Simple.Node; - lastNode: Simple.Node; + parentElement: SimpleElement; + firstNode: SimpleNode; + lastNode: SimpleNode; } type Expected = T | ((actual: T) => boolean); @@ -1512,17 +1512,17 @@ if (ENV._DEBUG_RENDER_TREE) { parentElement: (expect( node.parentNode, 'BUG: detached node' - ) as Simple.Node) as Simple.Element, - firstNode: node as Simple.Node, - lastNode: node as Simple.Node, + ) as SimpleNode) as SimpleElement, + firstNode: node as SimpleNode, + lastNode: node as SimpleNode, }; } elementBounds(element: Element): CapturedBounds { return { - parentElement: element as Simple.Element, - firstNode: element.firstChild! as Simple.Node, - lastNode: element.lastChild! as Simple.Node, + parentElement: element as SimpleElement, + firstNode: element.firstChild! as SimpleNode, + lastNode: element.lastChild! as SimpleNode, }; } diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts index ba9c29bab76..d180586eee7 100644 --- a/packages/@ember/-internals/meta/lib/meta.ts +++ b/packages/@ember/-internals/meta/lib/meta.ts @@ -1,7 +1,7 @@ import { lookupDescriptor, symbol, toString } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { createUpdatableTag, UpdatableTag } from '@glimmer/reference'; +import { createUpdatableTag, UpdatableTag } from '@glimmer/validator'; type ObjMap = { [key: string]: T }; diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts index 99f30047d38..cb7f5d4ed5a 100644 --- a/packages/@ember/-internals/metal/lib/alias.ts +++ b/packages/@ember/-internals/metal/lib/alias.ts @@ -3,7 +3,7 @@ import { inspect } from '@ember/-internals/utils'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { assert } from '@ember/debug'; import EmberError from '@ember/error'; -import { combine, UpdatableTag, update, validate, value } from '@glimmer/reference'; +import { combine, UpdatableTag, update, validate, value } from '@glimmer/validator'; import { finishLazyChains, getChainTagsForKey } from './chain-tags'; import { getCachedValueFor, diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts index eaea2d8a3de..c2d9418484a 100644 --- a/packages/@ember/-internals/metal/lib/chain-tags.ts +++ b/packages/@ember/-internals/metal/lib/chain-tags.ts @@ -1,6 +1,6 @@ import { meta as metaFor, peekMeta } from '@ember/-internals/meta'; import { assert, deprecate } from '@ember/debug'; -import { combine, createUpdatableTag, Tag, update, validate } from '@glimmer/reference'; +import { combine, createUpdatableTag, Tag, update, validate } from '@glimmer/validator'; import { objectAt } from './array'; import { getLastRevisionFor, peekCacheFor } from './computed_cache'; import { descriptorForProperty } from './descriptor_map'; diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts index dd83f00fe51..efb4ad9c461 100644 --- a/packages/@ember/-internals/metal/lib/computed.ts +++ b/packages/@ember/-internals/metal/lib/computed.ts @@ -10,7 +10,7 @@ import { update, validate, value as tagValue, -} from '@glimmer/reference'; +} from '@glimmer/validator'; import { finishLazyChains, getChainTagsForKeys } from './chain-tags'; import { getCachedValueFor, diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts index 4ebe408e114..9453088a3d9 100644 --- a/packages/@ember/-internals/metal/lib/observer.ts +++ b/packages/@ember/-internals/metal/lib/observer.ts @@ -2,7 +2,7 @@ import { ENV } from '@ember/-internals/environment'; import { peekMeta } from '@ember/-internals/meta'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { schedule } from '@ember/runloop'; -import { combine, CURRENT_TAG, Tag, validate, value } from '@glimmer/reference'; +import { combine, CURRENT_TAG, Tag, validate, value } from '@glimmer/validator'; import { getChainTagsForKey } from './chain-tags'; import changeEvent from './change_event'; import { addListener, removeListener, sendEvent } from './events'; diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts index 434dbf84ac7..bb09d1d879d 100644 --- a/packages/@ember/-internals/metal/lib/tags.ts +++ b/packages/@ember/-internals/metal/lib/tags.ts @@ -3,7 +3,7 @@ import { isProxy, setupMandatorySetter, symbol } from '@ember/-internals/utils'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { backburner } from '@ember/runloop'; import { DEBUG } from '@glimmer/env'; -import { CONSTANT_TAG, createTag, createUpdatableTag, dirty, Tag } from '@glimmer/reference'; +import { Tag, CONSTANT_TAG, createTag, createUpdatableTag, dirty } from '@glimmer/validator'; export const UNKNOWN_PROPERTY_TAG = symbol('UNKNOWN_PROPERTY_TAG'); diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts index 27fa79cbfa9..7e0b5c8f9d9 100644 --- a/packages/@ember/-internals/metal/lib/tracked.ts +++ b/packages/@ember/-internals/metal/lib/tracked.ts @@ -1,7 +1,7 @@ import { isEmberArray } from '@ember/-internals/utils'; import { assert } from '@ember/debug'; import { DEBUG } from '@glimmer/env'; -import { combine, CONSTANT_TAG, Tag, UpdatableTag, update } from '@glimmer/reference'; +import { combine, CONSTANT_TAG, Tag, UpdatableTag, update } from '@glimmer/validator'; import { Decorator, DecoratorPropertyDescriptor, isElementDescriptor } from './decorator'; import { setClassicDecorator } from './descriptor_map'; import { markObjectAsDirty, tagForProperty } from './tags'; diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js index 3eccab3984f..8a8da14bb63 100644 --- a/packages/@ember/-internals/metal/tests/alias_test.js +++ b/packages/@ember/-internals/metal/tests/alias_test.js @@ -13,7 +13,7 @@ import { import { Object as EmberObject } from '@ember/-internals/runtime'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers'; -import { value, validate } from '@glimmer/reference'; +import { value, validate } from '@glimmer/validator'; let obj, count; diff --git a/packages/@ember/-internals/metal/tests/tracked/classic_classes_test.js b/packages/@ember/-internals/metal/tests/tracked/classic_classes_test.js index d6cfb955981..6e9a841afac 100644 --- a/packages/@ember/-internals/metal/tests/tracked/classic_classes_test.js +++ b/packages/@ember/-internals/metal/tests/tracked/classic_classes_test.js @@ -2,7 +2,7 @@ import { AbstractTestCase, moduleFor } from 'internal-test-helpers'; import { defineProperty, tracked, track, nativeDescDecorator } from '../..'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; -import { value, validate } from '@glimmer/reference'; +import { value, validate } from '@glimmer/validator'; if (EMBER_METAL_TRACKED_PROPERTIES) { moduleFor( diff --git a/packages/@ember/-internals/metal/tests/tracked/validation_test.js b/packages/@ember/-internals/metal/tests/tracked/validation_test.js index 703e463f125..ba475d99761 100644 --- a/packages/@ember/-internals/metal/tests/tracked/validation_test.js +++ b/packages/@ember/-internals/metal/tests/tracked/validation_test.js @@ -12,7 +12,7 @@ import { import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { EMBER_ARRAY } from '@ember/-internals/utils'; import { AbstractTestCase, moduleFor } from 'internal-test-helpers'; -import { value, validate } from '@glimmer/reference'; +import { value, validate } from '@glimmer/validator'; if (EMBER_METAL_TRACKED_PROPERTIES) { moduleFor( diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js index f0244f783cd..36bb10bdb77 100644 --- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js +++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js @@ -19,7 +19,7 @@ import { import { setProxy } from '@ember/-internals/utils'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { assert } from '@ember/debug'; -import { combine, update } from '@glimmer/reference'; +import { combine, update } from '@glimmer/validator'; export function contentFor(proxy, m) { let content = get(proxy, 'content'); diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js index 2c52936ec41..25d07f6d4df 100644 --- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js +++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js @@ -16,7 +16,7 @@ import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import EmberObject from './object'; import { isArray, MutableArray } from '../mixins/array'; import { assert } from '@ember/debug'; -import { combine, validate, value } from '@glimmer/reference'; +import { combine, validate, value } from '@glimmer/validator'; const ARRAY_OBSERVER_MAPPING = { willChange: '_arrangedContentArrayWillChange', diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts index 143017ca5ae..8ea560ad229 100644 --- a/packages/@ember/-internals/views/index.d.ts +++ b/packages/@ember/-internals/views/index.d.ts @@ -1,7 +1,7 @@ -import { Simple, Template, Option } from '@glimmer/interfaces'; -import { Opaque } from '@glimmer/util'; +import { Template, Option } from '@glimmer/interfaces'; import { Factory, Owner } from '@ember/-internals/owner'; import { TemplateFactory } from '@ember/-internals/glimmer'; +import { SimpleElement } from '@simple-dom/interface'; export interface StaticTemplateMeta { moduleName: string; @@ -22,14 +22,14 @@ export const ViewMixin: any; export const ViewStateSupport: any; export const TextSupport: any; -export function getElementView(element: Simple.Element): Opaque; -export function getViewElement(view: Opaque): Option; -export function setElementView(element: Simple.Element, view: Opaque): void; -export function setViewElement(view: Opaque, element: Simple.Element): void; -export function clearElementView(element: Simple.Element): void; -export function clearViewElement(view: Opaque): void; +export function getElementView(element: SimpleElement): unknown; +export function getViewElement(view: unknown): Option; +export function setElementView(element: SimpleElement, view: unknown): void; +export function setViewElement(view: unknown, element: SimpleElement): void; +export function clearElementView(element: SimpleElement): void; +export function clearViewElement(view: unknown): void; -export function addChildView(parent: Opaque, child: Opaque): void; +export function addChildView(parent: unknown, child: unknown): void; export function isSimpleClick(event: Event): boolean; diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts index 4c4f23cae8a..885bd43fb33 100644 --- a/packages/@ember/object/compat.ts +++ b/packages/@ember/object/compat.ts @@ -10,7 +10,7 @@ import { } from '@ember/-internals/metal'; import { EMBER_METAL_TRACKED_PROPERTIES } from '@ember/canary-features'; import { assert } from '@ember/debug'; -import { UpdatableTag, update } from '@glimmer/reference'; +import { UpdatableTag, update } from '@glimmer/validator'; let wrapGetterSetter = function(_target: object, key: string, desc: PropertyDescriptor) { let { get: originalGet } = desc; diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts index c5c2c1c18fc..4d7740d066f 100644 --- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts +++ b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts @@ -4,11 +4,11 @@ import calculateLocationDisplay from '../system/calculate-location-display'; import { Builders } from '../types'; function isInlineLinkTo(node: AST.MustacheStatement): boolean { - return node.path.original === 'link-to'; + return expectPath(node.path).original === 'link-to'; } function isBlockLinkTo(node: AST.BlockStatement): boolean { - return node.path.original === 'link-to'; + return expectPath(node.path).original === 'link-to'; } function isSubExpression(node: AST.Expression): node is AST.SubExpression { @@ -16,7 +16,15 @@ function isSubExpression(node: AST.Expression): node is AST.SubExpression { } function isQueryParams(node: AST.Expression): node is AST.SubExpression { - return isSubExpression(node) && node.path.original === 'query-params'; + return isSubExpression(node) && expectPath(node.path).original === 'query-params'; +} + +function expectPath(node: AST.Expression): AST.PathExpression { + if (node.type !== 'PathExpression') { + throw new Error(`Expected a PathExpression, got ${node.type}`); + } + + return node; } function transformInlineLinkToIntoBlockForm( diff --git a/yarn.lock b/yarn.lock index 6447c97bf5c..a51facfc849 100644 --- a/yarn.lock +++ b/yarn.lock @@ -775,122 +775,126 @@ resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.1.1.tgz#d5732c3da593f202e6e1ac6dbee56a758242403f" integrity sha512-GEhri78jdQp/xxPpM6z08KlB0wrHfnfrJ9dmQk7JeQ4XCiMzXsJci7yooQgg/IcTKCM/PxE/IkGCQAo80adMkw== -"@glimmer/compiler@0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.5-alpha.3.tgz#1e5c5e6779c95dac77e81dc96822bef035a68c57" - integrity sha512-ih35kzH9iCl9RP8awREVVr25+27HxcbkDQuPdApmeDTuc+7tTvr40OBcEG9GLLPfdWXd5bP5eq0hITlAQvVW4g== +"@glimmer/compiler@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.44.0.tgz#711232d451ff854a33da755df5703774fc421131" + integrity sha512-yxCd8yADC9EAH/lr4xz9rq6iWqpW/9T3RNAevYpuJc/A6iwDDZugDix+fHBYSiJEWM5sb5Dg1xjaYJ9ES+8eog== dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/syntax" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" - "@glimmer/wire-format" "^0.38.5-alpha.3" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/syntax" "^0.44.0" + "@glimmer/util" "^0.44.0" + "@glimmer/wire-format" "^0.44.0" -"@glimmer/encoder@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.38.5-alpha.3.tgz#a6572e09a3e56f507a6503f2921df8fcc794981c" - integrity sha512-T4vfEG24nIoVWLavzjaUAAP9oPenIakKcqvXQNoj5P+2aLKLJau2jAzU/vMLzv4rS+hZWD5bpz0IVWoiKiV09w== +"@glimmer/encoder@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.44.0.tgz#b612683aad3dcf90540b81030f1e5b79bbc9f9d7" + integrity sha512-6/P4Ya2/2EYfa6ukNFTHdcxbdwI60dgEtUBCrFIlF4Dmqg6OiRBx65SeFhmZiWhHCvvHaDUjc8TTt7GeXeQEYw== dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/vm" "^0.38.5-alpha.3" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/vm" "^0.44.0" "@glimmer/env@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc= -"@glimmer/interfaces@0.38.5-alpha.3", "@glimmer/interfaces@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.5-alpha.3.tgz#e68a51ad2900ee3929fda76d42c0b581356d8ca7" - integrity sha512-VvnzMeZa6+UUdDsjEHe/zjGQywMjyegKmFA45xa0fjD6bL22GoKFXucIe9oi72BWEukM2+hNd9bXYioUg8mkOA== - dependencies: - "@glimmer/wire-format" "^0.38.5-alpha.3" - "@simple-dom/interface" "1.4.0" - -"@glimmer/low-level@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.38.5-alpha.3.tgz#4269003a4bc665da9bd4236f16803b197c518c5c" - integrity sha512-t+erJ598CKw43ZatsLPaLMQAySYEB00dJk/EUVBmJOCZS8413g1mnuuQJkrHiQ8nE7Zklyc2vEzKaPYgjxp67Q== - -"@glimmer/node@0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.38.5-alpha.3.tgz#e3d1386b4b4b1170524f6c554ef7f75de7b3d890" - integrity sha512-KSCXYhl1dv3UgKDQMy4pqB+BsV/BBo7Bd0N45+5OrVU0cSvXOG0Ak512UXwiVS68PQ2qz5u8vh/+chFh5wLa2A== - dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/runtime" "^0.38.5-alpha.3" - -"@glimmer/opcode-compiler@0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.38.5-alpha.3.tgz#48d287f5d0342162f2afcb29dc55e6b87695a94c" - integrity sha512-CrqmYvVVe1460ownzS48NOXI7nlfvMTfM1rrzGw7hv3h2UwQ7EHedO81Mg7Hsb/fc/C4UxvMpfiicKeQVbzh5g== - dependencies: - "@glimmer/encoder" "^0.38.5-alpha.3" - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/program" "^0.38.5-alpha.3" - "@glimmer/reference" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" - "@glimmer/vm" "^0.38.5-alpha.3" - "@glimmer/wire-format" "^0.38.5-alpha.3" - -"@glimmer/program@0.38.5-alpha.3", "@glimmer/program@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.38.5-alpha.3.tgz#55a32da10cb33c1fd436f35c77f7750a332008d4" - integrity sha512-Neyi4jGS7/igXMc+bpIETRQWLgDQuU6vxvwbIpOWAtf8MFInBl42Bo6rekcVktPmsNxPPBpjEDnapucteYE8gA== - dependencies: - "@glimmer/encoder" "^0.38.5-alpha.3" - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" - -"@glimmer/reference@0.38.5-alpha.3", "@glimmer/reference@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.38.5-alpha.3.tgz#f5291bc7f5adfaa8583b00696a7fdab3889ad781" - integrity sha512-F7rZha3h3/xuR2xLDYRJY0GlWh5ctSNI8OXQ9+L3E9DYVpqtqGQUfWAUfPVBmqXRyJzppIS2BceCTT4vaXpHKg== - dependencies: - "@glimmer/util" "^0.38.5-alpha.3" - -"@glimmer/runtime@0.38.5-alpha.3", "@glimmer/runtime@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.38.5-alpha.3.tgz#74255bbedea684b9460ab7be86ba31c9be8a0a6d" - integrity sha512-ofMBR984oNfvCR6z2RTSzZr3e897JW95xK/MQcfr1P3UCJr7+zdKECm861cNVMOmaCH2bv2rQxoplWs1SEULXg== - dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/low-level" "^0.38.5-alpha.3" - "@glimmer/program" "^0.38.5-alpha.3" - "@glimmer/reference" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" - "@glimmer/vm" "^0.38.5-alpha.3" - "@glimmer/wire-format" "^0.38.5-alpha.3" - "@simple-dom/interface" "^1.4.0" - -"@glimmer/syntax@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.5-alpha.3.tgz#da6c1daba1ada18493a1fc0879b2e8d1313b35af" - integrity sha512-hpYevmtgXrJxqJ9/07VAUNx86FGzoCcZi5SzVdFmN/YUuWEdjZjx2bNOCUDSx8SwssWpJJnxizHx77YII0Ftbw== - dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" - handlebars "^4.0.6" +"@glimmer/interfaces@0.44.0", "@glimmer/interfaces@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.44.0.tgz#0896204815f05fd8907b5703cbaee9d1b9edf5d3" + integrity sha512-O1VBrB1uhWh/XpBRaMbT5zncZiJJNTAqe0rnhRr4JicrlmNoIC4/5ADRgDORj5oBxuENjuZ+6UTul3WCOHETiw== + +"@glimmer/low-level@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.44.0.tgz#c164efc7e946d7cbbe54c258e64b9148e971c871" + integrity sha512-qOayju1J3vpQUT21QxafbP/7EIxY0ve5B9Biyk3i9MCb1BRnTL2OPoNK7Ia5uuA8qbwIk/PuNqx+uHYoOipXMw== + +"@glimmer/node@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.44.0.tgz#d15606b59f726d91e412c073c46cd40f2e046b42" + integrity sha512-Ylbn4VHgkvo7z+sXozyF4z2LwfqNgnb6PkmUxrZRwlfxTH4tFvmFN4yoHzlFdgSP7clh3N3ZsiRdIuxlHl85sQ== + dependencies: + "@glimmer/interfaces" "^0.44.0" + "@glimmer/runtime" "^0.44.0" + +"@glimmer/opcode-compiler@0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.44.0.tgz#7c27408827e1367e17f1f0f63a1d8c0b8df129a0" + integrity sha512-tLwHcEI9EIgEHOS2fGu3ke8FrA5MtQuTZPfrRL4Q29ofssKMJTN8IcPgpVVVEMozTX4Yoqutipv5VwM9FFul1g== + dependencies: + "@glimmer/encoder" "^0.44.0" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/program" "^0.44.0" + "@glimmer/reference" "^0.44.0" + "@glimmer/util" "^0.44.0" + "@glimmer/vm" "^0.44.0" + "@glimmer/wire-format" "^0.44.0" + +"@glimmer/program@0.44.0", "@glimmer/program@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.44.0.tgz#93e7feebac2e43f60af21a815e4d0c5bc5d4c9c1" + integrity sha512-y1EKDBb+/bxhufEygGmbtv2UX0BMPkCXJZ/cEqykYMjRpL1CvmB+TEks87QflGNGJ0vAMw/Li2ihi303r6p9XA== + dependencies: + "@glimmer/encoder" "^0.44.0" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/util" "^0.44.0" + +"@glimmer/reference@0.44.0", "@glimmer/reference@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.44.0.tgz#5478f993e5c3d75bf63951c1a35caa63a9758dac" + integrity sha512-rNK2WhP656EfjCZCK7sh7gdYD+uXK5OF4JAQXmJLmYGLMpYsTII3qXGalQqqsdN7MH0PvdGRgPQOirg+nm1i8Q== + dependencies: + "@glimmer/util" "^0.44.0" + "@glimmer/validator" "^0.44.0" + +"@glimmer/runtime@0.44.0", "@glimmer/runtime@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.44.0.tgz#44b996ae3bdeb5106b571966ef5bf8455671cead" + integrity sha512-HLthTJpPZ9Zfq+oU4UbANUYOCmmX/fMRuW0IWntEkNTNlIqQUWdF2o3ZmEL7VWc7el5UQrOJMqyvAQKcngOftQ== + dependencies: + "@glimmer/interfaces" "^0.44.0" + "@glimmer/low-level" "^0.44.0" + "@glimmer/program" "^0.44.0" + "@glimmer/reference" "^0.44.0" + "@glimmer/util" "^0.44.0" + "@glimmer/validator" "^0.44.0" + "@glimmer/vm" "^0.44.0" + "@glimmer/wire-format" "^0.44.0" + +"@glimmer/syntax@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.44.0.tgz#66a4d0a5047becb210259e7678b6efa9c14dbc6f" + integrity sha512-B/kLng2z9Cf/7jbfY7p50Q/3ouUouVT5jBgGVVTJJHvtCbrNszdMj3XY0v3hLxB83TASXf1dwJh3CNni82JnOQ== + dependencies: + "@glimmer/interfaces" "^0.44.0" + "@glimmer/util" "^0.44.0" + handlebars "^4.5.1" simple-html-tokenizer "^0.5.8" -"@glimmer/util@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.5-alpha.3.tgz#8d8084cef9ebbac1a757ac1b5bc6ba4948bd7e68" - integrity sha512-0gu7hN37tYhsGy+eHrAEYcielPNwDXsMo3IvD02K8MPJNHfhitofV5kFYJ8DpkNvZ5gMhD2As/461XKrwUdQKw== +"@glimmer/util@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9" + integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg== -"@glimmer/vm@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.38.5-alpha.3.tgz#d2a3477db184b7bbcb04270d3dc25a271d3c9f5c" - integrity sha512-ODW/hIzksJGm4aMjWb6QA1QeLqkLxfkbdvyvoH+WMhXvKkjsf9fQA9TYYPJD7ATe8KkaQWqyRatvqYS+3OoHng== +"@glimmer/validator@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1" + integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw== + +"@glimmer/vm@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.44.0.tgz#19c67a073a2e74aa05228734c6ac9c5987f3d75c" + integrity sha512-dko48uNQi6s1jSMn79h6lhcCBz8coBxXzdi//TpMFAboTEtRuyxQ2FEfIFACyamGQ7tmPKcrSzrT6zTj5eJUJA== dependencies: - "@glimmer/interfaces" "^0.38.5-alpha.3" - "@glimmer/util" "^0.38.5-alpha.3" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/util" "^0.44.0" -"@glimmer/wire-format@^0.38.5-alpha.3": - version "0.38.5-alpha.3" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.5-alpha.3.tgz#f79cc3b886a0fa322d8743820eb88d25a7f8304f" - integrity sha512-HQaNJCDTHNQTrTwCSKNB2vAsHW/gbYl+C7hPyZSbSYsEz3y+YOf6eZC8GSUMprErBeWkSLdXAa0RYUavUEEzLQ== +"@glimmer/wire-format@^0.44.0": + version "0.44.0" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.44.0.tgz#0970152d900bdadb6520eb9c183a76f50a0015de" + integrity sha512-tBTMaVKNMwddn2ffIcaZuYPMDfiRf6TF77oU4MEdF8y6E7XJJ5UcYrRUchYFizoE1V60f+Udh7zxZyjyDjW2/Q== dependencies: - "@glimmer/util" "^0.38.5-alpha.3" + "@glimmer/interfaces" "^0.44.0" + "@glimmer/util" "^0.44.0" "@simple-dom/document@^1.4.0": version "1.4.0" @@ -899,7 +903,7 @@ dependencies: "@simple-dom/interface" "^1.4.0" -"@simple-dom/interface@1.4.0", "@simple-dom/interface@^1.4.0": +"@simple-dom/interface@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f" integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA== @@ -4315,7 +4319,7 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.0.6: +handlebars@^4.0.11, handlebars@^4.0.4: version "4.1.0" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.0.tgz#0d6a6f34ff1f63cecec8423aa4169827bf787c3a" integrity sha512-l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w== @@ -4326,6 +4330,17 @@ handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.0.6: optionalDependencies: uglify-js "^3.1.4" +handlebars@^4.5.1: + version "4.5.1" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.1.tgz#8a01c382c180272260d07f2d1aa3ae745715c7ba" + integrity sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA== + dependencies: + neo-async "^2.6.0" + optimist "^0.6.1" + source-map "^0.6.1" + optionalDependencies: + uglify-js "^3.1.4" + has-ansi@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-1.0.3.tgz#c0b5b1615d9e382b0ff67169d967b425e48ca538" @@ -6057,6 +6072,11 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +neo-async@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"