@ghom/orm 1.0.0 → 1.1.0

package/dist/app/orm.js

@@ -48,21 +48,25 @@ class ORM extends handler_1.Handler {
             const tables = await Promise.all(pathList.map(async (filepath) => {
                 return Promise.resolve().then(() => __importStar(require(filepath))).then((file) => file.default);
             }));
-            tables.unshift(new table_1.Table({
+            const migration = new table_1.Table({
                 name: "migration",
                 priority: Infinity,
                 setup: (table) => {
                     table.string("table").unique().notNullable();
                     table.integer("version").notNullable();
                 },
-            }));
-            tables.forEach((table) => (table.orm = this));
-            return Promise.all(tables
-                .sort((a, b) => {
-                return (b.options.priority ?? 0) - (a.options.priority ?? 0);
-            })
-                .map((table) => table.make()));
+            });
+            migration.orm = this;
+            await migration.make();
+            for (const table of tables.sort((a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0))) {
+                table.orm = this;
+                await table.make();
+            }
         });
+        try {
+            await this.db.raw("PRAGMA foreign_keys = ON;");
+        }
+        catch (error) { }
         await this.load();
     }
 }

package/dist/app/table.d.ts

@@ -10,6 +10,7 @@ export interface TableOptions<Type> {
     migrations?: {
         [version: number]: (table: Knex.CreateTableBuilder) => void;
     };
+    then?: (this: Table<Type>, table: Table<Type>) => unknown;
     setup: (table: Knex.CreateTableBuilder) => void;
 }
 export declare class Table<Type> {
@@ -27,6 +28,8 @@ export declare class Table<Type> {
         _intersectProps: {};
         _unionProps: never;
     }[]>;
+    hasColumn(name: keyof Type): Promise<boolean>;
+    isEmpty(): Promise<boolean>;
     make(): Promise<this>;
     private migrate;
 }

package/dist/app/table.js

@@ -18,6 +18,15 @@ class Table {
     get query() {
         return this.db(this.options.name);
     }
+    async hasColumn(name) {
+        return this.db.schema.hasColumn(this.options.name, name);
+    }
+    async isEmpty() {
+        return this.query
+            .select()
+            .limit(1)
+            .then((rows) => rows.length === 0);
+    }
     async make() {
         try {
             await this.db.schema.createTable(this.options.name, this.options.setup);
@@ -46,6 +55,7 @@ class Table {
             if (this.verbose)
                 console.error(error);
         }
+        await this.options.then?.bind(this)(this);
         return this;
     }
     async migrate() {
@@ -59,7 +69,7 @@ class Table {
             .first();
         const data = fromDatabase || {
             table: this.options.name,
-            version: -1,
+            version: -Infinity,
         };
         const baseVersion = data.version;
         await this.db.schema.alterTable(this.options.name, (builder) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghom/orm",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,6 +17,7 @@
   "devDependencies": {
     "@vscode/sqlite3": "^5.0.7",
     "better-sqlite3": "^7.5.0",
+    "dotenv": "^16.0.0",
     "jest": "^27.5.1",
     "prettier": "^2.5.1",
     "typescript": "^4.5.5"

package/src/app/orm.ts

@@ -43,28 +43,30 @@ export class ORM extends Handler {
         })
       )
 
-      tables.unshift(
-        new Table<MigrationData>({
-          name: "migration",
-          priority: Infinity,
-          setup: (table) => {
-            table.string("table").unique().notNullable()
-            table.integer("version").notNullable()
-          },
-        })
-      )
+      const migration = new Table<MigrationData>({
+        name: "migration",
+        priority: Infinity,
+        setup: (table) => {
+          table.string("table").unique().notNullable()
+          table.integer("version").notNullable()
+        },
+      })
 
-      tables.forEach((table) => (table.orm = this))
+      migration.orm = this
+      await migration.make()
 
-      return Promise.all(
-        tables
-          .sort((a, b) => {
-            return (b.options.priority ?? 0) - (a.options.priority ?? 0)
-          })
-          .map((table) => table.make())
-      )
+      for (const table of tables.sort(
+        (a, b) => (b.options.priority ?? 0) - (a.options.priority ?? 0)
+      )) {
+        table.orm = this
+        await table.make()
+      }
     })
 
+    try {
+      await this.db.raw("PRAGMA foreign_keys = ON;")
+    } catch (error) {}
+
     await this.load()
   }
 }

package/src/app/table.ts

@@ -10,6 +10,7 @@ export interface TableOptions<Type> {
   name: string
   priority?: number
   migrations?: { [version: number]: (table: Knex.CreateTableBuilder) => void }
+  then?: (this: Table<Type>, table: Table<Type>) => unknown
   setup: (table: Knex.CreateTableBuilder) => void
 }
 
@@ -32,6 +33,17 @@ export class Table<Type> {
     return this.db<Type>(this.options.name)
   }
 
+  async hasColumn(name: keyof Type): Promise<boolean> {
+    return this.db.schema.hasColumn(this.options.name, name as string)
+  }
+
+  async isEmpty(): Promise<boolean> {
+    return this.query
+      .select()
+      .limit(1)
+      .then((rows) => rows.length === 0)
+  }
+
   async make(): Promise<this> {
     try {
       await this.db.schema.createTable(this.options.name, this.options.setup)
@@ -62,6 +74,8 @@ export class Table<Type> {
       if (this.verbose) console.error(error)
     }
 
+    await this.options.then?.bind(this)(this)
+
     return this
   }
 
@@ -83,7 +97,7 @@ export class Table<Type> {
 
     const data = fromDatabase || {
       table: this.options.name,
-      version: -1,
+      version: -Infinity,
     }
 
     const baseVersion = data.version

package/tests/.env

@@ -0,0 +1 @@
+DEBUG=knex*

package/tests/tables/a.js

@@ -3,8 +3,19 @@ const { Table } = require("../../dist/index")
 module.exports = new Table({
   name: "a",
   priority: 0,
-  setup: (table) => {
-    table.increments("id").primary()
-    table.integer("b_id").references("id").inTable("b").notNullable()
+  setup(table) {
+    table.increments("id").primary().notNullable()
+    table
+      .integer("b_id")
+      .references("id")
+      .inTable("b")
+      .onDelete("cascade")
+      .notNullable()
+  },
+  async then({ query }) {
+    await query.insert({
+      id: 0,
+      b_id: 0,
+    })
   },
 })

package/tests/tables/b.js

@@ -4,10 +4,21 @@ module.exports = new Table({
   name: "b",
   migrations: {
     0: (table) =>
-      table.integer("c_id").references("id").inTable("c").notNullable(),
+      table
+        .integer("c_id")
+        .references("id")
+        .inTable("c")
+        .onDelete("cascade")
+        .notNullable(),
   },
   priority: 1,
-  setup: (table) => {
-    table.increments("id").primary()
+  setup(table) {
+    table.increments("id").primary().notNullable()
+  },
+  async then({ query }) {
+    await query.insert({
+      id: 0,
+      c_id: 0,
+    })
   },
 })

package/tests/tables/c.js

@@ -3,7 +3,10 @@ const { Table } = require("../../dist/index")
 module.exports = new Table({
   name: "c",
   priority: 2,
-  setup: (table) => {
-    table.increments("id").primary()
+  setup(table) {
+    table.increments("id").primary().notNullable()
+  },
+  async then({ query }) {
+    await query.insert({ id: 0 })
   },
 })

package/tests/test.js

@@ -1,5 +1,9 @@
+require("dotenv").config({ path: "./.env" })
 const path = require("path")
 const { ORM } = require("../dist/index")
+const a = require("./tables/a")
+const b = require("./tables/b")
+const c = require("./tables/c")
 
 const orm = new ORM({
   tablePath: path.join(__dirname, "tables"),
@@ -21,6 +25,16 @@ test("migrations ran", async () => {
   expect(await orm.db.schema.hasColumn("b", "c_id")).toBeTruthy()
 })
 
+test("then ran", async () => {
+  const rows = await orm.db("a").select()
+  expect(rows.length).toBe(1)
+})
+
+test("cascade delete", async () => {
+  await c.query.del()
+  expect(await a.isEmpty()).toBeTruthy()
+})
+
 afterAll(async () => {
   await orm.db.destroy()
 })