@d-mok/quasar-app-extension-quasar-axe 4.0.3 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "4.0.3",
+    "version": "4.0.5",
     "description": "A Quasar App Extension",
     "main": "src/index.js",
     "scripts": {

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

@@ -90,15 +90,20 @@ export function ORM<
                 return Rs.map(r => this.convert(r))
             }
 
-            private async wrapper<X>(
+            private async wrapper(
                 logType: 'select' | 'insert' | 'update' | 'delete',
                 options: uiOptions | undefined,
-                fn: () => Promise<X>
-            ): Promise<X> {
+                fn: () => Promise<T[]>
+            ): Promise<T[]> {
                 const { confirm, notify, loading } = options ?? {}
 
                 if (confirm) {
-                    await qDialog.confirm(...confirm)
+                    if (Array.isArray(confirm)) {
+                        const [title, msg] = confirm
+                        await qDialog.confirm(title, msg)
+                    } else {
+                        await qDialog.confirm(confirm)
+                    }
                 }
 
                 if (loading === false) {
@@ -156,6 +161,8 @@ export function ORM<
                         : this.set(entities)
 
                     this.onChange()
+
+                    return entities
                 })
             }
 
@@ -182,6 +189,8 @@ export function ORM<
 
                     this.sortBy($ => vals.indexOf($[key]))
                     this.onChange()
+
+                    return entities
                 })
             }
 
@@ -216,7 +225,7 @@ export function ORM<
 
             async insert(row: Partial<R>, options?: uiOptions): Promise<T> {
                 let entities = await this.insertMany([row], options)
-                return entities[0]!
+                return entities[0]
             }
 
             async update(
@@ -224,37 +233,48 @@ export function ORM<
                 row: Partial<R>,
                 options?: uiOptions
             ): Promise<T> {
-                return await this.wrapper('update', options, async () => {
-                    const data: R = await supabase
-                        .from(tableName)
-                        .update(this.onSanitize(row))
-                        .eq(idKey, idVal as any)
-                        .select(fields)
-                        .single()
-                        .then(handleError)
+                const entities = await this.wrapper(
+                    'update',
+                    options,
+                    async () => {
+                        const data: R = await supabase
+                            .from(tableName)
+                            .update(this.onSanitize(row))
+                            .eq(idKey, idVal as any)
+                            .select(fields)
+                            .single()
+                            .then(handleError)
 
-                    const entity = this.convert(data)
+                        const entity = this.convert(data)
 
-                    this.merge([entity], idKey)
-                    this.onChange()
-                    this.onEdit()
+                        this.merge([entity], idKey)
+                        this.onChange()
+                        this.onEdit()
 
-                    return entity
-                })
+                        return [entity]
+                    }
+                )
+
+                return entities[0]
             }
 
             async delete(idVal: R[IdK], options?: uiOptions): Promise<void> {
                 await this.wrapper('delete', options, async () => {
-                    await supabase
+                    const data: R = await supabase
                         .from(tableName)
                         .delete()
                         .eq(idKey, idVal as any)
+                        .select(fields)
                         .single()
                         .then(handleError)
 
+                    const entity = this.convert(data)
+
                     this.remove($ => $[idKey] === idVal)
                     this.onChange()
                     this.onEdit()
+
+                    return [entity]
                 })
             }
 
@@ -302,7 +322,7 @@ if (process.env.DEBUGGING) {
 }
 
 type uiOptions = {
-    confirm?: [string, string]
+    confirm?: [string, string] | string
     notify?: string | false
     loading?: false
 }