@dreamtree-org/korm-js 1.0.35 → 1.0.37

package/BaseHelperUtility.js

@@ -1 +1 @@
-const Files=require("./helpers/files");class BaseHelperUtility{file=new Files;capitalize(e){return e.charAt(0).toUpperCase()+e.slice(1)}snakeCase(e){return e.replace(/([A-Z])/g,"_$1").toLowerCase()}camelCase(e){return e.replace(/([-_][a-z])/gi,e=>e.toUpperCase().replace("-","").replace("_",""))}kebabCase(e){return e.replace(/([A-Z])/g,"-$1").toLowerCase()}pascalCase(e){return e.replace(/([-_][a-z])/gi,e=>e.toUpperCase().replace("-","").replace("_",""))}pluralize(e){if(e.match(/[^aeiou]y$/i))return e.slice(0,-1)+"ies";if(e.match(/(s|x|z|ch|sh)$/i))return e+"es";if(e.match(/(f|fe)$/i)){if(e.endsWith("fe"))return e.slice(0,-2)+"ves";if(e.endsWith("f"))return e.slice(0,-1)+"ves"}return e.match(/(o)$/i)?e.length>1&&"aeiou".includes(e[e.length-2].toLowerCase())?e+"s":e+"es":e.match(/us$/i)?e.slice(0,-2)+"i":e.match(/is$/i)?e.slice(0,-2)+"es":e.match(/on$/i)||e.match(/um$/i)?e.slice(0,-2)+"a":e.match(/a$/i)?e+"s":e.match(/eau$/i)?e+"x":e.match(/ix$/i)||e.match(/ex$/i)?e.slice(0,-2)+"ices":e.match(/s$/i)?e:e+"s"}singularize(e){return String(e||"").trim().replace(/([b-df-hj-np-tv-z])ies$/i,"$1y").replace(/eaux$/i,"eau").replace(/oes$/i,"o").replace(/(xes|zes|ches|shes|sses)$/i,e=>e.slice(0,-2)).replace(/(us)es$/i,"$1").replace(/ves$/i,"f").replace(/([^s])s$/i,"$1")}modelName(e){let r=this.singularize(e);return r=this.camelCase(r),r=this.capitalize(r),r}dotParse(e,r,t=null){return this.dotWalk(e,{source:r,defaultValue:t})}dotWalk(e,r={}){const{source:t={},defaultValue:s=null,resolver:a=({current:e,part:r,source:t})=>e[r]}=r,l=e.split(".");let i=t;for(const e of l){const r=e.match(/^(\w+)\[(.*?)\]$/);if(r){const e=r[1],l=r[2]||0;if(i=i[e]||[],i=a({current:i,part:l,source:t}),void 0===i)return s}else{if(void 0===i[e])return s;if(i=a({current:i,part:e,source:t}),void 0===i)return s}}return i}dotWalkTree(e,r={}){const{resolver:t=({current:e,part:r,source:t})=>{}}=r,s={};for(const r of e){const e=r.split(".");let a=e.length,l=s,i=0;for(const u of e){let e=i===a-1;l[u]=l[u]||t({current:l,part:u,source:s,path:r,isLastPart:e}),l=l[u],i++}}return s}parseValue(e){return isNaN(e)||""===e?"true"===e.toLowerCase()||"false"!==e.toLowerCase()&&("null"===e.toLowerCase()?null:e):Number(e)}parseWhereValue(e){if("string"!=typeof e)return{operator:"=",value:e};if(e.startsWith("!")){const r=e.substring(1);return{operator:"!=",value:this.parseValue(r)}}if(e.includes("%"))return{operator:"like",value:e};const r=e.match(/^(><|<>)(.+)$/);if(r){const[,e,t]=r,s=t.split(",").map(e=>this.parseValue(e.trim()));if("><"===e){if(2===s.length)return{operator:"between",value:s}}else if("<>"===e&&2===s.length)return{operator:"notBetween",value:s}}const t=e.match(/^(>=|<=|<|>)(.+)$/);if(t){const[,e,r]=t;return{operator:e,value:this.parseValue(r)}}const s=e.match(/^(!?)\[\]?(.+)$/);if(s){const[,e,r]=s;return{operator:e?"notIn":"in",value:r.split(",").map(e=>this.parseValue(e.trim()))}}return{operator:"=",value:this.parseValue(e)}}objectFilter(e,r){return Object.keys(e).filter(t=>r(t,e[t])).reduce((r,t)=>(r[t]=e[t],r),{})}pluckDotWalkKey(e,r=1,t="."){let s=e.split(t);return[...s].splice(-1*s.length+r).join(t)}getDotWalkQuery(e,r=""){console.log({query:e,prefix:r});let t=this.dotWalkTree(Object.keys(e).filter(e=>e.includes(r)),{resolver:({current:r,part:t,source:s,path:a,isLastPart:l})=>l?e[a]:{}});return r&&(t=t[r]),t}setNested(e,r,t){let s={name:r,value:t},a=e,l=a,i="",u=s.name.split(".");return u.length>1?(u.forEach(e=>{a=l,l[e]=l[e]||{},l=l[e],i=e}),a[i]=s.value):(i=s.name,a=e[i],e[i]=s.value),e}}module.exports=BaseHelperUtility;
+const Files=require("./helpers/files");class BaseHelperUtility{file=new Files;capitalize(e){return e.charAt(0).toUpperCase()+e.slice(1)}snakeCase(e){return e.replace(/([A-Z])/g,"_$1").toLowerCase()}camelCase(e){return e.replace(/([-_][a-z])/gi,e=>e.toUpperCase().replace("-","").replace("_",""))}kebabCase(e){return e.replace(/([A-Z])/g,"-$1").toLowerCase()}pascalCase(e){return e.replace(/([-_][a-z])/gi,e=>e.toUpperCase().replace("-","").replace("_",""))}pluralize(e){if(e.match(/[^aeiou]y$/i))return e.slice(0,-1)+"ies";if(e.match(/(s|x|z|ch|sh)$/i))return e+"es";if(e.match(/(f|fe)$/i)){if(e.endsWith("fe"))return e.slice(0,-2)+"ves";if(e.endsWith("f"))return e.slice(0,-1)+"ves"}return e.match(/(o)$/i)?e.length>1&&"aeiou".includes(e[e.length-2].toLowerCase())?e+"s":e+"es":e.match(/us$/i)?e.slice(0,-2)+"i":e.match(/is$/i)?e.slice(0,-2)+"es":e.match(/on$/i)||e.match(/um$/i)?e.slice(0,-2)+"a":e.match(/a$/i)?e+"s":e.match(/eau$/i)?e+"x":e.match(/ix$/i)||e.match(/ex$/i)?e.slice(0,-2)+"ices":e.match(/s$/i)?e:e+"s"}singularize(e){return String(e||"").trim().replace(/([b-df-hj-np-tv-z])ies$/i,"$1y").replace(/eaux$/i,"eau").replace(/oes$/i,"o").replace(/(xes|zes|ches|shes|sses)$/i,e=>e.slice(0,-2)).replace(/(us)es$/i,"$1").replace(/ves$/i,"f").replace(/([^s])s$/i,"$1")}modelName(e){let r=this.singularize(e);return r=this.camelCase(r),r=this.capitalize(r),r}dotParse(e,r,t=null){return this.dotWalk(e,{source:r,defaultValue:t})}dotWalk(e,r={}){const{source:t={},defaultValue:s=null,resolver:a=({current:e,part:r,source:t})=>e[r]}=r,i=e.split(".");let l=t;for(const e of i){const r=e.match(/^(\w+)\[(.*?)\]$/);if(r){const e=r[1],i=r[2]||0;if(l=l[e]||[],l=a({current:l,part:i,source:t}),void 0===l)return s}else{if(void 0===l[e])return s;if(l=a({current:l,part:e,source:t}),void 0===l)return s}}return l}dotWalkTree(e,r={}){const{resolver:t=({current:e,part:r,source:t})=>{}}=r,s={};for(const r of e){const e=r.split(".");let a=e.length,i=s,l=0;for(const u of e){let e=l===a-1;i[u]=i[u]||t({current:i,part:u,source:s,path:r,isLastPart:e}),i=i[u],l++}}return s}parseValue(e){return isNaN(e)||""===e?"true"===e.toLowerCase()||"false"!==e.toLowerCase()&&("null"===e.toLowerCase()?null:e):Number(e)}parseWhereValue(e){if("string"!=typeof e)return{operator:"=",value:e};if(e.startsWith("!")){const r=e.substring(1);return{operator:"!=",value:this.parseValue(r)}}if(e.includes("%"))return{operator:"like",value:e};const r=e.match(/^(><|<>)(.+)$/);if(r){const[,e,t]=r,s=t.split(",").map(e=>this.parseValue(e.trim()));if("><"===e){if(2===s.length)return{operator:"between",value:s}}else if("<>"===e&&2===s.length)return{operator:"notBetween",value:s}}const t=e.match(/^(>=|<=|<|>)(.+)$/);if(t){const[,e,r]=t;return{operator:e,value:this.parseValue(r)}}const s=e.match(/^(!?)\[\]?(.+)$/);if(s){const[,e,r]=s;return{operator:e?"notIn":"in",value:r.split(",").map(e=>this.parseValue(e.trim()))}}return{operator:"=",value:this.parseValue(e)}}objectFilter(e,r){return Object.keys(e).filter(t=>r(t,e[t])).reduce((r,t)=>(r[t]=e[t],r),{})}pluckDotWalkKey(e,r=1,t="."){let s=e.split(t);return[...s].splice(-1*s.length+r).join(t)}getDotWalkQuery(e,r=""){let t=this.dotWalkTree(Object.keys(e).filter(e=>e.includes(r)),{resolver:({current:r,part:t,source:s,path:a,isLastPart:i})=>i?e[a]:{}});return r&&(t=t[r]),t}setNested(e,r,t){let s={name:r,value:t},a=e,i=a,l="",u=s.name.split(".");return u.length>1?(u.forEach(e=>{a=i,i[e]=i[e]||{},i=i[e],l=e}),a[l]=s.value):(l=s.name,a=e[l],e[l]=s.value),e}}module.exports=BaseHelperUtility;

package/ControllerWrapper.js

@@ -1 +1 @@
-const mysqlWrapper=require("./clients/mysql"),sqliteWrapper=require("./clients/sqlite"),pgWrapper=require("./clients/pg"),BaseHelperUtility=require("./BaseHelperUtility"),InstanceMapper={mysql2:mysqlWrapper,sqlite:sqliteWrapper,pg:pgWrapper},dbClientMapper={mysql2:"mysql2",mysql:"mysql2",pg:"pg",postgresql:"pg",sqlite:"sqlite",sqlite3:"sqlite"};class ControllerWrapper{static db=null;static dbClient=null;static schema=null;static resolverPath=null;static dbInstance=null;requestInstance=null;constructor(){this.requestInstance={}}static initializeKORM({db:e,dbClient:t,schema:s,resolverPath:a=null}){this.db=e,this.dbClient=t,this.schema=s,this.resolverPath=a;const r=dbClientMapper[t];if(!r)throw new Error(`Database client ${t} not found`);const n=InstanceMapper[r];if(!n)throw new Error(`Database client ${t} not found`);return this.dbInstance=new n(this),this}static setSchema(e){return this.schema=e,this}static async processRequest(e,t=null,s=null){return await this.dbInstance.processRequest(e,t,s)}static async syncDatabase(){return await this.dbInstance.syncDatabase()}static async generateSchema(){return await this.dbInstance.generateSchema()}}module.exports=ControllerWrapper;
+const mysqlWrapper=require("./clients/mysql"),sqliteWrapper=require("./clients/sqlite"),pgWrapper=require("./clients/pg"),BaseHelperUtility=require("./BaseHelperUtility"),InstanceMapper={mysql2:mysqlWrapper,sqlite:sqliteWrapper,pg:pgWrapper},dbClientMapper={mysql2:"mysql2",mysql:"mysql2",pg:"pg",postgresql:"pg",sqlite:"sqlite",sqlite3:"sqlite"};class ControllerWrapper{static db=null;static dbClient=null;static dbClientClass=null;static schema=null;static resolverPath=null;static dbInstance=null;requestInstance=null;constructor(){this.requestInstance={}}static initializeKORM({db:t,dbClient:e,schema:s,resolverPath:a=null}){this.db=t,this.dbClient=e,this.schema=s,this.resolverPath=a;const n=dbClientMapper[e];if(!n)throw new Error(`Database client ${e} not found`);const r=InstanceMapper[n];if(!r)throw new Error(`Database client ${e} not found`);return this.dbClientClass=r,this}static setSchema(t){this.schema=t;const e=this.dbClientClass;if(!e)throw new Error(`Database client ${dbClient} not found`);return this.dbInstance=new e(this),this}static async processRequest(t,e=null,s=null){return await this.dbInstance.processRequest(t,e,s)}static async syncDatabase(){return await this.dbInstance.syncDatabase()}static async generateSchema(){return await this.dbInstance.generateSchema()}}module.exports=ControllerWrapper;

package/build.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-const fs=require("fs"),path=require("path"),{execSync:execSync}=require("child_process");function progressBar(e,s,n=30){const i=e/s,o=Math.round(n*i),t=n-o,c="█".repeat(o)+"-".repeat(t);process.stdout.write(`\r[${c}] ${(100*i).toFixed(1)}% (${e}/${s})`),e===s&&process.stdout.write("\n")}function getAllJsFiles(e,s=["node_modules","dist","test"]){let n=[];return fs.readdirSync(e).forEach(i=>{const o=path.join(e,i),t=fs.statSync(o);t&&t.isDirectory()?s.includes(i)||(n=n.concat(getAllJsFiles(o,s))):i.endsWith(".js")&&n.push(o)}),n}function ensureDir(e){fs.existsSync(e)||(fs.mkdirSync(e,{recursive:!0}),console.log(`✅ Created directory: ${e}`))}function minifyFile(e,s){try{return execSync(`npx terser "${e}" -o "${s}" --compress --mangle --comments false`,{stdio:"pipe"}),!0}catch(n){return fs.copyFileSync(e,s),!1}}function copyFile(e,s){fs.copyFileSync(e,s)}async function build(){console.log("🚀 KORM Build: Minifying all JS files to dist/ with progress bar\n"),fs.existsSync("dist")&&(fs.rmSync("dist",{recursive:!0,force:!0}),console.log("✅ Cleaned dist/")),ensureDir("dist");const e=getAllJsFiles(".",["node_modules","dist","test"]),s=e.length;let n=0,i=0,o=0;e.forEach((e,t)=>{const c=path.relative(".",e),r=path.join("dist",c);ensureDir(path.dirname(r));const l=fs.statSync(e).size,d=(minifyFile(e,r),fs.statSync(r).size);i+=l,o+=d,n++,progressBar(n,s)}),["README.md","LICENSE"].forEach(e=>{fs.existsSync(e)&&(copyFile(e,path.join("dist",e)),console.log(`✅ Copied: ${e}`))}),fs.existsSync("node_modules")&&(execSync("cp -r node_modules dist/",{stdio:"pipe"}),console.log("✅ Copied node_modules/ to dist/"));const t=path.join(".","version-manager.js");let c=!1,r=null;if(fs.existsSync(t))try{const e=new(require("./version-manager"));"function"==typeof e.smartAutoIncrement&&(r=await e.smartAutoIncrement(),c=!0,console.log(`✅ Version updated using version-manager.js: ${r}`))}catch(e){console.warn("⚠️  Could not update version using version-manager.js:",e.message)}if(fs.existsSync("package.json")){const e=JSON.parse(fs.readFileSync("package.json","utf8"));e.scripts&&(delete e.scripts.build,delete e.scripts.clean,delete e.scripts.minify,delete e.scripts["minify:js"],delete e.scripts.prepublishOnly),delete e.devDependencies,e.main="index.js",delete e.files,c&&r&&("string"==typeof r?(e.version=r,console.log(`✅ Set version in dist/package.json: ${r}`)):(console.warn(`⚠️  newVersion is not a string: ${typeof r} - ${JSON.stringify(r)}`),e.version=e.version||"1.0.0")),fs.writeFileSync(path.join("dist","package.json"),JSON.stringify(e,null,2)),console.log("✅ Created dist/package.json")}const l=((i-o)/i*100).toFixed(1);console.log("\n📊 Build Statistics:"),console.log(`   JS files processed: ${s}`),console.log(`   Original size: ${(i/1024).toFixed(1)} KB`),console.log(`   Minified size: ${(o/1024).toFixed(1)} KB`),console.log(`   Size reduction: ${l}%`),c&&r&&console.log(`   New version: ${r}`),console.log("\n🎉 Build completed! Output in dist/")}build().catch(console.error);
+const fs=require("fs"),path=require("path"),{execSync:execSync}=require("child_process");function progressBar(e,s,i=30){const o=e/s,t=Math.round(i*o),n=i-t,c="█".repeat(t)+"-".repeat(n);process.stdout.write(`\r[${c}] ${(100*o).toFixed(1)}% (${e}/${s})`),e===s&&process.stdout.write("\n")}function getAllJsFiles(e,s=["node_modules","dist","test"]){let i=[];return fs.readdirSync(e).forEach(o=>{const t=path.join(e,o),n=fs.statSync(t);n&&n.isDirectory()?s.includes(o)||(i=i.concat(getAllJsFiles(t,s))):o.endsWith(".js")&&i.push(t)}),i}function ensureDir(e){fs.existsSync(e)||(fs.mkdirSync(e,{recursive:!0}),console.log(`✅ Created directory: ${e}`))}function minifyFile(e,s){try{return execSync(`npx terser "${e}" -o "${s}" --compress --mangle --comments false`,{stdio:"pipe"}),!0}catch(i){return fs.copyFileSync(e,s),!1}}function copyFile(e,s){fs.copyFileSync(e,s)}function copyDirectory(e,s){if(!fs.existsSync(e))return;ensureDir(s);fs.readdirSync(e,{withFileTypes:!0}).forEach(i=>{const o=path.join(e,i.name),t=path.join(s,i.name);i.isDirectory()?copyDirectory(o,t):copyFile(o,t)})}async function build(){console.log("🚀 KORM Build: Minifying all JS files to dist/ with progress bar\n"),fs.existsSync("dist")&&(fs.rmSync("dist",{recursive:!0,force:!0}),console.log("✅ Cleaned dist/")),ensureDir("dist");const e=getAllJsFiles(".",["node_modules","dist","test"]),s=e.length;let i=0,o=0,t=0;e.forEach((e,n)=>{const c=path.relative(".",e),r=path.join("dist",c);ensureDir(path.dirname(r));const l=fs.statSync(e).size,a=(minifyFile(e,r),fs.statSync(r).size);o+=l,t+=a,i++,progressBar(i,s)}),["README.md","LICENSE"].forEach(e=>{fs.existsSync(e)&&(copyFile(e,path.join("dist",e)),console.log(`✅ Copied: ${e}`))}),fs.existsSync("templates")&&(copyDirectory("templates",path.join("dist","templates")),console.log("✅ Copied templates/ to dist/")),fs.existsSync("node_modules")&&(execSync("cp -r node_modules dist/",{stdio:"pipe"}),console.log("✅ Copied node_modules/ to dist/"));const n=path.join(".","version-manager.js");let c=!1,r=null;if(fs.existsSync(n))try{const e=new(require("./version-manager"));"function"==typeof e.smartAutoIncrement&&(r=await e.smartAutoIncrement(),c=!0,console.log(`✅ Version updated using version-manager.js: ${r}`))}catch(e){console.warn("⚠️  Could not update version using version-manager.js:",e.message)}if(fs.existsSync("package.json")){const e=JSON.parse(fs.readFileSync("package.json","utf8"));e.scripts&&(delete e.scripts.build,delete e.scripts.clean,delete e.scripts.minify,delete e.scripts["minify:js"],delete e.scripts.prepublishOnly),delete e.devDependencies,e.main="index.js",delete e.files,c&&r&&("string"==typeof r?(e.version=r,console.log(`✅ Set version in dist/package.json: ${r}`)):(console.warn(`⚠️  newVersion is not a string: ${typeof r} - ${JSON.stringify(r)}`),e.version=e.version||"1.0.0")),fs.writeFileSync(path.join("dist","package.json"),JSON.stringify(e,null,2)),console.log("✅ Created dist/package.json")}const l=((o-t)/o*100).toFixed(1);console.log("\n📊 Build Statistics:"),console.log(`   JS files processed: ${s}`),console.log(`   Original size: ${(o/1024).toFixed(1)} KB`),console.log(`   Minified size: ${(t/1024).toFixed(1)} KB`),console.log(`   Size reduction: ${l}%`),c&&r&&console.log(`   New version: ${r}`),console.log("\n🎉 Build completed! Output in dist/")}build().catch(console.error);

package/clients/mysql/QueryBuilder.js

@@ -1 +1 @@
-const HelperUtility=require("./HelperUtility");class QueryBuilder{constructor(e,t,r=null){this.db=e,this.utils=t,this.controllerWrapper=r,this.helperUtility=new HelperUtility}getQueryBuilder(e,t=null){let r=this.db(e.table);return t&&(r=t),r._getMyModel=()=>e,r}parseValue(e){return this.helperUtility.parseValue(e)}parseWhereValue(e){return this.helperUtility.parseWhereValue(e)}_applyWhereCondition(e,t,r,i){switch(r){case"between":e.whereBetween(t,i);break;case"notBetween":e.whereNotBetween(t,i);break;case"in":e.whereIn(t,i);break;case"notIn":e.whereNotIn(t,i);break;case"like":e.whereLike(t,i);break;default:e.where(t,r,i)}}buildWithTree(e,t=null){return this.helperUtility.dotWalkTree(e,{resolver:({current:e,part:r,source:i})=>t?t({current:e,part:r,source:i}):{}})}async fetchRelatedRows(e,t){if(e.through){let r=await this.db(e.through).whereIn(e.throughLocalKey,t);return await this.db(e.table).whereIn(e.foreignKey,r.map(t=>t[e.throughForeignKey]))}return this.db(e.table).whereIn(e.foreignKey,t)}async fetchAndAttachRelated(e){const{parentRows:t,relName:r,model:i,withTree:l,relation:o}=e;let a=t.map(e=>e[o.localKey]),s=[];s="one"===o?.type?await this.fetchRelatedRows(o,a).first():await this.fetchRelatedRows(o,a);let n=new Map;for(const e of s){let t=e[o.foreignKey];n.has(t)||n.set(t,[]),n.get(t).push(e)}for(const e of t){let t=e[o.localKey];e[r]=n.get(t)||[]}let h=Object.keys(l);for(const e of h){let i=l[e],o=t.filter(e=>e[r].length>0).map(e=>e[r]).reduce((e,t)=>e.concat(t),[]),a=this.utils.getModel(this.controllerWrapper,r);await this.fetchAndAttachRelated({parentRows:o,relName:e,model:a,withTree:i,relation:a.hasRelations[e]})}return t}filterWhere(e,t=""){return t?Object.keys(e).filter(e=>e.includes(t)).reduce((r,i)=>(r[i.replace(t,"")]=e[i],r),{}):Object.keys(e).filter(e=>!e.includes(".")).reduce((t,r)=>(t[r]=e[r],t),{})}async getQuery(e,t){try{const{where:r={},with:i,withWhere:l,select:o,orderBy:a={column:"id",direction:"asc"},limit:s=10,offset:n=0,page:h,groupBy:c,having:p,distinct:y,join:u,leftJoin:f,rightJoin:d,innerJoin:g,count:w=!1}=t;let b=this.getQueryBuilder(e);o&&(Array.isArray(o)||"string"==typeof o)?b.select(o):b.select("*"),y&&(Array.isArray(y)||"string"==typeof y?b.distinct(y):b.distinct()),u&&this._applyJoins(b,u,"join"),f&&this._applyJoins(b,f,"leftJoin"),d&&this._applyJoins(b,d,"rightJoin"),g&&this._applyJoins(b,g,"innerJoin"),this._applyWhereClause(b,r,i),c&&(Array.isArray(c),b.groupBy(c)),p&&this._applyHavingClause(b,p),a&&this._applyOrderBy(b,a);let W=!1,_=s,m=n,j=1,A=0;h&&s>0&&(j=Math.max(1,parseInt(h)),m=(j-1)*s),s>0&&(b.limit(_),m>0&&b.offset(m));const k=await b;if(i&&i.length>0){const t=this.buildWithTree(i);for(const r of Object.keys(t))await this.fetchAndAttachRelated({parentRows:k,relName:r,model:e,withTree:t[r],relation:e.hasRelations[r]})}let B=null;if(s>0)try{let t=this.getQueryBuilder(e);r&&Object.keys(r).length>0&&this._applyWhereClause(t,r),u&&this._applyJoins(t,u,"join"),f&&this._applyJoins(t,f,"leftJoin"),d&&this._applyJoins(t,d,"rightJoin"),g&&this._applyJoins(t,g,"innerJoin");B=(await t.count("* as cnt").first()).cnt}catch(e){console.warn("Failed to get total count:",e.message),B=k.length}s>0&&null!==B&&(A=Math.ceil(B/s),W=j<A);return{data:k,totalCount:B,...s>0?{pagination:{page:j,limit:_,offset:m,totalPages:A,hasNext:W,hasPrev:j>1,nextPage:W?j+1:null,prevPage:j>1?j-1:null}}:{}}}catch(e){throw console.error("QueryService.getQuery error:",e),new Error(`Failed to execute query: ${e.message}`)}}_applyWhereClause(e,t,r=[]){if(t&&Object.keys(t).length>0){let r=this.helperUtility.getDotWalkQuery(t);console.log({filteredWhere:r}),r=this.helperUtility.objectFilter(r,(e,t)=>"object"!=typeof t||null===t);for(const[t,i]of Object.entries(r))if(null===i)e.whereNull(t);else if(Array.isArray(i))e.whereIn(t,i);else{const{operator:r,value:l}=this.parseWhereValue(i);this._applyWhereCondition(e,t,r,l)}}r&&r.length>0&&this._applyNestedWhere(e,t,r)}_applyNestedWhere(e,t,r){let i=this,l=e._getMyModel();if(r&&r.length>0)for(const o of r){let a=this.helperUtility.getDotWalkQuery(t,o);if(a&&Object.keys(a).length>0){let t=this.utils.getModel(this.controllerWrapper,o),s=l.hasRelations[o],n=r.map(e=>this.helperUtility.pluckDotWalkKey(e,1));e.whereExists(function(){let e=i.getQueryBuilder(t,this.select("*").from(t.table));e.whereRaw(`${s.foreignKey} = ${l.table}.${s.localKey}`),i._applyWhereClause(e,a,n)})}}}_applyJoins(e,t,r){const i=Array.isArray(t)?t:[t];for(const t of i)"string"==typeof t?e[r](t):"object"==typeof t&&(t.table&&t.on?e[r](t.table,t.on):t.table&&t.first&&t.operator&&t.second&&e[r](t.table,t.first,t.operator,t.second))}_applyWithWhere(e,t){try{if(Array.isArray(t))for(const r of t)"string"==typeof r?e.withWhere(r):"object"==typeof r&&e.withWhere(r.column,r.operator,r.value);else if("object"==typeof t)for(const[r,i]of Object.entries(t))e.withWhere(r,i)}catch(e){console.warn("Failed to apply withWhere:",e.message)}}_applyHavingClause(e,t){for(const[r,i]of Object.entries(t))"object"==typeof i&&i.operator?e.having(r,i.operator,i.value):e.having(r,i)}_applyOrderBy(e,t){if(Array.isArray(t))for(const r of t)"string"==typeof r?e.orderBy(r):"object"==typeof r&&e.orderBy(r.column,r.direction||"asc");else"string"==typeof t?e.orderBy(t):"object"==typeof t&&e.orderBy(t.column,t.direction||"asc")}}module.exports=QueryBuilder;
+const HelperUtility=require("./HelperUtility");class QueryBuilder{constructor(e,t,r=null){this.db=e,this.utils=t,this.controllerWrapper=r,this.helperUtility=new HelperUtility}getQueryBuilder(e,t=null){let r=this.db(e.table);return t&&(r=t),r._getMyModel=()=>e,r}parseValue(e){return this.helperUtility.parseValue(e)}parseWhereValue(e){return this.helperUtility.parseWhereValue(e)}_applyWhereCondition(e,t,r,i){switch(r){case"between":e.whereBetween(t,i);break;case"notBetween":e.whereNotBetween(t,i);break;case"in":e.whereIn(t,i);break;case"notIn":e.whereNotIn(t,i);break;case"like":e.whereLike(t,i);break;default:e.where(t,r,i)}}buildWithTree(e,t=null){return this.helperUtility.dotWalkTree(e,{resolver:({current:e,part:r,source:i})=>t?t({current:e,part:r,source:i}):{}})}async fetchRelatedRows(e,t){if(e.through){let r=await this.db(e.through).whereIn(e.throughLocalKey,t);return await this.db(e.table).whereIn(e.foreignKey,r.map(t=>t[e.throughForeignKey]))}return this.db(e.table).whereIn(e.foreignKey,t)}async fetchAndAttachRelated(e){const{parentRows:t,relName:r,model:i,withTree:l,relation:o}=e;let a=t.map(e=>e[o.localKey]),s=[];s=await this.fetchRelatedRows(o,a);let n=new Map;for(const e of s){let t=e[o.foreignKey];n.has(t)||n.set(t,[]),n.get(t).push(e)}for(const e of t){let t=e[o.localKey];"one"===o?.type&&1==n.get(t)?.length?e[r]=n.get(t)[0]:e[r]=n.get(t)||[]}let h=Object.keys(l);for(const e of h){let i=l[e],o=t.filter(e=>e[r].length>0).map(e=>e[r]).reduce((e,t)=>e.concat(t),[]),a=this.utils.getModel(this.controllerWrapper,r);await this.fetchAndAttachRelated({parentRows:o,relName:e,model:a,withTree:i,relation:a.hasRelations[e]})}return t}filterWhere(e,t=""){return t?Object.keys(e).filter(e=>e.includes(t)).reduce((r,i)=>(r[i.replace(t,"")]=e[i],r),{}):Object.keys(e).filter(e=>!e.includes(".")).reduce((t,r)=>(t[r]=e[r],t),{})}async getQuery(e,t){try{const{where:r={},with:i,withWhere:l,select:o,orderBy:a={column:"id",direction:"asc"},limit:s=10,offset:n=0,page:h,groupBy:c,having:p,distinct:y,join:u,leftJoin:f,rightJoin:d,innerJoin:g,count:w=!1}=t;let b=this.getQueryBuilder(e);o&&(Array.isArray(o)||"string"==typeof o)?b.select(o):b.select("*"),y&&(Array.isArray(y)||"string"==typeof y?b.distinct(y):b.distinct()),u&&this._applyJoins(b,u,"join"),f&&this._applyJoins(b,f,"leftJoin"),d&&this._applyJoins(b,d,"rightJoin"),g&&this._applyJoins(b,g,"innerJoin"),this._applyWhereClause(b,r,i),c&&(Array.isArray(c),b.groupBy(c)),p&&this._applyHavingClause(b,p),a&&this._applyOrderBy(b,a);let W=!1,_=s,m=n,j=1,A=0;h&&s>0&&(j=Math.max(1,parseInt(h)),m=(j-1)*s),s>0&&(b.limit(_),m>0&&b.offset(m));const k=await b;if(i&&i.length>0){const t=this.buildWithTree(i);for(const r of Object.keys(t))await this.fetchAndAttachRelated({parentRows:k,relName:r,model:e,withTree:t[r],relation:e.hasRelations[r]})}let B=null;if(s>0)try{let t=this.getQueryBuilder(e);r&&Object.keys(r).length>0&&this._applyWhereClause(t,r),u&&this._applyJoins(t,u,"join"),f&&this._applyJoins(t,f,"leftJoin"),d&&this._applyJoins(t,d,"rightJoin"),g&&this._applyJoins(t,g,"innerJoin");B=(await t.count("* as cnt").first()).cnt}catch(e){console.warn("Failed to get total count:",e.message),B=k.length}s>0&&null!==B&&(A=Math.ceil(B/s),W=j<A);return{data:k,totalCount:B,...s>0?{pagination:{page:j,limit:_,offset:m,totalPages:A,hasNext:W,hasPrev:j>1,nextPage:W?j+1:null,prevPage:j>1?j-1:null}}:{}}}catch(e){throw console.error("QueryService.getQuery error:",e),new Error(`Failed to execute query: ${e.message}`)}}_applyWhereClause(e,t,r=[]){if(t&&Object.keys(t).length>0){let r=this.helperUtility.getDotWalkQuery(t);console.log({filteredWhere:r}),r=this.helperUtility.objectFilter(r,(e,t)=>"object"!=typeof t||null===t);for(const[t,i]of Object.entries(r))if(null===i)e.whereNull(t);else if(Array.isArray(i))e.whereIn(t,i);else{const{operator:r,value:l}=this.parseWhereValue(i);this._applyWhereCondition(e,t,r,l)}}r&&r.length>0&&this._applyNestedWhere(e,t,r)}_applyNestedWhere(e,t,r){let i=this,l=e._getMyModel();if(r&&r.length>0)for(const o of r){let a=this.helperUtility.getDotWalkQuery(t,o);if(a&&Object.keys(a).length>0){let t=this.utils.getModel(this.controllerWrapper,o),s=l.hasRelations[o],n=r.map(e=>this.helperUtility.pluckDotWalkKey(e,1));e.whereExists(function(){let e=i.getQueryBuilder(t,this.select("*").from(t.table));e.whereRaw(`${s.foreignKey} = ${l.table}.${s.localKey}`),i._applyWhereClause(e,a,n)})}}}_applyJoins(e,t,r){const i=Array.isArray(t)?t:[t];for(const t of i)"string"==typeof t?e[r](t):"object"==typeof t&&(t.table&&t.on?e[r](t.table,t.on):t.table&&t.first&&t.operator&&t.second&&e[r](t.table,t.first,t.operator,t.second))}_applyWithWhere(e,t){try{if(Array.isArray(t))for(const r of t)"string"==typeof r?e.withWhere(r):"object"==typeof r&&e.withWhere(r.column,r.operator,r.value);else if("object"==typeof t)for(const[r,i]of Object.entries(t))e.withWhere(r,i)}catch(e){console.warn("Failed to apply withWhere:",e.message)}}_applyHavingClause(e,t){for(const[r,i]of Object.entries(t))"object"==typeof i&&i.operator?e.having(r,i.operator,i.value):e.having(r,i)}_applyOrderBy(e,t){if(Array.isArray(t))for(const r of t)"string"==typeof r?e.orderBy(r):"object"==typeof r&&e.orderBy(r.column,r.direction||"asc");else"string"==typeof t?e.orderBy(t):"object"==typeof t&&e.orderBy(t.column,t.direction||"asc")}}module.exports=QueryBuilder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamtree-org/korm-js",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Knowledge Object-Relational Mapping - A powerful, modular ORM system for Node.js with dynamic database operations, complex queries, relationships, and nested requests",
   "author": {
     "name": "Partha Preetham Krishna",

package/templates/model.template

@@ -0,0 +1,54 @@
+class {{modelName}} {
+    constructor() {
+        this.table = '{{tableName}}';
+    }
+
+    validate(args) {
+        const { request, context, db } = args;
+        return true;
+    }
+
+    onBeforeCreate(args) {
+        const { request, context, db, data } = args;
+        console.log('onBeforeCreate', { data, request });
+        return data;
+    }
+
+    onAfterCreate(args) {
+        const { request, context, db, data } = args;
+        console.log('onAfterCreate', { data, request });
+        return data;
+    }
+    
+    onBeforeUpdate(args) {
+        const { request, context, db, data } = args;
+        console.log('onBeforeUpdate', { data, request });
+        return data;
+    }
+
+    onAfterUpdate(args) {
+        const { request, context, db, data } = args;
+        console.log('onAfterUpdate', { data, request });
+        return data;
+    }
+
+    onBeforeDelete(args) {
+        const { request, context, db, data } = args;
+        console.log('onBeforeDelete', { data, request });
+        return data;
+    }
+
+    onAfterDelete(args) {
+        const { request, context, db, data } = args;
+        console.log('onAfterDelete', { data, request });
+        return data;
+    }
+
+    {{action}}Action(args) {
+        const { request, context, db, data } = args;
+        console.log('{{action}}Action', { data, request });
+        return data;
+    }
+}
+
+module.exports = {{modelName}};