lamix 4.2.16 → 4.2.17

package/README.md

@@ -117,9 +117,15 @@ const User = require('./models/User');
 const user = await User.create({ name: 'Alice', email: 'alice@example.com', password: 'secret' });
 
 # Fill & save (update)
-user.name = 'Alice Smith';  // you can also use user.fill({ name: 'Alice Smith' })
+name = 'Alice Smith';  
+user.fill({ name })
 await user.save();
 
+# Method 2 (update)
+const user = await User.findOrFail(param.id);
+const payload = req.body;  
+await user.update({ payload });
+
 # Find by primary key
 const user1 = await User.find(1);
 const user2 = await User.findOrFail(param.id);
@@ -164,7 +170,7 @@ const qb = User.query();
 const names = await User.query().select('id', 'name').get();
 
 # Aggregates
-const cnt = await User.query().count();          // count(*)
+const cnt = await User.query().count();     # count(*)
 const sumId = await User.query().sum('id');
 const avgId = await User.query().avg('id');
 const minId = await User.query().min('id');
@@ -181,12 +187,12 @@ const Pluckemails = await User.query().pluck('email');
 
 # Pagination
 const page1 = await User.query().paginate(1, 10);
-// page1 = { total, perPage, page, lastPage, data: [users...] }
+#page1 = { total, perPage, page, lastPage, data: [users...] }
 
 # Where In
 const usersIn = await User.query().whereIn('id', [1, 2, 3]).get();
 
-// Where Null / Not Null
+# Where Null / Not Null
 const withNull = await User.query().whereNull('deleted_at').get();
 const notNull = await User.query().whereNotNull('deleted_at').get();
 
@@ -219,7 +225,7 @@ const cached = await DB.cached('SELECT * FROM users WHERE id = ?', [5], 60000);
 #You can use relations:
 
 const user = await User.find(1);
-const posts = await user.posts().get();  // all posts for the user
+const posts = await user.posts().get();  # all posts for the user
 
 # Eager load in a query with Relations:
 const usersWithPosts = await User.query().with('posts').get();

package/lib/index.d.ts

@@ -494,7 +494,7 @@ export class LamixSessionStore {
     cleanupInterval: any;
     logger: any;
     compress: any;
-    cache: LRU<any, any>;
+    cache: LRUCache<{}, {}, unknown>;
     redisEnabled: boolean;
     redisRetryAt: number;
     redisCooldown: any;
@@ -547,8 +547,9 @@ export class BaseModel extends Model {
     serialize(): {};
 }
 declare class SimpleCache {
-    map: Map<any, any>;
-    get(k: any): any;
+    constructor(options?: {});
+    cache: LRUCache<{}, {}, unknown>;
+    get(k: any): {};
     set(k: any, v: any, ttl?: number): void;
     del(k: any): void;
     clear(): void;
@@ -611,5 +612,5 @@ declare class Relation {
     deleteBehavior: any;
     onDelete(behavior: any): this;
 }
-import LRU = require("lru-cache");
+import { LRUCache } from "lru-cache";
 export {};

package/lib/index.js

@@ -3,6 +3,10 @@
 const util = require('util');
 const { performance } = require('perf_hooks');
 const { AsyncLocalStorage } = require('async_hooks');
+const session = require('express-session');
+const Redis = require('ioredis');
+const LRUCache  = require('lru-cache');
+const zlib = require('zlib');
 require('dotenv').config();
 
 /* ---------------- Utilities ---------------- */
@@ -27,21 +31,33 @@ class DBError extends Error {
 /* ---------------- Cache ---------------- */
 
 class SimpleCache {
-  constructor() { this.map = new Map(); }
+  constructor(options = {}) {
+    this.cache = new LRUCache({
+      max: options.max || 1000,          // max number of items
+      ttlAutopurge: true,                // auto-remove expired entries
+    });
+  }
+
   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;
-    }
-    return e.v;
+    const v = this.cache.get(k);
+    return v === undefined ? null : v;
   }
+
   set(k, v, ttl = 0) {
-    this.map.set(k, { v, ts: Date.now(), ttl });
+    if (ttl > 0) {
+      this.cache.set(k, v, { ttl });
+    } else {
+      this.cache.set(k, v);
+    }
+  }
+
+  del(k) {
+    this.cache.delete(k);
+  }
+
+  clear() {
+    this.cache.clear();
   }
-  del(k) { this.map.delete(k); }
-  clear() { this.map.clear(); }
 }
 
 /* ---------------- Grammar ---------------- */
@@ -3891,11 +3907,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 +3938,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.17",
   "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",