@aerogel/core 0.0.0-next.d824b40e5d06757cd9f47c9f771d916185df4f05 → 0.0.0-next.ea2e864c719d0a4d01b04729a9b681c0e9c85ea7

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 (192) hide show
  1. package/dist/aerogel-core.css +1 -0
  2. package/dist/aerogel-core.d.ts +2262 -912
  3. package/dist/aerogel-core.js +3561 -0
  4. package/dist/aerogel-core.js.map +1 -0
  5. package/package.json +38 -34
  6. package/src/bootstrap/bootstrap.test.ts +7 -10
  7. package/src/bootstrap/index.ts +43 -15
  8. package/src/bootstrap/options.ts +4 -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/HeadlessInputDescription.vue +27 -0
  28. package/src/components/headless/{forms/AGHeadlessInputError.vue → HeadlessInputError.vue} +4 -8
  29. package/src/components/headless/HeadlessInputInput.vue +75 -0
  30. package/src/components/headless/HeadlessInputLabel.vue +18 -0
  31. package/src/components/headless/HeadlessInputTextArea.vue +40 -0
  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/HeadlessSelectError.vue +25 -0
  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 -9
  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 +115 -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} +38 -29
  63. package/src/components/ui/ErrorReportModalTitle.vue +24 -0
  64. package/src/components/ui/Form.vue +24 -0
  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 +131 -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/ui/StartupCrash.vue +31 -0
  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 +13 -5
  84. package/src/directives/measure.ts +46 -0
  85. package/src/errors/Errors.state.ts +1 -1
  86. package/src/errors/Errors.ts +41 -37
  87. package/src/errors/JobCancelledError.ts +3 -0
  88. package/src/errors/index.ts +22 -28
  89. package/src/errors/settings/Debug.vue +39 -0
  90. package/src/errors/settings/index.ts +10 -0
  91. package/src/errors/utils.ts +35 -0
  92. package/src/forms/FormController.test.ts +110 -0
  93. package/src/forms/FormController.ts +246 -0
  94. package/src/forms/index.ts +3 -2
  95. package/src/forms/utils.ts +51 -20
  96. package/src/forms/validation.ts +19 -0
  97. package/src/index.css +73 -0
  98. package/src/{main.ts → index.ts} +3 -0
  99. package/src/jobs/Job.ts +147 -0
  100. package/src/jobs/index.ts +10 -0
  101. package/src/jobs/listeners.ts +3 -0
  102. package/src/jobs/status.ts +4 -0
  103. package/src/lang/DefaultLangProvider.ts +46 -0
  104. package/src/lang/Lang.state.ts +11 -0
  105. package/src/lang/Lang.ts +44 -29
  106. package/src/lang/index.ts +12 -6
  107. package/src/lang/settings/Language.vue +48 -0
  108. package/src/lang/settings/index.ts +10 -0
  109. package/src/plugins/Plugin.ts +1 -1
  110. package/src/plugins/index.ts +10 -7
  111. package/src/services/App.state.ts +39 -7
  112. package/src/services/App.ts +49 -6
  113. package/src/services/Cache.ts +43 -0
  114. package/src/services/Events.test.ts +39 -0
  115. package/src/services/Events.ts +110 -36
  116. package/src/services/Service.ts +154 -49
  117. package/src/services/Storage.ts +20 -0
  118. package/src/services/index.ts +20 -8
  119. package/src/services/store.ts +8 -5
  120. package/src/services/utils.ts +18 -0
  121. package/src/testing/index.ts +26 -0
  122. package/src/testing/setup.ts +11 -0
  123. package/src/ui/UI.state.ts +14 -12
  124. package/src/ui/UI.ts +314 -95
  125. package/src/ui/index.ts +32 -27
  126. package/src/ui/utils.ts +16 -0
  127. package/src/utils/classes.ts +41 -0
  128. package/src/utils/composition/events.ts +4 -5
  129. package/src/utils/composition/forms.ts +20 -4
  130. package/src/utils/composition/persistent.test.ts +33 -0
  131. package/src/utils/composition/persistent.ts +11 -0
  132. package/src/utils/composition/state.test.ts +47 -0
  133. package/src/utils/composition/state.ts +33 -0
  134. package/src/utils/index.ts +5 -0
  135. package/src/utils/markdown.test.ts +50 -0
  136. package/src/utils/markdown.ts +53 -6
  137. package/src/utils/types.ts +3 -0
  138. package/src/utils/vue.ts +38 -123
  139. package/.eslintrc.js +0 -3
  140. package/dist/aerogel-core.cjs.js +0 -2
  141. package/dist/aerogel-core.cjs.js.map +0 -1
  142. package/dist/aerogel-core.esm.js +0 -2
  143. package/dist/aerogel-core.esm.js.map +0 -1
  144. package/dist/virtual.d.ts +0 -11
  145. package/noeldemartin.config.js +0 -5
  146. package/src/components/AGAppLayout.vue +0 -11
  147. package/src/components/AGAppOverlays.vue +0 -37
  148. package/src/components/AGAppSnackbars.vue +0 -13
  149. package/src/components/basic/AGErrorMessage.vue +0 -16
  150. package/src/components/basic/AGLink.vue +0 -9
  151. package/src/components/basic/AGMarkdown.vue +0 -36
  152. package/src/components/basic/index.ts +0 -5
  153. package/src/components/constants.ts +0 -8
  154. package/src/components/forms/AGButton.vue +0 -44
  155. package/src/components/forms/AGCheckbox.vue +0 -35
  156. package/src/components/forms/AGForm.vue +0 -26
  157. package/src/components/forms/AGInput.vue +0 -36
  158. package/src/components/forms/index.ts +0 -6
  159. package/src/components/headless/forms/AGHeadlessButton.vue +0 -51
  160. package/src/components/headless/forms/AGHeadlessInput.ts +0 -8
  161. package/src/components/headless/forms/AGHeadlessInput.vue +0 -54
  162. package/src/components/headless/forms/AGHeadlessInputInput.vue +0 -45
  163. package/src/components/headless/forms/AGHeadlessInputLabel.vue +0 -16
  164. package/src/components/headless/forms/index.ts +0 -6
  165. package/src/components/headless/modals/AGHeadlessModal.ts +0 -7
  166. package/src/components/headless/modals/AGHeadlessModal.vue +0 -88
  167. package/src/components/headless/modals/AGHeadlessModalPanel.vue +0 -28
  168. package/src/components/headless/modals/AGHeadlessModalTitle.vue +0 -13
  169. package/src/components/headless/modals/index.ts +0 -6
  170. package/src/components/headless/snackbars/AGHeadlessSnackbar.vue +0 -10
  171. package/src/components/headless/snackbars/index.ts +0 -25
  172. package/src/components/modals/AGAlertModal.vue +0 -25
  173. package/src/components/modals/AGConfirmModal.vue +0 -30
  174. package/src/components/modals/AGErrorReportModal.ts +0 -20
  175. package/src/components/modals/AGErrorReportModal.vue +0 -62
  176. package/src/components/modals/AGErrorReportModalTitle.vue +0 -25
  177. package/src/components/modals/AGLoadingModal.vue +0 -19
  178. package/src/components/modals/AGModal.ts +0 -10
  179. package/src/components/modals/AGModal.vue +0 -37
  180. package/src/components/modals/AGModalContext.ts +0 -8
  181. package/src/components/modals/AGModalContext.vue +0 -22
  182. package/src/components/modals/AGModalTitle.vue +0 -9
  183. package/src/components/modals/index.ts +0 -23
  184. package/src/components/snackbars/AGSnackbar.vue +0 -42
  185. package/src/components/snackbars/index.ts +0 -3
  186. package/src/directives/initial-focus.ts +0 -11
  187. package/src/forms/Form.test.ts +0 -58
  188. package/src/forms/Form.ts +0 -176
  189. package/src/forms/composition.ts +0 -6
  190. package/src/types/virtual.d.ts +0 -11
  191. package/tsconfig.json +0 -11
  192. package/vite.config.ts +0 -14
package/src/index.css ADDED
@@ -0,0 +1,73 @@
1
+ @import 'tailwindcss';
2
+
3
+ @plugin '@tailwindcss/forms';
4
+ @plugin '@tailwindcss/typography';
5
+
6
+ @source './';
7
+
8
+ @theme {
9
+ --color-primary: oklch(0.205 0 0);
10
+ --color-primary-50: color-mix(in oklab, var(--color-primary-600) 5%, transparent);
11
+ --color-primary-100: color-mix(in oklab, var(--color-primary-600) 15%, transparent);
12
+ --color-primary-200: color-mix(in oklab, var(--color-primary-600) 30%, transparent);
13
+ --color-primary-300: color-mix(in oklab, var(--color-primary-600) 50%, transparent);
14
+ --color-primary-400: color-mix(in oklab, var(--color-primary-600) 65%, transparent);
15
+ --color-primary-500: color-mix(in oklab, var(--color-primary-600) 80%, transparent);
16
+ --color-primary-600: var(--color-primary);
17
+ --color-primary-700: color-mix(in oklab, var(--color-primary-600) 90%, black);
18
+ --color-primary-800: color-mix(in oklab, var(--color-primary-600) 80%, black);
19
+ --color-primary-900: color-mix(in oklab, var(--color-primary-600) 70%, black);
20
+ --color-primary-950: color-mix(in oklab, var(--color-primary-600) 50%, black);
21
+
22
+ --color-background: oklch(1 0 0);
23
+ --color-links: var(--color-primary);
24
+ }
25
+
26
+ .clickable {
27
+ position: relative;
28
+ }
29
+
30
+ .clickable::after {
31
+ --clickable-size: 44px;
32
+ --clickable-inset-by: min(0px, calc((100% - var(--clickable-size)) / 2));
33
+
34
+ content: '';
35
+ position: absolute;
36
+ top: var(--clickable-inset-by);
37
+ left: var(--clickable-inset-by);
38
+ right: var(--clickable-inset-by);
39
+ bottom: var(--clickable-inset-by);
40
+ }
41
+
42
+ input[type='number'].appearance-textfield {
43
+ appearance: textfield;
44
+ }
45
+
46
+ input[type='number'].appearance-textfield::-webkit-outer-spin-button,
47
+ input[type='number'].appearance-textfield::-webkit-inner-spin-button {
48
+ appearance: none;
49
+ }
50
+
51
+ button[data-markdown-action] {
52
+ color: var(--tw-prose-links);
53
+ text-decoration: underline;
54
+ font-weight: 500;
55
+ }
56
+
57
+ @keyframes fade-in {
58
+ 0% {
59
+ opacity: 0;
60
+ }
61
+ 100% {
62
+ opacity: 1;
63
+ }
64
+ }
65
+
66
+ @keyframes grow {
67
+ 0% {
68
+ scale: 0;
69
+ }
70
+ 100% {
71
+ opacity: 1;
72
+ }
73
+ }
@@ -1,9 +1,12 @@
1
1
  export * from './bootstrap';
2
2
  export * from './components';
3
+ export * from './directives';
3
4
  export * from './errors';
4
5
  export * from './forms';
6
+ export * from './jobs';
5
7
  export * from './lang';
6
8
  export * from './plugins';
7
9
  export * from './services';
10
+ export * from './testing';
8
11
  export * from './ui';
9
12
  export * from './utils';
@@ -0,0 +1,147 @@
1
+ import { ListenersManager, PromisedValue, round, tap, toError } from '@noeldemartin/utils';
2
+ import type { Listeners } from '@noeldemartin/utils';
3
+
4
+ import JobCancelledError from '@aerogel/core/errors/JobCancelledError';
5
+
6
+ import type { JobListener } from './listeners';
7
+ import type { JobStatus } from './status';
8
+
9
+ export default abstract class Job<
10
+ Listener extends JobListener = JobListener,
11
+ Status extends JobStatus = JobStatus,
12
+ SerializedStatus extends JobStatus = JobStatus,
13
+ > {
14
+
15
+ protected status: Status;
16
+ protected _listeners: ListenersManager<JobListener>;
17
+ protected _progress?: number;
18
+ protected _cancelled?: PromisedValue<void>;
19
+ protected _started: PromisedValue<void>;
20
+ protected _completed: PromisedValue<void>;
21
+
22
+ constructor() {
23
+ this.status = this.getInitialStatus();
24
+ this._listeners = new ListenersManager();
25
+ this._started = new PromisedValue();
26
+ this._completed = new PromisedValue();
27
+ }
28
+
29
+ public async start(): Promise<void> {
30
+ this.beforeStart();
31
+ this._started.resolve();
32
+
33
+ try {
34
+ await this.updateProgress();
35
+ await this.run();
36
+ await this.updateProgress();
37
+
38
+ this._completed.resolve();
39
+ } catch (error) {
40
+ if (error instanceof JobCancelledError) {
41
+ return;
42
+ }
43
+
44
+ throw tap(toError(error), (realError) => {
45
+ this._completed.reject(realError);
46
+ });
47
+ }
48
+ }
49
+
50
+ public async cancel(): Promise<void> {
51
+ this._cancelled = new PromisedValue();
52
+
53
+ await this._cancelled;
54
+ }
55
+
56
+ public serialize(): SerializedStatus {
57
+ return this.serializeStatus(this.status);
58
+ }
59
+
60
+ public get listeners(): Listeners<Listener> {
61
+ return this._listeners;
62
+ }
63
+
64
+ public get progress(): number {
65
+ return this._progress ?? 0;
66
+ }
67
+
68
+ public get cancelled(): boolean {
69
+ return !!this._cancelled?.isResolved();
70
+ }
71
+
72
+ public get started(): Promise<void> {
73
+ return this._started;
74
+ }
75
+
76
+ public get completed(): Promise<void> {
77
+ return this._completed;
78
+ }
79
+
80
+ protected abstract run(): Promise<void>;
81
+
82
+ protected getInitialStatus(): Status {
83
+ return { completed: false } as Status;
84
+ }
85
+
86
+ protected beforeStart(): void {
87
+ if (!this._started.isResolved()) {
88
+ return;
89
+ }
90
+
91
+ if (this._cancelled) {
92
+ delete this._progress;
93
+ delete this._cancelled;
94
+
95
+ return;
96
+ }
97
+
98
+ throw new Error('Job already started!');
99
+ }
100
+
101
+ protected assertNotCancelled(): void {
102
+ if (!this._cancelled) {
103
+ return;
104
+ }
105
+
106
+ this._cancelled.resolve();
107
+
108
+ throw new JobCancelledError();
109
+ }
110
+
111
+ protected calculateCurrentProgress(status?: JobStatus): number {
112
+ status ??= this.status;
113
+
114
+ if (status.completed) {
115
+ return 1;
116
+ }
117
+
118
+ if (!status.children) {
119
+ return 0;
120
+ }
121
+
122
+ return round(
123
+ status.children.reduce((total, child) => total + this.calculateCurrentProgress(child), 0) /
124
+ status.children.length,
125
+ 2,
126
+ );
127
+ }
128
+
129
+ protected async updateProgress(update?: (status: Status) => unknown): Promise<void> {
130
+ await update?.(this.status);
131
+
132
+ const progress = this.calculateCurrentProgress();
133
+
134
+ if (progress === this._progress) {
135
+ return;
136
+ }
137
+
138
+ this._progress = progress;
139
+
140
+ await this._listeners.emit('onUpdated', progress);
141
+ }
142
+
143
+ protected serializeStatus(status: Status): SerializedStatus {
144
+ return { ...status } as unknown as SerializedStatus;
145
+ }
146
+
147
+ }
@@ -0,0 +1,10 @@
1
+ import Job from './Job';
2
+
3
+ export { Job };
4
+ export * from './Job';
5
+ export * from './listeners';
6
+ export * from './status';
7
+
8
+ export async function dispatch(job: Job): Promise<void> {
9
+ await job.start();
10
+ }
@@ -0,0 +1,3 @@
1
+ export interface JobListener {
2
+ onUpdated?(progress: number): unknown;
3
+ }
@@ -0,0 +1,4 @@
1
+ export interface JobStatus {
2
+ completed: boolean;
3
+ children?: JobStatus[];
4
+ }
@@ -0,0 +1,46 @@
1
+ import { isDevelopment } from '@noeldemartin/utils';
2
+
3
+ import type { LangProvider } from './Lang';
4
+
5
+ export default class DefaultLangProvider implements LangProvider {
6
+
7
+ constructor(
8
+ private locale: string,
9
+ private fallbackLocale: string,
10
+ ) {}
11
+
12
+ public getLocale(): string {
13
+ return this.locale;
14
+ }
15
+
16
+ public async setLocale(locale: string): Promise<void> {
17
+ this.locale = locale;
18
+ }
19
+
20
+ public getFallbackLocale(): string {
21
+ return this.fallbackLocale;
22
+ }
23
+
24
+ public async setFallbackLocale(fallbackLocale: string): Promise<void> {
25
+ this.fallbackLocale = fallbackLocale;
26
+ }
27
+
28
+ public getLocales(): string[] {
29
+ return ['en'];
30
+ }
31
+
32
+ public translate(key: string): string {
33
+ // eslint-disable-next-line no-console
34
+ isDevelopment() && console.warn('Lang provider is missing');
35
+
36
+ return key;
37
+ }
38
+
39
+ public translateWithDefault(_: string, defaultMessage: string): string {
40
+ // eslint-disable-next-line no-console
41
+ isDevelopment() && console.warn('Lang provider is missing');
42
+
43
+ return defaultMessage;
44
+ }
45
+
46
+ }
@@ -0,0 +1,11 @@
1
+ import { defineServiceState } from '@aerogel/core/services/Service';
2
+
3
+ export default defineServiceState({
4
+ name: 'lang',
5
+ persist: ['locale', 'fallbackLocale'],
6
+ initialState: {
7
+ locale: null as string | null,
8
+ locales: ['en'],
9
+ fallbackLocale: 'en',
10
+ },
11
+ });
package/src/lang/Lang.ts CHANGED
@@ -1,10 +1,16 @@
1
- import { facade, toString } from '@noeldemartin/utils';
1
+ import { facade } from '@noeldemartin/utils';
2
2
 
3
- import App from '@/services/App';
4
- import Service from '@/services/Service';
3
+ import DefaultLangProvider from './DefaultLangProvider';
4
+ import Service from './Lang.state';
5
5
 
6
6
  export interface LangProvider {
7
- translate(key: string, parameters?: Record<string, unknown>): string;
7
+ getLocale(): string;
8
+ setLocale(locale: string): Promise<void>;
9
+ getFallbackLocale(): string;
10
+ setFallbackLocale(fallbackLocale: string): Promise<void>;
11
+ getLocales(): string[];
12
+ translate(key: string, parameters?: Record<string, unknown> | number): string;
13
+ translateWithDefault(key: string, defaultMessage: string, parameters?: Record<string, unknown> | number): string;
8
14
  }
9
15
 
10
16
  export class LangService extends Service {
@@ -14,47 +20,56 @@ export class LangService extends Service {
14
20
  constructor() {
15
21
  super();
16
22
 
17
- this.provider = {
18
- translate: (key) => {
19
- // eslint-disable-next-line no-console
20
- App.development && console.warn('Lang provider is missing');
21
-
22
- return key;
23
- },
24
- };
23
+ this.provider = new DefaultLangProvider(
24
+ this.getState('locale') ?? this.getBrowserLocale(),
25
+ this.getState('fallbackLocale'),
26
+ );
25
27
  }
26
28
 
27
- public setProvider(provider: LangProvider): void {
29
+ public async setProvider(provider: LangProvider): Promise<void> {
28
30
  this.provider = provider;
31
+ this.locales = provider.getLocales();
32
+
33
+ await provider.setLocale(this.locale ?? this.getBrowserLocale());
34
+ await provider.setFallbackLocale(this.fallbackLocale);
29
35
  }
30
36
 
31
- public translate(key: string, parameters?: Record<string, unknown>): string {
37
+ public translate(key: string, parameters?: Record<string, unknown> | number): string {
32
38
  return this.provider.translate(key, parameters) ?? key;
33
39
  }
34
40
 
35
- public translateWithDefault(key: string, defaultMessage: string): string;
36
- public translateWithDefault(key: string, parameters: Record<string, unknown>, defaultMessage: string): string;
37
41
  public translateWithDefault(
38
42
  key: string,
39
- defaultMessageOrParameters?: string | Record<string, unknown>,
40
- defaultMessage?: string,
43
+ defaultMessage: string,
44
+ parameters: Record<string, unknown> | number = {},
41
45
  ): string {
42
- defaultMessage ??= defaultMessageOrParameters as string;
46
+ return this.provider.translateWithDefault(key, defaultMessage, parameters);
47
+ }
43
48
 
44
- const parameters = typeof defaultMessageOrParameters === 'string' ? {} : defaultMessageOrParameters ?? {};
45
- const message = this.provider.translate(key, parameters) ?? key;
49
+ public getBrowserLocale(): string {
50
+ const locales = this.getState('locales');
46
51
 
47
- if (message === key) {
48
- return Object.entries(parameters).reduce(
49
- (renderedMessage, [name, value]) =>
50
- renderedMessage.replace(new RegExp(`\\{\\s*${name}\\s*\\}`, 'g'), toString(value)),
51
- defaultMessage,
52
- );
52
+ return navigator.languages.find((locale) => locales.includes(locale)) ?? 'en';
53
+ }
54
+
55
+ protected override async boot(): Promise<void> {
56
+ if (!globalThis.document) {
57
+ return;
53
58
  }
54
59
 
55
- return message;
60
+ this.requireStore().$subscribe(
61
+ async () => {
62
+ await this.provider.setLocale(this.locale ?? this.getBrowserLocale());
63
+ await this.provider.setFallbackLocale(this.fallbackLocale);
64
+
65
+ this.locale
66
+ ? document.querySelector('html')?.setAttribute('lang', this.locale)
67
+ : document.querySelector('html')?.removeAttribute('lang');
68
+ },
69
+ { immediate: true },
70
+ );
56
71
  }
57
72
 
58
73
  }
59
74
 
60
- export default facade(new LangService());
75
+ export default facade(LangService);
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';
5
7
  import { translate, translateWithDefault } from './utils';
8
+ import type { LangProvider } from './Lang';
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,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,10 @@
1
+ import { defineSettings } from '@aerogel/core/services';
2
+
3
+ import Language from './Language.vue';
4
+
5
+ export default defineSettings([
6
+ {
7
+ priority: 100,
8
+ component: Language,
9
+ },
10
+ ]);
@@ -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,18 +1,50 @@
1
- import Build from 'virtual:aerogel';
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: Build.environment,
11
- sourceUrl: Build.sourceUrl,
12
- isMounted: false,
22
+ instance: null as App | null,
23
+ environment: getEnv() ?? 'development',
24
+ version: Aerogel.version,
25
+ sourceUrl: Aerogel.sourceUrl,
26
+ settings: [] as AppSetting[],
13
27
  },
14
28
  computed: {
15
29
  development: (state) => state.environment === 'development',
16
- testing: (state) => state.environment === 'testing',
30
+ staging: (state) => state.environment === 'staging',
31
+ testing: (state) => state.environment === 'test' || state.environment === 'testing',
32
+ versionName(state): string {
33
+ if (this.development) {
34
+ return 'dev.' + Aerogel.sourceHash.toString().substring(0, 7);
35
+ }
36
+
37
+ if (this.staging) {
38
+ return 'staging.' + Aerogel.sourceHash.toString().substring(0, 7);
39
+ }
40
+
41
+ return `v${state.version}`;
42
+ },
43
+ versionUrl(state): string {
44
+ return (
45
+ state.sourceUrl +
46
+ (this.development || this.staging ? `/tree/${Aerogel.sourceHash}` : `/releases/tag/${this.versionName}`)
47
+ );
48
+ },
17
49
  },
18
50
  });