Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start GlimmerVM 0.44.0 update #18454

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion broccoli/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<DefinitionState>
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -36,10 +39,10 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
hasDefaultBlock: boolean
): T;

abstract getSelf(component: T): VersionedPathReference<Opaque>;
abstract getSelf(component: T): VersionedPathReference<unknown>;
abstract getCapabilities(state: U): ComponentCapabilities;

didCreateElement(_component: T, _element: Simple.Element, _operations: ElementOperations): void {
didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void {
// noop
}

Expand Down
20 changes: 11 additions & 9 deletions packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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<string>,
component: Component,
operations: ElementOperations
Expand Down Expand Up @@ -360,7 +362,7 @@ export default class CurlyComponentManager

didCreateElement(
{ component, classRef, environment }: ComponentStateBucket,
element: Simple.Element,
element: SimpleElement,
operations: ElementOperations
): void {
setViewElement(component, element);
Expand Down
35 changes: 18 additions & 17 deletions packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -88,14 +86,14 @@ export interface Capabilities {

// TODO: export ICapturedArgumentsValue from glimmer and replace this
export interface Args {
named: Dict<Opaque>;
positional: Opaque[];
named: Dict<unknown>;
positional: unknown[];
}

export interface ManagerDelegate<ComponentInstance> {
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<ComponentInstance>(
Expand Down Expand Up @@ -144,8 +142,8 @@ export interface ManagerDelegateWithDestructors<ComponentInstance>
}

export interface ComponentArguments {
positional: Opaque[];
named: Dict<Opaque>;
positional: unknown[];
named: Dict<unknown>;
}

/**
Expand Down Expand Up @@ -322,7 +320,10 @@ export default class CustomComponentManager<ComponentInstance>
delegate.getContext(component);
}

getSelf({ delegate, component }: CustomComponentState<ComponentInstance>): PathReference<Opaque> {
getSelf({
delegate,
component,
}: CustomComponentState<ComponentInstance>): PathReference<unknown> {
return RootReference.create(delegate.getContext(component));
}

Expand Down
16 changes: 12 additions & 4 deletions packages/@ember/-internals/glimmer/lib/component-managers/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
27 changes: 12 additions & 15 deletions packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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<any>;
environment: Environment;
modelRef?: VersionedPathReference<Opaque>;
modelRef?: VersionedPathReference<unknown>;
}

interface EngineDefinitionState {
Expand Down Expand Up @@ -130,7 +127,7 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
return bucket;
}

getSelf({ self }: EngineState): VersionedPathReference<Opaque> {
getSelf({ self }: EngineState): VersionedPathReference<unknown> {
return self;
}

Expand Down
22 changes: 12 additions & 10 deletions packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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}` };
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading