@d-mok/quasar-app-extension-quasar-axe 2.1.8 → 2.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "2.1.8",
+    "version": "2.1.9",
     "description": "A Quasar App Extension",
     "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
     "license": "MIT",

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

@@ -3,7 +3,7 @@ import 'sapphire-js'
 export { qDialog } from './dialog'
 export * as qNotify from './notify'
 
-export { HANDLE_ERROR, supabase } from './supabase2'
+export { HANDLE_ERROR, supabase } from './supabase'
 
 export { TABLE, ENTITY } from './puppets'
 

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

@@ -3,23 +3,15 @@ import {
     HANDLE_ERROR,
     PostgrestFilterBuilder,
     PostgrestSingleResponse,
-} from '../../supabase2'
+} from '../../supabase'
 import { Filter } from '../type'
 
 type FilterBuilder = PostgrestFilterBuilder<any, any, any, any>
 
-async function send(q: FilterBuilder): Promise<any[]> {
+async function send(q: any): Promise<any[]> {
     let { data, error } = await q
     HANDLE_ERROR(data, error)
-    return data
-}
-
-async function sendSingle(
-    q: PromiseLike<PostgrestSingleResponse<any>>
-): Promise<any[]> {
-    let { data, error } = await q
-    HANDLE_ERROR(data, error)
-    return [data]
+    return Array.isArray(data) ? data : [data]
 }
 
 function parseFilters(q: FilterBuilder, filters: Filter[]): FilterBuilder {
@@ -78,7 +70,7 @@ class DB {
     }
 
     async insert(table: string, rows: any[]): Promise<any[]> {
-        let q = supabase.from(table).insert(rows)
+        let q = supabase.from(table).insert(rows).select('*')
         return send(q)
     }
 
@@ -88,13 +80,23 @@ class DB {
         idVal: any,
         row: any
     ): Promise<any[]> {
-        let q = supabase.from(table).update(row).eq(idKey, idVal).single()
-        return sendSingle(q)
+        let q = supabase
+            .from(table)
+            .update(row)
+            .eq(idKey, idVal)
+            .select('*')
+            .single()
+        return send(q)
     }
 
     async delete(table: string, idKey: string, idVal: any): Promise<any[]> {
-        let q = supabase.from(table).delete().eq(idKey, idVal).single()
-        return sendSingle(q)
+        let q = supabase
+            .from(table)
+            .delete()
+            .eq(idKey, idVal)
+            .select('*')
+            .single()
+        return send(q)
     }
 
     async upsert(

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

@@ -1,130 +1,115 @@
-// import {
-//     createClient,
-//     PostgrestError,
-//     SupabaseClient,
-// } from '@supabase/supabase-js'
-// import { qDialog } from './dialog'
+import {
+    createClient,
+    PostgrestError,
+    SupabaseClient,
+    Session,
+} from '@supabase/supabase-js'
+import { qDialog } from './dialog'
 
-// export type {
-//     PostgrestFilterBuilder,
-//     PostgrestSingleResponse,
-// } from '@supabase/postgrest-js'
+export type {
+    PostgrestFilterBuilder,
+    PostgrestSingleResponse,
+} from '@supabase/postgrest-js'
 
-// declare module '@supabase/supabase-js' {
-//     interface SupabaseClient {
-//         signIn: () => void
-//         accessTokenLife: () => number
-//         waitForSignin: () => Promise<void>
-//         email: () => string
-//         call: <T>(fn: string, params?: object | undefined) => Promise<T[]>
-//         callSingle: <T>(fn: string, params?: object | undefined) => Promise<T>
-//     }
-// }
+let SUPABASE_URL = process.env.SUPABASE_URL ?? ''
+let SUPABASE_KEY = process.env.SUPABASE_KEY ?? ''
 
-// export let supabase: SupabaseClient
-// let SUPABASE_URL = process.env.SUPABASE_URL
-// let SUPABASE_KEY = process.env.SUPABASE_KEY
+export class MySupabaseClient extends SupabaseClient {
+    email: string = 'unauthenticated'
+    session: Session | null = null
 
-// if (SUPABASE_URL && SUPABASE_KEY) {
-//     supabase = createClient(SUPABASE_URL, SUPABASE_KEY, {
-//         autoRefreshToken: true,
-//     })
+    constructor() {
+        super(SUPABASE_URL, SUPABASE_KEY, {
+            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'
+        })
+    }
 
-//     supabase.signIn = async () => {
-//         await supabase.auth.signOut()
-//         await supabase.auth.signIn(
-//             { provider: 'google' },
-//             { redirectTo: window.location.href }
-//         )
-//     }
+    async signIn() {
+        await this.auth.signOut()
+        await this.auth.signInWithOAuth({
+            provider: 'google',
+            options: {
+                redirectTo: window.location.href,
+            },
+        })
+    }
 
-//     supabase.accessTokenLife = () => {
-//         const session = supabase.auth.session()
-//         if (session?.expires_at === undefined) return -999999
-//         const expireAt = new Date(session.expires_at * 1000)
-//         const ms = expireAt.getTime() - new Date().getTime() // ms
-//         return Math.round(ms / 1000)
-//     }
+    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
+    }
 
-//     supabase.auth.onAuthStateChange((event, session) => {
-//         console.log('[SUPABASE AUTH]', event, session?.user?.email)
-//     })
+    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
+    }
 
-//     supabase.waitForSignin = async function (): Promise<void> {
-//         setInterval(() => {
-//             if (supabase.auth.session() === null) supabase.signIn()
-//         }, 1000)
-//         await waitFor(
-//             () => supabase.auth.session() !== null,
-//             '[Wait for SignIn] waiting...',
-//             '[Wait for SignIn] DONE!'
-//         )
-//     }
+    async waitForSignin(): Promise<void> {
+        setInterval(() => {
+            if (this.session === null) this.signIn()
+        }, 1000)
+        waitFor(
+            () => this.session !== null,
+            '[Wait for SignIn] waiting...',
+            '[Wait for SignIn] DONE!'
+        )
+    }
+}
 
-//     supabase.call = async function <T>(
-//         fn: string,
-//         params?: object | undefined
-//     ): Promise<T[]> {
-//         let { data, error } = await supabase.rpc<T>(fn, params)
-//         HANDLE_ERROR(data, error)
-//         return data
-//     }
+export let supabase = new MySupabaseClient()
 
-//     supabase.callSingle = async function <T>(
-//         fn: string,
-//         params?: object | undefined
-//     ): Promise<T> {
-//         let { data, error } = await supabase.rpc<T>(fn, params).single()
-//         HANDLE_ERROR(data, error)
-//         return data
-//     }
+export function HANDLE_ERROR<T>(
+    data: T[] | T | null,
+    error: PostgrestError | null
+): asserts data {
+    if (error) {
+        if (error.message === 'JWSError JWSInvalidSignature') {
+            localStorage.removeItem('supabase.auth.token')
+            qDialog.error(
+                'Database Error!',
+                'Your login session has expired. Please try refreshing the website.'
+            )
+            throw error
+        }
+        let msg = ''
+        msg += error.details ?? '' + '<br/>'
+        msg += error.message ?? '' + '<br/>'
+        msg += error.hint ?? ''
+        qDialog.error('Database Error!', msg)
+        throw error
+    }
+    if (data === null) {
+        qDialog.error('Supabase Error!', 'Returned data is null')
+        throw 'supabase return data is null!'
+    }
+}
 
-//     supabase.email = function (): string {
-//         return supabase.auth.user()?.email ?? 'unauthenticated'
-//     }
-// }
-
-// export function HANDLE_ERROR<T>(
-//     data: T[] | T | null,
-//     error: PostgrestError | null
-// ): asserts data {
-//     if (error) {
-//         if (error.message === 'JWSError JWSInvalidSignature') {
-//             localStorage.removeItem('supabase.auth.token')
-//             qDialog.error(
-//                 'Database Error!',
-//                 'Your login session has expired. Please try refreshing the website.'
-//             )
-//             throw error
-//         }
-//         let msg = ''
-//         msg += error.details ?? '' + '<br/>'
-//         msg += error.message ?? '' + '<br/>'
-//         msg += error.hint ?? ''
-//         qDialog.error('Database Error!', msg)
-//         throw error
-//     }
-//     if (data === null) {
-//         qDialog.error('Supabase Error!', 'Returned data is null')
-//         throw 'supabase return data is null!'
-//     }
-// }
-
-// async function waitFor(
-//     predicate: () => boolean,
-//     waitingMsg: string,
-//     doneMsg: string
-// ) {
-//     return new Promise(resolve => {
-//         function checker() {
-//             if (predicate()) {
-//                 console.log(doneMsg)
-//                 resolve(true)
-//             } else {
-//                 console.log(waitingMsg)
-//                 setTimeout(() => checker(), 50)
-//             }
-//         }
-//         checker()
-//     })
-// }
+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()
+    })
+}

package/src/templates/src/utils/supabase2.ts

@@ -1,116 +0,0 @@
-import {
-    createClient,
-    PostgrestError,
-    SupabaseClient,
-    Session,
-    SupabaseClientOptions,
-} from '@supabase/supabase-js'
-import { qDialog } from './dialog'
-
-export type {
-    PostgrestFilterBuilder,
-    PostgrestSingleResponse,
-} from '@supabase/postgrest-js'
-
-let SUPABASE_URL = process.env.SUPABASE_URL ?? ''
-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, {
-            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'
-        })
-    }
-
-    async signIn() {
-        await this.auth.signOut()
-        await this.auth.signInWithOAuth({
-            provider: 'google',
-            options: {
-                redirectTo: window.location.href,
-            },
-        })
-    }
-
-    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
-    }
-
-    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
-    }
-
-    async waitForSignin(): Promise<void> {
-        setInterval(() => {
-            if (this.session === null) this.signIn()
-        }, 1000)
-        waitFor(
-            () => this.session !== null,
-            '[Wait for SignIn] waiting...',
-            '[Wait for SignIn] DONE!'
-        )
-    }
-}
-
-export let supabase = new MySupabaseClient()
-
-export function HANDLE_ERROR<T>(
-    data: T[] | T | null,
-    error: PostgrestError | null
-): asserts data {
-    if (error) {
-        if (error.message === 'JWSError JWSInvalidSignature') {
-            localStorage.removeItem('supabase.auth.token')
-            qDialog.error(
-                'Database Error!',
-                'Your login session has expired. Please try refreshing the website.'
-            )
-            throw error
-        }
-        let msg = ''
-        msg += error.details ?? '' + '<br/>'
-        msg += error.message ?? '' + '<br/>'
-        msg += error.hint ?? ''
-        qDialog.error('Database Error!', msg)
-        throw error
-    }
-    if (data === null) {
-        qDialog.error('Supabase Error!', 'Returned data is null')
-        throw 'supabase return data is null!'
-    }
-}
-
-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()
-    })
-}