lamix 4.2.16 → 4.2.18

package/lib/index.d.ts

@@ -294,15 +294,8 @@ export class QueryBuilder {
     _pushWhere(w: any): this;
     then(resolve: any, reject: any): Promise<Collection>;
     where(columnOrObject: any, operator: any, value: any, ...args: any[]): this;
+    andWhere(...args: any[]): this;
     orWhere(columnOrObject: any, operatorOrValue: any, value: any, ...args: any[]): this;
-    toSQL(): string;
-    /**************************************************************************
-     * TO SQL
-     **************************************************************************/
-    toSQL(): {
-        sql: string;
-        bindings: any[];
-    };
     whereRaw(sql: any, bindings?: any[]): this;
     orWhereRaw(sql: any, bindings?: any[]): this;
     whereColumn(a: any, op: any, b: any, ...args: any[]): this;
@@ -433,6 +426,13 @@ export class QueryBuilder {
         }[];
         fromRaw: any;
     };
+    /**************************************************************************
+     * TO SQL
+     **************************************************************************/
+    toSQL(): {
+        sql: string;
+        bindings: any[];
+    };
     toSQLJSON(): {
         sql: string;
         bindings: any[];
@@ -494,7 +494,7 @@ export class LamixSessionStore {
     cleanupInterval: any;
     logger: any;
     compress: any;
-    cache: LRU<any, any>;
+    cache: any;
     redisEnabled: boolean;
     redisRetryAt: number;
     redisCooldown: any;
@@ -547,11 +547,25 @@ export class BaseModel extends Model {
     serialize(): {};
 }
 declare class SimpleCache {
-    map: Map<any, any>;
-    get(k: any): any;
-    set(k: any, v: any, ttl?: number): void;
-    del(k: any): void;
+    constructor(options?: {});
+    cache: any;
+    get(key: any): any;
+    set(key: any, value: any, ttl?: any): void;
+    has(key: any): any;
+    delete(key: any): any;
     clear(): void;
+    /**
+     * Get value or compute + store it
+     * Supports async functions
+     */
+    getOrSet(key: any, fetchFn: any, ttl?: any): Promise<any>;
+    /**
+     * Basic cache stats
+     */
+    stats(): {
+        size: any;
+        calculatedSize: any;
+    };
 }
 import { AsyncLocalStorage } from "node:async_hooks";
 declare class HasManyThrough extends Relation {
@@ -611,5 +625,4 @@ declare class Relation {
     deleteBehavior: any;
     onDelete(behavior: any): this;
 }
-import LRU = require("lru-cache");
 export {};

package/lib/index.js

@@ -4,6 +4,10 @@ const util = require('util');
 const { performance } = require('perf_hooks');
 const { AsyncLocalStorage } = require('async_hooks');
 require('dotenv').config();
+const session = require('express-session');
+const Redis = require('ioredis');
+const LRUCache = require('lru-cache');
+const zlib = require('zlib');
 
 /* ---------------- Utilities ---------------- */
 
@@ -25,25 +29,76 @@ class DBError extends Error {
 }
 
 /* ---------------- Cache ---------------- */
-
 class SimpleCache {
-  constructor() { this.map = new Map(); }
-  get(k) {
-    const e = this.map.get(k);
-    if (!e) return null;
-    if (e.ttl && Date.now() > e.ts + e.ttl) {
-      this.map.delete(k);
-      return null;
+  constructor(options = {}) {
+    const {
+      max = 1000,            // max number of items
+      ttl = 0,               // default TTL (ms)
+      maxSize,               // optional size-based eviction
+      sizeCalculation,       // function(value, key)
+    } = options;
+
+    this.cache = new LRUCache({
+      max,
+      ttl,
+      ttlAutopurge: true,
+      maxSize,
+      sizeCalculation,
+      allowStale: false,
+      updateAgeOnGet: false,
+    });
+  }
+
+  get(key) {
+    const value = this.cache.get(key);
+    return value === undefined ? null : value;
+  }
+
+  set(key, value, ttl = null) {
+    if (ttl !== null) {
+      this.cache.set(key, value, { ttl });
+    } else {
+      this.cache.set(key, value);
     }
-    return e.v;
   }
-  set(k, v, ttl = 0) {
-    this.map.set(k, { v, ts: Date.now(), ttl });
+
+  has(key) {
+    return this.cache.has(key);
+  }
+
+  delete(key) {
+    return this.cache.delete(key);
+  }
+
+  clear() {
+    this.cache.clear();
+  }
+
+  /**
+   * Get value or compute + store it
+   * Supports async functions
+   */
+  async getOrSet(key, fetchFn, ttl = null) {
+    const existing = this.get(key);
+    if (existing !== null) return existing;
+
+    const value = await fetchFn();
+    this.set(key, value, ttl);
+    return value;
+  }
+
+  /**
+   * Basic cache stats
+   */
+  stats() {
+    return {
+      size: this.cache.size,
+      calculatedSize: this.cache.calculatedSize,
+    };
   }
-  del(k) { this.map.delete(k); }
-  clear() { this.map.clear(); }
 }
 
+
 /* ---------------- Grammar ---------------- */
 
 class Grammar {
@@ -69,7 +124,7 @@ class DB {
   static config = null;
   static pool = null;
 
-  static cache = new SimpleCache();
+  static cache = new SimpleCache({ max: 1000, ttl: 60_000 });
   static retryAttempts = 1;
 
   static eventHandlers = { query: [], error: [], reconnect: [] };
@@ -1292,6 +1347,10 @@ class QueryBuilder {
     });
   }
 
+  andWhere(...args) {
+    return this.where(...args);
+  }
+
   orWhere(columnOrObject, operatorOrValue, value) {
     if (typeof columnOrObject === 'object' && columnOrObject !== null) {
       let query = this;
@@ -1320,15 +1379,14 @@ class QueryBuilder {
   }
 
   // Example method to generate SQL
-  toSQL() {
-    if (!this.wheres.length) return '';
-    const sql = this.wheres.map((w, i) => {
-      const prefix = i === 0 ? '' : ` ${w.boolean} `;
-      return `${prefix}\`${w.column}\` ${w.operator} ?`;
-    }).join('');
-    return 'WHERE ' + sql;
-  }
-
+  // toSQL() {
+  //   if (!this.wheres.length) return '';
+  //   const sql = this.wheres.map((w, i) => {
+  //     const prefix = i === 0 ? '' : ` ${w.boolean} `;
+  //     return `${prefix}\`${w.column}\` ${w.operator} ?`;
+  //   }).join('');
+  //   return 'WHERE ' + sql;
+  // }
 
   whereRaw(sql, bindings = []) {
     return this._pushWhere({
@@ -3435,7 +3493,9 @@ class Model {
   // INSERT – validation first
   // ──────────────────────────────
   async saveNew(attrs) {
-    if (!this._exists && !Object.keys(this._attributes).length) {
+    this._attributes = { ...attrs }; 
+    
+    if (!Object.keys(this._attributes).length) {
       throw new DBError('Cannot save empty model', {
         model: this.constructor.name
       });
@@ -3891,11 +3951,6 @@ class Model {
   }
 }
 
-const session = require('express-session');
-const Redis = require('ioredis');
-const LRU = require('lru-cache');
-const zlib = require('zlib');
-
 /* -------------------- DB Model -------------------- */
 class Session extends Model {
   static table = 'sessions';
@@ -3927,7 +3982,7 @@ class LamixSessionStore extends session.Store {
     this.compress = options.compress ?? true;
 
     /* -------- In-memory cache -------- */
-    this.cache = new LRU({
+    this.cache = new LRUCache({
       max: options.cacheSize || 1000,
       ttl: options.cacheTTL || 60000,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lamix",
-  "version": "4.2.16",
+  "version": "4.2.18",
   "description": "lamix - ORM for Node-express js",
   "main": "./lib",
   "type": "commonjs",
@@ -12,8 +12,7 @@
   },
   "files": [
     "lib",
-    "bin",
-    "README.md"
+    "bin"
   ],
   "repository": {
     "type": "git",
@@ -32,10 +31,10 @@
   "dependencies": {
     "bcrypt": "^6.0.0",
     "express-session": "^1.19.0",
-    "lru-cache": "^7.18.3",
+    "lru-cache": "^11.2.5",
     "ioredis": "^5.9.2",
     "chalk": "^4.1.2",
-    "dotenv": "^17.2.2"
+    "dotenv": "^17.2.4 "
   },
   "keywords": [
     "lamix",