bugfix

Tarasikee · Aug 26, 2022 · 6f98448 · 6f98448
1 parent b359f91
commit 6f98448
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 30 deletions.
diff --git a/src/classes/Instance.ts b/src/classes/Instance.ts
@@ -46,8 +46,11 @@ export class Instance<T extends { _id: string }> {
         const table = this.getTable()
 
         if (this._options.isNew) {
+            const _id = this._fields._id || crypto.randomUUID()
+
             new ColumnsUtils(this._schema.columns, table, this._fields)
-            table.push({...this._fields, _id: this._fields._id || crypto.randomUUID()})
+            table.push({...this._fields, _id})
+            this._fields._id = _id
 
             this.writeTable([...table])
         } else {
@@ -57,5 +60,7 @@ export class Instance<T extends { _id: string }> {
 
             this.writeTable([...filteredTable])
         }
+
+        return this
     }
 }
diff --git a/src/interfaces/Document.ts b/src/interfaces/Document.ts
@@ -1,5 +1,3 @@
 export interface Document {
     _id: string
-    _tableName: string
-    _url: string
 }
diff --git a/tests/userInitiale.ts b/tests/userInitiale.ts
@@ -2,33 +2,45 @@ import {Column, Document, Model, Schema, TinyTable} from "../tinydb.ts"
 
 @TinyTable("users")
 class User {
-  @Column({
-    type: "string",
-    unique: true
-  })
-  name!: string
-
-  @Column({
-    type: "date"
-  })
-  birthday!: string
-
-  @Column({
-    type: "boolean",
-    default: false,
-    allowNull: true
-  })
-  isAdmin!: boolean
-
-  @Column({
-    allowNull: true,
-    type: "json",
-    default: {
-      theme: "light",
-      lang: "en"
-    }
-  })
-  settings!: Record<string, unknown>
+    @Column({
+        type: "string",
+        unique: true
+    })
+    name!: string
+
+    @Column({
+        type: "date"
+    })
+    birthday!: string
+
+    @Column({
+        type: "boolean",
+        default: false,
+        allowNull: true
+    })
+    isAdmin!: boolean
+
+    @Column({
+        allowNull: true,
+        type: "json",
+        default: {
+            theme: "light",
+            lang: "en"
+        }
+    })
+    settings!: Record<string, unknown>
+
+    // @Column({
+    //     allowNull: true,
+    //     default: [],
+    //     type: "model"
+    // })
+    // friends!: string[]
+
+    // @Column({
+    //     type: "model"
+    // })
+    // profile!: User
 }
 
 export type userDocument = User & Document