webspresso 0.0.102 → 0.0.103

package/.agents/ORM.md

@@ -51,7 +51,9 @@ import { defineModel, zdb } from 'webspresso';
 export default defineModel({
   name: 'Product',
   table: 'products',
-  schema: zdb.schema({
+  timestamps: true, // auto-injects createdAt & updatedAt into schema & scopes
+  softDelete: true, // auto-injects deletedAt & manages soft-delete scope
+  schema: {
     id: zdb.id(),
     name: zdb.string().min(2),
     slug: zdb.string().unique(),
@@ -61,9 +63,7 @@ export default defineModel({
     metadata: zdb.json({ optional: true }),
     category_id: zdb.integer(),
     active: zdb.boolean({ default: true }),
-    created_at: zdb.timestamp({ auto: 'create' }),
-    updated_at: zdb.timestamp({ auto: 'update' }),
-  }),
+  },
   relations: {
     category: { type: 'belongsTo', model: 'Category', foreignKey: 'category_id' },
     reviews: { type: 'hasMany', model: 'Review', foreignKey: 'product_id' },
@@ -81,6 +81,13 @@ export default defineModel({
 });
 ```
 
+### Automatic Timestamps & Soft Deletes (`timestamps`, `softDelete`)
+Instead of manually defining boilerplate timestamp and soft delete columns in `schema`, configure them declaratively:
+- **Top-level / Options:** `timestamps: true` (or `options: { timestamps: true }`) automatically injects `createdAt` and `updatedAt` into the Zod schema, validation rules, column map, and Knex migrations.
+- **Soft Deletes:** `softDelete: true` (or `softDeletes: true`) automatically injects `deletedAt` (nullable/optional) into the schema and activates the repository `whereNull('deletedAt')` soft-delete scope.
+- **Custom column names & snake_case:** `timestamps: { snakeCase: true }` or `timestamps: { createdAt: 'created_at', updatedAt: 'updated_at' }`, `softDelete: { deletedAt: 'deleted_at' }`.
+- **Explicit Schema Spread:** `...zdb.timestamps()` and `...zdb.softDeletes()` are also supported for explicit schema definitions.
+
 ### Supported `zdb` Data Types
 - `zdb.id()` — Primary key (BigInt / Auto-increment)
 - `zdb.string({ max, unique, optional, sortable })` — String / VarChar
@@ -90,6 +97,8 @@ export default defineModel({
 - `zdb.file()` — File asset URL / upload path (non-sortable by default)
 - `zdb.json()` — Serialized JSON column (non-sortable by default)
 - `zdb.timestamp({ auto, sortable })` — Timestamp (`auto: 'create'` / `auto: 'update'`)
+- `zdb.timestamps({ snakeCase })` — Timestamp pair (`createdAt`, `updatedAt`)
+- `zdb.softDelete()`, `zdb.softDeletes({ snakeCase })` — Soft delete timestamp (`deletedAt`)
 
 *Note: All `zdb` types support chainable `.config({ sortable: boolean })` or options object `{ sortable: boolean }`.*
 

package/.agents/skills/webspresso-orm-and-database/SKILL.md

@@ -21,8 +21,10 @@ module.exports = defineModel({
   name: 'Product',
   table: 'products',
   primaryKey: 'id',
+  timestamps: true, // auto-injects createdAt & updatedAt into schema & scopes
+  softDelete: true, // auto-injects deletedAt & enables soft-delete scope
   
-  schema: zdb.object({
+  schema: {
     id: zdb.id(),
     name: zdb.string().min(1).max(255),
     slug: zdb.string().unique(),
@@ -30,10 +32,7 @@ module.exports = defineModel({
     in_stock: zdb.boolean().default(true),
     metadata: zdb.json().optional(),
     user_id: zdb.foreignKey('users.id'),
-    created_at: zdb.timestamp().autoCreate(),
-    updated_at: zdb.timestamp().autoUpdate(),
-    deleted_at: zdb.timestamp().nullable(),
-  }),
+  },
 
   relations: {
     user: {

package/README.md

@@ -115,13 +115,13 @@ const { defineModel, zdb } = require('webspresso');
 module.exports = defineModel({
   name: 'Note',
   table: 'notes',
+  timestamps: true, // auto-injects createdAt & updatedAt into schema & scopes
+  softDelete: true, // auto-injects deletedAt & enables soft-delete scope
   schema: {
     id: zdb.id(),
     title: zdb.string(200),
     content: zdb.text(),
     userId: zdb.integer(),
-    ...zdb.timestamps(),
-    ...zdb.softDeletes(),
   },
   relations: {
     user: { type: 'belongsTo', model: 'User', foreignKey: 'userId' },

package/core/auth/jwt.js

@@ -6,18 +6,17 @@
 
 const crypto = require('crypto');
 
+const HS256_HEADER_BASE64URL = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9';
+
 /**
  * Base64URL encode string or Buffer
  * @param {string|Buffer} input
  * @returns {string}
  */
 function base64UrlEncode(input) {
-  const buf = Buffer.isBuffer(input) ? input : Buffer.from(input, 'utf8');
-  return buf
-    .toString('base64')
-    .replace(/=/g, '')
-    .replace(/\+/g, '-')
-    .replace(/\//g, '_');
+  return Buffer.isBuffer(input)
+    ? input.toString('base64url')
+    : Buffer.from(String(input), 'utf8').toString('base64url');
 }
 
 /**
@@ -26,11 +25,7 @@ function base64UrlEncode(input) {
  * @returns {string}
  */
 function base64UrlDecode(input) {
-  let base64 = input.replace(/-/g, '+').replace(/_/g, '/');
-  while (base64.length % 4 !== 0) {
-    base64 += '=';
-  }
-  return Buffer.from(base64, 'base64').toString('utf8');
+  return Buffer.from(String(input), 'base64url').toString('utf8');
 }
 
 /**
@@ -110,16 +105,14 @@ function signJwt(payload, secret, options = {}) {
     ...payload,
   };
 
-  const encodedHeader = base64UrlEncode(JSON.stringify(header));
+  const encodedHeader = algorithm === 'HS256' ? HS256_HEADER_BASE64URL : base64UrlEncode(JSON.stringify(header));
   const encodedPayload = base64UrlEncode(JSON.stringify(fullPayload));
 
   const signingInput = `${encodedHeader}.${encodedPayload}`;
-  const signature = crypto
+  const encodedSignature = crypto
     .createHmac('sha256', secret)
     .update(signingInput)
-    .digest();
-
-  const encodedSignature = base64UrlEncode(signature);
+    .digest('base64url');
 
   return `${signingInput}.${encodedSignature}`;
 }
@@ -177,7 +170,7 @@ function verifyJwt(token, secret, options = {}) {
     .update(signingInput)
     .digest();
 
-  const actualSignatureBuf = Buffer.from(encodedSignature.replace(/-/g, '+').replace(/_/g, '/'), 'base64');
+  const actualSignatureBuf = Buffer.from(encodedSignature, 'base64url');
 
   if (
     expectedSignatureBuf.length !== actualSignatureBuf.length ||

package/core/auth/user-agent.js

@@ -39,6 +39,28 @@ function getClientIp(req) {
     '127.0.0.1';
 }
 
+/**
+ * Parse raw User-Agent header string into structured device info
+ * Zero external dependencies — pure regex extraction
+ * 
+ * @param {string} [userAgent='']
+ * @returns {DeviceInfo}
+ */
+const MAX_UA_CACHE = 512;
+const uaCache = new Map();
+
+const EMPTY_DEVICE_INFO = Object.freeze({
+  browser: 'Unknown',
+  os: 'Unknown',
+  device: 'unknown',
+  isMobile: false,
+  isTablet: false,
+  isDesktop: false,
+  isBot: false,
+});
+
+const BOT_PATTERN = /googlebot|bingbot|yandex|baiduspider|duckduckbot|slurp|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/|slackbot|vkshare|w3c_validator|whatsapp|curl|wget|postman/i;
+
 /**
  * Parse raw User-Agent header string into structured device info
  * Zero external dependencies — pure regex extraction
@@ -50,34 +72,30 @@ function parseUserAgent(userAgent = '') {
   const ua = String(userAgent || '').trim();
 
   if (!ua) {
-    return {
-      browser: 'Unknown',
-      os: 'Unknown',
-      device: 'unknown',
-      isMobile: false,
-      isTablet: false,
-      isDesktop: false,
-      isBot: false,
-    };
+    return { ...EMPTY_DEVICE_INFO };
+  }
+
+  const cached = uaCache.get(ua);
+  if (cached) {
+    return { ...cached };
   }
 
   // 1. Detect Bots / Crawlers
-  const botPattern = /googlebot|bingbot|yandex|baiduspider|duckduckbot|slurp|twitterbot|facebookexternalhit|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest\/|slackbot|vkshare|w3c_validator|whatsapp|curl|wget|postman/i;
-  const isBot = botPattern.test(ua);
+  const isBot = BOT_PATTERN.test(ua);
 
   // 2. Detect Operating System
   let os = 'Unknown';
+  let match;
   if (/iPad/i.test(ua)) {
-    const match = ua.match(/OS ([\d_\.]+)/i);
+    match = ua.match(/OS ([\d_\.]+)/i);
     os = match ? `iPadOS ${match[1].replace(/_/g, '.')}` : 'iPadOS';
   } else if (/iPhone|iPod/i.test(ua)) {
-    const match = ua.match(/OS ([\d_\.]+)/i);
+    match = ua.match(/OS ([\d_\.]+)/i);
     os = match ? `iOS ${match[1].replace(/_/g, '.')}` : 'iOS';
-  } else if (/Android/i.test(ua)) {
-    const match = ua.match(/Android (\d+(\.\d+)?)/i);
-    os = match ? `Android ${match[1]}` : 'Android';
+  } else if ((match = ua.match(/Android (\d+(\.\d+)?)/i))) {
+    os = `Android ${match[1]}`;
   } else if (/Macintosh|Mac OS X/i.test(ua)) {
-    const match = ua.match(/Mac OS X ([\d_\.]+)/i);
+    match = ua.match(/Mac OS X ([\d_\.]+)/i);
     if (match) {
       const ver = match[1].replace(/_/g, '.');
       os = `macOS ${ver}`;
@@ -100,30 +118,22 @@ function parseUserAgent(userAgent = '') {
 
   // 3. Detect Browser
   let browser = 'Unknown';
-  if (/Edg(e|A|iOS)?\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Edg(e|A|iOS)?\/(\d+)/i);
-    browser = `Edge ${match ? match[2] : ''}`.trim();
-  } else if (/OPR\/(\d+)/i.test(ua)) {
-    const match = ua.match(/OPR\/(\d+)/i);
-    browser = `Opera ${match ? match[1] : ''}`.trim();
-  } else if (/SamsungBrowser\/(\d+)/i.test(ua)) {
-    const match = ua.match(/SamsungBrowser\/(\d+)/i);
-    browser = `Samsung Internet ${match ? match[1] : ''}`.trim();
-  } else if (/Brave\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Brave\/(\d+)/i);
-    browser = `Brave ${match ? match[1] : ''}`.trim();
-  } else if (/Vivaldi\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Vivaldi\/(\d+)/i);
-    browser = `Vivaldi ${match ? match[1] : ''}`.trim();
-  } else if (/Chrome\/(\d+)/i.test(ua) && !/Chromium/i.test(ua)) {
-    const match = ua.match(/Chrome\/(\d+)/i);
-    browser = `Chrome ${match ? match[1] : ''}`.trim();
-  } else if (/Firefox\/(\d+)/i.test(ua) || /FxiOS\/(\d+)/i.test(ua)) {
-    const match = ua.match(/(?:Firefox|FxiOS)\/(\d+)/i);
-    browser = `Firefox ${match ? match[1] : ''}`.trim();
-  } else if (/Safari/i.test(ua) && /Version\/(\d+)/i.test(ua)) {
-    const match = ua.match(/Version\/(\d+)/i);
-    browser = `Safari ${match ? match[1] : ''}`.trim();
+  if ((match = ua.match(/Edg(e|A|iOS)?\/(\d+)/i))) {
+    browser = `Edge ${match[2] || ''}`.trim();
+  } else if ((match = ua.match(/OPR\/(\d+)/i))) {
+    browser = `Opera ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/SamsungBrowser\/(\d+)/i))) {
+    browser = `Samsung Internet ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Brave\/(\d+)/i))) {
+    browser = `Brave ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Vivaldi\/(\d+)/i))) {
+    browser = `Vivaldi ${match[1] || ''}`.trim();
+  } else if (!/Chromium/i.test(ua) && (match = ua.match(/Chrome\/(\d+)/i))) {
+    browser = `Chrome ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/(?:Firefox|FxiOS)\/(\d+)/i))) {
+    browser = `Firefox ${match[1] || ''}`.trim();
+  } else if ((match = ua.match(/Version\/(\d+)/i)) && /Safari/i.test(ua)) {
+    browser = `Safari ${match[1] || ''}`.trim();
   } else if (/Safari/i.test(ua) && !/Chrome/i.test(ua)) {
     browser = 'Safari';
   } else if (/MSIE (\d+)/i.test(ua) || (/Trident/i.test(ua) && /rv:(\d+)/i.test(ua))) {
@@ -144,7 +154,7 @@ function parseUserAgent(userAgent = '') {
   else if (isMobile) device = 'mobile';
   else if (isDesktop) device = 'desktop';
 
-  return {
+  const result = {
     browser,
     os,
     device,
@@ -153,9 +163,18 @@ function parseUserAgent(userAgent = '') {
     isDesktop,
     isBot,
   };
+
+  if (uaCache.size >= MAX_UA_CACHE) {
+    const oldestKey = uaCache.keys().next().value;
+    uaCache.delete(oldestKey);
+  }
+  uaCache.set(ua, result);
+
+  return { ...result };
 }
 
 module.exports = {
   getClientIp,
   parseUserAgent,
 };
+

package/core/compression/compression-stream.js

@@ -5,7 +5,7 @@
  */
 
 const zlib = require('zlib');
-const { supportsBrotli } = require('./negotiate');
+const negotiate = require('./negotiate');
 
 /**
  * Create a zlib compression transform stream based on encoding
@@ -23,7 +23,7 @@ function createCompressionStream(encoding, options = {}) {
 
   switch (enc) {
     case 'br': {
-      if (!supportsBrotli()) {
+      if (options.supportsBrotli === false || !negotiate.supportsBrotli()) {
         return null;
       }
       const brotliOpts = { ...(options.brotli || {}) };

package/core/compression/middleware.js

@@ -55,6 +55,7 @@ function createCompressionMiddleware(options = {}) {
   const customFilter = typeof options.filter === 'function' ? options.filter : null;
 
   const comp = compression({
+    ...options,
     threshold,
     brotli: options.brotli,
     level: options.level,
@@ -73,7 +74,6 @@ function createCompressionMiddleware(options = {}) {
       }
       return compression.filter(req, res);
     },
-    ...options,
   });
 
   return function compressionMiddleware(req, res, next) {

package/core/compression/negotiate.js

@@ -69,6 +69,9 @@ function parseAcceptEncoding(header) {
   return results;
 }
 
+const DEFAULT_SUPPORTED_ENCODINGS = Object.freeze(getDefaultSupportedEncodings());
+const DEFAULT_SUPPORTED_STRING = DEFAULT_SUPPORTED_ENCODINGS.join(',');
+
 const selectEncodingCache = new Map();
 const MAX_ENCODING_CACHE_SIZE = 128;
 
@@ -83,16 +86,20 @@ function selectEncoding(acceptEncoding, supportedEncodings) {
     return 'identity';
   }
 
-  const supported = Array.isArray(supportedEncodings) && supportedEncodings.length > 0
-    ? supportedEncodings.map(e => e.toLowerCase()).filter(e => e !== 'br' || supportsBrotli())
-    : getDefaultSupportedEncodings();
+  const isDefault = !supportedEncodings || !Array.isArray(supportedEncodings) || supportedEncodings.length === 0;
+  const cacheKey = isDefault
+    ? `${acceptEncoding}|${DEFAULT_SUPPORTED_STRING}`
+    : `${acceptEncoding}|${supportedEncodings.join(',')}`;
 
-  const cacheKey = `${acceptEncoding}|${supported.join(',')}`;
   const cached = selectEncodingCache.get(cacheKey);
   if (cached !== undefined) {
     return cached;
   }
 
+  const supported = isDefault
+    ? DEFAULT_SUPPORTED_ENCODINGS
+    : supportedEncodings.map(e => e.toLowerCase()).filter(e => e !== 'br' || supportsBrotli());
+
   const clientPreferences = parseAcceptEncoding(acceptEncoding);
   if (clientPreferences.length === 0) {
     if (selectEncodingCache.size < MAX_ENCODING_CACHE_SIZE) {

package/core/events/dispatcher.js

@@ -12,10 +12,14 @@ const EventEmitter = require('events');
  * @param {string} pattern
  * @returns {RegExp}
  */
+const patternRegexCache = new Map();
+
 function patternToRegExp(pattern) {
   if (pattern === '*' || pattern === '**') {
     return /^.*$/;
   }
+  const cached = patternRegexCache.get(pattern);
+  if (cached !== undefined) return cached;
 
   const escaped = pattern
     .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape regex special chars except *
@@ -23,7 +27,11 @@ function patternToRegExp(pattern) {
     .replace(/\*/g, '[^.]+')
     .replace(/___DOUBLE_STAR___/g, '.*');
 
-  return new RegExp(`^${escaped}$`);
+  const reg = new RegExp(`^${escaped}$`);
+  if (patternRegexCache.size < 500) {
+    patternRegexCache.set(pattern, reg);
+  }
+  return reg;
 }
 
 /**
@@ -193,8 +201,9 @@ class EventDispatcher extends EventEmitter {
     // 1. Exact listeners
     if (this.exactListeners.has(event)) {
       const list = this.exactListeners.get(event);
-      const toKeep = [];
-      for (const item of list) {
+      let hasOnce = false;
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i];
         if (matchesSender(item.sender, sender)) {
           matched.push({
             priority: item.priority,
@@ -207,53 +216,67 @@ class EventDispatcher extends EventEmitter {
             once: item.once,
           });
         }
-        if (!item.once) {
-          toKeep.push(item);
+        if (item.once) {
+          hasOnce = true;
         }
       }
-      this.exactListeners.set(event, toKeep);
+      if (hasOnce) {
+        this.exactListeners.set(event, list.filter((l) => !l.once));
+      }
     }
 
     // 2. Wildcard listeners
-    const remainingWildcards = [];
-    for (const item of this.wildcardListeners) {
-      if (item.regex.test(event) && matchesSender(item.sender, sender)) {
+    if (this.wildcardListeners.length > 0) {
+      let hasOnce = false;
+      for (let i = 0; i < this.wildcardListeners.length; i++) {
+        const item = this.wildcardListeners[i];
+        if (item.regex.test(event) && matchesSender(item.sender, sender)) {
+          matched.push({
+            priority: item.priority,
+            handler: item.handler,
+            isAny: false,
+            remove: () => {
+              this.wildcardListeners = this.wildcardListeners.filter((l) => l.id !== item.id);
+            },
+            once: item.once,
+          });
+          if (item.once) {
+            hasOnce = true;
+          }
+        }
+      }
+      if (hasOnce) {
+        this.wildcardListeners = this.wildcardListeners.filter((l) => !l.once);
+      }
+    }
+
+    // 3. Any listeners
+    if (this.anyListeners.length > 0) {
+      let hasOnce = false;
+      for (let i = 0; i < this.anyListeners.length; i++) {
+        const item = this.anyListeners[i];
         matched.push({
           priority: item.priority,
           handler: item.handler,
-          isAny: false,
+          isAny: true,
           remove: () => {
-            this.wildcardListeners = this.wildcardListeners.filter((l) => l.id !== item.id);
+            this.anyListeners = this.anyListeners.filter((l) => l.id !== item.id);
           },
           once: item.once,
         });
+        if (item.once) {
+          hasOnce = true;
+        }
       }
-      if (!item.once) {
-        remainingWildcards.push(item);
-      }
-    }
-    this.wildcardListeners = remainingWildcards;
-
-    // 3. Any listeners
-    const remainingAny = [];
-    for (const item of this.anyListeners) {
-      matched.push({
-        priority: item.priority,
-        handler: item.handler,
-        isAny: true,
-        remove: () => {
-          this.anyListeners = this.anyListeners.filter((l) => l.id !== item.id);
-        },
-        once: item.once,
-      });
-      if (!item.once) {
-        remainingAny.push(item);
+      if (hasOnce) {
+        this.anyListeners = this.anyListeners.filter((l) => !l.once);
       }
     }
-    this.anyListeners = remainingAny;
 
     // Sort by priority descending (higher numbers first)
-    matched.sort((a, b) => b.priority - a.priority);
+    if (matched.length > 1) {
+      matched.sort((a, b) => b.priority - a.priority);
+    }
 
     return matched;
   }

package/core/openapi/orm-components.js

@@ -2,7 +2,7 @@
  * ORM column → OpenAPI schema fragments (shared by schema-explorer and swagger plugin)
  */
 
-const { getAllModels } = require('../orm/model');
+const modelModule = require('../orm/model');
 
 /**
  * Generate OpenAPI 3 components.schemas from registered ORM models
@@ -10,8 +10,7 @@ const { getAllModels } = require('../orm/model');
  * @returns {Record<string, object>}
  */
 function generateOrmOpenApiSchemas(options = {}) {
-  const { exclude = [] } = options;
-  const models = getAllModels();
+  const { exclude = [], models = modelModule.getAllModels() } = options;
   const schemas = {};
 
   for (const [name, model] of models) {

package/core/orm/cache/listeners.js

@@ -5,7 +5,7 @@
  */
 
 const { ModelEvents, Hooks } = require('../events');
-const { getModel } = require('../model');
+const modelModule = require('../model');
 
 /** @type {Set<import('./layer').OrmCacheLayer>} */
 const layers = new Set();
@@ -27,7 +27,7 @@ function registerOrmCacheListeners(cacheLayer) {
    */
   function handleMutation(record, ctx, op) {
     const modelName = ctx.model;
-    const model = getModel(modelName);
+    const model = modelModule.getModel(modelName);
     if (!model) return;
 
     for (const layer of layers) {
@@ -68,7 +68,17 @@ function unregisterOrmCacheListeners(cacheLayer) {
   }
 }
 
+function _resetForTesting() {
+  for (const unsub of unsubs) {
+    if (typeof unsub === 'function') unsub();
+  }
+  unsubs = [];
+  layers.clear();
+  hooked = false;
+}
+
 module.exports = {
   registerOrmCacheListeners,
   unregisterOrmCacheListeners,
+  _resetForTesting,
 };

package/core/orm/json-fields.js

@@ -9,14 +9,20 @@
  * @returns {Set<string>} Set of JSON column names
  */
 function getJsonColumns(model) {
+  if (model && model._jsonColumns) {
+    return model._jsonColumns;
+  }
   const jsonCols = new Set();
-  if (model.columns) {
+  if (model && model.columns) {
     for (const [name, meta] of model.columns) {
       if (meta.type === 'json' || meta.type === 'array' || meta.type === 'files') {
         jsonCols.add(name);
       }
     }
   }
+  if (model) {
+    model._jsonColumns = jsonCols;
+  }
   return jsonCols;
 }