@memberjunction/core 5.11.0 → 5.12.0

package/dist/generic/queryPagingEngine.d.ts

@@ -0,0 +1,110 @@
+import { DatabasePlatform } from './platformSQL.js';
+/**
+ * Result of wrapping SQL with paging directives.
+ */
+export interface PagingWrappedSQL {
+    /** SQL that returns the paged data rows */
+    DataSQL: string;
+    /** SQL that returns the total row count (without paging) */
+    CountSQL: string;
+    /** The computed offset (same as startRow input) */
+    Offset: number;
+    /** The page size (same as maxRows input) */
+    PageSize: number;
+}
+/**
+ * Handles server-side pagination for query SQL by wrapping resolved SQL in CTEs
+ * and applying platform-specific OFFSET/FETCH or LIMIT/OFFSET clauses.
+ *
+ * Works with arbitrary SQL including pre-existing CTEs from the composition engine.
+ * The approach:
+ *   1. Parse the SQL to separate CTE prefix from the main SELECT
+ *   2. Extract and remove any ORDER BY from the main SELECT
+ *   3. Strip any TOP N clause from the main SELECT
+ *   4. Wrap the main SELECT as a new CTE (`__paged`)
+ *   5. Emit a data query with ORDER BY + platform paging
+ *   6. Emit a count query over the same CTE
+ */
+export declare class QueryPagingEngine {
+    /**
+     * Wraps resolved SQL with CTE-based paging for server-side pagination.
+     *
+     * @param resolvedSQL  The fully-resolved SQL (after composition + Nunjucks)
+     * @param startRow     0-based row offset
+     * @param maxRows      Maximum rows to return (page size)
+     * @param platform     Target database platform
+     * @returns DataSQL for paged results and CountSQL for total row count
+     */
+    static WrapWithPaging(resolvedSQL: string, startRow: number, maxRows: number, platform: DatabasePlatform): PagingWrappedSQL;
+    /**
+     * Determines whether the given params indicate paging should be applied.
+     * Paging is active when both StartRow is defined (>= 0) and MaxRows > 0.
+     */
+    static ShouldPage(startRow: number | undefined, maxRows: number | undefined): boolean;
+    /**
+     * Splits SQL into a CTE prefix (everything in the WITH chain) and the main
+     * SELECT statement. Handles nested parentheses to avoid splitting inside CTEs.
+     *
+     * Returns `ctePrefix` as the full `WITH ... AS (...)` chain (no trailing comma),
+     * and `mainSelect` as the final SELECT.
+     */
+    static splitCTEAndSelect(sql: string): {
+        ctePrefix: string;
+        mainSelect: string;
+    };
+    /**
+     * Extracts the ORDER BY clause from the end of a SQL statement.
+     * Only matches ORDER BY that is NOT inside parentheses (i.e., top-level).
+     */
+    static extractOrderBy(sql: string): {
+        sqlWithoutOrder: string;
+        orderByClause: string | null;
+    };
+    /**
+     * Strips a TOP N clause from a SELECT statement.
+     * Handles `SELECT TOP N`, `SELECT TOP (N)`, and `SELECT DISTINCT TOP N`.
+     */
+    static stripTopClause(sql: string): {
+        sql: string;
+        topRemoved: boolean;
+    };
+    /**
+     * Quotes an identifier for the target platform.
+     */
+    private static quoteIdentifier;
+    /**
+     * Builds the platform-specific paging clause.
+     */
+    private static buildPagingClause;
+    /**
+     * Remaps ORDER BY expressions so they reference the projected column names
+     * from the SELECT list rather than table-qualified aliases (e.g. `r.Total`
+     * becomes `TotalRevenue` if the SELECT has `r.Total AS TotalRevenue`).
+     *
+     * This is necessary because the outer query is `SELECT * FROM [__paged]`
+     * where the original table aliases no longer exist.
+     */
+    static remapOrderByToProjectedNames(orderByClause: string, selectSQL: string): string;
+    /**
+     * Parses the SELECT list from a SQL statement and builds a map of
+     * normalized expression → projected column name.
+     *
+     * For `SELECT au.Name AS UserName, COALESCE(rc.Count, 0) AS Total`
+     * returns Map { "AU.NAME" → "UserName", "COALESCE(RC.COUNT, 0)" → "Total" }
+     *
+     * Also indexes the stripped (no table prefix) versions:
+     * { "COALESCE(COUNT, 0)" → "Total", "NAME" → "UserName" }
+     */
+    private static buildSelectAliasMap;
+    /**
+     * Splits a SQL fragment by commas that are not inside parentheses.
+     */
+    private static splitAtTopLevelCommas;
+    /**
+     * Default ORDER BY when the original SQL has none.
+     * SQL Server requires ORDER BY for OFFSET/FETCH. We use (SELECT NULL) as a
+     * neutral ordering that satisfies the syntax without imposing any sort.
+     */
+    private static defaultOrderBy;
+}
+//# sourceMappingURL=queryPagingEngine.d.ts.map

package/dist/generic/queryPagingEngine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryPagingEngine.d.ts","sourceRoot":"","sources":["../../src/generic/queryPagingEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,iBAAiB;IAE1B;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GAC3B,gBAAgB;IAsCnB;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAQrF;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IAkEhF;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;IA+B7F;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE;IAcxE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAO9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAQhC;;;;;;;OAOG;IACH,MAAM,CAAC,4BAA4B,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IA6CrF;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAwDlC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAkBpC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;CAQhC"}

package/dist/generic/queryPagingEngine.js

@@ -0,0 +1,335 @@
+/**
+ * Handles server-side pagination for query SQL by wrapping resolved SQL in CTEs
+ * and applying platform-specific OFFSET/FETCH or LIMIT/OFFSET clauses.
+ *
+ * Works with arbitrary SQL including pre-existing CTEs from the composition engine.
+ * The approach:
+ *   1. Parse the SQL to separate CTE prefix from the main SELECT
+ *   2. Extract and remove any ORDER BY from the main SELECT
+ *   3. Strip any TOP N clause from the main SELECT
+ *   4. Wrap the main SELECT as a new CTE (`__paged`)
+ *   5. Emit a data query with ORDER BY + platform paging
+ *   6. Emit a count query over the same CTE
+ */
+export class QueryPagingEngine {
+    /**
+     * Wraps resolved SQL with CTE-based paging for server-side pagination.
+     *
+     * @param resolvedSQL  The fully-resolved SQL (after composition + Nunjucks)
+     * @param startRow     0-based row offset
+     * @param maxRows      Maximum rows to return (page size)
+     * @param platform     Target database platform
+     * @returns DataSQL for paged results and CountSQL for total row count
+     */
+    static WrapWithPaging(resolvedSQL, startRow, maxRows, platform) {
+        // Parse the SQL into CTE prefix + main SELECT
+        const { ctePrefix, mainSelect } = QueryPagingEngine.splitCTEAndSelect(resolvedSQL);
+        // Extract ORDER BY from the main SELECT
+        const { sqlWithoutOrder, orderByClause } = QueryPagingEngine.extractOrderBy(mainSelect);
+        // Strip TOP clause from the main SELECT (SQL Server habit)
+        const { sql: cleanSelect } = QueryPagingEngine.stripTopClause(sqlWithoutOrder);
+        // Build the CTE chain: existing CTEs + __paged
+        const pagingCTEName = QueryPagingEngine.quoteIdentifier('__paged', platform);
+        const existingCTEs = ctePrefix ? ctePrefix + ',\n' : 'WITH ';
+        const cteChain = `${existingCTEs}${pagingCTEName} AS (\n${cleanSelect}\n)`;
+        // Determine ORDER BY for the outer query, remapping table-qualified
+        // references to projected column names since the outer query is
+        // SELECT * FROM [__paged] where table aliases don't exist.
+        const rawOrderBy = orderByClause || QueryPagingEngine.defaultOrderBy(platform);
+        const outerOrderBy = orderByClause
+            ? QueryPagingEngine.remapOrderByToProjectedNames(rawOrderBy, cleanSelect)
+            : rawOrderBy;
+        // Build platform-specific data query
+        const pagingClause = QueryPagingEngine.buildPagingClause(startRow, maxRows, platform);
+        const dataSQL = `${cteChain}\nSELECT * FROM ${pagingCTEName}\nORDER BY ${outerOrderBy}\n${pagingClause}`;
+        // Build count query (no ORDER BY needed)
+        const countSQL = `${cteChain}\nSELECT COUNT(*) AS TotalRowCount FROM ${pagingCTEName}`;
+        return {
+            DataSQL: dataSQL,
+            CountSQL: countSQL,
+            Offset: startRow,
+            PageSize: maxRows,
+        };
+    }
+    /**
+     * Determines whether the given params indicate paging should be applied.
+     * Paging is active when both StartRow is defined (>= 0) and MaxRows > 0.
+     */
+    static ShouldPage(startRow, maxRows) {
+        return maxRows != null && maxRows > 0 && startRow != null && startRow >= 0;
+    }
+    // ────────────────────────────────────────────────────────────────────────
+    // Internal helpers
+    // ────────────────────────────────────────────────────────────────────────
+    /**
+     * Splits SQL into a CTE prefix (everything in the WITH chain) and the main
+     * SELECT statement. Handles nested parentheses to avoid splitting inside CTEs.
+     *
+     * Returns `ctePrefix` as the full `WITH ... AS (...)` chain (no trailing comma),
+     * and `mainSelect` as the final SELECT.
+     */
+    static splitCTEAndSelect(sql) {
+        const trimmed = sql.trim();
+        // Check if SQL starts with WITH (case-insensitive)
+        if (!/^WITH\s/i.test(trimmed)) {
+            return { ctePrefix: '', mainSelect: trimmed };
+        }
+        // Walk through the SQL tracking parenthesis depth to find where CTEs end
+        // and the final SELECT begins. CTEs are: WITH name AS (...), name AS (...)
+        // The final SELECT is the statement after the last CTE closing paren + optional comma.
+        let depth = 0;
+        let lastCTEEnd = -1;
+        let i = 0;
+        // Skip past "WITH "
+        const withMatch = trimmed.match(/^WITH\s+/i);
+        if (!withMatch) {
+            return { ctePrefix: '', mainSelect: trimmed };
+        }
+        i = withMatch[0].length;
+        while (i < trimmed.length) {
+            const ch = trimmed[i];
+            if (ch === '(') {
+                depth++;
+            }
+            else if (ch === ')') {
+                depth--;
+                if (depth === 0) {
+                    lastCTEEnd = i;
+                    // Look ahead: is there a comma (another CTE) or the final SELECT?
+                    const rest = trimmed.substring(i + 1).trimStart();
+                    if (rest.startsWith(',')) {
+                        // More CTEs — advance past the comma
+                        i = trimmed.indexOf(',', i + 1) + 1;
+                        continue;
+                    }
+                    // This is the end of the CTE chain
+                    break;
+                }
+            }
+            else if (ch === "'" && depth > 0) {
+                // Skip string literals inside CTEs
+                i++;
+                while (i < trimmed.length && trimmed[i] !== "'") {
+                    if (trimmed[i] === "'" && i + 1 < trimmed.length && trimmed[i + 1] === "'") {
+                        i += 2; // escaped quote
+                    }
+                    else {
+                        i++;
+                    }
+                }
+            }
+            i++;
+        }
+        if (lastCTEEnd === -1) {
+            // Couldn't parse CTEs — treat entire thing as mainSelect
+            return { ctePrefix: '', mainSelect: trimmed };
+        }
+        const ctePrefix = trimmed.substring(0, lastCTEEnd + 1).trim();
+        const mainSelect = trimmed.substring(lastCTEEnd + 1).trim();
+        return { ctePrefix, mainSelect };
+    }
+    /**
+     * Extracts the ORDER BY clause from the end of a SQL statement.
+     * Only matches ORDER BY that is NOT inside parentheses (i.e., top-level).
+     */
+    static extractOrderBy(sql) {
+        // Find the last top-level ORDER BY
+        const upperSQL = sql.toUpperCase();
+        let depth = 0;
+        let lastOrderByPos = -1;
+        for (let i = 0; i < sql.length; i++) {
+            const ch = sql[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (depth === 0 && i + 8 <= sql.length) {
+                const slice = upperSQL.substring(i, i + 8);
+                if (slice === 'ORDER BY') {
+                    // Verify it's a word boundary (preceded by whitespace or start)
+                    if (i === 0 || /\s/.test(sql[i - 1])) {
+                        lastOrderByPos = i;
+                    }
+                }
+            }
+        }
+        if (lastOrderByPos === -1) {
+            return { sqlWithoutOrder: sql, orderByClause: null };
+        }
+        const orderByClause = sql.substring(lastOrderByPos + 9).trim(); // 9 = "ORDER BY ".length
+        const sqlWithoutOrder = sql.substring(0, lastOrderByPos).trim();
+        return { sqlWithoutOrder, orderByClause };
+    }
+    /**
+     * Strips a TOP N clause from a SELECT statement.
+     * Handles `SELECT TOP N`, `SELECT TOP (N)`, and `SELECT DISTINCT TOP N`.
+     */
+    static stripTopClause(sql) {
+        // Match SELECT [DISTINCT] TOP (N) or TOP N
+        const topRegex = /^(SELECT\s+(?:DISTINCT\s+)?)TOP\s+(?:\(\s*\d+\s*\)|\d+)\s+/i;
+        const match = sql.match(topRegex);
+        if (!match) {
+            return { sql, topRemoved: false };
+        }
+        // Replace TOP clause, keeping SELECT [DISTINCT]
+        const cleaned = match[1] + sql.substring(match[0].length);
+        return { sql: cleaned, topRemoved: true };
+    }
+    /**
+     * Quotes an identifier for the target platform.
+     */
+    static quoteIdentifier(name, platform) {
+        if (platform === 'postgresql') {
+            return `"${name}"`;
+        }
+        return `[${name}]`;
+    }
+    /**
+     * Builds the platform-specific paging clause.
+     */
+    static buildPagingClause(startRow, maxRows, platform) {
+        if (platform === 'postgresql') {
+            return `LIMIT ${maxRows} OFFSET ${startRow}`;
+        }
+        // SQL Server
+        return `OFFSET ${startRow} ROWS FETCH NEXT ${maxRows} ROWS ONLY`;
+    }
+    /**
+     * Remaps ORDER BY expressions so they reference the projected column names
+     * from the SELECT list rather than table-qualified aliases (e.g. `r.Total`
+     * becomes `TotalRevenue` if the SELECT has `r.Total AS TotalRevenue`).
+     *
+     * This is necessary because the outer query is `SELECT * FROM [__paged]`
+     * where the original table aliases no longer exist.
+     */
+    static remapOrderByToProjectedNames(orderByClause, selectSQL) {
+        const aliasMap = QueryPagingEngine.buildSelectAliasMap(selectSQL);
+        // Split ORDER BY into terms at top-level commas
+        const terms = QueryPagingEngine.splitAtTopLevelCommas(orderByClause);
+        const remapped = terms.map(term => {
+            const trimmed = term.trim();
+            // Separate direction suffix (ASC, DESC, NULLS FIRST, NULLS LAST)
+            const dirMatch = trimmed.match(/\s+(ASC|DESC)(\s+NULLS\s+(FIRST|LAST))?\s*$/i);
+            const expr = dirMatch ? trimmed.substring(0, dirMatch.index).trim() : trimmed;
+            const direction = dirMatch ? dirMatch[0] : '';
+            // Normalize whitespace for comparison
+            const normalizedExpr = expr.replace(/\s+/g, ' ').trim();
+            // 1. Try exact match against SELECT expressions
+            const exactMatch = aliasMap.get(normalizedExpr.toUpperCase());
+            if (exactMatch) {
+                return exactMatch + direction;
+            }
+            // 2. Try stripping table alias prefixes from the expression
+            //    e.g., COALESCE(rc.ChangeCount, 0) → COALESCE(ChangeCount, 0)
+            const stripped = normalizedExpr.replace(/\b[a-zA-Z_]\w*\./g, '');
+            const strippedMatch = aliasMap.get(stripped.toUpperCase());
+            if (strippedMatch) {
+                return strippedMatch + direction;
+            }
+            // 3. If expr itself is a simple table.column, strip the prefix
+            //    and check if the bare column is a projected name
+            const dotMatch = expr.match(/^[a-zA-Z_]\w*\.([a-zA-Z_]\w*)$/);
+            if (dotMatch) {
+                return dotMatch[1] + direction;
+            }
+            // 4. Fallback: strip all table prefixes and hope for the best
+            return stripped + direction;
+        });
+        return remapped.join(', ');
+    }
+    /**
+     * Parses the SELECT list from a SQL statement and builds a map of
+     * normalized expression → projected column name.
+     *
+     * For `SELECT au.Name AS UserName, COALESCE(rc.Count, 0) AS Total`
+     * returns Map { "AU.NAME" → "UserName", "COALESCE(RC.COUNT, 0)" → "Total" }
+     *
+     * Also indexes the stripped (no table prefix) versions:
+     * { "COALESCE(COUNT, 0)" → "Total", "NAME" → "UserName" }
+     */
+    static buildSelectAliasMap(selectSQL) {
+        const map = new Map();
+        // Strip leading SQL comments (-- line comments and /* block comments */)
+        const stripped = selectSQL.replace(/^(\s*(--[^\n]*\n|\/\*[\s\S]*?\*\/))*\s*/i, '');
+        // Extract the column list between SELECT [DISTINCT] and the first top-level FROM
+        const selectMatch = stripped.match(/^SELECT\s+(?:DISTINCT\s+)?/i);
+        if (!selectMatch)
+            return map;
+        const afterSelect = stripped.substring(selectMatch[0].length);
+        // Find top-level FROM
+        const upperAfter = afterSelect.toUpperCase();
+        let depth = 0;
+        let fromPos = -1;
+        for (let i = 0; i < afterSelect.length; i++) {
+            const ch = afterSelect[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (depth === 0 && i + 5 <= afterSelect.length) {
+                if (upperAfter.substring(i, i + 5) === 'FROM ' || upperAfter.substring(i, i + 5) === 'FROM\n' || upperAfter.substring(i, i + 5) === 'FROM\t') {
+                    if (i === 0 || /\s/.test(afterSelect[i - 1])) {
+                        fromPos = i;
+                        break;
+                    }
+                }
+            }
+        }
+        const columnList = fromPos === -1 ? afterSelect : afterSelect.substring(0, fromPos);
+        const items = QueryPagingEngine.splitAtTopLevelCommas(columnList);
+        for (const item of items) {
+            const trimmed = item.trim();
+            if (!trimmed)
+                continue;
+            // Check for AS alias (case insensitive, must be word-bounded)
+            const asMatch = trimmed.match(/\s+AS\s+(\[?\w+\]?)\s*$/i);
+            if (asMatch) {
+                const expr = trimmed.substring(0, asMatch.index).trim();
+                const alias = asMatch[1].replace(/[[\]]/g, ''); // strip brackets
+                const normalizedExpr = expr.replace(/\s+/g, ' ').toUpperCase();
+                map.set(normalizedExpr, alias);
+                // Also index the stripped version (no table prefixes)
+                const strippedExpr = normalizedExpr.replace(/\b[A-Z_]\w*\./g, '');
+                if (strippedExpr !== normalizedExpr) {
+                    map.set(strippedExpr, alias);
+                }
+            }
+        }
+        return map;
+    }
+    /**
+     * Splits a SQL fragment by commas that are not inside parentheses.
+     */
+    static splitAtTopLevelCommas(sql) {
+        const parts = [];
+        let depth = 0;
+        let start = 0;
+        for (let i = 0; i < sql.length; i++) {
+            const ch = sql[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (ch === ',' && depth === 0) {
+                parts.push(sql.substring(start, i));
+                start = i + 1;
+            }
+        }
+        parts.push(sql.substring(start));
+        return parts;
+    }
+    /**
+     * Default ORDER BY when the original SQL has none.
+     * SQL Server requires ORDER BY for OFFSET/FETCH. We use (SELECT NULL) as a
+     * neutral ordering that satisfies the syntax without imposing any sort.
+     */
+    static defaultOrderBy(platform) {
+        if (platform === 'postgresql') {
+            // PostgreSQL allows LIMIT/OFFSET without ORDER BY, but for consistency
+            // we still add a neutral order
+            return '1';
+        }
+        return '(SELECT NULL)';
+    }
+}
+//# sourceMappingURL=queryPagingEngine.js.map

package/dist/generic/queryPagingEngine.js.map

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

package/dist/generic/runQuery.d.ts

@@ -77,6 +77,14 @@ export type RunQueryParams = {
      * 2. Otherwise the LocalCacheManager's default TTL will be used (typically 5 minutes)
      */
     CacheLocalTTL?: number;
+    /**
+     * Optional TTL (time-to-live) in minutes for server-side caching of ad-hoc SQL queries.
+     * When set to a value > 0 and the query uses the `SQL` field (ad-hoc mode), results
+     * will be cached using a hash of the SQL string as the cache key.
+     * Subsequent identical SQL executions within the TTL window return cached results.
+     * Has no effect on saved queries (they use QueryInfo.CacheConfig instead).
+     */
+    AdhocCacheTTLMinutes?: number;
 };
 /**
  * Class used to run a query and return the results.

package/dist/generic/runQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runQuery.d.ts","sourceRoot":"","sources":["../../src/generic/runQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAE5B;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED;;;;GAIG;AACH,qBAAa,QAAQ;IACjB,OAAO,CAAC,SAAS,CAA2B;IAC5C;;OAEG;gBACS,QAAQ,GAAE,iBAAiB,GAAG,IAAW;IAIrD;;;;OAIG;IACH,IAAW,aAAa,IAAI,iBAAiB,CAE5C;IACD;;;;;;;;OAQG;IACU,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC;IAK9F;;;;;;;OAOG;IACU,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAKpG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAiC;IAClE;;;;;OAKG;IACH,WAAkB,QAAQ,IAAI,iBAAiB,CAM9C;IACD;;;;;OAKG;IACH,WAAkB,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAMlD;CAEJ"}
+{"version":3,"file":"runQuery.d.ts","sourceRoot":"","sources":["../../src/generic/runQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAE5B;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAChC,CAAA;AAED;;;;GAIG;AACH,qBAAa,QAAQ;IACjB,OAAO,CAAC,SAAS,CAA2B;IAC5C;;OAEG;gBACS,QAAQ,GAAE,iBAAiB,GAAG,IAAW;IAIrD;;;;OAIG;IACH,IAAW,aAAa,IAAI,iBAAiB,CAE5C;IACD;;;;;;;;OAQG;IACU,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC;IAK9F;;;;;;;OAOG;IACU,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,WAAW,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAKpG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAiC;IAClE;;;;;OAKG;IACH,WAAkB,QAAQ,IAAI,iBAAiB,CAM9C;IACD;;;;;OAKG;IACH,WAAkB,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAMlD;CAEJ"}

package/dist/generic/runQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"runQuery.js","sourceRoot":"","sources":["../../src/generic/runQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAqFlD;;;;GAIG;AACH,MAAM,OAAO,QAAQ;IAEjB;;OAEG;IACH,YAAY,WAAqC,IAAI;QACjD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC;IAC/C,CAAC;IACD;;;;;;;;OAQG;IACI,KAAK,CAAC,QAAQ,CAAC,MAAsB,EAAE,WAAsB;QAChE,qFAAqF;QACrF,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,UAAU,CAAC,MAAwB,EAAE,WAAsB;QACpE,qFAAqF;QACrF,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;aAEc,uBAAkB,GAAW,qBAAqB,CAAC;IAClE;;;;;OAKG;IACI,MAAM,KAAK,QAAQ;QACtB,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QACnD,IAAI,CAAC;YACD,OAAO,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;;YAEtC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtF,CAAC;IACD;;;;;OAKG;IACI,MAAM,KAAK,QAAQ,CAAC,KAAwB;QAC/C,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QACnD,IAAI,CAAC;YACD,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;;YAEvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtF,CAAC"}
+{"version":3,"file":"runQuery.js","sourceRoot":"","sources":["../../src/generic/runQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AA8FlD;;;;GAIG;AACH,MAAM,OAAO,QAAQ;IAEjB;;OAEG;IACH,YAAY,WAAqC,IAAI;QACjD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,IAAW,aAAa;QACpB,OAAO,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC;IAC/C,CAAC;IACD;;;;;;;;OAQG;IACI,KAAK,CAAC,QAAQ,CAAC,MAAsB,EAAE,WAAsB;QAChE,qFAAqF;QACrF,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,UAAU,CAAC,MAAwB,EAAE,WAAsB;QACpE,qFAAqF;QACrF,OAAO,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;aAEc,uBAAkB,GAAW,qBAAqB,CAAC;IAClE;;;;;OAKG;IACI,MAAM,KAAK,QAAQ;QACtB,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QACnD,IAAI,CAAC;YACD,OAAO,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;;YAEtC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtF,CAAC;IACD;;;;;OAKG;IACI,MAAM,KAAK,QAAQ,CAAC,KAAwB;QAC/C,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QACnD,IAAI,CAAC;YACD,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;;YAEvC,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IACtF,CAAC"}

package/dist/index.d.ts

@@ -16,11 +16,13 @@ export * from "./generic/logging.js";
 export * from "./generic/queryInfo.js";
 export * from "./generic/queryInfoInterfaces.js";
 export * from "./generic/queryCompositionEngine.js";
+export * from "./generic/queryPagingEngine.js";
 export * from "./generic/querySQLFilters.js";
 export * from "./generic/runQuerySQLFilterImplementations.js";
 export * from "./generic/libraryInfo.js";
 export * from "./generic/QueryCacheConfig.js";
 export * from "./generic/QueryCache.js";
+export * from "./generic/QueryCacheManager.js";
 export * from "./generic/explorerNavigationItem.js";
 export * from "./generic/compositeKey.js";
 export * from "./generic/authEvaluator.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AAEvC,wBAAgB,WAAW,CAAC,QAAQ,KAAA,QAMnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AAEvC,wBAAgB,WAAW,CAAC,QAAQ,KAAA,QAMnC"}

package/dist/index.js

@@ -21,11 +21,13 @@ export * from "./generic/logging.js";
 export * from "./generic/queryInfo.js";
 export * from "./generic/queryInfoInterfaces.js";
 export * from "./generic/queryCompositionEngine.js";
+export * from "./generic/queryPagingEngine.js";
 export * from "./generic/querySQLFilters.js";
 export * from "./generic/runQuerySQLFilterImplementations.js";
 export * from "./generic/libraryInfo.js";
 export * from "./generic/QueryCacheConfig.js";
 export * from "./generic/QueryCache.js";
+export * from "./generic/QueryCacheManager.js";
 export * from "./generic/explorerNavigationItem.js";
 export * from "./generic/compositeKey.js";
 export * from "./generic/authEvaluator.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AAEvC,MAAM,UAAU,WAAW,CAAC,QAAQ;IAChC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC/B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC9B,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACjC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,4BAA4B,CAAC;AAE3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,wBAAwB,CAAC;AAEvC,MAAM,UAAU,WAAW,CAAC,QAAQ;IAChC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC/B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC9B,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;AACjC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@memberjunction/core",
   "type": "module",
-  "version": "5.11.0",
+  "version": "5.12.0",
   "description": "MemberJunction: Core Library including Metadata, Application, Entity Retrieval and Manipulation, and Utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@memberjunction/global": "5.11.0",
+    "@memberjunction/global": "5.12.0",
     "rxjs": "^7.8.2",
     "zod": "~3.24.4",
     "debug": "^4.4.3"