forj 0.1.5 → 0.1.6

package/package.json

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

package/src/clause-builder.ts

@@ -79,9 +79,8 @@ export default class ClauseBuilder<
     // @ts-ignore
     column = parseColumn(String(column), this.#table)
 
-    if (this.#schema && !zSame(column, value, this.#schema)) {
+    if (this.#schema && !zSame(column.replace(/"/g, ''), value, this.#schema))
       throw new Error(`Table column '${String(column)}' of type '${zType(column, this.#schema)}' is not assignable as type of '${typeof value}'.`)
-    }
 
     return isJoinCompare(value, this.#schema) // @ts-ignore
       ? this.#clause(`${column} ${operator} ${value}`, [], logical) // @ts-ignore

package/src/query-builder.ts

@@ -5,6 +5,7 @@ import {
   formatValue,
   isJoinCompare,
   zSame, zType,
+  sqlName,
 } from './utils'
 import type {
   IJoinBuilder, IClauseBuilder,
@@ -89,7 +90,7 @@ export default class QueryBuilder<
     ...args: JoinArgs<S, J>
   ) {
     this.#hasJoin = true
-    const query = (type ? type + ' ' : '') + `JOIN ${table as string} ON `
+    const query = (type ? type + ' ' : '') + `JOIN ${sqlName(table as string)} ON `
 
     if (typeof args[0] == 'function') {
       const join = new ClauseBuilder<S[J]>(table as string, this.#schema)
@@ -107,7 +108,6 @@ export default class QueryBuilder<
       value = operator
       operator = '='
     } else if (length == 3 && !isOperator(operator)) { // @ts-ignore
-      // console.log(column, operator, value, value2) // @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))
@@ -115,16 +115,16 @@ export default class QueryBuilder<
 
       operator = '='
     } else if (length == 4) { // @ts-ignore
-      // console.log(column, operator, value, value2) // @ts-ignore
       value = parseColumn(value2 as string, value as string)
       operator = '='
     }
 
     const col = parseColumn(String(column), String(table))
-    if (this.#schema && !zSame(col, value, this.#schema))
-      throw new Error(`Table column '${col}' of type '${zType(col, this.#schema)}' is not assignable as type of '${typeof value}'.`)
 
-    if (!isJoinCompare(value, this.#schema)) { // @ts-ignore
+    if (!isJoinCompare(value, this.#schema)) {
+      if (this.#schema && !zSame(col.replace(/"/g, ''), value, this.#schema))
+        throw new Error(`Table column '${col}' of type '${zType(col, this.#schema)}' is not assignable as type of '${typeof value}'.`)
+      // @ts-ignore
       this.#clauses.args = [value] // @ts-ignore // TODO: https://developers.cloudflare.com/d1/worker-api/#type-conversion
       value = '?'
     }

package/src/utils.ts

@@ -25,7 +25,9 @@ export function parseSelectColumn(
 }
 
 export function parseColumn(name: string, table: string, hasJoin: boolean = true) {
-  return !hasJoin || name.includes('.') ? name : table +'.'+ name
+  return !hasJoin || name.includes('.')
+    ? name.split('.').map(col => sqlName(col)).join('.')
+    : sqlName(table) + '.' + sqlName(name)
 }
 
 export function formatValue(value: any): string {
@@ -125,13 +127,17 @@ export const zSame = (key: string, val: any, schema?: any, deep: boolean = false
 }
 
 export function isJoinCompare(val: any, schema?: DBSchema) {
-  // if (!schema) return typeof val == 'string' && val?.includes('.')
-  if (!schema || typeof val != 'string' || !val?.includes('.'))
+  if (typeof val != 'string' || !val?.includes('.'))
     return false
 
-  const keys = zGet(val, schema)
+  if (!schema)
+    return true
+
+  const keys = zGet(val.replace(/"/g, ''), schema)
+  // const keys = zGet(val, schema)
   return keys && keys?.length
 }
+
 // List taken from `aKeywordTable` in https://github.com/sqlite/sqlite/blob/378bf82e2bc09734b8c5869f9b148efe37d29527/tool/mkkeywordhash.c#L172
 // prettier-ignore
 export const SQLITE_KEYWORDS = new Set([