@memberjunction/core 5.11.0 → 5.13.0

package/dist/generic/QueryCacheManager.js

@@ -0,0 +1,314 @@
+import { LocalCacheManager } from './localCacheManager.js';
+import { Metadata } from './metadata.js';
+import { LogStatus } from './logging.js';
+import { UUIDsEqual } from '@memberjunction/global';
+/**
+ * Wrapper around LocalCacheManager that translates query-specific caching concerns
+ * (paging, count, ad-hoc keys, dependency invalidation, entity-change awareness)
+ * into LocalCacheManager's generic RunQueryCache methods.
+ *
+ * Replaces the standalone QueryCache class so that query result caching participates
+ * in LCM's unified eviction, TTL, statistics, and optional Redis persistence.
+ *
+ * ## IMPORTANT — Caching is intentionally BYPASSED for now
+ *
+ * All Get/Set methods are wired up but short-circuit to no-ops. The reason:
+ *
+ * Query results cannot be reliably invalidated today. Unlike RunView caching (which
+ * tracks individual entities and can invalidate on any row-level mutation), queries
+ * are arbitrary SQL that may join, filter, or aggregate across many tables. The
+ * `QueryEntity` table maps queries to the entities they reference, but those mappings
+ * are LLM-discovered and not guaranteed to be complete. A TTL-only strategy risks
+ * serving stale data when the underlying rows change before the TTL expires.
+ *
+ * The full caching implementation is preserved below so that when we have a reliable
+ * invalidation strategy (e.g., entity mutation hooks that can confidently evict all
+ * affected query caches with complete QueryEntity coverage), we can enable caching
+ * by removing the early returns at the top of each method. Until then, every query
+ * execution hits the database to guarantee fresh results.
+ */
+export class QueryCacheManager {
+    constructor(connectionPrefix) {
+        /** Tracks cache timestamps per fingerprint for computing CacheTTLRemaining */
+        this._cacheTimestamps = new Map();
+        /** Reverse index: normalized entity name → set of fingerprints that depend on it */
+        this._queryEntityIndex = new Map();
+        this._connectionPrefix = connectionPrefix;
+    }
+    get LCM() {
+        return LocalCacheManager.Instance;
+    }
+    // ── Fingerprint generation ──────────────────────────────────────────────
+    Fingerprint(queryId, queryName, params) {
+        return this.LCM.GenerateRunQueryFingerprint(queryId, queryName, params, this._connectionPrefix);
+    }
+    PagedFingerprint(queryId, queryName, params, startRow, maxRows) {
+        return `${this.Fingerprint(queryId, queryName, params)}|page:${startRow}:${maxRows}`;
+    }
+    CountFingerprint(queryId, queryName, params) {
+        return `${this.Fingerprint(queryId, queryName, params)}|count`;
+    }
+    AdhocFingerprint(sql) {
+        return `_adhoc_|_|${QueryCacheManager.Fnv1aHash(sql)}|${this._connectionPrefix}`;
+    }
+    // ── Full-result cache ───────────────────────────────────────────────────
+    /**
+     * Retrieves cached full (unpaginated) results for a saved query.
+     * Returns null on miss or if caching is disabled.
+     */
+    async Get(query, params) {
+        // BYPASSED — see class-level comment for rationale
+        return null;
+        /* When caching is enabled, uncomment the block below:
+        if (!query.CacheConfig?.enabled) return null;
+
+        const fp = this.Fingerprint(query.ID, query.Name, params);
+        const cached = await this.LCM.GetRunQueryResult(fp);
+        if (!cached) return null;
+
+        const ttlRemainingMs = this.computeTTLRemaining(fp, query.CacheConfig.ttlMinutes);
+        return { results: cached.results, ttlRemainingMs };
+        */
+    }
+    /**
+     * Stores full (unpaginated) query results in the cache.
+     */
+    async Set(query, params, results) {
+        // BYPASSED — see class-level comment for rationale
+        return;
+        /* When caching is enabled, uncomment the block below:
+        const config = query.CacheConfig;
+        if (!config?.enabled) return;
+
+        const fp = this.Fingerprint(query.ID, query.Name, params);
+        const ttlMs = config.ttlMinutes * 60 * 1000;
+
+        await this.LCM.SetRunQueryResult(
+            fp, query.Name, results,
+            new Date().toISOString(),
+            results.length, query.ID, ttlMs,
+        );
+        this._cacheTimestamps.set(fp, Date.now());
+        this.RegisterEntityDependencies(fp, query);
+        */
+    }
+    // ── Paged cache ─────────────────────────────────────────────────────────
+    /**
+     * Retrieves cached results for a specific page of a paged query.
+     */
+    async GetPaged(query, params, startRow, maxRows) {
+        // BYPASSED — see class-level comment for rationale
+        return null;
+        /* When caching is enabled, uncomment the block below:
+        if (!query.CacheConfig?.enabled) return null;
+
+        const fp = this.PagedFingerprint(query.ID, query.Name, params, startRow, maxRows);
+        const cached = await this.LCM.GetRunQueryResult(fp);
+        if (!cached) return null;
+
+        const ttlRemainingMs = this.computeTTLRemaining(fp, query.CacheConfig.ttlMinutes);
+        return { results: cached.results, ttlRemainingMs };
+        */
+    }
+    /**
+     * Stores results for a specific page in the cache.
+     */
+    async SetPaged(query, params, startRow, maxRows, results) {
+        // BYPASSED — see class-level comment for rationale
+        return;
+        /* When caching is enabled, uncomment the block below:
+        const config = query.CacheConfig;
+        if (!config?.enabled) return;
+
+        const fp = this.PagedFingerprint(query.ID, query.Name, params, startRow, maxRows);
+        const ttlMs = config.ttlMinutes * 60 * 1000;
+        const displayName = `${query.Name} [page ${startRow}+${maxRows}]`;
+
+        await this.LCM.SetRunQueryResult(
+            fp, displayName, results,
+            new Date().toISOString(), results.length, query.ID, ttlMs,
+        );
+        this._cacheTimestamps.set(fp, Date.now());
+        this.RegisterEntityDependencies(fp, query);
+        */
+    }
+    // ── Count cache ─────────────────────────────────────────────────────────
+    /**
+     * Retrieves a cached TotalRowCount for a query + params combination.
+     */
+    async GetTotalRowCount(query, params) {
+        // BYPASSED — see class-level comment for rationale
+        return null;
+        /* When caching is enabled, uncomment the block below:
+        if (!query.CacheConfig?.enabled) return null;
+
+        const fp = this.CountFingerprint(query.ID, query.Name, params);
+        const cached = await this.LCM.GetRunQueryResult(fp);
+        if (!cached) return null;
+
+        const row = cached.results[0] as { TotalRowCount: number } | undefined;
+        return row?.TotalRowCount ?? null;
+        */
+    }
+    /**
+     * Stores a TotalRowCount value in the cache, encoded as a single-row result.
+     */
+    async SetTotalRowCount(query, params, count) {
+        // BYPASSED — see class-level comment for rationale
+        return;
+        /* When caching is enabled, uncomment the block below:
+        const config = query.CacheConfig;
+        if (!config?.enabled) return;
+
+        const fp = this.CountFingerprint(query.ID, query.Name, params);
+        const ttlMs = config.ttlMinutes * 60 * 1000;
+
+        await this.LCM.SetRunQueryResult(
+            fp, `${query.Name} [count]`, [{ TotalRowCount: count }],
+            new Date().toISOString(), 1, query.ID, ttlMs,
+        );
+        this._cacheTimestamps.set(fp, Date.now());
+        */
+    }
+    // ── Ad-hoc cache ────────────────────────────────────────────────────────
+    /**
+     * Retrieves cached results for an ad-hoc SQL query.
+     */
+    async GetAdhoc(sql, ttlMinutes) {
+        // BYPASSED — see class-level comment for rationale
+        return null;
+        /* When caching is enabled, uncomment the block below:
+        if (ttlMinutes <= 0) return null;
+
+        const fp = this.AdhocFingerprint(sql);
+        const cached = await this.LCM.GetRunQueryResult(fp);
+        return cached ? { results: cached.results } : null;
+        */
+    }
+    /**
+     * Stores ad-hoc SQL query results in the cache.
+     */
+    async SetAdhoc(sql, ttlMinutes, results) {
+        // BYPASSED — see class-level comment for rationale
+        return;
+        /* When caching is enabled, uncomment the block below:
+        if (ttlMinutes <= 0) return;
+
+        const fp = this.AdhocFingerprint(sql);
+        const ttlMs = ttlMinutes * 60 * 1000;
+
+        await this.LCM.SetRunQueryResult(
+            fp, 'Ad-Hoc Query', results,
+            new Date().toISOString(), results.length, undefined, ttlMs,
+        );
+        this._cacheTimestamps.set(fp, Date.now());
+        */
+    }
+    // ── Invalidation ────────────────────────────────────────────────────────
+    /**
+     * Invalidates all cache entries (full, paged, count) for a single query by name.
+     */
+    async InvalidateQuery(queryName) {
+        // No-op while caching is bypassed, but safe to call unconditionally
+        await this.LCM.InvalidateQueryCaches(queryName);
+    }
+    /**
+     * Invalidates cache entries for a query and all queries that transitively depend on it.
+     */
+    async InvalidateWithDependents(query, visited = new Set()) {
+        // No-op while caching is bypassed (nothing in cache to invalidate),
+        // but the traversal logic is preserved for when caching is enabled.
+        if (visited.has(query.ID))
+            return;
+        visited.add(query.ID);
+        await this.LCM.InvalidateQueryCaches(query.Name);
+        const dependents = query.Dependents;
+        if (dependents && dependents.length > 0) {
+            for (const dep of dependents) {
+                const depQuery = this.FindQueryById(dep.QueryID);
+                if (depQuery) {
+                    await this.InvalidateWithDependents(depQuery, visited);
+                }
+            }
+        }
+    }
+    // ── Entity-change invalidation ──────────────────────────────────────────
+    /**
+     * Called when an entity changes (save/delete). Invalidates all query cache entries
+     * that depend on the changed entity via QueryEntity mappings.
+     *
+     * While caching is bypassed the reverse index will always be empty, so this is
+     * effectively a no-op. Kept wired up so enabling caching requires no caller changes.
+     */
+    async HandleEntityChange(entityName) {
+        const normalized = entityName.trim().toLowerCase();
+        const fingerprints = this._queryEntityIndex.get(normalized);
+        if (!fingerprints || fingerprints.size === 0)
+            return;
+        const fpArray = [...fingerprints];
+        for (const fp of fpArray) {
+            await this.LCM.InvalidateRunQueryResult(fp);
+            this._cacheTimestamps.delete(fp);
+        }
+        fingerprints.clear();
+        LogStatus(`QueryCacheManager: invalidated ${fpArray.length} cache entries for entity "${entityName}"`);
+    }
+    // ── Entity dependency registration (private) ────────────────────────────
+    RegisterEntityDependencies(fingerprint, query) {
+        const entityNames = this.GetTransitiveEntityDependencies(query);
+        for (const name of entityNames) {
+            const normalized = name.trim().toLowerCase();
+            if (!this._queryEntityIndex.has(normalized)) {
+                this._queryEntityIndex.set(normalized, new Set());
+            }
+            this._queryEntityIndex.get(normalized).add(fingerprint);
+        }
+    }
+    GetTransitiveEntityDependencies(query, visited = new Set()) {
+        if (visited.has(query.ID))
+            return [];
+        visited.add(query.ID);
+        const entities = [];
+        // Direct entity mappings from QueryEntity table
+        const queryEntities = query.Entities;
+        if (queryEntities) {
+            for (const qe of queryEntities) {
+                if (qe.Entity) {
+                    entities.push(qe.Entity);
+                }
+            }
+        }
+        // Walk composition dependencies for transitive entity mappings
+        const dependencies = query.Dependencies;
+        if (dependencies) {
+            for (const dep of dependencies) {
+                const depQuery = this.FindQueryById(dep.DependsOnQueryID);
+                if (depQuery) {
+                    entities.push(...this.GetTransitiveEntityDependencies(depQuery, visited));
+                }
+            }
+        }
+        return [...new Set(entities)];
+    }
+    // ── Helpers ─────────────────────────────────────────────────────────────
+    FindQueryById(queryId) {
+        return Metadata.Provider.Queries.find((q) => UUIDsEqual(q.ID, queryId));
+    }
+    computeTTLRemaining(fingerprint, ttlMinutes) {
+        const cachedAt = this._cacheTimestamps.get(fingerprint) ?? 0;
+        const ttlMs = ttlMinutes * 60 * 1000;
+        return Math.max(0, (cachedAt + ttlMs) - Date.now());
+    }
+    /**
+     * FNV-1a 32-bit hash — fast, deterministic, good distribution for cache keys.
+     */
+    static Fnv1aHash(input) {
+        let hash = 0x811c9dc5; // FNV offset basis
+        for (let i = 0; i < input.length; i++) {
+            hash ^= input.charCodeAt(i);
+            hash = (hash * 0x01000193) >>> 0; // FNV prime, keep as uint32
+        }
+        return hash.toString(16);
+    }
+}
+//# sourceMappingURL=QueryCacheManager.js.map

package/dist/generic/QueryCacheManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryCacheManager.js","sourceRoot":"","sources":["../../src/generic/QueryCacheManager.ts"],"names":[],"mappings":"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"}

package/dist/generic/baseEntity.js

@@ -1,5 +1,5 @@
 import { MJEventType, MJGlobal, uuidv4, UUIDsEqual, WarningManager } from '@memberjunction/global';
-import { HookRegistry } from './hookRegistry.js';
+import { GetDataHooks } from './dataHooks.js';
 import { EntityFieldInfo, EntityInfo, EntityFieldTSType, EntityPermissionType, RecordChange, ValidationErrorInfo, ValidationResult } from './entityInfo.js';
 import { EntityDeleteOptions, EntitySaveOptions, ProviderType } from './interfaces.js';
 import { Metadata } from './metadata.js';
@@ -1775,7 +1775,7 @@ export class BaseEntity {
      * (error message), the save is rejected by throwing an Error.
      */
     async RunPreSaveHooks() {
-        const preSaveHooks = HookRegistry.GetHooks('PreSave');
+        const preSaveHooks = GetDataHooks('PreSave');
         for (const hook of preSaveHooks) {
             const hookResult = await hook(this, this.ActiveUser);
             if (hookResult === false) {