@stacksjs/database 0.70.257 → 0.70.259

package/dist/model-sources.js

@@ -1,76 +1 @@
-import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
-import { basename, join } from "node:path";
-import { path } from "@stacksjs/path";
-function collectModels(root, origin) {
-  if (!existsSync(root))
-    return [];
-  const out = [], walk = (dir) => {
-    let entries;
-    try {
-      entries = readdirSync(dir, { withFileTypes: !0 });
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      const full = join(dir, entry.name);
-      if (entry.isDirectory()) {
-        walk(full);
-        continue;
-      }
-      if (!entry.name.endsWith(".ts"))
-        continue;
-      if (entry.name.startsWith(".") || entry.name.startsWith("index"))
-        continue;
-      out.push({ file: full, name: entry.name.replace(/\.ts$/, ""), origin });
-    }
-  };
-  walk(root);
-  return out;
-}
-export function modelStagingDir() {
-  return path.frameworkRuntimePath("model-sources");
-}
-function stage(models) {
-  const dir = modelStagingDir();
-  try {
-    rmSync(dir, { recursive: !0, force: !0 });
-  } catch {}
-  mkdirSync(dir, { recursive: !0 });
-  for (const model of models) {
-    const target = join(dir, `${model.name}.ts`);
-    try {
-      symlinkSync(model.file, target);
-    } catch {
-      try {
-        writeFileSync(target, readFileSync(model.file));
-      } catch {}
-    }
-  }
-  return dir;
-}
-export function resolveModelSources(options = {}) {
-  const userRoot = options.userRoot ?? path.userModelsPath(), frameworkRoot = options.frameworkRoot ?? path.frameworkPath("defaults/app/Models"), user = collectModels(userRoot, "user"), framework = collectModels(frameworkRoot, "framework");
-  if (user.length === 0 && framework.length === 0)
-    return null;
-  const byName = new Map;
-  for (const model of framework)
-    byName.set(model.name, model);
-  for (const model of user)
-    byName.set(model.name, model);
-  const models = [...byName.values()].sort((a, b) => a.name.localeCompare(b.name)), roots = [];
-  if (user.length > 0)
-    roots.push(userRoot);
-  if (framework.length > 0)
-    roots.push(frameworkRoot);
-  const onlyUser = framework.length === 0, allFlat = models.every((m) => basename(join(m.file, "..")) === basename(onlyUser ? userRoot : frameworkRoot));
-  if (roots.length === 1 && allFlat)
-    return { dir: roots[0], models, roots, staged: !1 };
-  return { dir: stage(models), models, roots, staged: !0 };
-}
-export function cleanupModelStaging() {
-  const dir = modelStagingDir();
-  try {
-    if (existsSync(dir) && lstatSync(dir).isDirectory())
-      rmSync(dir, { recursive: !0, force: !0 });
-  } catch {}
-}
+import{existsSync,lstatSync,mkdirSync,readdirSync,readFileSync,rmSync,symlinkSync,writeFileSync}from"node:fs";import{basename,join}from"node:path";import{path}from"@stacksjs/path";function collectModels(root,origin){if(!existsSync(root))return[];const out=[],walk=(dir)=>{let entries;try{entries=readdirSync(dir,{withFileTypes:!0})}catch{return}for(const entry of entries){const full=join(dir,entry.name);if(entry.isDirectory()){walk(full);continue}if(!entry.name.endsWith(".ts"))continue;if(entry.name.startsWith(".")||entry.name.startsWith("index"))continue;out.push({file:full,name:entry.name.replace(/\.ts$/,""),origin})}};walk(root);return out}export function modelStagingDir(){return path.frameworkRuntimePath("model-sources")}function stage(models){const dir=modelStagingDir();try{rmSync(dir,{recursive:!0,force:!0})}catch{}mkdirSync(dir,{recursive:!0});for(const model of models){const target=join(dir,`${model.name}.ts`);try{symlinkSync(model.file,target)}catch{try{writeFileSync(target,readFileSync(model.file))}catch{}}}return dir}export function resolveModelSources(options={}){const userRoot=options.userRoot??path.userModelsPath(),frameworkRoot=options.frameworkRoot??path.frameworkPath("defaults/app/Models"),user=collectModels(userRoot,"user"),framework=collectModels(frameworkRoot,"framework");if(user.length===0&&framework.length===0)return null;const byName=new Map;for(const model of framework)byName.set(model.name,model);for(const model of user)byName.set(model.name,model);const models=[...byName.values()].sort((a,b)=>a.name.localeCompare(b.name)),roots=[];if(user.length>0)roots.push(userRoot);if(framework.length>0)roots.push(frameworkRoot);const onlyUser=framework.length===0,allFlat=models.every((m)=>basename(join(m.file,".."))===basename(onlyUser?userRoot:frameworkRoot));if(roots.length===1&&allFlat)return{dir:roots[0],models,roots,staged:!1};return{dir:stage(models),models,roots,staged:!0}}export function cleanupModelStaging(){const dir=modelStagingDir();try{if(existsSync(dir)&&lstatSync(dir).isDirectory())rmSync(dir,{recursive:!0,force:!0})}catch{}}

package/dist/notification-tables.js

@@ -1,13 +1,4 @@
-import { log } from "@stacksjs/logging";
-import { env as envVars } from "@stacksjs/env";
-import { db } from "./utils";
-import { sqlHelpers } from "./sql-helpers";
-function getDbDriver() {
-  return process.env.DB_CONNECTION || envVars.DB_CONNECTION || "sqlite";
-}
-export function notificationsTableSql(sql) {
-  const { pkColumn, nullableTimestamp, datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS notifications (
+import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";function getDbDriver(){return process.env.DB_CONNECTION||envVars.DB_CONNECTION||"sqlite"}export function notificationsTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notifications (
     ${pkColumn},
     user_id INTEGER NOT NULL,
     type VARCHAR(255) NOT NULL,
@@ -16,11 +7,7 @@ export function notificationsTableSql(sql) {
     uuid VARCHAR(36),
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     updated_at ${nullableTimestamp}
-  )`;
-}
-export function notificationPreferencesTableSql(sql) {
-  const { pkColumn, boolTrue, nullableTimestamp, datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS notification_preferences (
+  )`}export function notificationPreferencesTableSql(sql){const{pkColumn,boolTrue,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notification_preferences (
     ${pkColumn},
     user_id INTEGER NOT NULL,
     channel VARCHAR(50) NOT NULL,
@@ -29,11 +16,7 @@ export function notificationPreferencesTableSql(sql) {
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     updated_at ${nullableTimestamp},
     UNIQUE (user_id, channel, category)
-  )`;
-}
-export function notificationDeliveriesTableSql(sql) {
-  const { pkColumn, nullableTimestamp, datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS notification_deliveries (
+  )`}export function notificationDeliveriesTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS notification_deliveries (
     ${pkColumn},
     user_id INTEGER,
     channel VARCHAR(50) NOT NULL,
@@ -46,32 +29,4 @@ export function notificationDeliveriesTableSql(sql) {
     sent_at ${nullableTimestamp},
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     updated_at ${nullableTimestamp}
-  )`;
-}
-export async function migrateNotificationTables(options = {}) {
-  const dbDriver = getDbDriver(), sql = sqlHelpers(dbDriver);
-  if (options.verbose)
-    log.info(`Creating notification tables for ${dbDriver}...`);
-  try {
-    if (options.verbose)
-      log.info("Creating notifications table...");
-    await db.unsafe(notificationsTableSql(sql)).execute();
-    await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notifications_user ON notifications (user_id)").execute();
-    if (options.verbose)
-      log.info("Creating notification_preferences table...");
-    await db.unsafe(notificationPreferencesTableSql(sql)).execute();
-    await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_preferences_user ON notification_preferences (user_id)").execute();
-    if (options.verbose)
-      log.info("Creating notification deliveries table...");
-    await db.unsafe(notificationDeliveriesTableSql(sql)).execute();
-    await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_channel ON notification_deliveries (channel)").execute();
-    await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_status ON notification_deliveries (status)").execute();
-    if (options.verbose)
-      log.success("Notification tables created");
-    return { success: !0 };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    log.error(`Failed to create notification tables: ${message}`);
-    return { success: !1, error: message };
-  }
-}
+  )`}export async function migrateNotificationTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver);if(options.verbose)log.info(`Creating notification tables for ${dbDriver}...`);try{if(options.verbose)log.info("Creating notifications table...");await db.unsafe(notificationsTableSql(sql)).execute();await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notifications_user ON notifications (user_id)").execute();if(options.verbose)log.info("Creating notification_preferences table...");await db.unsafe(notificationPreferencesTableSql(sql)).execute();await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_preferences_user ON notification_preferences (user_id)").execute();if(options.verbose)log.info("Creating notification deliveries table...");await db.unsafe(notificationDeliveriesTableSql(sql)).execute();await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_channel ON notification_deliveries (channel)").execute();await db.unsafe("CREATE INDEX IF NOT EXISTS idx_notification_deliveries_status ON notification_deliveries (status)").execute();if(options.verbose)log.success("Notification tables created");return{success:!0}}catch(error){const message=error instanceof Error?error.message:String(error);log.error(`Failed to create notification tables: ${message}`);return{success:!1,error:message}}}

package/dist/query-logger.js

@@ -1,241 +1,2 @@
-import { sqlDateTime } from "./sql-helpers";
-import { memoryUsage } from "node:process";
-import { config } from "@stacksjs/config";
-import { log } from "@stacksjs/logging";
-import { parseQuery } from "./query-parser";
-import { db } from "./utils";
-let trackQuery = () => {};
-export function setQueryTracker(fn) {
-  trackQuery = fn;
-}
-let isLogging = !1;
-export async function logQuery(event) {
-  if (isLogging)
-    return;
-  try {
-    const { query, durationMs, error, bindings } = extractQueryInfo(event);
-    if (query)
-      try {
-        trackQuery(query, durationMs, config.database?.default || "unknown");
-      } catch {}
-    if (!config.database?.queryLogging?.enabled)
-      return;
-    const excludedQueries = config.database?.queryLogging?.excludedQueries;
-    if (!query.trim() || isExcludedQuery(query, Array.isArray(excludedQueries) ? excludedQueries : []))
-      return;
-    const status = determineQueryStatus(durationMs, error), logRecord = await createQueryLogRecord(query, durationMs, status, error, bindings);
-    if (config.database?.queryLogging?.analysis?.enabled && (status === "slow" || config.database.queryLogging.analysis.analyzeAll))
-      await enhanceWithQueryAnalysis(logRecord);
-    isLogging = !0;
-    try {
-      await storeQueryLog(logRecord);
-    } finally {
-      isLogging = !1;
-    }
-    if (status !== "completed")
-      log[status === "failed" ? "error" : "warn"](`Query ${status}:`, {
-        query: logRecord.query,
-        duration: logRecord.duration,
-        connection: logRecord.connection,
-        ...error && { error }
-      });
-  } catch (err) {
-    log.error("Failed to log query:", err);
-  }
-}
-export function isExcludedQuery(query, excludedQueries) {
-  const normalizedQuery = query.toLowerCase();
-  return excludedQueries.some((pattern) => {
-    const normalizedPattern = pattern.trim().toLowerCase();
-    return normalizedPattern.length > 0 && normalizedQuery.includes(normalizedPattern);
-  });
-}
-function queryText(sql) {
-  if (typeof sql === "string")
-    return usableQueryText(sql);
-  if (sql && typeof sql === "object" && typeof sql.then === "function")
-    return "";
-  if (sql && typeof sql.toString === "function")
-    return usableQueryText(String(sql));
-  return "";
-}
-function usableQueryText(text) {
-  return text.startsWith("[object ") ? "" : text;
-}
-function extractQueryInfo(event) {
-  const query = queryText(event.query?.sql), durationMs = event.queryDurationMillis || 0, error = event.error;
-  let bindings;
-  if (event.query?.parameters)
-    try {
-      bindings = JSON.stringify(event.query.parameters);
-    } catch {
-      bindings = "[]";
-    }
-  return { query, durationMs, error, bindings };
-}
-function determineQueryStatus(durationMs, error) {
-  const slowThreshold = config.database?.queryLogging?.slowThreshold || 100;
-  if (error)
-    return "failed";
-  if (durationMs > slowThreshold)
-    return "slow";
-  return "completed";
-}
-async function createQueryLogRecord(query, durationMs, status, error, bindings) {
-  const connection = config.database.default || "unknown", normalizedQuery = parseQuery(query).normalized || query, { trace, caller } = extractTraceInfo();
-  return {
-    query,
-    normalized_query: normalizedQuery,
-    duration: durationMs,
-    connection,
-    status,
-    error: error ? String(error) : void 0,
-    executed_at: sqlDateTime(),
-    bindings,
-    trace,
-    ...caller,
-    memory_usage: memoryUsage().heapUsed / 1024 / 1024
-  };
-}
-const SECRET_PATTERNS = [
-  /\b(?:sk|pk|rk|api|secret|token|bearer|password|pwd|key)[_-]?[A-Za-z0-9]{12,}/gi,
-  /\bsk_(?:live|test)_[A-Za-z0-9]{20,}/g,
-  /\bAKIA[0-9A-Z]{16}/g,
-  /\b[A-Za-z0-9_-]{40,}\b(?=\s|$|['"])/g
-];
-function sanitizeStackTrace(stack) {
-  let out = stack;
-  for (const pattern of SECRET_PATTERNS)
-    out = out.replace(pattern, "<redacted>");
-  return out;
-}
-function extractTraceInfo() {
-  try {
-    const stack = Error("Stack trace capture").stack || "", callerLine = stack.split(`
-`).slice(1).find((line) => !line.includes("query-logger.ts"));
-    let caller = {};
-    if (callerLine) {
-      const methodMatch = callerLine.match(/at (.+?) \(/), fileMatch = callerLine.match(/\((.+?):(\d+):(\d+)\)/);
-      if (methodMatch && methodMatch[1]) {
-        const methodParts = methodMatch[1].split(".");
-        caller = {
-          model: methodParts.length > 1 ? methodParts[0] : void 0,
-          method: methodParts.length > 1 ? methodParts[1] : methodParts[0]
-        };
-      }
-      if (fileMatch && fileMatch[1] && fileMatch[2])
-        caller = {
-          ...caller,
-          file: fileMatch[1],
-          line: Number.parseInt(fileMatch[2], 10)
-        };
-    }
-    return {
-      trace: sanitizeStackTrace(stack),
-      caller
-    };
-  } catch {
-    return { trace: "", caller: {} };
-  }
-}
-async function enhanceWithQueryAnalysis(logRecord) {
-  try {
-    const { tables, type } = parseQuery(logRecord.query);
-    logRecord.affected_tables = JSON.stringify(tables || []);
-    if (type === "SELECT" && config.database?.queryLogging?.analysis?.explainPlan) {
-      const explainResult = await getExplainPlan(logRecord.query);
-      if (explainResult) {
-        logRecord.explain_plan = explainResult.plan;
-        logRecord.indexes_used = JSON.stringify(explainResult.indexesUsed || []);
-        logRecord.missing_indexes = JSON.stringify(explainResult.missingIndexes || []);
-        if (config.database?.queryLogging?.analysis?.suggestions)
-          logRecord.optimization_suggestions = JSON.stringify(generateOptimizationSuggestions(explainResult, logRecord));
-      }
-    }
-    const tags = [type];
-    if (tables && tables.length > 0)
-      tags.push(...tables.map((table) => `table:${table}`));
-    logRecord.tags = JSON.stringify(tags);
-  } catch (error) {
-    log.debug("Error during query analysis:", error);
-  }
-}
-const EXPLAIN_DIALECTS = new Set(["sqlite", "mysql", "postgres"]);
-async function getExplainPlan(query) {
-  try {
-    const rawDriver = (await import("@stacksjs/config")).config?.database?.default, driver = typeof rawDriver === "string" ? rawDriver : "sqlite";
-    if (!EXPLAIN_DIALECTS.has(driver))
-      return null;
-    let sqlText;
-    if (driver === "mysql")
-      sqlText = `EXPLAIN FORMAT=JSON ${query}`;
-    else if (driver === "postgres")
-      sqlText = `EXPLAIN (FORMAT JSON) ${query}`;
-    else
-      sqlText = `EXPLAIN QUERY PLAN ${query}`;
-    const result = await db.unsafe?.(sqlText);
-    if (!result)
-      return null;
-    const rows = Array.isArray(result) ? result : result.rows ?? [], planText = JSON.stringify(rows), indexesUsed = [], missingIndexes = [];
-    if (driver === "sqlite")
-      for (const row of rows) {
-        const detail = row?.detail || "", idxMatch = detail.match(/USING (?:COVERING )?INDEX (\w+)/i);
-        if (idxMatch && idxMatch[1])
-          indexesUsed.push(idxMatch[1]);
-        else {
-          const scanMatch = detail.match(/^SCAN\s+(\w+)/i);
-          if (scanMatch && scanMatch[1])
-            missingIndexes.push(scanMatch[1]);
-        }
-      }
-    else if (driver === "mysql") {
-      const text = planText;
-      for (const m of text.matchAll(/"key"\s*:\s*"([^"]+)"/g))
-        if (m[1])
-          indexesUsed.push(m[1]);
-      for (const m of text.matchAll(/"table_name"\s*:\s*"([^"]+)"[^}]*"access_type"\s*:\s*"ALL"/g))
-        if (m[1])
-          missingIndexes.push(m[1]);
-    } else if (driver === "postgres") {
-      const text = planText;
-      for (const m of text.matchAll(/"Index Name"\s*:\s*"([^"]+)"/g))
-        if (m[1])
-          indexesUsed.push(m[1]);
-      for (const m of text.matchAll(/"Node Type"\s*:\s*"Seq Scan"[^}]*"Relation Name"\s*:\s*"([^"]+)"/g))
-        if (m[1])
-          missingIndexes.push(m[1]);
-    }
-    return {
-      plan: planText.length > 4000 ? `${planText.slice(0, 4000)}\u2026` : planText,
-      indexesUsed: Array.from(new Set(indexesUsed)),
-      missingIndexes: Array.from(new Set(missingIndexes))
-    };
-  } catch (err) {
-    log.debug("[query-logger] EXPLAIN failed (non-fatal):", err);
-    return null;
-  }
-}
-function generateOptimizationSuggestions(explainResult, logRecord) {
-  const suggestions = [];
-  if (explainResult.missingIndexes && explainResult.missingIndexes.length > 0)
-    suggestions.push(`Consider adding index on ${explainResult.missingIndexes.join(", ")}`);
-  if (logRecord.status === "slow") {
-    suggestions.push("Consider optimizing this query to reduce execution time");
-    if (logRecord.query.toLowerCase().includes("select *"))
-      suggestions.push("Specify only needed columns instead of using SELECT *");
-    if (!logRecord.query.toLowerCase().includes("limit"))
-      suggestions.push("Consider adding LIMIT clause to reduce result set size");
-  }
-  return suggestions;
-}
-async function storeQueryLog(logRecord) {
-  try {
-    await db.insertInto("query_logs").values(logRecord).execute();
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    if (/no such table|does not exist|doesn't exist/i.test(message) && /query_logs/i.test(message))
-      log.debug("Query logging will start after the query_logs table is migrated.");
-    else
-      log.error("Failed to store query log:", error);
-  }
-}
+import{sqlDateTime}from"./sql-helpers";import{memoryUsage}from"node:process";import{config}from"@stacksjs/config";import{log}from"@stacksjs/logging";import{parseQuery}from"./query-parser";import{db}from"./utils";let trackQuery=()=>{};export function setQueryTracker(fn){trackQuery=fn}let isLogging=!1;export async function logQuery(event){if(isLogging)return;try{const{query,durationMs,error,bindings}=extractQueryInfo(event);if(query)try{trackQuery(query,durationMs,config.database?.default||"unknown")}catch{}if(!config.database?.queryLogging?.enabled)return;const excludedQueries=config.database?.queryLogging?.excludedQueries;if(!query.trim()||isExcludedQuery(query,Array.isArray(excludedQueries)?excludedQueries:[]))return;const status=determineQueryStatus(durationMs,error),logRecord=await createQueryLogRecord(query,durationMs,status,error,bindings);if(config.database?.queryLogging?.analysis?.enabled&&(status==="slow"||config.database.queryLogging.analysis.analyzeAll))await enhanceWithQueryAnalysis(logRecord);isLogging=!0;try{await storeQueryLog(logRecord)}finally{isLogging=!1}if(status!=="completed")log[status==="failed"?"error":"warn"](`Query ${status}:`,{query:logRecord.query,duration:logRecord.duration,connection:logRecord.connection,...error&&{error}})}catch(err){log.error("Failed to log query:",err)}}export function isExcludedQuery(query,excludedQueries){const normalizedQuery=query.toLowerCase();return excludedQueries.some((pattern)=>{const normalizedPattern=pattern.trim().toLowerCase();return normalizedPattern.length>0&&normalizedQuery.includes(normalizedPattern)})}function queryText(sql){if(typeof sql==="string")return usableQueryText(sql);if(sql&&typeof sql==="object"&&typeof sql.then==="function")return"";if(sql&&typeof sql.toString==="function")return usableQueryText(String(sql));return""}function usableQueryText(text){return text.startsWith("[object ")?"":text}function extractQueryInfo(event){const query=queryText(event.query?.sql),durationMs=event.queryDurationMillis||0,error=event.error;let bindings;if(event.query?.parameters)try{bindings=JSON.stringify(event.query.parameters)}catch{bindings="[]"}return{query,durationMs,error,bindings}}function determineQueryStatus(durationMs,error){const slowThreshold=config.database?.queryLogging?.slowThreshold||100;if(error)return"failed";if(durationMs>slowThreshold)return"slow";return"completed"}async function createQueryLogRecord(query,durationMs,status,error,bindings){const connection=config.database.default||"unknown",normalizedQuery=parseQuery(query).normalized||query,{trace,caller}=extractTraceInfo();return{query,normalized_query:normalizedQuery,duration:durationMs,connection,status,error:error?String(error):void 0,executed_at:sqlDateTime(),bindings,trace,...caller,memory_usage:memoryUsage().heapUsed/1024/1024}}const SECRET_PATTERNS=[/\b(?:sk|pk|rk|api|secret|token|bearer|password|pwd|key)[_-]?[A-Za-z0-9]{12,}/gi,/\bsk_(?:live|test)_[A-Za-z0-9]{20,}/g,/\bAKIA[0-9A-Z]{16}/g,/\b[A-Za-z0-9_-]{40,}\b(?=\s|$|['"])/g];function sanitizeStackTrace(stack){let out=stack;for(const pattern of SECRET_PATTERNS)out=out.replace(pattern,"<redacted>");return out}function extractTraceInfo(){try{const stack=Error("Stack trace capture").stack||"",callerLine=stack.split(`
+`).slice(1).find((line)=>!line.includes("query-logger.ts"));let caller={};if(callerLine){const methodMatch=callerLine.match(/at (.+?) \(/),fileMatch=callerLine.match(/\((.+?):(\d+):(\d+)\)/);if(methodMatch&&methodMatch[1]){const methodParts=methodMatch[1].split(".");caller={model:methodParts.length>1?methodParts[0]:void 0,method:methodParts.length>1?methodParts[1]:methodParts[0]}}if(fileMatch&&fileMatch[1]&&fileMatch[2])caller={...caller,file:fileMatch[1],line:Number.parseInt(fileMatch[2],10)}}return{trace:sanitizeStackTrace(stack),caller}}catch{return{trace:"",caller:{}}}}async function enhanceWithQueryAnalysis(logRecord){try{const{tables,type}=parseQuery(logRecord.query);logRecord.affected_tables=JSON.stringify(tables||[]);if(type==="SELECT"&&config.database?.queryLogging?.analysis?.explainPlan){const explainResult=await getExplainPlan(logRecord.query);if(explainResult){logRecord.explain_plan=explainResult.plan;logRecord.indexes_used=JSON.stringify(explainResult.indexesUsed||[]);logRecord.missing_indexes=JSON.stringify(explainResult.missingIndexes||[]);if(config.database?.queryLogging?.analysis?.suggestions)logRecord.optimization_suggestions=JSON.stringify(generateOptimizationSuggestions(explainResult,logRecord))}}const tags=[type];if(tables&&tables.length>0)tags.push(...tables.map((table)=>`table:${table}`));logRecord.tags=JSON.stringify(tags)}catch(error){log.debug("Error during query analysis:",error)}}const EXPLAIN_DIALECTS=new Set(["sqlite","mysql","postgres"]);async function getExplainPlan(query){try{const rawDriver=(await import("@stacksjs/config")).config?.database?.default,driver=typeof rawDriver==="string"?rawDriver:"sqlite";if(!EXPLAIN_DIALECTS.has(driver))return null;let sqlText;if(driver==="mysql")sqlText=`EXPLAIN FORMAT=JSON ${query}`;else if(driver==="postgres")sqlText=`EXPLAIN (FORMAT JSON) ${query}`;else sqlText=`EXPLAIN QUERY PLAN ${query}`;const result=await db.unsafe?.(sqlText);if(!result)return null;const rows=Array.isArray(result)?result:result.rows??[],planText=JSON.stringify(rows),indexesUsed=[],missingIndexes=[];if(driver==="sqlite")for(const row of rows){const detail=row?.detail||"",idxMatch=detail.match(/USING (?:COVERING )?INDEX (\w+)/i);if(idxMatch&&idxMatch[1])indexesUsed.push(idxMatch[1]);else{const scanMatch=detail.match(/^SCAN\s+(\w+)/i);if(scanMatch&&scanMatch[1])missingIndexes.push(scanMatch[1])}}else if(driver==="mysql"){const text=planText;for(const m of text.matchAll(/"key"\s*:\s*"([^"]+)"/g))if(m[1])indexesUsed.push(m[1]);for(const m of text.matchAll(/"table_name"\s*:\s*"([^"]+)"[^}]*"access_type"\s*:\s*"ALL"/g))if(m[1])missingIndexes.push(m[1])}else if(driver==="postgres"){const text=planText;for(const m of text.matchAll(/"Index Name"\s*:\s*"([^"]+)"/g))if(m[1])indexesUsed.push(m[1]);for(const m of text.matchAll(/"Node Type"\s*:\s*"Seq Scan"[^}]*"Relation Name"\s*:\s*"([^"]+)"/g))if(m[1])missingIndexes.push(m[1])}return{plan:planText.length>4000?`${planText.slice(0,4000)}\u2026`:planText,indexesUsed:Array.from(new Set(indexesUsed)),missingIndexes:Array.from(new Set(missingIndexes))}}catch(err){log.debug("[query-logger] EXPLAIN failed (non-fatal):",err);return null}}function generateOptimizationSuggestions(explainResult,logRecord){const suggestions=[];if(explainResult.missingIndexes&&explainResult.missingIndexes.length>0)suggestions.push(`Consider adding index on ${explainResult.missingIndexes.join(", ")}`);if(logRecord.status==="slow"){suggestions.push("Consider optimizing this query to reduce execution time");if(logRecord.query.toLowerCase().includes("select *"))suggestions.push("Specify only needed columns instead of using SELECT *");if(!logRecord.query.toLowerCase().includes("limit"))suggestions.push("Consider adding LIMIT clause to reduce result set size")}return suggestions}async function storeQueryLog(logRecord){try{await db.insertInto("query_logs").values(logRecord).execute()}catch(error){const message=error instanceof Error?error.message:String(error);if(/no such table|does not exist|doesn't exist/i.test(message)&&/query_logs/i.test(message))log.debug("Query logging will start after the query_logs table is migrated.");else log.error("Failed to store query log:",error)}}

package/dist/query-parser.js

@@ -1,93 +1 @@
-export function parseQuery(sql) {
-  const result = {
-    normalized: "",
-    type: "OTHER",
-    tables: []
-  };
-  if (!sql)
-    return result;
-  try {
-    const upperQuery = sql.trim().toUpperCase();
-    if (upperQuery.startsWith("SELECT"))
-      result.type = "SELECT";
-    else if (upperQuery.startsWith("INSERT"))
-      result.type = "INSERT";
-    else if (upperQuery.startsWith("UPDATE"))
-      result.type = "UPDATE";
-    else if (upperQuery.startsWith("DELETE"))
-      result.type = "DELETE";
-    result.tables = extractTables(sql, result.type);
-    result.normalized = normalizeQuery(sql);
-    return result;
-  } catch {
-    return {
-      normalized: sql,
-      type: "OTHER",
-      tables: []
-    };
-  }
-}
-function buildIdentifierRegex(keyword, flags = "i") {
-  return new RegExp(`${keyword}\\s+(?:"([^"]+)"|\`([^\`]+)\`|\\[([^\\]]+)\\]|([\\w.]+))`, flags);
-}
-function pickMatchedIdentifier(match) {
-  if (!match)
-    return null;
-  const ident = match[1] ?? match[2] ?? match[3] ?? match[4];
-  if (!ident)
-    return null;
-  return ident.split(".").pop() ?? null;
-}
-function extractTables(sql, type) {
-  const tables = [];
-  try {
-    switch (type) {
-      case "SELECT": {
-        const fromMatch = sql.match(buildIdentifierRegex("from")), fromTable = pickMatchedIdentifier(fromMatch);
-        if (fromTable)
-          tables.push(fromTable);
-        const joinRegex = buildIdentifierRegex("join", "gi");
-        for (const m of sql.matchAll(joinRegex)) {
-          const joinTable = pickMatchedIdentifier(m);
-          if (joinTable)
-            tables.push(joinTable);
-        }
-        break;
-      }
-      case "INSERT": {
-        const intoMatch = sql.match(buildIdentifierRegex("into")), intoTable = pickMatchedIdentifier(intoMatch);
-        if (intoTable)
-          tables.push(intoTable);
-        break;
-      }
-      case "UPDATE": {
-        const updateMatch = sql.match(buildIdentifierRegex("update")), updateTable = pickMatchedIdentifier(updateMatch);
-        if (updateTable)
-          tables.push(updateTable);
-        break;
-      }
-      case "DELETE": {
-        const deleteFromMatch = sql.match(buildIdentifierRegex("from")), deleteTable = pickMatchedIdentifier(deleteFromMatch);
-        if (deleteTable)
-          tables.push(deleteTable);
-        break;
-      }
-    }
-  } catch {}
-  return [...new Set(tables)].filter(Boolean);
-}
-function normalizeQuery(sql) {
-  try {
-    let normalizedSql = sql;
-    normalizedSql = normalizedSql.replace(/(?<![a-zA-Z_])\b\d+\b(?![a-zA-Z_])/g, "?");
-    normalizedSql = normalizedSql.replace(/'([^']|'')*'/g, "?");
-    normalizedSql = normalizedSql.replace(/"([^"]|"")*"/g, "?");
-    normalizedSql = normalizedSql.replace(/\btrue\b/gi, "?");
-    normalizedSql = normalizedSql.replace(/\bfalse\b/gi, "?");
-    normalizedSql = normalizedSql.replace(/\bnull\b/gi, "?");
-    normalizedSql = normalizedSql.replace(/\s+/g, " ").trim();
-    return normalizedSql;
-  } catch {
-    return sql;
-  }
-}
+export function parseQuery(sql){const result={normalized:"",type:"OTHER",tables:[]};if(!sql)return result;try{const upperQuery=sql.trim().toUpperCase();if(upperQuery.startsWith("SELECT"))result.type="SELECT";else if(upperQuery.startsWith("INSERT"))result.type="INSERT";else if(upperQuery.startsWith("UPDATE"))result.type="UPDATE";else if(upperQuery.startsWith("DELETE"))result.type="DELETE";result.tables=extractTables(sql,result.type);result.normalized=normalizeQuery(sql);return result}catch{return{normalized:sql,type:"OTHER",tables:[]}}}function buildIdentifierRegex(keyword,flags="i"){return new RegExp(`${keyword}\\s+(?:"([^"]+)"|\`([^\`]+)\`|\\[([^\\]]+)\\]|([\\w.]+))`,flags)}function pickMatchedIdentifier(match){if(!match)return null;const ident=match[1]??match[2]??match[3]??match[4];if(!ident)return null;return ident.split(".").pop()??null}function extractTables(sql,type){const tables=[];try{switch(type){case"SELECT":{const fromMatch=sql.match(buildIdentifierRegex("from")),fromTable=pickMatchedIdentifier(fromMatch);if(fromTable)tables.push(fromTable);const joinRegex=buildIdentifierRegex("join","gi");for(const m of sql.matchAll(joinRegex)){const joinTable=pickMatchedIdentifier(m);if(joinTable)tables.push(joinTable)}break}case"INSERT":{const intoMatch=sql.match(buildIdentifierRegex("into")),intoTable=pickMatchedIdentifier(intoMatch);if(intoTable)tables.push(intoTable);break}case"UPDATE":{const updateMatch=sql.match(buildIdentifierRegex("update")),updateTable=pickMatchedIdentifier(updateMatch);if(updateTable)tables.push(updateTable);break}case"DELETE":{const deleteFromMatch=sql.match(buildIdentifierRegex("from")),deleteTable=pickMatchedIdentifier(deleteFromMatch);if(deleteTable)tables.push(deleteTable);break}}}catch{}return[...new Set(tables)].filter(Boolean)}function normalizeQuery(sql){try{let normalizedSql=sql;normalizedSql=normalizedSql.replace(/(?<![a-zA-Z_])\b\d+\b(?![a-zA-Z_])/g,"?");normalizedSql=normalizedSql.replace(/'([^']|'')*'/g,"?");normalizedSql=normalizedSql.replace(/"([^"]|"")*"/g,"?");normalizedSql=normalizedSql.replace(/\btrue\b/gi,"?");normalizedSql=normalizedSql.replace(/\bfalse\b/gi,"?");normalizedSql=normalizedSql.replace(/\bnull\b/gi,"?");normalizedSql=normalizedSql.replace(/\s+/g," ").trim();return normalizedSql}catch{return sql}}

package/dist/rbac-tables.js

@@ -1,13 +1,4 @@
-import { log } from "@stacksjs/logging";
-import { env as envVars } from "@stacksjs/env";
-import { db } from "./utils";
-import { sqlHelpers } from "./sql-helpers";
-function getDbDriver() {
-  return envVars.DB_CONNECTION || "sqlite";
-}
-export function rolesTableSql(sql) {
-  const { pkColumn, nullableTimestamp, datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS roles (
+import{log}from"@stacksjs/logging";import{env as envVars}from"@stacksjs/env";import{db}from"./utils";import{sqlHelpers}from"./sql-helpers";function getDbDriver(){return envVars.DB_CONNECTION||"sqlite"}export function rolesTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS roles (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     guard_name VARCHAR(255) NOT NULL DEFAULT 'web',
@@ -15,11 +6,7 @@ export function rolesTableSql(sql) {
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     updated_at ${nullableTimestamp},
     UNIQUE (name, guard_name)
-  )`;
-}
-export function permissionsTableSql(sql) {
-  const { pkColumn, nullableTimestamp, datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS permissions (
+  )`}export function permissionsTableSql(sql){const{pkColumn,nullableTimestamp,datetime}=sql;return`CREATE TABLE IF NOT EXISTS permissions (
     ${pkColumn},
     name VARCHAR(255) NOT NULL,
     guard_name VARCHAR(255) NOT NULL DEFAULT 'web',
@@ -27,61 +14,19 @@ export function permissionsTableSql(sql) {
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     updated_at ${nullableTimestamp},
     UNIQUE (name, guard_name)
-  )`;
-}
-export function userRolesTableSql(sql) {
-  const { datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS user_roles (
+  )`}export function userRolesTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS user_roles (
     user_id INTEGER NOT NULL,
     role_id INTEGER NOT NULL,
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (user_id, role_id)
-  )`;
-}
-export function userPermissionsTableSql(sql) {
-  const { datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS user_permissions (
+  )`}export function userPermissionsTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS user_permissions (
     user_id INTEGER NOT NULL,
     permission_id INTEGER NOT NULL,
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (user_id, permission_id)
-  )`;
-}
-export function rolePermissionsTableSql(sql) {
-  const { datetime } = sql;
-  return `CREATE TABLE IF NOT EXISTS role_permissions (
+  )`}export function rolePermissionsTableSql(sql){const{datetime}=sql;return`CREATE TABLE IF NOT EXISTS role_permissions (
     role_id INTEGER NOT NULL,
     permission_id INTEGER NOT NULL,
     created_at ${datetime} DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (role_id, permission_id)
-  )`;
-}
-export async function migrateRbacTables(options = {}) {
-  const dbDriver = getDbDriver(), sql = sqlHelpers(dbDriver);
-  if (options.verbose)
-    log.info(`Creating RBAC tables for ${dbDriver}...`);
-  try {
-    if (options.verbose)
-      log.info("Creating roles table...");
-    await db.unsafe(rolesTableSql(sql)).execute();
-    if (options.verbose)
-      log.info("Creating permissions table...");
-    await db.unsafe(permissionsTableSql(sql)).execute();
-    if (options.verbose)
-      log.info("Creating user_roles pivot...");
-    await db.unsafe(userRolesTableSql(sql)).execute();
-    if (options.verbose)
-      log.info("Creating user_permissions pivot...");
-    await db.unsafe(userPermissionsTableSql(sql)).execute();
-    if (options.verbose)
-      log.info("Creating role_permissions pivot...");
-    await db.unsafe(rolePermissionsTableSql(sql)).execute();
-    if (options.verbose)
-      log.success("RBAC tables created");
-    return { success: !0 };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    log.error(`Failed to create RBAC tables: ${message}`);
-    return { success: !1, error: message };
-  }
-}
+  )`}export async function migrateRbacTables(options={}){const dbDriver=getDbDriver(),sql=sqlHelpers(dbDriver);if(options.verbose)log.info(`Creating RBAC tables for ${dbDriver}...`);try{if(options.verbose)log.info("Creating roles table...");await db.unsafe(rolesTableSql(sql)).execute();if(options.verbose)log.info("Creating permissions table...");await db.unsafe(permissionsTableSql(sql)).execute();if(options.verbose)log.info("Creating user_roles pivot...");await db.unsafe(userRolesTableSql(sql)).execute();if(options.verbose)log.info("Creating user_permissions pivot...");await db.unsafe(userPermissionsTableSql(sql)).execute();if(options.verbose)log.info("Creating role_permissions pivot...");await db.unsafe(rolePermissionsTableSql(sql)).execute();if(options.verbose)log.success("RBAC tables created");return{success:!0}}catch(error){const message=error instanceof Error?error.message:String(error);log.error(`Failed to create RBAC tables: ${message}`);return{success:!1,error:message}}}