Skip to content

Commit c3e3c24

Browse files
dfreemandfreeman
authored
Merge pull request #74 from typed-ember/privatize
2 parents 26ea3a5 + 9915d50 commit c3e3c24

File tree

108 files changed

+498
-512
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+498
-512
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions

‎packages/config/__tests__/environment.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('Environments', () => {
3838

3939
test('getting specified template tag config', () => {
4040
let tags = {
41-
'@glimmerx/component': { hbs: { typesSource: '@glint/environment-glimmerx/types' } },
41+
'@glimmerx/component': { hbs: { typesSource: '@glint/environment-glimmerx/-private/dsl' } },
4242
};
4343

4444
let env = new GlintEnvironment('test-env', { tags });

‎packages/core/__tests__/cli/declaration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('CLI: emitting declarations', () => {
4545
Args: ApplicationArgs;
4646
}> {
4747
private startupTime;
48-
static template: import(\\"@glint/environment-glimmerx/types\\").Template;
48+
static template: void;
4949
}
5050
"
5151
`);

‎packages/environment-ember-loose/types/globals.d.ts renamed to ‎packages/environment-ember-loose/-private/dsl/globals.d.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import * as VM from '@glint/template/-private/keywords';
22

3-
import { ActionKeyword } from './intrinsics/action';
4-
import { ComponentKeyword } from './intrinsics/component';
5-
import { ConcatHelper } from './intrinsics/concat';
6-
import { EachInKeyword } from './intrinsics/each-in';
7-
import { FnHelper } from './intrinsics/fn';
8-
import { GetHelper } from './intrinsics/get';
9-
import { InputComponent } from './intrinsics/input';
10-
import { LinkToKeyword, LinkToComponent } from './intrinsics/link-to';
11-
import { LogHelper } from './intrinsics/log';
12-
import { MountKeyword } from './intrinsics/mount';
13-
import { MutKeyword } from './intrinsics/mut';
14-
import { OnModifier } from './intrinsics/on';
15-
import { OutletKeyword } from './intrinsics/outlet';
16-
import { TextareaComponent } from './intrinsics/textarea';
17-
import { UnboundKeyword } from './intrinsics/unbound';
18-
19-
import Registry from './registry';
3+
import { ActionKeyword } from '../intrinsics/action';
4+
import { ComponentKeyword } from '../intrinsics/component';
5+
import { ConcatHelper } from '../intrinsics/concat';
6+
import { EachInKeyword } from '../intrinsics/each-in';
7+
import { FnHelper } from '../intrinsics/fn';
8+
import { GetHelper } from '../intrinsics/get';
9+
import { InputComponent } from '../intrinsics/input';
10+
import { LinkToKeyword, LinkToComponent } from '../intrinsics/link-to';
11+
import { LogHelper } from '../intrinsics/log';
12+
import { MountKeyword } from '../intrinsics/mount';
13+
import { MutKeyword } from '../intrinsics/mut';
14+
import { OnModifier } from '../intrinsics/on';
15+
import { OutletKeyword } from '../intrinsics/outlet';
16+
import { TextareaComponent } from '../intrinsics/textarea';
17+
import { UnboundKeyword } from '../intrinsics/unbound';
18+
19+
import Registry from '../../registry';
2020

2121
// The keyword vs global breakdown here is loosely matched with
2222
// the listing in http://emberjs.github.io/rfcs/0496-handlebars-strict-mode.html

‎packages/environment-ember-loose/-private/dsl/index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from '@glint/template/-private/dsl';
2+
export { Globals } from './globals';

‎packages/environment-ember-loose/environment/index.ts renamed to ‎packages/environment-ember-loose/-private/environment/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { GlintEnvironmentConfig } from '@glint/config';
33
export default function glimmerxEnvironment(): GlintEnvironmentConfig {
44
return {
55
template: {
6-
typesPath: '@glint/environment-ember-loose/types',
6+
typesPath: '@glint/environment-ember-loose/-private/dsl',
77

88
getPossibleScriptPaths(templatePath) {
99
if (/[\\/]template\.hbs$/.test(templatePath)) {

‎packages/environment-ember-loose/types/intrinsics/action.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/action.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DirectInvokable } from '@glint/template/-private/resolution';
1+
import { DirectInvokable } from '@glint/template/-private/integration';
22

33
export type ActionNamedArgs<T> = {
44
value?: keyof T;

‎packages/environment-ember-loose/types/intrinsics/component.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/component.d.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
import { AcceptsBlocks, AnyBlocks, EmptyObject } from '@glint/template/-private/signature';
2-
import { DirectInvokable, Invokable } from '@glint/template/-private/resolution';
1+
import {
2+
AcceptsBlocks,
3+
AnyBlocks,
4+
EmptyObject,
5+
DirectInvokable,
6+
Invokable,
7+
} from '@glint/template/-private/integration';
38

49
type RegistryComponentArgs<Registry, T extends keyof Registry> = Registry[T] extends new (
510
...args: any

‎packages/environment-ember-loose/-private/intrinsics/concat.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
2+
3+
export type ConcatHelper = DirectInvokable<{
4+
(args: EmptyObject, ...params: unknown[]): string;
5+
}>;

‎packages/environment-ember-loose/-private/intrinsics/each-in.d.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
2+
3+
export type EachInKeyword = DirectInvokable<{
4+
<T>(args: EmptyObject, object: T): AcceptsBlocks<{
5+
default: [key: keyof T, value: T[keyof T]];
6+
}>;
7+
}>;

‎packages/environment-ember-loose/types/intrinsics/fn.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/fn.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { DirectInvokable } from '@glint/template/-private/resolution';
2-
import { EmptyObject } from '@glint/template/-private/signature';
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
32
import { Mut } from './mut';
43

54
export type FnHelper = DirectInvokable<{

‎packages/environment-ember-loose/types/intrinsics/get.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/get.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { DirectInvokable } from '@glint/template/-private/resolution';
2-
import { EmptyObject } from '@glint/template/-private/signature';
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
32

43
export type GetHelper = DirectInvokable<{
54
<T, K extends keyof T>(args: EmptyObject, obj: T, key: K): T[K];

‎packages/environment-ember-loose/types/intrinsics/input.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/input.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { AcceptsBlocks } from '@glint/template/-private';
2-
import { DirectInvokable } from '@glint/template/-private/resolution';
3-
import { EmptyObject } from '@glint/template/-private/signature';
1+
import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
42

53
export interface CheckboxInputArgs {
64
type: 'checkbox';

‎packages/environment-ember-loose/types/intrinsics/link-to.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/link-to.d.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { AcceptsBlocks, NoNamedArgs } from '@glint/template/-private';
2-
import { DirectInvokable } from '@glint/template/-private/resolution';
1+
import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
32

43
export type LinkToKeyword = DirectInvokable<{
5-
(args: NoNamedArgs, route: string, ...params: unknown[]): AcceptsBlocks<{
4+
(args: EmptyObject, route: string, ...params: unknown[]): AcceptsBlocks<{
65
default?: [];
76
}>;
87
}>;

‎packages/environment-ember-loose/-private/intrinsics/log.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
2+
3+
export type LogHelper = DirectInvokable<{
4+
(args: EmptyObject, ...params: unknown[]): void;
5+
}>;

‎packages/environment-ember-loose/types/intrinsics/mount.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/mount.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DirectInvokable } from '@glint/template/-private/resolution';
1+
import { DirectInvokable } from '@glint/template/-private/integration';
22

33
export type MountKeyword = DirectInvokable<{
44
(args: { model?: unknown }, engine: string): void;

‎packages/environment-ember-loose/types/intrinsics/mut.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/mut.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { DirectInvokable } from '@glint/template/-private/resolution';
2-
import { EmptyObject } from '@glint/template/-private/signature';
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
32

43
declare const Mut: unique symbol;
54

‎packages/environment-ember-loose/types/intrinsics/on.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/on.d.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { CreatesModifier } from '@glint/template/-private';
2-
import { DirectInvokable } from '@glint/template/-private/resolution';
1+
import { BoundModifier, DirectInvokable } from '@glint/template/-private/integration';
32

43
export interface OnModifierArgs {
54
capture?: boolean;
@@ -12,10 +11,10 @@ export type OnModifier = DirectInvokable<{
1211
args: OnModifierArgs,
1312
name: Name,
1413
callback: (event: HTMLElementEventMap[Name]) => void
15-
): CreatesModifier<HTMLElement>;
14+
): BoundModifier<HTMLElement>;
1615
(
1716
args: OnModifierArgs,
1817
name: string,
1918
callback: (event: Event) => void
20-
): CreatesModifier<HTMLElement>;
19+
): BoundModifier<HTMLElement>;
2120
}>;

‎packages/environment-ember-loose/-private/intrinsics/outlet.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
2+
3+
export type OutletKeyword = DirectInvokable<{
4+
(args: EmptyObject, name?: string): void;
5+
}>;

‎packages/environment-ember-loose/types/intrinsics/textarea.d.ts renamed to ‎packages/environment-ember-loose/-private/intrinsics/textarea.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { AcceptsBlocks } from '@glint/template/-private';
2-
import { DirectInvokable } from '@glint/template/-private/resolution';
3-
import { EmptyObject } from '@glint/template/-private/signature';
1+
import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
42

53
export interface TextareaArgs {
64
value?: string;

‎packages/environment-ember-loose/-private/intrinsics/unbound.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
2+
3+
export type UnboundKeyword = DirectInvokable<{
4+
<T>(args: EmptyObject, value: T): T;
5+
}>;

‎packages/environment-ember-loose/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
*.d.ts
33
tsconfig.tsbuildinfo
44

5-
!types/**/*.d.ts
5+
!registry/**/*.d.ts
6+
!-private/dsl/**/*.d.ts
7+
!-private/intrinsics/**/*.d.ts

‎packages/environment-ember-loose/.prettierignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
/*/*.js
2-
/*/*.d.ts
1+
/**/*.js
2+
/**/*.d.ts
3+
4+
!/registry/**/*.d.ts
5+
!/-private/dsl/**/*.d.ts
6+
!/-private/intrinsics/**/*.d.ts

‎packages/environment-ember-loose/__tests__/component.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
resolve,
66
ResolveContext,
77
yieldToBlock,
8-
} from '@glint/environment-ember-loose/types';
9-
import { EmptyObject } from '@glint/template/-private/signature';
8+
} from '@glint/environment-ember-loose/-private/dsl';
9+
import { EmptyObject } from '@glint/template/-private/integration';
1010
import { expectTypeOf } from 'expect-type';
1111

1212
{

‎packages/environment-ember-loose/__tests__/helper.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import Helper, { helper } from '@glint/environment-ember-loose/ember-component/helper';
2-
import { resolve } from '@glint/environment-ember-loose/types';
2+
import { resolve } from '@glint/environment-ember-loose/-private/dsl';
33
import { expectTypeOf } from 'expect-type';
4-
import { NoNamedArgs } from '@glint/template/-private';
4+
import { EmptyObject } from '@glint/template/-private/integration';
55

66
// Functional helper: positional params
77
{
88
let definition = helper(<T, U>([a, b]: [T, U]) => a || b);
99
let or = resolve(definition);
1010

11-
expectTypeOf(or).toEqualTypeOf<<T, U>(args: NoNamedArgs, t: T, u: U) => T | U>();
11+
expectTypeOf(or).toEqualTypeOf<<T, U>(args: EmptyObject, t: T, u: U) => T | U>();
1212

1313
// @ts-expect-error: extra named arg
1414
or({ hello: true }, 'a', 'b');

‎packages/environment-ember-loose/__tests__/intrinsics/action.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let action = resolve(Globals['action']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/component.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { resolve, invokeBlock } from '@glint/template';
2+
import { resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
33
import Component from '@glint/environment-ember-loose/ember-component';
4-
import { ComponentKeyword } from '../../types/intrinsics/component';
4+
import { ComponentKeyword } from '@glint/environment-ember-loose/-private/intrinsics/component';
55

66
const componentKeyword = resolve({} as ComponentKeyword<LocalRegistry>);
77

‎packages/environment-ember-loose/__tests__/intrinsics/concat.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let concat = resolve(Globals['concat']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/each-in.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
33

44
let eachIn = resolve(Globals['each-in']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/fn.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let fn = resolve(Globals['fn']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/get.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let get = resolve(Globals['get']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/input.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let input = resolve(Globals['input']);
55
let Input = resolve(Globals['Input']);

‎packages/environment-ember-loose/__tests__/intrinsics/link-to.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/types';
1+
import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
22

33
let linkTo = resolve(Globals['link-to']);
44
let LinkTo = resolve(Globals['LinkTo']);

‎packages/environment-ember-loose/__tests__/intrinsics/log.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
1+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
22

33
let log = resolve(Globals['log']);
44

‎packages/environment-ember-loose/__tests__/intrinsics/mount.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let mount = resolve(Globals['mount']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/mut.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
3-
import { Mut } from '../../types/intrinsics/mut';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
3+
import { Mut } from '@glint/environment-ember-loose/-private/intrinsics/mut';
44

55
let fn = resolve(Globals['fn']);
66
let mut = resolve(Globals['mut']);

‎packages/environment-ember-loose/__tests__/intrinsics/on.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, applyModifier, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, applyModifier, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
const on = resolve(Globals['on']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/outlet.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let outlet = resolve(Globals['outlet']);
55

‎packages/environment-ember-loose/__tests__/intrinsics/textarea.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let textarea = resolve(Globals['textarea']);
55
let Textarea = resolve(Globals['Textarea']);

‎packages/environment-ember-loose/__tests__/intrinsics/unbound.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expectTypeOf } from 'expect-type';
2-
import { Globals, resolve } from '@glint/environment-ember-loose/types';
2+
import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
33

44
let unbound = resolve(Globals['unbound']);
55

‎packages/environment-ember-loose/__tests__/modifier.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Modifier, { modifier } from '@glint/environment-ember-loose/ember-modifier';
2-
import { resolve } from '@glint/environment-ember-loose/types';
2+
import { resolve } from '@glint/environment-ember-loose/-private/dsl';
33
import { expectTypeOf } from 'expect-type';
4-
import { CreatesModifier } from '@glint/template/-private';
4+
import { BoundModifier } from '@glint/template/-private/integration';
55

66
// Class-based modifier
77
{
@@ -39,8 +39,8 @@ import { CreatesModifier } from '@glint/template/-private';
3939

4040
let neat = resolve(NeatModifier);
4141

42-
expectTypeOf(neat({}, 'hello')).toEqualTypeOf<CreatesModifier<HTMLImageElement>>();
43-
expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<CreatesModifier<HTMLImageElement>>();
42+
expectTypeOf(neat({}, 'hello')).toEqualTypeOf<BoundModifier<HTMLImageElement>>();
43+
expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<BoundModifier<HTMLImageElement>>();
4444

4545
// @ts-expect-error: missing required positional arg
4646
neat({});
@@ -69,8 +69,8 @@ import { CreatesModifier } from '@glint/template/-private';
6969

7070
let neat = resolve(definition);
7171

72-
expectTypeOf(neat({}, 'hello')).toEqualTypeOf<CreatesModifier<HTMLAudioElement>>();
73-
expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<CreatesModifier<HTMLAudioElement>>();
72+
expectTypeOf(neat({}, 'hello')).toEqualTypeOf<BoundModifier<HTMLAudioElement>>();
73+
expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<BoundModifier<HTMLAudioElement>>();
7474

7575
// @ts-expect-error: missing required positional arg
7676
neat({});

0 commit comments

Comments
 (0)