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

package/package.json

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

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

@@ -78,7 +78,7 @@ export function ORM<
 
             protected onChange(): void {}
             protected onEdit(): void {}
-            protected onSanitize<P extends Partial<R>>(row: P): P {
+            protected onSanitize(row: Partial<R>): Partial<R> {
                 return row
             }
 
@@ -132,13 +132,19 @@ export function ORM<
                 return entities
             }
 
-            async read(query: (q: Filter) => Filter = q => q): Promise<R[]> {
+            async read(
+                query: ((q: Filter) => Filter) | Partial<R> = q => q
+            ): Promise<R[]> {
                 const q = supabase.from(tableName).select(fields)
-                return await query(q).then(handleError)
+                if (typeof query === 'function') {
+                    return await query(q).then(handleError)
+                } else {
+                    return await q.match(query).then(handleError)
+                }
             }
 
             async select(
-                query: (q: Filter) => Filter = q => q,
+                query: ((q: Filter) => Filter) | Partial<R> = q => q,
                 options?: selectOptions
             ): Promise<void> {
                 await this.wrapper('select', options, async () => {
@@ -257,7 +263,7 @@ export function ORM<
                 conflictKeys: Key<P>[],
                 options?: uiOptions
             ): Promise<T> {
-                row = this.onSanitize(row)
+                row = this.onSanitize(row) as P
 
                 let found: R[] = await this.read(q =>
                     q.match(Object.pick(row, conflictKeys))
@@ -298,10 +304,10 @@ if (process.env.DEBUGGING) {
 type uiOptions = {
     confirm?: [string, string]
     notify?: string | false
-    loading?: boolean
+    loading?: false
 }
 
 type selectOptions = {
-    loading?: boolean
+    loading?: false
     patch?: true
 }

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

@@ -58,6 +58,7 @@ let ss = new StudentTable()
 let x1 = await ss.read()
 
 ss.select(q => q.eq('name', 'a').eq('num', 3).limit(100).order('class'))
+ss.select({ name: 'a', num: 3 })
 // @ts-expect-error
 ss.select(q => q.eq('isPrefect', 'a'))
 ss.selectIn('num', [1, 2, 3])
@@ -78,6 +79,7 @@ ss.update('', { name: 0 })
 ss.update('', { full: 'a' })
 // @ts-expect-error
 ss.update(0, { name: 'a' })
+ss.upsert({ name: 'a', num: 3 }, ['num'])
 
 let st = ss[0]!
 st.name