Make private modules clearly private

README.md

@@ -217,7 +217,7 @@ export default class Greeting extends Component<GreetingSignature> {
 
 Because Ember's template resolution occurs dynamically at runtime today, Glint needs a way of mapping the names used in your templates to the actual backing value they'll be resolved to. This takes the form of a "type registry" similar to the one that powers Ember Data's types.
 
-The recommended approach is to include a declaration in each component, modifier or helper module that adds it to the registry, which is the default export of `@glint/environment-ember-loose/types/registry`.
+The recommended approach is to include a declaration in each component, modifier or helper module that adds it to the registry, which is the default export of `@glint/environment-ember-loose/registry`.
 
 ```ts
 // app/components/greeting.ts
@@ -228,7 +228,7 @@ export default class Greeting extends Component {
   // ...
 }
 
-declare module '@glint/environment-ember-loose/types/registry' {
+declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
     Greeting: typeof Greeting;
   }

packages/config/__tests__/environment.test.ts

@@ -38,7 +38,7 @@ describe('Environments', () => {
 
     test('getting specified template tag config', () => {
       let tags = {
-        '@glimmerx/component': { hbs: { typesSource: '@glint/environment-glimmerx/types' } },
+        '@glimmerx/component': { hbs: { typesSource: '@glint/environment-glimmerx/-private/dsl' } },
       };
 
       let env = new GlintEnvironment('test-env', { tags });

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

@@ -45,7 +45,7 @@ describe('CLI: emitting declarations', () => {
           Args: ApplicationArgs;
       }> {
           private startupTime;
-          static template: import(\\"@glint/environment-glimmerx/types\\").Template;
+          static template: void;
       }
       "
     `);

packages/environment-ember-loose/types/globals.d.ts → packages/environment-ember-loose/-private/dsl/globals.d.ts

@@ -1,22 +1,22 @@
 import * as VM from '@glint/template/-private/keywords';
 
-import { ActionKeyword } from './intrinsics/action';
-import { ComponentKeyword } from './intrinsics/component';
-import { ConcatHelper } from './intrinsics/concat';
-import { EachInKeyword } from './intrinsics/each-in';
-import { FnHelper } from './intrinsics/fn';
-import { GetHelper } from './intrinsics/get';
-import { InputComponent } from './intrinsics/input';
-import { LinkToKeyword, LinkToComponent } from './intrinsics/link-to';
-import { LogHelper } from './intrinsics/log';
-import { MountKeyword } from './intrinsics/mount';
-import { MutKeyword } from './intrinsics/mut';
-import { OnModifier } from './intrinsics/on';
-import { OutletKeyword } from './intrinsics/outlet';
-import { TextareaComponent } from './intrinsics/textarea';
-import { UnboundKeyword } from './intrinsics/unbound';
-
-import Registry from './registry';
+import { ActionKeyword } from '../intrinsics/action';
+import { ComponentKeyword } from '../intrinsics/component';
+import { ConcatHelper } from '../intrinsics/concat';
+import { EachInKeyword } from '../intrinsics/each-in';
+import { FnHelper } from '../intrinsics/fn';
+import { GetHelper } from '../intrinsics/get';
+import { InputComponent } from '../intrinsics/input';
+import { LinkToKeyword, LinkToComponent } from '../intrinsics/link-to';
+import { LogHelper } from '../intrinsics/log';
+import { MountKeyword } from '../intrinsics/mount';
+import { MutKeyword } from '../intrinsics/mut';
+import { OnModifier } from '../intrinsics/on';
+import { OutletKeyword } from '../intrinsics/outlet';
+import { TextareaComponent } from '../intrinsics/textarea';
+import { UnboundKeyword } from '../intrinsics/unbound';
+
+import Registry from '../../registry';
 
 // The keyword vs global breakdown here is loosely matched with
 // the listing in http://emberjs.github.io/rfcs/0496-handlebars-strict-mode.html

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

@@ -0,0 +1,2 @@
+export * from '@glint/template/-private/dsl';
+export { Globals } from './globals';

packages/environment-ember-loose/environment/index.ts → packages/environment-ember-loose/-private/environment/index.ts

@@ -3,7 +3,7 @@ import { GlintEnvironmentConfig } from '@glint/config';
 export default function glimmerxEnvironment(): GlintEnvironmentConfig {
   return {
     template: {
-      typesPath: '@glint/environment-ember-loose/types',
+      typesPath: '@glint/environment-ember-loose/-private/dsl',
 
       getPossibleScriptPaths(templatePath) {
         if (/[\\/]template\.hbs$/.test(templatePath)) {

packages/environment-ember-loose/types/intrinsics/action.d.ts → packages/environment-ember-loose/-private/intrinsics/action.d.ts

@@ -1,4 +1,4 @@
-import { DirectInvokable } from '@glint/template/-private/resolution';
+import { DirectInvokable } from '@glint/template/-private/integration';
 
 export type ActionNamedArgs<T> = {
   value?: keyof T;

packages/environment-ember-loose/types/intrinsics/component.d.ts → packages/environment-ember-loose/-private/intrinsics/component.d.ts

@@ -1,5 +1,10 @@
-import { AcceptsBlocks, AnyBlocks, EmptyObject } from '@glint/template/-private/signature';
-import { DirectInvokable, Invokable } from '@glint/template/-private/resolution';
+import {
+  AcceptsBlocks,
+  AnyBlocks,
+  EmptyObject,
+  DirectInvokable,
+  Invokable,
+} from '@glint/template/-private/integration';
 
 type RegistryComponentArgs<Registry, T extends keyof Registry> = Registry[T] extends new (
   ...args: any

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

@@ -0,0 +1,5 @@
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+
+export type ConcatHelper = DirectInvokable<{
+  (args: EmptyObject, ...params: unknown[]): string;
+}>;

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

@@ -0,0 +1,7 @@
+import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+
+export type EachInKeyword = DirectInvokable<{
+  <T>(args: EmptyObject, object: T): AcceptsBlocks<{
+    default: [key: keyof T, value: T[keyof T]];
+  }>;
+}>;

packages/environment-ember-loose/types/intrinsics/fn.d.ts → packages/environment-ember-loose/-private/intrinsics/fn.d.ts

@@ -1,5 +1,4 @@
-import { DirectInvokable } from '@glint/template/-private/resolution';
-import { EmptyObject } from '@glint/template/-private/signature';
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 import { Mut } from './mut';
 
 export type FnHelper = DirectInvokable<{

packages/environment-ember-loose/types/intrinsics/get.d.ts → packages/environment-ember-loose/-private/intrinsics/get.d.ts

@@ -1,5 +1,4 @@
-import { DirectInvokable } from '@glint/template/-private/resolution';
-import { EmptyObject } from '@glint/template/-private/signature';
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 
 export type GetHelper = DirectInvokable<{
   <T, K extends keyof T>(args: EmptyObject, obj: T, key: K): T[K];

packages/environment-ember-loose/types/intrinsics/input.d.ts → packages/environment-ember-loose/-private/intrinsics/input.d.ts

@@ -1,6 +1,4 @@
-import { AcceptsBlocks } from '@glint/template/-private';
-import { DirectInvokable } from '@glint/template/-private/resolution';
-import { EmptyObject } from '@glint/template/-private/signature';
+import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 
 export interface CheckboxInputArgs {
   type: 'checkbox';

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

@@ -1,8 +1,7 @@
-import { AcceptsBlocks, NoNamedArgs } from '@glint/template/-private';
-import { DirectInvokable } from '@glint/template/-private/resolution';
+import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 
 export type LinkToKeyword = DirectInvokable<{
-  (args: NoNamedArgs, route: string, ...params: unknown[]): AcceptsBlocks<{
+  (args: EmptyObject, route: string, ...params: unknown[]): AcceptsBlocks<{
     default?: [];
   }>;
 }>;

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

@@ -0,0 +1,5 @@
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+
+export type LogHelper = DirectInvokable<{
+  (args: EmptyObject, ...params: unknown[]): void;
+}>;

packages/environment-ember-loose/types/intrinsics/mount.d.ts → packages/environment-ember-loose/-private/intrinsics/mount.d.ts

@@ -1,4 +1,4 @@
-import { DirectInvokable } from '@glint/template/-private/resolution';
+import { DirectInvokable } from '@glint/template/-private/integration';
 
 export type MountKeyword = DirectInvokable<{
   (args: { model?: unknown }, engine: string): void;

packages/environment-ember-loose/types/intrinsics/mut.d.ts → packages/environment-ember-loose/-private/intrinsics/mut.d.ts

@@ -1,5 +1,4 @@
-import { DirectInvokable } from '@glint/template/-private/resolution';
-import { EmptyObject } from '@glint/template/-private/signature';
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 
 declare const Mut: unique symbol;
 

packages/environment-ember-loose/types/intrinsics/on.d.ts → packages/environment-ember-loose/-private/intrinsics/on.d.ts

@@ -1,5 +1,4 @@
-import { CreatesModifier } from '@glint/template/-private';
-import { DirectInvokable } from '@glint/template/-private/resolution';
+import { BoundModifier, DirectInvokable } from '@glint/template/-private/integration';
 
 export interface OnModifierArgs {
   capture?: boolean;
@@ -12,10 +11,10 @@ export type OnModifier = DirectInvokable<{
     args: OnModifierArgs,
     name: Name,
     callback: (event: HTMLElementEventMap[Name]) => void
-  ): CreatesModifier<HTMLElement>;
+  ): BoundModifier<HTMLElement>;
   (
     args: OnModifierArgs,
     name: string,
     callback: (event: Event) => void
-  ): CreatesModifier<HTMLElement>;
+  ): BoundModifier<HTMLElement>;
 }>;

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

@@ -0,0 +1,5 @@
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+
+export type OutletKeyword = DirectInvokable<{
+  (args: EmptyObject, name?: string): void;
+}>;

packages/environment-ember-loose/types/intrinsics/textarea.d.ts → packages/environment-ember-loose/-private/intrinsics/textarea.d.ts

@@ -1,6 +1,4 @@
-import { AcceptsBlocks } from '@glint/template/-private';
-import { DirectInvokable } from '@glint/template/-private/resolution';
-import { EmptyObject } from '@glint/template/-private/signature';
+import { AcceptsBlocks, DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
 
 export interface TextareaArgs {
   value?: string;

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

@@ -0,0 +1,5 @@
+import { DirectInvokable, EmptyObject } from '@glint/template/-private/integration';
+
+export type UnboundKeyword = DirectInvokable<{
+  <T>(args: EmptyObject, value: T): T;
+}>;

packages/environment-ember-loose/.gitignore

@@ -2,4 +2,6 @@
 *.d.ts
 tsconfig.tsbuildinfo
 
-!types/**/*.d.ts
+!registry/**/*.d.ts
+!-private/dsl/**/*.d.ts
+!-private/intrinsics/**/*.d.ts

packages/environment-ember-loose/.prettierignore

@@ -1,2 +1,6 @@
-/*/*.js
-/*/*.d.ts
+/**/*.js
+/**/*.d.ts
+
+!/registry/**/*.d.ts
+!/-private/dsl/**/*.d.ts
+!/-private/intrinsics/**/*.d.ts

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

@@ -5,8 +5,8 @@ import {
   resolve,
   ResolveContext,
   yieldToBlock,
-} from '@glint/environment-ember-loose/types';
-import { EmptyObject } from '@glint/template/-private/signature';
+} from '@glint/environment-ember-loose/-private/dsl';
+import { EmptyObject } from '@glint/template/-private/integration';
 import { expectTypeOf } from 'expect-type';
 
 {

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

@@ -1,14 +1,14 @@
 import Helper, { helper } from '@glint/environment-ember-loose/ember-component/helper';
-import { resolve } from '@glint/environment-ember-loose/types';
+import { resolve } from '@glint/environment-ember-loose/-private/dsl';
 import { expectTypeOf } from 'expect-type';
-import { NoNamedArgs } from '@glint/template/-private';
+import { EmptyObject } from '@glint/template/-private/integration';
 
 // Functional helper: positional params
 {
   let definition = helper(<T, U>([a, b]: [T, U]) => a || b);
   let or = resolve(definition);
 
-  expectTypeOf(or).toEqualTypeOf<<T, U>(args: NoNamedArgs, t: T, u: U) => T | U>();
+  expectTypeOf(or).toEqualTypeOf<<T, U>(args: EmptyObject, t: T, u: U) => T | U>();
 
   // @ts-expect-error: extra named arg
   or({ hello: true }, 'a', 'b');

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let action = resolve(Globals['action']);
 

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

@@ -1,7 +1,7 @@
 import { expectTypeOf } from 'expect-type';
-import { resolve, invokeBlock } from '@glint/template';
+import { resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
 import Component from '@glint/environment-ember-loose/ember-component';
-import { ComponentKeyword } from '../../types/intrinsics/component';
+import { ComponentKeyword } from '@glint/environment-ember-loose/-private/intrinsics/component';
 
 const componentKeyword = resolve({} as ComponentKeyword<LocalRegistry>);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let concat = resolve(Globals['concat']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/types';
+import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
 
 let eachIn = resolve(Globals['each-in']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let fn = resolve(Globals['fn']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let get = resolve(Globals['get']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let input = resolve(Globals['input']);
 let Input = resolve(Globals['Input']);

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

@@ -1,4 +1,4 @@
-import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/types';
+import { Globals, resolve, invokeBlock } from '@glint/environment-ember-loose/-private/dsl';
 
 let linkTo = resolve(Globals['link-to']);
 let LinkTo = resolve(Globals['LinkTo']);

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

@@ -1,4 +1,4 @@
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let log = resolve(Globals['log']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let mount = resolve(Globals['mount']);
 

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

@@ -1,6 +1,6 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
-import { Mut } from '../../types/intrinsics/mut';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
+import { Mut } from '@glint/environment-ember-loose/-private/intrinsics/mut';
 
 let fn = resolve(Globals['fn']);
 let mut = resolve(Globals['mut']);

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, applyModifier, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, applyModifier, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 const on = resolve(Globals['on']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let outlet = resolve(Globals['outlet']);
 

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let textarea = resolve(Globals['textarea']);
 let Textarea = resolve(Globals['Textarea']);

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

@@ -1,5 +1,5 @@
 import { expectTypeOf } from 'expect-type';
-import { Globals, resolve } from '@glint/environment-ember-loose/types';
+import { Globals, resolve } from '@glint/environment-ember-loose/-private/dsl';
 
 let unbound = resolve(Globals['unbound']);
 

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

@@ -1,7 +1,7 @@
 import Modifier, { modifier } from '@glint/environment-ember-loose/ember-modifier';
-import { resolve } from '@glint/environment-ember-loose/types';
+import { resolve } from '@glint/environment-ember-loose/-private/dsl';
 import { expectTypeOf } from 'expect-type';
-import { CreatesModifier } from '@glint/template/-private';
+import { BoundModifier } from '@glint/template/-private/integration';
 
 // Class-based modifier
 {
@@ -39,8 +39,8 @@ import { CreatesModifier } from '@glint/template/-private';
 
   let neat = resolve(NeatModifier);
 
-  expectTypeOf(neat({}, 'hello')).toEqualTypeOf<CreatesModifier<HTMLImageElement>>();
-  expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<CreatesModifier<HTMLImageElement>>();
+  expectTypeOf(neat({}, 'hello')).toEqualTypeOf<BoundModifier<HTMLImageElement>>();
+  expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<BoundModifier<HTMLImageElement>>();
 
   // @ts-expect-error: missing required positional arg
   neat({});
@@ -69,8 +69,8 @@ import { CreatesModifier } from '@glint/template/-private';
 
   let neat = resolve(definition);
 
-  expectTypeOf(neat({}, 'hello')).toEqualTypeOf<CreatesModifier<HTMLAudioElement>>();
-  expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<CreatesModifier<HTMLAudioElement>>();
+  expectTypeOf(neat({}, 'hello')).toEqualTypeOf<BoundModifier<HTMLAudioElement>>();
+  expectTypeOf(neat({ multiplier: 3 }, 'hello')).toEqualTypeOf<BoundModifier<HTMLAudioElement>>();
 
   // @ts-expect-error: missing required positional arg
   neat({});