forj 0.1.8 → 0.1.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "forj",
   "description": "SQLite ORM and Query Builder whitout dependencies",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "main": "src/index.ts",
   "files": ["src"],
@@ -21,8 +21,9 @@
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.1003.0",
     "@aws-sdk/lib-dynamodb": "^3.1003.0",
+    "pathe": "^2.0",
     "pluralize": "^8.0",
-    "t0n": "^0.1.12",
+    "t0n": "^0.1.13",
     "zod": "^4.3.6"
   },
   "devDependencies": {

package/src/migrations/builder.ts

@@ -3,7 +3,11 @@ import { sqlName, tableSlug } from '../utils'
 import type { ColumnDefinition, IndexDefinition, ForeignKeyDefinition } from './types'
 
 export default class SchemaBuilder {
-  static create(blueprint: Blueprint, exist: boolean = false): string {
+  static create(
+    blueprint: Blueprint,
+    exist: boolean = false,
+    rowId: boolean = true
+  ): string {
     const table = sqlName(blueprint.table)
     const columns = blueprint.columns
     const indexes = blueprint.indexes
@@ -19,7 +23,9 @@ export default class SchemaBuilder {
       ...foreignKeyDefinitions
     ].filter(Boolean)
 
-    return `CREATE TABLE ${exist ? 'IF NOT EXISTS ' : ''}${table} (\n  ${allDefinitions.join(',\n  ')}\n);`
+    return `CREATE TABLE ${exist ? 'IF NOT EXISTS ' : ''}${table} (\n  ${allDefinitions.join(',\n  ')}\n)${
+      rowId ? '' : ' WITHOUT ROWID'
+    };`
   }
 
   static alter(blueprint: Blueprint): string[] {

package/src/migrations/migrator.ts

@@ -1,11 +1,12 @@
 import glob from 'tiny-glob'
 import { mkdirSync, existsSync, writeFileSync } from 'node:fs'
-import { dirname, join, resolve } from 'node:path'
-import { Datte, IMPORT } from 't0n'
+import { dirname, join } from 'pathe'
+import { Datte, Envir, IMPORT } from 't0n'
 import { Schema } from './schema'
 import { MigrationInfo, MigrationClass, Queue } from './types'
 
-const __root = resolve(dirname(new URL(import.meta.url).pathname), '../../../..')
+export const _forj = join(dirname(new URL(import.meta.url).pathname), '..')
+export const _root = Envir.get('npm_config_local_prefix') || Envir.get('PWD') || join(_forj, '../../../')
 
 export class Migrator {
   static #input: string
@@ -24,17 +25,17 @@ export class Migrator {
   }
 
   static dir(dir?: string) {
-    this.#input = join(__root, 'migrations', dir || '')
+    this.#input = join(_root, 'migrations', dir || '')
     this.#output = join(this.#input, 'sql')
     return this
   }
 
   static inputDir(dir: string) {
-    this.#input = join(__root, dir)
+    this.#input = join(_root, dir)
     return this
   }
   static outputDir(dir: string) {
-    this.#output = join(__root, dir)
+    this.#output = join(_root, dir)
     return this
   }
 
@@ -88,7 +89,7 @@ export class Migrator {
     if (!match) return null
     const [, year, month, day, hour, minute, second, slugName] = match
 
-    const input = join(__root, fileName)
+    const input = join(_root, fileName)
     const output = join(this.#output, name +'.sql')
     const mod = await IMPORT(input)
     const handler = mod.default as MigrationClass

package/src/migrations/schema.ts

@@ -47,8 +47,8 @@ export class Schema {
     return blueprint
   }
 
-  static create(table: string, fn: BlueprintFn, exist: boolean = false) {
-    this.#addStatement(Builder.create(this.#blueprint(table, fn), exist))
+  static create(table: string, fn: BlueprintFn, exist: boolean = false, rowId: boolean = true) {
+    this.#addStatement(Builder.create(this.#blueprint(table, fn), exist, rowId))
   }
 
   static createIfNotExists(table: string, fn: BlueprintFn) {
@@ -66,7 +66,15 @@ export class Schema {
     this.#addStatement(Builder.create(this.#blueprint(table, fn as BlueprintFn, (table: Blueprint) => {
       columns.forEach(column => table.foreignId(column))
       table.primary(table.columns.map(c => c.name))
-    })).slice(0, -1) + ' WITHOUT ROWID;')
+    }), false, false))
+  }
+
+  static createWithoutRowId(table: string, fn: BlueprintFn, exist: boolean = false) {
+    this.create(table, fn, false, false)
+  }
+
+  static createIfNotExistsWithoutRowId(table: string, fn: BlueprintFn) {
+    this.create(table, fn, true, false)
   }
 
   static table(table: string, fn: BlueprintFn) {

package/src/model.ts

@@ -38,7 +38,8 @@ export default abstract class Model<TB extends keyof DB, DB> {
     M extends typeof Model<TB, DB>,
     I extends InstanceType<M>,
     T extends I['$TShape'],
-  >(this: M, data: Record<keyof T, Value>) {
+    C extends keyof T
+  >(this: M, data: Record<C, Value>) {
     return this.builder<I['$DBShape'], T>().insert(data)
   }
 
@@ -46,7 +47,8 @@ export default abstract class Model<TB extends keyof DB, DB> {
     M extends typeof Model<TB, DB>,
     I extends InstanceType<M>,
     T extends I['$TShape'],
-  >(this: M, data: Record<keyof T, Value>) {
+    C extends keyof T
+  >(this: M, data: Record<C, Value>) {
     return this.builder<I['$DBShape'], T>().update(data)
   }
 

package/src/query-builder.ts

@@ -77,7 +77,7 @@ export default class QueryBuilder<
     return await this.#pipe?.run(this)
   }
 
-  #setType(type: QueryType, data?: Partial<Record<C, Value>>) {
+  #setType<K extends keyof T>(type: QueryType, data?: Partial<Record<K, Value>>) {
     this.#type = type
     if (data) {
       this.#keys = Object.keys(data)
@@ -87,14 +87,14 @@ export default class QueryBuilder<
     return this
   }
 
-  insert(data: Partial<Record<C, Value>>) {
+  insert<K extends keyof T>(data: Partial<Record<K, Value>>) {
     if (this.#opts.timestamps || this.#opts.createdAt) // @ts-ignore
       data.created_at = Timestamp.now()
 
     return this.#setType(types.INSERT, data)
   }
 
-  update(data: Partial<Record<C, Value>>) {
+  update<K extends keyof T>(data: Partial<Record<K, Value>>) {
     if (this.#opts.timestamps || this.#opts.updatedAt) // @ts-ignore
       data.updated_at = Timestamp.now()