xansql 1.0.8 → 1.0.9

package/model/Args/WhereArgs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"WhereArgs.cjs","sources":["../../../src/model/Args/WhereArgs.ts"],"sourcesContent":["import Model from \"..\";\nimport Foreign from \"../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../core/XansqlError\";\nimport XqlArray from \"../../xt/fields/Array\";\nimport XqlObject from \"../../xt/fields/Object\";\nimport XqlRecord from \"../../xt/fields/Record\";\nimport XqlTuple from \"../../xt/fields/Tuple\";\nimport { escapeSqlValue, isArray, isObject } from \"../../utils\";\nimport ValueFormatter from \"../include/ValueFormatter\";\nimport { WhereArgsType, WhereSubCondition } from \"../types\";\n\ntype Meta = {\n   parentTable: string\n}\n\nclass WhereArgs {\n   private model: Model\n   // private where: WhereArgsType\n   // private meta: Meta | undefined\n   readonly wheres: string[]\n   readonly sql: string = ''\n   private condition_keys = [\"equals\", \"not\", \"lt\", \"lte\", \"gt\", \"gte\", \"in\", \"notIn\", \"between\", \"notBetween\", \"contains\", \"notContains\", \"startsWith\", \"endsWith\", \"isNull\", \"isNotNull\", \"isEmpty\", \"isNotEmpty\", \"isTrue\", \"isFalse\"]\n\n   constructor(model: Model, where: WhereArgsType | WhereArgsType[], meta?: Meta) {\n      this.model = model\n\n      let schema = model.schema\n      let wheres: string[] = []\n\n      if (Array.isArray(where)) {\n         let _ors = []\n         for (let w of where) {\n            const whereArgs = new WhereArgs(model, w, meta)\n            if (whereArgs.sql) {\n               if (whereArgs.wheres.length > 1) {\n                  _ors.push(`(${whereArgs.wheres.join(\" AND \")})`)\n               } else {\n                  _ors.push(`${whereArgs.wheres.join(\" AND \")}`)\n               }\n            }\n         }\n\n         if (_ors.length) {\n            wheres.push(`(${_ors.join(\" OR \")})`)\n         }\n      } else {\n         for (let column in where) {\n            this.checkIsAllowed(column)\n            const value: any = where[column]\n            const field = schema[column]\n\n            if (Foreign.is(field)) {\n               if (!isArray(value) && !isObject(value)) {\n                  throw new XansqlError({\n                     message: `${column} must be an object or array in the WHERE clause, but received ${typeof value} in table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               } else if (isObject(value) && Object.keys(value).length === 0 || isArray(value) && value.length === 0) {\n                  // skip empty object\n                  continue;\n               }\n\n               if (Foreign.isSchema(field) && isObject(value) && Object.keys(value).some(k => this.condition_keys.includes(k))) {\n                  const v = this.condition(column, value as WhereSubCondition)\n                  wheres.push(v)\n                  continue\n               }\n\n               let foreign = Foreign.get(model, column)\n               let FModel = model.xansql.getModel(foreign.table)\n               if (meta && meta.parentTable === foreign.table) {\n                  throw new XansqlError({\n                     message: `Circular reference detected in WHERE clause for table ${model.table} on column ${column}`,\n                     model: model.table,\n                     column\n                  });\n               }\n               let _sql = ''\n               if (Array.isArray(value) || isObject(value)) {\n                  const where = new WhereArgs(FModel, value, { parentTable: model.table })\n                  if (where.sql) {\n                     _sql = where.wheres.join(\" AND \")\n                  }\n               } else {\n                  throw new XansqlError({\n                     message: `Invalid value for foreign key ${column} in WHERE clause of table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               }\n\n               wheres.push(`EXISTS (SELECT 1 FROM ${foreign.table} WHERE ${foreign.sql} ${_sql ? ` AND ${_sql}` : \"\"})`)\n            } else {\n               let v = ''\n               if (Array.isArray(value)) {\n                  const sub = value.map((_v: any) => {\n                     return isObject(_v)\n                        ? this.condition(column, _v)\n                        : `${model.table}.${column} = ${ValueFormatter.toSql(model, column, _v)}`\n                  })\n                  if (sub.length > 1) {\n                     v = `(${sub.join(\" OR \")})`\n                  } else {\n                     v = sub.join(\" OR \")\n                  }\n               } else if (isObject(value)) {\n                  v = this.condition(column, value)\n               } else {\n                  v = `${model.table}.${column} = ${ValueFormatter.toSql(model, column, value)}`\n               }\n               wheres.push(v)\n            }\n         }\n      }\n\n      this.wheres = wheres\n      this.sql = this.wheres.length ? `WHERE ${this.wheres.join(\" AND \")} ` : \"\"\n   }\n\n   private condition(column: string, conditions: WhereSubCondition) {\n      const model = this.model\n      const generate = Object.keys(conditions).map((subKey) => {\n         let value = (conditions as any)[subKey];\n         if (isObject(value)) {\n            throw new XansqlError({\n               message: `Invalid value for where condition ${subKey} on column ${column} in table ${model.table}`,\n               model: model.table,\n               column\n            });\n         }\n         let val: string = value;\n         if (Array.isArray(val)) {\n            if (['in', 'notIn'].includes(subKey)) {\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\", \");\n            } else if (['between', 'notBetween'].includes(subKey)) {\n               if (val.length !== 2) {\n                  throw new XansqlError({\n                     message: `The 'between' and 'notBetween' operators require an array of exactly two values for column ${column} in table ${model.table}.`,\n                     model: model.table,\n                     column\n                  });\n               }\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\" AND \");\n            } else {\n               throw new XansqlError({\n                  message: `Array value is not supported for operator ${subKey} on column ${column} in table ${model.table}.`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else if (typeof val === 'boolean') {\n            val = val ? \"1\" : \"0\";\n         } else {\n            val = ValueFormatter.toSql(model, column, val);\n         }\n\n         let col = model.table + \".\" + column;\n         switch (subKey) {\n            case 'equals':\n               if (val === \"NULL\") return `${col} IS NULL`;\n               return `${col} = ${val}`;\n            case 'not':\n               if (val === \"NULL\") return `${col} IS NOT NULL`;\n               return `${col} != ${val}`;\n            case 'lt':\n               return `${col} < ${val}`;\n            case 'lte':\n               return `${col} <= ${val}`;\n            case 'gt':\n               return `${col} > ${val}`;\n            case 'gte':\n               return `${col} >= ${val}`;\n            case 'in':\n               if (val?.length === 0) {\n                  return `1 = 0`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} = ${val}`;\n               }\n               return `${col} IN (${val})`;\n            case 'notIn':\n               // handle empty array and val is a single value\n               if (val.length === 0) {\n                  return `1 = 1`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} != ${val}`;\n               }\n               return `${col} NOT IN (${val})`;\n            case 'between':\n               return `${col} BETWEEN (${val})`;\n            case 'notBetween':\n               return `${col} NOT BETWEEN (${val})`;\n            case 'contains':\n               return `${col} LIKE '%${escapeSqlValue(value)}%'`;\n            case 'notContains':\n               return `${col} NOT LIKE '%${escapeSqlValue(value)}%'`;\n            case 'startsWith':\n               return `${col} LIKE '${escapeSqlValue(value)}%'`;\n            case 'endsWith':\n               return `${col} LIKE '%${escapeSqlValue(value)}'`;\n            case 'isNull':\n               return `${col} IS NULL`;\n            case 'isNotNull':\n               return `${col} IS NOT NULL`;\n            case 'isEmpty':\n               return `(${col} IS NULL OR LENGTH(${col}) = 0)`;\n            case 'isNotEmpty':\n               return `(WHERE ${col} IS NOT NULL AND LENGTH(${col}) > 0)`;\n            case 'isTrue':\n               return `${col} = TRUE`;\n            case 'isFalse':\n               return `${col} = FALSE`;\n            default:\n               throw new XansqlError({\n                  message: `Unknown where condition ${subKey} on column ${column} in table ${model.table}`,\n                  model: model.table,\n                  column\n               });\n         }\n      });\n\n      return `${generate.join(' AND ')}`;\n   }\n\n   private checkIsAllowed(column: string) {\n      const xanv = this.model.schema[column]\n      if (Foreign.isArray(xanv)) return true\n      const isNotAllowed = xanv instanceof XqlArray\n         || xanv instanceof XqlObject\n         || xanv instanceof XqlRecord\n         || xanv instanceof XqlTuple\n      // || xanv instanceof XqlFile\n\n      if (isNotAllowed) {\n         throw new XansqlError({\n            message: `Field ${column} of type ${xanv.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,\n            model: this.model.table,\n            column\n         });\n      }\n   }\n}\n\nexport default WhereArgs;"],"names":["Foreign","isArray","isObject","XansqlError","ValueFormatter","escapeSqlValue","XqlArray","XqlObject","XqlRecord","XqlTuple"],"mappings":"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"}
+{"version":3,"file":"WhereArgs.cjs","sources":["../../../src/model/Args/WhereArgs.ts"],"sourcesContent":["import Model from \"..\";\nimport Foreign from \"../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../core/XansqlError\";\nimport XqlArray from \"../../xt/fields/Array\";\nimport XqlObject from \"../../xt/fields/Object\";\nimport XqlRecord from \"../../xt/fields/Record\";\nimport XqlTuple from \"../../xt/fields/Tuple\";\nimport { escapeSqlValue, iof, isArray, isObject } from \"../../utils\";\nimport ValueFormatter from \"../include/ValueFormatter\";\nimport { WhereArgsType, WhereSubCondition } from \"../types\";\nimport XqlFile from \"../../xt/fields/File\";\n\ntype Meta = {\n   parentTable: string\n}\n\nclass WhereArgs {\n   private model: Model\n   // private where: WhereArgsType\n   // private meta: Meta | undefined\n   readonly wheres: string[]\n   readonly sql: string = ''\n   private condition_keys = [\"equals\", \"not\", \"lt\", \"lte\", \"gt\", \"gte\", \"in\", \"notIn\", \"between\", \"notBetween\", \"contains\", \"notContains\", \"startsWith\", \"endsWith\", \"isNull\", \"isNotNull\", \"isEmpty\", \"isNotEmpty\", \"isTrue\", \"isFalse\"]\n\n   constructor(model: Model, where: WhereArgsType | WhereArgsType[], meta?: Meta) {\n      this.model = model\n\n      let schema = model.schema\n      let wheres: string[] = []\n\n      if (Array.isArray(where)) {\n         let _ors = []\n         for (let w of where) {\n            const whereArgs = new WhereArgs(model, w, meta)\n            if (whereArgs.sql) {\n               if (whereArgs.wheres.length > 1) {\n                  _ors.push(`(${whereArgs.wheres.join(\" AND \")})`)\n               } else {\n                  _ors.push(`${whereArgs.wheres.join(\" AND \")}`)\n               }\n            }\n         }\n\n         if (_ors.length) {\n            wheres.push(`(${_ors.join(\" OR \")})`)\n         }\n      } else {\n         for (let column in where) {\n            this.checkIsAllowed(column)\n            const value: any = where[column]\n            const field = schema[column]\n\n            if (Foreign.is(field)) {\n               if (!isArray(value) && !isObject(value)) {\n                  throw new XansqlError({\n                     message: `${column} must be an object or array in the WHERE clause, but received ${typeof value} in table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               } else if (isObject(value) && Object.keys(value).length === 0 || isArray(value) && value.length === 0) {\n                  // skip empty object\n                  continue;\n               }\n\n               if (Foreign.isSchema(field) && isObject(value) && Object.keys(value).some(k => this.condition_keys.includes(k))) {\n                  const v = this.condition(column, value as WhereSubCondition)\n                  wheres.push(v)\n                  continue\n               }\n\n               let foreign = Foreign.get(model, column)\n               let FModel = model.xansql.getModel(foreign.table)\n               if (meta && meta.parentTable === foreign.table) {\n                  throw new XansqlError({\n                     message: `Circular reference detected in WHERE clause for table ${model.table} on column ${column}`,\n                     model: model.table,\n                     column\n                  });\n               }\n               let _sql = ''\n               if (Array.isArray(value) || isObject(value)) {\n                  const where = new WhereArgs(FModel, value, { parentTable: model.table })\n                  if (where.sql) {\n                     _sql = where.wheres.join(\" AND \")\n                  }\n               } else {\n                  throw new XansqlError({\n                     message: `Invalid value for foreign key ${column} in WHERE clause of table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               }\n\n               wheres.push(`EXISTS (SELECT 1 FROM ${foreign.table} WHERE ${foreign.sql} ${_sql ? ` AND ${_sql}` : \"\"})`)\n            } else {\n               let v = ''\n               if (Array.isArray(value)) {\n                  const sub = value.map((_v: any) => {\n                     return isObject(_v)\n                        ? this.condition(column, _v)\n                        : `${model.table}.${column} = ${ValueFormatter.toSql(model, column, _v)}`\n                  })\n                  if (sub.length > 1) {\n                     v = `(${sub.join(\" OR \")})`\n                  } else {\n                     v = sub.join(\" OR \")\n                  }\n               } else if (isObject(value)) {\n                  v = this.condition(column, value)\n               } else {\n                  v = `${model.table}.${column} = ${ValueFormatter.toSql(model, column, value)}`\n               }\n               wheres.push(v)\n            }\n         }\n      }\n\n      this.wheres = wheres\n      this.sql = this.wheres.length ? `WHERE ${this.wheres.join(\" AND \")} ` : \"\"\n   }\n\n   private condition(column: string, conditions: WhereSubCondition) {\n      const model = this.model\n      const generate = Object.keys(conditions).map((subKey) => {\n         let value = (conditions as any)[subKey];\n         if (isObject(value)) {\n            throw new XansqlError({\n               message: `Invalid value for where condition ${subKey} on column ${column} in table ${model.table}`,\n               model: model.table,\n               column\n            });\n         }\n         let val: string = value;\n         if (Array.isArray(val)) {\n            if (['in', 'notIn'].includes(subKey)) {\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\", \");\n            } else if (['between', 'notBetween'].includes(subKey)) {\n               if (val.length !== 2) {\n                  throw new XansqlError({\n                     message: `The 'between' and 'notBetween' operators require an array of exactly two values for column ${column} in table ${model.table}.`,\n                     model: model.table,\n                     column\n                  });\n               }\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\" AND \");\n            } else {\n               throw new XansqlError({\n                  message: `Array value is not supported for operator ${subKey} on column ${column} in table ${model.table}.`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else if (typeof val === 'boolean') {\n            val = val ? \"1\" : \"0\";\n         } else {\n            val = ValueFormatter.toSql(model, column, val);\n         }\n\n         let col = model.table + \".\" + column;\n         switch (subKey) {\n            case 'equals':\n               if (val === \"NULL\") return `${col} IS NULL`;\n               return `${col} = ${val}`;\n            case 'not':\n               if (val === \"NULL\") return `${col} IS NOT NULL`;\n               return `${col} != ${val}`;\n            case 'lt':\n               return `${col} < ${val}`;\n            case 'lte':\n               return `${col} <= ${val}`;\n            case 'gt':\n               return `${col} > ${val}`;\n            case 'gte':\n               return `${col} >= ${val}`;\n            case 'in':\n               if (val?.length === 0) {\n                  return `1 = 0`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} = ${val}`;\n               }\n               return `${col} IN (${val})`;\n            case 'notIn':\n               // handle empty array and val is a single value\n               if (val.length === 0) {\n                  return `1 = 1`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} != ${val}`;\n               }\n               return `${col} NOT IN (${val})`;\n            case 'between':\n               return `${col} BETWEEN (${val})`;\n            case 'notBetween':\n               return `${col} NOT BETWEEN (${val})`;\n            case 'contains':\n               return `${col} LIKE '%${escapeSqlValue(value)}%'`;\n            case 'notContains':\n               return `${col} NOT LIKE '%${escapeSqlValue(value)}%'`;\n            case 'startsWith':\n               return `${col} LIKE '${escapeSqlValue(value)}%'`;\n            case 'endsWith':\n               return `${col} LIKE '%${escapeSqlValue(value)}'`;\n            case 'isNull':\n               return `${col} IS NULL`;\n            case 'isNotNull':\n               return `${col} IS NOT NULL`;\n            case 'isEmpty':\n               return `(${col} IS NULL OR LENGTH(${col}) = 0)`;\n            case 'isNotEmpty':\n               return `(WHERE ${col} IS NOT NULL AND LENGTH(${col}) > 0)`;\n            case 'isTrue':\n               return `${col} = TRUE`;\n            case 'isFalse':\n               return `${col} = FALSE`;\n            default:\n               throw new XansqlError({\n                  message: `Unknown where condition ${subKey} on column ${column} in table ${model.table}`,\n                  model: model.table,\n                  column\n               });\n         }\n      });\n\n      return `${generate.join(' AND ')}`;\n   }\n\n   private checkIsAllowed(column: string) {\n      const field = this.model.schema[column]\n      if (Foreign.isArray(field)) return true\n      const isNotAllowed = iof(field, XqlArray, XqlObject, XqlRecord, XqlTuple, XqlFile)\n\n      if (isNotAllowed) {\n         throw new XansqlError({\n            message: `Field ${column} of type ${field.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,\n            model: this.model.table,\n            column\n         });\n      }\n   }\n}\n\nexport default WhereArgs;"],"names":["Foreign","isArray","isObject","XansqlError","ValueFormatter","escapeSqlValue","iof","XqlArray","XqlObject","XqlRecord","XqlTuple","XqlFile"],"mappings":";;;;;;;;;;;;AAgBA,MAAM,SAAS,CAAA;AAQZ,IAAA,WAAA,CAAY,KAAY,EAAE,KAAsC,EAAE,IAAW,EAAA;QAHpE,IAAA,CAAA,GAAG,GAAW,EAAE;AACjB,QAAA,IAAA,CAAA,cAAc,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC;AAGnO,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;AAElB,QAAA,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM;QACzB,IAAI,MAAM,GAAa,EAAE;AAEzB,QAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACvB,IAAI,IAAI,GAAG,EAAE;AACb,YAAA,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBAClB,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC;AAC/C,gBAAA,IAAI,SAAS,CAAC,GAAG,EAAE;oBAChB,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;AAC9B,wBAAA,IAAI,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAA,CAAG,CAAC;oBACnD;yBAAO;AACJ,wBAAA,IAAI,CAAC,IAAI,CAAC,CAAA,EAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAE,CAAC;oBACjD;gBACH;YACH;AAEA,YAAA,IAAI,IAAI,CAAC,MAAM,EAAE;AACd,gBAAA,MAAM,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAA,CAAG,CAAC;YACxC;QACH;aAAO;AACJ,YAAA,KAAK,IAAI,MAAM,IAAI,KAAK,EAAE;AACvB,gBAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;AAC3B,gBAAA,MAAM,KAAK,GAAQ,KAAK,CAAC,MAAM,CAAC;AAChC,gBAAA,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;AAE5B,gBAAA,IAAIA,wBAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;AACpB,oBAAA,IAAI,CAACC,mBAAO,CAAC,KAAK,CAAC,IAAI,CAACC,oBAAQ,CAAC,KAAK,CAAC,EAAE;wBACtC,MAAM,IAAIC,gBAAW,CAAC;4BACnB,OAAO,EAAE,CAAA,EAAG,MAAM,CAAA,8DAAA,EAAiE,OAAO,KAAK,CAAA,UAAA,EAAa,KAAK,CAAC,KAAK,CAAA,CAAE;4BACzH,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB;AACF,yBAAA,CAAC;oBACL;yBAAO,IAAID,oBAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,IAAID,mBAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;;wBAEpG;oBACH;AAEA,oBAAA,IAAID,wBAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAIE,oBAAQ,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;wBAC9G,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAA0B,CAAC;AAC5D,wBAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;wBACd;oBACH;oBAEA,IAAI,OAAO,GAAGF,wBAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC;AACxC,oBAAA,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;oBACjD,IAAI,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,OAAO,CAAC,KAAK,EAAE;wBAC7C,MAAM,IAAIG,gBAAW,CAAC;AACnB,4BAAA,OAAO,EAAE,CAAA,sDAAA,EAAyD,KAAK,CAAC,KAAK,CAAA,WAAA,EAAc,MAAM,CAAA,CAAE;4BACnG,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB;AACF,yBAAA,CAAC;oBACL;oBACA,IAAI,IAAI,GAAG,EAAE;AACb,oBAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAID,oBAAQ,CAAC,KAAK,CAAC,EAAE;AAC1C,wBAAA,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;AACxE,wBAAA,IAAI,KAAK,CAAC,GAAG,EAAE;4BACZ,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;wBACpC;oBACH;yBAAO;wBACJ,MAAM,IAAIC,gBAAW,CAAC;AACnB,4BAAA,OAAO,EAAE,CAAA,8BAAA,EAAiC,MAAM,6BAA6B,KAAK,CAAC,KAAK,CAAA,CAAE;4BAC1F,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB;AACF,yBAAA,CAAC;oBACL;oBAEA,MAAM,CAAC,IAAI,CAAC,CAAA,sBAAA,EAAyB,OAAO,CAAC,KAAK,CAAA,OAAA,EAAU,OAAO,CAAC,GAAG,CAAA,CAAA,EAAI,IAAI,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAA,CAAE,GAAG,EAAE,CAAA,CAAA,CAAG,CAAC;gBAC5G;qBAAO;oBACJ,IAAI,CAAC,GAAG,EAAE;AACV,oBAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACvB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAO,KAAI;4BAC/B,OAAOD,oBAAQ,CAAC,EAAE;kCACb,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;AAC3B,kCAAE,CAAA,EAAG,KAAK,CAAC,KAAK,CAAA,CAAA,EAAI,MAAM,CAAA,GAAA,EAAME,4BAAc,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE;AAC/E,wBAAA,CAAC,CAAC;AACF,wBAAA,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;4BACjB,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA,CAAA,CAAG;wBAC9B;6BAAO;AACJ,4BAAA,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;wBACvB;oBACH;AAAO,yBAAA,IAAIF,oBAAQ,CAAC,KAAK,CAAC,EAAE;wBACzB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC;oBACpC;yBAAO;AACJ,wBAAA,CAAC,GAAG,CAAA,EAAG,KAAK,CAAC,KAAK,CAAA,CAAA,EAAI,MAAM,CAAA,GAAA,EAAME,4BAAc,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;oBACjF;AACA,oBAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjB;YACH;QACH;AAEA,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;QACpB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAA,MAAA,EAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAA,CAAG,GAAG,EAAE;IAC7E;IAEQ,SAAS,CAAC,MAAc,EAAE,UAA6B,EAAA;AAC5D,QAAA,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK;AACxB,QAAA,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,KAAI;AACrD,YAAA,IAAI,KAAK,GAAI,UAAkB,CAAC,MAAM,CAAC;AACvC,YAAA,IAAIF,oBAAQ,CAAC,KAAK,CAAC,EAAE;gBAClB,MAAM,IAAIC,gBAAW,CAAC;oBACnB,OAAO,EAAE,qCAAqC,MAAM,CAAA,WAAA,EAAc,MAAM,CAAA,UAAA,EAAa,KAAK,CAAC,KAAK,CAAA,CAAE;oBAClG,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB;AACF,iBAAA,CAAC;YACL;YACA,IAAI,GAAG,GAAW,KAAK;AACvB,YAAA,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACnC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAKC,4BAAc,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBAChF;qBAAO,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACpD,oBAAA,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;wBACnB,MAAM,IAAID,gBAAW,CAAC;AACnB,4BAAA,OAAO,EAAE,CAAA,2FAAA,EAA8F,MAAM,aAAa,KAAK,CAAC,KAAK,CAAA,CAAA,CAAG;4BACxI,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB;AACF,yBAAA,CAAC;oBACL;oBACA,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,KAAKC,4BAAc,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBACnF;qBAAO;oBACJ,MAAM,IAAID,gBAAW,CAAC;wBACnB,OAAO,EAAE,6CAA6C,MAAM,CAAA,WAAA,EAAc,MAAM,CAAA,UAAA,EAAa,KAAK,CAAC,KAAK,CAAA,CAAA,CAAG;wBAC3G,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB;AACF,qBAAA,CAAC;gBACL;YACH;AAAO,iBAAA,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE;gBAClC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG;YACxB;iBAAO;gBACJ,GAAG,GAAGC,4BAAc,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC;YACjD;YAEA,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,GAAG,GAAG,GAAG,MAAM;YACpC,QAAQ,MAAM;AACX,gBAAA,KAAK,QAAQ;oBACV,IAAI,GAAG,KAAK,MAAM;wBAAE,OAAO,CAAA,EAAG,GAAG,CAAA,QAAA,CAAU;AAC3C,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,GAAA,EAAM,GAAG,EAAE;AAC3B,gBAAA,KAAK,KAAK;oBACP,IAAI,GAAG,KAAK,MAAM;wBAAE,OAAO,CAAA,EAAG,GAAG,CAAA,YAAA,CAAc;AAC/C,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,IAAA,EAAO,GAAG,EAAE;AAC5B,gBAAA,KAAK,IAAI;AACN,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,GAAA,EAAM,GAAG,EAAE;AAC3B,gBAAA,KAAK,KAAK;AACP,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,IAAA,EAAO,GAAG,EAAE;AAC5B,gBAAA,KAAK,IAAI;AACN,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,GAAA,EAAM,GAAG,EAAE;AAC3B,gBAAA,KAAK,KAAK;AACP,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,IAAA,EAAO,GAAG,EAAE;AAC5B,gBAAA,KAAK,IAAI;oBACN,IAAI,CAAA,GAAG,KAAA,IAAA,IAAH,GAAG,KAAA,MAAA,GAAA,MAAA,GAAH,GAAG,CAAE,MAAM,MAAK,CAAC,EAAE;AACpB,wBAAA,OAAO,OAAO;oBACjB;yBAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AAC5B,wBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,GAAA,EAAM,GAAG,EAAE;oBAC3B;AACA,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,KAAA,EAAQ,GAAG,GAAG;AAC9B,gBAAA,KAAK,OAAO;;AAET,oBAAA,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;AACnB,wBAAA,OAAO,OAAO;oBACjB;yBAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AAC5B,wBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,IAAA,EAAO,GAAG,EAAE;oBAC5B;AACA,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,SAAA,EAAY,GAAG,GAAG;AAClC,gBAAA,KAAK,SAAS;AACX,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,UAAA,EAAa,GAAG,GAAG;AACnC,gBAAA,KAAK,YAAY;AACd,oBAAA,OAAO,CAAA,EAAG,GAAG,CAAA,cAAA,EAAiB,GAAG,GAAG;AACvC,gBAAA,KAAK,UAAU;oBACZ,OAAO,CAAA,EAAG,GAAG,CAAA,QAAA,EAAWC,0BAAc,CAAC,KAAK,CAAC,IAAI;AACpD,gBAAA,KAAK,aAAa;oBACf,OAAO,CAAA,EAAG,GAAG,CAAA,YAAA,EAAeA,0BAAc,CAAC,KAAK,CAAC,IAAI;AACxD,gBAAA,KAAK,YAAY;oBACd,OAAO,CAAA,EAAG,GAAG,CAAA,OAAA,EAAUA,0BAAc,CAAC,KAAK,CAAC,IAAI;AACnD,gBAAA,KAAK,UAAU;oBACZ,OAAO,CAAA,EAAG,GAAG,CAAA,QAAA,EAAWA,0BAAc,CAAC,KAAK,CAAC,GAAG;AACnD,gBAAA,KAAK,QAAQ;oBACV,OAAO,CAAA,EAAG,GAAG,CAAA,QAAA,CAAU;AAC1B,gBAAA,KAAK,WAAW;oBACb,OAAO,CAAA,EAAG,GAAG,CAAA,YAAA,CAAc;AAC9B,gBAAA,KAAK,SAAS;AACX,oBAAA,OAAO,CAAA,CAAA,EAAI,GAAG,CAAA,mBAAA,EAAsB,GAAG,QAAQ;AAClD,gBAAA,KAAK,YAAY;AACd,oBAAA,OAAO,CAAA,OAAA,EAAU,GAAG,CAAA,wBAAA,EAA2B,GAAG,QAAQ;AAC7D,gBAAA,KAAK,QAAQ;oBACV,OAAO,CAAA,EAAG,GAAG,CAAA,OAAA,CAAS;AACzB,gBAAA,KAAK,SAAS;oBACX,OAAO,CAAA,EAAG,GAAG,CAAA,QAAA,CAAU;AAC1B,gBAAA;oBACG,MAAM,IAAIF,gBAAW,CAAC;wBACnB,OAAO,EAAE,2BAA2B,MAAM,CAAA,WAAA,EAAc,MAAM,CAAA,UAAA,EAAa,KAAK,CAAC,KAAK,CAAA,CAAE;wBACxF,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB;AACF,qBAAA,CAAC;;AAEX,QAAA,CAAC,CAAC;QAEF,OAAO,CAAA,EAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;IACrC;AAEQ,IAAA,cAAc,CAAC,MAAc,EAAA;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;AACvC,QAAA,IAAIH,wBAAO,CAAC,OAAO,CAAC,KAAK,CAAC;AAAE,YAAA,OAAO,IAAI;AACvC,QAAA,MAAM,YAAY,GAAGM,eAAG,CAAC,KAAK,EAAEC,eAAQ,EAAEC,gBAAS,EAAEC,gBAAS,EAAEC,eAAQ,EAAEC,cAAO,CAAC;QAElF,IAAI,YAAY,EAAE;YACf,MAAM,IAAIR,gBAAW,CAAC;AACnB,gBAAA,OAAO,EAAE,CAAA,MAAA,EAAS,MAAM,CAAA,SAAA,EAAY,KAAK,CAAC,WAAW,CAAC,IAAI,4CAA4C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAA,CAAE;AACxH,gBAAA,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;gBACvB;AACF,aAAA,CAAC;QACL;IACH;AACF;;;;"}

package/model/Args/WhereArgs.mjs

@@ -4,8 +4,9 @@ import XqlArray from '../../xt/fields/Array.mjs';
 import XqlObject from '../../xt/fields/Object.mjs';
 import XqlRecord from '../../xt/fields/Record.mjs';
 import XqlTuple from '../../xt/fields/Tuple.mjs';
-import { isArray, isObject, escapeSqlValue } from '../../utils/index.mjs';
+import { isArray, isObject, escapeSqlValue, iof } from '../../utils/index.mjs';
 import ValueFormatter from '../include/ValueFormatter.mjs';
+import XqlFile from '../../xt/fields/File.mjs';
 
 class WhereArgs {
     constructor(model, where, meta) {
@@ -216,17 +217,13 @@ class WhereArgs {
         return `${generate.join(' AND ')}`;
     }
     checkIsAllowed(column) {
-        const xanv = this.model.schema[column];
-        if (Foreign.isArray(xanv))
+        const field = this.model.schema[column];
+        if (Foreign.isArray(field))
             return true;
-        const isNotAllowed = xanv instanceof XqlArray
-            || xanv instanceof XqlObject
-            || xanv instanceof XqlRecord
-            || xanv instanceof XqlTuple;
-        // || xanv instanceof XqlFile
+        const isNotAllowed = iof(field, XqlArray, XqlObject, XqlRecord, XqlTuple, XqlFile);
         if (isNotAllowed) {
             throw new XansqlError({
-                message: `Field ${column} of type ${xanv.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,
+                message: `Field ${column} of type ${field.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,
                 model: this.model.table,
                 column
             });

package/model/Args/WhereArgs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"WhereArgs.mjs","sources":["../../../src/model/Args/WhereArgs.ts"],"sourcesContent":["import Model from \"..\";\nimport Foreign from \"../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../core/XansqlError\";\nimport XqlArray from \"../../xt/fields/Array\";\nimport XqlObject from \"../../xt/fields/Object\";\nimport XqlRecord from \"../../xt/fields/Record\";\nimport XqlTuple from \"../../xt/fields/Tuple\";\nimport { escapeSqlValue, isArray, isObject } from \"../../utils\";\nimport ValueFormatter from \"../include/ValueFormatter\";\nimport { WhereArgsType, WhereSubCondition } from \"../types\";\n\ntype Meta = {\n   parentTable: string\n}\n\nclass WhereArgs {\n   private model: Model\n   // private where: WhereArgsType\n   // private meta: Meta | undefined\n   readonly wheres: string[]\n   readonly sql: string = ''\n   private condition_keys = [\"equals\", \"not\", \"lt\", \"lte\", \"gt\", \"gte\", \"in\", \"notIn\", \"between\", \"notBetween\", \"contains\", \"notContains\", \"startsWith\", \"endsWith\", \"isNull\", \"isNotNull\", \"isEmpty\", \"isNotEmpty\", \"isTrue\", \"isFalse\"]\n\n   constructor(model: Model, where: WhereArgsType | WhereArgsType[], meta?: Meta) {\n      this.model = model\n\n      let schema = model.schema\n      let wheres: string[] = []\n\n      if (Array.isArray(where)) {\n         let _ors = []\n         for (let w of where) {\n            const whereArgs = new WhereArgs(model, w, meta)\n            if (whereArgs.sql) {\n               if (whereArgs.wheres.length > 1) {\n                  _ors.push(`(${whereArgs.wheres.join(\" AND \")})`)\n               } else {\n                  _ors.push(`${whereArgs.wheres.join(\" AND \")}`)\n               }\n            }\n         }\n\n         if (_ors.length) {\n            wheres.push(`(${_ors.join(\" OR \")})`)\n         }\n      } else {\n         for (let column in where) {\n            this.checkIsAllowed(column)\n            const value: any = where[column]\n            const field = schema[column]\n\n            if (Foreign.is(field)) {\n               if (!isArray(value) && !isObject(value)) {\n                  throw new XansqlError({\n                     message: `${column} must be an object or array in the WHERE clause, but received ${typeof value} in table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               } else if (isObject(value) && Object.keys(value).length === 0 || isArray(value) && value.length === 0) {\n                  // skip empty object\n                  continue;\n               }\n\n               if (Foreign.isSchema(field) && isObject(value) && Object.keys(value).some(k => this.condition_keys.includes(k))) {\n                  const v = this.condition(column, value as WhereSubCondition)\n                  wheres.push(v)\n                  continue\n               }\n\n               let foreign = Foreign.get(model, column)\n               let FModel = model.xansql.getModel(foreign.table)\n               if (meta && meta.parentTable === foreign.table) {\n                  throw new XansqlError({\n                     message: `Circular reference detected in WHERE clause for table ${model.table} on column ${column}`,\n                     model: model.table,\n                     column\n                  });\n               }\n               let _sql = ''\n               if (Array.isArray(value) || isObject(value)) {\n                  const where = new WhereArgs(FModel, value, { parentTable: model.table })\n                  if (where.sql) {\n                     _sql = where.wheres.join(\" AND \")\n                  }\n               } else {\n                  throw new XansqlError({\n                     message: `Invalid value for foreign key ${column} in WHERE clause of table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               }\n\n               wheres.push(`EXISTS (SELECT 1 FROM ${foreign.table} WHERE ${foreign.sql} ${_sql ? ` AND ${_sql}` : \"\"})`)\n            } else {\n               let v = ''\n               if (Array.isArray(value)) {\n                  const sub = value.map((_v: any) => {\n                     return isObject(_v)\n                        ? this.condition(column, _v)\n                        : `${model.table}.${column} = ${ValueFormatter.toSql(model, column, _v)}`\n                  })\n                  if (sub.length > 1) {\n                     v = `(${sub.join(\" OR \")})`\n                  } else {\n                     v = sub.join(\" OR \")\n                  }\n               } else if (isObject(value)) {\n                  v = this.condition(column, value)\n               } else {\n                  v = `${model.table}.${column} = ${ValueFormatter.toSql(model, column, value)}`\n               }\n               wheres.push(v)\n            }\n         }\n      }\n\n      this.wheres = wheres\n      this.sql = this.wheres.length ? `WHERE ${this.wheres.join(\" AND \")} ` : \"\"\n   }\n\n   private condition(column: string, conditions: WhereSubCondition) {\n      const model = this.model\n      const generate = Object.keys(conditions).map((subKey) => {\n         let value = (conditions as any)[subKey];\n         if (isObject(value)) {\n            throw new XansqlError({\n               message: `Invalid value for where condition ${subKey} on column ${column} in table ${model.table}`,\n               model: model.table,\n               column\n            });\n         }\n         let val: string = value;\n         if (Array.isArray(val)) {\n            if (['in', 'notIn'].includes(subKey)) {\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\", \");\n            } else if (['between', 'notBetween'].includes(subKey)) {\n               if (val.length !== 2) {\n                  throw new XansqlError({\n                     message: `The 'between' and 'notBetween' operators require an array of exactly two values for column ${column} in table ${model.table}.`,\n                     model: model.table,\n                     column\n                  });\n               }\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\" AND \");\n            } else {\n               throw new XansqlError({\n                  message: `Array value is not supported for operator ${subKey} on column ${column} in table ${model.table}.`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else if (typeof val === 'boolean') {\n            val = val ? \"1\" : \"0\";\n         } else {\n            val = ValueFormatter.toSql(model, column, val);\n         }\n\n         let col = model.table + \".\" + column;\n         switch (subKey) {\n            case 'equals':\n               if (val === \"NULL\") return `${col} IS NULL`;\n               return `${col} = ${val}`;\n            case 'not':\n               if (val === \"NULL\") return `${col} IS NOT NULL`;\n               return `${col} != ${val}`;\n            case 'lt':\n               return `${col} < ${val}`;\n            case 'lte':\n               return `${col} <= ${val}`;\n            case 'gt':\n               return `${col} > ${val}`;\n            case 'gte':\n               return `${col} >= ${val}`;\n            case 'in':\n               if (val?.length === 0) {\n                  return `1 = 0`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} = ${val}`;\n               }\n               return `${col} IN (${val})`;\n            case 'notIn':\n               // handle empty array and val is a single value\n               if (val.length === 0) {\n                  return `1 = 1`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} != ${val}`;\n               }\n               return `${col} NOT IN (${val})`;\n            case 'between':\n               return `${col} BETWEEN (${val})`;\n            case 'notBetween':\n               return `${col} NOT BETWEEN (${val})`;\n            case 'contains':\n               return `${col} LIKE '%${escapeSqlValue(value)}%'`;\n            case 'notContains':\n               return `${col} NOT LIKE '%${escapeSqlValue(value)}%'`;\n            case 'startsWith':\n               return `${col} LIKE '${escapeSqlValue(value)}%'`;\n            case 'endsWith':\n               return `${col} LIKE '%${escapeSqlValue(value)}'`;\n            case 'isNull':\n               return `${col} IS NULL`;\n            case 'isNotNull':\n               return `${col} IS NOT NULL`;\n            case 'isEmpty':\n               return `(${col} IS NULL OR LENGTH(${col}) = 0)`;\n            case 'isNotEmpty':\n               return `(WHERE ${col} IS NOT NULL AND LENGTH(${col}) > 0)`;\n            case 'isTrue':\n               return `${col} = TRUE`;\n            case 'isFalse':\n               return `${col} = FALSE`;\n            default:\n               throw new XansqlError({\n                  message: `Unknown where condition ${subKey} on column ${column} in table ${model.table}`,\n                  model: model.table,\n                  column\n               });\n         }\n      });\n\n      return `${generate.join(' AND ')}`;\n   }\n\n   private checkIsAllowed(column: string) {\n      const xanv = this.model.schema[column]\n      if (Foreign.isArray(xanv)) return true\n      const isNotAllowed = xanv instanceof XqlArray\n         || xanv instanceof XqlObject\n         || xanv instanceof XqlRecord\n         || xanv instanceof XqlTuple\n      // || xanv instanceof XqlFile\n\n      if (isNotAllowed) {\n         throw new XansqlError({\n            message: `Field ${column} of type ${xanv.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,\n            model: this.model.table,\n            column\n         });\n      }\n   }\n}\n\nexport default WhereArgs;"],"names":[],"mappings":"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"}
+{"version":3,"file":"WhereArgs.mjs","sources":["../../../src/model/Args/WhereArgs.ts"],"sourcesContent":["import Model from \"..\";\nimport Foreign from \"../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../core/XansqlError\";\nimport XqlArray from \"../../xt/fields/Array\";\nimport XqlObject from \"../../xt/fields/Object\";\nimport XqlRecord from \"../../xt/fields/Record\";\nimport XqlTuple from \"../../xt/fields/Tuple\";\nimport { escapeSqlValue, iof, isArray, isObject } from \"../../utils\";\nimport ValueFormatter from \"../include/ValueFormatter\";\nimport { WhereArgsType, WhereSubCondition } from \"../types\";\nimport XqlFile from \"../../xt/fields/File\";\n\ntype Meta = {\n   parentTable: string\n}\n\nclass WhereArgs {\n   private model: Model\n   // private where: WhereArgsType\n   // private meta: Meta | undefined\n   readonly wheres: string[]\n   readonly sql: string = ''\n   private condition_keys = [\"equals\", \"not\", \"lt\", \"lte\", \"gt\", \"gte\", \"in\", \"notIn\", \"between\", \"notBetween\", \"contains\", \"notContains\", \"startsWith\", \"endsWith\", \"isNull\", \"isNotNull\", \"isEmpty\", \"isNotEmpty\", \"isTrue\", \"isFalse\"]\n\n   constructor(model: Model, where: WhereArgsType | WhereArgsType[], meta?: Meta) {\n      this.model = model\n\n      let schema = model.schema\n      let wheres: string[] = []\n\n      if (Array.isArray(where)) {\n         let _ors = []\n         for (let w of where) {\n            const whereArgs = new WhereArgs(model, w, meta)\n            if (whereArgs.sql) {\n               if (whereArgs.wheres.length > 1) {\n                  _ors.push(`(${whereArgs.wheres.join(\" AND \")})`)\n               } else {\n                  _ors.push(`${whereArgs.wheres.join(\" AND \")}`)\n               }\n            }\n         }\n\n         if (_ors.length) {\n            wheres.push(`(${_ors.join(\" OR \")})`)\n         }\n      } else {\n         for (let column in where) {\n            this.checkIsAllowed(column)\n            const value: any = where[column]\n            const field = schema[column]\n\n            if (Foreign.is(field)) {\n               if (!isArray(value) && !isObject(value)) {\n                  throw new XansqlError({\n                     message: `${column} must be an object or array in the WHERE clause, but received ${typeof value} in table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               } else if (isObject(value) && Object.keys(value).length === 0 || isArray(value) && value.length === 0) {\n                  // skip empty object\n                  continue;\n               }\n\n               if (Foreign.isSchema(field) && isObject(value) && Object.keys(value).some(k => this.condition_keys.includes(k))) {\n                  const v = this.condition(column, value as WhereSubCondition)\n                  wheres.push(v)\n                  continue\n               }\n\n               let foreign = Foreign.get(model, column)\n               let FModel = model.xansql.getModel(foreign.table)\n               if (meta && meta.parentTable === foreign.table) {\n                  throw new XansqlError({\n                     message: `Circular reference detected in WHERE clause for table ${model.table} on column ${column}`,\n                     model: model.table,\n                     column\n                  });\n               }\n               let _sql = ''\n               if (Array.isArray(value) || isObject(value)) {\n                  const where = new WhereArgs(FModel, value, { parentTable: model.table })\n                  if (where.sql) {\n                     _sql = where.wheres.join(\" AND \")\n                  }\n               } else {\n                  throw new XansqlError({\n                     message: `Invalid value for foreign key ${column} in WHERE clause of table ${model.table}`,\n                     model: model.table,\n                     column\n                  });\n               }\n\n               wheres.push(`EXISTS (SELECT 1 FROM ${foreign.table} WHERE ${foreign.sql} ${_sql ? ` AND ${_sql}` : \"\"})`)\n            } else {\n               let v = ''\n               if (Array.isArray(value)) {\n                  const sub = value.map((_v: any) => {\n                     return isObject(_v)\n                        ? this.condition(column, _v)\n                        : `${model.table}.${column} = ${ValueFormatter.toSql(model, column, _v)}`\n                  })\n                  if (sub.length > 1) {\n                     v = `(${sub.join(\" OR \")})`\n                  } else {\n                     v = sub.join(\" OR \")\n                  }\n               } else if (isObject(value)) {\n                  v = this.condition(column, value)\n               } else {\n                  v = `${model.table}.${column} = ${ValueFormatter.toSql(model, column, value)}`\n               }\n               wheres.push(v)\n            }\n         }\n      }\n\n      this.wheres = wheres\n      this.sql = this.wheres.length ? `WHERE ${this.wheres.join(\" AND \")} ` : \"\"\n   }\n\n   private condition(column: string, conditions: WhereSubCondition) {\n      const model = this.model\n      const generate = Object.keys(conditions).map((subKey) => {\n         let value = (conditions as any)[subKey];\n         if (isObject(value)) {\n            throw new XansqlError({\n               message: `Invalid value for where condition ${subKey} on column ${column} in table ${model.table}`,\n               model: model.table,\n               column\n            });\n         }\n         let val: string = value;\n         if (Array.isArray(val)) {\n            if (['in', 'notIn'].includes(subKey)) {\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\", \");\n            } else if (['between', 'notBetween'].includes(subKey)) {\n               if (val.length !== 2) {\n                  throw new XansqlError({\n                     message: `The 'between' and 'notBetween' operators require an array of exactly two values for column ${column} in table ${model.table}.`,\n                     model: model.table,\n                     column\n                  });\n               }\n               val = val.map((item) => ValueFormatter.toSql(model, column, item)).join(\" AND \");\n            } else {\n               throw new XansqlError({\n                  message: `Array value is not supported for operator ${subKey} on column ${column} in table ${model.table}.`,\n                  model: model.table,\n                  column\n               });\n            }\n         } else if (typeof val === 'boolean') {\n            val = val ? \"1\" : \"0\";\n         } else {\n            val = ValueFormatter.toSql(model, column, val);\n         }\n\n         let col = model.table + \".\" + column;\n         switch (subKey) {\n            case 'equals':\n               if (val === \"NULL\") return `${col} IS NULL`;\n               return `${col} = ${val}`;\n            case 'not':\n               if (val === \"NULL\") return `${col} IS NOT NULL`;\n               return `${col} != ${val}`;\n            case 'lt':\n               return `${col} < ${val}`;\n            case 'lte':\n               return `${col} <= ${val}`;\n            case 'gt':\n               return `${col} > ${val}`;\n            case 'gte':\n               return `${col} >= ${val}`;\n            case 'in':\n               if (val?.length === 0) {\n                  return `1 = 0`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} = ${val}`;\n               }\n               return `${col} IN (${val})`;\n            case 'notIn':\n               // handle empty array and val is a single value\n               if (val.length === 0) {\n                  return `1 = 1`;\n               } else if (!val.includes(\",\")) {\n                  return `${col} != ${val}`;\n               }\n               return `${col} NOT IN (${val})`;\n            case 'between':\n               return `${col} BETWEEN (${val})`;\n            case 'notBetween':\n               return `${col} NOT BETWEEN (${val})`;\n            case 'contains':\n               return `${col} LIKE '%${escapeSqlValue(value)}%'`;\n            case 'notContains':\n               return `${col} NOT LIKE '%${escapeSqlValue(value)}%'`;\n            case 'startsWith':\n               return `${col} LIKE '${escapeSqlValue(value)}%'`;\n            case 'endsWith':\n               return `${col} LIKE '%${escapeSqlValue(value)}'`;\n            case 'isNull':\n               return `${col} IS NULL`;\n            case 'isNotNull':\n               return `${col} IS NOT NULL`;\n            case 'isEmpty':\n               return `(${col} IS NULL OR LENGTH(${col}) = 0)`;\n            case 'isNotEmpty':\n               return `(WHERE ${col} IS NOT NULL AND LENGTH(${col}) > 0)`;\n            case 'isTrue':\n               return `${col} = TRUE`;\n            case 'isFalse':\n               return `${col} = FALSE`;\n            default:\n               throw new XansqlError({\n                  message: `Unknown where condition ${subKey} on column ${column} in table ${model.table}`,\n                  model: model.table,\n                  column\n               });\n         }\n      });\n\n      return `${generate.join(' AND ')}`;\n   }\n\n   private checkIsAllowed(column: string) {\n      const field = this.model.schema[column]\n      if (Foreign.isArray(field)) return true\n      const isNotAllowed = iof(field, XqlArray, XqlObject, XqlRecord, XqlTuple, XqlFile)\n\n      if (isNotAllowed) {\n         throw new XansqlError({\n            message: `Field ${column} of type ${field.constructor.name} is not allowed in WHERE clause in table ${this.model.table}`,\n            model: this.model.table,\n            column\n         });\n      }\n   }\n}\n\nexport default WhereArgs;"],"names":[],"mappings":"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"}

package/model/Base.cjs

@@ -3,6 +3,7 @@
 var tslib = require('tslib');
 var core_classes_ForeignInfo = require('../core/classes/ForeignInfo.cjs');
 var core_XansqlError = require('../core/XansqlError.cjs');
+var utils_index = require('../utils/index.cjs');
 var xt_fields_IDField = require('../xt/fields/IDField.cjs');
 
 class ModelBase {
@@ -17,7 +18,7 @@ class ModelBase {
         this.schema = schema;
         for (let column in schema) {
             const field = schema[column];
-            if (field instanceof xt_fields_IDField) {
+            if (utils_index.iof(field, xt_fields_IDField)) {
                 if (this.IDColumn) {
                     throw new core_XansqlError({
                         message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,

package/model/Base.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Base.cjs","sources":["../../src/model/Base.ts"],"sourcesContent":["import { EventHandler, EventPayloads } from \"../core/classes/EventManager\";\nimport Foreign from \"../core/classes/ForeignInfo\";\nimport Xansql from \"../core/Xansql\";\nimport XansqlError from \"../core/XansqlError\";\nimport XqlIDField from \"../xt/fields/IDField\";\nimport { XansqlSchemaObject } from \"../xt/types\";\nimport { XansqlModelHookNames, XansqlModelHooks } from \"./types\";\n\ntype Relation = {\n   type: \"array\" | \"schema\",\n   column: string,\n}\n\nabstract class ModelBase {\n   readonly schema: XansqlSchemaObject;\n   readonly table: string;\n   readonly IDColumn: string = '';\n   readonly columns: string[] = [];\n   readonly relations: Relation[] = [];\n   hooks: XansqlModelHooks = {};\n   xansql: Xansql = null as any;\n   alias: string = '';\n\n   constructor(table: string, schema: XansqlSchemaObject) {\n      this.table = table;\n      this.schema = schema;\n      for (let column in schema) {\n         const field = schema[column];\n         if (field instanceof XqlIDField) {\n            if (this.IDColumn) {\n               throw new XansqlError({\n                  message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,\n                  model: this.table,\n               });\n            }\n            this.IDColumn = column;\n         }\n\n         if (Foreign.isArray(field)) {\n            this.relations.push({ type: \"array\", column });\n         } else {\n            if (Foreign.isSchema(field)) {\n               this.relations.push({ type: \"schema\", column });\n            }\n            this.columns.push(column);\n         }\n      }\n      if (!this.IDColumn) {\n         throw new XansqlError({\n            message: `Schema ${this.table} must have an id column`,\n            model: this.table,\n         });\n      }\n   }\n\n   async execute(sql: string) {\n      const xansql = this.xansql;\n      return await xansql.execute(sql) as any\n   }\n\n   isIDColumn(column: string): boolean {\n      return column === this.IDColumn;\n   }\n\n   protected async callHook(hook: XansqlModelHookNames, ...args: any): Promise<any> {\n      const xansql = this.xansql;\n      const config = xansql.config;\n\n      const modelHooks: any = this.hooks || {}\n      const configHooks: any = config.hooks || {}\n      let returnValue = null;\n\n      if (hook in modelHooks!) {\n         returnValue = await modelHooks[hook].apply(this, args);\n      }\n\n      if (hook in configHooks!) {\n         returnValue = await configHooks[hook].apply(null, [this, ...args]);\n      }\n\n      return returnValue;\n   }\n\n   on<K extends keyof EventPayloads>(event: K, handler: EventHandler<K>) {\n      this.xansql.EventManager.on(event, ({ model, ...rest }: any) => {\n         handler.apply(this, rest as any);\n      });\n   }\n\n}\n\nexport default ModelBase;"],"names":["XqlIDField","XansqlError","Foreign","__rest"],"mappings":"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"}
+{"version":3,"file":"Base.cjs","sources":["../../src/model/Base.ts"],"sourcesContent":["import { EventHandler, EventPayloads } from \"../core/classes/EventManager\";\nimport Foreign from \"../core/classes/ForeignInfo\";\nimport Xansql from \"../core/Xansql\";\nimport XansqlError from \"../core/XansqlError\";\nimport { iof } from \"../utils\";\nimport XqlIDField from \"../xt/fields/IDField\";\nimport { XansqlSchemaObject } from \"../xt/types\";\nimport { XansqlModelHookNames, XansqlModelHooks } from \"./types\";\n\ntype Relation = {\n   type: \"array\" | \"schema\",\n   column: string,\n}\n\nabstract class ModelBase {\n   readonly schema: XansqlSchemaObject;\n   readonly table: string;\n   readonly IDColumn: string = '';\n   readonly columns: string[] = [];\n   readonly relations: Relation[] = [];\n   hooks: XansqlModelHooks = {};\n   xansql: Xansql = null as any;\n   alias: string = '';\n\n   constructor(table: string, schema: XansqlSchemaObject) {\n      this.table = table;\n      this.schema = schema;\n      for (let column in schema) {\n         const field = schema[column];\n         if (iof(field, XqlIDField)) {\n            if (this.IDColumn) {\n               throw new XansqlError({\n                  message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,\n                  model: this.table,\n               });\n            }\n            this.IDColumn = column;\n         }\n\n         if (Foreign.isArray(field)) {\n            this.relations.push({ type: \"array\", column });\n         } else {\n            if (Foreign.isSchema(field)) {\n               this.relations.push({ type: \"schema\", column });\n            }\n            this.columns.push(column);\n         }\n      }\n      if (!this.IDColumn) {\n         throw new XansqlError({\n            message: `Schema ${this.table} must have an id column`,\n            model: this.table,\n         });\n      }\n   }\n\n   async execute(sql: string) {\n      const xansql = this.xansql;\n      return await xansql.execute(sql) as any\n   }\n\n   isIDColumn(column: string): boolean {\n      return column === this.IDColumn;\n   }\n\n   protected async callHook(hook: XansqlModelHookNames, ...args: any): Promise<any> {\n      const xansql = this.xansql;\n      const config = xansql.config;\n\n      const modelHooks: any = this.hooks || {}\n      const configHooks: any = config.hooks || {}\n      let returnValue = null;\n\n      if (hook in modelHooks!) {\n         returnValue = await modelHooks[hook].apply(this, args);\n      }\n\n      if (hook in configHooks!) {\n         returnValue = await configHooks[hook].apply(null, [this, ...args]);\n      }\n\n      return returnValue;\n   }\n\n   on<K extends keyof EventPayloads>(event: K, handler: EventHandler<K>) {\n      this.xansql.EventManager.on(event, ({ model, ...rest }: any) => {\n         handler.apply(this, rest as any);\n      });\n   }\n\n}\n\nexport default ModelBase;"],"names":["iof","XqlIDField","XansqlError","Foreign","__rest"],"mappings":"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"}

package/model/Base.mjs

@@ -1,6 +1,7 @@
 import { __rest } from 'tslib';
 import Foreign from '../core/classes/ForeignInfo.mjs';
 import XansqlError from '../core/XansqlError.mjs';
+import { iof } from '../utils/index.mjs';
 import XqlIDField from '../xt/fields/IDField.mjs';
 
 class ModelBase {
@@ -15,7 +16,7 @@ class ModelBase {
         this.schema = schema;
         for (let column in schema) {
             const field = schema[column];
-            if (field instanceof XqlIDField) {
+            if (iof(field, XqlIDField)) {
                 if (this.IDColumn) {
                     throw new XansqlError({
                         message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,

package/model/Base.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Base.mjs","sources":["../../src/model/Base.ts"],"sourcesContent":["import { EventHandler, EventPayloads } from \"../core/classes/EventManager\";\nimport Foreign from \"../core/classes/ForeignInfo\";\nimport Xansql from \"../core/Xansql\";\nimport XansqlError from \"../core/XansqlError\";\nimport XqlIDField from \"../xt/fields/IDField\";\nimport { XansqlSchemaObject } from \"../xt/types\";\nimport { XansqlModelHookNames, XansqlModelHooks } from \"./types\";\n\ntype Relation = {\n   type: \"array\" | \"schema\",\n   column: string,\n}\n\nabstract class ModelBase {\n   readonly schema: XansqlSchemaObject;\n   readonly table: string;\n   readonly IDColumn: string = '';\n   readonly columns: string[] = [];\n   readonly relations: Relation[] = [];\n   hooks: XansqlModelHooks = {};\n   xansql: Xansql = null as any;\n   alias: string = '';\n\n   constructor(table: string, schema: XansqlSchemaObject) {\n      this.table = table;\n      this.schema = schema;\n      for (let column in schema) {\n         const field = schema[column];\n         if (field instanceof XqlIDField) {\n            if (this.IDColumn) {\n               throw new XansqlError({\n                  message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,\n                  model: this.table,\n               });\n            }\n            this.IDColumn = column;\n         }\n\n         if (Foreign.isArray(field)) {\n            this.relations.push({ type: \"array\", column });\n         } else {\n            if (Foreign.isSchema(field)) {\n               this.relations.push({ type: \"schema\", column });\n            }\n            this.columns.push(column);\n         }\n      }\n      if (!this.IDColumn) {\n         throw new XansqlError({\n            message: `Schema ${this.table} must have an id column`,\n            model: this.table,\n         });\n      }\n   }\n\n   async execute(sql: string) {\n      const xansql = this.xansql;\n      return await xansql.execute(sql) as any\n   }\n\n   isIDColumn(column: string): boolean {\n      return column === this.IDColumn;\n   }\n\n   protected async callHook(hook: XansqlModelHookNames, ...args: any): Promise<any> {\n      const xansql = this.xansql;\n      const config = xansql.config;\n\n      const modelHooks: any = this.hooks || {}\n      const configHooks: any = config.hooks || {}\n      let returnValue = null;\n\n      if (hook in modelHooks!) {\n         returnValue = await modelHooks[hook].apply(this, args);\n      }\n\n      if (hook in configHooks!) {\n         returnValue = await configHooks[hook].apply(null, [this, ...args]);\n      }\n\n      return returnValue;\n   }\n\n   on<K extends keyof EventPayloads>(event: K, handler: EventHandler<K>) {\n      this.xansql.EventManager.on(event, ({ model, ...rest }: any) => {\n         handler.apply(this, rest as any);\n      });\n   }\n\n}\n\nexport default ModelBase;"],"names":[],"mappings":"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"}
+{"version":3,"file":"Base.mjs","sources":["../../src/model/Base.ts"],"sourcesContent":["import { EventHandler, EventPayloads } from \"../core/classes/EventManager\";\nimport Foreign from \"../core/classes/ForeignInfo\";\nimport Xansql from \"../core/Xansql\";\nimport XansqlError from \"../core/XansqlError\";\nimport { iof } from \"../utils\";\nimport XqlIDField from \"../xt/fields/IDField\";\nimport { XansqlSchemaObject } from \"../xt/types\";\nimport { XansqlModelHookNames, XansqlModelHooks } from \"./types\";\n\ntype Relation = {\n   type: \"array\" | \"schema\",\n   column: string,\n}\n\nabstract class ModelBase {\n   readonly schema: XansqlSchemaObject;\n   readonly table: string;\n   readonly IDColumn: string = '';\n   readonly columns: string[] = [];\n   readonly relations: Relation[] = [];\n   hooks: XansqlModelHooks = {};\n   xansql: Xansql = null as any;\n   alias: string = '';\n\n   constructor(table: string, schema: XansqlSchemaObject) {\n      this.table = table;\n      this.schema = schema;\n      for (let column in schema) {\n         const field = schema[column];\n         if (iof(field, XqlIDField)) {\n            if (this.IDColumn) {\n               throw new XansqlError({\n                  message: `Model ${this.table} has multiple ID columns (${this.IDColumn} and ${column})`,\n                  model: this.table,\n               });\n            }\n            this.IDColumn = column;\n         }\n\n         if (Foreign.isArray(field)) {\n            this.relations.push({ type: \"array\", column });\n         } else {\n            if (Foreign.isSchema(field)) {\n               this.relations.push({ type: \"schema\", column });\n            }\n            this.columns.push(column);\n         }\n      }\n      if (!this.IDColumn) {\n         throw new XansqlError({\n            message: `Schema ${this.table} must have an id column`,\n            model: this.table,\n         });\n      }\n   }\n\n   async execute(sql: string) {\n      const xansql = this.xansql;\n      return await xansql.execute(sql) as any\n   }\n\n   isIDColumn(column: string): boolean {\n      return column === this.IDColumn;\n   }\n\n   protected async callHook(hook: XansqlModelHookNames, ...args: any): Promise<any> {\n      const xansql = this.xansql;\n      const config = xansql.config;\n\n      const modelHooks: any = this.hooks || {}\n      const configHooks: any = config.hooks || {}\n      let returnValue = null;\n\n      if (hook in modelHooks!) {\n         returnValue = await modelHooks[hook].apply(this, args);\n      }\n\n      if (hook in configHooks!) {\n         returnValue = await configHooks[hook].apply(null, [this, ...args]);\n      }\n\n      return returnValue;\n   }\n\n   on<K extends keyof EventPayloads>(event: K, handler: EventHandler<K>) {\n      this.xansql.EventManager.on(event, ({ model, ...rest }: any) => {\n         handler.apply(this, rest as any);\n      });\n   }\n\n}\n\nexport default ModelBase;"],"names":[],"mappings":";;;;;;AAcA,MAAe,SAAS,CAAA;IAUrB,WAAA,CAAY,KAAa,EAAE,MAA0B,EAAA;QAP5C,IAAA,CAAA,QAAQ,GAAW,EAAE;QACrB,IAAA,CAAA,OAAO,GAAa,EAAE;QACtB,IAAA,CAAA,SAAS,GAAe,EAAE;QACnC,IAAA,CAAA,KAAK,GAAqB,EAAE;QAC5B,IAAA,CAAA,MAAM,GAAW,IAAW;QAC5B,IAAA,CAAA,KAAK,GAAW,EAAE;AAGf,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;AAClB,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM;AACpB,QAAA,KAAK,IAAI,MAAM,IAAI,MAAM,EAAE;AACxB,YAAA,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;AAC5B,YAAA,IAAI,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;AACzB,gBAAA,IAAI,IAAI,CAAC,QAAQ,EAAE;oBAChB,MAAM,IAAI,WAAW,CAAC;wBACnB,OAAO,EAAE,CAAA,MAAA,EAAS,IAAI,CAAC,KAAK,CAAA,0BAAA,EAA6B,IAAI,CAAC,QAAQ,CAAA,KAAA,EAAQ,MAAM,CAAA,CAAA,CAAG;wBACvF,KAAK,EAAE,IAAI,CAAC,KAAK;AACnB,qBAAA,CAAC;gBACL;AACA,gBAAA,IAAI,CAAC,QAAQ,GAAG,MAAM;YACzB;AAEA,YAAA,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACzB,gBAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YACjD;iBAAO;AACJ,gBAAA,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AAC1B,oBAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;gBAClD;AACA,gBAAA,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5B;QACH;AACA,QAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,IAAI,WAAW,CAAC;AACnB,gBAAA,OAAO,EAAE,CAAA,OAAA,EAAU,IAAI,CAAC,KAAK,CAAA,uBAAA,CAAyB;gBACtD,KAAK,EAAE,IAAI,CAAC,KAAK;AACnB,aAAA,CAAC;QACL;IACH;IAEA,MAAM,OAAO,CAAC,GAAW,EAAA;AACtB,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;AAC1B,QAAA,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAQ;IAC1C;AAEA,IAAA,UAAU,CAAC,MAAc,EAAA;AACtB,QAAA,OAAO,MAAM,KAAK,IAAI,CAAC,QAAQ;IAClC;AAEU,IAAA,MAAM,QAAQ,CAAC,IAA0B,EAAE,GAAG,IAAS,EAAA;AAC9D,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;AAC1B,QAAA,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM;AAE5B,QAAA,MAAM,UAAU,GAAQ,IAAI,CAAC,KAAK,IAAI,EAAE;AACxC,QAAA,MAAM,WAAW,GAAQ,MAAM,CAAC,KAAK,IAAI,EAAE;QAC3C,IAAI,WAAW,GAAG,IAAI;AAEtB,QAAA,IAAI,IAAI,IAAI,UAAW,EAAE;AACtB,YAAA,WAAW,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;QACzD;AAEA,QAAA,IAAI,IAAI,IAAI,WAAY,EAAE;AACvB,YAAA,WAAW,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QACrE;AAEA,QAAA,OAAO,WAAW;IACrB;IAEA,EAAE,CAAgC,KAAQ,EAAE,OAAwB,EAAA;AACjE,QAAA,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAuB,KAAI;AAA3B,YAAA,IAAA,EAAE,KAAK,EAAA,GAAA,EAAgB,EAAX,IAAI,GAAA,MAAA,CAAA,EAAA,EAAhB,SAAkB,CAAF;AACjD,YAAA,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAW,CAAC;AACnC,QAAA,CAAC,CAAC;IACL;AAEF;;;;"}

package/model/Executer/Aggregate/SelectArgs.cjs

@@ -2,6 +2,7 @@
 
 var core_classes_ForeignInfo = require('../../../core/classes/ForeignInfo.cjs');
 var core_XansqlError = require('../../../core/XansqlError.cjs');
+var utils_index = require('../../../utils/index.cjs');
 var xt_fields_IDField = require('../../../xt/fields/IDField.cjs');
 var xt_fields_Number = require('../../../xt/fields/Number.cjs');
 
@@ -35,7 +36,7 @@ class SelectArgs {
     columnFormat(column, columnArg) {
         let model = this.model;
         const field = model.schema[column];
-        const isNumber = field instanceof xt_fields_Number || field instanceof xt_fields_IDField;
+        const isNumber = utils_index.iof(field, xt_fields_Number, xt_fields_IDField);
         let sql = [];
         for (let func in columnArg) {
             const funcArg = columnArg[func];

package/model/Executer/Aggregate/SelectArgs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SelectArgs.cjs","sources":["../../../../src/model/Executer/Aggregate/SelectArgs.ts"],"sourcesContent":["import Model from \"../..\";\nimport Foreign from \"../../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport XqlIDField from \"../../../xt/fields/IDField\";\nimport XqlNumber from \"../../../xt/fields/Number\";\nimport { AggregateSelectArgsColumnType, AggregateSelectArgsType } from \"../../types\";\n\nclass SelectArgs {\n   model: Model\n\n   readonly sql: string;\n\n   constructor(model: Model, args: AggregateSelectArgsType) {\n      this.model = model\n      const sqls = []\n\n      for (let column in args) {\n         const field = model.schema[column];\n         if (!field) {\n            throw new XansqlError({\n               message: `Column ${column} not found in model ${model.table} for aggregate select`,\n               model: model.table,\n               column: column\n            });\n         }\n         if (Foreign.is(field)) {\n            throw new XansqlError({\n               message: `Cannot perform aggregate functions on foreign key column ${column} in model ${model.table}`,\n               model: model.table,\n               column: column\n            });\n         } else {\n            const columnArg = args[column] as AggregateSelectArgsColumnType\n            sqls.push(this.columnFormat(column, columnArg))\n         }\n      }\n\n      this.sql = sqls.join(\", \")\n   }\n\n   columnFormat(column: string, columnArg: AggregateSelectArgsColumnType) {\n      let model = this.model\n      const field = model.schema[column];\n      const isNumber = field instanceof XqlNumber || field instanceof XqlIDField\n      let sql = []\n      for (let func in columnArg) {\n         const funcArg = columnArg[func as keyof AggregateSelectArgsColumnType]\n         const isObject = funcArg && typeof funcArg === \"object\"\n         // apply distinct\n         let col = column\n         if (isObject && funcArg.distinct === true) {\n            col = `DISTINCT ${col}`\n         }\n\n         let _sql = `${func.toUpperCase()}(${col})`\n\n         // make to integer for all as REAL\n         if (!isNumber) {\n            _sql = `CAST(${_sql} AS REAL)`\n         }\n\n         if (isObject && funcArg?.round !== undefined) {\n            _sql = `ROUND(${_sql}, ${funcArg.round})`\n         }\n\n         if (isObject && funcArg.alias) {\n            _sql += ` AS ${funcArg.alias}`\n         } else {\n            _sql += ` AS ${func}_${column}`\n         }\n\n         sql.push(_sql)\n      }\n      return sql.join(\", \")\n   }\n\n}\n\nexport default SelectArgs;"],"names":["XansqlError","Foreign","XqlNumber","XqlIDField"],"mappings":";;;;;;;AAOA,MAAM,UAAU,CAAA;IAKb,WAAA,CAAY,KAAY,EAAE,IAA6B,EAAA;AACpD,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;QAClB,MAAM,IAAI,GAAG,EAAE;AAEf,QAAA,KAAK,IAAI,MAAM,IAAI,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE;gBACT,MAAM,IAAIA,gBAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,OAAA,EAAU,MAAM,uBAAuB,KAAK,CAAC,KAAK,CAAA,qBAAA,CAAuB;oBAClF,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;AACA,YAAA,IAAIC,wBAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAID,gBAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,yDAAA,EAA4D,MAAM,aAAa,KAAK,CAAC,KAAK,CAAA,CAAE;oBACrG,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;iBAAO;AACJ,gBAAA,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAkC;AAC/D,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClD;QACH;QAEA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B;IAEA,YAAY,CAAC,MAAc,EAAE,SAAwC,EAAA;AAClE,QAAA,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,MAAM,QAAQ,GAAG,KAAK,YAAYE,gBAAS,IAAI,KAAK,YAAYC,iBAAU;QAC1E,IAAI,GAAG,GAAG,EAAE;AACZ,QAAA,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;AACzB,YAAA,MAAM,OAAO,GAAG,SAAS,CAAC,IAA2C,CAAC;YACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;;YAEvD,IAAI,GAAG,GAAG,MAAM;YAChB,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;AACxC,gBAAA,GAAG,GAAG,CAAA,SAAA,EAAY,GAAG,CAAA,CAAE;YAC1B;YAEA,IAAI,IAAI,GAAG,CAAA,EAAG,IAAI,CAAC,WAAW,EAAE,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA,CAAG;;YAG1C,IAAI,CAAC,QAAQ,EAAE;AACZ,gBAAA,IAAI,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAA,SAAA,CAAW;YACjC;AAEA,YAAA,IAAI,QAAQ,IAAI,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,KAAK,MAAK,SAAS,EAAE;gBAC3C,IAAI,GAAG,SAAS,IAAI,CAAA,EAAA,EAAK,OAAO,CAAC,KAAK,GAAG;YAC5C;AAEA,YAAA,IAAI,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE;AAC5B,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,OAAO,CAAC,KAAK,EAAE;YACjC;iBAAO;AACJ,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,IAAI,CAAA,CAAA,EAAI,MAAM,EAAE;YAClC;AAEA,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB;AACA,QAAA,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB;AAEF;;;;"}
+{"version":3,"file":"SelectArgs.cjs","sources":["../../../../src/model/Executer/Aggregate/SelectArgs.ts"],"sourcesContent":["import Model from \"../..\";\nimport Foreign from \"../../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { iof } from \"../../../utils\";\nimport XqlIDField from \"../../../xt/fields/IDField\";\nimport XqlNumber from \"../../../xt/fields/Number\";\nimport { AggregateSelectArgsColumnType, AggregateSelectArgsType } from \"../../types\";\n\nclass SelectArgs {\n   model: Model\n\n   readonly sql: string;\n\n   constructor(model: Model, args: AggregateSelectArgsType) {\n      this.model = model\n      const sqls = []\n\n      for (let column in args) {\n         const field = model.schema[column];\n         if (!field) {\n            throw new XansqlError({\n               message: `Column ${column} not found in model ${model.table} for aggregate select`,\n               model: model.table,\n               column: column\n            });\n         }\n         if (Foreign.is(field)) {\n            throw new XansqlError({\n               message: `Cannot perform aggregate functions on foreign key column ${column} in model ${model.table}`,\n               model: model.table,\n               column: column\n            });\n         } else {\n            const columnArg = args[column] as AggregateSelectArgsColumnType\n            sqls.push(this.columnFormat(column, columnArg))\n         }\n      }\n\n      this.sql = sqls.join(\", \")\n   }\n\n   columnFormat(column: string, columnArg: AggregateSelectArgsColumnType) {\n      let model = this.model\n      const field = model.schema[column];\n      const isNumber = iof(field, XqlNumber, XqlIDField)\n      let sql = []\n      for (let func in columnArg) {\n         const funcArg = columnArg[func as keyof AggregateSelectArgsColumnType]\n         const isObject = funcArg && typeof funcArg === \"object\"\n         // apply distinct\n         let col = column\n         if (isObject && funcArg.distinct === true) {\n            col = `DISTINCT ${col}`\n         }\n\n         let _sql = `${func.toUpperCase()}(${col})`\n\n         // make to integer for all as REAL\n         if (!isNumber) {\n            _sql = `CAST(${_sql} AS REAL)`\n         }\n\n         if (isObject && funcArg?.round !== undefined) {\n            _sql = `ROUND(${_sql}, ${funcArg.round})`\n         }\n\n         if (isObject && funcArg.alias) {\n            _sql += ` AS ${funcArg.alias}`\n         } else {\n            _sql += ` AS ${func}_${column}`\n         }\n\n         sql.push(_sql)\n      }\n      return sql.join(\", \")\n   }\n\n}\n\nexport default SelectArgs;"],"names":["XansqlError","Foreign","iof","XqlNumber","XqlIDField"],"mappings":";;;;;;;;AAQA,MAAM,UAAU,CAAA;IAKb,WAAA,CAAY,KAAY,EAAE,IAA6B,EAAA;AACpD,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;QAClB,MAAM,IAAI,GAAG,EAAE;AAEf,QAAA,KAAK,IAAI,MAAM,IAAI,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE;gBACT,MAAM,IAAIA,gBAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,OAAA,EAAU,MAAM,uBAAuB,KAAK,CAAC,KAAK,CAAA,qBAAA,CAAuB;oBAClF,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;AACA,YAAA,IAAIC,wBAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAID,gBAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,yDAAA,EAA4D,MAAM,aAAa,KAAK,CAAC,KAAK,CAAA,CAAE;oBACrG,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;iBAAO;AACJ,gBAAA,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAkC;AAC/D,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClD;QACH;QAEA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B;IAEA,YAAY,CAAC,MAAc,EAAE,SAAwC,EAAA;AAClE,QAAA,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,MAAM,QAAQ,GAAGE,eAAG,CAAC,KAAK,EAAEC,gBAAS,EAAEC,iBAAU,CAAC;QAClD,IAAI,GAAG,GAAG,EAAE;AACZ,QAAA,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;AACzB,YAAA,MAAM,OAAO,GAAG,SAAS,CAAC,IAA2C,CAAC;YACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;;YAEvD,IAAI,GAAG,GAAG,MAAM;YAChB,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;AACxC,gBAAA,GAAG,GAAG,CAAA,SAAA,EAAY,GAAG,CAAA,CAAE;YAC1B;YAEA,IAAI,IAAI,GAAG,CAAA,EAAG,IAAI,CAAC,WAAW,EAAE,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA,CAAG;;YAG1C,IAAI,CAAC,QAAQ,EAAE;AACZ,gBAAA,IAAI,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAA,SAAA,CAAW;YACjC;AAEA,YAAA,IAAI,QAAQ,IAAI,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,KAAK,MAAK,SAAS,EAAE;gBAC3C,IAAI,GAAG,SAAS,IAAI,CAAA,EAAA,EAAK,OAAO,CAAC,KAAK,GAAG;YAC5C;AAEA,YAAA,IAAI,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE;AAC5B,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,OAAO,CAAC,KAAK,EAAE;YACjC;iBAAO;AACJ,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,IAAI,CAAA,CAAA,EAAI,MAAM,EAAE;YAClC;AAEA,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB;AACA,QAAA,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB;AAEF;;;;"}

package/model/Executer/Aggregate/SelectArgs.mjs

@@ -1,5 +1,6 @@
 import Foreign from '../../../core/classes/ForeignInfo.mjs';
 import XansqlError from '../../../core/XansqlError.mjs';
+import { iof } from '../../../utils/index.mjs';
 import XqlIDField from '../../../xt/fields/IDField.mjs';
 import XqlNumber from '../../../xt/fields/Number.mjs';
 
@@ -33,7 +34,7 @@ class SelectArgs {
     columnFormat(column, columnArg) {
         let model = this.model;
         const field = model.schema[column];
-        const isNumber = field instanceof XqlNumber || field instanceof XqlIDField;
+        const isNumber = iof(field, XqlNumber, XqlIDField);
         let sql = [];
         for (let func in columnArg) {
             const funcArg = columnArg[func];

package/model/Executer/Aggregate/SelectArgs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"SelectArgs.mjs","sources":["../../../../src/model/Executer/Aggregate/SelectArgs.ts"],"sourcesContent":["import Model from \"../..\";\nimport Foreign from \"../../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport XqlIDField from \"../../../xt/fields/IDField\";\nimport XqlNumber from \"../../../xt/fields/Number\";\nimport { AggregateSelectArgsColumnType, AggregateSelectArgsType } from \"../../types\";\n\nclass SelectArgs {\n   model: Model\n\n   readonly sql: string;\n\n   constructor(model: Model, args: AggregateSelectArgsType) {\n      this.model = model\n      const sqls = []\n\n      for (let column in args) {\n         const field = model.schema[column];\n         if (!field) {\n            throw new XansqlError({\n               message: `Column ${column} not found in model ${model.table} for aggregate select`,\n               model: model.table,\n               column: column\n            });\n         }\n         if (Foreign.is(field)) {\n            throw new XansqlError({\n               message: `Cannot perform aggregate functions on foreign key column ${column} in model ${model.table}`,\n               model: model.table,\n               column: column\n            });\n         } else {\n            const columnArg = args[column] as AggregateSelectArgsColumnType\n            sqls.push(this.columnFormat(column, columnArg))\n         }\n      }\n\n      this.sql = sqls.join(\", \")\n   }\n\n   columnFormat(column: string, columnArg: AggregateSelectArgsColumnType) {\n      let model = this.model\n      const field = model.schema[column];\n      const isNumber = field instanceof XqlNumber || field instanceof XqlIDField\n      let sql = []\n      for (let func in columnArg) {\n         const funcArg = columnArg[func as keyof AggregateSelectArgsColumnType]\n         const isObject = funcArg && typeof funcArg === \"object\"\n         // apply distinct\n         let col = column\n         if (isObject && funcArg.distinct === true) {\n            col = `DISTINCT ${col}`\n         }\n\n         let _sql = `${func.toUpperCase()}(${col})`\n\n         // make to integer for all as REAL\n         if (!isNumber) {\n            _sql = `CAST(${_sql} AS REAL)`\n         }\n\n         if (isObject && funcArg?.round !== undefined) {\n            _sql = `ROUND(${_sql}, ${funcArg.round})`\n         }\n\n         if (isObject && funcArg.alias) {\n            _sql += ` AS ${funcArg.alias}`\n         } else {\n            _sql += ` AS ${func}_${column}`\n         }\n\n         sql.push(_sql)\n      }\n      return sql.join(\", \")\n   }\n\n}\n\nexport default SelectArgs;"],"names":[],"mappings":";;;;;AAOA,MAAM,UAAU,CAAA;IAKb,WAAA,CAAY,KAAY,EAAE,IAA6B,EAAA;AACpD,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;QAClB,MAAM,IAAI,GAAG,EAAE;AAEf,QAAA,KAAK,IAAI,MAAM,IAAI,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE;gBACT,MAAM,IAAI,WAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,OAAA,EAAU,MAAM,uBAAuB,KAAK,CAAC,KAAK,CAAA,qBAAA,CAAuB;oBAClF,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;AACA,YAAA,IAAI,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAI,WAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,yDAAA,EAA4D,MAAM,aAAa,KAAK,CAAC,KAAK,CAAA,CAAE;oBACrG,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;iBAAO;AACJ,gBAAA,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAkC;AAC/D,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClD;QACH;QAEA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B;IAEA,YAAY,CAAC,MAAc,EAAE,SAAwC,EAAA;AAClE,QAAA,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,MAAM,QAAQ,GAAG,KAAK,YAAY,SAAS,IAAI,KAAK,YAAY,UAAU;QAC1E,IAAI,GAAG,GAAG,EAAE;AACZ,QAAA,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;AACzB,YAAA,MAAM,OAAO,GAAG,SAAS,CAAC,IAA2C,CAAC;YACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;;YAEvD,IAAI,GAAG,GAAG,MAAM;YAChB,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;AACxC,gBAAA,GAAG,GAAG,CAAA,SAAA,EAAY,GAAG,CAAA,CAAE;YAC1B;YAEA,IAAI,IAAI,GAAG,CAAA,EAAG,IAAI,CAAC,WAAW,EAAE,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA,CAAG;;YAG1C,IAAI,CAAC,QAAQ,EAAE;AACZ,gBAAA,IAAI,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAA,SAAA,CAAW;YACjC;AAEA,YAAA,IAAI,QAAQ,IAAI,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,KAAK,MAAK,SAAS,EAAE;gBAC3C,IAAI,GAAG,SAAS,IAAI,CAAA,EAAA,EAAK,OAAO,CAAC,KAAK,GAAG;YAC5C;AAEA,YAAA,IAAI,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE;AAC5B,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,OAAO,CAAC,KAAK,EAAE;YACjC;iBAAO;AACJ,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,IAAI,CAAA,CAAA,EAAI,MAAM,EAAE;YAClC;AAEA,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB;AACA,QAAA,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB;AAEF;;;;"}
+{"version":3,"file":"SelectArgs.mjs","sources":["../../../../src/model/Executer/Aggregate/SelectArgs.ts"],"sourcesContent":["import Model from \"../..\";\nimport Foreign from \"../../../core/classes/ForeignInfo\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { iof } from \"../../../utils\";\nimport XqlIDField from \"../../../xt/fields/IDField\";\nimport XqlNumber from \"../../../xt/fields/Number\";\nimport { AggregateSelectArgsColumnType, AggregateSelectArgsType } from \"../../types\";\n\nclass SelectArgs {\n   model: Model\n\n   readonly sql: string;\n\n   constructor(model: Model, args: AggregateSelectArgsType) {\n      this.model = model\n      const sqls = []\n\n      for (let column in args) {\n         const field = model.schema[column];\n         if (!field) {\n            throw new XansqlError({\n               message: `Column ${column} not found in model ${model.table} for aggregate select`,\n               model: model.table,\n               column: column\n            });\n         }\n         if (Foreign.is(field)) {\n            throw new XansqlError({\n               message: `Cannot perform aggregate functions on foreign key column ${column} in model ${model.table}`,\n               model: model.table,\n               column: column\n            });\n         } else {\n            const columnArg = args[column] as AggregateSelectArgsColumnType\n            sqls.push(this.columnFormat(column, columnArg))\n         }\n      }\n\n      this.sql = sqls.join(\", \")\n   }\n\n   columnFormat(column: string, columnArg: AggregateSelectArgsColumnType) {\n      let model = this.model\n      const field = model.schema[column];\n      const isNumber = iof(field, XqlNumber, XqlIDField)\n      let sql = []\n      for (let func in columnArg) {\n         const funcArg = columnArg[func as keyof AggregateSelectArgsColumnType]\n         const isObject = funcArg && typeof funcArg === \"object\"\n         // apply distinct\n         let col = column\n         if (isObject && funcArg.distinct === true) {\n            col = `DISTINCT ${col}`\n         }\n\n         let _sql = `${func.toUpperCase()}(${col})`\n\n         // make to integer for all as REAL\n         if (!isNumber) {\n            _sql = `CAST(${_sql} AS REAL)`\n         }\n\n         if (isObject && funcArg?.round !== undefined) {\n            _sql = `ROUND(${_sql}, ${funcArg.round})`\n         }\n\n         if (isObject && funcArg.alias) {\n            _sql += ` AS ${funcArg.alias}`\n         } else {\n            _sql += ` AS ${func}_${column}`\n         }\n\n         sql.push(_sql)\n      }\n      return sql.join(\", \")\n   }\n\n}\n\nexport default SelectArgs;"],"names":[],"mappings":";;;;;;AAQA,MAAM,UAAU,CAAA;IAKb,WAAA,CAAY,KAAY,EAAE,IAA6B,EAAA;AACpD,QAAA,IAAI,CAAC,KAAK,GAAG,KAAK;QAClB,MAAM,IAAI,GAAG,EAAE;AAEf,QAAA,KAAK,IAAI,MAAM,IAAI,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,KAAK,EAAE;gBACT,MAAM,IAAI,WAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,OAAA,EAAU,MAAM,uBAAuB,KAAK,CAAC,KAAK,CAAA,qBAAA,CAAuB;oBAClF,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;AACA,YAAA,IAAI,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;gBACpB,MAAM,IAAI,WAAW,CAAC;AACnB,oBAAA,OAAO,EAAE,CAAA,yDAAA,EAA4D,MAAM,aAAa,KAAK,CAAC,KAAK,CAAA,CAAE;oBACrG,KAAK,EAAE,KAAK,CAAC,KAAK;AAClB,oBAAA,MAAM,EAAE;AACV,iBAAA,CAAC;YACL;iBAAO;AACJ,gBAAA,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAkC;AAC/D,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClD;QACH;QAEA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC7B;IAEA,YAAY,CAAC,MAAc,EAAE,SAAwC,EAAA;AAClE,QAAA,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK;QACtB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC;QAClD,IAAI,GAAG,GAAG,EAAE;AACZ,QAAA,KAAK,IAAI,IAAI,IAAI,SAAS,EAAE;AACzB,YAAA,MAAM,OAAO,GAAG,SAAS,CAAC,IAA2C,CAAC;YACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;;YAEvD,IAAI,GAAG,GAAG,MAAM;YAChB,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,KAAK,IAAI,EAAE;AACxC,gBAAA,GAAG,GAAG,CAAA,SAAA,EAAY,GAAG,CAAA,CAAE;YAC1B;YAEA,IAAI,IAAI,GAAG,CAAA,EAAG,IAAI,CAAC,WAAW,EAAE,CAAA,CAAA,EAAI,GAAG,CAAA,CAAA,CAAG;;YAG1C,IAAI,CAAC,QAAQ,EAAE;AACZ,gBAAA,IAAI,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAA,SAAA,CAAW;YACjC;AAEA,YAAA,IAAI,QAAQ,IAAI,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAE,KAAK,MAAK,SAAS,EAAE;gBAC3C,IAAI,GAAG,SAAS,IAAI,CAAA,EAAA,EAAK,OAAO,CAAC,KAAK,GAAG;YAC5C;AAEA,YAAA,IAAI,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE;AAC5B,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,OAAO,CAAC,KAAK,EAAE;YACjC;iBAAO;AACJ,gBAAA,IAAI,IAAI,CAAA,IAAA,EAAO,IAAI,CAAA,CAAA,EAAI,MAAM,EAAE;YAClC;AAEA,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;QACjB;AACA,QAAA,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB;AAEF;;;;"}

package/model/Executer/Aggregate/index.cjs

@@ -42,11 +42,11 @@ class AggregateExecuter {
             groupBySql = ` GROUP BY ${args.groupBy.join(", ")} `;
         }
         sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim();
-        const { results } = await model.execute(sql);
+        const res = await model.execute(sql);
         // remove groupBy columns from results
-        if (this.removeGroupByColumns && results.length && args.groupBy && args.groupBy.length) {
+        if (this.removeGroupByColumns && (res === null || res === void 0 ? void 0 : res.results.length) && args.groupBy && args.groupBy.length) {
             const groupBySet = new Set(args.groupBy);
-            for (let { chunk } of utils_chunker.chunkArray(results)) {
+            for (let { chunk } of utils_chunker.chunkArray(res === null || res === void 0 ? void 0 : res.results)) {
                 for (let row of chunk) {
                     for (let column of groupBySet) {
                         delete row[column];
@@ -54,7 +54,7 @@ class AggregateExecuter {
                 }
             }
         }
-        return results;
+        return res === null || res === void 0 ? void 0 : res.results;
     }
 }
 

package/model/Executer/Aggregate/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../../../src/model/Executer/Aggregate/index.ts"],"sourcesContent":["import Model from \"../..\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { chunkArray } from \"../../../utils/chunker\";\nimport WhereArgs from \"../../Args/WhereArgs\";\nimport { AggregateArgsType } from \"../../types\";\nimport LimitArgs from \"../Find/LimitArgs\";\nimport OrderByArgs from \"../Find/OrderByArgs\";\nimport SelectArgs from \"./SelectArgs\";\n\nclass AggregateExecuter {\n\n   private model: Model\n   private removeGroupByColumns: boolean\n   constructor(model: Model, removeGroupByColumns: boolean = true) {\n      this.model = model\n      this.removeGroupByColumns = removeGroupByColumns\n   }\n\n   async execute(args: AggregateArgsType) {\n      const xansql = this.model.xansql\n      const model = this.model\n      const select = new SelectArgs(model, args.select || {})\n      const Where = new WhereArgs(model, args.where || {})\n      const OrderBy = new OrderByArgs(model, args.orderBy || {})\n      let LimitSql = \"\"\n\n      if (args.groupBy && args.groupBy.length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      if (!LimitSql && Object.keys(args.limit || {}).length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      let sql = `SELECT `\n      let groupBySql = \"\"\n      if (args.groupBy && args.groupBy.length) {\n         // check column is exists\n         for (let column of args.groupBy) {\n            if (!model.schema[column]) {\n               throw new XansqlError({\n                  message: `Column ${column} not found in model ${model.table} for groupBy`,\n                  model: model.table,\n                  column: column\n               });\n            }\n         }\n         sql += args.groupBy.join(\", \") + \", \"\n         groupBySql = ` GROUP BY ${args.groupBy.join(\", \")} `\n      }\n      sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim()\n      const { results } = await model.execute(sql)\n\n      // remove groupBy columns from results\n      if (this.removeGroupByColumns && results.length && args.groupBy && args.groupBy.length) {\n         const groupBySet = new Set(args.groupBy)\n         for (let { chunk } of chunkArray(results)) {\n            for (let row of chunk) {\n               for (let column of groupBySet) {\n                  delete (row as any)[column]\n               }\n            }\n         }\n      }\n\n      return results\n   }\n}\n\nexport default AggregateExecuter"],"names":["SelectArgs","WhereArgs","OrderByArgs","LimitArgs","XansqlError","chunkArray"],"mappings":"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"}
+{"version":3,"file":"index.cjs","sources":["../../../../src/model/Executer/Aggregate/index.ts"],"sourcesContent":["import Model from \"../..\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { chunkArray } from \"../../../utils/chunker\";\nimport WhereArgs from \"../../Args/WhereArgs\";\nimport { AggregateArgsType } from \"../../types\";\nimport LimitArgs from \"../Find/LimitArgs\";\nimport OrderByArgs from \"../Find/OrderByArgs\";\nimport SelectArgs from \"./SelectArgs\";\n\nclass AggregateExecuter {\n\n   private model: Model\n   private removeGroupByColumns: boolean\n   constructor(model: Model, removeGroupByColumns: boolean = true) {\n      this.model = model\n      this.removeGroupByColumns = removeGroupByColumns\n   }\n\n   async execute(args: AggregateArgsType) {\n      const xansql = this.model.xansql\n      const model = this.model\n      const select = new SelectArgs(model, args.select || {})\n      const Where = new WhereArgs(model, args.where || {})\n      const OrderBy = new OrderByArgs(model, args.orderBy || {})\n      let LimitSql = \"\"\n\n      if (args.groupBy && args.groupBy.length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      if (!LimitSql && Object.keys(args.limit || {}).length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      let sql = `SELECT `\n      let groupBySql = \"\"\n      if (args.groupBy && args.groupBy.length) {\n         // check column is exists\n         for (let column of args.groupBy) {\n            if (!model.schema[column]) {\n               throw new XansqlError({\n                  message: `Column ${column} not found in model ${model.table} for groupBy`,\n                  model: model.table,\n                  column: column\n               });\n            }\n         }\n         sql += args.groupBy.join(\", \") + \", \"\n         groupBySql = ` GROUP BY ${args.groupBy.join(\", \")} `\n      }\n      sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim()\n      const res = await model.execute(sql)\n\n      // remove groupBy columns from results\n      if (this.removeGroupByColumns && res?.results.length && args.groupBy && args.groupBy.length) {\n         const groupBySet = new Set(args.groupBy)\n         for (let { chunk } of chunkArray(res?.results)) {\n            for (let row of chunk) {\n               for (let column of groupBySet) {\n                  delete (row as any)[column]\n               }\n            }\n         }\n      }\n\n      return res?.results\n   }\n}\n\nexport default AggregateExecuter"],"names":["SelectArgs","WhereArgs","OrderByArgs","LimitArgs","XansqlError","chunkArray"],"mappings":"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"}

package/model/Executer/Aggregate/index.mjs

@@ -40,11 +40,11 @@ class AggregateExecuter {
             groupBySql = ` GROUP BY ${args.groupBy.join(", ")} `;
         }
         sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim();
-        const { results } = await model.execute(sql);
+        const res = await model.execute(sql);
         // remove groupBy columns from results
-        if (this.removeGroupByColumns && results.length && args.groupBy && args.groupBy.length) {
+        if (this.removeGroupByColumns && (res === null || res === void 0 ? void 0 : res.results.length) && args.groupBy && args.groupBy.length) {
             const groupBySet = new Set(args.groupBy);
-            for (let { chunk } of chunkArray(results)) {
+            for (let { chunk } of chunkArray(res === null || res === void 0 ? void 0 : res.results)) {
                 for (let row of chunk) {
                     for (let column of groupBySet) {
                         delete row[column];
@@ -52,7 +52,7 @@ class AggregateExecuter {
                 }
             }
         }
-        return results;
+        return res === null || res === void 0 ? void 0 : res.results;
     }
 }
 

package/model/Executer/Aggregate/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../src/model/Executer/Aggregate/index.ts"],"sourcesContent":["import Model from \"../..\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { chunkArray } from \"../../../utils/chunker\";\nimport WhereArgs from \"../../Args/WhereArgs\";\nimport { AggregateArgsType } from \"../../types\";\nimport LimitArgs from \"../Find/LimitArgs\";\nimport OrderByArgs from \"../Find/OrderByArgs\";\nimport SelectArgs from \"./SelectArgs\";\n\nclass AggregateExecuter {\n\n   private model: Model\n   private removeGroupByColumns: boolean\n   constructor(model: Model, removeGroupByColumns: boolean = true) {\n      this.model = model\n      this.removeGroupByColumns = removeGroupByColumns\n   }\n\n   async execute(args: AggregateArgsType) {\n      const xansql = this.model.xansql\n      const model = this.model\n      const select = new SelectArgs(model, args.select || {})\n      const Where = new WhereArgs(model, args.where || {})\n      const OrderBy = new OrderByArgs(model, args.orderBy || {})\n      let LimitSql = \"\"\n\n      if (args.groupBy && args.groupBy.length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      if (!LimitSql && Object.keys(args.limit || {}).length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      let sql = `SELECT `\n      let groupBySql = \"\"\n      if (args.groupBy && args.groupBy.length) {\n         // check column is exists\n         for (let column of args.groupBy) {\n            if (!model.schema[column]) {\n               throw new XansqlError({\n                  message: `Column ${column} not found in model ${model.table} for groupBy`,\n                  model: model.table,\n                  column: column\n               });\n            }\n         }\n         sql += args.groupBy.join(\", \") + \", \"\n         groupBySql = ` GROUP BY ${args.groupBy.join(\", \")} `\n      }\n      sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim()\n      const { results } = await model.execute(sql)\n\n      // remove groupBy columns from results\n      if (this.removeGroupByColumns && results.length && args.groupBy && args.groupBy.length) {\n         const groupBySet = new Set(args.groupBy)\n         for (let { chunk } of chunkArray(results)) {\n            for (let row of chunk) {\n               for (let column of groupBySet) {\n                  delete (row as any)[column]\n               }\n            }\n         }\n      }\n\n      return results\n   }\n}\n\nexport default AggregateExecuter"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.mjs","sources":["../../../../src/model/Executer/Aggregate/index.ts"],"sourcesContent":["import Model from \"../..\";\nimport XansqlError from \"../../../core/XansqlError\";\nimport { chunkArray } from \"../../../utils/chunker\";\nimport WhereArgs from \"../../Args/WhereArgs\";\nimport { AggregateArgsType } from \"../../types\";\nimport LimitArgs from \"../Find/LimitArgs\";\nimport OrderByArgs from \"../Find/OrderByArgs\";\nimport SelectArgs from \"./SelectArgs\";\n\nclass AggregateExecuter {\n\n   private model: Model\n   private removeGroupByColumns: boolean\n   constructor(model: Model, removeGroupByColumns: boolean = true) {\n      this.model = model\n      this.removeGroupByColumns = removeGroupByColumns\n   }\n\n   async execute(args: AggregateArgsType) {\n      const xansql = this.model.xansql\n      const model = this.model\n      const select = new SelectArgs(model, args.select || {})\n      const Where = new WhereArgs(model, args.where || {})\n      const OrderBy = new OrderByArgs(model, args.orderBy || {})\n      let LimitSql = \"\"\n\n      if (args.groupBy && args.groupBy.length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      if (!LimitSql && Object.keys(args.limit || {}).length) {\n         LimitSql = (new LimitArgs(model, args.limit || {})).sql\n      }\n\n      let sql = `SELECT `\n      let groupBySql = \"\"\n      if (args.groupBy && args.groupBy.length) {\n         // check column is exists\n         for (let column of args.groupBy) {\n            if (!model.schema[column]) {\n               throw new XansqlError({\n                  message: `Column ${column} not found in model ${model.table} for groupBy`,\n                  model: model.table,\n                  column: column\n               });\n            }\n         }\n         sql += args.groupBy.join(\", \") + \", \"\n         groupBySql = ` GROUP BY ${args.groupBy.join(\", \")} `\n      }\n      sql += `${select.sql} FROM ${model.table} ${Where.sql}${groupBySql}${OrderBy.sql}${LimitSql}`.trim()\n      const res = await model.execute(sql)\n\n      // remove groupBy columns from results\n      if (this.removeGroupByColumns && res?.results.length && args.groupBy && args.groupBy.length) {\n         const groupBySet = new Set(args.groupBy)\n         for (let { chunk } of chunkArray(res?.results)) {\n            for (let row of chunk) {\n               for (let column of groupBySet) {\n                  delete (row as any)[column]\n               }\n            }\n         }\n      }\n\n      return res?.results\n   }\n}\n\nexport default AggregateExecuter"],"names":[],"mappings":"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"}

package/model/Executer/Create/CreateDataArgs.cjs

@@ -84,14 +84,14 @@ class CreateDataArgs {
                     }
                     else {
                         // check is the field is IDField or created_at or updated_at
-                        if (model.IDColumn === column || field instanceof xt_fields_Date && (field.meta.update || field.meta.create)) {
+                        if (model.IDColumn === column || utils_index.iof(field, xt_fields_Date) && (field.meta.update || (field.meta.create || field.meta.update))) {
                             throw new core_XansqlError({
                                 message: `Cannot set value for ${model.table}.${column}. It is automatically managed.`,
                                 model: model.table,
                                 column: column
                             });
                         }
-                        if (value instanceof File) {
+                        if (utils_index.iof(value, File)) {
                             this.files[column] = value;
                             this.data[column] = '';
                             model_include_ValueFormatter.toSql(model, column, value); // for validation
@@ -102,7 +102,7 @@ class CreateDataArgs {
                     }
                 }
                 catch (error) {
-                    if (error instanceof core_XansqlError) {
+                    if (utils_index.iof(error, core_XansqlError)) {
                         this.errors.push(error);
                     }
                     else {
@@ -135,9 +135,13 @@ class CreateDataArgs {
                             column: column
                         }));
                     }
-                    continue;
                 }
-                this.data[column] = model_include_ValueFormatter.toSql(model, column, null);
+                else if (utils_index.iof(field, xt_fields_Date) && (field.meta.create || field.meta.update)) {
+                    this.data[column] = model_include_ValueFormatter.toSql(model, column, new Date());
+                }
+                else {
+                    this.data[column] = model_include_ValueFormatter.toSql(model, column, null);
+                }
             }
             // generate sql
             // const keys = Object.keys(this.data)