@aerogel/core 0.0.0-next.926bde19326fe7b6b24b277666936862b64d8295 → 0.0.0-next.a56c0f4966eb71571173f8502f3f36d357ceebc7
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.
- package/dist/aerogel-core.cjs.js +1 -1
- package/dist/aerogel-core.cjs.js.map +1 -1
- package/dist/aerogel-core.d.ts +860 -126
- package/dist/aerogel-core.esm.js +1 -1
- package/dist/aerogel-core.esm.js.map +1 -1
- package/histoire.config.ts +7 -0
- package/noeldemartin.config.js +4 -1
- package/package.json +14 -4
- package/postcss.config.js +6 -0
- package/src/assets/histoire.css +3 -0
- package/src/bootstrap/bootstrap.test.ts +1 -0
- package/src/bootstrap/index.ts +14 -2
- package/src/components/AGAppLayout.vue +6 -2
- package/src/components/AGAppModals.vue +15 -0
- package/src/components/AGAppOverlays.vue +5 -7
- package/src/components/AGAppSnackbars.vue +13 -0
- package/src/components/constants.ts +8 -0
- package/src/components/forms/AGButton.vue +33 -10
- package/src/components/forms/AGCheckbox.vue +35 -0
- package/src/components/forms/AGInput.vue +8 -4
- package/src/components/forms/AGSelect.story.vue +28 -0
- package/src/components/forms/AGSelect.vue +53 -0
- package/src/components/forms/index.ts +5 -5
- package/src/components/headless/forms/AGHeadlessButton.vue +7 -7
- package/src/components/headless/forms/AGHeadlessInput.ts +2 -2
- package/src/components/headless/forms/AGHeadlessInput.vue +7 -7
- package/src/components/headless/forms/AGHeadlessInputError.vue +1 -1
- package/src/components/headless/forms/AGHeadlessInputInput.vue +15 -3
- package/src/components/headless/forms/AGHeadlessSelect.ts +43 -0
- package/src/components/headless/forms/AGHeadlessSelect.vue +77 -0
- package/src/components/headless/forms/AGHeadlessSelectButton.vue +24 -0
- package/src/components/headless/forms/AGHeadlessSelectError.vue +26 -0
- package/src/components/headless/forms/AGHeadlessSelectLabel.vue +21 -0
- package/src/components/headless/forms/AGHeadlessSelectOption.ts +4 -0
- package/src/components/headless/forms/AGHeadlessSelectOption.vue +39 -0
- package/src/components/headless/forms/AGHeadlessSelectOptions.ts +3 -0
- package/src/components/headless/forms/index.ts +9 -1
- package/src/components/headless/index.ts +1 -0
- package/src/components/headless/modals/AGHeadlessModalPanel.vue +5 -1
- package/src/components/headless/snackbars/AGHeadlessSnackbar.vue +10 -0
- package/src/components/headless/snackbars/index.ts +25 -0
- package/src/components/index.ts +3 -1
- package/src/components/lib/AGErrorMessage.vue +16 -0
- package/src/components/lib/AGLink.vue +9 -0
- package/src/components/lib/AGMarkdown.vue +36 -0
- package/src/components/lib/AGStartupCrash.vue +31 -0
- package/src/components/lib/index.ts +4 -0
- package/src/components/modals/AGAlertModal.vue +1 -2
- package/src/components/modals/AGConfirmModal.vue +4 -4
- package/src/components/modals/AGErrorReportModal.ts +20 -0
- package/src/components/modals/AGErrorReportModal.vue +62 -0
- package/src/components/modals/AGErrorReportModalButtons.vue +109 -0
- package/src/components/modals/AGErrorReportModalTitle.vue +25 -0
- package/src/components/modals/AGLoadingModal.vue +19 -0
- package/src/components/modals/AGModal.ts +1 -1
- package/src/components/modals/AGModal.vue +23 -4
- package/src/components/modals/AGModalTitle.vue +9 -0
- package/src/components/modals/index.ts +18 -2
- package/src/components/snackbars/AGSnackbar.vue +42 -0
- package/src/components/snackbars/index.ts +3 -0
- package/src/directives/index.ts +16 -3
- package/src/errors/Errors.state.ts +31 -0
- package/src/errors/Errors.ts +183 -0
- package/src/errors/index.ts +55 -0
- package/src/forms/Form.ts +26 -15
- package/src/forms/utils.ts +17 -0
- package/src/lang/Lang.ts +12 -4
- package/src/lang/index.ts +3 -5
- package/src/lang/utils.ts +4 -0
- package/src/main.histoire.ts +1 -0
- package/src/main.ts +1 -2
- package/src/plugins/Plugin.ts +1 -0
- package/src/plugins/index.ts +19 -0
- package/src/services/App.state.ts +10 -2
- package/src/services/App.ts +24 -2
- package/src/services/Service.ts +132 -45
- package/src/services/index.ts +21 -4
- package/src/services/store.ts +27 -0
- package/src/ui/UI.state.ts +11 -1
- package/src/ui/UI.ts +75 -9
- package/src/ui/index.ts +7 -1
- package/src/utils/composition/forms.ts +11 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/markdown.ts +11 -2
- package/src/utils/vue.ts +5 -3
- package/tailwind.config.js +4 -0
- package/tsconfig.json +1 -0
- package/vite.config.ts +2 -1
- package/.eslintrc.js +0 -3
- package/src/components/basic/AGMarkdown.vue +0 -35
- package/src/components/basic/index.ts +0 -3
- package/src/globals.ts +0 -6
|
@@ -1,7 +1,23 @@
|
|
|
1
1
|
import AGAlertModal from './AGAlertModal.vue';
|
|
2
2
|
import AGConfirmModal from './AGConfirmModal.vue';
|
|
3
|
+
import AGErrorReportModalButtons from './AGErrorReportModalButtons.vue';
|
|
4
|
+
import AGErrorReportModalTitle from './AGErrorReportModalTitle.vue';
|
|
5
|
+
import AGLoadingModal from './AGLoadingModal.vue';
|
|
3
6
|
import AGModal from './AGModal.vue';
|
|
7
|
+
import AGModalTitle from './AGModalTitle.vue';
|
|
4
8
|
import AGModalContext from './AGModalContext.vue';
|
|
5
|
-
import { IAGModal } from './AGModal';
|
|
6
9
|
|
|
7
|
-
export
|
|
10
|
+
export * from './AGErrorReportModal';
|
|
11
|
+
export * from './AGModal';
|
|
12
|
+
export * from './AGModalContext';
|
|
13
|
+
|
|
14
|
+
export {
|
|
15
|
+
AGAlertModal,
|
|
16
|
+
AGConfirmModal,
|
|
17
|
+
AGErrorReportModalButtons,
|
|
18
|
+
AGErrorReportModalTitle,
|
|
19
|
+
AGLoadingModal,
|
|
20
|
+
AGModal,
|
|
21
|
+
AGModalTitle,
|
|
22
|
+
AGModalContext,
|
|
23
|
+
};
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<AGHeadlessSnackbar class="flex flex-row items-center justify-center gap-3 p-4" :class="styleClasses">
|
|
3
|
+
<AGMarkdown :text="message" inline />
|
|
4
|
+
<AGButton
|
|
5
|
+
v-for="(action, i) of actions"
|
|
6
|
+
:key="i"
|
|
7
|
+
:color="color"
|
|
8
|
+
@click="activate(action)"
|
|
9
|
+
>
|
|
10
|
+
{{ action.text }}
|
|
11
|
+
</AGButton>
|
|
12
|
+
</AGHeadlessSnackbar>
|
|
13
|
+
</template>
|
|
14
|
+
|
|
15
|
+
<script setup lang="ts">
|
|
16
|
+
import { computed } from 'vue';
|
|
17
|
+
|
|
18
|
+
import UI from '@/ui/UI';
|
|
19
|
+
import { Colors } from '@/components/constants';
|
|
20
|
+
import { useSnackbarProps } from '@/components/headless';
|
|
21
|
+
import type { SnackbarAction } from '@/components/headless';
|
|
22
|
+
|
|
23
|
+
import AGButton from '../forms/AGButton.vue';
|
|
24
|
+
import AGHeadlessSnackbar from '../headless/snackbars/AGHeadlessSnackbar.vue';
|
|
25
|
+
import AGMarkdown from '../lib/AGMarkdown.vue';
|
|
26
|
+
|
|
27
|
+
const props = defineProps(useSnackbarProps());
|
|
28
|
+
const styleClasses = computed(() => {
|
|
29
|
+
switch (props.color) {
|
|
30
|
+
case Colors.Danger:
|
|
31
|
+
return 'bg-red-200 text-red-900';
|
|
32
|
+
default:
|
|
33
|
+
case Colors.Secondary:
|
|
34
|
+
return 'bg-gray-900 text-white';
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
function activate(action: SnackbarAction): void {
|
|
39
|
+
action.handler?.();
|
|
40
|
+
action.dismiss && UI.hideSnackbar(props.id);
|
|
41
|
+
}
|
|
42
|
+
</script>
|
package/src/directives/index.ts
CHANGED
|
@@ -4,12 +4,25 @@ import { definePlugin } from '@/plugins';
|
|
|
4
4
|
|
|
5
5
|
import initialFocus from './initial-focus';
|
|
6
6
|
|
|
7
|
-
const
|
|
7
|
+
const builtInDirectives: Record<string, Directive> = {
|
|
8
8
|
'initial-focus': initialFocus,
|
|
9
9
|
};
|
|
10
10
|
|
|
11
11
|
export default definePlugin({
|
|
12
|
-
install(app) {
|
|
13
|
-
|
|
12
|
+
install(app, options) {
|
|
13
|
+
const directives = {
|
|
14
|
+
...builtInDirectives,
|
|
15
|
+
...options.directives,
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
for (const [name, directive] of Object.entries(directives)) {
|
|
19
|
+
app.directive(name, directive);
|
|
20
|
+
}
|
|
14
21
|
},
|
|
15
22
|
});
|
|
23
|
+
|
|
24
|
+
declare module '@/bootstrap/options' {
|
|
25
|
+
interface AerogelOptions {
|
|
26
|
+
directives?: Record<string, Directive>;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { JSError } from '@noeldemartin/utils';
|
|
2
|
+
|
|
3
|
+
import { defineServiceState } from '@/services';
|
|
4
|
+
|
|
5
|
+
export type ErrorSource = string | Error | JSError | unknown;
|
|
6
|
+
|
|
7
|
+
export interface ErrorReport {
|
|
8
|
+
title: string;
|
|
9
|
+
description?: string;
|
|
10
|
+
details?: string;
|
|
11
|
+
error?: Error | JSError | unknown;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface ErrorReportLog {
|
|
15
|
+
report: ErrorReport;
|
|
16
|
+
seen: boolean;
|
|
17
|
+
date: Date;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export default defineServiceState({
|
|
21
|
+
name: 'errors',
|
|
22
|
+
initialState: {
|
|
23
|
+
logs: [] as ErrorReportLog[],
|
|
24
|
+
startupErrors: [] as ErrorReport[],
|
|
25
|
+
},
|
|
26
|
+
computed: {
|
|
27
|
+
hasErrors: ({ logs }) => logs.length > 0,
|
|
28
|
+
hasNewErrors: ({ logs }) => logs.some((error) => !error.seen),
|
|
29
|
+
hasStartupErrors: ({ startupErrors }) => startupErrors.length > 0,
|
|
30
|
+
},
|
|
31
|
+
});
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { JSError, facade, isObject, objectWithoutEmpty, toString } from '@noeldemartin/utils';
|
|
2
|
+
|
|
3
|
+
import App from '@/services/App';
|
|
4
|
+
import ServiceBootError from '@/errors/ServiceBootError';
|
|
5
|
+
import UI, { UIComponents } from '@/ui/UI';
|
|
6
|
+
import { translateWithDefault } from '@/lang/utils';
|
|
7
|
+
|
|
8
|
+
import Service from './Errors.state';
|
|
9
|
+
import { Colors } from '@/components/constants';
|
|
10
|
+
import type { ErrorReport, ErrorReportLog, ErrorSource } from './Errors.state';
|
|
11
|
+
|
|
12
|
+
export class ErrorsService extends Service {
|
|
13
|
+
|
|
14
|
+
public forceReporting: boolean = false;
|
|
15
|
+
private enabled: boolean = true;
|
|
16
|
+
|
|
17
|
+
public enable(): void {
|
|
18
|
+
this.enabled = true;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
public disable(): void {
|
|
22
|
+
this.enabled = false;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
public async inspect(error: ErrorSource | ErrorReport[]): Promise<void> {
|
|
26
|
+
const reports = Array.isArray(error) ? error : [await this.createErrorReport(error)];
|
|
27
|
+
|
|
28
|
+
if (reports.length === 0) {
|
|
29
|
+
UI.alert(translateWithDefault('errors.inspectEmpty', 'Nothing to inspect!'));
|
|
30
|
+
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
UI.openModal(UI.requireComponent(UIComponents.ErrorReportModal), { reports });
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
public async report(error: ErrorSource, message?: string): Promise<void> {
|
|
38
|
+
if (App.development || App.testing) {
|
|
39
|
+
this.logError(error);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (!this.enabled) {
|
|
43
|
+
throw error;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
if (!App.isMounted) {
|
|
47
|
+
const startupError = await this.createStartupErrorReport(error);
|
|
48
|
+
|
|
49
|
+
if (startupError) {
|
|
50
|
+
this.setState({ startupErrors: this.startupErrors.concat(startupError) });
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const report = await this.createErrorReport(error);
|
|
57
|
+
const log: ErrorReportLog = {
|
|
58
|
+
report,
|
|
59
|
+
seen: false,
|
|
60
|
+
date: new Date(),
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
UI.showSnackbar(
|
|
64
|
+
message ??
|
|
65
|
+
translateWithDefault('errors.notice', 'Something went wrong, but it\'s not your fault. Try again!'),
|
|
66
|
+
{
|
|
67
|
+
color: Colors.Danger,
|
|
68
|
+
actions: [
|
|
69
|
+
{
|
|
70
|
+
text: translateWithDefault('errors.viewDetails', 'View details'),
|
|
71
|
+
dismiss: true,
|
|
72
|
+
handler: () =>
|
|
73
|
+
UI.openModal(UI.requireComponent(UIComponents.ErrorReportModal), {
|
|
74
|
+
reports: [report],
|
|
75
|
+
}),
|
|
76
|
+
},
|
|
77
|
+
],
|
|
78
|
+
},
|
|
79
|
+
);
|
|
80
|
+
|
|
81
|
+
this.setState({ logs: [log].concat(this.logs) });
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
public see(report: ErrorReport): void {
|
|
85
|
+
this.setState({
|
|
86
|
+
logs: this.logs.map((log) => {
|
|
87
|
+
if (log.report !== report) {
|
|
88
|
+
return log;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
return {
|
|
92
|
+
...log,
|
|
93
|
+
seen: true,
|
|
94
|
+
};
|
|
95
|
+
}),
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
public seeAll(): void {
|
|
100
|
+
this.setState({
|
|
101
|
+
logs: this.logs.map((log) => ({
|
|
102
|
+
...log,
|
|
103
|
+
seen: true,
|
|
104
|
+
})),
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
public getErrorMessage(error: ErrorSource): string {
|
|
109
|
+
if (typeof error === 'string') {
|
|
110
|
+
return error;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
if (error instanceof Error || error instanceof JSError) {
|
|
114
|
+
return error.message;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
if (isObject(error)) {
|
|
118
|
+
return toString(error['message'] ?? error['description'] ?? 'Unknown error object');
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
return translateWithDefault('errors.unknown', 'Unknown Error');
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
private logError(error: unknown): void {
|
|
125
|
+
// eslint-disable-next-line no-console
|
|
126
|
+
console.error(error);
|
|
127
|
+
|
|
128
|
+
if (isObject(error) && error.cause) {
|
|
129
|
+
this.logError(error.cause);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
private async createErrorReport(error: ErrorSource): Promise<ErrorReport> {
|
|
134
|
+
if (typeof error === 'string') {
|
|
135
|
+
return { title: error };
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
if (error instanceof Error || error instanceof JSError) {
|
|
139
|
+
return this.createErrorReportFromError(error);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
if (isObject(error)) {
|
|
143
|
+
return objectWithoutEmpty({
|
|
144
|
+
title: toString(
|
|
145
|
+
error['name'] ?? error['title'] ?? translateWithDefault('errors.unknown', 'Unknown Error'),
|
|
146
|
+
),
|
|
147
|
+
description: toString(
|
|
148
|
+
error['message'] ??
|
|
149
|
+
error['description'] ??
|
|
150
|
+
translateWithDefault('errors.unknownDescription', 'Unknown error object'),
|
|
151
|
+
),
|
|
152
|
+
error,
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
return {
|
|
157
|
+
title: translateWithDefault('errors.unknown', 'Unknown Error'),
|
|
158
|
+
error,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
private async createStartupErrorReport(error: ErrorSource): Promise<ErrorReport | null> {
|
|
163
|
+
if (error instanceof ServiceBootError) {
|
|
164
|
+
// Ignore second-order boot errors in order to have a cleaner startup crash screen.
|
|
165
|
+
return error.cause instanceof ServiceBootError ? null : this.createErrorReport(error.cause);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
return this.createErrorReport(error);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
private createErrorReportFromError(error: Error | JSError, defaults: Partial<ErrorReport> = {}): ErrorReport {
|
|
172
|
+
return {
|
|
173
|
+
title: error.name,
|
|
174
|
+
description: error.message,
|
|
175
|
+
details: error.stack,
|
|
176
|
+
error,
|
|
177
|
+
...defaults,
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
export default facade(new ErrorsService());
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { App } from 'vue';
|
|
2
|
+
|
|
3
|
+
import { bootServices } from '@/services';
|
|
4
|
+
import { definePlugin } from '@/plugins';
|
|
5
|
+
|
|
6
|
+
import Errors from './Errors';
|
|
7
|
+
import { ErrorReport, ErrorReportLog, ErrorSource } from './Errors.state';
|
|
8
|
+
|
|
9
|
+
export { Errors, ErrorSource, ErrorReport, ErrorReportLog };
|
|
10
|
+
|
|
11
|
+
const services = { $errors: Errors };
|
|
12
|
+
const frameworkHandler: ErrorHandler = (error) => {
|
|
13
|
+
if (!Errors.instance) {
|
|
14
|
+
// eslint-disable-next-line no-console
|
|
15
|
+
console.warn('Errors service hasn\'t been initialized properly!');
|
|
16
|
+
|
|
17
|
+
// eslint-disable-next-line no-console
|
|
18
|
+
console.error(error);
|
|
19
|
+
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
Errors.report(error);
|
|
24
|
+
|
|
25
|
+
return true;
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
function setUpErrorHandler(app: App, baseHandler: ErrorHandler = () => false): void {
|
|
29
|
+
const errorHandler: ErrorHandler = (error) => baseHandler(error) || frameworkHandler(error);
|
|
30
|
+
|
|
31
|
+
app.config.errorHandler = errorHandler;
|
|
32
|
+
globalThis.onerror = (event, _, __, ___, error) => errorHandler(error ?? event);
|
|
33
|
+
globalThis.onunhandledrejection = (event) => errorHandler(event.reason);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export type ErrorHandler = (error: ErrorSource) => boolean;
|
|
37
|
+
export type ErrorsServices = typeof services;
|
|
38
|
+
|
|
39
|
+
export default definePlugin({
|
|
40
|
+
async install(app, options) {
|
|
41
|
+
setUpErrorHandler(app, options.handleError);
|
|
42
|
+
|
|
43
|
+
await bootServices(app, services);
|
|
44
|
+
},
|
|
45
|
+
});
|
|
46
|
+
|
|
47
|
+
declare module '@/bootstrap/options' {
|
|
48
|
+
interface AerogelOptions {
|
|
49
|
+
handleError?(error: ErrorSource): boolean;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
declare module '@/services' {
|
|
54
|
+
export interface Services extends ErrorsServices {}
|
|
55
|
+
}
|
package/src/forms/Form.ts
CHANGED
|
@@ -6,6 +6,8 @@ import type { ComputedRef, DeepReadonly, Ref, UnwrapNestedRefs } from 'vue';
|
|
|
6
6
|
export const FormFieldTypes = {
|
|
7
7
|
String: 'string',
|
|
8
8
|
Number: 'number',
|
|
9
|
+
Boolean: 'boolean',
|
|
10
|
+
Object: 'object',
|
|
9
11
|
} as const;
|
|
10
12
|
|
|
11
13
|
export interface FormFieldDefinition<TType extends FormFieldType = FormFieldType, TRules extends string = string> {
|
|
@@ -33,15 +35,20 @@ export type GetFormFieldValue<TType> = TType extends typeof FormFieldTypes.Strin
|
|
|
33
35
|
? string
|
|
34
36
|
: TType extends typeof FormFieldTypes.Number
|
|
35
37
|
? number
|
|
38
|
+
: TType extends typeof FormFieldTypes.Boolean
|
|
39
|
+
? boolean
|
|
40
|
+
: TType extends typeof FormFieldTypes.Object
|
|
41
|
+
? object
|
|
36
42
|
: never;
|
|
37
43
|
|
|
44
|
+
const validForms: WeakMap<Form, ComputedRef<boolean>> = new WeakMap();
|
|
45
|
+
|
|
38
46
|
export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinitions> extends MagicObject {
|
|
39
47
|
|
|
40
48
|
public errors: DeepReadonly<UnwrapNestedRefs<FormErrors<Fields>>>;
|
|
41
49
|
|
|
42
50
|
private _fields: Fields;
|
|
43
51
|
private _data: FormData<Fields>;
|
|
44
|
-
private _valid: ComputedRef<boolean>;
|
|
45
52
|
private _submitted: Ref<boolean>;
|
|
46
53
|
private _errors: FormErrors<Fields>;
|
|
47
54
|
|
|
@@ -52,13 +59,17 @@ export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinit
|
|
|
52
59
|
this._submitted = ref(false);
|
|
53
60
|
this._data = this.getInitialData(fields);
|
|
54
61
|
this._errors = this.getInitialErrors(fields);
|
|
55
|
-
|
|
62
|
+
|
|
63
|
+
validForms.set(
|
|
64
|
+
this,
|
|
65
|
+
computed(() => !Object.values(this._errors).some((error) => error !== null)),
|
|
66
|
+
);
|
|
56
67
|
|
|
57
68
|
this.errors = readonly(this._errors);
|
|
58
69
|
}
|
|
59
70
|
|
|
60
71
|
public get valid(): boolean {
|
|
61
|
-
return this
|
|
72
|
+
return !!validForms.get(this)?.value;
|
|
62
73
|
}
|
|
63
74
|
|
|
64
75
|
public get submitted(): boolean {
|
|
@@ -78,10 +89,10 @@ export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinit
|
|
|
78
89
|
}
|
|
79
90
|
|
|
80
91
|
public validate(): boolean {
|
|
81
|
-
const errors = Object.entries(this._fields).reduce((
|
|
82
|
-
|
|
92
|
+
const errors = Object.entries(this._fields).reduce((formErrors, [name, definition]) => {
|
|
93
|
+
formErrors[name] = this.getFieldErrors(name, definition);
|
|
83
94
|
|
|
84
|
-
return
|
|
95
|
+
return formErrors;
|
|
85
96
|
}, {} as Record<string, string[] | null>);
|
|
86
97
|
|
|
87
98
|
this.resetErrors(errors);
|
|
@@ -89,11 +100,11 @@ export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinit
|
|
|
89
100
|
return this.valid;
|
|
90
101
|
}
|
|
91
102
|
|
|
92
|
-
public reset(): void {
|
|
103
|
+
public reset(options: { keepData?: boolean; keepErrors?: boolean } = {}): void {
|
|
93
104
|
this._submitted.value = false;
|
|
94
105
|
|
|
95
|
-
this.resetData();
|
|
96
|
-
this.resetErrors();
|
|
106
|
+
options.keepData || this.resetData();
|
|
107
|
+
options.keepErrors || this.resetErrors();
|
|
97
108
|
}
|
|
98
109
|
|
|
99
110
|
public submit(): boolean {
|
|
@@ -135,10 +146,10 @@ export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinit
|
|
|
135
146
|
return {} as FormData<Fields>;
|
|
136
147
|
}
|
|
137
148
|
|
|
138
|
-
const data = Object.entries(fields).reduce((
|
|
139
|
-
|
|
149
|
+
const data = Object.entries(fields).reduce((formData, [name, definition]) => {
|
|
150
|
+
formData[name as keyof Fields] = (definition.default ?? null) as FormData<Fields>[keyof Fields];
|
|
140
151
|
|
|
141
|
-
return
|
|
152
|
+
return formData;
|
|
142
153
|
}, {} as FormData<Fields>);
|
|
143
154
|
|
|
144
155
|
return reactive(data) as FormData<Fields>;
|
|
@@ -149,10 +160,10 @@ export default class Form<Fields extends FormFieldDefinitions = FormFieldDefinit
|
|
|
149
160
|
return {} as FormErrors<Fields>;
|
|
150
161
|
}
|
|
151
162
|
|
|
152
|
-
const errors = Object.keys(fields).reduce((
|
|
153
|
-
|
|
163
|
+
const errors = Object.keys(fields).reduce((formErrors, name) => {
|
|
164
|
+
formErrors[name as keyof Fields] = null;
|
|
154
165
|
|
|
155
|
-
return
|
|
166
|
+
return formErrors;
|
|
156
167
|
}, {} as FormErrors<Fields>);
|
|
157
168
|
|
|
158
169
|
return reactive(errors) as FormErrors<Fields>;
|
package/src/forms/utils.ts
CHANGED
|
@@ -1,6 +1,23 @@
|
|
|
1
1
|
import { FormFieldTypes } from './Form';
|
|
2
2
|
import type { FormFieldDefinition } from './Form';
|
|
3
3
|
|
|
4
|
+
export function booleanInput(defaultValue?: boolean): FormFieldDefinition<typeof FormFieldTypes.Boolean> {
|
|
5
|
+
return {
|
|
6
|
+
default: defaultValue,
|
|
7
|
+
type: FormFieldTypes.Boolean,
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
export function requiredBooleanInput(
|
|
12
|
+
defaultValue?: boolean,
|
|
13
|
+
): FormFieldDefinition<typeof FormFieldTypes.Boolean, 'required'> {
|
|
14
|
+
return {
|
|
15
|
+
default: defaultValue,
|
|
16
|
+
type: FormFieldTypes.Boolean,
|
|
17
|
+
rules: 'required',
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
|
|
4
21
|
export function requiredNumberInput(
|
|
5
22
|
defaultValue?: number,
|
|
6
23
|
): FormFieldDefinition<typeof FormFieldTypes.Number, 'required'> {
|
package/src/lang/Lang.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { facade } from '@noeldemartin/utils';
|
|
1
|
+
import { facade, toString } from '@noeldemartin/utils';
|
|
2
2
|
|
|
3
3
|
import App from '@/services/App';
|
|
4
4
|
import Service from '@/services/Service';
|
|
@@ -17,7 +17,7 @@ export class LangService extends Service {
|
|
|
17
17
|
this.provider = {
|
|
18
18
|
translate: (key) => {
|
|
19
19
|
// eslint-disable-next-line no-console
|
|
20
|
-
App.
|
|
20
|
+
App.development && console.warn('Lang provider is missing');
|
|
21
21
|
|
|
22
22
|
return key;
|
|
23
23
|
},
|
|
@@ -41,10 +41,18 @@ export class LangService extends Service {
|
|
|
41
41
|
): string {
|
|
42
42
|
defaultMessage ??= defaultMessageOrParameters as string;
|
|
43
43
|
|
|
44
|
-
const parameters = typeof defaultMessageOrParameters === 'string' ? {} : defaultMessageOrParameters;
|
|
44
|
+
const parameters = typeof defaultMessageOrParameters === 'string' ? {} : defaultMessageOrParameters ?? {};
|
|
45
45
|
const message = this.provider.translate(key, parameters) ?? key;
|
|
46
46
|
|
|
47
|
-
|
|
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
|
+
);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return message;
|
|
48
56
|
}
|
|
49
57
|
|
|
50
58
|
}
|
package/src/lang/index.ts
CHANGED
|
@@ -2,16 +2,14 @@ import { bootServices } from '@/services';
|
|
|
2
2
|
import { definePlugin } from '@/plugins';
|
|
3
3
|
|
|
4
4
|
import Lang, { LangProvider } from './Lang';
|
|
5
|
+
import { translate, translateWithDefault } from './utils';
|
|
5
6
|
|
|
6
|
-
export { Lang, LangProvider };
|
|
7
|
+
export { Lang, LangProvider, translate, translateWithDefault };
|
|
7
8
|
|
|
8
9
|
const services = { $lang: Lang };
|
|
9
10
|
|
|
10
11
|
export type LangServices = typeof services;
|
|
11
12
|
|
|
12
|
-
export const translate = Lang.translate.bind(Lang);
|
|
13
|
-
export const translateWithDefault = Lang.translateWithDefault.bind(Lang);
|
|
14
|
-
|
|
15
13
|
export default definePlugin({
|
|
16
14
|
async install(app) {
|
|
17
15
|
app.config.globalProperties.$t ??= translate;
|
|
@@ -22,7 +20,7 @@ export default definePlugin({
|
|
|
22
20
|
});
|
|
23
21
|
|
|
24
22
|
declare module '@/services' {
|
|
25
|
-
interface Services extends LangServices {}
|
|
23
|
+
export interface Services extends LangServices {}
|
|
26
24
|
}
|
|
27
25
|
|
|
28
26
|
declare module '@vue/runtime-core' {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import './assets/histoire.css';
|
package/src/main.ts
CHANGED
package/src/plugins/Plugin.ts
CHANGED
package/src/plugins/index.ts
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import type { GetClosureArgs } from '@noeldemartin/utils';
|
|
2
|
+
|
|
3
|
+
import App from '@/services/App';
|
|
4
|
+
|
|
1
5
|
import type { Plugin } from './Plugin';
|
|
2
6
|
|
|
3
7
|
export * from './Plugin';
|
|
@@ -5,3 +9,18 @@ export * from './Plugin';
|
|
|
5
9
|
export function definePlugin<T extends Plugin>(plugin: T): T {
|
|
6
10
|
return plugin;
|
|
7
11
|
}
|
|
12
|
+
|
|
13
|
+
export async function installPlugins(plugins: Plugin[], ...args: GetClosureArgs<Plugin['install']>): Promise<void> {
|
|
14
|
+
App.setState(
|
|
15
|
+
'plugins',
|
|
16
|
+
plugins.reduce((pluginsMap, plugin) => {
|
|
17
|
+
if (plugin.name) {
|
|
18
|
+
pluginsMap[plugin.name] = plugin;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return pluginsMap;
|
|
22
|
+
}, {} as Record<string, Plugin>),
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
await Promise.all(plugins.map((plugin) => plugin.install(...args)) ?? []);
|
|
26
|
+
}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
+
import Aerogel from 'virtual:aerogel';
|
|
2
|
+
|
|
1
3
|
import { defineServiceState } from '@/services/Service';
|
|
4
|
+
import type { Plugin } from '@/plugins/Plugin';
|
|
2
5
|
|
|
3
6
|
export default defineServiceState({
|
|
7
|
+
name: 'app',
|
|
4
8
|
initialState: {
|
|
5
|
-
|
|
9
|
+
plugins: {} as Record<string, Plugin>,
|
|
10
|
+
environment: Aerogel.environment,
|
|
11
|
+
sourceUrl: Aerogel.sourceUrl,
|
|
12
|
+
isMounted: false,
|
|
6
13
|
},
|
|
7
14
|
computed: {
|
|
8
|
-
|
|
15
|
+
development: (state) => state.environment === 'development',
|
|
16
|
+
testing: (state) => state.environment === 'testing',
|
|
9
17
|
},
|
|
10
18
|
});
|
package/src/services/App.ts
CHANGED
|
@@ -1,7 +1,29 @@
|
|
|
1
|
-
import { facade } from '@noeldemartin/utils';
|
|
1
|
+
import { facade, forever, updateLocationQueryParameters } from '@noeldemartin/utils';
|
|
2
|
+
|
|
3
|
+
import Events from '@/services/Events';
|
|
4
|
+
import type { Plugin } from '@/plugins';
|
|
2
5
|
|
|
3
6
|
import Service from './App.state';
|
|
4
7
|
|
|
5
|
-
export class AppService extends Service {
|
|
8
|
+
export class AppService extends Service {
|
|
9
|
+
|
|
10
|
+
public async reload(queryParameters?: Record<string, string | undefined>): Promise<void> {
|
|
11
|
+
queryParameters && updateLocationQueryParameters(queryParameters);
|
|
12
|
+
|
|
13
|
+
location.reload();
|
|
14
|
+
|
|
15
|
+
// Stall until the reload happens
|
|
16
|
+
await forever();
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
public plugin<T extends Plugin = Plugin>(name: string): T | null {
|
|
20
|
+
return (this.plugins[name] as T) ?? null;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
protected async boot(): Promise<void> {
|
|
24
|
+
Events.once('application-mounted', () => this.setState({ isMounted: true }));
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
}
|
|
6
28
|
|
|
7
29
|
export default facade(new AppService());
|