forj 0.1.9 → 0.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "forj",
   "description": "SQLite ORM and Query Builder whitout dependencies",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "type": "module",
   "main": "src/index.ts",
   "files": ["src"],
@@ -23,7 +23,7 @@
     "@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/clause-builder.ts

@@ -65,13 +65,13 @@ export default class ClauseBuilder<
     logical: ClauseOperator,
     ...args: WhereArgs<T>
   ) {
-    if (typeof args[0] == 'function')
+    if (typeof args[0] === 'function')
       return this.#nested(args[0], logical)
 
     const length = args.length
     let [column, operator, value] = args
 
-    if (length == 2) { // @ts-ignore
+    if (length === 2) { // @ts-ignore
       value = operator
       operator = '='
     }

package/src/d1/model.ts

@@ -38,7 +38,7 @@ export abstract class BaseModel<TB extends keyof DB, DB> extends BModel<TB, DB>
   }
 
   static DB() {
-    if (typeof this.$db == 'string') { // TODO: improv compatibility without nodejs_compat
+    if (typeof this.$db === 'string') { // TODO: improv compatibility without nodejs_compat
       if (!Envir.has(this.$db))
         throw new Error(`Database '${this.$db}' instance not provided.`)
 

package/src/dynamodb/client.ts

@@ -96,7 +96,7 @@ export class RawClient {
     if (Array.isArray(key)) {
       pk = key[0]
       skValue = key[1] ?? sk
-    } else if (typeof key == 'object' && key != null) {
+    } else if (typeof key === 'object' && key !== null) {
       return key
     } else {
       pk = key

package/src/dynamodb/compact.ts

@@ -70,7 +70,7 @@ export default class Compact {
   }
 
   static decode<T = any>(val: string, schema: SchemaStructure): T {
-    if (!val || typeof val != 'string') return val as T
+    if (!val || typeof val !== 'string') return val as T
 
     return this.withSchema(this.unzip(JSON.parse(
       this.#unpack(val)
@@ -89,7 +89,7 @@ export default class Compact {
     if (this.#cantZip(obj)) return obj
 
     return schema.map(key => {
-      if (typeof key == 'string')
+      if (typeof key === 'string')
         return this.memo(obj[key], seen)
 
       const mainKey = Object.keys(key)[0]
@@ -112,14 +112,14 @@ export default class Compact {
 
     if (this.#cantZip(val, type, length)) return val
 
-    if (type == 'object') {
+    if (type === 'object') {
       for (const key in val)
         val[key] = this.unzip(val[key], seen)
 
       return val
     }
 
-    if (type == 'string' && val.startsWith('^')) {
+    if (type === 'string' && val.startsWith('^')) {
       const item = seen[parseInt(val.slice(1), 10)]
       return item ? item : val
     }
@@ -143,7 +143,7 @@ export default class Compact {
   static entry(key: any, value: any): any {
     if (!key) return undefined
 
-    if (typeof key == 'string')
+    if (typeof key === 'string')
       return [key, value == null ? null : value]
 
     const mainKey = Object.keys(key)[0]
@@ -166,7 +166,7 @@ export default class Compact {
       return val.map(item => this.memo(item, seen))
 
     const type = typeof val
-    if (type == 'object' && val != null) {
+    if (type === 'object' && val !== null) {
       for (const key in val)
         val[key] = this.memo(val[key], seen)
 
@@ -177,7 +177,7 @@ export default class Compact {
     if (this.#cantZip(val, type, length)) return val
 
     const index = seen.indexOf(val)
-    if (index != -1)
+    if (index !== -1)
       return `^${index}`
 
     seen.push(val)
@@ -200,6 +200,6 @@ export default class Compact {
   static #cantZip(val: any, type: string = '', length: number = 0) {
     if (!val || [null, true, false, 'true', 'false'].includes(val)) return true
 
-    return !type && !length ? false : type != 'object' && length < 2
+    return !type && !length ? false : type !== 'object' && length < 2
   }
 }

package/src/dynamodb/decorators.ts

@@ -9,7 +9,7 @@ export function getModelMetadata(target: Function | any): ModelMetadata {
   return {
     table: target.m[0],
     // @ts-ignore
-    keys: typeKeys != 'undefined' ? (typeKeys == 'string' ? { PK: target.m[1] } : { PK: target.m[1][0], SK: target.m[1][1] }) : undefined,
+    keys: typeKeys !== 'undefined' ? (typeKeys === 'string' ? { PK: target.m[1] } : { PK: target.m[1][0], SK: target.m[1][1] }) : undefined,
     defaultSK: target?.defaultSK || undefined,
     zip: target.m[2] || false,
     fields: target.m[3] || [],
@@ -18,7 +18,7 @@ export function getModelMetadata(target: Function | any): ModelMetadata {
 
 function _table(target: Function | any, opt?: ModelOpts) {
   if (!target?.m) target.m = []
-  const table = opt ? (typeof opt == 'string' ? opt : opt?.table) : undefined
+  const table = opt ? (typeof opt === 'string' ? opt : opt?.table) : undefined
 
   target.m[0] = table || pluralize(target.name.toLocaleUpperCase())
 }
@@ -36,7 +36,7 @@ function _key(target: Function | any, pk: string, sk?: string) {
 
 export function _model(target: any, opt?: ModelOpts) {
   _table(target, opt)
-  const notStr = typeof opt != 'string'
+  const notStr = typeof opt !== 'string'
 
   if (!opt || !notStr || (opt?.zip == null || opt?.zip))
     _zip(target)
@@ -68,7 +68,7 @@ function _sk(target: any, prop: string) {
 export function Entity(target: Function): void
 export function Entity(opt?: ModelOpts): ClassDecorator
 export function Entity(...args: any[]): void | ClassDecorator {
-  if (args.length == 1 && typeof args[0] == 'function')
+  if (args.length === 1 && typeof args[0] === 'function')
     return _table(args[0])
 
   return (target: any) => _table(target, ...args)
@@ -77,7 +77,7 @@ export function Entity(...args: any[]): void | ClassDecorator {
 export function Model(target: Function): void
 export function Model(opt?: ModelOpts): ClassDecorator
 export function Model(...args: any[]): void | ClassDecorator {
-  if (args.length == 1 && typeof args[0] == 'function')
+  if (args.length === 1 && typeof args[0] === 'function')
     return _model(args[0])
 
   return (target: any) => _model(target, ...args)
@@ -86,7 +86,7 @@ export function Model(...args: any[]): void | ClassDecorator {
 export function Zip(target: Function): void
 export function Zip(): ClassDecorator
 export function Zip(...args: any[]): void | ClassDecorator {
-  if (args.length == 1 && typeof args[0] == 'function')
+  if (args.length === 1 && typeof args[0] === 'function')
     return _zip(args[0])
 
   return (target: any) => _zip(target)
@@ -105,10 +105,10 @@ export function PartitionKey(target: any, propertyKey: string | undefined, param
 export function PartitionKey(...args: any[]): void | PropertyDecorator {
   if (!args.length) return
 
-  if (typeof args[0] == 'function' && typeof args[1] == 'string' && args[1])
+  if (typeof args[0] === 'function' && typeof args[1] === 'string' && args[1])
     return _pk(args[0], args[1])
 
-  if (args.length == 1 && args[0])
+  if (args.length === 1 && args[0])
     return (target: any) => _pk(target, args[0])
 }
 
@@ -118,9 +118,9 @@ export function SortKey(target: any, propertyKey: string | undefined, parameterI
 export function SortKey(...args: any[]): void | PropertyDecorator {
   if (!args.length) return
 
-  if (typeof args[0] == 'function' && typeof args[1] == 'string' && args[1])
+  if (typeof args[0] === 'function' && typeof args[1] === 'string' && args[1])
     return _sk(args[0], args[1])
 
-  if (args.length == 1 && args[0])
+  if (args.length === 1 && args[0])
     return (target: any) => _sk(target, args[0])
 }

package/src/dynamodb/model.ts

@@ -21,7 +21,7 @@ export default class AbstractModel<T extends object> {
     this.#queryBuilder = queryBuilder
     this.#model = model
 
-    if (typeof (cls as ModelMetadata).table == 'string') {
+    if (typeof (cls as ModelMetadata).table === 'string') {
       this.#meta = cls as ModelMetadata
       this.cls = model?.cls
       return

package/src/dynamodb/repository.ts

@@ -12,7 +12,7 @@ export function Repository<
   base?: B | ModelOpts,
   opts?: ModelOpts
 ) {
-  const isClass = typeof base == 'function'
+  const isClass = typeof base === 'function'
   type M = z.infer<S>
 
   const Repo = Schema(schema, isClass ? base : undefined)

package/src/migrations/blueprint.ts

@@ -95,7 +95,7 @@ export class Blueprint {
   enum(name: string, values: string[] | number[]) {
     return this.#column({
       name,
-      type: values.every(v => typeof v == 'string') ? 'TEXT' : (values.every(v => Number.isInteger(v)) ? 'INTEGER' : 'REAL'),
+      type: values.every(v => typeof v === 'string') ? 'TEXT' : (values.every(v => Number.isInteger(v)) ? 'INTEGER' : 'REAL'),
       // TODO:
       // Checking floating-point numbers can be problematic due to the precision of REAL numbers
       // SQLite might store 0.5 as 0.4999999 or 0.5000001, causing the check to fail
@@ -103,7 +103,7 @@ export class Blueprint {
       //   rate NUMERIC(3,1) NOT NULL DEFAULT 0 CHECK(
       //     rate IN (0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5)
       //   )
-      raw: `CHECK(${name} IN (${values.map(v => typeof v == 'string' ? `'${v.replace(/'/g, "\\'")}'` : v).join(', ')}))`,
+      raw: `CHECK(${name} IN (${values.map(v => typeof v === 'string' ? `'${v.replace(/'/g, "\\'")}'` : v).join(', ')}))`,
     })
   }
 
@@ -112,7 +112,7 @@ export class Blueprint {
   }
 
   timestamps(columnType: 'int' | 'date' = 'int') {
-    const isInt = columnType == 'int'
+    const isInt = columnType === 'int'
     const type = isInt ? 'INTEGER' : 'DATETIME'
     this.#column({ name: 'created_at', type, nullable: true, raw: 'DEFAULT '+ (isInt ? '(unixepoch())' : 'CURRENT_TIMESTAMP') })
     this.#column({ name: 'updated_at', type, nullable: true })
@@ -120,7 +120,7 @@ export class Blueprint {
   }
 
   softDelete(columnType: 'int' | 'date' = 'int', name: string = 'deleted_at') {
-    this.#column({ name, type: columnType == 'int' ? 'INTEGER' : 'DATETIME', nullable: true })
+    this.#column({ name, type: columnType === 'int' ? 'INTEGER' : 'DATETIME', nullable: true })
     return this
   }
   softDeletes(columnType: 'int' | 'date' = 'int', name: string = 'deleted_at') {

package/src/migrations/builder.ts

@@ -78,9 +78,9 @@ export default class SchemaBuilder {
         sql += 'NULL'
       } else {
         const type = typeof column.default
-        if (type == 'string') {
+        if (type === 'string') {
           sql += `'${column.default.replace(/'/g, "\\'")}'`
-        } else if (type == 'boolean') {
+        } else if (type === 'boolean') {
           sql += Number(column.default)
         } else {
           sql += `${column.default}`.replace(/''/g, "'\\'")

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()
 
@@ -136,7 +136,7 @@ export default class QueryBuilder<
     this.#hasJoin = true
     const query = (type ? type + ' ' : '') + `JOIN ${sqlName(table as string)} ON `
 
-    if (typeof args[0] == 'function') {
+    if (typeof args[0] === 'function') {
       const join = new ClauseBuilder<S[J]>(table as string, this.#schema)
       args[0](join)
 
@@ -148,17 +148,17 @@ export default class QueryBuilder<
     const length = args.length
     let [column, operator, value, value2] = args
 
-    if (length == 2) { // @ts-ignore
+    if (length === 2) { // @ts-ignore
       value = operator
       operator = '='
-    } else if (length == 3 && !isOperator(operator)) { // @ts-ignore
+    } else if (length === 3 && !isOperator(operator)) { // @ts-ignore
       value = parseColumn(value as string, operator as string) // TODO: check if value is a valid column
 
       if (this.#schema && !isJoinCompare(value, this.#schema))
         throw new Error(`Table column '${value}' doesn't exists.`)
 
       operator = '='
-    } else if (length == 4) { // @ts-ignore
+    } else if (length === 4) { // @ts-ignore
       value = parseColumn(value2 as string, value as string)
       operator = '='
     }
@@ -549,16 +549,16 @@ export default class QueryBuilder<
     if (this.#clauses.length)
       sql += ' WHERE '+ this.#clauses.clauses.join(' ')
 
-    if (this.#type == types.SELECT && this.#groups.length)
+    if (this.#type === types.SELECT && this.#groups.length)
       sql += ' GROUP BY '+ this.#groups.join(', ')
 
     if (this.#orders.length)
       sql += ' ORDER BY '+ this.#orders.join(', ')
 
-    if (this.#limit != undefined)
+    if (this.#limit !== undefined)
       sql += ' LIMIT '+ this.#limit
 
-    if (this.#offset != undefined)
+    if (this.#offset !== undefined)
       sql += ' OFFSET '+ this.#offset
 
     return sql

package/src/utils.ts

@@ -12,7 +12,7 @@ export const types = {
 const operators = ['=', '!=', '>', '<', '>=', '<=', 'LIKE', 'IN', 'NOT IN', 'IS', 'IS NOT', 'BETWEEN']
 
 export function isOperator(o: any) {
-  return typeof o == 'string' && operators.includes(o)
+  return typeof o === 'string' && operators.includes(o)
 }
 
 export function parseSelectColumn(
@@ -28,7 +28,7 @@ export function parseSelectColumn(
     return col
 
   const [table, column] = explicit ? col.split('.') : [baseTable, col]
-  if (column == '*') return col
+  if (column === '*') return col
 
   return `${table}.${column} AS ${pluralize(table, 1)}_${column}`
 }
@@ -40,14 +40,15 @@ export function parseColumn(name: string, table: string, hasJoin: boolean = true
 }
 
 export function formatValue(value: any): string {
-  if (value == null || value == undefined)
+  // if (value == null || value == undefined)
+  if (value == null)
     return 'NULL'
 
   const type = typeof value
-  if (type == 'number' || type == 'bigint')
+  if (type === 'number' || type === 'bigint')
     return String(value)
 
-  if (type == 'boolean')
+  if (type === 'boolean')
     return value ? '1' : '0'
 
   if (value instanceof Date)
@@ -70,7 +71,7 @@ const zodTypeMap: Record<string, string> = {
   ZodFunction: 'function',
 }
 
-export const isZod = (obj: any): obj is z.ZodTypeAny => obj && typeof obj == 'object' && '_def' in obj
+export const isZod = (obj: any): obj is z.ZodTypeAny => obj && typeof obj === 'object' && '_def' in obj
 
 const getDef = (schema: any) => schema?._def ?? schema?.def ?? {}
 
@@ -78,7 +79,7 @@ const getTypeName = (def: any): string => {
   if (!def) return ''
   if (def.typeName) return def.typeName // zod v3
   if (def.type) { // zod v4
-    if (typeof def.type == 'string') {
+    if (typeof def.type === 'string') {
       if (def.type.startsWith('Zod')) return def.type
       return 'Zod'+ def.type[0].toUpperCase() + def.type.slice(1)
       // return zodTypeMap[def.type] || def.type
@@ -99,10 +100,10 @@ const unwrap = (schema: any): any => {
     const def = current._def || current?.def
     const type = getTypeName(def)
 
-    if (type == 'ZodNullable')
+    if (type === 'ZodNullable')
       allowNull = true
 
-    if (type == 'ZodOptional' || type == 'ZodDefault')
+    if (type === 'ZodOptional' || type === 'ZodDefault')
       allowUndefined = true
 
     if (['ZodOptional', 'ZodNullable', 'ZodDefault', 'ZodReadonly'].includes(type)) {
@@ -110,7 +111,7 @@ const unwrap = (schema: any): any => {
       continue
     }
 
-    if (type == 'ZodEffects' || type == 'ZodPipeline') {
+    if (type === 'ZodEffects' || type === 'ZodPipeline') {
       current = def.schema || def.innerType || def.out
       continue
     }
@@ -123,7 +124,7 @@ const unwrap = (schema: any): any => {
 }
 
 export const zHas = (key: string, schema?: any): boolean => {
-  if (!schema || typeof schema != 'object' || Array.isArray(schema))
+  if (!schema || typeof schema !== 'object' || Array.isArray(schema))
     return false
 
   const keys = key.split('.')
@@ -131,7 +132,7 @@ export const zHas = (key: string, schema?: any): boolean => {
   for (const k of keys) {
     schema = unwrap(schema).schema
 
-    if (!schema || typeof schema != 'object')
+    if (!schema || typeof schema !== 'object')
       return false
 
     if (schema.shape && k in schema.shape) {
@@ -152,7 +153,7 @@ export const zGet = (key: string, schema?: any): [string, z.ZodTypeAny] | false
   for (const k of keys) {
     schema = unwrap(schema).schema
 
-    if (typeof schema != 'object') return false
+    if (typeof schema !== 'object') return false
 
     if (schema?.shape && k in schema.shape) {
       schema = schema.shape[k]
@@ -201,23 +202,23 @@ export const zSame = (key: string, val: any, schema?: any, deep: boolean = false
 
   if (!type) return false
 
-  if (type == 'ZodUnion' && def.options)
+  if (type === 'ZodUnion' && def.options)
     return def.options.some((z: any) => zSame(key, val, z, true))
 
-  if (type == 'ZodArray')
+  if (type === 'ZodArray')
     return Array.isArray(val)
 
-  if (type == 'ZodObject')
-    return typeof val == 'object' && val != null && !Array.isArray(val)
+  if (type === 'ZodObject')
+    return typeof val === 'object' && val !== null && !Array.isArray(val)
 
-  if (type == 'ZodDate')
+  if (type === 'ZodDate')
     return val instanceof Date
 
-  return typeof val == zodTypeMap[type]
+  return typeof val === zodTypeMap[type]
 }
 
 export function isJoinCompare(val: any, schema?: DBSchema) {
-  if (typeof val != 'string' || !val?.includes('.'))
+  if (typeof val !== 'string' || !val?.includes('.'))
     return false
 
   if (!schema)