@d-mok/quasar-app-extension-quasar-axe 1.0.21 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d-mok/quasar-app-extension-quasar-axe",
-  "version": "1.0.21",
+  "version": "1.0.25",
   "description": "A Quasar App Extension",
   "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
   "license": "MIT",
@@ -24,7 +24,7 @@
     "@types/papaparse": "^5.3.2",
     "@types/webpack-env": "^1.16.3",
     "papaparse": "^5.3.1",
-    "sapphire-js": "^1.0.63"
+    "sapphire-js": "^1.0.64"
   },
   "devDependencies": {
     "@quasar/app": "^3.3.1",

package/src/templates/src/utils.ts

@@ -1,34 +1,99 @@
 
 //@ts-ignore
-export { qDialog } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/dialog'
+import { qDialog as _qDialog } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/dialog'
 //@ts-ignore
-export { qNotify } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/notify'
+import { qNotify as _qNotify } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/notify'
 //@ts-ignore
-export { Table, Empower } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/table'
+import { TableEdit as _TableEdit, Empower as _Empower } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/table'
 //@ts-ignore
-export { TableView } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/view'
+import { TableView as _TableView } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/view'
 //@ts-ignore
-export { TableRPC } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/rpc'
-
-//@ts-ignore
-import '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
-//@ts-ignore
-export { supabase, handleError, callRPC } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
+import { TableRPC as _TableRPC } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/ORM/rpc'
 //@ts-ignore
 export { Sheet, List } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/sapphire'
+//@ts-ignore
+import { EMAIL as _EMAIL, RPC as _RPC } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
+
+
+declare global {
+    var qDialog: typeof _qDialog
+    var qNotify: typeof _qNotify
+    var TableEdit: typeof _TableEdit
+    var Empower: typeof _Empower
+    var TableView: typeof _TableView
+    var TableRPC: typeof _TableRPC
+    var EMAIL: typeof _EMAIL
+    var RPC: typeof _RPC
+}
+
+globalThis.qDialog = _qDialog
+globalThis.qNotify = _qNotify
+globalThis.TableEdit = _TableEdit
+globalThis.Empower = _Empower
+globalThis.TableView = _TableView
+globalThis.TableRPC = _TableRPC
+globalThis.EMAIL = _EMAIL
+globalThis.RPC = _RPC
+
+
+
+
 
 
 //@ts-ignore
-import { qDialog } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/dialog'
+import '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
 //@ts-ignore
-import { qNotify } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/notify'
+export { supabase } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
+
+
+// //@ts-ignore
+// import { qDialog } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/dialog'
+// //@ts-ignore
+// import { qNotify } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/notify'
 //@ts-ignore
 import { supabase } from '@d-mok/quasar-app-extension-quasar-axe/src/utils/supabase'
 if (process.env.DEBUGGING) {
-    // @ts-ignore
-    globalThis.qDialog = qDialog
-    // @ts-ignore
-    globalThis.qNotify = qNotify
+    // // @ts-ignore
+    // globalThis.qDialog = qDialog
+    // // @ts-ignore
+    // globalThis.qNotify = qNotify
     // @ts-ignore
     globalThis.supabase = supabase
 }
+
+
+
+
+
+
+
+
+// expose vue functions
+
+declare global {
+    var ref: typeof _ref
+    var watch: typeof _watch
+    var watchEffect: typeof _watchEffect
+    var computed: typeof _computed
+    var useRouter: typeof _useRouter
+    var useRoute: typeof _useRoute
+    type PropType<T> = _PropType<T>
+}
+
+import {
+    ref as _ref,
+    watch as _watch,
+    watchEffect as _watchEffect,
+    computed as _computed,
+    PropType as _PropType
+} from 'vue'
+
+import { useRouter as _useRouter, useRoute as _useRoute } from 'vue-router'
+
+globalThis.ref = _ref
+globalThis.watch = _watch
+globalThis.watchEffect = _watchEffect
+globalThis.computed = _computed
+globalThis.useRouter = _useRouter
+globalThis.useRoute = _useRoute
+

package/src/utils/ORM/basic.ts

@@ -45,17 +45,22 @@ export abstract class BasicTable<T extends R, R extends object> extends Sheet<T>
     /**
      * The class of the elements.
      */
-    public abstract readonly entityClass: new (_: Partial<R>) => T
+    public abstract readonly Puppet: new (_: Partial<R>) => T
 
     /**
      * The default ordering instruction object.
      */
     public readonly ordering: Readonly<Ordering<T>> = []
 
+    /**
+     * The row class (for extracting fields in select)
+     */
+    public readonly Rack: undefined | (new (_: Partial<R>) => R) = undefined
+
 
 
     private convert(data: R[]): T[] {
-        return data.map($ => new this.entityClass($))
+        return data.map($ => new this.Puppet($))
     }
 
     private log(msg: string, data?: T[]): void {
@@ -70,9 +75,9 @@ export abstract class BasicTable<T extends R, R extends object> extends Sheet<T>
 
 
     private fields(): string {
-        let newObj = new this.entityClass({})
-        let fs = Object.keys(newObj)
-        return fs.join(',')
+        if (this.Rack === undefined) return '*'
+        let newObj = new this.Rack({})
+        return Object.keys(newObj).join(',')
     }
 
 
@@ -110,7 +115,7 @@ export abstract class BasicTable<T extends R, R extends object> extends Sheet<T>
         param?: any
         where?: Where<R>
         custom?: (_: PostgrestFilterBuilder) => PostgrestFilterBuilder
-        action?: (entities: T[]) => void
+        action?: (puppet: T[]) => void
         confirm?: [string, string?]
         notify?: string
         slience?: boolean
@@ -125,12 +130,12 @@ export abstract class BasicTable<T extends R, R extends object> extends Sheet<T>
         let { data, error } = await q
         handleError(data, error)
 
-        let entities = this.convert(data)
-        action(entities)
+        let puppets = this.convert(data)
+        action(puppets)
         this.order(...this.ordering)
 
 
-        this.log(type, entities)
+        this.log(type, puppets)
         if (notify) qNotify.toast(notify)
         if (slience) loadingBar(true)
     }
@@ -143,7 +148,7 @@ export abstract class BasicTable<T extends R, R extends object> extends Sheet<T>
      * Get an item by `criteria`. If not found, return a new object.
      */
     got(criteria: Criteria<T>): T {
-        return this.get(criteria) ?? new this.entityClass({})
+        return this.get(criteria) ?? new this.Puppet({})
     }
 
 

package/src/utils/ORM/rpc.ts

@@ -36,9 +36,5 @@ export abstract class TableRPC<T extends R, R extends object> extends BasicTable
         })
     }
 
-
-
-
-
 }
 

package/src/utils/ORM/table.ts

@@ -16,7 +16,7 @@ type muteOptions = {
  * @template T - type of element class
  * @template R - type of database row class
  */
-export abstract class Table<T extends R, R extends object> extends TableView<T, R>{
+export abstract class TableEdit<T extends R, R extends object> extends TableView<T, R>{
 
 
 
@@ -109,7 +109,7 @@ export function Empower<RCls extends Constructor, R = InstanceType<RCls>>(BaseCl
 
     return class extends BaseCls {
 
-        public hostTable: Table<any, any> | undefined = undefined;
+        public hostTable: TableEdit<any, any> | undefined = undefined;
 
         public async update(
             this: this & R,
@@ -155,59 +155,3 @@ export function Empower<RCls extends Constructor, R = InstanceType<RCls>>(BaseCl
 
 
 
-
-
-
-
-
-
-
-
-// class FolderRow {
-//     id: number = 0
-//     subject: string = ""
-//     category: string = ""
-//     teacher: string = ""
-//     bank: string = ""
-//     name: string = ""
-//     pub_q: boolean = false
-//     pub_s: boolean = false
-//     codes: string[] = []
-//     modified: number = 0
-
-//     constructor(row = {}) {
-//         Object.assign(this, row)
-//     }
-// }
-
-
-
-
-// export class Folder extends FolderRow {
-
-
-
-
-// }
-
-
-
-// export class FolderTable extends Table<Folder, FolderRow>{
-//     readonly tableName = 'folder'
-//     readonly idField = 'id' as const
-//     readonly entityClass = Folder
-//     readonly ordering = [
-//         'subject',
-//         { category: ['topic', 'paper', 'exercise'] },
-//         'bank',
-//         'name'
-//     ] as const
-
-
-
-// }
-
-
-// export const Folders = (new FolderTable).reactive()
-
-// Folders.selectIn('teacher', [1,2,3])

package/src/utils/supabase.ts

@@ -137,15 +137,17 @@ export function handleError<T>(data: T[] | null, error: PostgrestError | null):
 
 
 
-const _filterBuilder = supabase.from('DEMO').select().eq('','').order('f').limit(3)
+const _filterBuilder = supabase.from('DEMO').select().eq('', '').order('f').limit(3)
 export type PostgrestFilterBuilder = typeof _filterBuilder
 
 
 
-export async function callRPC<T>(fn: string, params?: object | undefined) {
+export async function RPC<T>(fn: string, params?: object | undefined) {
     let { data, error } = await supabase.rpc<T>(fn, params)
     handleError(data, error)
     return data
 }
 
-
+export function EMAIL(): string {
+    return supabase.email()
+}