forj 0.0.6 → 0.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "forj",
   "description": "SQLite ORM and Query Builder whitout dependencies",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "main": "src/index.ts",
   "files": ["src"],

package/src/migrations/blueprint.ts

@@ -23,7 +23,7 @@ export class Blueprint {
   }
 
   id(name: string = 'id') { // Auto-increment ID (bigint unsigned)
-    return this.#column({ name, type: 'BIGINT', unsigned: true, autoIncrement: true, primary: true, nullable: false })
+    return this.#column({ name, type: 'INTEGER', autoIncrement: true, primary: true, nullable: false })
   }
 
   string(name: string, length: number = 255) {
@@ -34,49 +34,58 @@ export class Blueprint {
     return this.#column({ name, type: 'TEXT', nullable: false })
   }
 
-  integer(name: string) {
+  int(name: string) {
     return this.#column({ name, type: 'INTEGER', nullable: false })
   }
-
-  bigInteger(name: string) {
-    return this.#column({ name, type: 'BIGINT', nullable: false })
+  integer(name: string) {
+    return this.int(name)
   }
-
-  tinyInteger(name: string) {
-    return this.#column({ name, type: 'TINYINT', nullable: false })
+  real(name: string) {
+    return this.#column({ name, type: 'REAL', nullable: false })
+  }
+  numeric(name: string) {
+    return this.#column({ name, type: 'NUMERIC', nullable: false })
   }
 
+  // bigInteger(name: string) {
+  //   return this.#column({ name, type: 'BIGINT', nullable: false })
+  // }
+
+  // tinyInteger(name: string) {
+  //   return this.#column({ name, type: 'TINYINT', nullable: false })
+  // }
+
   boolean(name: string) {
-    return this.#column({ name, type: 'BOOLEAN', nullable: false })
+    return this.#column({ name, type: 'INTEGER', nullable: false })
   }
 
-  decimal(name: string, precision: number = 8, scale: number = 2) {
-    return this.#column({ name, type: `DECIMAL(${precision},${scale})`, nullable: false })
-  }
+  // decimal(name: string, precision: number = 8, scale: number = 2) {
+  //   return this.#column({ name, type: `DECIMAL(${precision},${scale})`, nullable: false })
+  // }
 
-  float(name: string) {
-    return this.#column({ name, type: 'FLOAT', nullable: false })
-  }
+  // float(name: string) {
+  //   return this.#column({ name, type: 'FLOAT', nullable: false })
+  // }
 
-  double(name: string) {
-    return this.#column({ name, type: 'DOUBLE', nullable: false })
-  }
+  // double(name: string) {
+  //   return this.#column({ name, type: 'DOUBLE', nullable: false })
+  // }
 
-  date(name: string) {
-    return this.#column({ name, type: 'DATE', nullable: false })
-  }
+  // date(name: string) {
+  //   return this.#column({ name, type: 'DATE', nullable: false })
+  // }
 
-  dateTime(name: string) {
-    return this.#column({ name, type: 'DATETIME', nullable: false })
-  }
+  // dateTime(name: string) {
+  //   return this.#column({ name, type: 'DATETIME', nullable: false })
+  // }
 
-  timestamp(name: string) {
-    return this.#column({ name, type: 'TIMESTAMP', nullable: false })
-  }
+  // timestamp(name: string) {
+  //   return this.#column({ name, type: 'TIMESTAMP', nullable: false })
+  // }
 
-  time(name: string) {
-    return this.#column({ name, type: 'TIME', nullable: false })
-  }
+  // time(name: string) {
+  //   return this.#column({ name, type: 'TIME', nullable: false })
+  // }
 
   json(name: string) {
     return this.#column({ name, type: 'JSON', nullable: false })
@@ -86,14 +95,18 @@ export class Blueprint {
     return this.#column({ name, type: `ENUM(${values.map(v => `'${v}'`).join(', ')})`, nullable: false })
   }
 
+  blob(name: string) {
+    return this.#column({ name, type: 'BLOB', nullable: false })
+  }
+
   timestamps() {
-    this.timestamp('created_at')
-    this.timestamp('updated_at')
+    this.#column({ name: 'created_at', type: 'TEXT', nullable: false })
+    this.#column({ name: 'updated_at', type: 'TEXT', nullable: false })
     return this
   }
 
   softDelete(name: string = 'deleted_at') {
-    this.timestamp(name).nullable()
+    this.#column({ name, type: 'TEXT', nullable: true })
     return this
   }
 

package/src/migrations/builder.ts

@@ -53,8 +53,11 @@ export default class SchemaBuilder {
     if (column.length && !column.type.includes('('))
       sql += `(${column.length})`
 
-    if (column.unsigned)
-      sql += ' UNSIGNED'
+    if (column.autoIncrement)
+      sql += ' AUTOINCREMENT'
+
+    // if (column.unsigned)
+    //   sql += ' UNSIGNED'
 
     if (column.nullable) {
       sql += ' NULL'
@@ -62,9 +65,6 @@ export default class SchemaBuilder {
       sql += ' NOT NULL'
     }
 
-    if (column.autoIncrement)
-      sql += ' AUTO_INCREMENT'
-
     if (column.default !== undefined) {
       if (column.default === null) {
         sql += ' DEFAULT NULL'
@@ -83,8 +83,8 @@ export default class SchemaBuilder {
     if (column.primary)
       sql += ' PRIMARY KEY'
 
-    if (column.comment)
-      sql += ` COMMENT '${column.comment.replace(/'/g, "''")}'`
+    // if (column.comment)
+    //   sql += ` COMMENT '${column.comment.replace(/'/g, "''")}'`
 
     return sql
   }

package/src/migrations/migrator.ts

@@ -8,8 +8,16 @@ import { MigrationInfo, MigrationClass, Queue } from './types'
 const __root = resolve(dirname(new URL(import.meta.url).pathname), '../../../..')
 
 export class Migrator {
-  static #input: string = join(__root, 'migrations')
-  static #output: string = join(__root, 'migrations', 'sql')
+  static #input = join(__root, 'migrations')
+  static #output = join(__root, 'migrations', 'sql')
+  static #createPatterns = [
+    /^create_(\w+)_table$/,
+    /^create_(\w+)$/,
+  ]
+  static #changePatterns = [
+    /.+_(to|from|in)_(\w+)_table$/,
+    /.+_(to|from|in)_(\w+)$/,
+  ]
 
   static inputDir(dir: string) {
     this.#input = join(__root, dir)
@@ -93,6 +101,20 @@ export class Migrator {
     }
   }
 
+  static guess(name: string): [string, boolean] {
+    for (const pattern of this.#createPatterns) {
+      const match = name.match(pattern)
+      if (match) return [match[1], true]
+    }
+
+    for (const pattern of this.#changePatterns) {
+      const match = name.match(pattern)
+      if (match) return [match[2], false]
+    }
+
+    return ['', false]
+  }
+
   static className(name: string) {
     const lastSlashIndex = name.lastIndexOf('/')
     const fileName = lastSlashIndex >= 0 ? name.substring(lastSlashIndex + 1) : name