Skip to content

Commit fb1a5ab

Browse files
committed
Revert "rename Component to EmberComponent"
This reverts commit 803f06b.
1 parent 803f06b commit fb1a5ab

File tree

7 files changed

+29
-32
lines changed

7 files changed

+29
-32
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ export { default as RootTemplate } from './lib/templates/root';
450450
export { default as Input } from './lib/components/input';
451451
export { default as LinkTo } from './lib/components/link-to';
452452
export { default as Textarea } from './lib/components/textarea';
453-
export { default as EmberComponent } from './lib/component';
453+
export { default as Component } from './lib/component';
454454
export {
455455
default as Helper,
456456
helper,

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import {
3939
validateTag,
4040
valueForTag,
4141
} from '@glimmer/validator';
42-
import type EmberComponent from '../component';
42+
import type Component from '../component';
4343
import type { DynamicScope } from '../renderer';
4444
import type RuntimeResolver from '../resolver';
4545
import { isTemplateFactory } from '../template';
@@ -77,8 +77,8 @@ function aliasIdToElementId(args: VMArguments, props: any) {
7777
// properties applying right to left.
7878
function applyAttributeBindings(
7979
attributeBindings: Array<string>,
80-
component: EmberComponent,
81-
rootRef: Reference<EmberComponent>,
80+
component: Component,
81+
rootRef: Reference<Component>,
8282
operations: ElementOperations
8383
) {
8484
let seen: string[] = [];
@@ -109,9 +109,9 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
109109
debugFreeze(EMPTY_POSITIONAL_ARGS);
110110

111111
type ComponentFactory = InternalFactory<
112-
EmberComponent,
112+
Component,
113113
{
114-
create(props?: any): EmberComponent;
114+
create(props?: any): Component;
115115
positionalParams: string | string[] | undefined | null;
116116
name: string;
117117
}
@@ -126,7 +126,7 @@ export default class CurlyComponentManager
126126
WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
127127
WithDynamicTagName<ComponentStateBucket>
128128
{
129-
protected templateFor(component: EmberComponent): CompilableProgram | null {
129+
protected templateFor(component: Component): CompilableProgram | null {
130130
let { layout, layoutName } = component;
131131
let owner = getOwner(component);
132132
assert('Component is unexpectedly missing an owner', owner);
@@ -474,10 +474,7 @@ export default class CurlyComponentManager
474474
}
475475
}
476476

477-
export function processComponentInitializationAssertions(
478-
component: EmberComponent,
479-
props: any
480-
): void {
477+
export function processComponentInitializationAssertions(component: Component, props: any): void {
481478
assert(
482479
`classNameBindings must be non-empty strings: ${component}`,
483480
(() => {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {
1212
import type { Nullable } from '@ember/-internals/utility-types';
1313
import { capabilityFlagsFrom } from '@glimmer/manager';
1414
import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
15-
import type EmberComponent from '../component';
15+
import type Component from '../component';
1616
import type { DynamicScope } from '../renderer';
1717
import ComponentStateBucket from '../utils/curly-component-state-bucket';
1818
import CurlyComponentManager, {
@@ -22,9 +22,9 @@ import CurlyComponentManager, {
2222
} from './curly';
2323

2424
class RootComponentManager extends CurlyComponentManager {
25-
component: EmberComponent;
25+
component: Component;
2626

27-
constructor(component: EmberComponent) {
27+
constructor(component: Component) {
2828
super();
2929
this.component = component;
3030
}
@@ -104,7 +104,7 @@ export class RootComponentDefinition implements ComponentDefinition {
104104
capabilities = capabilityFlagsFrom(ROOT_CAPABILITIES);
105105
compilable = null;
106106

107-
constructor(component: EmberComponent) {
107+
constructor(component: Component) {
108108
this.manager = new RootComponentManager(component);
109109
let factory = getFactoryFor(component);
110110
assert('missing factory for component', factory !== undefined);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,13 @@ declare const SIGNATURE: unique symbol;
795795
*/
796796
// This type param is used in the class, so must appear here.
797797
// eslint-disable-next-line @typescript-eslint/no-unused-vars
798-
interface EmberComponent<S = unknown>
798+
interface Component<S = unknown>
799799
extends CoreView,
800800
TargetActionSupport,
801801
ActionSupport,
802802
ComponentMethods {}
803803

804-
class EmberComponent<S = unknown>
804+
class Component<S = unknown>
805805
extends CoreView.extend(
806806
TargetActionSupport,
807807
ActionSupport,
@@ -827,7 +827,7 @@ class EmberComponent<S = unknown>
827827

828828
// SAFETY: this has no runtime existence whatsoever; it is a "phantom type"
829829
// here to preserve the type param.
830-
private declare [SIGNATURE]: S;
830+
declare private [SIGNATURE]: S;
831831

832832
// SAFTEY: This is set in `init`.
833833
declare _superRerender: this['rerender'];
@@ -1327,7 +1327,7 @@ class EmberComponent<S = unknown>
13271327
addChildView(this, view);
13281328
}
13291329

1330-
_transitionTo(this: EmberComponent, state: keyof typeof ViewStates) {
1330+
_transitionTo(this: Component, state: keyof typeof ViewStates) {
13311331
let priorState = this._currentState;
13321332
let currentState = (this._currentState = this._states[state]);
13331333
this._state = state;
@@ -1689,10 +1689,10 @@ class EmberComponent<S = unknown>
16891689
}
16901690

16911691
// We continue to use reopenClass here so that positionalParams can be overridden with reopenClass in subclasses.
1692-
EmberComponent.reopenClass({
1692+
Component.reopenClass({
16931693
positionalParams: [],
16941694
});
16951695

1696-
setInternalComponentManager(CURLY_COMPONENT_MANAGER, EmberComponent);
1696+
setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
16971697

1698-
export default EmberComponent;
1698+
export default Component;

packages/@ember/-internals/glimmer/lib/renderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { unwrapTemplate } from './component-managers/unwrap-template';
4949
import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
5050
import type { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
5151
import RSVP from 'rsvp';
52-
import type EmberComponent from './component';
52+
import type Component from './component';
5353
import { hasDOM } from '../../browser-environment';
5454
import type ClassicComponent from './component';
5555
import { BOUNDS } from './component-managers/curly';
@@ -199,7 +199,7 @@ class ClassicRootState {
199199
readonly env: Environment;
200200

201201
constructor(
202-
public root: EmberComponent | OutletView,
202+
public root: Component | OutletView,
203203
context: EvaluationContext,
204204
owner: object,
205205
template: Template,

packages/@ember/-internals/glimmer/lib/utils/bindings.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {
1010
createPrimitiveRef,
1111
valueForRef,
1212
} from '@glimmer/reference';
13-
import type EmberComponent from '../component';
13+
import type Component from '../component';
1414

15-
function referenceForParts(rootRef: Reference<EmberComponent>, parts: string[]): Reference {
15+
function referenceForParts(rootRef: Reference<Component>, parts: string[]): Reference {
1616
let isAttrs = parts[0] === 'attrs';
1717

1818
// TODO deprecate this
@@ -50,8 +50,8 @@ export function parseAttributeBinding(microsyntax: string): [string, string, boo
5050
}
5151

5252
export function installAttributeBinding(
53-
component: EmberComponent,
54-
rootRef: Reference<EmberComponent>,
53+
component: Component,
54+
rootRef: Reference<Component>,
5555
parsed: [string, string, boolean],
5656
operations: ElementOperations
5757
) {
@@ -81,7 +81,7 @@ export function installAttributeBinding(
8181
}
8282

8383
export function createClassNameBindingRef(
84-
rootRef: Reference<EmberComponent>,
84+
rootRef: Reference<Component>,
8585
microsyntax: string,
8686
operations: ElementOperations
8787
) {

packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { Reference } from '@glimmer/reference';
55
import { createConstRef } from '@glimmer/reference';
66
import type { Revision, Tag } from '@glimmer/validator';
77
import { beginUntrackFrame, endUntrackFrame, valueForTag } from '@glimmer/validator';
8-
import type EmberComponent from '../component';
8+
import type Component from '../component';
99

1010
type Finalizer = () => void;
1111
function NOOP() {}
@@ -22,11 +22,11 @@ function NOOP() {}
2222
*/
2323
export default class ComponentStateBucket {
2424
public classRef: Reference | null = null;
25-
public rootRef: Reference<EmberComponent>;
25+
public rootRef: Reference<Component>;
2626
public argsRevision: Revision;
2727

2828
constructor(
29-
public component: EmberComponent,
29+
public component: Component,
3030
public args: CapturedNamedArguments | null,
3131
public argsTag: Tag,
3232
public finalizer: Finalizer,

0 commit comments

Comments
 (0)