From bb5fcec57f917d7234f1f51d5516b2fd59d5b2c9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Mar 2024 20:56:54 -0400
Subject: [PATCH 01/18] More signature rendering

---
 ui/docs/docs/helper-signature.md       | 17 +++++++
 ui/docs/docs/modifier-signature.md     | 17 +++++++
 ui/src/components/page-nav.gts         |  4 +-
 ui/src/samples/-private/modifier.ts    | 12 +++++
 ui/src/typedoc/signature/args.gts      | 28 +++++++++++
 ui/src/typedoc/signature/component.gts | 64 +++--------------------
 ui/src/typedoc/signature/element.gts   | 36 +++++++++++++
 ui/src/typedoc/signature/helper.gts    |  0
 ui/src/typedoc/signature/modifier.gts  | 70 ++++++++++++++++++++++++++
 9 files changed, 190 insertions(+), 58 deletions(-)
 create mode 100644 ui/docs/docs/helper-signature.md
 create mode 100644 ui/docs/docs/modifier-signature.md
 create mode 100644 ui/src/samples/-private/modifier.ts
 create mode 100644 ui/src/typedoc/signature/args.gts
 create mode 100644 ui/src/typedoc/signature/element.gts
 create mode 100644 ui/src/typedoc/signature/helper.gts
 create mode 100644 ui/src/typedoc/signature/modifier.gts

diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
new file mode 100644
index 00000000..f82778dd
--- /dev/null
+++ b/ui/docs/docs/helper-signature.md
@@ -0,0 +1,17 @@
+# `<HelperSignature />`
+
+Render the docs generated from Comments, [JSDoc](https://jsdoc.app/), etc, specialized specifically for helpers and plain functions, which have a known signature format, consisting of `Args`, and `Return`.
+
+This, along with the other API doc-related components, are powered by [TypeDoc](https://typedoc.org/) and generated from declarations.
+
+## API Reference
+
+API Reference generated via:
+
+```hbs live no-shadow preview below
+<HelperSignature
+  @module='src/browser/re-exports'
+  @name='ComponentSignature'
+  @package='kolay'
+/>
+```
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
new file mode 100644
index 00000000..b23245db
--- /dev/null
+++ b/ui/docs/docs/modifier-signature.md
@@ -0,0 +1,17 @@
+# `<ModifierSignature />`
+
+Render the docs generated from Comments, [JSDoc](https://jsdoc.app/), etc, specialized specifically for element modifiers, which have a known signature format, consisting of `Args`, and `Element`.
+
+This, along with the other API doc-related components, are powered by [TypeDoc](https://typedoc.org/) and generated from declarations.
+
+## API Reference
+
+API Reference generated via:
+
+```hbs live no-shadow preview below
+<ModifierSignature
+  @module='src/browser/re-exports'
+  @name='ComponentSignature'
+  @package='kolay'
+/>
+```
diff --git a/ui/src/components/page-nav.gts b/ui/src/components/page-nav.gts
index 1cd906fa..174ac4c8 100644
--- a/ui/src/components/page-nav.gts
+++ b/ui/src/components/page-nav.gts
@@ -29,7 +29,7 @@ export class PageNav extends Component<{
      * ```gjs
      * import { PageNav } from 'kolay/components';
      *
-     * function toSentenceCase(name) { /* ... \*\/ }
+     * function toSentenceCase(name) { /* ... *\/ }
      *
      * <template>
      *   <PageNav>
@@ -49,7 +49,7 @@ export class PageNav extends Component<{
      * ```gjs
      * import { PageNav } from 'kolay/components';
      *
-     * function toSentenceCase(name) { /* ... \*\/ }
+     * function toSentenceCase(name) { /* ... *\/ }
      *
      * <template>
      *   <PageNav>
diff --git a/ui/src/samples/-private/modifier.ts b/ui/src/samples/-private/modifier.ts
new file mode 100644
index 00000000..143ba9fa
--- /dev/null
+++ b/ui/src/samples/-private/modifier.ts
@@ -0,0 +1,12 @@
+import { modifier } from 'ember-modifier';
+
+export const functionModifier = modifier(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(positional, named);
+  },
+);
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
new file mode 100644
index 00000000..33676691
--- /dev/null
+++ b/ui/src/typedoc/signature/args.gts
@@ -0,0 +1,28 @@
+import { Comment, isIntrinsic, Type } from '../renderer.gts';
+
+import type { TOC } from '@ember/component/template-only';
+
+const not = (x: unknown) => !x;
+
+export const NamedArgs: TOC<{
+  Args: { kind: 'component' | 'modifier' | 'helper'; info: any };
+}> = <template>
+  {{#if @info}}
+    <h3 class='typedoc-heading'>Arguments</h3>
+    {{#each @info.type.declaration.children as |child|}}
+      <span class='typedoc-{{@kind}}-arg'>
+        <span class='typedoc-{{@kind}}-arg-info'>
+          <pre class='typedoc-name'>@{{child.name}}</pre>
+          {{#if (isIntrinsic child.type)}}
+            <Type @info={{child.type}} />
+          {{/if}}
+        </span>
+        {{#if (not (isIntrinsic child.type))}}
+          <Type @info={{child.type}} />
+        {{else}}
+          <Comment @info={{child}} />
+        {{/if}}
+      </span>
+    {{/each}}
+  {{/if}}
+</template>;
diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index dc04801f..fd1eb9bb 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -1,7 +1,7 @@
-import { ExternalLink } from 'ember-primitives/components/external-link';
-
-import { Comment, isIntrinsic, Type } from '../renderer.gts';
+import { Comment, Type } from '../renderer.gts';
 import { findChildDeclaration, Load } from '../utils.gts';
+import { NamedArgs } from './args.gts';
+import { Element } from './element.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
@@ -41,8 +41,6 @@ function getSignature(info: DeclarationReflection) {
   return info;
 }
 
-const not = (x: unknown) => !x;
-
 export const ComponentSignature: TOC<{
   Args: {
     /**
@@ -66,62 +64,16 @@ export const ComponentSignature: TOC<{
     as |declaration|
   >
     {{#let (getSignature declaration) as |info|}}
-      <Element @info={{findChildDeclaration info 'Element'}} />
-      <Args @info={{findChildDeclaration info 'Args'}} />
+      <Element
+        @kind='component'
+        @info={{findChildDeclaration info 'Element'}}
+      />
+      <NamedArgs @kind='component' @info={{findChildDeclaration info 'Args'}} />
       <Blocks @info={{findChildDeclaration info 'Blocks'}} />
     {{/let}}
   </Load>
 </template>;
 
-const Args: TOC<{ Args: { info: any } }> = <template>
-  {{#if @info}}
-    <h3 class='typedoc-heading'>Arguments</h3>
-    {{#each @info.type.declaration.children as |child|}}
-      <span class='typedoc-component-arg'>
-        <span class='typedoc-component-arg-info'>
-          <pre class='typedoc-name'>@{{child.name}}</pre>
-          {{#if (isIntrinsic child.type)}}
-            <Type @info={{child.type}} />
-          {{/if}}
-        </span>
-        {{#if (not (isIntrinsic child.type))}}
-          <Type @info={{child.type}} />
-        {{else}}
-          <Comment @info={{child}} />
-        {{/if}}
-      </span>
-    {{/each}}
-  {{/if}}
-</template>;
-
-const mdnElement = (typeName: string) => {
-  let element = typeName
-    .replace('HTML', '')
-    .replace('Element', '')
-    .toLowerCase();
-
-  return `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${element}`;
-};
-
-const Element: TOC<{ Args: { info: any } }> = <template>
-  {{#if @info}}
-    <h3 class='typedoc-heading typedoc__component-signature__element-header'>
-      <span class='typedoc__name'>{{@info.name}}</span>
-      <span class='typedoc__component-signature__element-type'>
-        <ExternalLink
-          href={{mdnElement @info.type.name}}
-          class='typedoc__type-link'
-        >
-          {{@info.type.name}}
-          ➚
-        </ExternalLink>
-      </span>
-    </h3>
-    <span class='typedoc__component-signature__element'>
-      <Comment @info={{@info}} />
-    </span>
-  {{/if}}
-</template>;
 const Blocks: TOC<{ Args: { info: any } }> = <template>
   {{#if @info}}
     <h3 class='typedoc-heading'>Blocks</h3>
diff --git a/ui/src/typedoc/signature/element.gts b/ui/src/typedoc/signature/element.gts
new file mode 100644
index 00000000..0a4a75ca
--- /dev/null
+++ b/ui/src/typedoc/signature/element.gts
@@ -0,0 +1,36 @@
+import { ExternalLink } from 'ember-primitives/components/external-link';
+
+import { Comment } from '../renderer.gts';
+
+import type { TOC } from '@ember/component/template-only';
+
+const mdnElement = (typeName: string) => {
+  let element = typeName
+    .replace('HTML', '')
+    .replace('Element', '')
+    .toLowerCase();
+
+  return `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/${element}`;
+};
+
+export const Element: TOC<{
+  Args: { kind: 'component' | 'modifier'; info: any };
+}> = <template>
+  {{#if @info}}
+    <h3 class='typedoc-heading typedoc__{{@kind}}-signature__element-header'>
+      <span class='typedoc__name'>{{@info.name}}</span>
+      <span class='typedoc__{{@kind}}-signature__element-type'>
+        <ExternalLink
+          href={{mdnElement @info.type.name}}
+          class='typedoc__type-link'
+        >
+          {{@info.type.name}}
+          ➚
+        </ExternalLink>
+      </span>
+    </h3>
+    <span class='typedoc__{{@kind}}-signature__element'>
+      <Comment @info={{@info}} />
+    </span>
+  {{/if}}
+</template>;
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
new file mode 100644
index 00000000..e69de29b
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
new file mode 100644
index 00000000..31edb510
--- /dev/null
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -0,0 +1,70 @@
+import { findChildDeclaration, Load } from '../utils.gts';
+import { NamedArgs } from './args.gts';
+import { Element } from './element.gts';
+
+import type { TOC } from '@ember/component/template-only';
+import type { DeclarationReflection } from 'typedoc';
+
+function getSignature(info: DeclarationReflection) {
+  /**
+   * export const Foo: TOC<{ signature here }> = <template> ... </template>
+   */
+  if (
+    info.type?.type === 'reference' &&
+    info.type?.typeArguments?.[0]?.type === 'reflection'
+  ) {
+    return info.type.typeArguments[0].declaration;
+  }
+
+  /**
+   * export class Foo extends Component<{ signature here }> { ... }
+   */
+  if (info.variant === 'declaration' && 'extendedTypes' in info) {
+    let extendedType = info.extendedTypes?.[0];
+
+    if (
+      extendedType?.type === 'reference' &&
+      extendedType?.package === '@glimmer/component'
+    ) {
+      let typeArg = extendedType.typeArguments?.[0];
+
+      if (typeArg?.type === 'reflection') {
+        return typeArg.declaration;
+      }
+    }
+  }
+
+  /**
+   * export interface Signature { ... }
+   */
+  return info;
+}
+
+export const ComponentSignature: TOC<{
+  Args: {
+    /**
+     * Which module to import the type from
+     */
+    module: string;
+    /**
+     * The name of the component to render the type / JSDoc of
+     */
+    name: string;
+    /**
+     * The name of the package to lookup the module and export name.
+     */
+    package: string;
+  };
+}> = <template>
+  <Load
+    @package={{@package}}
+    @module={{@module}}
+    @name={{@name}}
+    as |declaration|
+  >
+    {{#let (getSignature declaration) as |info|}}
+      <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
+      <NamedArgs @kind='modifier' @info={{findChildDeclaration info 'Args'}} />
+    {{/let}}
+  </Load>
+</template>;

From ccdeaa73e9c5e69bd6601f3970dc4780804c1acc Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Mar 2024 21:31:36 -0400
Subject: [PATCH 02/18] Debug this commit: something in here broke the build

---
 docs-app/ember-cli-build.js           |   2 +-
 pnpm-lock.yaml                        | 576 +++++++++++---------------
 src/plugins/api-docs/index.js         |   2 +-
 src/plugins/api-docs/typedoc.js       |   2 +-
 ui/docs/docs/modifier-signature.md    |   6 +-
 ui/package.json                       |   1 +
 ui/src/samples/-private/modifier.ts   |   4 +-
 ui/src/typedoc/signature/modifier.gts |  12 +-
 8 files changed, 265 insertions(+), 340 deletions(-)

diff --git a/docs-app/ember-cli-build.js b/docs-app/ember-cli-build.js
index b7d84add..c5ea7ec2 100644
--- a/docs-app/ember-cli-build.js
+++ b/docs-app/ember-cli-build.js
@@ -38,7 +38,7 @@ module.exports = async function (defaults) {
                 src: '../ui/docs',
               },
             ],
-            packages: ['kolay', 'ember-primitives', 'ember-resources'],
+            packages: ['kolay', 'ember-primitives', 'ember-resources', '@universal-ember/kolay-ui'],
           }),
         ],
       },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 27f3ca16..c2470714 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -60,7 +60,7 @@ importers:
         version: 1.3.0
       '@nullvoxpopuli/eslint-configs':
         specifier: ^3.2.2
-        version: 3.2.2(@babel/core@7.24.0)(@babel/eslint-parser@7.23.10)(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint-config-prettier@9.1.0)(eslint-plugin-ember@12.0.2)(eslint-plugin-qunit@8.1.1)(eslint@8.57.0)(prettier@3.2.5)(typescript@5.3.3)
+        version: 3.2.2(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(prettier@3.2.5)(typescript@5.3.3)
       '@tsconfig/node20':
         specifier: ^20.1.2
         version: 20.1.2
@@ -96,7 +96,7 @@ importers:
         version: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       eslint:
         specifier: ^8.56.0
         version: 8.57.0
@@ -175,7 +175,7 @@ importers:
     devDependencies:
       '@babel/core':
         specifier: ^7.23.6
-        version: 7.24.0
+        version: 7.24.0(supports-color@8.1.1)
       '@babel/eslint-parser':
         specifier: ^7.23.3
         version: 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
@@ -283,7 +283,7 @@ importers:
         version: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-template-imports:
         specifier: ^4.0.0
         version: 4.1.0
@@ -364,7 +364,7 @@ importers:
     devDependencies:
       '@babel/core':
         specifier: ^7.23.6
-        version: 7.24.0
+        version: 7.24.0(supports-color@8.1.1)
       '@babel/eslint-parser':
         specifier: ^7.23.3
         version: 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
@@ -410,12 +410,15 @@ importers:
       concurrently:
         specifier: ^8.2.2
         version: 8.2.2
+      ember-modifier:
+        specifier: ^4.1.0
+        version: 4.1.0(ember-source@5.7.0)
       ember-repl:
         specifier: ^4.1.1
         version: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-template-lint:
         specifier: ^5.13.0
         version: 5.13.0
@@ -523,28 +526,6 @@ packages:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/core@7.24.0:
-    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.23.5
-      '@babel/generator': 7.23.6
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helpers': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-      convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@9.4.0)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
   /@babel/core@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
@@ -577,7 +558,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
       eslint: 8.57.0
       eslint-visitor-keys: 2.1.0
@@ -624,7 +605,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
@@ -644,7 +625,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
@@ -657,10 +638,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -730,7 +711,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.20
@@ -744,7 +725,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
@@ -787,16 +768,6 @@ packages:
       '@babel/template': 7.24.0
       '@babel/types': 7.24.0
 
-  /@babel/helpers@7.24.0:
-    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-    transitivePeerDependencies:
-      - supports-color
-
   /@babel/helpers@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
     engines: {node: '>=6.9.0'}
@@ -831,7 +802,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.24.0):
@@ -843,7 +814,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
@@ -857,7 +828,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -871,7 +842,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -884,7 +855,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-decorators': 7.24.0(@babel/core@7.24.0)
@@ -899,7 +870,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -912,7 +883,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
 
   /@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.24.0):
     resolution: {integrity: sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==}
@@ -924,7 +895,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -938,7 +909,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0):
@@ -949,7 +920,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0):
@@ -961,7 +932,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-decorators@7.24.0(@babel/core@7.24.0):
@@ -973,7 +944,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0):
@@ -984,7 +955,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0):
@@ -995,7 +966,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.0):
@@ -1007,7 +978,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
@@ -1020,7 +991,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.24.0):
@@ -1032,7 +1003,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0):
@@ -1043,7 +1014,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0):
@@ -1054,7 +1025,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0):
@@ -1066,7 +1037,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
@@ -1078,7 +1049,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0):
@@ -1089,7 +1060,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0):
@@ -1100,7 +1071,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0):
@@ -1111,7 +1082,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0):
@@ -1122,7 +1093,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0):
@@ -1133,7 +1104,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0):
@@ -1145,7 +1116,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0):
@@ -1157,7 +1128,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.0):
@@ -1169,7 +1140,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0):
@@ -1181,7 +1152,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1194,7 +1165,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.24.0):
@@ -1206,7 +1177,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
@@ -1221,7 +1192,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
@@ -1235,7 +1206,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.24.0):
@@ -1247,7 +1218,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.24.0):
@@ -1259,7 +1230,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1272,7 +1243,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
@@ -1286,7 +1257,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
@@ -1305,7 +1276,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/template': 7.24.0
 
@@ -1318,7 +1289,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.24.0):
@@ -1330,7 +1301,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1343,7 +1314,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.24.0):
@@ -1355,7 +1326,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
 
@@ -1368,7 +1339,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1381,7 +1352,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
 
@@ -1394,7 +1365,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.0)
     dev: true
@@ -1408,7 +1379,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
@@ -1421,7 +1392,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-plugin-utils': 7.24.0
@@ -1435,7 +1406,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
 
@@ -1448,7 +1419,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.24.0):
@@ -1460,7 +1431,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
 
@@ -1473,7 +1444,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.24.0):
@@ -1485,7 +1456,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1498,7 +1469,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-simple-access': 7.22.5
@@ -1512,7 +1483,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1527,7 +1498,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1540,7 +1511,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1553,7 +1524,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.24.0):
@@ -1565,7 +1536,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
 
@@ -1578,7 +1549,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
 
@@ -1592,7 +1563,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
@@ -1607,7 +1578,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
 
@@ -1620,7 +1591,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
 
@@ -1633,7 +1604,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
@@ -1647,7 +1618,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.24.0):
@@ -1659,7 +1630,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1672,7 +1643,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1687,7 +1658,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.24.0):
@@ -1699,7 +1670,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       regenerator-transform: 0.15.2
 
@@ -1712,7 +1683,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-runtime@7.24.0(@babel/core@7.24.0):
@@ -1724,7 +1695,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
       babel-plugin-polyfill-corejs2: 0.4.8(@babel/core@7.24.0)
@@ -1743,7 +1714,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-spread@7.23.3(@babel/core@7.24.0):
@@ -1755,7 +1726,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
@@ -1768,7 +1739,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0):
@@ -1780,7 +1751,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.24.0):
@@ -1792,7 +1763,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.24.0):
@@ -1804,7 +1775,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1818,7 +1789,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
     dev: true
@@ -1831,7 +1802,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
@@ -1845,7 +1816,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.24.0):
@@ -1857,7 +1828,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1870,7 +1841,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1883,7 +1854,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1904,7 +1875,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
@@ -1996,7 +1967,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
       '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.0)
@@ -2010,7 +1981,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/types': 7.24.0
       esutils: 2.0.3
@@ -2024,7 +1995,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
       '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
@@ -2041,7 +2012,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -2087,29 +2058,12 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.24.0
       '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/traverse@7.24.0:
-    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.23.5
-      '@babel/generator': 7.23.6
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@9.4.0)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
   /@babel/traverse@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
     engines: {node: '>=6.9.0'}
@@ -2257,7 +2211,7 @@ packages:
       ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3)
       ember-cli-babel: 7.26.11
       ember-cli-htmlbars: 6.3.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@glint/template'
       - supports-color
@@ -2301,7 +2255,7 @@ packages:
     resolution: {integrity: sha512-JGOQNRj3UR0NdWEg8MsM2eqPLncEwSB1IX+rwntIj22TEKj8biqx7GDgSbeH+ZedijmCh354Hf2c5rthrdzUAw==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@embroider/shared-internals': 2.5.2
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       broccoli-funnel: 3.0.8
       semver: 7.6.0
     transitivePeerDependencies:
@@ -2339,12 +2293,12 @@ packages:
       '@embroider/core': ^3.4.5
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
       '@babel/plugin-transform-runtime': 7.24.0(@babel/core@7.24.0)
       '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
       '@babel/runtime': 7.24.0
-      '@babel/traverse': 7.24.0
+      '@babel/traverse': 7.24.0(supports-color@8.1.1)
       '@embroider/core': 3.4.5(@glint/template@1.3.0)
       '@embroider/macros': 1.14.0(@glint/template@1.3.0)
       '@types/babel__code-frame': 7.0.6
@@ -2364,12 +2318,12 @@ packages:
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
       chalk: 4.1.2
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       escape-string-regexp: 4.0.0
       fast-sourcemap-concat: 1.4.0
       fs-extra: 9.1.0
       fs-tree-diff: 2.0.1
-      jsdom: 16.7.0
+      jsdom: 16.7.0(supports-color@8.1.1)
       lodash: 4.17.21
       pkg-up: 3.1.0
       resolve: 1.22.8
@@ -2392,25 +2346,25 @@ packages:
     resolution: {integrity: sha512-DoowHKCASfjLe//Ok0jEOptVHlvGtepV1UjIGy6AFkBb4nXlszg/SuiXAYlm9Np6GG+YMTGLZF4AN4zemzefLQ==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/parser': 7.24.0
-      '@babel/traverse': 7.24.0
+      '@babel/traverse': 7.24.0(supports-color@8.1.1)
       '@embroider/macros': 1.14.0(@glint/template@1.3.0)
-      '@embroider/shared-internals': 2.5.2
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       assert-never: 1.2.1
       babel-plugin-ember-template-compilation: 2.2.1
       broccoli-node-api: 1.7.0
       broccoli-persistent-filter: 3.1.3
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fast-sourcemap-concat: 1.4.0
       filesize: 10.1.0
       fs-extra: 9.1.0
       fs-tree-diff: 2.0.1
       handlebars: 4.7.8
       js-string-escape: 1.0.1
-      jsdom: 16.7.0
+      jsdom: 16.7.0(supports-color@8.1.1)
       lodash: 4.17.21
       resolve: 1.22.8
       resolve-package-path: 4.0.3
@@ -2447,7 +2401,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/shared-internals': 2.5.2
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2468,7 +2422,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/shared-internals': 2.5.2
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2490,8 +2444,8 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
-      '@embroider/shared-internals': 2.5.2
+      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2503,22 +2457,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@embroider/shared-internals@2.5.2:
-    resolution: {integrity: sha512-jNDJ9YlV6Qp9Na9v17qirUewVuq6T0t32nn+bbnFlCRTvmllKluZdYPSC5RuRnEZKTloVYRSF0+f1rgkTIEvxQ==}
-    engines: {node: 12.* || 14.* || >= 16}
-    dependencies:
-      babel-import-util: 2.0.1
-      debug: 4.3.4(supports-color@9.4.0)
-      ember-rfc176-data: 0.3.18
-      fs-extra: 9.1.0
-      js-string-escape: 1.0.1
-      lodash: 4.17.21
-      resolve-package-path: 4.0.3
-      semver: 7.6.0
-      typescript-memoize: 1.1.1
-    transitivePeerDependencies:
-      - supports-color
-
   /@embroider/shared-internals@2.5.2(supports-color@8.1.1):
     resolution: {integrity: sha512-jNDJ9YlV6Qp9Na9v17qirUewVuq6T0t32nn+bbnFlCRTvmllKluZdYPSC5RuRnEZKTloVYRSF0+f1rgkTIEvxQ==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -2534,14 +2472,13 @@ packages:
       typescript-memoize: 1.1.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
   /@embroider/shared-internals@2.5.2-unstable.12a42ca:
     resolution: {integrity: sha512-QlZksVS/IIRsDcVSX4EEKku4TTbJMRhD68OAZhBiUWiw9cjwelRILpimt9LR99Bop4/90x6nr6Dl068o/zswHg==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
       babel-import-util: 2.0.1
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       ember-rfc176-data: 0.3.18
       fs-extra: 9.1.0
       js-string-escape: 1.0.1
@@ -2565,13 +2502,13 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
       '@glint/environment-ember-loose': 1.3.0(@glimmer/component@1.1.2)(@glint/template@1.3.0)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0)
       '@glint/template': 1.3.0
       broccoli-funnel: 3.0.8
       ember-cli-babel: 8.2.0(@babel/core@7.24.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -2842,7 +2779,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -3244,7 +3181,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -3462,7 +3399,7 @@ packages:
       prettier:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
@@ -3487,6 +3424,55 @@ packages:
       - typescript
     dev: true
 
+  /@nullvoxpopuli/eslint-configs@3.2.2(@typescript-eslint/eslint-plugin@7.1.0)(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(prettier@3.2.5)(typescript@5.3.3):
+    resolution: {integrity: sha512-Qm7TR7K+kb5emAoddPsoznmAgUptL7YWUOdtaBq2T4pgkEyr7JTS1v4TPg07LusfYi2He2nKJBdTcD++hrsNdw==}
+    engines: {node: '>= v16.0.0'}
+    peerDependencies:
+      '@babel/core': ^7.22.10
+      '@babel/eslint-parser': ^7.22.10
+      '@typescript-eslint/eslint-plugin': ^5.62.0 || >= 6.0.0
+      '@typescript-eslint/parser': ^5.62.0 || >= 6.0.0
+      eslint: ^7.0.0 || ^8.0.0
+      eslint-plugin-ember: '>= 11.10.0'
+      eslint-plugin-qunit: '>= 8.0.0'
+      prettier: ^2.8.8 || >= 3.0.0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      '@babel/eslint-parser':
+        optional: true
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+      '@typescript-eslint/parser':
+        optional: true
+      eslint-plugin-ember:
+        optional: true
+      eslint-plugin-qunit:
+        optional: true
+      prettier:
+        optional: true
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
+      '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
+      cosmiconfig: 8.3.6(typescript@5.3.3)
+      eslint: 8.57.0
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.1.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-plugin-decorator-position: 5.0.2(@babel/eslint-parser@7.23.10)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.1.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-json: 3.1.0
+      eslint-plugin-n: 16.6.2(eslint@8.57.0)
+      eslint-plugin-prettier: 4.2.1(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5)
+      eslint-plugin-simple-import-sort: 10.0.0(eslint@8.57.0)
+      prettier: 3.2.5
+      prettier-plugin-ember-template-tag: 1.1.0(prettier@3.2.5)
+    transitivePeerDependencies:
+      - eslint-config-prettier
+      - eslint-import-resolver-node
+      - eslint-import-resolver-webpack
+      - supports-color
+      - typescript
+    dev: true
+
   /@octokit/auth-token@3.0.4:
     resolution: {integrity: sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==}
     engines: {node: '>= 14'}
@@ -4052,7 +4038,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-module-imports': 7.22.15
       '@rollup/pluginutils': 5.1.0(rollup@4.12.1)
       rollup: 4.12.1
@@ -4519,7 +4505,7 @@ packages:
       '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.3.1
@@ -4545,7 +4531,7 @@ packages:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.57.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -4580,7 +4566,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       eslint: 8.57.0
       ts-api-utils: 1.2.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -4609,7 +4595,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -4893,15 +4879,6 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
-    dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /agent-base@6.0.2(supports-color@8.1.1):
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
@@ -5298,7 +5275,7 @@ packages:
     resolution: {integrity: sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==}
     engines: {node: 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       heimdalljs: 0.2.6
       istextorbinary: 2.6.0
       mkdirp: 0.5.6
@@ -5361,7 +5338,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
     dev: true
 
   /babel-helper-builder-binary-assignment-operator-visitor@6.24.1(supports-color@8.1.1):
@@ -5543,7 +5520,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       semver: 5.7.2
 
   /babel-plugin-debug-macros@0.3.4(@babel/core@7.24.0):
@@ -5555,7 +5532,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       semver: 5.7.2
 
   /babel-plugin-ember-data-packages-polyfill@0.1.2:
@@ -5623,7 +5600,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
       semver: 6.3.1
     transitivePeerDependencies:
@@ -5637,7 +5614,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
       core-js-compat: 3.36.0
     transitivePeerDependencies:
@@ -5651,7 +5628,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
     transitivePeerDependencies:
       - supports-color
@@ -6178,7 +6155,7 @@ packages:
     resolution: {integrity: sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==}
     engines: {node: '>= 6'}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/polyfill': 7.12.1
       broccoli-funnel: 2.0.2
       broccoli-merge-trees: 3.0.2
@@ -6202,7 +6179,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       broccoli-persistent-filter: 3.1.3
       clone: 2.1.2
       hash-for-dep: 1.5.1
@@ -6344,7 +6321,7 @@ packages:
     dependencies:
       array-equal: 1.0.2
       broccoli-plugin: 4.0.7
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fs-tree-diff: 2.0.1
       heimdalljs: 0.2.6
       minimatch: 3.1.2
@@ -6524,7 +6501,7 @@ packages:
       broccoli-persistent-filter: 2.3.1
       broccoli-plugin: 2.1.0
       chalk: 2.4.2
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       ensure-posix-path: 1.1.1
       fs-extra: 8.1.0
       minimatch: 3.1.2
@@ -7645,6 +7622,7 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 9.4.0
+    dev: true
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
@@ -7902,7 +7880,7 @@ packages:
     dependencies:
       '@ember/test-waiters': 3.1.0
       '@embroider/addon-shim': 1.8.7
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -7910,14 +7888,14 @@ packages:
     resolution: {integrity: sha512-pkWIljmJClYL17YBk8FjO7NrZPQoY9v0b+FooJvaHf/xlDQIBYVP7OaDHbNuNbpj7+wAwSDAnnwxjCoLsmm4cw==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
       '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
       '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
-      '@embroider/shared-internals': 2.5.2
+      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
       babel-loader: 8.3.0(@babel/core@7.24.0)(webpack@5.90.3)
       babel-plugin-ember-modules-api-polyfill: 3.5.0
       babel-plugin-ember-template-compilation: 2.2.1
@@ -7929,7 +7907,7 @@ packages:
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
       css-loader: 5.2.7(webpack@5.90.3)
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
       fs-tree-diff: 2.0.1
       handlebars: 4.7.8
@@ -7973,7 +7951,7 @@ packages:
       ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0)
       ember-cli-babel: 7.26.11
       ember-cli-babel-plugin-helpers: 1.1.1
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - '@glint/template'
@@ -7986,7 +7964,7 @@ packages:
       ember-source: ^3.28.0 || >= 4.0.0
     dependencies:
       ember-cli-babel: 7.26.11
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       git-repo-info: 2.1.1
     transitivePeerDependencies:
       - supports-color
@@ -8000,7 +7978,7 @@ packages:
     resolution: {integrity: sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
@@ -8042,7 +8020,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
@@ -8178,7 +8156,7 @@ packages:
     engines: {node: 16.* || >= 18}
     dependencies:
       broccoli-funnel: 3.0.8
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8210,7 +8188,7 @@ packages:
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-transform-typescript': 7.4.5(@babel/core@7.24.0)
       ansi-to-html: 0.6.15
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       ember-cli-babel-plugin-helpers: 1.1.1
       execa: 1.0.0
       fs-extra: 7.0.1
@@ -8230,7 +8208,7 @@ packages:
     dependencies:
       '@babel/plugin-transform-typescript': 7.5.5(@babel/core@7.24.0)
       ansi-to-html: 0.6.15
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       ember-cli-babel-plugin-helpers: 1.1.1
       execa: 2.1.0
       fs-extra: 8.1.0
@@ -8249,7 +8227,7 @@ packages:
     dependencies:
       ansi-to-html: 0.6.15
       broccoli-stew: 3.0.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 4.1.0
       fs-extra: 9.1.0
       resolve: 1.22.8
@@ -8456,7 +8434,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       '@embroider/util': 1.13.0(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@glint/environment-ember-loose'
       - '@glint/template'
@@ -8473,7 +8451,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@glimmer/syntax': 0.88.1
       '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
@@ -8495,7 +8473,7 @@ packages:
       ember-cli-babel: 7.26.11
       ember-cli-typescript: 5.3.0
       ember-cli-version-checker: 5.1.2
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8521,7 +8499,7 @@ packages:
       '@embroider/addon-shim': 1.8.7
       ember-cli-normalize-entity-name: 1.0.0
       ember-cli-string-utils: 1.1.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8533,7 +8511,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       '@simple-dom/document': 1.4.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8568,7 +8546,7 @@ packages:
       ember-element-helper: 0.8.6(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-modifier: 4.1.0(ember-source@5.7.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-velcro: 2.1.3(ember-modifier@4.1.0)(ember-source@5.7.0)
       reactiveweb: 1.2.2(@babel/core@7.24.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       tracked-toolbox: 2.0.0(@babel/core@7.24.0)(ember-source@5.7.0)
@@ -8588,7 +8566,7 @@ packages:
       '@embroider/addon-shim': 1.8.7
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
       ember-cli-test-loader: 3.1.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       qunit: 2.20.1
     transitivePeerDependencies:
       - '@glint/template'
@@ -8625,7 +8603,7 @@ packages:
       content-tag: 1.2.2
       decorator-transforms: 1.1.0(@babel/core@7.24.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       line-column: 1.0.2
       magic-string: 0.30.8
       mdast: 3.0.0
@@ -8656,7 +8634,7 @@ packages:
         optional: true
     dependencies:
       ember-cli-babel: 7.26.11
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8677,7 +8655,7 @@ packages:
       '@glimmer/component': 1.1.2(@babel/core@7.24.0)
       '@glimmer/tracking': 1.1.2
       '@glint/template': 1.3.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8697,16 +8675,14 @@ packages:
     engines: {node: 8.* || 10.* || >= 12}
     dependencies:
       '@babel/parser': 7.24.0
-      '@babel/traverse': 7.24.0
+      '@babel/traverse': 7.24.0(supports-color@8.1.1)
       recast: 0.18.10
     transitivePeerDependencies:
       - supports-color
 
-  /ember-source@5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3):
+  /ember-source@5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3):
     resolution: {integrity: sha512-iOZVyxLBzGewEThDDsNRZ9y02SNH42PWSPC9U4O94pew7ktld3IpIODCDjLCtKWn2zAGM9DhWTMrXz27HI1UKw==}
     engines: {node: '>= 16.*'}
-    peerDependencies:
-      '@glimmer/component': ^1.1.2
     dependencies:
       '@babel/helper-module-imports': 7.22.15
       '@ember/edition-utils': 1.2.0
@@ -8868,7 +8844,7 @@ packages:
       '@floating-ui/dom': 1.6.3
       ember-functions-as-helper-polyfill: 2.1.2(ember-source@5.7.0)
       ember-modifier: 4.1.0(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8931,7 +8907,7 @@ packages:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       engine.io-parser: 5.2.2
       ws: 8.11.0
     transitivePeerDependencies:
@@ -9171,7 +9147,7 @@ packages:
       eslint: '*'
       eslint-plugin-import: '*'
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       enhanced-resolve: 5.15.1
       eslint: 8.57.0
       eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.1.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
@@ -9227,7 +9203,7 @@ packages:
       '@babel/eslint-parser':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
       '@ember-data/rfc395-data': 0.0.4
@@ -9447,7 +9423,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -10935,17 +10911,6 @@ packages:
     resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==}
     dev: true
 
-  /http-proxy-agent@4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
-    engines: {node: '>= 6'}
-    dependencies:
-      '@tootallnate/once': 1.1.2
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.4.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /http-proxy-agent@4.0.1(supports-color@8.1.1):
     resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
     engines: {node: '>= 6'}
@@ -10968,16 +10933,6 @@ packages:
       - debug
     dev: true
 
-  /https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.4.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /https-proxy-agent@5.0.1(supports-color@8.1.1):
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
@@ -11605,7 +11560,7 @@ packages:
       '@babel/preset-env':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/parser': 7.24.0
       '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
       '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
@@ -11629,48 +11584,6 @@ packages:
       - supports-color
     dev: true
 
-  /jsdom@16.7.0:
-    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
-    dependencies:
-      abab: 2.0.6
-      acorn: 8.11.3
-      acorn-globals: 6.0.0
-      cssom: 0.4.4
-      cssstyle: 2.3.0
-      data-urls: 2.0.0
-      decimal.js: 10.4.3
-      domexception: 2.0.1
-      escodegen: 2.1.0
-      form-data: 3.0.1
-      html-encoding-sniffer: 2.0.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.7
-      parse5: 6.0.1
-      saxes: 5.0.1
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.3
-      w3c-hr-time: 1.0.2
-      w3c-xmlserializer: 2.0.0
-      webidl-conversions: 6.1.0
-      whatwg-encoding: 1.0.5
-      whatwg-mimetype: 2.3.0
-      whatwg-url: 8.7.0
-      ws: 7.5.9
-      xml-name-validator: 3.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
-
   /jsdom@16.7.0(supports-color@8.1.1):
     resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
     engines: {node: '>=10'}
@@ -12177,8 +12090,8 @@ packages:
       agentkeepalive: 4.5.0
       cacache: 15.3.0
       http-cache-semantics: 4.1.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
+      http-proxy-agent: 4.0.1(supports-color@8.1.1)
+      https-proxy-agent: 5.0.1(supports-color@8.1.1)
       is-lambda: 1.0.1
       lru-cache: 6.0.0
       minipass: 3.3.6
@@ -12684,7 +12597,7 @@ packages:
     resolution: {integrity: sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==}
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       decode-named-character-reference: 1.0.2
       micromark-core-commonmark: 1.1.0
       micromark-factory-space: 1.1.0
@@ -13876,7 +13789,7 @@ packages:
     peerDependencies:
       prettier: '>= 3.0.0'
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@glimmer/syntax': 0.84.3
       ember-cli-htmlbars: 6.3.0
       ember-template-imports: 3.4.2
@@ -13891,7 +13804,7 @@ packages:
     peerDependencies:
       prettier: '>= 3.0.0'
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       content-tag: 1.2.2
       prettier: 3.2.5
     transitivePeerDependencies:
@@ -14136,7 +14049,7 @@ packages:
       ember-async-data: 1.0.3(ember-source@5.7.0)
       ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - '@glimmer/component'
@@ -14406,7 +14319,7 @@ packages:
   /remove-types@1.0.0:
     resolution: {integrity: sha512-G7Hk1Q+UJ5DvlNAoJZObxANkBZGiGdp589rVcTW/tYqJWJ5rwfraSnKSQaETN8Epaytw8J40nS/zC7bcHGv36w==}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       '@babel/plugin-syntax-decorators': 7.24.0(@babel/core@7.24.0)
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.24.0)
       prettier: 2.8.8
@@ -15061,7 +14974,7 @@ packages:
   /socket.io-adapter@2.5.4:
     resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==}
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       ws: 8.11.0
     transitivePeerDependencies:
       - bufferutil
@@ -15074,7 +14987,7 @@ packages:
     engines: {node: '>=10.0.0'}
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -15086,7 +14999,7 @@ packages:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       engine.io: 6.5.4
       socket.io-adapter: 2.5.4
       socket.io-parser: 4.2.4
@@ -15100,8 +15013,8 @@ packages:
     resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
     engines: {node: '>= 10'}
     dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@9.4.0)
+      agent-base: 6.0.2(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@8.1.1)
       socks: 2.8.1
     transitivePeerDependencies:
       - supports-color
@@ -15279,7 +15192,7 @@ packages:
     resolution: {integrity: sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -15537,7 +15450,7 @@ packages:
       cosmiconfig: 9.0.0(typescript@5.3.3)
       css-functions-list: 3.2.1
       css-tree: 2.3.1
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fast-glob: 3.3.2
       fastest-levenshtein: 1.0.16
       file-entry-cache: 8.0.0
@@ -15597,6 +15510,7 @@ packages:
   /supports-color@9.4.0:
     resolution: {integrity: sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==}
     engines: {node: '>=12'}
+    dev: true
 
   /supports-hyperlinks@3.0.0:
     resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==}
@@ -15636,7 +15550,7 @@ packages:
     resolution: {integrity: sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==}
     engines: {node: 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       heimdalljs: 0.2.6
       mkdirp: 0.5.6
       rimraf: 3.0.2
@@ -16047,7 +15961,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
@@ -16072,7 +15986,7 @@ packages:
     resolution: {integrity: sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==}
     engines: {node: '>=8'}
     dependencies:
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       fs-tree-diff: 2.0.1
       mkdirp: 0.5.6
       quick-temp: 0.1.8
@@ -16641,7 +16555,7 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       pathe: 1.1.2
       picocolors: 1.0.0
       vite: 5.1.4
@@ -16723,7 +16637,7 @@ packages:
       '@vitest/utils': 1.3.1
       acorn-walk: 8.3.2
       chai: 4.4.1
-      debug: 4.3.4(supports-color@9.4.0)
+      debug: 4.3.4(supports-color@8.1.1)
       execa: 8.0.1
       local-pkg: 0.5.0
       magic-string: 0.30.8
@@ -17067,7 +16981,7 @@ packages:
   /workerpool@3.1.2:
     resolution: {integrity: sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.24.0(supports-color@8.1.1)
       object-assign: 4.1.1
       rsvp: 4.8.5
     transitivePeerDependencies:
@@ -17276,7 +17190,7 @@ packages:
       ember-primitives: 0.12.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-modifier@4.1.0)(ember-resources@7.0.0)(ember-source@5.7.0)
       ember-repl: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       globby: 14.0.1
       json5: 2.2.3
       package-up: 5.0.0
@@ -17316,7 +17230,7 @@ packages:
       ember-primitives: 0.12.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-modifier@4.1.0)(ember-resources@7.0.0)(ember-source@5.7.0)
       ember-repl: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
       qunit: 2.20.1
       reactiveweb: 1.2.2(@babel/core@7.24.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       tracked-built-ins: 3.3.0
diff --git a/src/plugins/api-docs/index.js b/src/plugins/api-docs/index.js
index 3d255f66..af0c9f7c 100644
--- a/src/plugins/api-docs/index.js
+++ b/src/plugins/api-docs/index.js
@@ -35,7 +35,7 @@ export const apiDocs = (options) => {
    * @param {string} pkgName
    */
   function getDest(pkgName) {
-    return `${options.dest ?? 'docs'}/${pkgName}.json`;
+    return `${options.dest ?? 'docs'}/${pkgName.replace('/', '__')}.json`;
   }
 
   return {
diff --git a/src/plugins/api-docs/typedoc.js b/src/plugins/api-docs/typedoc.js
index 729a8802..7985bed8 100644
--- a/src/plugins/api-docs/typedoc.js
+++ b/src/plugins/api-docs/typedoc.js
@@ -31,7 +31,7 @@ export async function generateTypeDocJSON({ packageName }) {
   const absoluteResolved = resolvedEntries.map((entry) => join(typeInfo.dir, entry));
 
   const typedoc = await import('typedoc');
-  const tmpTSConfigPath = `/tmp/kolay-typedoc-${packageName}.json`;
+  const tmpTSConfigPath = `/tmp/kolay-typedoc-${packageName.replace('/', '__').replace('@', 'at__')}.json`;
   const extendsTsConfig = require.resolve('@tsconfig/ember/tsconfig.json');
 
   const tsConfig = {
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index b23245db..7d9bb7bc 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -10,8 +10,8 @@ API Reference generated via:
 
 ```hbs live no-shadow preview below
 <ModifierSignature
-  @module='src/browser/re-exports'
-  @name='ComponentSignature'
-  @package='kolay'
+  @module='declarations/samples/-private/modifier'
+  @name='functionExampleA'
+  @package='@universal-ember/kolay-ui'
 />
 ```
diff --git a/ui/package.json b/ui/package.json
index 1bc87ee4..e4044308 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -62,6 +62,7 @@
     "@types/qunit": "^2.19.10",
     "babel-plugin-ember-template-compilation": "^2.2.1",
     "concurrently": "^8.2.2",
+    "ember-modifier": "^4.1.0",
     "ember-repl": "^4.1.1",
     "ember-source": "~5.7.0",
     "ember-template-lint": "^5.13.0",
diff --git a/ui/src/samples/-private/modifier.ts b/ui/src/samples/-private/modifier.ts
index 143ba9fa..b17b1c38 100644
--- a/ui/src/samples/-private/modifier.ts
+++ b/ui/src/samples/-private/modifier.ts
@@ -1,12 +1,12 @@
 import { modifier } from 'ember-modifier';
 
-export const functionModifier = modifier(
+export const functionExampleA = modifier(
   (
     element: HTMLDivElement,
     positional: [x: number, y: number],
     named: { invert?: boolean },
   ) => {
     // eslint-disable-next-line no-console
-    console.log(positional, named);
+    console.log(element, positional, named);
   },
 );
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index 31edb510..e8e0b051 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -40,6 +40,16 @@ function getSignature(info: DeclarationReflection) {
   return info;
 }
 
+function getNamedArgs(info: DeclarationReflection) {
+  let args = findChildDeclaration(info, 'Args');
+
+if (!args) return;
+
+let named = findChildDeclaration(args, 'Named');
+
+return named;
+}
+
 export const ComponentSignature: TOC<{
   Args: {
     /**
@@ -64,7 +74,7 @@ export const ComponentSignature: TOC<{
   >
     {{#let (getSignature declaration) as |info|}}
       <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
-      <NamedArgs @kind='modifier' @info={{findChildDeclaration info 'Args'}} />
+      <NamedArgs @kind='modifier' @info={{getNamedArgs info}} />
     {{/let}}
   </Load>
 </template>;

From cfad373ee234605dc33f2f371cb9b410962b837d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 11:53:53 -0400
Subject: [PATCH 03/18] Add a way to debug typedoc output for this project, add
 some docs, specifically around ordering pages

---
 .eslintignore                                |  4 +-
 .gitignore                                   |  2 +
 .prettierignore                              |  2 +
 docs-app/app/routes/application.ts           |  1 +
 docs-app/ember-cli-build.js                  |  2 +-
 docs-app/public/docs/plugins/index.md        |  9 ----
 docs-app/public/docs/plugins/kolay.md        | 36 ++++++++++---
 docs-app/public/docs/usage/meta.jsonc        |  4 ++
 docs-app/public/docs/usage/ordering-pages.md | 54 ++++++++++++++++++++
 package.json                                 |  5 ++
 src/plugins/api-docs/types.ts                |  8 ---
 src/plugins/combined.js                      | 21 +++++---
 src/plugins/index.d.ts                       |  4 ++
 src/plugins/markdown-pages/types.ts          | 36 -------------
 src/plugins/types.ts                         | 54 +++++++++++++++++++-
 tsconfig.json                                |  2 +-
 tsconfig.typedoc.json                        |  7 +++
 typedoc.config.json                          | 24 +++++++++
 ui/src/typedoc/signature/modifier.gts        |  6 +--
 19 files changed, 207 insertions(+), 74 deletions(-)
 delete mode 100644 docs-app/public/docs/plugins/index.md
 create mode 100644 docs-app/public/docs/usage/meta.jsonc
 create mode 100644 docs-app/public/docs/usage/ordering-pages.md
 create mode 100644 src/plugins/index.d.ts
 create mode 100644 tsconfig.typedoc.json
 create mode 100644 typedoc.config.json

diff --git a/.eslintignore b/.eslintignore
index 630e909f..c1033aef 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,8 @@
 node_modules/
 declarations/
+dist/
+dist-typedoc/
 *.yaml
 *.md
 docs-app/
-ui/
\ No newline at end of file
+ui/
diff --git a/.gitignore b/.gitignore
index bf8f0c7a..dae501b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 node_modules/
+dist/
+dist-typedoc/
 declarations/
 .turbo/
diff --git a/.prettierignore b/.prettierignore
index 72f651f1..c1033aef 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,5 +1,7 @@
 node_modules/
 declarations/
+dist/
+dist-typedoc/
 *.yaml
 *.md
 docs-app/
diff --git a/docs-app/app/routes/application.ts b/docs-app/app/routes/application.ts
index 70bcd061..e31d4bb7 100644
--- a/docs-app/app/routes/application.ts
+++ b/docs-app/app/routes/application.ts
@@ -25,6 +25,7 @@ export default class ApplicationRoute extends Route {
         import('shiki/langs/glimmer-js.mjs'),
         import('shiki/langs/glimmer-ts.mjs'),
         import('shiki/langs/handlebars.mjs'),
+        import('shiki/langs/jsonc.mjs'),
       ],
       langAlias: {
         gjs: 'glimmer-js',
diff --git a/docs-app/ember-cli-build.js b/docs-app/ember-cli-build.js
index c5ea7ec2..b7d84add 100644
--- a/docs-app/ember-cli-build.js
+++ b/docs-app/ember-cli-build.js
@@ -38,7 +38,7 @@ module.exports = async function (defaults) {
                 src: '../ui/docs',
               },
             ],
-            packages: ['kolay', 'ember-primitives', 'ember-resources', '@universal-ember/kolay-ui'],
+            packages: ['kolay', 'ember-primitives', 'ember-resources'],
           }),
         ],
       },
diff --git a/docs-app/public/docs/plugins/index.md b/docs-app/public/docs/plugins/index.md
deleted file mode 100644
index b607884a..00000000
--- a/docs-app/public/docs/plugins/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build Plugins
-
-Kolay requires some build-time static analysis to function.
-
-[`kolay(...)`][plugin-kolay] is the only required plugin. This generates the navigation and information about how Kolay's runtime code will fetch the markdown documents deployed with the app's static assets. Optionally, if a list of packages is provided, apiDocs will be generated from your library's type declarations. Rendering these api docs uses the [Signature Components][ui-signature] or [`APIDocs`][ui-apiDocs] components.
-
-[plugin-kolay]: /plugins/kolay.md
-[ui-signature]: /Runtime/components/component-signature.md
-[ui-apiDocs]: /Runtime/components/api-docs.md
diff --git a/docs-app/public/docs/plugins/kolay.md b/docs-app/public/docs/plugins/kolay.md
index 9d5645e8..6cdddec4 100644
--- a/docs-app/public/docs/plugins/kolay.md
+++ b/docs-app/public/docs/plugins/kolay.md
@@ -1,14 +1,38 @@
 # `kolay(...)`
 
-This is the main build plugin
+Kolay requires some build-time static analysis to function.
 
-## Config
+`kolay(...)` is the only required plugin. This generates the navigation and information about how Kolay's runtime code will fetch the markdown documents deployed with the app's static assets. Optionally, if a list of packages is provided, apiDocs will be generated from your library's type declarations. Rendering these api docs uses the [Signature Components][ui-signature] or [`APIDocs`][ui-apiDocs] components.
 
-either json or jsonc
+[plugin-kolay]: /plugins/kolay.md
+[ui-signature]: /Runtime/components/component-signature.md
+[ui-apiDocs]: /Runtime/components/api-docs.md
 
-- set order
-- change name
+Usage in embroider / webpack:
+
+```js
+// ember-cli-build.js
+
+const { kolay } = await import("kolay/webpack");
+
+return require("@embroider/compat").compatBuild(app, Webpack, {
+  /* ... */
+  packagerOptions: {
+    webpackConfig: {
+      /* ... */
+      plugins: [kolay(/* Options, see below */)],
+    },
+  },
+});
+```
 
 ```hbs live no-shadow
-<APIDocs @package="kolay" @module="declarations/vite" @name="kolay" />
+<APIDocs @package="kolay" @module="declarations/plugins/types" @name="Options" />
 ```
+
+## Conventions
+
+There are a few ways you can collect docs:
+
+- using `src`, these are your main docs, but they could also be your only docs. If you have a small project, this will provide the best experience for working with documentation as changes to this directory are (especially if using the recommended `public/docs` value), will automatically reload when changes are made.
+- The `groups` option are where more freedom is provided. This can point at a `docs` folder in another folder in your project, or it can point at a `components` folder and the plugin will pick up all markdown files it finds in there. This can be useful for co-locating docs with their implementations.
diff --git a/docs-app/public/docs/usage/meta.jsonc b/docs-app/public/docs/usage/meta.jsonc
new file mode 100644
index 00000000..711bf244
--- /dev/null
+++ b/docs-app/public/docs/usage/meta.jsonc
@@ -0,0 +1,4 @@
+{
+  // This is in order of need-to-know
+  "order": ["setup", "rendering-pages", "ordering-pages"],
+}
diff --git a/docs-app/public/docs/usage/ordering-pages.md b/docs-app/public/docs/usage/ordering-pages.md
new file mode 100644
index 00000000..5579f334
--- /dev/null
+++ b/docs-app/public/docs/usage/ordering-pages.md
@@ -0,0 +1,54 @@
+## Ordering
+
+At build time, the order of both pages and folders can be configured by providing a `meta.json` or `meta.jsonc` file as a sibling to the list of paths you want to sort.
+
+### Sorting folders
+
+For example, in this project, the docs are in folders in `public/docs`:
+
+```
+public/
+  docs/
+    plugins/
+    usage/
+```
+
+But we want `usage` to come before `plugins`, even though alphabetically, `plugins` comes before `usage`.
+
+We can create a `meta.jsonc` file at `public/docs/meta.jsonc`:
+
+```jsonc
+{
+  // We want usage to be first, which breaks the
+  // default sort order provided by the filesystem: Alphabetical
+  "order": ["usage", "plugins"],
+}
+```
+
+With `jsonc`, we can have comments to explain our reasoning for having configuration at all, and now when rendering the navigation at runtime, we can have `Usage` rendered above `Plugins` without needing to implement any runtime code to do this for us.
+
+### Sorting pages
+
+For example, in this project, the pages under `usage` appear alphabetically in the filesystem like this:
+
+```
+public/
+  docs/
+    usage/
+      ordering-pages.md
+      rendering-pages.md
+      setup.md
+```
+
+Alphabetical ordering in this case is backwards from how it is _useful_ to read about the information contained within these documents.
+
+To sort these pages, we can create a `meta.json` file at `public/docs/usage/meta.jsonc` with the following contents:
+
+```jsonc
+{
+  // This is in order of need-to-know
+  "order": ["setup", "rendering-pages", "ordering-pages"],
+}
+```
+
+And then the order of these pages is adjusted so that at runtime, there is nothing to do! 🥳
diff --git a/package.json b/package.json
index 45cc887c..86e7da0b 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,10 @@
     },
     "./build": {
       "types": "./declarations/plugins/index.d.ts",
+      "import": "./src/browser/virtual/empty.js"
+    },
+    "./build/types": {
+      "types": "./declarations/plugins/types.d.ts",
       "import": "./src/plugins/index.js"
     },
     "./webpack": {
@@ -75,6 +79,7 @@
     "build": "pnpm prepack",
     "build:declarations": "tsc --declaration",
     "_syncPnpm": "pnpm sync-dependencies-meta-injected",
+    "start:typedoc": "typedoc --options ./typedoc.config.json --watch",
     "test:node": "vitest --run"
   },
   "dependencies": {
diff --git a/src/plugins/api-docs/types.ts b/src/plugins/api-docs/types.ts
index ca04bc29..fe91acc7 100644
--- a/src/plugins/api-docs/types.ts
+++ b/src/plugins/api-docs/types.ts
@@ -1,12 +1,4 @@
 export interface APIDocsOptions {
-  /**
-   * List of packages to generate api docs for
-   */
   packages: string[];
-
-  /**
-   * Destination folder to place the api docs json files in.
-   * Defaults to "docs"
-   */
   dest?: string | undefined;
 }
diff --git a/src/plugins/combined.js b/src/plugins/combined.js
index d88f6e53..71104388 100644
--- a/src/plugins/combined.js
+++ b/src/plugins/combined.js
@@ -4,13 +4,20 @@ import { apiDocs } from './api-docs/index.js';
 import { markdownPages } from './markdown-pages/index.js';
 import { setup } from './setup.js';
 
-export const combined = /* #__PURE__ */ createUnplugin(
-  /**
-   * @param {Parameters<typeof apiDocs>[0] & Parameters<typeof markdownPages>[0]} options
-   */
-  (options) => [
+/**
+ * @typedef {import('./types.ts').Options} Options
+ */
+
+/**
+ *
+ * @param {Options} options
+ */
+export function combinedPlugins(options) {
+  return [
     setup(),
     apiDocs({ packages: options.packages, dest: options.dest }),
     markdownPages({ src: options.src, groups: options.groups, dest: options.dest }),
-  ]
-);
+  ];
+}
+
+export const combined = /* #__PURE__ */ createUnplugin(combinedPlugins);
diff --git a/src/plugins/index.d.ts b/src/plugins/index.d.ts
new file mode 100644
index 00000000..2e7d3bf1
--- /dev/null
+++ b/src/plugins/index.d.ts
@@ -0,0 +1,4 @@
+export { combined as kolay } from './combined.js';
+export { gitRef } from './git-ref.js';
+export * as helpers from './helpers.js';
+export type { APIDocsOptions, MarkdownPagesOptions } from './types.ts';
diff --git a/src/plugins/markdown-pages/types.ts b/src/plugins/markdown-pages/types.ts
index 75d998b0..1f068b07 100644
--- a/src/plugins/markdown-pages/types.ts
+++ b/src/plugins/markdown-pages/types.ts
@@ -6,38 +6,10 @@ export type Node = Page | Collection;
 export type GatheredDocs = Array<{ mdPath: string; config?: object }>;
 
 export interface MarkdownPagesOptions {
-  /**
-   * The source directory for where to look for files to include in  the build and create the manifest from.
-   * This is relative to the CWD.
-   * Note that only md, json, and jsonc files are used.
-   *
-   * This option is the same as the one in `groups`, but is a shorthand for if
-   * you only have one set of docs with no configuration needed.
-   */
   src?: string | undefined;
-
-  /**
-   * Additional markdown sources to include
-   * These will be copied into your dist directory, and will be grouped by each entry's "name" property
-   */
   groups: {
-    /**
-     * The name of the group
-     */
     name: string;
-    /**
-     * The source directory for where to look for files to include in  the build and create the manifest from.
-     * This is relative to the CWD.
-     * Note that only md, json, and jsonc files are used.
-     */
     src: string;
-
-    /**
-     * Only generate a manifest of directories.
-     * This ignores all of the files on disk, useful if you have many
-     * convention-based file names and some other means of enforcing that they all exist.
-     * (such as runtime testing)
-     */
     onlyDirectories?: boolean;
 
     /**
@@ -55,14 +27,6 @@ export interface MarkdownPagesOptions {
     exclude?: string[];
   }[];
 
-  /**
-   * The name of the file that is written.
-   * Defaults to 'manifest.json'
-   */
   name?: string | undefined;
-  /**
-   * Where to place the manifest
-   * Defaults to 'docs'
-   */
   dest?: string | undefined;
 }
diff --git a/src/plugins/types.ts b/src/plugins/types.ts
index 579c25f7..27611269 100644
--- a/src/plugins/types.ts
+++ b/src/plugins/types.ts
@@ -1,2 +1,52 @@
-export type { APIDocsOptions } from './api-docs/types.js';
-export type { MarkdownPagesOptions as CreateManifestOptions } from './markdown-pages/types.js';
+export interface Options {
+  /**
+   * The source directory for where to look for files to include in  the build and create the manifest from.
+   * This is relative to the CWD.
+   * Note that only md, json, and jsonc files are used.
+   *
+   * This option is the same as the one in `groups`, but is a shorthand for if
+   * you only have one set of docs with no configuration needed.
+   */
+  src?: string | undefined;
+
+  /**
+   * Additional markdown sources to include
+   * These will be copied into your dist directory, and will be grouped by each entry's "name" property
+   */
+  groups: {
+    /**
+     * The name of the group
+     */
+    name: string;
+    /**
+     * The source directory for where to look for files to include in  the build and create the manifest from.
+     * This is relative to the CWD.
+     * Note that only md, json, and jsonc files are used.
+     */
+    src: string;
+
+    /**
+     * Only generate a manifest of directories.
+     * This ignores all of the files on disk, useful if you have many
+     * convention-based file names and some other means of enforcing that they all exist.
+     * (such as runtime testing)
+     */
+    onlyDirectories?: boolean;
+  }[];
+
+  /**
+   * List of packages to generate api docs for
+   */
+  packages: string[];
+
+  /**
+   * The name of the file that is written.
+   * Defaults to 'manifest.json'
+   */
+  name?: string | undefined;
+  /**
+   * Where to place the manifest
+   * Defaults to 'docs'
+   */
+  dest?: string | undefined;
+}
diff --git a/tsconfig.json b/tsconfig.json
index feee8e82..a055b388 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": ["@tsconfig/strictest", "@tsconfig/node20"],
-  "include": ["src"],
+  "include": ["src/**/*"],
   "exclude": ["docs-app", "declarations", "ui"],
   "compilerOptions": {
     "allowImportingTsExtensions": true,
diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json
new file mode 100644
index 00000000..32c092a4
--- /dev/null
+++ b/tsconfig.typedoc.json
@@ -0,0 +1,7 @@
+{
+  "extends": ["@tsconfig/ember", "@tsconfig/node20"],
+  "include": ["declarations/**/*"],
+  "compilerOptions": {
+    "allowImportingTsExtensions": true
+  }
+}
diff --git a/typedoc.config.json b/typedoc.config.json
new file mode 100644
index 00000000..73de1e9e
--- /dev/null
+++ b/typedoc.config.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "https://typedoc.org/schema.json",
+  "tsconfig": "./tsconfig.typedoc.json",
+  "entryPoints": [
+    "./declarations/index.d.ts",
+    "./declarations/vite.d.ts",
+    "./declarations/webpack.d.ts",
+    "./declarations/plugins/index.d.ts",
+    "./declarations/plugins/types.d.ts",
+    "./src/browser/components.d.ts",
+    "./src/browser/test-support.d.ts"
+  ],
+  "includes": ["./declarations"],
+  "cleanOutputDir": true,
+  "compilerOptions": {
+    "noEmitOnError": false
+  },
+  "out": "./dist-typedoc",
+  "json": "./dist-typedoc/typedoc.json",
+  "pretty": true,
+  "excludeInternal": false,
+  "skipErrorChecking": true,
+  "plugin": ["@zamiell/typedoc-plugin-not-exported"]
+}
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index e8e0b051..b5eb52da 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -43,11 +43,11 @@ function getSignature(info: DeclarationReflection) {
 function getNamedArgs(info: DeclarationReflection) {
   let args = findChildDeclaration(info, 'Args');
 
-if (!args) return;
+  if (!args) return;
 
-let named = findChildDeclaration(args, 'Named');
+  let named = findChildDeclaration(args, 'Named');
 
-return named;
+  return named;
 }
 
 export const ComponentSignature: TOC<{

From 8782ef79ea89107300f5cedac3320bc7779a5a6e Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 14:56:42 -0400
Subject: [PATCH 04/18] Progress

---
 package.json                          |   6 +
 pnpm-lock.yaml                        | 537 ++++++++++++++++----------
 src/browser/private/samples.d.ts      |   1 +
 src/browser/private/samples.js        |   1 +
 src/browser/test-support.d.ts         |   2 +-
 src/browser/virtual/setup.d.ts        |   2 +
 src/plugins/api-docs/typedoc.js       |  13 +-
 tsconfig.typedoc.json                 |  10 +-
 typedoc.config.json                   |   5 +-
 ui/docs/docs/helper-signature.md      |  12 +-
 ui/docs/docs/modifier-signature.md    |  22 +-
 ui/src/samples/-private/helper.ts     |  13 +
 ui/src/samples/-private/index.ts      |   6 +
 ui/src/samples/-private/modifier.ts   |  38 +-
 ui/src/services/kolay/compiler.ts     |   4 +
 ui/src/typedoc/signature/args.gts     |  28 ++
 ui/src/typedoc/signature/helper.gts   | 106 +++++
 ui/src/typedoc/signature/modifier.gts |  19 +-
 18 files changed, 601 insertions(+), 224 deletions(-)
 create mode 100644 src/browser/private/samples.d.ts
 create mode 100644 src/browser/private/samples.js
 create mode 100644 ui/src/samples/-private/helper.ts
 create mode 100644 ui/src/samples/-private/index.ts

diff --git a/package.json b/package.json
index 86e7da0b..06cfa1b4 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,10 @@
       "types": "./declarations/plugins/types.d.ts",
       "import": "./src/plugins/index.js"
     },
+    "./private/samples": {
+      "types": "./src/browser/private/samples.d.ts",
+      "default": "./src/browser/private/samples.js"
+    },
     "./webpack": {
       "types": "./declarations/webpack.d.ts",
       "import": "./src/webpack.js"
@@ -108,6 +112,8 @@
     "@tsconfig/node20": "^20.1.2",
     "@tsconfig/strictest": "^2.0.3",
     "@types/common-tags": "^1.8.4",
+    "@types/qunit": "^2.19.10",
+    "@types/rsvp": "^4.0.9",
     "@typescript-eslint/eslint-plugin": "^7.0.1",
     "@typescript-eslint/parser": "^7.0.1",
     "@universal-ember/kolay-ui": "workspace:^",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c2470714..0e2297a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -70,6 +70,12 @@ importers:
       '@types/common-tags':
         specifier: ^1.8.4
         version: 1.8.4
+      '@types/qunit':
+        specifier: ^2.19.10
+        version: 2.19.10
+      '@types/rsvp':
+        specifier: ^4.0.9
+        version: 4.0.9
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.0.1
         version: 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
@@ -96,7 +102,7 @@ importers:
         version: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       eslint:
         specifier: ^8.56.0
         version: 8.57.0
@@ -175,7 +181,7 @@ importers:
     devDependencies:
       '@babel/core':
         specifier: ^7.23.6
-        version: 7.24.0(supports-color@8.1.1)
+        version: 7.24.0
       '@babel/eslint-parser':
         specifier: ^7.23.3
         version: 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
@@ -283,7 +289,7 @@ importers:
         version: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-template-imports:
         specifier: ^4.0.0
         version: 4.1.0
@@ -364,7 +370,7 @@ importers:
     devDependencies:
       '@babel/core':
         specifier: ^7.23.6
-        version: 7.24.0(supports-color@8.1.1)
+        version: 7.24.0
       '@babel/eslint-parser':
         specifier: ^7.23.3
         version: 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
@@ -418,7 +424,7 @@ importers:
         version: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-source:
         specifier: ~5.7.0
-        version: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+        version: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-template-lint:
         specifier: ^5.13.0
         version: 5.13.0
@@ -526,6 +532,28 @@ packages:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/core@7.24.0:
+    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helpers': 7.24.0
+      '@babel/parser': 7.24.0
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+      convert-source-map: 2.0.0
+      debug: 4.3.4(supports-color@9.4.0)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/core@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
@@ -558,7 +586,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
       eslint: 8.57.0
       eslint-visitor-keys: 2.1.0
@@ -605,7 +633,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
@@ -625,7 +653,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
@@ -638,10 +666,10 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -685,7 +713,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-simple-access': 7.22.5
@@ -711,7 +739,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.20
@@ -725,7 +753,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
@@ -768,6 +796,16 @@ packages:
       '@babel/template': 7.24.0
       '@babel/types': 7.24.0
 
+  /@babel/helpers@7.24.0:
+    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/helpers@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
     engines: {node: '>=6.9.0'}
@@ -802,7 +840,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.24.0):
@@ -814,7 +852,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
@@ -828,7 +866,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -842,7 +880,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -855,7 +893,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-decorators': 7.24.0(@babel/core@7.24.0)
@@ -870,7 +908,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -883,7 +921,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
 
   /@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.24.0):
     resolution: {integrity: sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==}
@@ -895,7 +933,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -909,7 +947,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0):
@@ -920,7 +958,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0):
@@ -932,7 +970,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-decorators@7.24.0(@babel/core@7.24.0):
@@ -944,7 +982,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0):
@@ -955,7 +993,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0):
@@ -966,7 +1004,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.0):
@@ -978,7 +1016,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
@@ -991,7 +1029,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.24.0):
@@ -1003,7 +1041,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0):
@@ -1014,7 +1052,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0):
@@ -1025,7 +1063,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0):
@@ -1037,7 +1075,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
     dev: true
 
@@ -1049,7 +1087,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0):
@@ -1060,7 +1098,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0):
@@ -1071,7 +1109,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0):
@@ -1082,7 +1120,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0):
@@ -1093,7 +1131,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0):
@@ -1104,7 +1142,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0):
@@ -1116,7 +1154,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0):
@@ -1128,7 +1166,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.0):
@@ -1140,7 +1178,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0):
@@ -1152,7 +1190,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1165,7 +1203,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.24.0):
@@ -1177,7 +1215,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
@@ -1192,7 +1230,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
@@ -1206,7 +1244,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.24.0):
@@ -1218,7 +1256,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.24.0):
@@ -1230,7 +1268,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1243,7 +1281,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
@@ -1257,7 +1295,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
@@ -1276,7 +1314,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/template': 7.24.0
 
@@ -1289,7 +1327,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.24.0):
@@ -1301,7 +1339,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1314,7 +1352,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.24.0):
@@ -1326,7 +1364,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
 
@@ -1339,7 +1377,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1352,7 +1390,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
 
@@ -1365,7 +1403,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.0)
     dev: true
@@ -1379,7 +1417,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
@@ -1392,7 +1430,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-plugin-utils': 7.24.0
@@ -1406,7 +1444,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
 
@@ -1419,7 +1457,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.24.0):
@@ -1431,7 +1469,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
 
@@ -1444,7 +1482,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.24.0):
@@ -1456,7 +1494,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1469,7 +1507,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-simple-access': 7.22.5
@@ -1483,7 +1521,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1498,7 +1536,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1511,7 +1549,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1524,7 +1562,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.24.0):
@@ -1536,7 +1574,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
 
@@ -1549,7 +1587,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
 
@@ -1563,7 +1601,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
@@ -1578,7 +1616,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
 
@@ -1591,7 +1629,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
 
@@ -1604,7 +1642,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
@@ -1618,7 +1656,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.24.0):
@@ -1630,7 +1668,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1643,7 +1681,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1658,7 +1696,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.24.0):
@@ -1670,7 +1708,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       regenerator-transform: 0.15.2
 
@@ -1683,7 +1721,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-runtime@7.24.0(@babel/core@7.24.0):
@@ -1695,7 +1733,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
       babel-plugin-polyfill-corejs2: 0.4.8(@babel/core@7.24.0)
@@ -1714,7 +1752,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-spread@7.23.3(@babel/core@7.24.0):
@@ -1726,7 +1764,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
@@ -1739,7 +1777,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0):
@@ -1751,7 +1789,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.24.0):
@@ -1763,7 +1801,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.24.0):
@@ -1775,7 +1813,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
@@ -1789,7 +1827,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
     dev: true
@@ -1802,7 +1840,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
@@ -1816,7 +1854,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
   /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.24.0):
@@ -1828,7 +1866,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1841,7 +1879,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1854,7 +1892,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
@@ -1875,7 +1913,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
@@ -1967,7 +2005,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
       '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.0)
@@ -1981,7 +2019,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/types': 7.24.0
       esutils: 2.0.3
@@ -1995,7 +2033,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
       '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
@@ -2012,7 +2050,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       clone-deep: 4.0.1
       find-cache-dir: 2.1.0
       make-dir: 2.1.0
@@ -2058,12 +2096,29 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.24.0
       '@babel/types': 7.24.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/traverse@7.24.0:
+    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-hoist-variables': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/parser': 7.24.0
+      '@babel/types': 7.24.0
+      debug: 4.3.4(supports-color@9.4.0)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/traverse@7.24.0(supports-color@8.1.1):
     resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
     engines: {node: '>=6.9.0'}
@@ -2211,7 +2266,7 @@ packages:
       ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3)
       ember-cli-babel: 7.26.11
       ember-cli-htmlbars: 6.3.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@glint/template'
       - supports-color
@@ -2255,7 +2310,7 @@ packages:
     resolution: {integrity: sha512-JGOQNRj3UR0NdWEg8MsM2eqPLncEwSB1IX+rwntIj22TEKj8biqx7GDgSbeH+ZedijmCh354Hf2c5rthrdzUAw==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2
       broccoli-funnel: 3.0.8
       semver: 7.6.0
     transitivePeerDependencies:
@@ -2293,12 +2348,12 @@ packages:
       '@embroider/core': ^3.4.5
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
       '@babel/plugin-transform-runtime': 7.24.0(@babel/core@7.24.0)
       '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
       '@babel/runtime': 7.24.0
-      '@babel/traverse': 7.24.0(supports-color@8.1.1)
+      '@babel/traverse': 7.24.0
       '@embroider/core': 3.4.5(@glint/template@1.3.0)
       '@embroider/macros': 1.14.0(@glint/template@1.3.0)
       '@types/babel__code-frame': 7.0.6
@@ -2318,12 +2373,12 @@ packages:
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
       chalk: 4.1.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       escape-string-regexp: 4.0.0
       fast-sourcemap-concat: 1.4.0
       fs-extra: 9.1.0
       fs-tree-diff: 2.0.1
-      jsdom: 16.7.0(supports-color@8.1.1)
+      jsdom: 16.7.0
       lodash: 4.17.21
       pkg-up: 3.1.0
       resolve: 1.22.8
@@ -2346,25 +2401,25 @@ packages:
     resolution: {integrity: sha512-DoowHKCASfjLe//Ok0jEOptVHlvGtepV1UjIGy6AFkBb4nXlszg/SuiXAYlm9Np6GG+YMTGLZF4AN4zemzefLQ==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/parser': 7.24.0
-      '@babel/traverse': 7.24.0(supports-color@8.1.1)
+      '@babel/traverse': 7.24.0
       '@embroider/macros': 1.14.0(@glint/template@1.3.0)
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2
       assert-never: 1.2.1
       babel-plugin-ember-template-compilation: 2.2.1
       broccoli-node-api: 1.7.0
       broccoli-persistent-filter: 3.1.3
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       fast-sourcemap-concat: 1.4.0
       filesize: 10.1.0
       fs-extra: 9.1.0
       fs-tree-diff: 2.0.1
       handlebars: 4.7.8
       js-string-escape: 1.0.1
-      jsdom: 16.7.0(supports-color@8.1.1)
+      jsdom: 16.7.0
       lodash: 4.17.21
       resolve: 1.22.8
       resolve-package-path: 4.0.3
@@ -2401,7 +2456,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2422,7 +2477,7 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2444,8 +2499,8 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@babel/core': 7.24.0
+      '@embroider/shared-internals': 2.5.2
       '@glint/template': 1.3.0
       assert-never: 1.2.1
       babel-import-util: 2.0.1
@@ -2457,6 +2512,22 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@embroider/shared-internals@2.5.2:
+    resolution: {integrity: sha512-jNDJ9YlV6Qp9Na9v17qirUewVuq6T0t32nn+bbnFlCRTvmllKluZdYPSC5RuRnEZKTloVYRSF0+f1rgkTIEvxQ==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      babel-import-util: 2.0.1
+      debug: 4.3.4(supports-color@9.4.0)
+      ember-rfc176-data: 0.3.18
+      fs-extra: 9.1.0
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      resolve-package-path: 4.0.3
+      semver: 7.6.0
+      typescript-memoize: 1.1.1
+    transitivePeerDependencies:
+      - supports-color
+
   /@embroider/shared-internals@2.5.2(supports-color@8.1.1):
     resolution: {integrity: sha512-jNDJ9YlV6Qp9Na9v17qirUewVuq6T0t32nn+bbnFlCRTvmllKluZdYPSC5RuRnEZKTloVYRSF0+f1rgkTIEvxQ==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -2472,13 +2543,14 @@ packages:
       typescript-memoize: 1.1.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
 
   /@embroider/shared-internals@2.5.2-unstable.12a42ca:
     resolution: {integrity: sha512-QlZksVS/IIRsDcVSX4EEKku4TTbJMRhD68OAZhBiUWiw9cjwelRILpimt9LR99Bop4/90x6nr6Dl068o/zswHg==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
       babel-import-util: 2.0.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       ember-rfc176-data: 0.3.18
       fs-extra: 9.1.0
       js-string-escape: 1.0.1
@@ -2502,13 +2574,13 @@ packages:
       '@glint/template':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
       '@glint/environment-ember-loose': 1.3.0(@glimmer/component@1.1.2)(@glint/template@1.3.0)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.1.0)
       '@glint/template': 1.3.0
       broccoli-funnel: 3.0.8
       ember-cli-babel: 8.2.0(@babel/core@7.24.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -2779,7 +2851,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -3181,7 +3253,7 @@ packages:
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -3399,7 +3471,7 @@ packages:
       prettier:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@typescript-eslint/eslint-plugin': 7.1.0(@typescript-eslint/parser@7.1.0)(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
@@ -4038,7 +4110,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-module-imports': 7.22.15
       '@rollup/pluginutils': 5.1.0(rollup@4.12.1)
       rollup: 4.12.1
@@ -4440,6 +4512,10 @@ packages:
       '@types/glob': 8.1.0
       '@types/node': 20.11.24
 
+  /@types/rsvp@4.0.9:
+    resolution: {integrity: sha512-F6vaN5mbxw2MBCu/AD9fSKwrhnto2pE77dyUsi415qz9IP9ni9ZOWXHxnXfsM4NW9UjW+it189jvvqnhv37Z7Q==}
+    dev: true
+
   /@types/semver@7.5.8:
     resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
     dev: true
@@ -4505,7 +4581,7 @@ packages:
       '@typescript-eslint/type-utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       eslint: 8.57.0
       graphemer: 1.4.0
       ignore: 5.3.1
@@ -4531,7 +4607,7 @@ packages:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       eslint: 8.57.0
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -4566,7 +4642,7 @@ packages:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
       '@typescript-eslint/utils': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       eslint: 8.57.0
       ts-api-utils: 1.2.1(typescript@5.3.3)
       typescript: 5.3.3
@@ -4595,7 +4671,7 @@ packages:
     dependencies:
       '@typescript-eslint/types': 7.1.0
       '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -4879,6 +4955,15 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  /agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /agent-base@6.0.2(supports-color@8.1.1):
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
@@ -4905,9 +4990,6 @@ packages:
 
   /ajv-formats@2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependenciesMeta:
-      ajv:
-        optional: true
     dependencies:
       ajv: 8.12.0
 
@@ -5275,7 +5357,7 @@ packages:
     resolution: {integrity: sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==}
     engines: {node: 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       heimdalljs: 0.2.6
       istextorbinary: 2.6.0
       mkdirp: 0.5.6
@@ -5338,7 +5420,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
     dev: true
 
   /babel-helper-builder-binary-assignment-operator-visitor@6.24.1(supports-color@8.1.1):
@@ -5520,7 +5602,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       semver: 5.7.2
 
   /babel-plugin-debug-macros@0.3.4(@babel/core@7.24.0):
@@ -5532,7 +5614,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       semver: 5.7.2
 
   /babel-plugin-ember-data-packages-polyfill@0.1.2:
@@ -5600,7 +5682,7 @@ packages:
         optional: true
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
       semver: 6.3.1
     transitivePeerDependencies:
@@ -5614,7 +5696,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
       core-js-compat: 3.36.0
     transitivePeerDependencies:
@@ -5628,7 +5710,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
     transitivePeerDependencies:
       - supports-color
@@ -6155,7 +6237,7 @@ packages:
     resolution: {integrity: sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==}
     engines: {node: '>= 6'}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/polyfill': 7.12.1
       broccoli-funnel: 2.0.2
       broccoli-merge-trees: 3.0.2
@@ -6179,7 +6261,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       broccoli-persistent-filter: 3.1.3
       clone: 2.1.2
       hash-for-dep: 1.5.1
@@ -6321,7 +6403,7 @@ packages:
     dependencies:
       array-equal: 1.0.2
       broccoli-plugin: 4.0.7
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       fs-tree-diff: 2.0.1
       heimdalljs: 0.2.6
       minimatch: 3.1.2
@@ -6501,7 +6583,7 @@ packages:
       broccoli-persistent-filter: 2.3.1
       broccoli-plugin: 2.1.0
       chalk: 2.4.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       ensure-posix-path: 1.1.1
       fs-extra: 8.1.0
       minimatch: 3.1.2
@@ -7622,7 +7704,6 @@ packages:
     dependencies:
       ms: 2.1.2
       supports-color: 9.4.0
-    dev: true
 
   /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
@@ -7880,7 +7961,7 @@ packages:
     dependencies:
       '@ember/test-waiters': 3.1.0
       '@embroider/addon-shim': 1.8.7
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -7888,14 +7969,14 @@ packages:
     resolution: {integrity: sha512-pkWIljmJClYL17YBk8FjO7NrZPQoY9v0b+FooJvaHf/xlDQIBYVP7OaDHbNuNbpj7+wAwSDAnnwxjCoLsmm4cw==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
       '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
       '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
-      '@embroider/shared-internals': 2.5.2(supports-color@8.1.1)
+      '@embroider/shared-internals': 2.5.2
       babel-loader: 8.3.0(@babel/core@7.24.0)(webpack@5.90.3)
       babel-plugin-ember-modules-api-polyfill: 3.5.0
       babel-plugin-ember-template-compilation: 2.2.1
@@ -7907,7 +7988,7 @@ packages:
       broccoli-plugin: 4.0.7
       broccoli-source: 3.0.1
       css-loader: 5.2.7(webpack@5.90.3)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       fs-extra: 10.1.0
       fs-tree-diff: 2.0.1
       handlebars: 4.7.8
@@ -7951,7 +8032,7 @@ packages:
       ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0)
       ember-cli-babel: 7.26.11
       ember-cli-babel-plugin-helpers: 1.1.1
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - '@glint/template'
@@ -7964,7 +8045,7 @@ packages:
       ember-source: ^3.28.0 || >= 4.0.0
     dependencies:
       ember-cli-babel: 7.26.11
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       git-repo-info: 2.1.1
     transitivePeerDependencies:
       - supports-color
@@ -7978,7 +8059,7 @@ packages:
     resolution: {integrity: sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
@@ -8020,7 +8101,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
@@ -8156,7 +8237,7 @@ packages:
     engines: {node: 16.* || >= 18}
     dependencies:
       broccoli-funnel: 3.0.8
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8188,7 +8269,7 @@ packages:
       '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-transform-typescript': 7.4.5(@babel/core@7.24.0)
       ansi-to-html: 0.6.15
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       ember-cli-babel-plugin-helpers: 1.1.1
       execa: 1.0.0
       fs-extra: 7.0.1
@@ -8208,7 +8289,7 @@ packages:
     dependencies:
       '@babel/plugin-transform-typescript': 7.5.5(@babel/core@7.24.0)
       ansi-to-html: 0.6.15
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       ember-cli-babel-plugin-helpers: 1.1.1
       execa: 2.1.0
       fs-extra: 8.1.0
@@ -8227,7 +8308,7 @@ packages:
     dependencies:
       ansi-to-html: 0.6.15
       broccoli-stew: 3.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       execa: 4.1.0
       fs-extra: 9.1.0
       resolve: 1.22.8
@@ -8434,7 +8515,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       '@embroider/util': 1.13.0(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@glint/environment-ember-loose'
       - '@glint/template'
@@ -8451,7 +8532,7 @@ packages:
       '@babel/core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@glimmer/syntax': 0.88.1
       '@typescript-eslint/parser': 7.1.0(eslint@8.57.0)(typescript@5.3.3)
@@ -8473,7 +8554,7 @@ packages:
       ember-cli-babel: 7.26.11
       ember-cli-typescript: 5.3.0
       ember-cli-version-checker: 5.1.2
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8499,7 +8580,7 @@ packages:
       '@embroider/addon-shim': 1.8.7
       ember-cli-normalize-entity-name: 1.0.0
       ember-cli-string-utils: 1.1.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8511,7 +8592,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       '@simple-dom/document': 1.4.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8546,7 +8627,7 @@ packages:
       ember-element-helper: 0.8.6(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-modifier: 4.1.0(ember-source@5.7.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       ember-velcro: 2.1.3(ember-modifier@4.1.0)(ember-source@5.7.0)
       reactiveweb: 1.2.2(@babel/core@7.24.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       tracked-toolbox: 2.0.0(@babel/core@7.24.0)(ember-source@5.7.0)
@@ -8566,7 +8647,7 @@ packages:
       '@embroider/addon-shim': 1.8.7
       '@embroider/macros': 1.15.0(@glint/template@1.3.0)
       ember-cli-test-loader: 3.1.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       qunit: 2.20.1
     transitivePeerDependencies:
       - '@glint/template'
@@ -8603,7 +8684,7 @@ packages:
       content-tag: 1.2.2
       decorator-transforms: 1.1.0(@babel/core@7.24.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       line-column: 1.0.2
       magic-string: 0.30.8
       mdast: 3.0.0
@@ -8634,7 +8715,7 @@ packages:
         optional: true
     dependencies:
       ember-cli-babel: 7.26.11
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8655,7 +8736,7 @@ packages:
       '@glimmer/component': 1.1.2(@babel/core@7.24.0)
       '@glimmer/tracking': 1.1.2
       '@glint/template': 1.3.0
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8675,14 +8756,16 @@ packages:
     engines: {node: 8.* || 10.* || >= 12}
     dependencies:
       '@babel/parser': 7.24.0
-      '@babel/traverse': 7.24.0(supports-color@8.1.1)
+      '@babel/traverse': 7.24.0
       recast: 0.18.10
     transitivePeerDependencies:
       - supports-color
 
-  /ember-source@5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3):
+  /ember-source@5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3):
     resolution: {integrity: sha512-iOZVyxLBzGewEThDDsNRZ9y02SNH42PWSPC9U4O94pew7ktld3IpIODCDjLCtKWn2zAGM9DhWTMrXz27HI1UKw==}
     engines: {node: '>= 16.*'}
+    peerDependencies:
+      '@glimmer/component': ^1.1.2
     dependencies:
       '@babel/helper-module-imports': 7.22.15
       '@ember/edition-utils': 1.2.0
@@ -8844,7 +8927,7 @@ packages:
       '@floating-ui/dom': 1.6.3
       ember-functions-as-helper-polyfill: 2.1.2(ember-source@5.7.0)
       ember-modifier: 4.1.0(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -8907,7 +8990,7 @@ packages:
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       engine.io-parser: 5.2.2
       ws: 8.11.0
     transitivePeerDependencies:
@@ -9147,7 +9230,7 @@ packages:
       eslint: '*'
       eslint-plugin-import: '*'
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       enhanced-resolve: 5.15.1
       eslint: 8.57.0
       eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.1.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
@@ -9203,7 +9286,7 @@ packages:
       '@babel/eslint-parser':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/eslint-parser': 7.23.10(@babel/core@7.24.0)(eslint@8.57.0)
       '@babel/plugin-proposal-decorators': 7.24.0(@babel/core@7.24.0)
       '@ember-data/rfc395-data': 0.0.4
@@ -9423,7 +9506,7 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.2.2
@@ -10911,6 +10994,17 @@ packages:
     resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==}
     dev: true
 
+  /http-proxy-agent@4.0.1:
+    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': 1.1.2
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /http-proxy-agent@4.0.1(supports-color@8.1.1):
     resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
     engines: {node: '>= 6'}
@@ -10933,6 +11027,16 @@ packages:
       - debug
     dev: true
 
+  /https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@9.4.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /https-proxy-agent@5.0.1(supports-color@8.1.1):
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
@@ -11560,7 +11664,7 @@ packages:
       '@babel/preset-env':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/parser': 7.24.0
       '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
       '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
@@ -11584,6 +11688,48 @@ packages:
       - supports-color
     dev: true
 
+  /jsdom@16.7.0:
+    resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.11.3
+      acorn-globals: 6.0.0
+      cssom: 0.4.4
+      cssstyle: 2.3.0
+      data-urls: 2.0.0
+      decimal.js: 10.4.3
+      domexception: 2.0.1
+      escodegen: 2.1.0
+      form-data: 3.0.1
+      html-encoding-sniffer: 2.0.1
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.7
+      parse5: 6.0.1
+      saxes: 5.0.1
+      symbol-tree: 3.2.4
+      tough-cookie: 4.1.3
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 2.0.0
+      webidl-conversions: 6.1.0
+      whatwg-encoding: 1.0.5
+      whatwg-mimetype: 2.3.0
+      whatwg-url: 8.7.0
+      ws: 7.5.9
+      xml-name-validator: 3.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /jsdom@16.7.0(supports-color@8.1.1):
     resolution: {integrity: sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==}
     engines: {node: '>=10'}
@@ -12090,8 +12236,8 @@ packages:
       agentkeepalive: 4.5.0
       cacache: 15.3.0
       http-cache-semantics: 4.1.1
-      http-proxy-agent: 4.0.1(supports-color@8.1.1)
-      https-proxy-agent: 5.0.1(supports-color@8.1.1)
+      http-proxy-agent: 4.0.1
+      https-proxy-agent: 5.0.1
       is-lambda: 1.0.1
       lru-cache: 6.0.0
       minipass: 3.3.6
@@ -12597,7 +12743,7 @@ packages:
     resolution: {integrity: sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==}
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       decode-named-character-reference: 1.0.2
       micromark-core-commonmark: 1.1.0
       micromark-factory-space: 1.1.0
@@ -13789,7 +13935,7 @@ packages:
     peerDependencies:
       prettier: '>= 3.0.0'
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@glimmer/syntax': 0.84.3
       ember-cli-htmlbars: 6.3.0
       ember-template-imports: 3.4.2
@@ -13804,7 +13950,7 @@ packages:
     peerDependencies:
       prettier: '>= 3.0.0'
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       content-tag: 1.2.2
       prettier: 3.2.5
     transitivePeerDependencies:
@@ -14049,7 +14195,7 @@ packages:
       ember-async-data: 1.0.3(ember-source@5.7.0)
       ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - '@glimmer/component'
@@ -14319,7 +14465,7 @@ packages:
   /remove-types@1.0.0:
     resolution: {integrity: sha512-G7Hk1Q+UJ5DvlNAoJZObxANkBZGiGdp589rVcTW/tYqJWJ5rwfraSnKSQaETN8Epaytw8J40nS/zC7bcHGv36w==}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       '@babel/plugin-syntax-decorators': 7.24.0(@babel/core@7.24.0)
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.24.0)
       prettier: 2.8.8
@@ -14974,7 +15120,7 @@ packages:
   /socket.io-adapter@2.5.4:
     resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       ws: 8.11.0
     transitivePeerDependencies:
       - bufferutil
@@ -14987,7 +15133,7 @@ packages:
     engines: {node: '>=10.0.0'}
     dependencies:
       '@socket.io/component-emitter': 3.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -14999,7 +15145,7 @@ packages:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       engine.io: 6.5.4
       socket.io-adapter: 2.5.4
       socket.io-parser: 4.2.4
@@ -15013,8 +15159,8 @@ packages:
     resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
     engines: {node: '>= 10'}
     dependencies:
-      agent-base: 6.0.2(supports-color@8.1.1)
-      debug: 4.3.4(supports-color@8.1.1)
+      agent-base: 6.0.2
+      debug: 4.3.4(supports-color@9.4.0)
       socks: 2.8.1
     transitivePeerDependencies:
       - supports-color
@@ -15192,7 +15338,7 @@ packages:
     resolution: {integrity: sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==}
     engines: {node: 6.* || 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -15450,7 +15596,7 @@ packages:
       cosmiconfig: 9.0.0(typescript@5.3.3)
       css-functions-list: 3.2.1
       css-tree: 2.3.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       fast-glob: 3.3.2
       fastest-levenshtein: 1.0.16
       file-entry-cache: 8.0.0
@@ -15510,7 +15656,6 @@ packages:
   /supports-color@9.4.0:
     resolution: {integrity: sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==}
     engines: {node: '>=12'}
-    dev: true
 
   /supports-hyperlinks@3.0.0:
     resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==}
@@ -15550,7 +15695,7 @@ packages:
     resolution: {integrity: sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==}
     engines: {node: 8.* || >= 10.*}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       heimdalljs: 0.2.6
       mkdirp: 0.5.6
       rimraf: 3.0.2
@@ -15961,7 +16106,7 @@ packages:
     dependencies:
       '@embroider/addon-shim': 1.8.7
       ember-cache-primitive-polyfill: 1.0.1(@babel/core@7.24.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
     transitivePeerDependencies:
       - '@babel/core'
       - supports-color
@@ -15986,7 +16131,7 @@ packages:
     resolution: {integrity: sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==}
     engines: {node: '>=8'}
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       fs-tree-diff: 2.0.1
       mkdirp: 0.5.6
       quick-temp: 0.1.8
@@ -16555,7 +16700,7 @@ packages:
     hasBin: true
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       pathe: 1.1.2
       picocolors: 1.0.0
       vite: 5.1.4
@@ -16637,7 +16782,7 @@ packages:
       '@vitest/utils': 1.3.1
       acorn-walk: 8.3.2
       chai: 4.4.1
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.4(supports-color@9.4.0)
       execa: 8.0.1
       local-pkg: 0.5.0
       magic-string: 0.30.8
@@ -16981,7 +17126,7 @@ packages:
   /workerpool@3.1.2:
     resolution: {integrity: sha512-WJFA0dGqIK7qj7xPTqciWBH5DlJQzoPjsANvc3Y4hNB0SScT+Emjvt0jPPkDBUjBNngX1q9hHgt1Gfwytu6pug==}
     dependencies:
-      '@babel/core': 7.24.0(supports-color@8.1.1)
+      '@babel/core': 7.24.0
       object-assign: 4.1.1
       rsvp: 4.8.5
     transitivePeerDependencies:
@@ -17190,7 +17335,7 @@ packages:
       ember-primitives: 0.12.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-modifier@4.1.0)(ember-resources@7.0.0)(ember-source@5.7.0)
       ember-repl: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       globby: 14.0.1
       json5: 2.2.3
       package-up: 5.0.0
@@ -17230,7 +17375,7 @@ packages:
       ember-primitives: 0.12.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-modifier@4.1.0)(ember-resources@7.0.0)(ember-source@5.7.0)
       ember-repl: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
       ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
-      ember-source: 5.7.0(@babel/core@7.24.0)(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
       qunit: 2.20.1
       reactiveweb: 1.2.2(@babel/core@7.24.0)(@ember/test-waiters@3.1.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
       tracked-built-ins: 3.3.0
diff --git a/src/browser/private/samples.d.ts b/src/browser/private/samples.d.ts
new file mode 100644
index 00000000..805ed9eb
--- /dev/null
+++ b/src/browser/private/samples.d.ts
@@ -0,0 +1 @@
+export * from '@universal-ember/kolay-ui/samples/-private/index';
diff --git a/src/browser/private/samples.js b/src/browser/private/samples.js
new file mode 100644
index 00000000..805ed9eb
--- /dev/null
+++ b/src/browser/private/samples.js
@@ -0,0 +1 @@
+export * from '@universal-ember/kolay-ui/samples/-private/index';
diff --git a/src/browser/test-support.d.ts b/src/browser/test-support.d.ts
index 3e715cca..ab075cd0 100644
--- a/src/browser/test-support.d.ts
+++ b/src/browser/test-support.d.ts
@@ -5,6 +5,6 @@ type Options = Parameters<typeof setup>[1];
 
 type NestedHooks = Parameters<NonNullable<Parameters<QUnit['module']>[1]>>[0];
 
-export function setupKolay(hooks: NestedHooks, config: () => Promise<Options>);
+export function setupKolay(hooks: NestedHooks, config: () => Promise<Options>): void;
 
 export function selectGroup(context: object, groupName: string): void;
diff --git a/src/browser/virtual/setup.d.ts b/src/browser/virtual/setup.d.ts
index ec57f8c5..d52e59d9 100644
--- a/src/browser/virtual/setup.d.ts
+++ b/src/browser/virtual/setup.d.ts
@@ -1,3 +1,5 @@
+import type { Manifest } from '@universal-ember/kolay-ui';
+
 export function setupKolay(
   context: object,
   options: {
diff --git a/src/plugins/api-docs/typedoc.js b/src/plugins/api-docs/typedoc.js
index 7985bed8..1ea3f3ea 100644
--- a/src/plugins/api-docs/typedoc.js
+++ b/src/plugins/api-docs/typedoc.js
@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { writeFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 
 import { globby } from 'globby';
 
@@ -34,12 +34,21 @@ export async function generateTypeDocJSON({ packageName }) {
   const tmpTSConfigPath = `/tmp/kolay-typedoc-${packageName.replace('/', '__').replace('@', 'at__')}.json`;
   const extendsTsConfig = require.resolve('@tsconfig/ember/tsconfig.json');
 
+  const home = process.cwd();
+
+  const homeRequire = createRequire(home);
+
   const tsConfig = {
     extends: extendsTsConfig,
-    include: [join(typeInfo.dir, '**/*')],
+    // include: [join(typeInfo.dir, '**/*')],
+    include: absoluteResolved.map((entry) => dirname(entry)),
     compilerOptions: {
       baseUrl: typeInfo.dir,
       noEmitOnError: false,
+      types: [
+        homeRequire.resolve('ember-source/types/stable/index.d.ts'),
+        homeRequire.resolve('ember-modifier/index.d.ts'),
+      ],
     },
   };
 
diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json
index 32c092a4..d6141a2e 100644
--- a/tsconfig.typedoc.json
+++ b/tsconfig.typedoc.json
@@ -1,7 +1,11 @@
 {
-  "extends": ["@tsconfig/ember", "@tsconfig/node20"],
-  "include": ["declarations/**/*"],
+  "extends": "@tsconfig/ember",
+  "include": ["./declarations/**/*", "./src/browser/**/*"],
   "compilerOptions": {
-    "allowImportingTsExtensions": true
+    "baseUrl": ".",
+    "skipLibCheck": true,
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": false,
+    "types": ["ember-source/types"]
   }
 }
diff --git a/typedoc.config.json b/typedoc.config.json
index 73de1e9e..f695d9c0 100644
--- a/typedoc.config.json
+++ b/typedoc.config.json
@@ -8,9 +8,10 @@
     "./declarations/plugins/index.d.ts",
     "./declarations/plugins/types.d.ts",
     "./src/browser/components.d.ts",
-    "./src/browser/test-support.d.ts"
+    "./src/browser/test-support.d.ts",
+    "./src/browser/private/samples.d.ts"
   ],
-  "includes": ["./declarations"],
+  "exclude": ["node_modules"],
   "cleanOutputDir": true,
   "compilerOptions": {
     "noEmitOnError": false
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index f82778dd..7e043544 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -10,8 +10,16 @@ API Reference generated via:
 
 ```hbs live no-shadow preview below
 <HelperSignature
-  @module='src/browser/re-exports'
-  @name='ComponentSignature'
+  @module='src/browser/private/samples'
+  @name='plainHelperA'
+  @package='kolay'
+/>
+```
+
+```hbs live no-shadow preview below
+<HelperSignature
+  @module='src/browser/private/samples'
+  @name='helperLikeB'
   @package='kolay'
 />
 ```
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index 7d9bb7bc..980fb3c3 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -10,8 +10,24 @@ API Reference generated via:
 
 ```hbs live no-shadow preview below
 <ModifierSignature
-  @module='declarations/samples/-private/modifier'
-  @name='functionExampleA'
-  @package='@universal-ember/kolay-ui'
+  @module='src/browser/private/samples'
+  @name='functionModifierA'
+  @package='kolay'
+/>
+```
+
+```hbs live no-shadow preview below
+<ModifierSignature
+  @module='src/browser/private/samples'
+  @name='functionModifierB'
+  @package='kolay'
+/>
+```
+
+```hbs live no-shadow preview below
+<ModifierSignature
+  @module='src/browser/private/samples'
+  @name='functionModifierC'
+  @package='kolay'
 />
 ```
diff --git a/ui/src/samples/-private/helper.ts b/ui/src/samples/-private/helper.ts
new file mode 100644
index 00000000..85039b7b
--- /dev/null
+++ b/ui/src/samples/-private/helper.ts
@@ -0,0 +1,13 @@
+import type { HelperLike } from '@glint/template';
+
+export function plainHelperA(a: number, b: number): number {
+  return a + b;
+}
+
+export const helperLikeB = undefined as unknown as HelperLike<{
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}>;
diff --git a/ui/src/samples/-private/index.ts b/ui/src/samples/-private/index.ts
new file mode 100644
index 00000000..4ad4df74
--- /dev/null
+++ b/ui/src/samples/-private/index.ts
@@ -0,0 +1,6 @@
+export { helperLikeB, plainHelperA } from './helper.ts';
+export {
+  functionModifierA,
+  functionModifierB,
+  functionModifierC,
+} from './modifier.ts';
diff --git a/ui/src/samples/-private/modifier.ts b/ui/src/samples/-private/modifier.ts
index b17b1c38..cdffd09f 100644
--- a/ui/src/samples/-private/modifier.ts
+++ b/ui/src/samples/-private/modifier.ts
@@ -1,6 +1,42 @@
 import { modifier } from 'ember-modifier';
 
-export const functionExampleA = modifier(
+import type { ModifierLike } from '@glint/template';
+
+export const functionModifierA = modifier<{
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}>(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(element, positional, named);
+  },
+);
+
+export const functionModifierB = modifier(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(element, positional, named);
+  },
+);
+
+export const functionModifierC: ModifierLike<{
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}> = modifier(
   (
     element: HTMLDivElement,
     positional: [x: number, y: number],
diff --git a/ui/src/services/kolay/compiler.ts b/ui/src/services/kolay/compiler.ts
index c9a3624c..43e48fa0 100644
--- a/ui/src/services/kolay/compiler.ts
+++ b/ui/src/services/kolay/compiler.ts
@@ -5,6 +5,8 @@ import { compile } from 'ember-repl';
 
 import { APIDocs, CommentQuery } from '../../typedoc/renderer.gts';
 import { ComponentSignature } from '../../typedoc/signature/component.gts';
+import { HelperSignature } from '../../typedoc/signature/helper.gts';
+import { ModifierSignature } from '../../typedoc/signature/modifier.gts';
 import { CompileState } from './compiler/compile-state.ts';
 import { getDefaultOptions } from './compiler/import-map.ts';
 
@@ -51,6 +53,8 @@ export default class Compiler extends Service {
         APIDocs,
         CommentQuery,
         ComponentSignature,
+        ModifierSignature,
+        HelperSignature,
         ...topLevelScope,
       },
       onSuccess: async (component) => state.success(component),
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index 33676691..ff0ded7d 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -1,9 +1,37 @@
 import { Comment, isIntrinsic, Type } from '../renderer.gts';
+import { findChildDeclaration } from '../utils.gts';
 
 import type { TOC } from '@ember/component/template-only';
+import type { DeclarationReflection } from 'typedoc';
 
 const not = (x: unknown) => !x;
 
+/**
+ * Get named args from a full Args signature
+ */
+export function getNamedArgs(info: DeclarationReflection) {
+  let args = findChildDeclaration(info, 'Args');
+
+  if (!args) return;
+
+  let named = findChildDeclaration(args, 'Named');
+
+  return named;
+}
+
+/**
+ * Get positional args from a full Args signature
+ */
+export function getPositionalArgs(info: DeclarationReflection) {
+  let args = findChildDeclaration(info, 'Args');
+
+  if (!args) return;
+
+  let named = findChildDeclaration(args, 'Positional');
+
+  return named;
+}
+
 export const NamedArgs: TOC<{
   Args: { kind: 'component' | 'modifier' | 'helper'; info: any };
 }> = <template>
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index e69de29b..daaee94f 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -0,0 +1,106 @@
+import { Type } from '../renderer.gts';
+import { Load } from '../utils.gts';
+import { getNamedArgs, getPositionalArgs, NamedArgs } from './args.gts';
+
+import type { TOC } from '@ember/component/template-only';
+import type { DeclarationReflection } from 'typedoc';
+
+function getSignature(info: DeclarationReflection) {
+  /**
+   * export const Foo: HelperLike<{...}>
+   */
+  if (
+    info.variant === 'declaration' &&
+    info.type?.type === 'reference' &&
+    info.type?.package === '@glint/template' &&
+    info.type?.name === 'HelperLike' &&
+    Array.isArray(info.type?.typeArguments) &&
+    info.type.typeArguments[0] &&
+    'declaration' in info.type.typeArguments[0]
+  ) {
+    return info.type.typeArguments[0]?.declaration;
+  }
+
+  /**
+   * export function(...): return;
+   */
+  if (info.signatures) {
+    return info.signatures;
+  }
+
+  /**
+   * export interface Signature { ... }
+   */
+  return info;
+}
+
+function getArgs(info: any) {
+  if (Array.isArray(info)) {
+    return info.find(item => item.name === 'Args');
+  }
+
+  if ('children' in info) {
+    return getArgs(info.children);
+  }
+}
+
+function getReturn(info: any) {
+  if (Array.isArray(info)) {
+    return info.find(item => item.name === 'Return')?.type;
+  }
+
+  if ('children' in info) {
+    return getReturn(info.children);
+  }
+}
+
+const Return: TOC<{ Args: { info: any }}> = <template>
+  {{#if @info}}
+    <h3 class='typedoc-heading'>Return</h3>
+
+    <Type @info={{@info}} />
+  {{/if}}
+</template>;
+
+export const HelperSignature: TOC<{
+  Args: {
+    /**
+     * Which module to import the type from
+     */
+    module: string;
+    /**
+     * The name of the component to render the type / JSDoc of
+     */
+    name: string;
+    /**
+     * The name of the package to lookup the module and export name.
+     */
+    package: string;
+  };
+}> = <template>
+  <Load
+    @package={{@package}}
+    @module={{@module}}
+    @name={{@name}}
+    as |declaration|
+  >
+    {{log 'hepler' declaration}}
+    {{#let (getSignature declaration) as |info|}}
+      {{#if (Array.isArray info)}}
+        {{#each info as |signature|}}
+          {{! TODO: have special formatting for parameters vs return type }}
+        {{! @glint-expect-error }}
+          <Type @info={{signature}} />
+        {{/each}}
+      {{else}}
+        {{! Whenever we have a "Full Signature" or "HelperLike" definition }}
+        {{#let (getArgs info) (getReturn info) as |args returnType|}}
+          <NamedArgs @kind='modifier' @info={{getPositionalArgs args}} />
+          <NamedArgs @kind='modifier' @info={{getNamedArgs args}} />
+          <Return @info={{returnType}} />
+        {{/let}}
+      {{/if}}
+
+    {{/let}}
+  </Load>
+</template>;
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index b5eb52da..85f7c0bd 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -1,5 +1,5 @@
 import { findChildDeclaration, Load } from '../utils.gts';
-import { NamedArgs } from './args.gts';
+import { getNamedArgs, NamedArgs } from './args.gts';
 import { Element } from './element.gts';
 
 import type { TOC } from '@ember/component/template-only';
@@ -17,14 +17,14 @@ function getSignature(info: DeclarationReflection) {
   }
 
   /**
-   * export class Foo extends Component<{ signature here }> { ... }
+   * export const foo = modifier<Signature>(() => {});
    */
   if (info.variant === 'declaration' && 'extendedTypes' in info) {
     let extendedType = info.extendedTypes?.[0];
 
     if (
       extendedType?.type === 'reference' &&
-      extendedType?.package === '@glimmer/component'
+      extendedType?.package === 'ember-modifier'
     ) {
       let typeArg = extendedType.typeArguments?.[0];
 
@@ -40,17 +40,7 @@ function getSignature(info: DeclarationReflection) {
   return info;
 }
 
-function getNamedArgs(info: DeclarationReflection) {
-  let args = findChildDeclaration(info, 'Args');
-
-  if (!args) return;
-
-  let named = findChildDeclaration(args, 'Named');
-
-  return named;
-}
-
-export const ComponentSignature: TOC<{
+export const ModifierSignature: TOC<{
   Args: {
     /**
      * Which module to import the type from
@@ -72,6 +62,7 @@ export const ComponentSignature: TOC<{
     @name={{@name}}
     as |declaration|
   >
+    {{log 'modifier' declaration}}
     {{#let (getSignature declaration) as |info|}}
       <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
       <NamedArgs @kind='modifier' @info={{getNamedArgs info}} />

From a5ccc743481ac3d7d8efb2d6cada6e8b621137ea Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 18:47:31 -0400
Subject: [PATCH 05/18] Mobile menu and a little bit of responsiveness

---
 docs-app/app/templates/application.gts | 134 ++++++++++++++++----
 docs-app/ember-cli-build.js            |   3 +
 docs-app/package.json                  |   1 +
 pnpm-lock.yaml                         | 169 +++++++++++++++++++++++++
 ui/docs/docs/helper-signature.md       |  79 ++++++++++++
 ui/src/samples/-private/helper.ts      |  34 ++++-
 ui/src/samples/-private/index.ts       |   8 +-
 ui/src/typedoc/signature/args.gts      |  51 ++++----
 ui/src/typedoc/signature/component.gts |  23 ++--
 ui/src/typedoc/signature/helper.gts    |  23 ++--
 ui/src/typedoc/signature/modifier.gts  |   4 +-
 ui/src/typedoc/styles.css              |   6 +
 12 files changed, 454 insertions(+), 81 deletions(-)

diff --git a/docs-app/app/templates/application.gts b/docs-app/app/templates/application.gts
index 00ac79a5..f31bbe33 100644
--- a/docs-app/app/templates/application.gts
+++ b/docs-app/app/templates/application.gts
@@ -1,42 +1,124 @@
+
+import 'ember-mobile-menu/themes/android'
+
+import { on } from '@ember/modifier';
+
 import { pascalCase, sentenceCase } from 'change-case';
 import ENV from 'docs-app/config/environment';
+// @ts-expect-error no types for the mobile-menu
+import MenuWrapper from 'ember-mobile-menu/components/mobile-menu-wrapper';
 import { pageTitle } from 'ember-page-title';
 import Route from 'ember-route-template';
 import { GroupNav, PageNav } from 'kolay/components';
 
+import type { TOC } from '@ember/component/template-only';
 import type { Page } from 'kolay';
 
+const Menu: TOC<{ Element: SVGElement }>  = <template>
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  x="0px" y="0px" viewBox="0 0 50 50"
+  style="fill:currentColor"
+  ...attributes
+><path d="M 0 7.5 L 0 12.5 L 50 12.5 L 50 7.5 Z M 0 22.5 L 0 27.5 L 50 27.5 L 50 22.5 Z M 0 37.5 L 0 42.5 L 50 42.5 L 50 37.5 Z"></path></svg>
+</template>;
+
+const SideNav: TOC<{ Element: HTMLElement }> = <template>
+  <aside>
+    <PageNav ...attributes>
+      <:page as |page|>
+        {{nameFor page}}
+      </:page>
+      <:collection as |collection|>
+        {{sentenceCase collection.name}}
+      </:collection>
+    </PageNav>
+  </aside>
+</template>;
+
 export default Route(
   <template>
     {{pageTitle ENV.APP.shortVersion}}
 
-    <div class="container">
-      <header>
-        <GroupNav />
-      </header>
-
-      <div class="application__layout">
-        <aside>
-          <PageNav id="side-nav">
-            <:page as |page|>
-              {{nameFor page}}
-            </:page>
-            <:collection as |collection|>
-              {{sentenceCase collection.name}}
-            </:collection>
-          </PageNav>
-        </aside>
-
-        <main>
-          {{outlet}}
-        </main>
-      </div>
-
-    </div>
+      <MenuWrapper as |mmw|>
+        <mmw.MobileMenu @mode="push" @maxWidth={{200}} as |mm|>
+          <SideNav {{on "click" mm.actions.close}} />
+        </mmw.MobileMenu>
+
+        <mmw.Content class="container">
+          <header style="display: flex; align-items: baseline; gap: 1rem;">
+            <mmw.Toggle><Menu /></mmw.Toggle>
+            <GroupNav />
+          </header>
+
+          <div class="big-layout">
+            <SideNav />
+
+            <main style="padding-top: 1rem;">
+              {{outlet}}
+            </main>
+          </div>
+        </mmw.Content>
+      </MenuWrapper>
+
+    {{!-- prettier-ignore --}}
     <style>
-      .application__layout { display: grid; grid-template-columns: max-content 1fr; gap: 2rem;
-      padding-top: 1rem; } header { border-bottom: 1px solid currentColor; } nav#side-nav {
-      min-width: 150px; ul { padding-left: 0.5rem; list-style: none; line-height: 1.75rem; } }
+      :root {
+        --mobile-menu-header-bg:                 #E04E39;
+
+        --mobile-menu-item-color:                #333;
+        --mobile-menu-item-active-bg:            #EEE;
+        --mobile-menu-item-link-disabled-color:  #6C757D;
+      }
+      .mobile-menu-wrapper__content,
+      .mobile-menu__tray {
+        background: none;
+      }
+
+      header {
+        border-bottom: 1px solid currentColor;
+      }
+
+      header button.mobile-menu__toggle {
+        padding: 0.25rem 0.5rem;
+        background: none;
+        color: currentColor;
+        width: 48px;
+        height: 44px;
+        display: inline-flex;
+        align-self: center;
+        align-items: center;
+        justify-content: center;
+        margin: 0;
+      }
+
+      @media (min-width: 768px) {
+        header button.mobile-menu__toggle {
+          display: none;
+        }
+      }
+
+      @media (max-width: 768px) {
+        .big-layout aside { display: none; }
+      }
+
+      .big-layout {
+        display: grid;
+        grid-template-columns: max-content 1fr;
+        gap: 2rem;
+      }
+
+      .mobile-menu__tray, .big-layout {
+        overflow-x: hidden;
+
+        nav {
+          ul {
+            padding-left: 0.5rem;
+            list-style: none;
+            line-height: 1.75rem;
+          }
+        }
+      }
     </style>
   </template>
 );
diff --git a/docs-app/ember-cli-build.js b/docs-app/ember-cli-build.js
index b7d84add..14df3dcf 100644
--- a/docs-app/ember-cli-build.js
+++ b/docs-app/ember-cli-build.js
@@ -8,6 +8,9 @@ module.exports = async function (defaults) {
     'ember-cli-babel': {
       enableTypeScriptTransform: true,
     },
+    autoImport: {
+      watchedDependencies: ['kolay', '@universal-ember/kolay-ui'],
+    },
   });
 
   const { Webpack } = require('@embroider/webpack');
diff --git a/docs-app/package.json b/docs-app/package.json
index a1f18189..f823bd4f 100644
--- a/docs-app/package.json
+++ b/docs-app/package.json
@@ -102,6 +102,7 @@
     "change-case": "^5.4.3",
     "ember-async-data": "^1.0.3",
     "ember-cached-decorator-polyfill": "^1.0.2",
+    "ember-mobile-menu": "^5.1.0",
     "ember-repl": "^4.1.1",
     "ember-route-template": "^1.0.3",
     "kolay": "workspace:^",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0e2297a1..6d42a517 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,6 +163,9 @@ importers:
       ember-cached-decorator-polyfill:
         specifier: ^1.0.2
         version: 1.0.2(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)
+      ember-mobile-menu:
+        specifier: ^5.1.0
+        version: 5.1.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3)
       ember-repl:
         specifier: ^4.1.1
         version: 4.2.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)(reactiveweb@1.2.2)
@@ -2242,6 +2245,26 @@ packages:
       - supports-color
     dev: true
 
+  /@ember/render-modifiers@2.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0):
+    resolution: {integrity: sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ==}
+    engines: {node: 12.* || 14.* || >= 16}
+    peerDependencies:
+      '@glint/template': ^1.0.2
+      ember-source: ^3.8 || ^4.0.0 || ^5.0.0
+    peerDependenciesMeta:
+      '@glint/template':
+        optional: true
+    dependencies:
+      '@embroider/macros': 1.15.0(@glint/template@1.3.0)
+      '@glint/template': 1.3.0
+      ember-cli-babel: 7.26.11
+      ember-modifier-manager-polyfill: 1.2.0(@babel/core@7.24.0)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
+    dev: false
+
   /@ember/string@3.1.1:
     resolution: {integrity: sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==}
     engines: {node: 12.* || 14.* || >= 16}
@@ -8319,6 +8342,14 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /ember-cli-version-checker@2.2.0:
+    resolution: {integrity: sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==}
+    engines: {node: '>= 4'}
+    dependencies:
+      resolve: 1.22.8
+      semver: 5.7.2
+    dev: false
+
   /ember-cli-version-checker@3.1.3:
     resolution: {integrity: sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==}
     engines: {node: 6.* || 8.* || >= 10.*}
@@ -8507,6 +8538,26 @@ packages:
       - '@babel/core'
       - supports-color
 
+  /ember-concurrency@4.0.1(@babel/core@7.24.0)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0):
+    resolution: {integrity: sha512-U6tEmQRPJg+qUAFM2Ub1pSSqa2AtaGZreCB6bsR3IkpiMPn19HpeebOwOIqgdE+10eUHYTXHgcsopWmPyYkHnA==}
+    engines: {node: 16.* || >= 18}
+    peerDependencies:
+      '@glimmer/tracking': ^1.1.2
+      '@glint/template': '>= 1.0.0'
+      ember-source: ^3.28.0 || ^4.0.0 || >=5.0.0
+    dependencies:
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/types': 7.24.0
+      '@embroider/addon-shim': 1.8.7
+      '@glimmer/tracking': 1.1.2
+      '@glint/template': 1.3.0
+      decorator-transforms: 1.1.0(@babel/core@7.24.0)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
+    dev: false
+
   /ember-element-helper@0.8.6(@glint/environment-ember-loose@1.3.0)(@glint/template@1.3.0)(ember-source@5.7.0):
     resolution: {integrity: sha512-WcbkJKgBZypRGwujeiPrQfZRhETVFLR0wvH2UxDaNBhLWncapt6KK+M/2i/eODoAQwgGxziejhXC6Cbqa9zA8g==}
     engines: {node: 14.* || 16.* || >= 18}
@@ -8558,6 +8609,23 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /ember-gesture-modifiers@6.0.1(@ember/test-helpers@3.3.0)(ember-source@5.7.0):
+    resolution: {integrity: sha512-CQCM05eqpZx77HZqbPAgb1SVkTvXIpPY9SOmlReU4TdigHL0+BcaMD94kcAvE/4SIaxQ+/nOIp0kUmVfqUg1IQ==}
+    peerDependencies:
+      '@ember/test-helpers': '>=3.0.0'
+      ember-source: '>=3.28.0'
+    peerDependenciesMeta:
+      '@ember/test-helpers':
+        optional: true
+    dependencies:
+      '@ember/test-helpers': 3.3.0(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3)
+      '@embroider/addon-shim': 1.8.7
+      ember-modifier: 4.1.0(ember-source@5.7.0)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /ember-load-initializers@2.1.2(@babel/core@7.24.0):
     resolution: {integrity: sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw==}
     engines: {node: 6.* || 8.* || >= 10.*}
@@ -8569,6 +8637,45 @@ packages:
       - supports-color
     dev: true
 
+  /ember-mobile-menu@5.1.0(@babel/core@7.24.0)(@ember/test-helpers@3.3.0)(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3):
+    resolution: {integrity: sha512-iE+dydJ8EVaiOIZyxPe0QZsUClaUCaX8a20GvW0iTOCu1FeKrRI5HA9u9p+ELZPSw54gP/w3V53KK3pjMuDl+Q==}
+    peerDependencies:
+      ember-source: '>=3.28.0'
+    dependencies:
+      '@ember/render-modifiers': 2.1.0(@babel/core@7.24.0)(@glint/template@1.3.0)(ember-source@5.7.0)
+      '@ember/test-waiters': 3.1.0
+      '@embroider/addon-shim': 1.8.7
+      '@glimmer/component': 1.1.2(@babel/core@7.24.0)
+      '@glimmer/tracking': 1.1.2
+      ember-concurrency: 4.0.1(@babel/core@7.24.0)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
+      ember-gesture-modifiers: 6.0.1(@ember/test-helpers@3.3.0)(ember-source@5.7.0)
+      ember-modify-based-class-resource: 1.1.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-resources@7.0.0)(ember-source@5.7.0)
+      ember-on-resize-modifier: 2.0.2(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3)
+      ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
+      ember-set-body-class: 1.0.2
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+      tracked-built-ins: 3.3.0
+      wobble: 1.5.1
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@ember/test-helpers'
+      - '@glint/template'
+      - supports-color
+      - webpack
+    dev: false
+
+  /ember-modifier-manager-polyfill@1.2.0(@babel/core@7.24.0):
+    resolution: {integrity: sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+    dependencies:
+      ember-cli-babel: 7.26.11
+      ember-cli-version-checker: 2.2.0
+      ember-compatibility-helpers: 1.2.7(@babel/core@7.24.0)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - supports-color
+    dev: false
+
   /ember-modifier@4.1.0(ember-source@5.7.0):
     resolution: {integrity: sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ==}
     peerDependencies:
@@ -8584,6 +8691,45 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /ember-modify-based-class-resource@1.1.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-resources@7.0.0)(ember-source@5.7.0):
+    resolution: {integrity: sha512-35PqPA6XFncpJkePr1Zs5aR/bANpsCEa8X7fXkA0EkTyuILqP3ycqtlfK0VxkADz62lk86BR8biGsTz0jgdZUQ==}
+    peerDependencies:
+      '@glimmer/component': ^1.1.2
+      '@glimmer/tracking': ^1.1.2
+      ember-resources: '>= 6.4.0'
+      ember-source: ^3.28.0 || ^4.0.0 || ^5.0.0
+    peerDependenciesMeta:
+      '@glimmer/component':
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.24.0
+      '@embroider/addon-shim': 1.8.7
+      '@embroider/macros': 1.15.0(@glint/template@1.3.0)
+      '@glimmer/component': 1.1.2(@babel/core@7.24.0)
+      '@glimmer/tracking': 1.1.2
+      ember-resources: 7.0.0(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.7.0)
+      ember-source: 5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3)
+    transitivePeerDependencies:
+      - '@glint/template'
+      - supports-color
+    dev: false
+
+  /ember-on-resize-modifier@2.0.2(@glint/template@1.3.0)(ember-source@5.7.0)(webpack@5.90.3):
+    resolution: {integrity: sha512-7mcD7CNbiCaZEIASWlRz/Wmn47afCMSFTdQJSSUe0WCgnXxn9DVoqZ39B7ZuddTHa0V6otTFrV/lIRYpggQ+eg==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      ember-auto-import: 2.7.2(@glint/template@1.3.0)(webpack@5.90.3)
+      ember-cli-babel: 7.26.11
+      ember-cli-htmlbars: 5.7.2
+      ember-modifier: 4.1.0(ember-source@5.7.0)
+      ember-resize-observer-service: 1.1.0
+    transitivePeerDependencies:
+      - '@glint/template'
+      - ember-source
+      - supports-color
+      - webpack
+    dev: false
+
   /ember-page-title@8.2.2(ember-source@5.7.0):
     resolution: {integrity: sha512-DpIVgDaYstMSvHuhjG8QRnyfFD+E9/uy9GXO35kzmHaCg2hGB4e5Z6jcfitk8qh/lp5VRX8Tpl4HTBX+CKwMWw==}
     engines: {node: 16.* || >= 18}
@@ -8705,6 +8851,16 @@ packages:
       - '@glimmer/tracking'
       - supports-color
 
+  /ember-resize-observer-service@1.1.0:
+    resolution: {integrity: sha512-/vbfxtHSyOGSNdjPKL8X3SyvUnYo3z88sJtD/bLJ0ZGhqVPaXCmtSkLyr/Fh75ckJDixRFxK4i4zEUSlrbk0PA==}
+    engines: {node: 12.* || 14.* || >= 16}
+    dependencies:
+      ember-cli-babel: 7.26.11
+      ember-cli-htmlbars: 5.7.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /ember-resolver@11.0.1(ember-source@5.7.0):
     resolution: {integrity: sha512-ucBk3oM+PR+AfYoSUXeQh8cDQS1sSiEKp4Pcgbew5cFMSqPxJfqd1zyZsfQKNTuyubeGmWxBOyMVSTvX2LeCyg==}
     engines: {node: 14.* || 16.* || >= 18}
@@ -8761,6 +8917,15 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /ember-set-body-class@1.0.2:
+    resolution: {integrity: sha512-SEsTwFp9SHTg4LgebhkUuLgYWg1VZD7I1QcrV2sTY583wu216OThoSs5szvS/KgSc1xD1Z22TFvOb848t2hGfw==}
+    engines: {node: 10.* || 12.* || >= 14.*}
+    dependencies:
+      ember-cli-babel: 7.26.11
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /ember-source@5.7.0(@babel/core@7.24.0)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(webpack@5.90.3):
     resolution: {integrity: sha512-iOZVyxLBzGewEThDDsNRZ9y02SNH42PWSPC9U4O94pew7ktld3IpIODCDjLCtKWn2zAGM9DhWTMrXz27HI1UKw==}
     engines: {node: '>= 16.*'}
@@ -17120,6 +17285,10 @@ packages:
       string-width: 4.2.3
     dev: true
 
+  /wobble@1.5.1:
+    resolution: {integrity: sha512-vQD1uu0yXhZWfQJKVf2UVNb3AVnD0qXAbcIqG6Aw02ABLVm77xz6KcLuduWSwOiOMNh8TjZqouZsHTJWTdLwVQ==}
+    dev: false
+
   /wordwrap@1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 7e043544..519c21dc 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -8,6 +8,11 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 API Reference generated via:
 
+```ts
+export function plainHelperA(a: number, b: number): number {
+  return a + b;
+}
+```
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -16,6 +21,19 @@ API Reference generated via:
 />
 ```
 
+---------
+
+```ts
+import type { HelperLike } from '@glint/template';
+
+export const helperLikeB = ((...args: unknown[]) => { /* ... */ }) as unknown as HelperLike<{
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}>;
+```
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -23,3 +41,64 @@ API Reference generated via:
   @package='kolay'
 />
 ```
+
+---------
+
+```ts
+export const plainHelperC = (a: number, b: number, options?: { optional?: boolean, required: boolean  }) => {
+  /* ... */
+  console.log(a, b, options);
+}
+```
+```hbs live no-shadow preview below
+<HelperSignature
+  @module='src/browser/private/samples'
+  @name='plainHelperC'
+  @package='kolay'
+/>
+```
+
+---------
+
+```ts
+export class ClassHelperD extends Helper<{
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}> {
+  /* ... */
+}
+```
+```hbs live no-shadow preview below
+<HelperSignature
+  @module='src/browser/private/samples'
+  @name='classHelperD'
+  @package='kolay'
+/>
+```
+
+---------
+
+```ts
+interface ESignature {
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}
+
+export class classHelperE extends Helper<ESignature> {
+  /* ... */
+}
+```
+
+```hbs live no-shadow preview below
+<HelperSignature
+  @module='src/browser/private/samples'
+  @name='classHelperE'
+  @package='kolay'
+/>
+```
diff --git a/ui/src/samples/-private/helper.ts b/ui/src/samples/-private/helper.ts
index 85039b7b..2cd0c469 100644
--- a/ui/src/samples/-private/helper.ts
+++ b/ui/src/samples/-private/helper.ts
@@ -1,13 +1,45 @@
+/* eslint-disable no-console */
+import Helper from '@ember/component/helper';
+
 import type { HelperLike } from '@glint/template';
 
 export function plainHelperA(a: number, b: number): number {
   return a + b;
 }
 
-export const helperLikeB = undefined as unknown as HelperLike<{
+export const helperLikeB = ((...args: unknown[]) => {
+  console.log(args);
+}) as unknown as HelperLike<{
   Args: {
     Named: { optional?: boolean };
     Positional: [first: string, second?: string];
   };
   Return: string;
 }>;
+
+export const plainHelperC = (a: number, b: number, options?: { optional?: boolean, required: boolean  }) => {
+  /* ... */
+  console.log(a, b, options);
+}
+
+export class classHelperD extends Helper<{
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}> {
+  /* ... */
+}
+
+interface ESignature {
+  Args: {
+    Named: { optional?: boolean };
+    Positional: [first: string, second?: string];
+  };
+  Return: string;
+}
+
+export class classHelperE extends Helper<ESignature> {
+  /* ... */
+}
diff --git a/ui/src/samples/-private/index.ts b/ui/src/samples/-private/index.ts
index 4ad4df74..2e0f02ef 100644
--- a/ui/src/samples/-private/index.ts
+++ b/ui/src/samples/-private/index.ts
@@ -1,6 +1,2 @@
-export { helperLikeB, plainHelperA } from './helper.ts';
-export {
-  functionModifierA,
-  functionModifierB,
-  functionModifierC,
-} from './modifier.ts';
+export * from './helper.ts';
+export * from './modifier.ts';
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index ff0ded7d..d88cfc66 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -1,43 +1,16 @@
 import { Comment, isIntrinsic, Type } from '../renderer.gts';
-import { findChildDeclaration } from '../utils.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
 
 const not = (x: unknown) => !x;
 
-/**
- * Get named args from a full Args signature
- */
-export function getNamedArgs(info: DeclarationReflection) {
-  let args = findChildDeclaration(info, 'Args');
-
-  if (!args) return;
-
-  let named = findChildDeclaration(args, 'Named');
-
-  return named;
-}
-
-/**
- * Get positional args from a full Args signature
- */
-export function getPositionalArgs(info: DeclarationReflection) {
-  let args = findChildDeclaration(info, 'Args');
-
-  if (!args) return;
-
-  let named = findChildDeclaration(args, 'Positional');
-
-  return named;
-}
-
-export const NamedArgs: TOC<{
+export const Args: TOC<{
   Args: { kind: 'component' | 'modifier' | 'helper'; info: any };
 }> = <template>
   {{#if @info}}
     <h3 class='typedoc-heading'>Arguments</h3>
-    {{#each @info.type.declaration.children as |child|}}
+    {{#each (listifyArgs @info) as |child|}}
       <span class='typedoc-{{@kind}}-arg'>
         <span class='typedoc-{{@kind}}-arg-info'>
           <pre class='typedoc-name'>@{{child.name}}</pre>
@@ -54,3 +27,23 @@ export const NamedArgs: TOC<{
     {{/each}}
   {{/if}}
 </template>;
+
+function listifyArgs(info: DeclarationReflection): any[] {
+  if (!info) return [];
+
+  if (Array.isArray(info)) {
+    return info;
+  }
+
+  if ('children' in info && Array.isArray(info.children)) {
+    return info.children;
+  }
+
+  if (info.type && 'declaration' in info.type && info.type.declaration) {
+    return listifyArgs(info.type.declaration);
+  }
+
+  console.log('unhandled', info);
+
+  return [];
+}
diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index fd1eb9bb..216a317c 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -1,12 +1,12 @@
 import { Comment, Type } from '../renderer.gts';
 import { findChildDeclaration, Load } from '../utils.gts';
-import { NamedArgs } from './args.gts';
+import { Args } from './args.gts';
 import { Element } from './element.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
 
-function getSignature(info: DeclarationReflection) {
+function getSignatureType(info: DeclarationReflection) {
   /**
    * export const Foo: TOC<{ signature here }> = <template> ... </template>
    */
@@ -41,6 +41,16 @@ function getSignature(info: DeclarationReflection) {
   return info;
 }
 
+function getSignature(info: DeclarationReflection) {
+  let type = getSignatureType(info);
+
+  return {
+    Element: findChildDeclaration(type, 'Element'),
+    Args: findChildDeclaration(type, 'Args'),
+    Blocks: findChildDeclaration(type, 'Blocks'),
+  }
+}
+
 export const ComponentSignature: TOC<{
   Args: {
     /**
@@ -64,12 +74,9 @@ export const ComponentSignature: TOC<{
     as |declaration|
   >
     {{#let (getSignature declaration) as |info|}}
-      <Element
-        @kind='component'
-        @info={{findChildDeclaration info 'Element'}}
-      />
-      <NamedArgs @kind='component' @info={{findChildDeclaration info 'Args'}} />
-      <Blocks @info={{findChildDeclaration info 'Blocks'}} />
+      <Element @kind='component' @info={{info.Element}} />
+      <Args @kind='component' @info={{info.Args}} />
+      <Blocks @info={{info.Blocks}} />
     {{/let}}
   </Load>
 </template>;
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index daaee94f..54c63eb0 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -1,6 +1,6 @@
 import { Type } from '../renderer.gts';
 import { Load } from '../utils.gts';
-import { getNamedArgs, getPositionalArgs, NamedArgs } from './args.gts';
+import { Args } from './args.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
@@ -18,6 +18,7 @@ function getSignature(info: DeclarationReflection) {
     info.type.typeArguments[0] &&
     'declaration' in info.type.typeArguments[0]
   ) {
+    // There can only be one type argument for a HelperLike
     return info.type.typeArguments[0]?.declaration;
   }
 
@@ -35,6 +36,10 @@ function getSignature(info: DeclarationReflection) {
 }
 
 function getArgs(info: any) {
+  if ('parameters' in info) {
+    return info.parameters;
+  }
+
   if (Array.isArray(info)) {
     return info.find(item => item.name === 'Args');
   }
@@ -45,6 +50,10 @@ function getArgs(info: any) {
 }
 
 function getReturn(info: any) {
+  if (info.variant === 'signature' ){
+    return info.type;
+  }
+
   if (Array.isArray(info)) {
     return info.find(item => item.name === 'Return')?.type;
   }
@@ -88,17 +97,13 @@ export const HelperSignature: TOC<{
     {{#let (getSignature declaration) as |info|}}
       {{#if (Array.isArray info)}}
         {{#each info as |signature|}}
-          {{! TODO: have special formatting for parameters vs return type }}
-        {{! @glint-expect-error }}
-          <Type @info={{signature}} />
+          <Args @kind='helper' @info={{getArgs signature}} />
+          <Return @info={{getReturn signature}} />
         {{/each}}
       {{else}}
         {{! Whenever we have a "Full Signature" or "HelperLike" definition }}
-        {{#let (getArgs info) (getReturn info) as |args returnType|}}
-          <NamedArgs @kind='modifier' @info={{getPositionalArgs args}} />
-          <NamedArgs @kind='modifier' @info={{getNamedArgs args}} />
-          <Return @info={{returnType}} />
-        {{/let}}
+        <Args @kind='helper' @info={{getArgs info}} />
+        <Return @info={{getReturn info}} />
       {{/if}}
 
     {{/let}}
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index 85f7c0bd..79686107 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -1,5 +1,5 @@
 import { findChildDeclaration, Load } from '../utils.gts';
-import { getNamedArgs, NamedArgs } from './args.gts';
+import { Args } from './args.gts';
 import { Element } from './element.gts';
 
 import type { TOC } from '@ember/component/template-only';
@@ -65,7 +65,7 @@ export const ModifierSignature: TOC<{
     {{log 'modifier' declaration}}
     {{#let (getSignature declaration) as |info|}}
       <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
-      <NamedArgs @kind='modifier' @info={{getNamedArgs info}} />
+      <Args @kind='modifier' @info={{info}} />
     {{/let}}
   </Load>
 </template>;
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 3274cf40..2d84c002 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -95,6 +95,12 @@ section {
   align-items: baseline;
 }
 
+.typedoc__component-signature__block .typedoc-rendered-comment {
+  border-top: 1px solid #333;
+  padding-top: 0.5rem;
+  margin-top: 0.5rem;
+}
+
 .typedoc__component-signature__block
   .typedoc-declaration-name
   + .typedoc-reference {

From 9e4cdb77b4989c5ce3c536c8e22a2a294cfb16f5 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 21:18:48 -0400
Subject: [PATCH 06/18] CSS oof

---
 docs-app/app/styles/app.css                   |  9 ++++++
 docs-app/app/templates/application.gts        |  7 +++++
 docs-app/app/templates/page.gjs               | 24 +++++++--------
 docs-app/public/docs/usage/rendering-pages.md | 30 +++++++++----------
 ui/src/samples/-private/helper.ts             |  4 +++
 ui/src/typedoc/styles.css                     | 17 +++++++++--
 6 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/docs-app/app/styles/app.css b/docs-app/app/styles/app.css
index acfca60b..e92d7b32 100644
--- a/docs-app/app/styles/app.css
+++ b/docs-app/app/styles/app.css
@@ -3,3 +3,12 @@
 a.active {
   font-weight: bold;
 }
+
+pre.shiki {
+  white-space: pre-wrap;
+  /* overflow: hidden; */
+}
+pre.shiki>code {
+  /* padding-right: 1rem; */
+  /* overflow: auto; */
+}
diff --git a/docs-app/app/templates/application.gts b/docs-app/app/templates/application.gts
index f31bbe33..afb216ec 100644
--- a/docs-app/app/templates/application.gts
+++ b/docs-app/app/templates/application.gts
@@ -106,6 +106,13 @@ export default Route(
         display: grid;
         grid-template-columns: max-content 1fr;
         gap: 2rem;
+
+        main {
+          max-width: 100%;
+          display: flex;
+          flex-direction: column;
+          overflow-x: hidden;
+        }
       }
 
       .mobile-menu__tray, .big-layout {
diff --git a/docs-app/app/templates/page.gjs b/docs-app/app/templates/page.gjs
index 9646aacb..99f5a79a 100644
--- a/docs-app/app/templates/page.gjs
+++ b/docs-app/app/templates/page.gjs
@@ -7,20 +7,18 @@ function removeLoader() {
 
 export default Route(
   <template>
-    <div>
-      <Page>
-        <:error as |error|>
-          <div style="border: 1px solid red; padding: 1rem;">
-            {{error}}
-          </div>
-        </:error>
+    <Page>
+      <:error as |error|>
+        <div style="border: 1px solid red; padding: 1rem;">
+          {{error}}
+        </div>
+      </:error>
 
-        <:success as |Prose|>
-          <Prose />
-          {{(removeLoader)}}
-        </:success>
+      <:success as |Prose|>
+        <Prose />
+        {{(removeLoader)}}
+      </:success>
 
-      </Page>
-    </div>
+    </Page>
   </template>
 );
diff --git a/docs-app/public/docs/usage/rendering-pages.md b/docs-app/public/docs/usage/rendering-pages.md
index e16b3ee5..36ef95d1 100644
--- a/docs-app/public/docs/usage/rendering-pages.md
+++ b/docs-app/public/docs/usage/rendering-pages.md
@@ -15,22 +15,20 @@ function removeLoader() {
 
 export default Route(
   <template>
-    <div>
-      <Page>
-
-        <:error as |error|>
-          <div style="border: 1px solid red; padding: 1rem;">
-            {{error}}
-          </div>
-        </:error>
-
-        <:success as |prose|>
-          <prose />
-          {{(removeLoader)}}
-        </:success>
-
-      </Page>
-    </div>
+    <Page>
+
+      <:error as |error|>
+        <div style="border: 1px solid red; padding: 1rem;">
+          {{error}}
+        </div>
+      </:error>
+
+      <:success as |prose|>
+        <prose />
+        {{(removeLoader)}}
+      </:success>
+
+    </Page>
   </template>,
 );
 ```
diff --git a/ui/src/samples/-private/helper.ts b/ui/src/samples/-private/helper.ts
index 2cd0c469..e0b52854 100644
--- a/ui/src/samples/-private/helper.ts
+++ b/ui/src/samples/-private/helper.ts
@@ -3,6 +3,10 @@ import Helper from '@ember/component/helper';
 
 import type { HelperLike } from '@glint/template';
 
+/**
+ * @param {number} a - the first argument
+ * @param {number} b - the second argument
+ */
 export function plainHelperA(a: number, b: number): number {
   return a + b;
 }
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 2d84c002..aeff232f 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -46,18 +46,23 @@ section {
 }
 
 .typedoc-named-tuple,
-.typedoc-component-arg-info {
+.typedoc-component-arg-info,
+.typedoc-helper-arg-info {
   display: flex;
   gap: 0.25rem;
   align-items: baseline;
   justify-content: space-between;
 }
-.typedoc-component-arg-info > .typedoc-name {
+.typedoc-component-arg-info > .typedoc-name,
+.typedoc-helper-arg-info > .typedoc-name {
   display: inline-block;
   margin: 0;
   font-size: 1rem;
   font-weight: bold;
 }
+.typedoc-helper-arg-info  {
+  border-bottom: 1px gray dashed;
+}
 
 .typedoc-declaration-children {
   list-style: none;
@@ -69,11 +74,13 @@ section {
  * Component Signatures
  *
  */
+.typedoc__modifier-signature__element,
 .typedoc__component-signature__element,
 .typedoc__component-signature__block {
   display: block;
   padding: 0 1rem;
 }
+.typedoc__modifier-signature__element-type,
 .typedoc__component-signature__element-type {
   display: flex;
   gap: 0.25rem;
@@ -81,12 +88,14 @@ section {
   justify-content: space-between;
 }
 
+.typedoc__modifier-signature__element-type > .typedoc__name,
 .typedoc__component-signature__element-type > .typedoc__name {
   display: inline-block;
   margin: 0;
   line-height: 1.5rem;
 }
 
+.typedoc__modifier-signature__element-header,
 .typedoc__component-signature__element-header {
   display: flex;
   flex-direction: row;
@@ -95,6 +104,7 @@ section {
   align-items: baseline;
 }
 
+.typedoc__helper-signature__block .typedoc-rendered-comment,
 .typedoc__component-signature__block .typedoc-rendered-comment {
   border-top: 1px solid #333;
   padding-top: 0.5rem;
@@ -122,11 +132,13 @@ section {
   padding: 0.5rem;
 }
 
+.typedoc-helper-arg,
 .typedoc-component-arg {
   margin-bottom: 0.5rem;
   display: grid;
   gap: 0.25rem;
 }
+.typedoc-helper-arg > .typedoc-name,
 .typedoc-component-arg > .typedoc-name,
 .typedoc__component-signature__block > .typedoc__name {
   font-size: 1.2rem;
@@ -137,6 +149,7 @@ section {
   max-height: unset;
 }
 
+.typedoc-helper-arg .typedoc-rendered-comment p,
 .typedoc-component-arg .typedoc-rendered-comment p {
   margin-top: 0;
   margin-bottom: 0.25rem;

From cc0fc9cd3b043b24cfcecad99b34fd733d244424 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:21:57 -0400
Subject: [PATCH 07/18] fix

---
 docs-app/app/templates/page.gjs     |  4 +++-
 ui/src/typedoc/signature/args.gts   |  8 +++++++-
 ui/src/typedoc/signature/helper.gts |  6 ++++--
 ui/src/typedoc/styles.css           | 10 +++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/docs-app/app/templates/page.gjs b/docs-app/app/templates/page.gjs
index 99f5a79a..80cbb9c5 100644
--- a/docs-app/app/templates/page.gjs
+++ b/docs-app/app/templates/page.gjs
@@ -2,7 +2,9 @@ import Route from 'ember-route-template';
 import { Page } from 'kolay/components';
 
 function removeLoader() {
-  document.querySelector('#kolay__loading')?.remove();
+  requestAnimationFrame(() => {
+    document.querySelector('#kolay__loading')?.remove();
+  });
 }
 
 export default Route(
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index d88cfc66..936990c7 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -5,6 +5,12 @@ import type { DeclarationReflection } from 'typedoc';
 
 const not = (x: unknown) => !x;
 
+const isComponent = (kind: 'component' | 'modifier' | 'helper') => kind === 'component';
+
+/**
+ * Only components' args are prefixed with a `@`, 
+ * because only components have template-content.
+ */
 export const Args: TOC<{
   Args: { kind: 'component' | 'modifier' | 'helper'; info: any };
 }> = <template>
@@ -13,7 +19,7 @@ export const Args: TOC<{
     {{#each (listifyArgs @info) as |child|}}
       <span class='typedoc-{{@kind}}-arg'>
         <span class='typedoc-{{@kind}}-arg-info'>
-          <pre class='typedoc-name'>@{{child.name}}</pre>
+          <pre class='typedoc-name'>{{if (isComponent @kind) "@"}}{{child.name}}</pre>
           {{#if (isIntrinsic child.type)}}
             <Type @info={{child.type}} />
           {{/if}}
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index 54c63eb0..709df549 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -65,9 +65,11 @@ function getReturn(info: any) {
 
 const Return: TOC<{ Args: { info: any }}> = <template>
   {{#if @info}}
-    <h3 class='typedoc-heading'>Return</h3>
+    <div class="typedoc__helper__return">
+      <h3 class='typedoc-heading'>Return</h3>
 
-    <Type @info={{@info}} />
+      <Type @info={{@info}} />
+    </div>
   {{/if}}
 </template>;
 
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index aeff232f..7d116007 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -61,7 +61,15 @@ section {
   font-weight: bold;
 }
 .typedoc-helper-arg-info  {
-  border-bottom: 1px gray dashed;
+  border-bottom: 1px rgba(125,125,125,0.5) dashed;
+}
+.typedoc__helper__return {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+.typedoc__helper__return > .typedoc-heading {
+  margin: 0;
 }
 
 .typedoc-declaration-children {

From f1fcf27989d2b7a7f40cbe66968f09dd8d9fb1f6 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 22:31:19 -0400
Subject: [PATCH 08/18] lint:fix

---
 docs-app/.template-lintrc.js           |  2 +
 docs-app/app/styles/app.css            |  2 +-
 docs-app/app/templates/application.gts | 62 ++++++++++++--------------
 ui/docs/docs/helper-signature.md       | 24 +++++++---
 ui/src/samples/-private/helper.ts      |  8 +++-
 ui/src/typedoc/signature/args.gts      | 13 ++++--
 ui/src/typedoc/signature/component.gts |  2 +-
 ui/src/typedoc/signature/helper.gts    | 11 +++--
 ui/src/typedoc/signature/modifier.gts  |  1 -
 ui/src/typedoc/styles.css              |  4 +-
 10 files changed, 72 insertions(+), 57 deletions(-)

diff --git a/docs-app/.template-lintrc.js b/docs-app/.template-lintrc.js
index 9e274c75..cfca5a21 100644
--- a/docs-app/.template-lintrc.js
+++ b/docs-app/.template-lintrc.js
@@ -5,5 +5,7 @@ module.exports = {
   rules: {
     'no-forbidden-elements': 'off',
     'no-inline-styles': 'off',
+    // Let prettier maintain invis
+    'no-whitespace-for-layout': 'off',
   },
 };
diff --git a/docs-app/app/styles/app.css b/docs-app/app/styles/app.css
index e92d7b32..28f98c3f 100644
--- a/docs-app/app/styles/app.css
+++ b/docs-app/app/styles/app.css
@@ -8,7 +8,7 @@ pre.shiki {
   white-space: pre-wrap;
   /* overflow: hidden; */
 }
-pre.shiki>code {
+pre.shiki > code {
   /* padding-right: 1rem; */
   /* overflow: auto; */
 }
diff --git a/docs-app/app/templates/application.gts b/docs-app/app/templates/application.gts
index afb216ec..6a40eedc 100644
--- a/docs-app/app/templates/application.gts
+++ b/docs-app/app/templates/application.gts
@@ -1,5 +1,4 @@
-
-import 'ember-mobile-menu/themes/android'
+import 'ember-mobile-menu/themes/android';
 
 import { on } from '@ember/modifier';
 
@@ -14,13 +13,17 @@ import { GroupNav, PageNav } from 'kolay/components';
 import type { TOC } from '@ember/component/template-only';
 import type { Page } from 'kolay';
 
-const Menu: TOC<{ Element: SVGElement }>  = <template>
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  x="0px" y="0px" viewBox="0 0 50 50"
-  style="fill:currentColor"
-  ...attributes
-><path d="M 0 7.5 L 0 12.5 L 50 12.5 L 50 7.5 Z M 0 22.5 L 0 27.5 L 50 27.5 L 50 22.5 Z M 0 37.5 L 0 42.5 L 50 42.5 L 50 37.5 Z"></path></svg>
+const Menu: TOC<{ Element: SVGElement }> = <template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    x="0px"
+    y="0px"
+    viewBox="0 0 50 50"
+    style="fill:currentColor"
+    ...attributes
+  ><path
+      d="M 0 7.5 L 0 12.5 L 50 12.5 L 50 7.5 Z M 0 22.5 L 0 27.5 L 50 27.5 L 50 22.5 Z M 0 37.5 L 0 42.5 L 50 42.5 L 50 37.5 Z"
+    ></path></svg>
 </template>;
 
 const SideNav: TOC<{ Element: HTMLElement }> = <template>
@@ -40,36 +43,29 @@ export default Route(
   <template>
     {{pageTitle ENV.APP.shortVersion}}
 
-      <MenuWrapper as |mmw|>
-        <mmw.MobileMenu @mode="push" @maxWidth={{200}} as |mm|>
-          <SideNav {{on "click" mm.actions.close}} />
-        </mmw.MobileMenu>
+    <MenuWrapper as |mmw|>
+      <mmw.MobileMenu @mode="push" @maxWidth={{200}} as |mm|>
+        <SideNav {{on "click" mm.actions.close}} />
+      </mmw.MobileMenu>
 
-        <mmw.Content class="container">
-          <header style="display: flex; align-items: baseline; gap: 1rem;">
-            <mmw.Toggle><Menu /></mmw.Toggle>
-            <GroupNav />
-          </header>
+      <mmw.Content class="container">
+        <header style="display: flex; align-items: baseline; gap: 1rem;">
+          <mmw.Toggle><Menu /></mmw.Toggle>
+          <GroupNav />
+        </header>
 
-          <div class="big-layout">
-            <SideNav />
+        <div class="big-layout">
+          <SideNav />
 
-            <main style="padding-top: 1rem;">
-              {{outlet}}
-            </main>
-          </div>
-        </mmw.Content>
-      </MenuWrapper>
+          <main style="padding-top: 1rem;">
+            {{outlet}}
+          </main>
+        </div>
+      </mmw.Content>
+    </MenuWrapper>
 
     {{!-- prettier-ignore --}}
     <style>
-      :root {
-        --mobile-menu-header-bg:                 #E04E39;
-
-        --mobile-menu-item-color:                #333;
-        --mobile-menu-item-active-bg:            #EEE;
-        --mobile-menu-item-link-disabled-color:  #6C757D;
-      }
       .mobile-menu-wrapper__content,
       .mobile-menu__tray {
         background: none;
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 519c21dc..7ffeb2c5 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -13,6 +13,7 @@ export function plainHelperA(a: number, b: number): number {
   return a + b;
 }
 ```
+
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -21,12 +22,14 @@ export function plainHelperA(a: number, b: number): number {
 />
 ```
 
----------
+---
 
 ```ts
 import type { HelperLike } from '@glint/template';
 
-export const helperLikeB = ((...args: unknown[]) => { /* ... */ }) as unknown as HelperLike<{
+export const helperLikeB = ((...args: unknown[]) => {
+  /* ... */
+}) as unknown as HelperLike<{
   Args: {
     Named: { optional?: boolean };
     Positional: [first: string, second?: string];
@@ -34,6 +37,7 @@ export const helperLikeB = ((...args: unknown[]) => { /* ... */ }) as unknown as
   Return: string;
 }>;
 ```
+
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -42,14 +46,19 @@ export const helperLikeB = ((...args: unknown[]) => { /* ... */ }) as unknown as
 />
 ```
 
----------
+---
 
 ```ts
-export const plainHelperC = (a: number, b: number, options?: { optional?: boolean, required: boolean  }) => {
+export const plainHelperC = (
+  a: number,
+  b: number,
+  options?: { optional?: boolean; required: boolean },
+) => {
   /* ... */
   console.log(a, b, options);
-}
+};
 ```
+
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -58,7 +67,7 @@ export const plainHelperC = (a: number, b: number, options?: { optional?: boolea
 />
 ```
 
----------
+---
 
 ```ts
 export class ClassHelperD extends Helper<{
@@ -71,6 +80,7 @@ export class ClassHelperD extends Helper<{
   /* ... */
 }
 ```
+
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -79,7 +89,7 @@ export class ClassHelperD extends Helper<{
 />
 ```
 
----------
+---
 
 ```ts
 interface ESignature {
diff --git a/ui/src/samples/-private/helper.ts b/ui/src/samples/-private/helper.ts
index e0b52854..ed113eda 100644
--- a/ui/src/samples/-private/helper.ts
+++ b/ui/src/samples/-private/helper.ts
@@ -21,10 +21,14 @@ export const helperLikeB = ((...args: unknown[]) => {
   Return: string;
 }>;
 
-export const plainHelperC = (a: number, b: number, options?: { optional?: boolean, required: boolean  }) => {
+export const plainHelperC = (
+  a: number,
+  b: number,
+  options?: { optional?: boolean; required: boolean },
+) => {
   /* ... */
   console.log(a, b, options);
-}
+};
 
 export class classHelperD extends Helper<{
   Args: {
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index 936990c7..9650ab8f 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -5,10 +5,11 @@ import type { DeclarationReflection } from 'typedoc';
 
 const not = (x: unknown) => !x;
 
-const isComponent = (kind: 'component' | 'modifier' | 'helper') => kind === 'component';
+const isComponent = (kind: 'component' | 'modifier' | 'helper') =>
+  kind === 'component';
 
 /**
- * Only components' args are prefixed with a `@`, 
+ * Only components' args are prefixed with a `@`,
  * because only components have template-content.
  */
 export const Args: TOC<{
@@ -19,7 +20,10 @@ export const Args: TOC<{
     {{#each (listifyArgs @info) as |child|}}
       <span class='typedoc-{{@kind}}-arg'>
         <span class='typedoc-{{@kind}}-arg-info'>
-          <pre class='typedoc-name'>{{if (isComponent @kind) "@"}}{{child.name}}</pre>
+          <pre class='typedoc-name'>{{if
+              (isComponent @kind)
+              '@'
+            }}{{child.name}}</pre>
           {{#if (isIntrinsic child.type)}}
             <Type @info={{child.type}} />
           {{/if}}
@@ -49,7 +53,8 @@ function listifyArgs(info: DeclarationReflection): any[] {
     return listifyArgs(info.type.declaration);
   }
 
-  console.log('unhandled', info);
+  // eslint-disable-next-line no-console
+  console.warn('unhandled', info);
 
   return [];
 }
diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index 216a317c..6394ee63 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -48,7 +48,7 @@ function getSignature(info: DeclarationReflection) {
     Element: findChildDeclaration(type, 'Element'),
     Args: findChildDeclaration(type, 'Args'),
     Blocks: findChildDeclaration(type, 'Blocks'),
-  }
+  };
 }
 
 export const ComponentSignature: TOC<{
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index 709df549..b19e0ce9 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -41,7 +41,7 @@ function getArgs(info: any) {
   }
 
   if (Array.isArray(info)) {
-    return info.find(item => item.name === 'Args');
+    return info.find((item) => item.name === 'Args');
   }
 
   if ('children' in info) {
@@ -50,12 +50,12 @@ function getArgs(info: any) {
 }
 
 function getReturn(info: any) {
-  if (info.variant === 'signature' ){
+  if (info.variant === 'signature') {
     return info.type;
   }
 
   if (Array.isArray(info)) {
-    return info.find(item => item.name === 'Return')?.type;
+    return info.find((item) => item.name === 'Return')?.type;
   }
 
   if ('children' in info) {
@@ -63,9 +63,9 @@ function getReturn(info: any) {
   }
 }
 
-const Return: TOC<{ Args: { info: any }}> = <template>
+const Return: TOC<{ Args: { info: any } }> = <template>
   {{#if @info}}
-    <div class="typedoc__helper__return">
+    <div class='typedoc__helper__return'>
       <h3 class='typedoc-heading'>Return</h3>
 
       <Type @info={{@info}} />
@@ -95,7 +95,6 @@ export const HelperSignature: TOC<{
     @name={{@name}}
     as |declaration|
   >
-    {{log 'hepler' declaration}}
     {{#let (getSignature declaration) as |info|}}
       {{#if (Array.isArray info)}}
         {{#each info as |signature|}}
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index 79686107..2fc0788c 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -62,7 +62,6 @@ export const ModifierSignature: TOC<{
     @name={{@name}}
     as |declaration|
   >
-    {{log 'modifier' declaration}}
     {{#let (getSignature declaration) as |info|}}
       <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
       <Args @kind='modifier' @info={{info}} />
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 7d116007..2fc5fd2d 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -60,8 +60,8 @@ section {
   font-size: 1rem;
   font-weight: bold;
 }
-.typedoc-helper-arg-info  {
-  border-bottom: 1px rgba(125,125,125,0.5) dashed;
+.typedoc-helper-arg-info {
+  border-bottom: 1px rgba(125, 125, 125, 0.5) dashed;
 }
 .typedoc__helper__return {
   display: flex;

From 9a498e514e559d77cc337069e779d5d90a6b2970 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Mar 2024 23:07:12 -0400
Subject: [PATCH 09/18] progress

---
 ui/src/typedoc/renderer.gts       | 14 +++++++------
 ui/src/typedoc/signature/args.gts | 35 ++++++++++++++++++++++++++++++-
 ui/src/typedoc/styles.css         |  2 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/ui/src/typedoc/renderer.gts b/ui/src/typedoc/renderer.gts
index 98c7978f..21293404 100644
--- a/ui/src/typedoc/renderer.gts
+++ b/ui/src/typedoc/renderer.gts
@@ -169,14 +169,16 @@ const Declaration: TOC<{
 const Reflection: TOC<{ info: { declaration: DeclarationReflection } }> =
   <template><Declaration @info={{@info.declaration}} /></template>;
 
-const isReference = (x: { type: string }) => x.type === 'reference';
-const isReflection = (x: { type: string }) => x.type === 'reflection';
+const isReference = (x: { type: string }) => x?.type === 'reference';
+const isReflection = (x: { type: string }) => x?.type === 'reflection';
 
-export const isIntrinsic = (x: { type: string }) => x.type === 'intrinsic';
+export const isIntrinsic = (x: { type: string }) => x?.type === 'intrinsic';
 
-const isTuple = (x: { type: string }) => x.type === 'tuple';
-const isNamedTuple = (x: SomeType | undefined): x is NamedTupleMember =>
+const isTuple = (x: { type: string }) => x?.type === 'tuple';
+
+export const isNamedTuple = (x: SomeType | undefined): x is NamedTupleMember =>
   x?.type === 'namedTupleMember';
+
 const isVoidIntrinsic = (x: unknown | undefined) => {
   if (!x) return false;
   if (typeof x !== 'object') return false;
@@ -289,7 +291,7 @@ const Tuple: TOC<{ Args: { info: TupleType } }> = <template>
   {{/each}}
 </template>;
 
-const NamedTuple: TOC<{ Args: { info: NamedTupleMember } }> = <template>
+export const NamedTuple: TOC<{ Args: { info: NamedTupleMember } }> = <template>
   <div class='typedoc-named-tuple'>
     <div class='typedoc-name'>{{@info.name}}</div>
     <Type @info={{@info.element}} />
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index 9650ab8f..b5d4a2f5 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -1,4 +1,4 @@
-import { Comment, isIntrinsic, Type } from '../renderer.gts';
+import { Comment, isIntrinsic, isNamedTuple, Type } from '../renderer.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
@@ -26,10 +26,14 @@ export const Args: TOC<{
             }}{{child.name}}</pre>
           {{#if (isIntrinsic child.type)}}
             <Type @info={{child.type}} />
+          {{else if (isNamedTuple child)}}
+            <Type @info={{child.element}} />
           {{/if}}
         </span>
         {{#if (not (isIntrinsic child.type))}}
           <Type @info={{child.type}} />
+        {{else if (isNamedTuple child)}}
+          <Type @info={{child.element}} />
         {{else}}
           <Comment @info={{child}} />
         {{/if}}
@@ -45,7 +49,19 @@ function listifyArgs(info: DeclarationReflection): any[] {
     return info;
   }
 
+  /**
+   * This object *may* have Named and Positional on them,
+   * in which case, we want to create [...Postiional, Named]
+   */
   if ('children' in info && Array.isArray(info.children)) {
+    if (info.children.length <= 2) {
+      let flattened = flattenArgs(info.children);
+
+      if (flattened.length > 0) {
+        return flattened;
+      }
+    }
+
     return info.children;
   }
 
@@ -58,3 +74,20 @@ function listifyArgs(info: DeclarationReflection): any[] {
 
   return [];
 }
+
+function flattenArgs(args: any[]): any[] {
+  let named = args.find((x) => x.name === 'Named');
+  let positional = args.find((x) => x.name === 'Positional');
+
+  let result = [];
+
+  if (positional) {
+    result.push(positional.type?.elements);
+  }
+
+  if (named) {
+    result.push(named);
+  }
+
+  return result.flat();
+}
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 2fc5fd2d..0116efdc 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -65,7 +65,7 @@ section {
 }
 .typedoc__helper__return {
   display: flex;
-  align-items: baseline;
+  align-items: center;
   justify-content: space-between;
 }
 .typedoc__helper__return > .typedoc-heading {

From 1d763b40238fbe2600b9ab6a0ef34e84ae84c777 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 17 Mar 2024 16:28:03 -0400
Subject: [PATCH 10/18] Correctly re-export helper and modifier signature
 components

---
 ui/docs/docs/component-signature.md |  6 +++---
 ui/docs/docs/helper-signature.md    | 10 +++++++++-
 ui/docs/docs/modifier-signature.md  | 10 ++++++++++
 ui/src/index.ts                     |  8 +++++++-
 ui/src/typedoc/index.ts             |  2 ++
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/ui/docs/docs/component-signature.md b/ui/docs/docs/component-signature.md
index 1d7a3077..4215bd26 100644
--- a/ui/docs/docs/component-signature.md
+++ b/ui/docs/docs/component-signature.md
@@ -6,12 +6,12 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 ## API Reference
 
-API Reference generated via:
-
-```hbs live no-shadow preview below
+```hbs live no-shadow
 <ComponentSignature
   @module='src/browser/re-exports'
   @name='ComponentSignature'
   @package='kolay'
 />
 ```
+
+## Supported Signatures
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 7ffeb2c5..5dd5eebd 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -6,7 +6,15 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 ## API Reference
 
-API Reference generated via:
+```hbs live no-shadow
+<ComponentSignature
+  @module='src/browser/re-exports'
+  @name='HelperSignature'
+  @package='kolay'
+/>
+```
+
+## Supported Signatures
 
 ```ts
 export function plainHelperA(a: number, b: number): number {
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index 980fb3c3..1e6398c6 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -6,6 +6,16 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 ## API Reference
 
+```hbs live no-shadow
+<ComponentSignature
+  @module='src/browser/re-exports'
+  @name='ModifierSignature'
+  @package='kolay'
+/>
+```
+
+## Supported Signatures
+
 API Reference generated via:
 
 ```hbs live no-shadow preview below
diff --git a/ui/src/index.ts b/ui/src/index.ts
index 35b65ff8..cf2d2112 100644
--- a/ui/src/index.ts
+++ b/ui/src/index.ts
@@ -1,5 +1,11 @@
 // Required to *sanely* use typedoc data
-export { APIDocs, CommentQuery, ComponentSignature } from './typedoc/index.ts';
+export {
+  APIDocs,
+  CommentQuery,
+  ComponentSignature,
+  HelperSignature,
+  ModifierSignature,
+} from './typedoc/index.ts';
 
 // Required to use Kolay
 export { addRoutes } from './router.ts';
diff --git a/ui/src/typedoc/index.ts b/ui/src/typedoc/index.ts
index a9b7708b..2ae3ca5a 100644
--- a/ui/src/typedoc/index.ts
+++ b/ui/src/typedoc/index.ts
@@ -2,3 +2,5 @@ import './styles.css';
 
 export { APIDocs, CommentQuery } from './renderer.gts';
 export { ComponentSignature } from './signature/component.gts';
+export { HelperSignature } from './signature/helper.gts';
+export { ModifierSignature } from './signature/modifier.gts';

From 72bf80b678e2a081e23001bb8015527901a5be75 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:17:36 -0400
Subject: [PATCH 11/18] woo

---
 ui/docs/docs/helper-signature.md  | 9 +++++++--
 ui/src/samples/-private/helper.ts | 9 +++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 5dd5eebd..5c86169a 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -17,8 +17,13 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 ## Supported Signatures
 
 ```ts
-export function plainHelperA(a: number, b: number): number {
-  return a + b;
+/**
+ * @param {number} first - the first argument
+ * @param {number} second - the second argument
+ * @return {number} the sum of the two values
+ */
+export function plainHelperA(first: number, second: number): number {
+  return first + second;
 }
 ```
 
diff --git a/ui/src/samples/-private/helper.ts b/ui/src/samples/-private/helper.ts
index ed113eda..505b5fb7 100644
--- a/ui/src/samples/-private/helper.ts
+++ b/ui/src/samples/-private/helper.ts
@@ -4,11 +4,12 @@ import Helper from '@ember/component/helper';
 import type { HelperLike } from '@glint/template';
 
 /**
- * @param {number} a - the first argument
- * @param {number} b - the second argument
+ * @param {number} first - the first argument
+ * @param {number} second - the second argument
+ * @return {number} the sum of the two values
  */
-export function plainHelperA(a: number, b: number): number {
-  return a + b;
+export function plainHelperA(first: number, second: number): number {
+  return first + second;
 }
 
 export const helperLikeB = ((...args: unknown[]) => {

From 0dfcb8d75c79e2ec7e496f71ddcc50390fd15fd2 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 19 Mar 2024 20:04:13 -0400
Subject: [PATCH 12/18] idk if progress

---
 ui/docs/docs/component-signature.md   | 26 ++++++++++++++
 ui/src/samples/-private/component.gts | 50 +++++++++++++++++++++++++++
 ui/src/samples/-private/index.ts      |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 ui/src/samples/-private/component.gts

diff --git a/ui/docs/docs/component-signature.md b/ui/docs/docs/component-signature.md
index 4215bd26..39352b46 100644
--- a/ui/docs/docs/component-signature.md
+++ b/ui/docs/docs/component-signature.md
@@ -15,3 +15,29 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 ```
 
 ## Supported Signatures
+
+<fieldset>
+  <summary>Separate Interface</summary>
+
+```hbs live no-shadow
+<ComponentSignature
+  @module='src/browser/private/samples'
+  @name='SignatureA'
+  @package='kolay'
+/>
+```
+
+</fieldset>
+
+<fieldset>
+  <summary>Inline</summary>
+
+```hbs live no-shadow
+<ComponentSignature
+  @module='src/browser/private/samples'
+  @name='ClassA'
+  @package='kolay'
+/>
+```
+
+</fieldset>
diff --git a/ui/src/samples/-private/component.gts b/ui/src/samples/-private/component.gts
new file mode 100644
index 00000000..1a193ba7
--- /dev/null
+++ b/ui/src/samples/-private/component.gts
@@ -0,0 +1,50 @@
+/* eslint-disable ember/no-empty-glimmer-component-classes */
+import Component from '@glimmer/component';
+
+import type { TOC } from '@ember/component/template-only';
+
+export interface SignatureA {
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}
+
+export class ClassA extends Component<{
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}> {}
+
+
+export class ClassB extends Component<SignatureA> {}
+
+export const TemplateOnlyC: TOC<SignatureA> = <template>
+  hi there
+</template>;
+
+export const TemplateOnlyD: TOC<{
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}> = <template>hi</template>;
diff --git a/ui/src/samples/-private/index.ts b/ui/src/samples/-private/index.ts
index 2e0f02ef..42160b75 100644
--- a/ui/src/samples/-private/index.ts
+++ b/ui/src/samples/-private/index.ts
@@ -1,2 +1,3 @@
+export * from './component.gts';
 export * from './helper.ts';
 export * from './modifier.ts';

From d90f0e3efc0d751192686ac95c721ef383cf8fcc Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 19 Mar 2024 21:59:39 -0400
Subject: [PATCH 13/18] actual progress

---
 pnpm-lock.yaml                      | 166 +++++++++++++++++++++++-----
 ui/docs/docs/component-signature.md |  97 +++++++++++++++-
 ui/package.json                     |   2 +-
 3 files changed, 237 insertions(+), 28 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6d42a517..2eebdcd4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -450,8 +450,8 @@ importers:
         specifier: ^8.0.1
         version: 8.0.1
       fix-bad-declaration-output:
-        specifier: ^1.1.2
-        version: 1.1.2
+        specifier: ^1.1.4
+        version: 1.1.4
       prettier:
         specifier: ^3.1.1
         version: 3.2.5
@@ -647,6 +647,27 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       semver: 6.3.1
 
+  /@babel/helper-create-class-features-plugin@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-annotate-as-pure': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
+      '@babel/helper-replace-supers': 7.24.1(@babel/core@7.24.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      semver: 6.3.1
+    dev: true
+
   /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.0):
     resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
     engines: {node: '>=6.9.0'}
@@ -761,6 +782,21 @@ packages:
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
 
+  /@babel/helper-replace-supers@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-member-expression-to-functions': 7.23.0
+      '@babel/helper-optimise-call-expression': 7.22.5
+    dev: true
+
   /@babel/helper-simple-access@7.22.5:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
@@ -834,6 +870,14 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/parser@7.24.1:
+    resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.24.0
+    dev: true
+
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.24.0):
     resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}
     engines: {node: '>=6.9.0'}
@@ -1010,8 +1054,8 @@ packages:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
 
-  /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.24.0):
-    resolution: {integrity: sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==}
+  /@babel/plugin-syntax-flow@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1275,6 +1319,20 @@ packages:
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
+  /@babel/plugin-transform-class-properties@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+    dev: true
+
   /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.24.0):
     resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==}
     engines: {node: '>=6.9.0'}
@@ -1397,8 +1455,8 @@ packages:
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
 
-  /@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.24.0):
-    resolution: {integrity: sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==}
+  /@babel/plugin-transform-flow-strip-types@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -1408,7 +1466,7 @@ packages:
     dependencies:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-flow': 7.24.1(@babel/core@7.24.0)
     dev: true
 
   /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.24.0):
@@ -1515,6 +1573,21 @@ packages:
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-simple-access': 7.22.5
 
+  /@babel/plugin-transform-modules-commonjs@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-simple-access': 7.22.5
+    dev: true
+
   /@babel/plugin-transform-modules-systemjs@7.23.9(@babel/core@7.24.0):
     resolution: {integrity: sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==}
     engines: {node: '>=6.9.0'}
@@ -1581,6 +1654,20 @@ packages:
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
 
+  /@babel/plugin-transform-nullish-coalescing-operator@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
+    dev: true
+
   /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.24.0):
     resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==}
     engines: {node: '>=6.9.0'}
@@ -1650,6 +1737,21 @@ packages:
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
 
+  /@babel/plugin-transform-optional-chaining@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
+    dev: true
+
   /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.24.0):
     resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==}
     engines: {node: '>=6.9.0'}
@@ -1675,6 +1777,20 @@ packages:
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
       '@babel/helper-plugin-utils': 7.24.0
 
+  /@babel/plugin-transform-private-methods@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-create-class-features-plugin': 7.24.1(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.24.0
+    dev: true
+
   /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.24.0):
     resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==}
     engines: {node: '>=6.9.0'}
@@ -1999,8 +2115,8 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/preset-flow@7.24.0(@babel/core@7.24.0):
-    resolution: {integrity: sha512-cum/nSi82cDaSJ21I4PgLTVlj0OXovFk6GRguJYe/IKg6y6JHLTbJhybtX4k35WT9wdeJfEVjycTixMhBHd0Dg==}
+  /@babel/preset-flow@7.24.1(@babel/core@7.24.0):
+    resolution: {integrity: sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -2011,7 +2127,7 @@ packages:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.24.0)
+      '@babel/plugin-transform-flow-strip-types': 7.24.1(@babel/core@7.24.0)
     dev: true
 
   /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0):
@@ -10253,8 +10369,8 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /fix-bad-declaration-output@1.1.2:
-    resolution: {integrity: sha512-6Sj2LWVXdn5I/yykw57V7S0xeHh3WqeCPtrjwCFxI5CVa8h6yKgmzBh5QPLzKMDZ1izVjso4F9TFIJSjYPAOCw==}
+  /fix-bad-declaration-output@1.1.4:
+    resolution: {integrity: sha512-gK1foQT1cxE5GqYgyD4VVY1WCS72M+MbKUIZMRaPCx7HPWnsXKG9bqwo7aNsZiaK5gzlXNtdcg7PnQ8yoGrjZQ==}
     hasBin: true
     dependencies:
       fs-extra: 11.2.0
@@ -10323,8 +10439,8 @@ packages:
     resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
     dev: true
 
-  /flow-parser@0.229.2:
-    resolution: {integrity: sha512-T72XV2Izvl7yV6dhHhLaJ630Y6vOZJl6dnOS6dN0bPW9ExuREu7xGAf3omtcxX76POTuux9TJPu9ZpS48a/rdw==}
+  /flow-parser@0.231.0:
+    resolution: {integrity: sha512-WVzuqwq7ZnvBceCG0DGeTQebZE+iIU0mlk5PmJgYj9DDrt+0isGC2m1ezW9vxL4V+HERJJo9ExppOnwKH2op6Q==}
     engines: {node: '>=0.4.0'}
     dev: true
 
@@ -11830,23 +11946,23 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.24.0)
-      '@babel/preset-flow': 7.24.0(@babel/core@7.24.0)
+      '@babel/parser': 7.24.1
+      '@babel/plugin-transform-class-properties': 7.24.1(@babel/core@7.24.0)
+      '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.24.1(@babel/core@7.24.0)
+      '@babel/plugin-transform-optional-chaining': 7.24.1(@babel/core@7.24.0)
+      '@babel/plugin-transform-private-methods': 7.24.1(@babel/core@7.24.0)
+      '@babel/preset-flow': 7.24.1(@babel/core@7.24.0)
       '@babel/preset-typescript': 7.23.3(@babel/core@7.24.0)
       '@babel/register': 7.23.7(@babel/core@7.24.0)
       babel-core: 7.0.0-bridge.0(@babel/core@7.24.0)
       chalk: 4.1.2
-      flow-parser: 0.229.2
+      flow-parser: 0.231.0
       graceful-fs: 4.2.11
       micromatch: 4.0.5
       neo-async: 2.6.2
       node-dir: 0.1.17
-      recast: 0.23.5
+      recast: 0.23.6
       temp: 0.8.4
       write-file-atomic: 2.4.3
     transitivePeerDependencies:
@@ -14432,8 +14548,8 @@ packages:
       private: 0.1.8
       source-map: 0.6.1
 
-  /recast@0.23.5:
-    resolution: {integrity: sha512-M67zIddJiwXdfPQRYKJ0qZO1SLdH1I0hYeb0wzxA+pNOvAZiQHulWzuk+fYsEWRQ8VfZrgjyucqsCOtCyM01/A==}
+  /recast@0.23.6:
+    resolution: {integrity: sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==}
     engines: {node: '>= 4'}
     dependencies:
       ast-types: 0.16.1
diff --git a/ui/docs/docs/component-signature.md b/ui/docs/docs/component-signature.md
index 39352b46..2d442233 100644
--- a/ui/docs/docs/component-signature.md
+++ b/ui/docs/docs/component-signature.md
@@ -19,7 +19,23 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 <fieldset>
   <summary>Separate Interface</summary>
 
-```hbs live no-shadow
+```gts
+export interface SignatureA {
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}
+```
+
+
+```hbs live no-shadow preview below
 <ComponentSignature
   @module='src/browser/private/samples'
   @name='SignatureA'
@@ -32,7 +48,22 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 <fieldset>
   <summary>Inline</summary>
 
-```hbs live no-shadow
+```gts
+export class ClassA extends Component<{
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}> {}
+```
+
+```hbs live no-shadow preview below
 <ComponentSignature
   @module='src/browser/private/samples'
   @name='ClassA'
@@ -41,3 +72,65 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 ```
 
 </fieldset>
+
+<fieldset>
+  <summary>Reference</summary>
+
+```gts
+export class ClassB extends Component<SignatureA> {}
+```
+
+```hbs live no-shadow preview below
+<ComponentSignature
+  @module='src/browser/private/samples'
+  @name='ClassB'
+  @package='kolay'
+/>
+```
+
+</fieldset>
+
+<fieldset>
+  <summary>TemplateOnly w/ Reference</summary>
+
+```gts
+export const TemplateOnlyC: TOC<SignatureA> = <template> ... </template>;
+```
+
+```hbs live no-shadow preview below
+<ComponentSignature
+  @module='src/browser/private/samples'
+  @name='TemplateOnlyC'
+  @package='kolay'
+/>
+```
+
+</fieldset>
+
+<fieldset>
+  <summary>TemplateOnly w/ Inline</summary>
+
+```gts
+export const TemplateOnlyD: TOC<{
+  Element: HTMLDivElement;
+  Args: {
+    foo: number;
+    bar: string;
+  };
+  Blocks: {
+    default: [first: number, second: string];
+    namedBlockA: [first: typeof ClassA];
+    namedBlockB: [boolean];
+  }
+}> = <template>hi</template>;
+```
+
+```hbs live no-shadow preview below
+<ComponentSignature
+  @module='src/browser/private/samples'
+  @name='TemplateOnlyD'
+  @package='kolay'
+/>
+```
+
+</fieldset>
diff --git a/ui/package.json b/ui/package.json
index e4044308..66372d8c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -72,7 +72,7 @@
     "eslint-plugin-n": "^16.4.0",
     "eslint-plugin-prettier": "^5.0.1",
     "execa": "^8.0.1",
-    "fix-bad-declaration-output": "^1.1.2",
+    "fix-bad-declaration-output": "^1.1.4",
     "prettier": "^3.1.1",
     "prettier-plugin-ember-template-tag": "^2.0.0",
     "qunit": "^2.20.0",

From ce15a20094202994c3d98879118c560120f275cd Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 00:13:46 -0400
Subject: [PATCH 14/18] I think I need to cave and find out how typedoc does
 this

---
 ui/src/typedoc/signature/component.gts | 55 +++++++++++++++++++++++---
 ui/src/typedoc/utils.gts               |  4 +-
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index 6394ee63..6daac7cd 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -6,7 +6,39 @@ import { Element } from './element.gts';
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
 
-function getSignatureType(info: DeclarationReflection) {
+function lookupReference(reference: any, info: any) {
+  let id = reference.target;
+  let lookup = info.symbolIdMap[id];
+
+  let fileName = lookup?.sourceFileName;
+  let name = lookup?.qualifiedName;
+
+  return findReferenceByFilename(name, fileName, info);
+}
+
+function findReferenceByFilename(name: string, fileName: string, info: any): any {
+  if (!info.children) return;
+
+  for (let child of info.children) {
+    if (child.sources[0].fileName === fileName) {
+      return child;
+    }
+
+    if (!child.children) continue;
+
+    let isRelevant = child.children.find(( grandChild: any) => grandChild.sources[0].fileName === fileName);
+
+    if (isRelevant) {
+      return isRelevant;
+    }
+
+    let grand = findReferenceByFilename(name, fileName, child);
+
+    if (grand) return grand;
+  }
+}
+
+function getSignatureType(info: DeclarationReflection, doc: any) {
   /**
    * export const Foo: TOC<{ signature here }> = <template> ... </template>
    */
@@ -32,6 +64,13 @@ function getSignatureType(info: DeclarationReflection) {
       if (typeArg?.type === 'reflection') {
         return typeArg.declaration;
       }
+
+      if (typeArg?.type === 'reference') {
+        if ('symbolIdMap' in doc) {
+          // This is hard, maybe typedoc has a util?
+          return findReferenceByFilename(typeArg.name, ( extendedType as any).target.sourceFileName, doc);
+        }
+      }
     }
   }
 
@@ -41,8 +80,14 @@ function getSignatureType(info: DeclarationReflection) {
   return info;
 }
 
-function getSignature(info: DeclarationReflection) {
-  let type = getSignatureType(info);
+function getSignature(info: DeclarationReflection, doc: any) {
+  let type = getSignatureType(info, doc);
+
+  if (!type) {
+    console.warn('Could not finde signature');
+
+    return;
+  }
 
   return {
     Element: findChildDeclaration(type, 'Element'),
@@ -71,9 +116,9 @@ export const ComponentSignature: TOC<{
     @package={{@package}}
     @module={{@module}}
     @name={{@name}}
-    as |declaration|
+    as |declaration doc|
   >
-    {{#let (getSignature declaration) as |info|}}
+    {{#let (getSignature declaration doc) as |info|}}
       <Element @kind='component' @info={{info.Element}} />
       <Args @kind='component' @info={{info.Args}} />
       <Blocks @info={{info.Blocks}} />
diff --git a/ui/src/typedoc/utils.gts b/ui/src/typedoc/utils.gts
index 3d030c1b..624b6b51 100644
--- a/ui/src/typedoc/utils.gts
+++ b/ui/src/typedoc/utils.gts
@@ -63,7 +63,7 @@ export class Load extends Component<{
     name: string;
     package: string;
   };
-  Blocks: { default: [DeclarationReflection] };
+  Blocks: { default: [DeclarationReflection, any] };
 }> {
   @service('kolay/api-docs') declare apiDocs: APIDocsService;
 
@@ -101,7 +101,7 @@ export class Load extends Component<{
             @name={{@name}}
             as |type|
           >
-            {{yield type}}
+            {{yield type this.request.value}}
           </Query>
         {{/if}}
       </section>

From d4218bd8538e7fbce1084689425d2a3ce5c2e0ce Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 11:58:35 -0400
Subject: [PATCH 15/18] Helper progress

---
 docs-app/app/styles/app.css         | 10 ++++++++++
 ui/docs/docs/component-signature.md |  8 ++++----
 ui/docs/docs/helper-signature.md    | 28 +++++++++++++++++++++++-----
 ui/src/typedoc/signature/helper.gts | 23 +++++++++++++++++++++++
 ui/src/typedoc/styles.css           |  3 ++-
 5 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/docs-app/app/styles/app.css b/docs-app/app/styles/app.css
index 28f98c3f..8f020739 100644
--- a/docs-app/app/styles/app.css
+++ b/docs-app/app/styles/app.css
@@ -12,3 +12,13 @@ pre.shiki > code {
   /* padding-right: 1rem; */
   /* overflow: auto; */
 }
+
+fieldset {
+  padding: 1rem;
+}
+fieldset summary {
+  font-weight: bold;
+  font-style: italic;
+  font-size: 1.2rem;
+  border-bottom: 1px solid: #888;
+}
diff --git a/ui/docs/docs/component-signature.md b/ui/docs/docs/component-signature.md
index 2d442233..57061e39 100644
--- a/ui/docs/docs/component-signature.md
+++ b/ui/docs/docs/component-signature.md
@@ -74,13 +74,13 @@ export class ClassA extends Component<{
 </fieldset>
 
 <fieldset>
-  <summary>Reference</summary>
+  <summary>Reference (not currently supported)</summary>
 
 ```gts
 export class ClassB extends Component<SignatureA> {}
 ```
 
-```hbs live no-shadow preview below
+```hbs live no-shadow
 <ComponentSignature
   @module='src/browser/private/samples'
   @name='ClassB'
@@ -91,13 +91,13 @@ export class ClassB extends Component<SignatureA> {}
 </fieldset>
 
 <fieldset>
-  <summary>TemplateOnly w/ Reference</summary>
+  <summary>TemplateOnly w/ Reference (not currently supported)</summary>
 
 ```gts
 export const TemplateOnlyC: TOC<SignatureA> = <template> ... </template>;
 ```
 
-```hbs live no-shadow preview below
+```hbs live no-shadow 
 <ComponentSignature
   @module='src/browser/private/samples'
   @name='TemplateOnlyC'
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 5c86169a..064b0753 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -16,6 +16,9 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 ## Supported Signatures
 
+<fieldset>
+  <summary>Plain Function, JSDoc</summary>
+
 ```ts
 /**
  * @param {number} first - the first argument
@@ -35,7 +38,10 @@ export function plainHelperA(first: number, second: number): number {
 />
 ```
 
----
+</fieldset>
+
+<fieldset>
+  <summary>Plain Function, cast as HelperLike</summary>
 
 ```ts
 import type { HelperLike } from '@glint/template';
@@ -59,7 +65,10 @@ export const helperLikeB = ((...args: unknown[]) => {
 />
 ```
 
----
+</fieldset>
+
+<fieldset>
+  <summary>Plain Function, typescript</summary>
 
 ```ts
 export const plainHelperC = (
@@ -72,6 +81,7 @@ export const plainHelperC = (
 };
 ```
 
+
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -80,7 +90,10 @@ export const plainHelperC = (
 />
 ```
 
----
+</fieldset>
+
+<fieldset>
+  <summary>class-based classic Helper, inline Signature</summary>
 
 ```ts
 export class ClassHelperD extends Helper<{
@@ -102,7 +115,10 @@ export class ClassHelperD extends Helper<{
 />
 ```
 
----
+</fieldset>
+
+<fieldset>
+  <summary>class-based classic Helper, referenced Signature (not currently supported)</summary>
 
 ```ts
 interface ESignature {
@@ -118,10 +134,12 @@ export class classHelperE extends Helper<ESignature> {
 }
 ```
 
-```hbs live no-shadow preview below
+```hbs live no-shadow 
 <HelperSignature
   @module='src/browser/private/samples'
   @name='classHelperE'
   @package='kolay'
 />
 ```
+
+</fieldset>
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index b19e0ce9..de8a63c9 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -22,6 +22,29 @@ function getSignature(info: DeclarationReflection) {
     return info.type.typeArguments[0]?.declaration;
   }
 
+/**
+* export class MyHelper extends ...
+*/
+if (Array.isArray(info.extendedTypes) && info.extendedTypes.length > 0) {
+  let firstExtended = info.extendedTypes[0];
+
+/**
+* import Helper from '@ember/component/helper';
+*
+* export class MyHelper extends Helper<{...}>
+*/
+  if (
+    firstExtended?.type === 'reference' &&
+    firstExtended.package === 'ember-source' &&
+    firstExtended.qualifiedName.includes('/helper') &&
+     Array.isArray(firstExtended.typeArguments) &&
+     firstExtended.typeArguments[0] &&
+    'declaration' in firstExtended.typeArguments[0]
+  ){
+    return firstExtended.typeArguments[0].declaration;
+  }
+}
+
   /**
    * export function(...): return;
    */
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 0116efdc..2b43ffdd 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -72,7 +72,8 @@ section {
   margin: 0;
 }
 
-.typedoc-declaration-children {
+.typedoc-declaration-children,
+.typedoc-declaration-children li {
   list-style: none;
   padding: 0 0.5rem;
 }

From a74363441cc7ddff04d3328fbddd81b44bf16886 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 15:23:55 -0400
Subject: [PATCH 16/18] wip

---
 ui/docs/docs/modifier-signature.md    | 91 ++++++++++++++++++++++++++-
 ui/src/samples/-private/modifier.ts   |  8 +++
 ui/src/typedoc/signature/args.gts     | 18 ++++++
 ui/src/typedoc/signature/helper.gts   | 16 +----
 ui/src/typedoc/signature/modifier.gts | 51 +++++++++++++--
 5 files changed, 163 insertions(+), 21 deletions(-)

diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index 1e6398c6..57288565 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -16,7 +16,50 @@ This, along with the other API doc-related components, are powered by [TypeDoc](
 
 ## Supported Signatures
 
-API Reference generated via:
+<fieldset>
+  <summary>Direct Interface</summary>
+
+```ts
+export interface ModifierSignatureA {
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}
+```
+
+```hbs live no-shadow preview below
+<ModifierSignature
+  @module='src/browser/private/samples'
+  @name='ModifierSignatureA'
+  @package='kolay'
+/>
+```
+
+</fieldset>
+
+<fieldset>
+  <summary>function modifier, inline signature</summary>
+
+```ts
+export const functionModifierA = modifier<{
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}>(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(element, positional, named);
+  },
+);
+```
 
 ```hbs live no-shadow preview below
 <ModifierSignature
@@ -26,6 +69,24 @@ API Reference generated via:
 />
 ```
 
+</fieldset>
+
+<fieldset>
+  <summary>function modifier, implicit signature</summary>
+
+```ts
+export const functionModifierB = modifier(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(element, positional, named);
+  },
+);
+
+```
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
@@ -34,6 +95,32 @@ API Reference generated via:
 />
 ```
 
+</fieldset>
+
+<fieldset>
+  <summary>function modifier, ModifierLike</summary>
+
+```ts
+import { ModifierLike } from '@glint/template';
+
+export const functionModifierC: ModifierLike<{
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}> = modifier(
+  (
+    element: HTMLDivElement,
+    positional: [x: number, y: number],
+    named: { invert?: boolean },
+  ) => {
+    // eslint-disable-next-line no-console
+    console.log(element, positional, named);
+  },
+);
+```
+
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
@@ -41,3 +128,5 @@ API Reference generated via:
   @package='kolay'
 />
 ```
+
+</fieldset>
diff --git a/ui/src/samples/-private/modifier.ts b/ui/src/samples/-private/modifier.ts
index cdffd09f..78e0ceb1 100644
--- a/ui/src/samples/-private/modifier.ts
+++ b/ui/src/samples/-private/modifier.ts
@@ -2,6 +2,14 @@ import { modifier } from 'ember-modifier';
 
 import type { ModifierLike } from '@glint/template';
 
+export interface ModifierSignatureA {
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}
+
 export const functionModifierA = modifier<{
   Element: HTMLDivElement;
   Args: {
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index b5d4a2f5..49aac192 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -91,3 +91,21 @@ function flattenArgs(args: any[]): any[] {
 
   return result.flat();
 }
+
+/**
+* Returns args for either a function or signature
+*/
+export function getArgs(info: any) {
+  if ('parameters' in info) {
+    return info.parameters;
+  }
+
+  if (Array.isArray(info)) {
+    return info.find((item) => item.name === 'Args');
+  }
+
+  if ('children' in info) {
+    return getArgs(info.children);
+  }
+}
+
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index de8a63c9..cb1b1283 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -1,6 +1,6 @@
 import { Type } from '../renderer.gts';
 import { Load } from '../utils.gts';
-import { Args } from './args.gts';
+import { Args, getArgs } from './args.gts';
 
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
@@ -58,20 +58,6 @@ if (Array.isArray(info.extendedTypes) && info.extendedTypes.length > 0) {
   return info;
 }
 
-function getArgs(info: any) {
-  if ('parameters' in info) {
-    return info.parameters;
-  }
-
-  if (Array.isArray(info)) {
-    return info.find((item) => item.name === 'Args');
-  }
-
-  if ('children' in info) {
-    return getArgs(info.children);
-  }
-}
-
 function getReturn(info: any) {
   if (info.variant === 'signature') {
     return info.type;
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index 2fc0788c..82102ff9 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -1,11 +1,11 @@
+/** eslint-disable @typescript-eslint/no-unused-vars */
 import { findChildDeclaration, Load } from '../utils.gts';
 import { Args } from './args.gts';
 import { Element } from './element.gts';
 
 import type { TOC } from '@ember/component/template-only';
-import type { DeclarationReflection } from 'typedoc';
 
-function getSignature(info: DeclarationReflection) {
+function getSignatureType(info: any) {
   /**
    * export const Foo: TOC<{ signature here }> = <template> ... </template>
    */
@@ -17,8 +17,34 @@ function getSignature(info: DeclarationReflection) {
   }
 
   /**
-   * export const foo = modifier<Signature>(() => {});
+  * import { modifier } from 'ember-modifier';
+  *
+   * export const foo = modifier<{ ... }>(() => {});
    */
+  /**
+* (implicit signature)
+*
+  * import { modifier } from 'ember-modifier';
+  *
+   * export const foo = modifier(() => {});
+   */
+  if (info.variant === 'declaration' && 'type' in info) {
+    if (info.type.package === 'ember-modifier') {
+      // can't get at the inline signature here
+    }
+
+/**
+* import type { ModifierLike } from '@glint/template';
+*
+* export const X: ModifierLike<{ ... }>
+*/
+if (info.type.package === '@glint/template' && Array.isArray(info.type.typeArguments) && info.type.typeArguments.length > 0) {
+return info.type.typeArguments[0].declaration;
+}
+  }
+
+
+
   if (info.variant === 'declaration' && 'extendedTypes' in info) {
     let extendedType = info.extendedTypes?.[0];
 
@@ -40,6 +66,21 @@ function getSignature(info: DeclarationReflection) {
   return info;
 }
 
+function getSignature(info: any) {
+  let type = getSignatureType(info);
+
+  if (!type) {
+    console.warn('Could not finde signature');
+
+    return;
+  }
+
+  return {
+    Element: findChildDeclaration(type, 'Element'),
+    Args: findChildDeclaration(type, 'Args'),
+  };
+}
+
 export const ModifierSignature: TOC<{
   Args: {
     /**
@@ -63,8 +104,8 @@ export const ModifierSignature: TOC<{
     as |declaration|
   >
     {{#let (getSignature declaration) as |info|}}
-      <Element @kind='modifier' @info={{findChildDeclaration info 'Element'}} />
-      <Args @kind='modifier' @info={{info}} />
+      <Element @kind='modifier' @info={{info.Element}} />
+      <Args @kind='modifier' @info={{info.Args}} />
     {{/let}}
   </Load>
 </template>;

From 2bced35f8a7f3e1ecb8999e09573c7f0d9d30e56 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 17:02:40 -0400
Subject: [PATCH 17/18] lint:fix

---
 docs-app/app/styles/app.css            |  2 +-
 ui/docs/docs/component-signature.md    | 11 ++++---
 ui/docs/docs/helper-signature.md       |  3 +-
 ui/docs/docs/modifier-signature.md     |  2 +-
 ui/src/samples/-private/component.gts  | 11 +++----
 ui/src/typedoc/signature/args.gts      |  5 ++--
 ui/src/typedoc/signature/component.gts | 30 ++++++++++++-------
 ui/src/typedoc/signature/helper.gts    | 40 +++++++++++++-------------
 ui/src/typedoc/signature/modifier.gts  | 34 +++++++++++-----------
 9 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/docs-app/app/styles/app.css b/docs-app/app/styles/app.css
index 8f020739..c906285c 100644
--- a/docs-app/app/styles/app.css
+++ b/docs-app/app/styles/app.css
@@ -20,5 +20,5 @@ fieldset summary {
   font-weight: bold;
   font-style: italic;
   font-size: 1.2rem;
-  border-bottom: 1px solid: #888;
+  border-bottom: 1px solid #888;
 }
diff --git a/ui/docs/docs/component-signature.md b/ui/docs/docs/component-signature.md
index 57061e39..cf64ce40 100644
--- a/ui/docs/docs/component-signature.md
+++ b/ui/docs/docs/component-signature.md
@@ -30,11 +30,10 @@ export interface SignatureA {
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }
 ```
 
-
 ```hbs live no-shadow preview below
 <ComponentSignature
   @module='src/browser/private/samples'
@@ -59,7 +58,7 @@ export class ClassA extends Component<{
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }> {}
 ```
 
@@ -94,10 +93,10 @@ export class ClassB extends Component<SignatureA> {}
   <summary>TemplateOnly w/ Reference (not currently supported)</summary>
 
 ```gts
-export const TemplateOnlyC: TOC<SignatureA> = <template> ... </template>;
+export const TemplateOnlyC: TOC<SignatureA> = <template>...</template>;
 ```
 
-```hbs live no-shadow 
+```hbs live no-shadow
 <ComponentSignature
   @module='src/browser/private/samples'
   @name='TemplateOnlyC'
@@ -121,7 +120,7 @@ export const TemplateOnlyD: TOC<{
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }> = <template>hi</template>;
 ```
 
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 064b0753..5d106457 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -81,7 +81,6 @@ export const plainHelperC = (
 };
 ```
 
-
 ```hbs live no-shadow preview below
 <HelperSignature
   @module='src/browser/private/samples'
@@ -134,7 +133,7 @@ export class classHelperE extends Helper<ESignature> {
 }
 ```
 
-```hbs live no-shadow 
+```hbs live no-shadow
 <HelperSignature
   @module='src/browser/private/samples'
   @name='classHelperE'
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index 57288565..7488fd16 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -85,8 +85,8 @@ export const functionModifierB = modifier(
     console.log(element, positional, named);
   },
 );
-
 ```
+
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
diff --git a/ui/src/samples/-private/component.gts b/ui/src/samples/-private/component.gts
index 1a193ba7..bc9e3eec 100644
--- a/ui/src/samples/-private/component.gts
+++ b/ui/src/samples/-private/component.gts
@@ -13,7 +13,7 @@ export interface SignatureA {
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }
 
 export class ClassA extends Component<{
@@ -26,15 +26,12 @@ export class ClassA extends Component<{
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }> {}
 
-
 export class ClassB extends Component<SignatureA> {}
 
-export const TemplateOnlyC: TOC<SignatureA> = <template>
-  hi there
-</template>;
+export const TemplateOnlyC: TOC<SignatureA> = <template>hi there</template>;
 
 export const TemplateOnlyD: TOC<{
   Element: HTMLDivElement;
@@ -46,5 +43,5 @@ export const TemplateOnlyD: TOC<{
     default: [first: number, second: string];
     namedBlockA: [first: typeof ClassA];
     namedBlockB: [boolean];
-  }
+  };
 }> = <template>hi</template>;
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index 49aac192..1ae7e4b8 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -93,8 +93,8 @@ function flattenArgs(args: any[]): any[] {
 }
 
 /**
-* Returns args for either a function or signature
-*/
+ * Returns args for either a function or signature
+ */
 export function getArgs(info: any) {
   if ('parameters' in info) {
     return info.parameters;
@@ -108,4 +108,3 @@ export function getArgs(info: any) {
     return getArgs(info.children);
   }
 }
-
diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index 6daac7cd..71b9b927 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -6,17 +6,21 @@ import { Element } from './element.gts';
 import type { TOC } from '@ember/component/template-only';
 import type { DeclarationReflection } from 'typedoc';
 
-function lookupReference(reference: any, info: any) {
-  let id = reference.target;
-  let lookup = info.symbolIdMap[id];
+// function lookupReference(reference: any, info: any) {
+//   let id = reference.target;
+//   let lookup = info.symbolIdMap[id];
 
-  let fileName = lookup?.sourceFileName;
-  let name = lookup?.qualifiedName;
+//   let fileName = lookup?.sourceFileName;
+//   let name = lookup?.qualifiedName;
 
-  return findReferenceByFilename(name, fileName, info);
-}
+//   return findReferenceByFilename(name, fileName, info);
+// }
 
-function findReferenceByFilename(name: string, fileName: string, info: any): any {
+function findReferenceByFilename(
+  name: string,
+  fileName: string,
+  info: any,
+): any {
   if (!info.children) return;
 
   for (let child of info.children) {
@@ -26,7 +30,9 @@ function findReferenceByFilename(name: string, fileName: string, info: any): any
 
     if (!child.children) continue;
 
-    let isRelevant = child.children.find(( grandChild: any) => grandChild.sources[0].fileName === fileName);
+    let isRelevant = child.children.find(
+      (grandChild: any) => grandChild.sources[0].fileName === fileName,
+    );
 
     if (isRelevant) {
       return isRelevant;
@@ -68,7 +74,11 @@ function getSignatureType(info: DeclarationReflection, doc: any) {
       if (typeArg?.type === 'reference') {
         if ('symbolIdMap' in doc) {
           // This is hard, maybe typedoc has a util?
-          return findReferenceByFilename(typeArg.name, ( extendedType as any).target.sourceFileName, doc);
+          return findReferenceByFilename(
+            typeArg.name,
+            (extendedType as any).target.sourceFileName,
+            doc,
+          );
         }
       }
     }
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index cb1b1283..268acc0e 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -22,28 +22,28 @@ function getSignature(info: DeclarationReflection) {
     return info.type.typeArguments[0]?.declaration;
   }
 
-/**
-* export class MyHelper extends ...
-*/
-if (Array.isArray(info.extendedTypes) && info.extendedTypes.length > 0) {
-  let firstExtended = info.extendedTypes[0];
+  /**
+   * export class MyHelper extends ...
+   */
+  if (Array.isArray(info.extendedTypes) && info.extendedTypes.length > 0) {
+    let firstExtended = info.extendedTypes[0];
 
-/**
-* import Helper from '@ember/component/helper';
-*
-* export class MyHelper extends Helper<{...}>
-*/
-  if (
-    firstExtended?.type === 'reference' &&
-    firstExtended.package === 'ember-source' &&
-    firstExtended.qualifiedName.includes('/helper') &&
-     Array.isArray(firstExtended.typeArguments) &&
-     firstExtended.typeArguments[0] &&
-    'declaration' in firstExtended.typeArguments[0]
-  ){
-    return firstExtended.typeArguments[0].declaration;
+    /**
+     * import Helper from '@ember/component/helper';
+     *
+     * export class MyHelper extends Helper<{...}>
+     */
+    if (
+      firstExtended?.type === 'reference' &&
+      firstExtended.package === 'ember-source' &&
+      firstExtended.qualifiedName.includes('/helper') &&
+      Array.isArray(firstExtended.typeArguments) &&
+      firstExtended.typeArguments[0] &&
+      'declaration' in firstExtended.typeArguments[0]
+    ) {
+      return firstExtended.typeArguments[0].declaration;
+    }
   }
-}
 
   /**
    * export function(...): return;
diff --git a/ui/src/typedoc/signature/modifier.gts b/ui/src/typedoc/signature/modifier.gts
index 82102ff9..749c1453 100644
--- a/ui/src/typedoc/signature/modifier.gts
+++ b/ui/src/typedoc/signature/modifier.gts
@@ -17,15 +17,15 @@ function getSignatureType(info: any) {
   }
 
   /**
-  * import { modifier } from 'ember-modifier';
-  *
+   * import { modifier } from 'ember-modifier';
+   *
    * export const foo = modifier<{ ... }>(() => {});
    */
   /**
-* (implicit signature)
-*
-  * import { modifier } from 'ember-modifier';
-  *
+   * (implicit signature)
+   *
+   * import { modifier } from 'ember-modifier';
+   *
    * export const foo = modifier(() => {});
    */
   if (info.variant === 'declaration' && 'type' in info) {
@@ -33,18 +33,20 @@ function getSignatureType(info: any) {
       // can't get at the inline signature here
     }
 
-/**
-* import type { ModifierLike } from '@glint/template';
-*
-* export const X: ModifierLike<{ ... }>
-*/
-if (info.type.package === '@glint/template' && Array.isArray(info.type.typeArguments) && info.type.typeArguments.length > 0) {
-return info.type.typeArguments[0].declaration;
-}
+    /**
+     * import type { ModifierLike } from '@glint/template';
+     *
+     * export const X: ModifierLike<{ ... }>
+     */
+    if (
+      info.type.package === '@glint/template' &&
+      Array.isArray(info.type.typeArguments) &&
+      info.type.typeArguments.length > 0
+    ) {
+      return info.type.typeArguments[0].declaration;
+    }
   }
 
-
-
   if (info.variant === 'declaration' && 'extendedTypes' in info) {
     let extendedType = info.extendedTypes?.[0];
 

From 914971226e55826b7ad48aa856957a4be24bbfda Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 20 Mar 2024 21:09:42 -0400
Subject: [PATCH 18/18] Linting is very helpful

---
 .../components/component-signature-test.gts   | 107 ++++++++++++++-
 .../components/helper-signature-test.gts      | 129 ++++++++++++++++++
 .../components/modifier-signature-test.gts    | 119 ++++++++++++++++
 ui/docs/docs/helper-signature.md              |   4 +-
 ui/docs/docs/modifier-signature.md            |  45 +++---
 ui/src/typedoc/renderer.gts                   |  14 +-
 ui/src/typedoc/signature/args.gts             |   8 +-
 ui/src/typedoc/signature/component.gts        |   4 +-
 ui/src/typedoc/signature/element.gts          |   2 +-
 ui/src/typedoc/signature/helper.gts           |   2 +-
 ui/src/typedoc/styles.css                     |  73 +++++-----
 11 files changed, 430 insertions(+), 77 deletions(-)
 create mode 100644 docs-app/tests/kolay/components/helper-signature-test.gts
 create mode 100644 docs-app/tests/kolay/components/modifier-signature-test.gts

diff --git a/docs-app/tests/kolay/components/component-signature-test.gts b/docs-app/tests/kolay/components/component-signature-test.gts
index 74d2af00..bfca696f 100644
--- a/docs-app/tests/kolay/components/component-signature-test.gts
+++ b/docs-app/tests/kolay/components/component-signature-test.gts
@@ -1,5 +1,5 @@
 import { render } from '@ember/test-helpers';
-import { module, test } from 'qunit';
+import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 
 import { ComponentSignature } from 'kolay';
@@ -13,7 +13,7 @@ module('<ComponentSignature>', function (hooks) {
     manifest: await import('kolay/manifest:virtual'),
   }));
 
-  test('it works', async function (assert) {
+  test('self', async function (assert) {
     await render(
       <template>
         <ComponentSignature
@@ -24,7 +24,110 @@ module('<ComponentSignature>', function (hooks) {
       </template>
     );
 
+    assert.dom().doesNotContainText('Element');
     assert.dom().containsText('Arguments');
     assert.dom().containsText('@package');
+    assert.dom().containsText('@module');
+    assert.dom().containsText('@name');
+    assert.dom().doesNotContainText('Blocks');
+  });
+
+  test('interface', async function (assert) {
+    await render(
+      <template>
+        <ComponentSignature
+          @module="src/browser/private/samples"
+          @name="SignatureA"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().containsText('@foo');
+    assert.dom().containsText('@bar');
+    assert.dom().containsText('Blocks');
+    assert.dom().containsText(':namedBlockA');
+    assert.dom().containsText(':namedBlockB');
+  });
+
+  test('class:inline', async function (assert) {
+    await render(
+      <template>
+        <ComponentSignature @module="src/browser/private/samples" @name="ClassA" @package="kolay" />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().containsText('@foo');
+    assert.dom().containsText('@bar');
+    assert.dom().containsText('Blocks');
+    assert.dom().containsText(':default');
+    assert.dom().containsText(':namedBlockA');
+    assert.dom().containsText(':namedBlockB');
+  });
+
+  skip('class:reference', async function (assert) {
+    await render(
+      <template>
+        <ComponentSignature @module="src/browser/private/samples" @name="ClassB" @package="kolay" />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().containsText('@foo');
+    assert.dom().containsText('@bar');
+    assert.dom().containsText('Blocks');
+    assert.dom().containsText(':namedBlockA');
+    assert.dom().containsText(':namedBlockB');
+  });
+
+  skip('template-only:reference', async function (assert) {
+    await render(
+      <template>
+        <ComponentSignature
+          @module="src/browser/private/samples"
+          @name="TemplateOnlyC"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().containsText('@foo');
+    assert.dom().containsText('@bar');
+    assert.dom().containsText('Blocks');
+    assert.dom().containsText(':namedBlockA');
+    assert.dom().containsText(':namedBlockB');
+  });
+
+  test('template-only:inline', async function (assert) {
+    await render(
+      <template>
+        <ComponentSignature
+          @module="src/browser/private/samples"
+          @name="TemplateOnlyD"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().containsText('@foo');
+    assert.dom().containsText('@bar');
+    assert.dom().containsText('Blocks');
+    assert.dom().containsText(':default');
+    assert.dom().containsText(':namedBlockA');
+    assert.dom().containsText(':namedBlockB');
   });
 });
diff --git a/docs-app/tests/kolay/components/helper-signature-test.gts b/docs-app/tests/kolay/components/helper-signature-test.gts
new file mode 100644
index 00000000..190a847f
--- /dev/null
+++ b/docs-app/tests/kolay/components/helper-signature-test.gts
@@ -0,0 +1,129 @@
+import { render } from '@ember/test-helpers';
+import { module, skip, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+
+import { HelperSignature } from 'kolay';
+
+import { setupKolay } from 'kolay/test-support';
+
+module('<HelperSignature>', function (hooks) {
+  setupRenderingTest(hooks);
+  setupKolay(hooks, async () => ({
+    apiDocs: await import('kolay/api-docs:virtual'),
+    manifest: await import('kolay/manifest:virtual'),
+  }));
+
+  test('self', async function (assert) {
+    // This is not supported
+    await render(
+      <template>
+        <HelperSignature
+          @package="kolay"
+          @module="src/browser/re-exports"
+          @name="HelperSignature"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().doesNotContainText('Arguments');
+    assert.dom().doesNotContainText('@package');
+    assert.dom().doesNotContainText('@module');
+    assert.dom().doesNotContainText('@name');
+    assert.dom().doesNotContainText('Blocks');
+  });
+
+  test('function', async function (assert) {
+    await render(
+      <template>
+        <HelperSignature
+          @module="src/browser/private/samples"
+          @name="plainHelperA"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('the first argument');
+    assert.dom().containsText('the second argument');
+    assert.dom().containsText('Return');
+  });
+
+  test('function:cast:HelperLike', async function (assert) {
+    await render(
+      <template>
+        <HelperSignature
+          @module="src/browser/private/samples"
+          @name="helperLikeB"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('first');
+    assert.dom().containsText('second');
+    assert.dom().containsText('Named');
+    assert.dom().containsText('optional');
+    assert.dom().containsText('Return');
+  });
+
+  test('function:typescript', async function (assert) {
+    await render(
+      <template>
+        <HelperSignature
+          @module="src/browser/private/samples"
+          @name="plainHelperC"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('a');
+    assert.dom().containsText('b');
+    assert.dom().containsText('options', 'has equiv of Named');
+    assert.dom().containsText('optional');
+    assert.dom().containsText('required');
+    assert.dom().containsText('Return');
+  });
+
+  skip('classic class:inline', async function (assert) {
+    await render(
+      <template>
+        <HelperSignature
+          @module="src/browser/private/samples"
+          @name="classHelperD"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('optional');
+    assert.dom().containsText('first');
+    assert.dom().containsText('second');
+    assert.dom().containsText('Named');
+    assert.dom().containsText('Return');
+  });
+
+  skip('classic class:reference', async function (assert) {
+    await render(
+      <template>
+        <HelperSignature
+          @module="src/browser/private/samples"
+          @name="classHelperE"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('optional');
+    assert.dom().containsText('first');
+    assert.dom().containsText('second');
+    assert.dom().containsText('Named');
+    assert.dom().containsText('Return');
+  });
+});
diff --git a/docs-app/tests/kolay/components/modifier-signature-test.gts b/docs-app/tests/kolay/components/modifier-signature-test.gts
new file mode 100644
index 00000000..cb9a3b6d
--- /dev/null
+++ b/docs-app/tests/kolay/components/modifier-signature-test.gts
@@ -0,0 +1,119 @@
+import { render } from '@ember/test-helpers';
+import { module, skip, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+
+import { ModifierSignature } from 'kolay';
+
+import { setupKolay } from 'kolay/test-support';
+
+module('<ModifierSignature>', function (hooks) {
+  setupRenderingTest(hooks);
+  setupKolay(hooks, async () => ({
+    apiDocs: await import('kolay/api-docs:virtual'),
+    manifest: await import('kolay/manifest:virtual'),
+  }));
+
+  test('self', async function (assert) {
+    // This is not supported
+    await render(
+      <template>
+        <ModifierSignature
+          @package="kolay"
+          @module="src/browser/re-exports"
+          @name="ModifierSignature"
+        />
+      </template>
+    );
+
+    assert.dom().doesNotContainText('Element');
+    assert.dom().containsText('Arguments', 'the signatures are similar on purpose');
+    assert.dom().doesNotContainText('@package');
+    assert.dom().doesNotContainText('@module');
+    assert.dom().doesNotContainText('@name');
+    assert.dom().doesNotContainText('Blocks');
+  });
+
+  test('interface', async function (assert) {
+    await render(
+      <template>
+        <ModifierSignature
+          @module="src/browser/private/samples"
+          @name="ModifierSignatureA"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().doesNotContainText('Args');
+    assert.dom().doesNotContainText('Positional');
+    assert.dom().containsText('x');
+    assert.dom().containsText('y');
+    assert.dom().containsText('invert');
+  });
+
+  skip('function:inline', async function (assert) {
+    await render(
+      <template>
+        <ModifierSignature
+          @module="src/browser/private/samples"
+          @name="functionModifierA"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().doesNotContainText('Args');
+    assert.dom().doesNotContainText('Positional');
+    assert.dom().containsText('x');
+    assert.dom().containsText('y');
+    assert.dom().containsText('invert');
+  });
+
+  skip('function:implicit', async function (assert) {
+    await render(
+      <template>
+        <ModifierSignature
+          @module="src/browser/private/samples"
+          @name="functionModifierB"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().doesNotContainText('Args');
+    assert.dom().doesNotContainText('Positional');
+    assert.dom().containsText('x');
+    assert.dom().containsText('y');
+    assert.dom().containsText('invert');
+  });
+
+  test('ModifierLike', async function (assert) {
+    await render(
+      <template>
+        <ModifierSignature
+          @module="src/browser/private/samples"
+          @name="functionModifierC"
+          @package="kolay"
+        />
+      </template>
+    );
+
+    assert.dom().containsText('Element');
+    assert.dom().containsText('HTMLDivElement');
+    assert.dom().containsText('Arguments');
+    assert.dom().doesNotContainText('Args');
+    assert.dom().doesNotContainText('Positional');
+    assert.dom().containsText('x');
+    assert.dom().containsText('y');
+    assert.dom().containsText('invert');
+  });
+});
diff --git a/ui/docs/docs/helper-signature.md b/ui/docs/docs/helper-signature.md
index 5d106457..1ce3ed23 100644
--- a/ui/docs/docs/helper-signature.md
+++ b/ui/docs/docs/helper-signature.md
@@ -92,7 +92,7 @@ export const plainHelperC = (
 </fieldset>
 
 <fieldset>
-  <summary>class-based classic Helper, inline Signature</summary>
+  <summary>class-based classic Helper, inline Signature (not currently supported)</summary>
 
 ```ts
 export class ClassHelperD extends Helper<{
@@ -106,7 +106,7 @@ export class ClassHelperD extends Helper<{
 }
 ```
 
-```hbs live no-shadow preview below
+```hbs live no-shadow
 <HelperSignature
   @module='src/browser/private/samples'
   @name='classHelperD'
diff --git a/ui/docs/docs/modifier-signature.md b/ui/docs/docs/modifier-signature.md
index 7488fd16..f5452f0b 100644
--- a/ui/docs/docs/modifier-signature.md
+++ b/ui/docs/docs/modifier-signature.md
@@ -40,23 +40,24 @@ export interface ModifierSignatureA {
 </fieldset>
 
 <fieldset>
-  <summary>function modifier, inline signature</summary>
+  <summary>function modifier, ModifierLike</summary>
 
 ```ts
-export const functionModifierA = modifier<{
+import { ModifierLike } from '@glint/template';
+
+export const functionModifierC: ModifierLike<{
   Element: HTMLDivElement;
   Args: {
     Positional: [x: number, y: number];
     Named: { invert?: boolean };
   };
-}>(
+}> = modifier(
   (
     element: HTMLDivElement,
     positional: [x: number, y: number],
     named: { invert?: boolean },
   ) => {
-    // eslint-disable-next-line no-console
-    console.log(element, positional, named);
+    /* ... */
   },
 );
 ```
@@ -64,7 +65,7 @@ export const functionModifierA = modifier<{
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
-  @name='functionModifierA'
+  @name='functionModifierC'
   @package='kolay'
 />
 ```
@@ -72,17 +73,22 @@ export const functionModifierA = modifier<{
 </fieldset>
 
 <fieldset>
-  <summary>function modifier, implicit signature</summary>
+  <summary>function modifier, inline signature (not currently supported)</summary>
 
 ```ts
-export const functionModifierB = modifier(
+export const functionModifierA = modifier<{
+  Element: HTMLDivElement;
+  Args: {
+    Positional: [x: number, y: number];
+    Named: { invert?: boolean };
+  };
+}>(
   (
     element: HTMLDivElement,
     positional: [x: number, y: number],
     named: { invert?: boolean },
   ) => {
-    // eslint-disable-next-line no-console
-    console.log(element, positional, named);
+    /* ... */
   },
 );
 ```
@@ -90,7 +96,7 @@ export const functionModifierB = modifier(
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
-  @name='functionModifierB'
+  @name='functionModifierA'
   @package='kolay'
 />
 ```
@@ -98,25 +104,16 @@ export const functionModifierB = modifier(
 </fieldset>
 
 <fieldset>
-  <summary>function modifier, ModifierLike</summary>
+  <summary>function modifier, implicit signature (not currentnly supported)</summary>
 
 ```ts
-import { ModifierLike } from '@glint/template';
-
-export const functionModifierC: ModifierLike<{
-  Element: HTMLDivElement;
-  Args: {
-    Positional: [x: number, y: number];
-    Named: { invert?: boolean };
-  };
-}> = modifier(
+export const functionModifierB = modifier(
   (
     element: HTMLDivElement,
     positional: [x: number, y: number],
     named: { invert?: boolean },
   ) => {
-    // eslint-disable-next-line no-console
-    console.log(element, positional, named);
+    /* ... */
   },
 );
 ```
@@ -124,7 +121,7 @@ export const functionModifierC: ModifierLike<{
 ```hbs live no-shadow preview below
 <ModifierSignature
   @module='src/browser/private/samples'
-  @name='functionModifierC'
+  @name='functionModifierB'
   @package='kolay'
 />
 ```
diff --git a/ui/src/typedoc/renderer.gts b/ui/src/typedoc/renderer.gts
index 21293404..56f68350 100644
--- a/ui/src/typedoc/renderer.gts
+++ b/ui/src/typedoc/renderer.gts
@@ -127,9 +127,9 @@ const Declaration: TOC<{
   };
 }> = <template>
   {{#if @info}}
-    <div class='typedoc-declaration'>
+    <div class='typedoc__declaration'>
       {{#if (not (isIgnored @info.name))}}
-        <span class='typedoc-declaration-name'>{{@info.name}}</span>
+        <span class='typedoc__declaration-name'>{{@info.name}}</span>
       {{/if}}
 
       {{#if (isConst @info)}}
@@ -141,7 +141,7 @@ const Declaration: TOC<{
       {{/if}}
 
       {{#if @info.children}}
-        <ul class='typedoc-declaration-children'>
+        <ul class='typedoc__declaration-children'>
           {{#each @info.children as |child|}}
             <li><Declaration @info={{child}} /></li>
           {{/each}}
@@ -149,7 +149,7 @@ const Declaration: TOC<{
       {{/if}}
 
       {{#if @info.signatures}}
-        <ul class='typedoc-declaration-signatures'>
+        <ul class='typedoc__declaration-signatures'>
           {{#each @info.signatures as |child|}}
             {{! @glint-expect-error }}
             <li><Type @info={{child}} /></li>
@@ -275,7 +275,7 @@ const Reference: TOC<{ info: ReferenceType }> = <template>
 </template>;
 
 const Intrinsic: TOC<{ info: { name: string } }> = <template>
-  <span class='typedoc-intrinsic'>{{@info.name}}</span>
+  <span class='typedoc__intrinsic'>{{@info.name}}</span>
 </template>;
 
 const VoidIntrinsic: TOC<{ info: { name: string } }> = <template>
@@ -292,8 +292,8 @@ const Tuple: TOC<{ Args: { info: TupleType } }> = <template>
 </template>;
 
 export const NamedTuple: TOC<{ Args: { info: NamedTupleMember } }> = <template>
-  <div class='typedoc-named-tuple'>
-    <div class='typedoc-name'>{{@info.name}}</div>
+  <div class='typedoc__named-tuple'>
+    <div class='typedoc__name'>{{@info.name}}</div>
     <Type @info={{@info.element}} />
   </div>
 </template>;
diff --git a/ui/src/typedoc/signature/args.gts b/ui/src/typedoc/signature/args.gts
index 1ae7e4b8..50d37a05 100644
--- a/ui/src/typedoc/signature/args.gts
+++ b/ui/src/typedoc/signature/args.gts
@@ -16,11 +16,11 @@ export const Args: TOC<{
   Args: { kind: 'component' | 'modifier' | 'helper'; info: any };
 }> = <template>
   {{#if @info}}
-    <h3 class='typedoc-heading'>Arguments</h3>
+    <h3 class='typedoc__heading'>Arguments</h3>
     {{#each (listifyArgs @info) as |child|}}
-      <span class='typedoc-{{@kind}}-arg'>
-        <span class='typedoc-{{@kind}}-arg-info'>
-          <pre class='typedoc-name'>{{if
+      <span class='typedoc__{{@kind}}-signature__arg'>
+        <span class='typedoc__{{@kind}}-signature__arg-info'>
+          <pre class='typedoc__name'>{{if
               (isComponent @kind)
               '@'
             }}{{child.name}}</pre>
diff --git a/ui/src/typedoc/signature/component.gts b/ui/src/typedoc/signature/component.gts
index 71b9b927..7a2c397b 100644
--- a/ui/src/typedoc/signature/component.gts
+++ b/ui/src/typedoc/signature/component.gts
@@ -138,12 +138,12 @@ export const ComponentSignature: TOC<{
 
 const Blocks: TOC<{ Args: { info: any } }> = <template>
   {{#if @info}}
-    <h3 class='typedoc-heading'>Blocks</h3>
+    <h3 class='typedoc__heading'>Blocks</h3>
     {{#each @info.type.declaration.children as |child|}}
       <span class='typedoc__component-signature__block'>
         <pre class='typedoc__name'>&lt;:{{child.name}}&gt;</pre>
         {{! <span class='typedoc-category'>Properties </span> }}
-        <div class='typedoc-property'>
+        <div class='typedoc__property'>
           <Type @info={{child.type}} />
           <Comment @info={{child}} />
         </div>
diff --git a/ui/src/typedoc/signature/element.gts b/ui/src/typedoc/signature/element.gts
index 0a4a75ca..edb2ad1e 100644
--- a/ui/src/typedoc/signature/element.gts
+++ b/ui/src/typedoc/signature/element.gts
@@ -17,7 +17,7 @@ export const Element: TOC<{
   Args: { kind: 'component' | 'modifier'; info: any };
 }> = <template>
   {{#if @info}}
-    <h3 class='typedoc-heading typedoc__{{@kind}}-signature__element-header'>
+    <h3 class='typedoc__heading typedoc__{{@kind}}-signature__element-header'>
       <span class='typedoc__name'>{{@info.name}}</span>
       <span class='typedoc__{{@kind}}-signature__element-type'>
         <ExternalLink
diff --git a/ui/src/typedoc/signature/helper.gts b/ui/src/typedoc/signature/helper.gts
index 268acc0e..0f15c61f 100644
--- a/ui/src/typedoc/signature/helper.gts
+++ b/ui/src/typedoc/signature/helper.gts
@@ -75,7 +75,7 @@ function getReturn(info: any) {
 const Return: TOC<{ Args: { info: any } }> = <template>
   {{#if @info}}
     <div class='typedoc__helper__return'>
-      <h3 class='typedoc-heading'>Return</h3>
+      <h3 class='typedoc__heading'>Return</h3>
 
       <Type @info={{@info}} />
     </div>
diff --git a/ui/src/typedoc/styles.css b/ui/src/typedoc/styles.css
index 2b43ffdd..bb54c28d 100644
--- a/ui/src/typedoc/styles.css
+++ b/ui/src/typedoc/styles.css
@@ -1,6 +1,6 @@
 .typedoc__type-link,
 .typedoc__unknown__yield,
-.typedoc-intrinsic {
+.typedoc__intrinsic {
   border: 1px solid #222;
   display: inline-block;
   font-style: italic;
@@ -14,53 +14,55 @@
   padding: 0 0.5rem;
 }
 
-.typedoc-declaration-name {
+.typedoc__declaration-name {
   margin: 0;
   display: inline-block;
   line-height: 1.5rem;
 }
-.typedoc-declaration {
-  .typedoc-declaration-name {
+.typedoc__declaration {
+  .typedoc__declaration-name {
     font-weight: bold;
   }
 }
 section {
-  > .typedoc-declaration {
-    > .typedoc-declaration-name {
+  > .typedoc__declaration {
+    > .typedoc__declaration-name {
       font-size: 1.5rem;
     }
   }
 }
 
-.typedoc-heading {
+.typedoc__heading {
   display: block;
 }
 
-.typedoc-property,
-.typedoc-component-arg {
+.typedoc__property,
+.typedoc__component-signature__arg {
   padding: 0 1rem;
 }
 
-.typedoc-declaration-signatures {
+.typedoc__declaration-signatures {
   list-style: none;
 }
 
-.typedoc-named-tuple,
-.typedoc-component-arg-info,
-.typedoc-helper-arg-info {
+.typedoc__named-tuple,
+.typedoc__component-signature__arg-info,
+.typedoc__helper-signature__arg-info,
+.typedoc__modifier-signature__arg-info {
   display: flex;
   gap: 0.25rem;
   align-items: baseline;
   justify-content: space-between;
 }
-.typedoc-component-arg-info > .typedoc-name,
-.typedoc-helper-arg-info > .typedoc-name {
+.typedoc__component-signature__arg-info > .typedoc__name,
+.typedoc__helper-signature__arg-info > .typedoc__name,
+.typedoc__modifier-signature__arg-info > .typedoc__name {
   display: inline-block;
   margin: 0;
   font-size: 1rem;
   font-weight: bold;
 }
-.typedoc-helper-arg-info {
+.typedoc__helper-signature__arg-info {
   border-bottom: 1px rgba(125, 125, 125, 0.5) dashed;
 }
 .typedoc__helper__return {
@@ -68,12 +70,12 @@ section {
   align-items: center;
   justify-content: space-between;
 }
-.typedoc__helper__return > .typedoc-heading {
+.typedoc__helper__return > .typedoc__heading {
   margin: 0;
 }
 
-.typedoc-declaration-children,
-.typedoc-declaration-children li {
+.typedoc__declaration-children,
+.typedoc__declaration-children li {
   list-style: none;
   padding: 0 0.5rem;
 }
@@ -121,34 +123,36 @@ section {
 }
 
 .typedoc__component-signature__block
-  .typedoc-declaration-name
-  + .typedoc-reference {
+  .typedoc__declaration-name
+  + .typedoc__reference {
   margin-bottom: -0.25rem;
 }
 .typedoc__component-signature__block
-  > .typedoc-property
-  .typedoc-declaration-children {
+  > .typedoc__property
+  .typedoc__declaration-children {
   display: grid;
   gap: 0.5rem;
 }
 .typedoc__component-signature__block
-  > .typedoc-property
-  > .typedoc-declaration
-  > ul.typedoc-declaration-children
+  > .typedoc__property
+  > .typedoc__declaration
+  > ul.typedoc__declaration-children
   > li
-  > .typedoc-declaration {
+  > .typedoc__declaration {
   border: 1px solid lightgray;
   padding: 0.5rem;
 }
 
-.typedoc-helper-arg,
-.typedoc-component-arg {
+.typedoc__helper-signature__arg,
+.typedoc__modifier-signature__arg,
+.typedoc__component-signature__arg {
   margin-bottom: 0.5rem;
   display: grid;
   gap: 0.25rem;
 }
-.typedoc-helper-arg > .typedoc-name,
-.typedoc-component-arg > .typedoc-name,
+.typedoc__helper-signature__arg > .typedoc__name,
+.typedoc__modifier-signature__arg > .typedoc__name,
+.typedoc__component-signature__arg > .typedoc__name,
 .typedoc__component-signature__block > .typedoc__name {
   font-size: 1.2rem;
   overflow-y: hidden;
@@ -158,8 +162,9 @@ section {
   max-height: unset;
 }
 
-.typedoc-helper-arg .typedoc-rendered-comment p,
-.typedoc-component-arg .typedoc-rendered-comment p {
+.typedoc__helper-signature__arg .typedoc-rendered-comment p,
+.typedoc__modifier-signature__arg .typedoc-rendered-comment p,
+.typedoc__component-signature__arg .typedoc-rendered-comment p {
   margin-top: 0;
   margin-bottom: 0.25rem;
 }
@@ -191,7 +196,7 @@ section {
 /**
  * Array formatting
  */
-.typedoc__array > div.typedoc-declaration > ul.typedoc-declaration-children {
+.typedoc__array > div.typedoc__declaration > ul.typedoc__declaration-children {
   border: 1px solid;
   margin: 0;
 }