@d-mok/quasar-app-extension-quasar-axe 3.1.49 → 3.1.51

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "3.1.49",
+    "version": "3.1.51",
     "description": "A Quasar App Extension",
     "main": "src/index.js",
     "scripts": {
@@ -17,7 +17,7 @@
         "handsontable": "^15.2.0",
         "jszip": "^3.10.1",
         "lodash": "^4.17.21",
-        "sapphire-js": "^2.1.48",
+        "sapphire-js": "^2.1.49",
         "sortablejs": "^1.15.0",
         "valibot": "^1.0.0"
     },

package/src/templates/src/utils/dialog/advanced.ts

@@ -4,9 +4,10 @@ import dialogBtn from './custom/dialogBtn.vue'
 import dialogFile from './custom/dialogFile.vue'
 import dialogRadioText from './custom/dialogRadioText.vue'
 import dialogCheckboxText from './custom/dialogCheckboxText.vue'
+import dialogForm from './custom/dialogForm.vue'
 import { throwError } from './basic'
 import type { Component } from 'vue'
-import { base } from './custom_base'
+import { Dialog, QDialogOptions } from 'quasar'
 
 type Predicate<T> = (_: T) => boolean
 type Mapper<T, S> = (_: T) => S
@@ -18,6 +19,20 @@ type PropType<C extends VueComponent> = Omit<
 >
 type OkType<C extends VueComponent> = Parameters<InstanceType<C>['$emit']>[1]
 
+export async function base(component: Component, props: any) {
+    return new Promise<any>((resolve, reject) =>
+        Dialog.create({
+            component,
+            componentProps: {
+                persistent: true,
+                ...props,
+            },
+        })
+            .onOk((data: any) => resolve(data))
+            .onCancel(() => reject('dialog cancelled by user.'))
+    )
+}
+
 export async function custom<C extends VueComponent>(
     component: C,
     props?: PropType<C>
@@ -275,3 +290,80 @@ export async function askCheckboxText(
         cancel: true,
     })
 }
+
+/**
+ * FORM
+ */
+
+type FormPrefill = Record<
+    string,
+    | string
+    | number
+    | boolean
+    | { type: 'string'; value: string; label?: string; hint?: string }
+    | { type: 'number'; value: number; label?: string; hint?: string }
+    | { type: 'boolean'; value: boolean; label?: string }
+    | { type: 'date'; value: string; label?: string; hint?: string }
+    | { type: 'time'; value: string; label?: string; hint?: string }
+    | {
+          type: 'select'
+          value: string
+          options: string[]
+          label?: string
+          hint?: string
+      }
+    | {
+          type: 'autocomplete'
+          value: string
+          options: string[]
+          label?: string
+          hint?: string
+          noFilter?: boolean
+          immediate?: boolean
+      }
+>
+
+type FormPrefillStandard<T extends FormPrefill> = {
+    [P in keyof T]: T[P] extends object
+        ? T[P]
+        : T[P] extends string
+        ? { type: 'string'; value: string; label?: string; hint?: string }
+        : T[P] extends number
+        ? { type: 'number'; value: number; label?: string; hint?: string }
+        : T[P] extends boolean
+        ? { type: 'boolean'; value: boolean; label?: string }
+        : never
+}
+
+type FormFlat<T extends FormPrefill> = {
+    [P in keyof T]: T[P] extends object ? T[P]['value'] : T[P]
+}
+
+/**
+ * Ask for an objects.
+ */
+export async function askForm<T extends FormPrefill>(
+    title: string,
+    message: string,
+    prefill: T,
+    validators: [(_: FormFlat<T>) => boolean, string][] = [[$ => true, '']],
+    onChange: (
+        current: FormPrefillStandard<T>,
+        old: FormPrefillStandard<T>
+    ) => void = (c, o) => {}
+): Promise<FormFlat<T>> {
+    const standardPrefill = Object.mapValues(prefill, $ => {
+        if (typeof $ === 'string') return { type: 'string', value: $ }
+        if (typeof $ === 'number') return { type: 'number', value: $ }
+        if (typeof $ === 'boolean') return { type: 'boolean', value: $ }
+        return $
+    })
+
+    return await base(dialogForm, {
+        title,
+        message,
+        prefill: standardPrefill,
+        validators,
+        onChange,
+    })
+}

package/src/templates/src/utils/dialog/index.ts

@@ -1,5 +1,4 @@
 import * as basic from './basic'
 import * as advanced from './advanced'
-import * as form from './form'
 
-export const qDialog = { ...basic, ...advanced, ...form }
+export const qDialog = { ...basic, ...advanced }

package/src/templates/src/utils/dialog/custom_base.ts

@@ -1,16 +0,0 @@
-import { Dialog, QDialogOptions } from 'quasar'
-import type { Component } from 'vue'
-
-export async function base(component: Component, props: any) {
-    return new Promise<any>((resolve, reject) =>
-        Dialog.create({
-            component,
-            componentProps: {
-                persistent: true,
-                ...props,
-            },
-        })
-            .onOk((data: any) => resolve(data))
-            .onCancel(() => reject('dialog cancelled by user.'))
-    )
-}

package/src/templates/src/utils/dialog/form.ts

@@ -1,75 +0,0 @@
-import dialogForm from './custom/dialogForm.vue'
-import { base } from './custom_base'
-
-type FormPrefill = Record<
-    string,
-    | string
-    | number
-    | boolean
-    | { type: 'string'; value: string; label?: string; hint?: string }
-    | { type: 'number'; value: number; label?: string; hint?: string }
-    | { type: 'boolean'; value: boolean; label?: string }
-    | { type: 'date'; value: string; label?: string; hint?: string }
-    | { type: 'time'; value: string; label?: string; hint?: string }
-    | {
-          type: 'select'
-          value: string
-          options: string[]
-          label?: string
-          hint?: string
-      }
-    | {
-          type: 'autocomplete'
-          value: string
-          options: string[]
-          label?: string
-          hint?: string
-          noFilter?: boolean
-          immediate?: boolean
-      }
->
-
-type FormPrefillStandard<T extends FormPrefill> = {
-    [P in keyof T]: T[P] extends object
-        ? T[P]
-        : T[P] extends string
-        ? { type: 'string'; value: string; label?: string; hint?: string }
-        : T[P] extends number
-        ? { type: 'number'; value: number; label?: string; hint?: string }
-        : T[P] extends boolean
-        ? { type: 'boolean'; value: boolean; label?: string }
-        : never
-}
-
-type FormFlat<T extends FormPrefill> = {
-    [P in keyof T]: T[P] extends object ? T[P]['value'] : T[P]
-}
-
-/**
- * Ask for an objects.
- */
-export async function askForm<T extends FormPrefill>(
-    title: string,
-    message: string,
-    prefill: T,
-    validators: [(_: FormFlat<T>) => boolean, string][] = [[$ => true, '']],
-    onChange: (
-        current: FormPrefillStandard<T>,
-        old: FormPrefillStandard<T>
-    ) => void = (c, o) => {}
-): Promise<FormFlat<T>> {
-    const standardPrefill = Object.mapValues(prefill, $ => {
-        if (typeof $ === 'string') return { type: 'string', value: $ }
-        if (typeof $ === 'number') return { type: 'number', value: $ }
-        if (typeof $ === 'boolean') return { type: 'boolean', value: $ }
-        return $
-    })
-
-    return await base(dialogForm, {
-        title,
-        message,
-        prefill: standardPrefill,
-        validators,
-        onChange,
-    })
-}