@memberjunction/generic-database-provider 5.28.0 → 5.30.0

package/dist/queryCompositionEngine.d.ts

@@ -187,6 +187,13 @@ export declare class QueryCompositionEngine {
      * `__tests__/skip-failure-regressions.test.ts` and `SKIP-QUERY-RENDERING-BUGS.md`.
      */
     private assembleCTEs;
+    /**
+     * Validates that no CTE body still contains an illegal top-level ORDER BY
+     * after stripping. Throws a diagnostic error with the dep name, category
+     * path, and specific reason — replacing the cryptic SQL Server error
+     * "The ORDER BY clause is invalid in views, inline functions...".
+     */
+    private validateCTEBodies;
     /**
      * Strips the surrounding bracket / quote characters from a CTE name so we
      * can compare names case-insensitively across quoting styles. `[Foo]`,
@@ -194,29 +201,22 @@ export declare class QueryCompositionEngine {
      */
     private canonicalCTEName;
     /**
-     * Walks `innerCTEDefinitions` (each formatted as `Name AS (\nbody\n)` by
-     * `extractCTEsViaRegex`/`extractCTEsViaAST`) and ensures every CTE name is
-     * unique across the assembled WITH. When a collision is detected, the inner
-     * CTE is renamed (`Name` → `Name__2`, `__3`, …) and the new name is
-     * substituted everywhere the original was referenced — both in subsequent
-     * inner CTE bodies (siblings can reference each other) and in the dep's
-     * main SELECT.
+     * Deconflicts inner CTE names using a SymbolTable for name allocation.
+     * The SymbolTable guarantees uniqueness at registration time — name
+     * collisions become impossible by construction.
      *
-     * NOTE (Phase 0 trade-off): reference rewriting is a word-boundary regex
-     * over raw SQL. It does NOT skip string literals or comments. Real
-     * dependencies' inner-CTE names are unlikely to appear as quoted text or
-     * column aliases, so this is acceptable for the immediate fix; the
-     * IR-based redesign (see plans/query-rendering-pipeline-redesign.md)
-     * replaces this with a structured walk.
+     * Reference rewriting uses word-boundary regex over raw SQL. It does
+     * NOT skip string literals or comments — inner-CTE names are unlikely
+     * to appear as quoted text or column aliases in practice.
      */
-    private deconflictInnerCTEs;
+    private deconflictInnerCTEsViaSymbolTable;
     /**
      * Replaces every reference to `oldName` (bare, [bracketed], or "quoted")
      * with bare `newName`. Case-insensitive. Word-boundary matched so
      * `MyAcronymBridge` is not affected by renaming `AcronymBridge`.
      *
      * Does not attempt to skip string literals or comments — see the note on
-     * `deconflictInnerCTEs` for the trade-off rationale.
+     * `deconflictInnerCTEsViaSymbolTable` for the trade-off rationale.
      */
     private renameSQLIdentifier;
     /**
@@ -227,7 +227,7 @@ export declare class QueryCompositionEngine {
      * AST parsing fails (e.g. SQL contains Nunjucks template tokens).
      *
      * @param sql SQL starting with a WITH clause
-     * @param platform Database platform, used to select the AST dialect
+     * @param dialect SQL dialect for AST parsing
      */
     private hoistInnerCTEs;
     /**
@@ -236,85 +236,20 @@ export declare class QueryCompositionEngine {
      * SQL Server disallows ORDER BY inside CTEs unless TOP, OFFSET, or FOR XML is present.
      * PostgreSQL allows ORDER BY in CTEs, so no stripping is needed there.
      *
-     * Uses a 4-tier strategy:
-     * 1. Fast exit — no ORDER keyword at all, or dialect allows ORDER BY in CTEs
-     * 2. AST path — parse (with Nunjucks preprocessing if needed), check if ORDER BY is legal
-     *    (TOP/OFFSET/FOR XML via AST nodes), null out orderby if not, regenerate.
-     *    Handles window functions, UNION/EXCEPT, subqueries, string literals, and Nunjucks templates.
-     * 3. Regex fallback — paren-depth heuristic for SQL the parser still can't handle
-     *    (e.g. STRING_AGG WITHIN GROUP)
-     * 4. OFFSET 0 ROWS injection — last resort when both AST and regex fail to strip ORDER BY.
-     *    Injects OFFSET 0 ROWS after the ORDER BY clause to make it legal in CTEs.
-     *    This is semantically neutral (returns all rows starting from 0) but switches
-     *    SQL Server into paging mode internally, which may affect query plan shape.
-     */
-    private stripTrailingOrderBy;
-    /**
-     * Attempts to strip the top-level ORDER BY clause using AST parsing.
-     * Tries direct parsing first, then MJPlaceholder-preprocessed parsing if the SQL
-     * contains MJ template syntax. Handles UNION/EXCEPT by walking the _next chain.
-     */
-    private stripOrderByViaAST;
-    /**
-     * Core AST stripping: parse, analyze, and regenerate SQL without ORDER BY.
-     */
-    private tryASTStrip;
-    /**
-     * Walks the _next chain (UNION/EXCEPT/INTERSECT) to find the statement
-     * that carries the ORDER BY clause.
-     */
-    private findOrderByStatement;
-    /**
-     * Nunjucks-aware ORDER BY stripping: preprocess templates into placeholder SQL,
-     * parse with AST to confirm top-level ORDER BY exists, then use the position-aware
-     * scanner on the original SQL to strip only the last top-level ORDER BY.
-     */
-    private tryNunjucksAwareStrip;
-    /**
-     * Checks AST properties to determine if ORDER BY is legal in a CTE context.
-     */
-    private isOrderByLegalInCTE;
-    /**
-     * Strips the last top-level ORDER BY clause using position-aware scanning.
-     * Skips strings, comments, Nunjucks tags, and tracks paren depth.
-     */
-    private stripLastTopLevelOrderBy;
-    /**
-     * Finds character positions of all ORDER BY keywords at the outermost level
-     * (paren depth 0, not inside strings, comments, or MJ template tokens).
+     * Delegates to the shared `AnalyzeTopLevelOrderBy` utility (orderByAnalyzer.ts)
+     * which implements a 2-tier strategy:
+     *   Tier 1: AST parsing (with Nunjucks preprocessing if needed)
+     *   Tier 2: MJLexer scanner with carried lexical state across token boundaries
      *
-     * Uses MJLexer to skip MJ tokens ({{ }}, {% %}, {# #}), then scans only
-     * SQL_TEXT segments for ORDER BY keywords while tracking paren depth and
-     * respecting SQL string literals and comments.
+     * When both tiers fail to strip, falls back to OFFSET 0 ROWS injection as
+     * a last resort (semantically neutral but makes ORDER BY legal in CTEs).
      */
-    private findTopLevelOrderByPositions;
-    /**
-     * Preprocesses Nunjucks templates into valid SQL for AST parsing.
-     * Uses MJPlaceholderSubstitution for context-aware placeholder generation.
-     */
-    private preprocessNunjucks;
+    private stripTrailingOrderBy;
     /**
      * Injects OFFSET 0 ROWS after the last top-level ORDER BY clause to make it
-     * legal in a CTE without changing the result set. Uses the position-aware scanner
-     * to find the correct insertion point after the ORDER BY columns.
+     * legal in a CTE without changing the result set.
      */
     private injectOffset0Rows;
-    /**
-     * Position-aware fallback for stripping the last top-level ORDER BY clause.
-     * Delegates to `stripLastTopLevelOrderBy`, which uses MJLexer to skip MJ
-     * template tokens, then scans only SQL_TEXT segments while respecting paren
-     * depth, single-quoted string literals, line comments (--), and block
-     * comments (/* … *​/).
-     *
-     * The previous regex-only implementation matched any literal "ORDER BY" in
-     * the SQL — including text inside leading block comments like
-     * `/* No ORDER BY / TOP — composable. *​/` — and truncated the dep body
-     * mid-comment, producing illegal SQL ("Incorrect syntax near '('").
-     * Skip-Brain hit this against multiple AGRiP composition deps. See
-     * `__tests__/skip-failure-regressions.test.ts` and
-     * `SKIP-QUERY-RENDERING-BUGS.md` (Bug A) at the repo root.
-     */
-    private stripOrderByViaRegex;
     /**
      * Strips SQL comments from the input string so that composition tokens
      * inside comments are not treated as real references.
@@ -322,16 +257,6 @@ export declare class QueryCompositionEngine {
      * Preserves string literals (single-quoted) to avoid stripping inside them.
      */
     private stripSQLComments;
-    /**
-     * Escapes {{ and }} inside SQL comments so that Nunjucks doesn't try to parse them.
-     * This is needed because dependency queries may carry comments containing
-     * {{query:"..."}} examples or documentation that would otherwise cause
-     * Nunjucks "expected variable end" errors.
-     *
-     * Only modifies content inside -- single-line and block comments.
-     * Leaves string literals and normal SQL untouched.
-     */
-    escapeTemplateTokensInComments(sql: string): string;
 }
 export {};
 //# sourceMappingURL=queryCompositionEngine.d.ts.map

package/dist/queryCompositionEngine.d.ts.map

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