@d-mok/quasar-app-extension-quasar-axe 3.1.67 → 3.1.69

package/package.json

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

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

@@ -4,7 +4,7 @@ import './extension'
 export { qDialog } from './dialog'
 export * as qNotify from './notify'
 
-export { HANDLE_ERROR, supabase } from './supabase'
+export { handleError, supabase } from './supabase'
 
 export { ORM } from './puppets'
 

package/src/templates/src/utils/puppets/core/db.ts

@@ -1,15 +1,10 @@
-import {
-    supabase,
-    HANDLE_ERROR,
-    PostgrestFilterBuilder,
-} from '../../supabase'
+import { supabase, handleError, PostgrestFilterBuilder } from '../../supabase'
 import { Filter } from '../type'
 
 type FilterBuilder = PostgrestFilterBuilder<any, any, any, any>
 
 async function send(q: any): Promise<any[]> {
-    let { data, error } = await q
-    HANDLE_ERROR(data, error)
+    let data = await q.then(handleError)
     return Array.isArray(data) ? data : [data]
 }
 

package/src/templates/src/utils/storage.ts

@@ -1,7 +1,6 @@
-import { supabase, HANDLE_ERROR, zipCreate, zipDownload } from '.'
+import { supabase, handleError } from '.'
 import { reactive } from 'vue'
 import { FileOptions } from '@supabase/storage-js'
-import { exportFile } from 'quasar'
 import { mimeTypesToExt } from './mimeTypesToExt'
 
 export class SupabaseBucket extends Map<string, string> {
@@ -11,28 +10,28 @@ export class SupabaseBucket extends Map<string, string> {
 
     private async listPaths(): Promise<string[]> {
         // can only list file in root folder
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .list(undefined, { limit: 10000 })
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         return data.pluck('name')
     }
 
     private async getUrl(path: string): Promise<string> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .createSignedUrl(path, 60 * 60 * 24)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         return data.signedUrl
     }
 
     private async getUrls(
         paths: string[]
     ): Promise<{ path: string | null; signedUrl: string }[]> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .createSignedUrls(paths, 60 * 60 * 24)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         return data
     }
 
@@ -56,10 +55,10 @@ export class SupabaseBucket extends Map<string, string> {
         file: File | Blob,
         fileOptions?: FileOptions
     ): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .upload(path, file, fileOptions)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         await this.load(path)
     }
 
@@ -68,10 +67,10 @@ export class SupabaseBucket extends Map<string, string> {
         file: File | Blob,
         fileOptions?: FileOptions
     ): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .update(path, file, fileOptions)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         await this.load(path)
     }
 
@@ -80,34 +79,34 @@ export class SupabaseBucket extends Map<string, string> {
         file: File | Blob,
         fileOptions?: FileOptions
     ): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .upload(path, file, { ...fileOptions, upsert: true })
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         await this.load(path)
     }
 
     async remove(path: string): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .remove([path])
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         this.delete(path)
     }
 
     async copy(fromPath: string, toPath: string): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .copy(fromPath, toPath)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         await this.load(toPath)
     }
 
     async move(fromPath: string, toPath: string): Promise<void> {
-        const { data, error } = await supabase.storage
+        const data = await supabase.storage
             .from(this.bucketName)
             .move(fromPath, toPath)
-        HANDLE_ERROR(data, error)
+            .then(handleError)
         await this.load(toPath)
         this.delete(fromPath)
     }

package/src/templates/src/utils/supabase.ts

@@ -1,9 +1,4 @@
-import {
-    createClient,
-    PostgrestError,
-    SupabaseClient,
-    Session,
-} from '@supabase/supabase-js'
+import { PostgrestError, SupabaseClient } from '@supabase/supabase-js'
 import { qDialog } from './dialog'
 
 export type {
@@ -16,7 +11,6 @@ let SUPABASE_KEY = process.env.SUPABASE_KEY ?? ''
 
 export class MySupabaseClient extends SupabaseClient {
     email: string = 'unauthenticated'
-    // session: Session | null = null
 
     constructor() {
         super(SUPABASE_URL, SUPABASE_KEY, {
@@ -24,15 +18,9 @@ export class MySupabaseClient extends SupabaseClient {
                 // @ts-ignore
                 schema: process.env.SUPABASE_SCHEMA ?? 'public',
             },
-            // auth: {
-            //     autoRefreshToken: true,
-            //     persistSession: true,
-            //     detectSessionInUrl: true,
-            // },
         })
         this.auth.onAuthStateChange((event, session) => {
             console.log('[SUPABASE AUTH]', event, session?.user?.email)
-            // this.session = session
             this.email = session?.user?.email ?? 'unauthenticated'
         })
     }
@@ -52,42 +40,19 @@ export class MySupabaseClient extends SupabaseClient {
     }
 
     async call<T>(fn: string, params?: object | undefined): Promise<T[]> {
-        let { data, error } = await this.rpc<string, any>(fn, params)
-        HANDLE_ERROR(data, error)
-        return data
+        return await this.rpc<string, any>(fn, params).then(handleError)
     }
 
     async callSingle<T>(fn: string, params?: object | undefined): Promise<T> {
-        let { data, error } = await this.rpc<string, any>(fn, params).single()
-        HANDLE_ERROR(data, error)
-        return data as T
+        return (await this.rpc<string, any>(fn, params)
+            .single()
+            .then(handleError)) as T
     }
 
-    // private async tryRefreshSession() {
-    //     try {
-    //         await this.auth.refreshSession()
-    //     } catch (e) {
-    //         console.error('[Supabase] Refresh session failed', e)
-    //     }
-    // }
-
     async waitForSignin(): Promise<void> {
-        // await this.tryRefreshSession()
         await this.auth.initialize()
         const { data } = await this.auth.getClaims()
         if (data === null) this.signIn()
-        // setInterval(async () => {
-        //     if (this.session === null) await this.tryRefreshSession()
-        //     if (this.session === null) this.signIn()
-        // }, 1000)
-        // setInterval(async () => {
-        //     await this.auth.refreshSession()
-        // }, 1000 * 60 * 30 * 0.99)
-        // await waitFor(
-        //     () => this.session !== null,
-        //     '[Wait for SignIn] waiting...',
-        //     '[Wait for SignIn] DONE!'
-        // )
     }
 }
 
@@ -95,7 +60,7 @@ export let supabase: MySupabaseClient
 if (SUPABASE_URL !== '' && SUPABASE_KEY !== '')
     supabase = new MySupabaseClient()
 
-export function HANDLE_ERROR<T>(
+function HANDLE_ERROR<T>(
     data: T[] | T | null,
     error: PostgrestError | Error | null
 ): asserts data {
@@ -121,21 +86,13 @@ export function HANDLE_ERROR<T>(
     }
 }
 
-// async function waitFor(
-//     predicate: () => boolean,
-//     waitingMsg: string,
-//     doneMsg: string
-// ) {
-//     return new Promise(resolve => {
-//         async function checker() {
-//             if (predicate()) {
-//                 console.log(doneMsg)
-//                 resolve(true)
-//             } else {
-//                 console.log(waitingMsg)
-//                 setTimeout(checker, 50)
-//             }
-//         }
-//         checker()
-//     })
-// }
+export function handleError<D>({
+    data,
+    error,
+}: {
+    data: D
+    error: PostgrestError | Error | null
+}): NonNullable<D> {
+    HANDLE_ERROR(data, error)
+    return data
+}