@aerogel/core 0.0.0-next.f9394854509d71d644498ac087706a2f8f8eea1c → 0.0.0-next.fb0f08b1df2e4aff5b34e23b9927b06b58484c98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (207) hide show
  1. package/dist/aerogel-core.css +1 -0
  2. package/dist/aerogel-core.d.ts +2054 -1811
  3. package/dist/aerogel-core.js +3541 -0
  4. package/dist/aerogel-core.js.map +1 -0
  5. package/package.json +32 -37
  6. package/src/bootstrap/bootstrap.test.ts +4 -7
  7. package/src/bootstrap/index.ts +21 -19
  8. package/src/bootstrap/options.ts +1 -1
  9. package/src/components/AppLayout.vue +14 -0
  10. package/src/components/{AGAppModals.vue → AppModals.vue} +3 -4
  11. package/src/components/AppOverlays.vue +9 -0
  12. package/src/components/AppToasts.vue +16 -0
  13. package/src/components/contracts/AlertModal.ts +19 -0
  14. package/src/components/contracts/Button.ts +16 -0
  15. package/src/components/contracts/ConfirmModal.ts +48 -0
  16. package/src/components/contracts/DropdownMenu.ts +25 -0
  17. package/src/components/contracts/ErrorReportModal.ts +33 -0
  18. package/src/components/contracts/Input.ts +26 -0
  19. package/src/components/contracts/LoadingModal.ts +26 -0
  20. package/src/components/contracts/Modal.ts +21 -0
  21. package/src/components/contracts/PromptModal.ts +34 -0
  22. package/src/components/contracts/Select.ts +45 -0
  23. package/src/components/contracts/Toast.ts +15 -0
  24. package/src/components/contracts/index.ts +11 -0
  25. package/src/components/headless/HeadlessButton.vue +51 -0
  26. package/src/components/headless/HeadlessInput.vue +59 -0
  27. package/src/components/headless/{forms/AGHeadlessInputDescription.vue → HeadlessInputDescription.vue} +7 -8
  28. package/src/components/headless/{forms/AGHeadlessInputError.vue → HeadlessInputError.vue} +4 -8
  29. package/src/components/headless/{forms/AGHeadlessInputInput.vue → HeadlessInputInput.vue} +17 -26
  30. package/src/components/headless/{forms/AGHeadlessInputLabel.vue → HeadlessInputLabel.vue} +3 -7
  31. package/src/components/headless/{forms/AGHeadlessInputTextArea.vue → HeadlessInputTextArea.vue} +10 -13
  32. package/src/components/headless/HeadlessModal.vue +57 -0
  33. package/src/components/headless/HeadlessModalContent.vue +30 -0
  34. package/src/components/headless/HeadlessModalDescription.vue +12 -0
  35. package/src/components/headless/HeadlessModalOverlay.vue +12 -0
  36. package/src/components/headless/HeadlessModalTitle.vue +12 -0
  37. package/src/components/headless/HeadlessSelect.vue +120 -0
  38. package/src/components/headless/{forms/AGHeadlessSelectError.vue → HeadlessSelectError.vue} +5 -6
  39. package/src/components/headless/HeadlessSelectLabel.vue +25 -0
  40. package/src/components/headless/HeadlessSelectOption.vue +34 -0
  41. package/src/components/headless/HeadlessSelectOptions.vue +42 -0
  42. package/src/components/headless/HeadlessSelectTrigger.vue +22 -0
  43. package/src/components/headless/HeadlessSelectValue.vue +18 -0
  44. package/src/components/headless/HeadlessSwitch.vue +96 -0
  45. package/src/components/headless/HeadlessToast.vue +18 -0
  46. package/src/components/headless/HeadlessToastAction.vue +13 -0
  47. package/src/components/headless/index.ts +20 -3
  48. package/src/components/index.ts +6 -11
  49. package/src/components/ui/AdvancedOptions.vue +18 -0
  50. package/src/components/ui/AlertModal.vue +17 -0
  51. package/src/components/ui/Button.vue +100 -0
  52. package/src/components/ui/Checkbox.vue +56 -0
  53. package/src/components/ui/ConfirmModal.vue +50 -0
  54. package/src/components/ui/DropdownMenu.vue +32 -0
  55. package/src/components/ui/DropdownMenuOption.vue +22 -0
  56. package/src/components/ui/DropdownMenuOptions.vue +44 -0
  57. package/src/components/ui/EditableContent.vue +82 -0
  58. package/src/components/ui/ErrorLogs.vue +19 -0
  59. package/src/components/ui/ErrorLogsModal.vue +48 -0
  60. package/src/components/ui/ErrorMessage.vue +15 -0
  61. package/src/components/ui/ErrorReportModal.vue +73 -0
  62. package/src/components/{modals/AGErrorReportModalButtons.vue → ui/ErrorReportModalButtons.vue} +34 -27
  63. package/src/components/ui/ErrorReportModalTitle.vue +24 -0
  64. package/src/components/{forms/AGForm.vue → ui/Form.vue} +4 -5
  65. package/src/components/ui/Input.vue +56 -0
  66. package/src/components/ui/Link.vue +12 -0
  67. package/src/components/ui/LoadingModal.vue +34 -0
  68. package/src/components/ui/Markdown.vue +97 -0
  69. package/src/components/ui/Modal.vue +123 -0
  70. package/src/components/ui/ModalContext.vue +31 -0
  71. package/src/components/ui/ProgressBar.vue +51 -0
  72. package/src/components/ui/PromptModal.vue +38 -0
  73. package/src/components/ui/Select.vue +27 -0
  74. package/src/components/ui/SelectLabel.vue +21 -0
  75. package/src/components/ui/SelectOption.vue +29 -0
  76. package/src/components/ui/SelectOptions.vue +35 -0
  77. package/src/components/ui/SelectTrigger.vue +29 -0
  78. package/src/components/ui/SettingsModal.vue +15 -0
  79. package/src/components/{lib/AGStartupCrash.vue → ui/StartupCrash.vue} +8 -8
  80. package/src/components/ui/Switch.vue +11 -0
  81. package/src/components/ui/Toast.vue +46 -0
  82. package/src/components/ui/index.ts +33 -0
  83. package/src/directives/index.ts +9 -5
  84. package/src/directives/measure.ts +12 -6
  85. package/src/errors/Errors.state.ts +1 -1
  86. package/src/errors/Errors.ts +29 -27
  87. package/src/errors/JobCancelledError.ts +3 -0
  88. package/src/errors/index.ts +9 -6
  89. package/src/errors/utils.ts +1 -1
  90. package/src/forms/{Form.test.ts → FormController.test.ts} +32 -8
  91. package/src/forms/{Form.ts → FormController.ts} +42 -38
  92. package/src/forms/index.ts +2 -3
  93. package/src/forms/utils.ts +35 -35
  94. package/src/index.css +73 -0
  95. package/src/jobs/Job.ts +144 -2
  96. package/src/jobs/index.ts +4 -1
  97. package/src/jobs/listeners.ts +3 -0
  98. package/src/jobs/status.ts +4 -0
  99. package/src/lang/DefaultLangProvider.ts +7 -4
  100. package/src/lang/Lang.state.ts +1 -1
  101. package/src/lang/Lang.ts +1 -1
  102. package/src/lang/index.ts +12 -6
  103. package/src/lang/settings/Debug.vue +39 -0
  104. package/src/lang/settings/Language.vue +48 -0
  105. package/src/lang/settings/index.ts +15 -0
  106. package/src/plugins/Plugin.ts +1 -1
  107. package/src/plugins/index.ts +10 -7
  108. package/src/services/App.state.ts +23 -4
  109. package/src/services/App.ts +16 -3
  110. package/src/services/Cache.ts +1 -1
  111. package/src/services/Events.test.ts +8 -8
  112. package/src/services/Events.ts +16 -12
  113. package/src/services/Service.ts +116 -53
  114. package/src/services/Storage.ts +20 -0
  115. package/src/services/index.ts +14 -5
  116. package/src/services/utils.ts +18 -0
  117. package/src/testing/index.ts +4 -3
  118. package/src/testing/setup.ts +5 -13
  119. package/src/ui/UI.state.ts +8 -13
  120. package/src/ui/UI.ts +209 -123
  121. package/src/ui/index.ts +27 -28
  122. package/src/utils/classes.ts +41 -0
  123. package/src/utils/composition/events.ts +4 -6
  124. package/src/utils/composition/forms.ts +20 -4
  125. package/src/utils/composition/persistent.test.ts +33 -0
  126. package/src/utils/composition/persistent.ts +11 -0
  127. package/src/utils/composition/state.test.ts +47 -0
  128. package/src/utils/composition/state.ts +33 -0
  129. package/src/utils/index.ts +5 -1
  130. package/src/utils/markdown.test.ts +50 -0
  131. package/src/utils/markdown.ts +53 -6
  132. package/src/utils/types.ts +3 -0
  133. package/src/utils/vue.ts +38 -141
  134. package/dist/aerogel-core.cjs.js +0 -2
  135. package/dist/aerogel-core.cjs.js.map +0 -1
  136. package/dist/aerogel-core.esm.js +0 -2
  137. package/dist/aerogel-core.esm.js.map +0 -1
  138. package/histoire.config.ts +0 -7
  139. package/noeldemartin.config.js +0 -5
  140. package/postcss.config.js +0 -6
  141. package/src/assets/histoire.css +0 -3
  142. package/src/components/AGAppLayout.vue +0 -16
  143. package/src/components/AGAppOverlays.vue +0 -41
  144. package/src/components/AGAppSnackbars.vue +0 -13
  145. package/src/components/composition.ts +0 -23
  146. package/src/components/constants.ts +0 -8
  147. package/src/components/forms/AGButton.vue +0 -44
  148. package/src/components/forms/AGCheckbox.vue +0 -41
  149. package/src/components/forms/AGInput.vue +0 -40
  150. package/src/components/forms/AGSelect.story.vue +0 -46
  151. package/src/components/forms/AGSelect.vue +0 -60
  152. package/src/components/forms/index.ts +0 -5
  153. package/src/components/headless/forms/AGHeadlessButton.ts +0 -3
  154. package/src/components/headless/forms/AGHeadlessButton.vue +0 -62
  155. package/src/components/headless/forms/AGHeadlessInput.ts +0 -34
  156. package/src/components/headless/forms/AGHeadlessInput.vue +0 -70
  157. package/src/components/headless/forms/AGHeadlessSelect.ts +0 -42
  158. package/src/components/headless/forms/AGHeadlessSelect.vue +0 -77
  159. package/src/components/headless/forms/AGHeadlessSelectButton.vue +0 -24
  160. package/src/components/headless/forms/AGHeadlessSelectLabel.vue +0 -24
  161. package/src/components/headless/forms/AGHeadlessSelectOption.ts +0 -4
  162. package/src/components/headless/forms/AGHeadlessSelectOption.vue +0 -39
  163. package/src/components/headless/forms/AGHeadlessSelectOptions.ts +0 -3
  164. package/src/components/headless/forms/composition.ts +0 -10
  165. package/src/components/headless/forms/index.ts +0 -18
  166. package/src/components/headless/modals/AGHeadlessModal.ts +0 -34
  167. package/src/components/headless/modals/AGHeadlessModal.vue +0 -86
  168. package/src/components/headless/modals/AGHeadlessModalPanel.vue +0 -28
  169. package/src/components/headless/modals/AGHeadlessModalTitle.vue +0 -13
  170. package/src/components/headless/modals/index.ts +0 -4
  171. package/src/components/headless/snackbars/AGHeadlessSnackbar.vue +0 -10
  172. package/src/components/headless/snackbars/index.ts +0 -40
  173. package/src/components/interfaces.ts +0 -24
  174. package/src/components/lib/AGErrorMessage.vue +0 -16
  175. package/src/components/lib/AGLink.vue +0 -9
  176. package/src/components/lib/AGMarkdown.vue +0 -41
  177. package/src/components/lib/AGMeasured.vue +0 -16
  178. package/src/components/lib/index.ts +0 -5
  179. package/src/components/modals/AGAlertModal.ts +0 -15
  180. package/src/components/modals/AGAlertModal.vue +0 -14
  181. package/src/components/modals/AGConfirmModal.ts +0 -33
  182. package/src/components/modals/AGConfirmModal.vue +0 -26
  183. package/src/components/modals/AGErrorReportModal.ts +0 -46
  184. package/src/components/modals/AGErrorReportModal.vue +0 -54
  185. package/src/components/modals/AGErrorReportModalTitle.vue +0 -25
  186. package/src/components/modals/AGLoadingModal.ts +0 -23
  187. package/src/components/modals/AGLoadingModal.vue +0 -15
  188. package/src/components/modals/AGModal.ts +0 -10
  189. package/src/components/modals/AGModal.vue +0 -39
  190. package/src/components/modals/AGModalContext.ts +0 -8
  191. package/src/components/modals/AGModalContext.vue +0 -22
  192. package/src/components/modals/AGModalTitle.vue +0 -9
  193. package/src/components/modals/AGPromptModal.ts +0 -36
  194. package/src/components/modals/AGPromptModal.vue +0 -34
  195. package/src/components/modals/index.ts +0 -17
  196. package/src/components/snackbars/AGSnackbar.vue +0 -36
  197. package/src/components/snackbars/index.ts +0 -3
  198. package/src/components/utils.ts +0 -10
  199. package/src/directives/initial-focus.ts +0 -11
  200. package/src/forms/composition.ts +0 -6
  201. package/src/main.histoire.ts +0 -1
  202. package/src/utils/tailwindcss.test.ts +0 -26
  203. package/src/utils/tailwindcss.ts +0 -7
  204. package/tailwind.config.js +0 -4
  205. package/tsconfig.json +0 -11
  206. package/vite.config.ts +0 -17
  207. /package/src/{main.ts → index.ts} +0 -0
package/src/lang/index.ts CHANGED
@@ -1,10 +1,14 @@
1
- import { bootServices } from '@/services';
2
- import { definePlugin } from '@/plugins';
1
+ import App from '@aerogel/core/services/App';
2
+ import { bootServices } from '@aerogel/core/services';
3
+ import { definePlugin } from '@aerogel/core/plugins';
3
4
 
4
- import Lang, { LangProvider } from './Lang';
5
+ import Lang from './Lang';
6
+ import settings from './settings';
7
+ import type { LangProvider } from './Lang';
5
8
  import { translate, translateWithDefault } from './utils';
6
9
 
7
- export { Lang, LangProvider, translate, translateWithDefault };
10
+ export { Lang, translate, translateWithDefault };
11
+ export type { LangProvider };
8
12
 
9
13
  const services = { $lang: Lang };
10
14
 
@@ -15,15 +19,17 @@ export default definePlugin({
15
19
  app.config.globalProperties.$t ??= translate;
16
20
  app.config.globalProperties.$td = translateWithDefault;
17
21
 
22
+ settings.forEach((setting) => App.addSetting(setting));
23
+
18
24
  await bootServices(app, services);
19
25
  },
20
26
  });
21
27
 
22
- declare module '@/services' {
28
+ declare module '@aerogel/core/services' {
23
29
  export interface Services extends LangServices {}
24
30
  }
25
31
 
26
- declare module '@vue/runtime-core' {
32
+ declare module 'vue' {
27
33
  interface ComponentCustomProperties {
28
34
  $td: typeof translateWithDefault;
29
35
  }
@@ -0,0 +1,39 @@
1
+ <template>
2
+ <div class="mt-4 flex flex-row">
3
+ <div class="flex-grow">
4
+ <h3 id="debug-setting" class="text-base font-semibold">
5
+ {{ $td('settings.debug', 'Debugging') }}
6
+ </h3>
7
+ <Markdown
8
+ lang-key="settings.debugDescription"
9
+ lang-default="Enable debugging with [Eruda](https://eruda.liriliri.io/)."
10
+ class="mt-1 text-sm text-gray-500"
11
+ />
12
+ </div>
13
+
14
+ <Switch v-model="enabled" aria-labelledby="debug-setting" />
15
+ </div>
16
+ </template>
17
+
18
+ <script setup lang="ts">
19
+ import { ref, watchEffect } from 'vue';
20
+ import type Eruda from 'eruda';
21
+
22
+ import Switch from '@aerogel/core/components/ui/Switch.vue';
23
+ import Markdown from '@aerogel/core/components/ui/Markdown.vue';
24
+
25
+ let eruda: typeof Eruda | null = null;
26
+ const enabled = ref(false);
27
+
28
+ watchEffect(async () => {
29
+ if (!enabled.value) {
30
+ eruda?.destroy();
31
+
32
+ return;
33
+ }
34
+
35
+ eruda ??= (await import('eruda')).default;
36
+
37
+ eruda.init();
38
+ });
39
+ </script>
@@ -0,0 +1,48 @@
1
+ <template>
2
+ <Select
3
+ v-model="$lang.locale"
4
+ class="flex flex-col items-start md:flex-row"
5
+ as="div"
6
+ :options
7
+ :render-option="renderLocale"
8
+ >
9
+ <div class="grow">
10
+ <SelectLabel class="text-base font-semibold">
11
+ {{ $td('settings.locale', 'Language') }}
12
+ </SelectLabel>
13
+ <Markdown
14
+ lang-key="settings.localeDescription"
15
+ lang-default="Choose the application's language."
16
+ class="mt-1 text-sm text-gray-500"
17
+ />
18
+ </div>
19
+ <Button variant="ghost" :as="SelectTrigger" class="grid w-auto outline-none" />
20
+ <SelectOptions />
21
+ </Select>
22
+ </template>
23
+
24
+ <script setup lang="ts">
25
+ import Aerogel from 'virtual:aerogel';
26
+
27
+ import { computed } from 'vue';
28
+
29
+ import Markdown from '@aerogel/core/components/ui/Markdown.vue';
30
+ import Button from '@aerogel/core/components/ui/Button.vue';
31
+ import Select from '@aerogel/core/components/ui/Select.vue';
32
+ import SelectLabel from '@aerogel/core/components/ui/SelectLabel.vue';
33
+ import SelectTrigger from '@aerogel/core/components/ui/SelectTrigger.vue';
34
+ import SelectOptions from '@aerogel/core/components/ui/SelectOptions.vue';
35
+ import { Lang, translateWithDefault } from '@aerogel/core/lang';
36
+
37
+ const browserLocale = Lang.getBrowserLocale();
38
+ const options = computed(() => [null, ...Lang.locales]);
39
+
40
+ function renderLocale(locale: string | null): string {
41
+ return (
42
+ (locale && Aerogel.locales[locale]) ??
43
+ translateWithDefault('settings.localeDefault', '{locale} (default)', {
44
+ locale: Aerogel.locales[browserLocale] ?? browserLocale,
45
+ })
46
+ );
47
+ }
48
+ </script>
@@ -0,0 +1,15 @@
1
+ import { defineSettings } from '@aerogel/core/services';
2
+
3
+ import Debug from './Debug.vue';
4
+ import Language from './Language.vue';
5
+
6
+ export default defineSettings([
7
+ {
8
+ priority: 10,
9
+ component: Debug,
10
+ },
11
+ {
12
+ priority: 100,
13
+ component: Language,
14
+ },
15
+ ]);
@@ -1,6 +1,6 @@
1
1
  import type { App } from 'vue';
2
2
 
3
- import type { AerogelOptions } from '@/bootstrap/options';
3
+ import type { AerogelOptions } from '@aerogel/core/bootstrap/options';
4
4
 
5
5
  export interface Plugin {
6
6
  name?: string;
@@ -1,6 +1,6 @@
1
1
  import type { GetClosureArgs } from '@noeldemartin/utils';
2
2
 
3
- import App from '@/services/App';
3
+ import App from '@aerogel/core/services/App';
4
4
 
5
5
  import type { Plugin } from './Plugin';
6
6
 
@@ -13,13 +13,16 @@ export function definePlugin<T extends Plugin>(plugin: T): T {
13
13
  export async function installPlugins(plugins: Plugin[], ...args: GetClosureArgs<Plugin['install']>): Promise<void> {
14
14
  App.setState(
15
15
  'plugins',
16
- plugins.reduce((pluginsMap, plugin) => {
17
- if (plugin.name) {
18
- pluginsMap[plugin.name] = plugin;
19
- }
16
+ plugins.reduce(
17
+ (pluginsMap, plugin) => {
18
+ if (plugin.name) {
19
+ pluginsMap[plugin.name] = plugin;
20
+ }
20
21
 
21
- return pluginsMap;
22
- }, {} as Record<string, Plugin>),
22
+ return pluginsMap;
23
+ },
24
+ {} as Record<string, Plugin>,
25
+ ),
23
26
  );
24
27
 
25
28
  await Promise.all(plugins.map((plugin) => plugin.install(...args)) ?? []);
@@ -1,30 +1,49 @@
1
1
  import Aerogel from 'virtual:aerogel';
2
2
 
3
- import { defineServiceState } from '@/services/Service';
4
- import type { Plugin } from '@/plugins/Plugin';
3
+ import { getEnv } from '@noeldemartin/utils';
4
+ import type { App, Component } from 'vue';
5
+
6
+ import { defineServiceState } from '@aerogel/core/services/Service';
7
+ import type { Plugin } from '@aerogel/core/plugins/Plugin';
8
+
9
+ export interface AppSetting {
10
+ component: Component;
11
+ priority: number;
12
+ }
13
+
14
+ export function defineSettings<T extends AppSetting[]>(settings: T): T {
15
+ return settings;
16
+ }
5
17
 
6
18
  export default defineServiceState({
7
19
  name: 'app',
8
20
  initialState: {
9
21
  plugins: {} as Record<string, Plugin>,
10
- environment: Aerogel.environment,
22
+ instance: null as App | null,
23
+ environment: getEnv() ?? 'development',
11
24
  version: Aerogel.version,
12
25
  sourceUrl: Aerogel.sourceUrl,
26
+ settings: [] as AppSetting[],
13
27
  },
14
28
  computed: {
15
29
  development: (state) => state.environment === 'development',
30
+ staging: (state) => state.environment === 'staging',
16
31
  testing: (state) => state.environment === 'test' || state.environment === 'testing',
17
32
  versionName(state): string {
18
33
  if (this.development) {
19
34
  return 'dev.' + Aerogel.sourceHash.toString().substring(0, 7);
20
35
  }
21
36
 
37
+ if (this.staging) {
38
+ return 'staging.' + Aerogel.sourceHash.toString().substring(0, 7);
39
+ }
40
+
22
41
  return `v${state.version}`;
23
42
  },
24
43
  versionUrl(state): string {
25
44
  return (
26
45
  state.sourceUrl +
27
- (this.development ? `/tree/${Aerogel.sourceHash}` : `/releases/tag/${this.versionName}`)
46
+ (this.development || this.staging ? `/tree/${Aerogel.sourceHash}` : `/releases/tag/${this.versionName}`)
28
47
  );
29
48
  },
30
49
  },
@@ -1,12 +1,17 @@
1
1
  import Aerogel from 'virtual:aerogel';
2
2
 
3
3
  import { PromisedValue, facade, forever, updateLocationQueryParameters } from '@noeldemartin/utils';
4
+ import { markRaw } from 'vue';
4
5
 
5
- import Events from '@/services/Events';
6
- import type { Plugin } from '@/plugins';
6
+ import Events from '@aerogel/core/services/Events';
7
+ import type { Plugin } from '@aerogel/core/plugins';
8
+ import type { AppSetting, Services } from '@aerogel/core/services';
7
9
 
8
10
  import Service from './App.state';
9
11
 
12
+ export { defineSettings } from './App.state';
13
+ export type { AppSetting } from './App.state';
14
+
10
15
  export class AppService extends Service {
11
16
 
12
17
  public readonly name = Aerogel.name;
@@ -21,6 +26,10 @@ export class AppService extends Service {
21
26
  return this.mounted.isResolved();
22
27
  }
23
28
 
29
+ public addSetting(setting: AppSetting): void {
30
+ this.settings.push(markRaw(setting));
31
+ }
32
+
24
33
  public async whenReady<T>(callback: () => T): Promise<T> {
25
34
  const result = await this.ready.then(callback);
26
35
 
@@ -40,7 +49,11 @@ export class AppService extends Service {
40
49
  return (this.plugins[name] as T) ?? null;
41
50
  }
42
51
 
43
- protected async boot(): Promise<void> {
52
+ public service<T extends keyof Services>(name: T): Services[T] | null {
53
+ return this.instance?.config.globalProperties[name] ?? null;
54
+ }
55
+
56
+ protected override async boot(): Promise<void> {
44
57
  Events.once('application-ready', () => this.ready.resolve());
45
58
  Events.once('application-mounted', () => this.mounted.resolve());
46
59
  }
@@ -1,6 +1,6 @@
1
1
  import { PromisedValue, facade, tap } from '@noeldemartin/utils';
2
2
 
3
- import Service from '@/services/Service';
3
+ import Service from '@aerogel/core/services/Service';
4
4
 
5
5
  export class CacheService extends Service {
6
6
 
@@ -10,12 +10,12 @@ describe('Events', () => {
10
10
  // Arrange
11
11
  let counter = 0;
12
12
 
13
- Events.on('trigger', () => counter++);
13
+ Events.on('application-mounted', () => counter++);
14
14
 
15
15
  // Act
16
- await Events.emit('trigger');
17
- await Events.emit('trigger');
18
- await Events.emit('trigger');
16
+ await Events.emit('application-mounted');
17
+ await Events.emit('application-mounted');
18
+ await Events.emit('application-mounted');
19
19
 
20
20
  // Assert
21
21
  expect(counter).toEqual(3);
@@ -25,12 +25,12 @@ describe('Events', () => {
25
25
  // Arrange
26
26
  const storage: string[] = [];
27
27
 
28
- Events.on('trigger', () => storage.push('second'));
29
- Events.on('trigger', { priority: EventListenerPriorities.Low }, () => storage.push('third'));
30
- Events.on('trigger', { priority: EventListenerPriorities.High }, () => storage.push('first'));
28
+ Events.on('application-mounted', () => storage.push('second'));
29
+ Events.on('application-mounted', { priority: EventListenerPriorities.Low }, () => storage.push('third'));
30
+ Events.on('application-mounted', { priority: EventListenerPriorities.High }, () => storage.push('first'));
31
31
 
32
32
  // Act
33
- await Events.emit('trigger');
33
+ await Events.emit('application-mounted');
34
34
 
35
35
  // Assert
36
36
  expect(storage).toEqual(['first', 'second', 'third']);
@@ -1,16 +1,15 @@
1
1
  import { arrayRemove, facade, fail, tap } from '@noeldemartin/utils';
2
2
 
3
- import Service from '@/services/Service';
3
+ import Service from '@aerogel/core/services/Service';
4
4
 
5
5
  export interface EventsPayload {}
6
6
  export interface EventListenerOptions {
7
- priority: number;
7
+ priority: EventListenerPriority;
8
8
  }
9
9
  export type AerogelGlobalEvents = Partial<{ [Event in EventWithoutPayload]: () => unknown }> &
10
10
  Partial<{ [Event in EventWithPayload]: EventListener<EventsPayload[Event]> }>;
11
11
 
12
12
  export type EventListener<T = unknown> = (payload: T) => unknown;
13
- export type UnknownEvent<T> = T extends keyof EventsPayload ? never : T;
14
13
 
15
14
  export type EventWithoutPayload = {
16
15
  [K in keyof EventsPayload]: EventsPayload[K] extends void ? K : never;
@@ -26,18 +25,20 @@ export const EventListenerPriorities = {
26
25
  High: 256,
27
26
  } as const;
28
27
 
28
+ export type EventListenerPriority = (typeof EventListenerPriorities)[keyof typeof EventListenerPriorities];
29
+
29
30
  export class EventsService extends Service {
30
31
 
31
32
  private listeners: Record<string, { priorities: number[]; handlers: Record<number, EventListener[]> }> = {};
32
33
 
33
- protected async boot(): Promise<void> {
34
+ protected override async boot(): Promise<void> {
34
35
  Object.entries(globalThis.__aerogelEvents__ ?? {}).forEach(([event, listener]) =>
35
- this.on(event as string, listener as EventListener));
36
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
37
+ this.on(event as any, listener as EventListener));
36
38
  }
37
39
 
38
40
  public emit<Event extends EventWithoutPayload>(event: Event): Promise<void>;
39
41
  public emit<Event extends EventWithPayload>(event: Event, payload: EventsPayload[Event]): Promise<void>;
40
- public emit<Event extends string>(event: UnknownEvent<Event>, payload?: unknown): Promise<void>;
41
42
  public async emit(event: string, payload?: unknown): Promise<void> {
42
43
  const listeners = this.listeners[event] ?? { priorities: [], handlers: {} };
43
44
 
@@ -48,19 +49,24 @@ export class EventsService extends Service {
48
49
 
49
50
  /* eslint-disable max-len */
50
51
  public on<Event extends EventWithoutPayload>(event: Event, listener: () => unknown): () => void;
52
+ public on<Event extends EventWithoutPayload>(event: Event, priority: EventListenerPriority, listener: () => unknown): () => void; // prettier-ignore
51
53
  public on<Event extends EventWithoutPayload>(event: Event, options: Partial<EventListenerOptions>, listener: () => unknown): () => void; // prettier-ignore
52
54
  public on<Event extends EventWithPayload>(event: Event, listener: EventListener<EventsPayload[Event]>): () => void | void; // prettier-ignore
55
+ public on<Event extends EventWithPayload>(event: Event, priority: EventListenerPriority, listener: EventListener<EventsPayload[Event]>): () => void | void; // prettier-ignore
53
56
  public on<Event extends EventWithPayload>(event: Event, options: Partial<EventListenerOptions>, listener: EventListener<EventsPayload[Event]>): () => void | void; // prettier-ignore
54
- public on<Event extends string>(event: UnknownEvent<Event>, listener: EventListener): () => void;
55
- public on<Event extends string>(event: UnknownEvent<Event>, options: Partial<EventListenerOptions>, listener: EventListener): () => void; // prettier-ignore
56
57
  /* eslint-enable max-len */
57
58
 
58
59
  public on(
59
60
  event: string,
60
- optionsOrListener: Partial<EventListenerOptions> | EventListener,
61
+ optionsOrListener: Partial<EventListenerOptions> | EventListenerPriority | EventListener,
61
62
  listener?: EventListener,
62
63
  ): () => void {
63
- const options = typeof optionsOrListener === 'function' ? {} : optionsOrListener;
64
+ const options =
65
+ typeof optionsOrListener === 'function'
66
+ ? {}
67
+ : typeof optionsOrListener === 'number'
68
+ ? { priority: optionsOrListener }
69
+ : optionsOrListener;
64
70
  const handler = typeof optionsOrListener === 'function' ? optionsOrListener : (listener as EventListener);
65
71
 
66
72
  this.registerListener(event, options, handler);
@@ -73,8 +79,6 @@ export class EventsService extends Service {
73
79
  public once<Event extends EventWithoutPayload>(event: Event, options: Partial<EventListenerOptions>, listener: () => unknown): () => void; // prettier-ignore
74
80
  public once<Event extends EventWithPayload>(event: Event, listener: EventListener<EventsPayload[Event]>): () => void | void; // prettier-ignore
75
81
  public once<Event extends EventWithPayload>(event: Event, options: Partial<EventListenerOptions>, listener: EventListener<EventsPayload[Event]>): () => void | void; // prettier-ignore
76
- public once<Event extends string>(event: UnknownEvent<Event>, listener: EventListener): () => void;
77
- public once<Event extends string>(event: UnknownEvent<Event>, options: Partial<EventListenerOptions>, listener: EventListener): () => void; // prettier-ignore
78
82
  /* eslint-enable max-len */
79
83
 
80
84
  public once(