@d-mok/quasar-app-extension-quasar-axe 1.0.39 → 1.0.40

package/package.json

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

package/src/puppets/entity.ts

@@ -4,8 +4,13 @@ import { Constructor } from './type'
 
 export function Entity<
     TBase extends Constructor,
+    K extends string & keyof R,
     R extends InstanceType<TBase> = InstanceType<TBase>
->(RowClass: TBase) {
+>(
+    RowClass: TBase,
+    tableName: string,
+    idKey: K
+) {
 
     class VIEW extends RowClass {
 
@@ -17,8 +22,11 @@ export function Entity<
 
         static _RowClass = RowClass
 
-        static _fields: (string & keyof InstanceType<TBase>)[]
-            = Object.keys(new RowClass()) as any
+        static _tableName = tableName
+
+        static _idKey: K = idKey
+
+        static _fields: any[] = Object.keys(new RowClass())
 
     }
 

package/src/puppets/table.ts

@@ -5,7 +5,12 @@ import { Core } from './core'
 import { Entity } from './entity'
 
 
-type imprinted<R extends object> = { _RowClass: Constructor, _fields: (string & keyof R)[] }
+type imprinted<R extends object> = {
+    _RowClass: Constructor
+    _tableName: string
+    _idKey: string & keyof R
+    _fields: any[]
+}
 type EntityClass<T extends R, R extends object> = Constructor<T> & imprinted<R>
 type RowOf<E extends EntityClass<any, any>> = InstanceType<E['_RowClass']>
 
@@ -18,15 +23,17 @@ function logCreate(tableName: string, idKey: string, entityName: string) {
 
 
 export function Table<
-    K extends string & keyof R,
     ClassT extends EntityClass<T, R>,
     R extends RowOf<ClassT> = RowOf<ClassT>,
     T extends R = InstanceType<ClassT>
->(
-    EntityClass: ClassT,
-    idKey: K,
-    tableName: string = EntityClass.name.toLowerCase(),
-) {
+    >(
+        EntityClass: ClassT,
+        ordering: Ordering<InstanceType<ClassT>> = []
+    ) {
+
+    const tableName: string = EntityClass._tableName
+    const idKey: ClassT['_idKey'] = EntityClass._idKey
+    const fields: any[] = EntityClass._fields
 
     logCreate(tableName, idKey, EntityClass.name)
 
@@ -43,7 +50,7 @@ export function Table<
         return new Core<T, R>(
             tableName,
             idKey,
-            EntityClass._fields,
+            fields,
             convertor(host)
         )
     }
@@ -51,11 +58,9 @@ export function Table<
 
     class Base extends Sheet<T>  {
 
-        /** The default ordering instruction object. */
-        protected readonly ordering: Readonly<Ordering<T>> = []
 
         protected reorder() {
-            this.order(...this.ordering)
+            this.order(...ordering)
         }
 
 
@@ -78,7 +83,7 @@ export function Table<
     class TableView extends Base {
 
         private orderByList<K extends keyof R>(key: K, vals: R[K][]) {
-            this.ordering.length === 0
+            ordering.length === 0
                 ? this.reorder()
                 : this.order({ [key]: vals } as any)
         }
@@ -153,7 +158,7 @@ export function Table<
         }
 
 
-        update(idVal: R[K], row: Partial<R>) {
+        update(idVal: R[ClassT['_idKey']], row: Partial<R>) {
             let callback = ($: T[]) => {
                 this.merge($, idKey)
                 this.reorder()
@@ -170,7 +175,7 @@ export function Table<
         }
 
 
-        delete(idVal: R[K]) {
+        delete(idVal: R[ClassT['_idKey']]) {
             let callback = ($: T[]) => {
                 this.discard({ [idKey]: idVal } as any)
                 this.reorder()
@@ -222,7 +227,7 @@ export function Table<
 
 
 
-// class Student extends Entity(StudentRow).EDIT {
+// class Student extends Entity(StudentRow, 'student', 'num').EDIT {
 
 //     public full = this.class + this.name
 
@@ -231,14 +236,13 @@ export function Table<
 
 // let s = new Student()
 // // s.ful
-// s.update({ num: 1 })
 
 
 
 
-// class StudentsCollection extends Table(Student, 'num').EDIT {
 
-//     protected ordering = ['name'] as const
+// class StudentsCollection extends Table(Student,['full']).EDIT {
+
 
 //     protected override onChange() {
 //         return 1
@@ -248,8 +252,8 @@ export function Table<
 
 
 // let ss = new StudentsCollection()
-// ss.select().eq('num', 1)
-// ss.insert({ nae }).confirm('a')
-// ss.delete('f')
+// ss.select().eq('num',)
+// ss.insert()
+// ss.delete(1)