linkgress-orm 0.4.76 → 0.4.79

package/dist/query/sql-utils.d.ts

@@ -1,5 +1,17 @@
 import type { TableSchema } from '../schema/table-builder';
 export declare const renumberPlaceholders: (sqlText: string, offset: number) => string;
+/**
+ * True when the SQL fragment contains a bare `$N` placeholder OUTSIDE quoted
+ * segments and comments — i.e. one {@link renumberPlaceholders} would rebind.
+ * Same quote/comment-aware scan, so `'literal $1 inside quotes'` and a `$1`
+ * sitting in a `--` comment stay invisible.
+ *
+ * Reads the regex's NAMED `digits` group rather than a positional index: the
+ * token classes of QUOTED_OR_PLACEHOLDER have grown before (comments were
+ * added after the literals), and a positional check silently points at the
+ * wrong group when that happens.
+ */
+export declare const hasBarePlaceholder: (sqlText: string) => boolean;
 /**
  * Column configuration extracted from schema
  */

package/dist/query/sql-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-utils.d.ts","sourceRoot":"","sources":["../../src/query/sql-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA0B3D,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,MAGpE,CAAC;AAEJ;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QACP,QAAQ,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;QAC9B,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAIjE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAIpE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAMxF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,GAAG,GAAG,CAKzE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,GAAG,GAAG,CAI3E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,EAAE,CAS/D;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAW3F;AAED;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAMR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,oBAAoB,GAAE,OAAe,GACpC,YAAY,EAAE,CAoBhB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAChC,MAAM,EAAE,WAAW,EACnB,oBAAoB,GAAE,OAAe,GACpC,MAAM,EAAE,CAoCV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAChC,aAAa,EAAE,YAAY,EAAE,EAC7B,eAAe,GAAE,MAAU,GAC1B,kBAAkB,CAuBpB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,MAAM,EAAE,EACvB,MAAM,EAAE,WAAW,EACnB,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAoCR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAO3E;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO7E"}
+{"version":3,"file":"sql-utils.d.ts","sourceRoot":"","sources":["../../src/query/sql-utils.ts"],"names":[],"mappings":"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"}

package/dist/query/sql-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.POSTGRES_MAX_PARAMS = exports.renumberPlaceholders = void 0;
+exports.POSTGRES_MAX_PARAMS = exports.hasBarePlaceholder = exports.renumberPlaceholders = void 0;
 exports.getQualifiedTableName = getQualifiedTableName;
 exports.buildReturningColumnList = buildReturningColumnList;
 exports.buildColumnNamesList = buildColumnNamesList;
@@ -37,9 +37,29 @@ exports.getDbColumnName = getDbColumnName;
  * Shared by QueryBatch, MutationBatch and insertWithChildren for cross-leg
  * parameter renumbering.
  */
-const QUOTED_OR_PLACEHOLDER = /('(?:[^']|'')*')|("(?:[^"]|"")*")|(--[^\n]*)|(\/\*[\s\S]*?\*\/)|\$(\d+)/g;
+const QUOTED_OR_PLACEHOLDER = /('(?:[^']|'')*')|("(?:[^"]|"")*")|(--[^\n]*)|(\/\*[\s\S]*?\*\/)|\$(?<digits>\d+)/g;
 const renumberPlaceholders = (sqlText, offset) => sqlText.replace(QUOTED_OR_PLACEHOLDER, (match, _single, _dbl, _lineComment, _blockComment, digits) => digits !== undefined ? `$${Number(digits) + offset}` : match);
 exports.renumberPlaceholders = renumberPlaceholders;
+/**
+ * True when the SQL fragment contains a bare `$N` placeholder OUTSIDE quoted
+ * segments and comments — i.e. one {@link renumberPlaceholders} would rebind.
+ * Same quote/comment-aware scan, so `'literal $1 inside quotes'` and a `$1`
+ * sitting in a `--` comment stay invisible.
+ *
+ * Reads the regex's NAMED `digits` group rather than a positional index: the
+ * token classes of QUOTED_OR_PLACEHOLDER have grown before (comments were
+ * added after the literals), and a positional check silently points at the
+ * wrong group when that happens.
+ */
+const hasBarePlaceholder = (sqlText) => {
+    for (const match of sqlText.matchAll(QUOTED_OR_PLACEHOLDER)) {
+        if (match.groups?.digits !== undefined) {
+            return true;
+        }
+    }
+    return false;
+};
+exports.hasBarePlaceholder = hasBarePlaceholder;
 /**
  * Get qualified table name with schema prefix if specified
  */

package/dist/query/sql-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql-utils.js","sourceRoot":"","sources":["../../src/query/sql-utils.ts"],"names":[],"mappings":";;;AAyDA,sDAIC;AAKD,4DAIC;AAKD,oDAMC;AAKD,kDAKC;AAKD,sDAIC;AAKD,8CASC;AAKD,gEAWC;AAUD,8DASC;AAKD,gDAwBC;AAOD,0DAwCC;AAKD,8CA2BC;AAKD,kDA0CC;AAKD,gDAOC;AAKD,0CAOC;AAtUD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,qBAAqB,GAAG,0EAA0E,CAAC;AAElG,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,MAAc,EAAU,EAAE,CAC9E,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,CACnG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAC7D,CAAC;AAHS,QAAA,oBAAoB,wBAG7B;AAyBJ;;GAEG;AACH,SAAgB,qBAAqB,CAAC,MAAmB;IACvD,OAAO,MAAM,CAAC,MAAM;QAClB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,MAAM,MAAM,CAAC,IAAI,GAAG;QACvC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC;AACzB,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CAAC,MAAmB;IAC1D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,IAAK,GAAW,CAAC,KAAK,EAAE,CAAC,IAAI,GAAG,CAAC;SACnD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAgB,oBAAoB,CAAC,MAAmB,EAAE,UAAoB;IAC5E,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,KAAU,EAAE,MAAoB;IAClE,MAAM,eAAe,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3D,OAAO,MAAM,CAAC,MAAM;QAClB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QACzC,CAAC,CAAC,eAAe,CAAC;AACtB,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB,CAAC,KAAU,EAAE,MAAoB;IACpE,OAAO,MAAM,CAAC,MAAM;QAClB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;QACjC,CAAC,CAAC,KAAK,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,MAAmB;IACnD,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,MAAM,SAAS,GAAI,UAAkB,CAAC,KAAK,EAAE,CAAC;QAC9C,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;YACzB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B,CAAC,MAAmB,EAAE,QAAkB;IAChF,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,SAAS,GAAI,MAAc,CAAC,KAAK,EAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACU,QAAA,mBAAmB,GAAG,KAAK,CAAC;AAEzC;;GAEG;AACH,SAAgB,yBAAyB,CACvC,WAAmB,EACnB,eAAwB;IAExB,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,2BAAmB,GAAG,WAAW,CAAC,CAAC;IACtE,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC,CAAC,4BAA4B;AACxE,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAChC,MAAmB,EACnB,QAAkB,EAClB,uBAAgC,KAAK;IAErC,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,oBAAoB,EAAE,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC;oBACX,QAAQ;oBACR,MAAM,EAAE,MAAM,CAAC,IAAI;oBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,aAAa,EAAE,MAAM,CAAC,aAAa;iBACpC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,SAAgC,EAChC,MAAmB,EACnB,uBAAgC,KAAK;IAErC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,gEAAgE;IAChE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,iEAAiE;QACjE,IAAI,MAAM,CAAC,aAAa,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAClD,SAAS;QACX,CAAC;QAED,uEAAuE;QACvE,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC;QAExE,oFAAoF;QACpF,IAAI,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1E,SAAS;QACX,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,SAAgC,EAChC,aAA6B,EAC7B,kBAA0B,CAAC;IAE3B,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,UAAU,GAAG,eAAe,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAa,EAAE,CAAC;QAErC,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,WAAW,GAAG,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACvD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzB,eAAe,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,YAAY,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,OAAO;QACL,YAAY;QACZ,MAAM;QACN,cAAc,EAAE,UAAU;KAC3B,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CACjC,eAAyB,EACzB,aAAuB,EACvB,MAAmB,EACnB,WAAoB,EACpB,QAAiB;IAEjB,IAAI,GAAG,GAAG,cAAc,CAAC;IAEzB,0BAA0B;IAC1B,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC;QAC/B,OAAO,IAAI,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC;IAClC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,GAAG,IAAI,KAAK,YAAY,GAAG,CAAC;IAE5B,sBAAsB;IACtB,IAAI,WAAW,EAAE,CAAC;QAChB,GAAG,IAAI,UAAU,WAAW,EAAE,CAAC;IACjC,CAAC;IAED,gBAAgB;IAChB,GAAG,IAAI,iBAAiB,CAAC;IAEzB,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,8DAA8D;YAC9D,OAAO,IAAI,GAAG,iBAAiB,GAAG,GAAG,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,IAAI,MAAM,CAAC,IAAI,iBAAiB,MAAM,CAAC,IAAI,GAAG,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE9B,mBAAmB;IACnB,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,IAAI,UAAU,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,MAAmB;IACpD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;IACtC,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACpE,MAAM,MAAM,GAAI,UAAkB,CAAC,KAAK,EAAE,CAAC;QAC3C,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe,CAAC,MAAmB,EAAE,QAAgB;IACnE,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"sql-utils.js","sourceRoot":"","sources":["../../src/query/sql-utils.ts"],"names":[],"mappings":"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"}

package/dist/query/strategies/lateral-collection-strategy.d.ts

@@ -1,5 +1,14 @@
 import { ICollectionStrategy, CollectionStrategyType, CollectionAggregationConfig, CollectionAggregationResult } from '../collection-strategy.interface';
 import { QueryContext } from '../query-builder';
+/**
+ * The LateralSqlCache key of an aggregation: every input `LateralCollectionStrategy.render` and
+ * its helpers read, in order — the alias inputs (counter, relation, tables), the correlation
+ * columns, the clause TEXT (which already carries the `$n` placeholder numbering), the scalar
+ * flags and limits, both navigation-join lists with their alias-map resolution, and the
+ * projection. Parameter VALUES never enter the strategy and never enter the key. Built by plain
+ * concatenation (a rope V8 flattens once, on the lookup) — cheaper than an array join.
+ */
+export declare const lateralShapeKey: (config: CollectionAggregationConfig, context: QueryContext) => string;
 /**
  * LATERAL JOIN-based collection strategy
  *
@@ -57,6 +66,8 @@ export declare class LateralCollectionStrategy implements ICollectionStrategy {
      */
     private buildParentCorrelation;
     buildAggregation(config: CollectionAggregationConfig, context: QueryContext): CollectionAggregationResult;
+    /** The uncached rendering behind {@link buildAggregation}. */
+    private render;
     /**
      * Check if we can use a correlated subquery instead of LATERAL
      * This is more efficient for simple cases without LIMIT/OFFSET/ORDER BY
@@ -69,10 +80,24 @@ export declare class LateralCollectionStrategy implements ICollectionStrategy {
      */
     private buildCorrelatedSubqueryAggregation;
     /**
-     * Helper to collect nested CTE/LATERAL joins from selected fields
-     * These are joins to CTEs or LATERAL subqueries created for nested collections
+     * Rewrites the collection marker alias (`"__collection_<table>__".`) to the lateral's inner
+     * alias. The regex pass runs only when the marker is present at all.
+     */
+    private rewriteMarker;
+    /**
+     * One select-list entry for a leaf field. A bare quoted column (`"col"`, no dot, no inner
+     * quote) is qualified with the inner alias; anything else has the marker rewritten and is
+     * aliased unless it already renders as exactly `"<alias>"`.
+     */
+    private renderLeafSelect;
+    /**
+     * Renders the selected fields in ONE recursive pass: returns the `json_build_object(...)` text
+     * of this level and appends the flattened inner select list and the nested lateral joins to
+     * `out` (same order as the three separate walks this replaces — depth first, own join before
+     * the nested ones). No intermediate arrays: the select list of a wide collection projection was
+     * three allocations per field and three joins per statement.
      */
-    private collectNestedCteJoins;
+    private renderFields;
     /**
      * Build navigation JOINs SQL for multi-level navigation in collection queries
      */

package/dist/query/strategies/lateral-collection-strategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lateral-collection-strategy.d.ts","sourceRoot":"","sources":["../../../src/query/strategies/lateral-collection-strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,2BAA2B,EAG5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACnE,OAAO,IAAI,sBAAsB;IAIjC,iBAAiB,IAAI,OAAO;IAK5B;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,sBAAsB;IAa9B,gBAAgB,CACd,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,YAAY,GACpB,2BAA2B;IAgE9B;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAsBhC;;;;OAIG;IACH,OAAO,CAAC,kCAAkC;IA4H1C;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;;;;OAOG;IACH,OAAO,CAAC,6BAA6B;IAwDrC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmJ7B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAoHlC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAwF7B;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAuE/B"}
+{"version":3,"file":"lateral-collection-strategy.d.ts","sourceRoot":"","sources":["../../../src/query/strategies/lateral-collection-strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,2BAA2B,EAG5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AA4ChD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,2BAA2B,EAAE,SAAS,YAAY,KAAG,MAc5F,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACnE,OAAO,IAAI,sBAAsB;IAIjC,iBAAiB,IAAI,OAAO;IAK5B;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,sBAAsB;IAa9B,gBAAgB,CACd,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,YAAY,GACpB,2BAA2B;IAqC9B,8DAA8D;IAC9D,OAAO,CAAC,MAAM;IAmEd;;;OAGG;IACH,OAAO,CAAC,wBAAwB;IAsBhC;;;;OAIG;IACH,OAAO,CAAC,kCAAkC;IA4H1C;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;;;;;OAMG;IACH,OAAO,CAAC,YAAY;IAqBpB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;;;;OAOG;IACH,OAAO,CAAC,6BAA6B;IA0DrC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA6D7B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IA+ClC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAwF7B;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAuE/B"}

package/dist/query/strategies/lateral-collection-strategy.js

@@ -1,8 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LateralCollectionStrategy = void 0;
+exports.LateralCollectionStrategy = exports.lateralShapeKey = void 0;
 const query_utils_1 = require("../query-utils");
 const join_utils_1 = require("../join-utils");
+const lateral_sql_cache_1 = require("../lateral-sql-cache");
+/** Key-part separator: a control character no alias, column name or SQL text contains. */
+const KEY_SEP = String.fromCharCode(1);
+/** A column list as one key part; the one-column case (nearly every FK) needs no join allocation. */
+const listKey = (list) => (list === undefined ? '' : list.length === 1 ? list[0] : list.join(','));
+/** Appends what `buildNavigationJoinsWithAlias` reads from each join, including the alias-map resolution of its source. */
+const appendNavigationJoinsKey = (key, joins, aliasMap) => {
+    if (!joins) {
+        return key + '-' + KEY_SEP;
+    }
+    key += joins.length + KEY_SEP;
+    for (const join of joins) {
+        key += join.alias + KEY_SEP + join.targetTable + KEY_SEP + (join.targetSchema ?? '') + KEY_SEP
+            + listKey(join.foreignKeys) + KEY_SEP + listKey(join.matches) + KEY_SEP + (join.isMandatory ? 'I' : 'L') + KEY_SEP
+            + join.sourceAlias + KEY_SEP + (aliasMap?.get(join.sourceAlias) ?? '') + KEY_SEP;
+    }
+    return key;
+};
+/** Appends the projection: aliases, expressions, nesting, and nested laterals by memo id (or by text when not memoised). */
+const appendFieldsKey = (key, fields) => {
+    key += '[' + fields.length + KEY_SEP;
+    for (const field of fields) {
+        key += field.alias + KEY_SEP + (field.expression ?? '') + KEY_SEP + (field.isColumn === true ? 'c' : 'e') + KEY_SEP;
+        if (field.nestedCteJoin) {
+            key += field.nestedCteJoin.cteName + KEY_SEP + (field.nestedCteJoin.memoId ? '#' + field.nestedCteJoin.memoId : field.nestedCteJoin.joinClause) + KEY_SEP;
+        }
+        key = field.nested ? appendFieldsKey(key, field.nested) : key + '-' + KEY_SEP;
+    }
+    return key + ']' + KEY_SEP;
+};
+/**
+ * The LateralSqlCache key of an aggregation: every input `LateralCollectionStrategy.render` and
+ * its helpers read, in order — the alias inputs (counter, relation, tables), the correlation
+ * columns, the clause TEXT (which already carries the `$n` placeholder numbering), the scalar
+ * flags and limits, both navigation-join lists with their alias-map resolution, and the
+ * projection. Parameter VALUES never enter the strategy and never enter the key. Built by plain
+ * concatenation (a rope V8 flattens once, on the lookup) — cheaper than an array join.
+ */
+const lateralShapeKey = (config, context) => {
+    const aliasMap = context.lateralTableAliasMap;
+    let key = config.counter + KEY_SEP + config.relationName + KEY_SEP + config.targetTable + KEY_SEP + config.foreignKey + KEY_SEP
+        + listKey(config.foreignKeys) + KEY_SEP + listKey(config.matches) + KEY_SEP + (config.foreignKeyTableAlias ?? '') + KEY_SEP
+        + config.sourceTable + KEY_SEP + (aliasMap?.get(config.sourceTable) ?? '') + KEY_SEP
+        + (config.whereClause ?? '') + KEY_SEP + (config.orderByClause ?? '') + KEY_SEP + (config.orderByClauseAlias ?? '') + KEY_SEP
+        + (config.limitValue ?? '') + KEY_SEP + (config.offsetValue ?? '') + KEY_SEP
+        + (config.isDistinct === true ? 'D' : '') + (config.isSingleResult === true ? 'S' : '') + (config.useJsonArrayAggregation === true ? 'J' : '') + KEY_SEP
+        + config.aggregationType + KEY_SEP + (config.aggregateField ?? '') + KEY_SEP + (config.aggregateExpression ?? '') + KEY_SEP
+        + (config.arrayField ?? '') + KEY_SEP + config.defaultValue + KEY_SEP;
+    key = appendNavigationJoinsKey(key, config.navigationJoins, aliasMap);
+    key = appendNavigationJoinsKey(key, config.selectorNavigationJoins, aliasMap);
+    return appendFieldsKey(key, config.selectedFields);
+};
+exports.lateralShapeKey = lateralShapeKey;
 /**
  * LATERAL JOIN-based collection strategy
  *
@@ -71,6 +124,38 @@ class LateralCollectionStrategy {
         return `"${fkTableAlias}"."${foreignKey}" = "${sourceAlias}"."id"`;
     }
     buildAggregation(config, context) {
+        // Memoised per shape (see LateralSqlCache): the rendering below reads nothing but the
+        // config and the enclosing alias map, and mutates neither, so a hit is a pure lookup.
+        if (!lateral_sql_cache_1.LateralSqlCache.isEnabled()) {
+            return this.render(config, context);
+        }
+        const key = (0, exports.lateralShapeKey)(config, context);
+        const hit = lateral_sql_cache_1.LateralSqlCache.get(key);
+        if (hit) {
+            return {
+                sql: hit.sql,
+                params: context.allParams,
+                tableName: hit.tableName,
+                joinClause: hit.joinClause,
+                selectExpression: hit.selectExpression,
+                isCTE: false,
+                memoId: hit.id,
+            };
+        }
+        const rendered = this.render(config, context);
+        const entry = lateral_sql_cache_1.LateralSqlCache.store(key, {
+            sql: rendered.sql,
+            joinClause: rendered.joinClause,
+            selectExpression: rendered.selectExpression,
+            tableName: rendered.tableName,
+        });
+        if (entry.id > 0) {
+            rendered.memoId = entry.id;
+        }
+        return rendered;
+    }
+    /** The uncached rendering behind {@link buildAggregation}. */
+    render(config, context) {
         const lateralAlias = `lateral_${config.counter}`;
         // Optimization: For simple aggregations without LIMIT/OFFSET/ORDER BY,
         // use a correlated subquery in SELECT instead of LATERAL JOIN.
@@ -264,20 +349,60 @@ WHERE ${whereSQL})`;
         };
     }
     /**
-     * Helper to collect nested CTE/LATERAL joins from selected fields
-     * These are joins to CTEs or LATERAL subqueries created for nested collections
+     * Rewrites the collection marker alias (`"__collection_<table>__".`) to the lateral's inner
+     * alias. The regex pass runs only when the marker is present at all.
      */
-    collectNestedCteJoins(fields) {
-        const joins = [];
+    rewriteMarker(expression, targetTable, innerTableAlias) {
+        if (!expression.includes('"__collection_')) {
+            return expression;
+        }
+        return expression.replace((0, query_utils_1.collectionMarkerPattern)(targetTable, true), '"' + innerTableAlias + '".');
+    }
+    /**
+     * One select-list entry for a leaf field. A bare quoted column (`"col"`, no dot, no inner
+     * quote) is qualified with the inner alias; anything else has the marker rewritten and is
+     * aliased unless it already renders as exactly `"<alias>"`.
+     */
+    renderLeafSelect(expression, fullAlias, targetTable, innerTableAlias) {
+        const length = expression.length;
+        const isSimpleColumn = length > 2
+            && expression.charCodeAt(0) === 34
+            && expression.charCodeAt(length - 1) === 34
+            && expression.indexOf('"', 1) === length - 1
+            && expression.indexOf('.') === -1;
+        if (isSimpleColumn) {
+            return '"' + innerTableAlias + '".' + expression + ' as "' + fullAlias + '"';
+        }
+        const rewritten = this.rewriteMarker(expression, targetTable, innerTableAlias);
+        return rewritten === '"' + fullAlias + '"' ? rewritten : rewritten + ' as "' + fullAlias + '"';
+    }
+    /**
+     * Renders the selected fields in ONE recursive pass: returns the `json_build_object(...)` text
+     * of this level and appends the flattened inner select list and the nested lateral joins to
+     * `out` (same order as the three separate walks this replaces — depth first, own join before
+     * the nested ones). No intermediate arrays: the select list of a wide collection projection was
+     * three allocations per field and three joins per statement.
+     */
+    renderFields(fields, prefix, targetTable, innerTableAlias, out) {
+        let json = '';
         for (const field of fields) {
+            const alias = field.alias;
+            const fullAlias = prefix ? prefix + '__' + alias : alias;
             if (field.nestedCteJoin) {
-                joins.push(field.nestedCteJoin.joinClause);
+                out.joins += (out.joins ? '\n  ' : '') + field.nestedCteJoin.joinClause;
             }
             if (field.nested) {
-                joins.push(...this.collectNestedCteJoins(field.nested));
+                const nestedJson = this.renderFields(field.nested, fullAlias, targetTable, innerTableAlias, out);
+                json += (json ? ', ' : '') + "'" + alias + "', " + nestedJson;
+            }
+            else {
+                json += (json ? ', ' : '') + "'" + alias + "', \"" + fullAlias + '"';
+                if (field.expression) {
+                    out.select += (out.select ? ', ' : '') + this.renderLeafSelect(field.expression, fullAlias, targetTable, innerTableAlias);
+                }
             }
         }
-        return joins;
+        return 'json_build_object(' + json + ')';
     }
     /**
      * Build navigation JOINs SQL for multi-level navigation in collection queries
@@ -313,14 +438,15 @@ WHERE ${whereSQL})`;
      * @param targetTable - Optional: the original target table name (e.g., "posts") to map to innerTableAlias
      * @param context - Optional: QueryContext containing lateralTableAliasMap for nested lateral references
      */
-    buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context) {
+    buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context, relationName) {
         if (!navigationJoins || navigationJoins.length === 0) {
             return '';
         }
-        // Extract the relation name from innerTableAlias (e.g., "lateral_0_posts" -> "posts")
-        // This is needed to know which source aliases should be remapped
-        const parts = innerTableAlias.split('_');
-        const relationName = parts.length >= 3 ? parts.slice(2).join('_') : innerTableAlias;
+        if (relationName === undefined) {
+            // `lateral_<n>_<relation>` — the relation name is everything after the second `_`
+            const parts = innerTableAlias.split('_');
+            relationName = parts.length >= 3 ? parts.slice(2).join('_') : innerTableAlias;
+        }
         // Get the lateral table alias map from context (for nested lateral references)
         // This is used when a nested collection's selector navigation references a parent collection's table
         const lateralAliasMap = context?.lateralTableAliasMap;
@@ -363,101 +489,24 @@ WHERE ${whereSQL})`;
      */
     buildJsonbAggregation(config, lateralAlias, context) {
         const { selectedFields, targetTable, foreignKey, sourceTable, whereClause, orderByClause, limitValue, offsetValue, isDistinct, navigationJoins, relationName } = config;
-        // Use a unique table alias to avoid conflicts with outer query tables
-        // This is important when the collection targets the same table as the outer query
-        // (e.g., post.user.posts where both outer and inner are "posts" table)
         const innerTableAlias = `${lateralAlias}_${relationName}`;
-        // Helper to collect all leaf fields from a potentially nested structure
-        const collectLeafFields = (fields, prefix = '') => {
-            const result = [];
-            for (const field of fields) {
-                const fullAlias = prefix ? `${prefix}__${field.alias}` : field.alias;
-                if (field.nested) {
-                    result.push(...collectLeafFields(field.nested, fullAlias));
-                }
-                else if (field.expression) {
-                    result.push({ alias: fullAlias, expression: field.expression });
-                }
-            }
-            return result;
-        };
-        // Helper to build json_build_object expression (handles nested structures)
-        const buildJsonbObject = (fields, prefix = '') => {
-            const parts = [];
-            for (const field of fields) {
-                if (field.nested) {
-                    const nestedJsonb = buildJsonbObject(field.nested, prefix ? `${prefix}__${field.alias}` : field.alias);
-                    parts.push(`'${field.alias}', ${nestedJsonb}`);
-                }
-                else {
-                    const fullAlias = prefix ? `${prefix}__${field.alias}` : field.alias;
-                    parts.push(`'${field.alias}', "${fullAlias}"`);
-                }
-            }
-            return `json_build_object(${parts.join(', ')})`;
-        };
-        // Collect all leaf fields for the SELECT clause
-        const leafFields = collectLeafFields(selectedFields);
-        // When there are navigation joins, we need to qualify unqualified field expressions
-        // with the inner table alias to avoid ambiguous column references
-        const hasNavigationJoins = navigationJoins && navigationJoins.length > 0;
-        // Helper to rewrite expressions that reference the collection's table to use inner alias
-        const rewriteTableReference = (expression) => {
-            // Replace the special marker alias `"__collection_tableName__".` with `"innerTableAlias".`
-            // This marker is set in CollectionQueryBuilder.createMockItem() to distinguish
-            // collection references from outer table references when both target the same table
-            if (!expression.includes('"__collection_')) {
-                return expression; // nothing to rewrite — skip the regex pass entirely
-            }
-            const markerPattern = (0, query_utils_1.collectionMarkerPattern)(targetTable, true);
-            return expression.replace(markerPattern, `"${innerTableAlias}".`);
-        };
-        // Build the subquery SELECT fields (no foreign key needed since we correlate with parent)
-        const allSelectFields = leafFields.map(f => {
-            // If expression is just a quoted column name (e.g., `"id"`), qualify it with inner table alias
-            // But if it's already qualified (e.g., `"user"."username"`), rewrite if it references target table
-            const isSimpleColumn = /^"[^".]+"$/.test(f.expression);
-            if (isSimpleColumn) {
-                // Unqualified column - qualify with inner table alias
-                const columnName = f.expression.slice(1, -1); // Remove quotes
-                return `"${innerTableAlias}"."${columnName}" as "${f.alias}"`;
-            }
-            // Already qualified - rewrite target table references
-            const rewritten = rewriteTableReference(f.expression);
-            if (rewritten !== `"${f.alias}"`) {
-                return `${rewritten} as "${f.alias}"`;
-            }
-            return rewritten;
-        });
-        // Build the JSONB fields for json_build_object
-        const jsonbObjectExpr = buildJsonbObject(selectedFields);
-        // Build navigation JOINs for multi-level navigation
-        // Pass innerTableAlias so navigation joins can reference it properly
-        const navJoinsSQL = this.buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context);
-        // Collect nested CTE/LATERAL joins (for collections within collections)
-        const nestedCteJoins = this.collectNestedCteJoins(selectedFields);
-        const nestedCteJoinsSQL = nestedCteJoins.length > 0 ? nestedCteJoins.join('\n  ') : '';
-        // For nested collections, the source table may be aliased in a parent LATERAL
-        // Check the lateralTableAliasMap to get the correct alias
+        // Inner select list + json_build_object + nested lateral joins in one pass
+        const rendered = { select: '', joins: '' };
+        const jsonbObjectExpr = this.renderFields(selectedFields, '', targetTable, innerTableAlias, rendered);
+        const navJoinsSQL = this.buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context, relationName);
+        // Check if the source table has been aliased by a parent LATERAL (for nested collections)
         const effectiveSourceTable = context.lateralTableAliasMap?.get(sourceTable) || sourceTable;
-        // Build WHERE clause - LATERAL correlates with parent via foreign key
-        // The correlation is: innerAlias.foreignKey = source.id (plus any literal
-        // predicates carried by `config.foreignKeys`/`matches`).
-        // For selectMany, the FK is on the intermediate table (joined via navJoins)
+        // Build WHERE clause with correlation to parent
+        // For selectMany, the FK is on the intermediate table (joined via navJoins), not the target table
         const fkTableAlias = config.foreignKeyTableAlias || innerTableAlias;
         let whereSQL = `WHERE ${this.buildParentCorrelation(config, fkTableAlias, effectiveSourceTable, foreignKey)}`;
         if (whereClause) {
-            // Rewrite the user's WHERE clause to use inner alias for the collection's table
-            const rewrittenWhereClause = rewriteTableReference(whereClause);
-            whereSQL += ` AND ${rewrittenWhereClause}`;
+            whereSQL += ` AND ${this.rewriteMarker(whereClause, targetTable, innerTableAlias)}`;
         }
-        // Build ORDER BY clause - also rewrite table references
         let orderBySQL = '';
         if (orderByClause) {
-            const rewrittenOrderBy = rewriteTableReference(orderByClause);
-            orderBySQL = `ORDER BY ${rewrittenOrderBy}`;
+            orderBySQL = `ORDER BY ${this.rewriteMarker(orderByClause, targetTable, innerTableAlias)}`;
         }
-        // Build LIMIT/OFFSET
         let limitOffsetClause = '';
         if (limitValue !== undefined) {
             limitOffsetClause = `LIMIT ${limitValue}`;
@@ -465,21 +514,18 @@ WHERE ${whereSQL})`;
         if (offsetValue !== undefined) {
             limitOffsetClause += ` OFFSET ${offsetValue}`;
         }
-        // Build DISTINCT clause
         const distinctClause = isDistinct ? 'DISTINCT ' : '';
-        // Note: We don't add ORDER BY inside json_agg because:
-        // 1. The inner subquery already applies ORDER BY before LIMIT/OFFSET
-        // 2. Column aliases in the subquery may differ from original column names
-        // The order is preserved from the inner query's ORDER BY
+        // Build LATERAL subquery
+        // Structure: SELECT json_agg(json_build_object(...)) FROM (SELECT ... LIMIT/OFFSET) sub
         const lateralSQL = `
 SELECT json_agg(
   ${jsonbObjectExpr}
 ) as data
 FROM (
-  SELECT ${distinctClause}${allSelectFields.join(', ')}
+  SELECT ${distinctClause}${rendered.select}
   FROM "${targetTable}" "${innerTableAlias}"
   ${navJoinsSQL}
-  ${nestedCteJoinsSQL}
+  ${rendered.joins}
   ${whereSQL}
   ${orderBySQL}
   ${limitOffsetClause}
@@ -493,95 +539,30 @@ FROM (
      */
     buildSingleJsonAggregation(config, lateralAlias, context) {
         const { selectedFields, targetTable, foreignKey, sourceTable, whereClause, orderByClause, isDistinct, navigationJoins, relationName } = config;
-        // Use a unique table alias to avoid conflicts with outer query tables
         const innerTableAlias = `${lateralAlias}_${relationName}`;
-        // Helper to collect all leaf fields from a potentially nested structure
-        const collectLeafFields = (fields, prefix = '') => {
-            const result = [];
-            for (const field of fields) {
-                const fullAlias = prefix ? `${prefix}__${field.alias}` : field.alias;
-                if (field.nested) {
-                    result.push(...collectLeafFields(field.nested, fullAlias));
-                }
-                else if (field.expression) {
-                    result.push({ alias: fullAlias, expression: field.expression });
-                }
-            }
-            return result;
-        };
-        // Helper to build json_build_object expression (handles nested structures)
-        const buildJsonbObject = (fields, prefix = '') => {
-            const parts = [];
-            for (const field of fields) {
-                if (field.nested) {
-                    const nestedJsonb = buildJsonbObject(field.nested, prefix ? `${prefix}__${field.alias}` : field.alias);
-                    parts.push(`'${field.alias}', ${nestedJsonb}`);
-                }
-                else {
-                    const fullAlias = prefix ? `${prefix}__${field.alias}` : field.alias;
-                    parts.push(`'${field.alias}', "${fullAlias}"`);
-                }
-            }
-            return `json_build_object(${parts.join(', ')})`;
-        };
-        // Collect all leaf fields for the SELECT clause
-        const leafFields = collectLeafFields(selectedFields);
-        // Helper to rewrite expressions that reference the collection's table to use inner alias
-        const rewriteTableReference = (expression) => {
-            // Replace the special marker alias `"__collection_tableName__".` with `"innerTableAlias".`
-            if (!expression.includes('"__collection_')) {
-                return expression; // nothing to rewrite — skip the regex pass entirely
-            }
-            const markerPattern = (0, query_utils_1.collectionMarkerPattern)(targetTable, true);
-            return expression.replace(markerPattern, `"${innerTableAlias}".`);
-        };
-        // Build the subquery SELECT fields using inner table alias
-        const allSelectFields = leafFields.map(f => {
-            const isSimpleColumn = /^"[^".]+"$/.test(f.expression);
-            if (isSimpleColumn) {
-                const columnName = f.expression.slice(1, -1);
-                return `"${innerTableAlias}"."${columnName}" as "${f.alias}"`;
-            }
-            const rewritten = rewriteTableReference(f.expression);
-            if (rewritten !== `"${f.alias}"`) {
-                return `${rewritten} as "${f.alias}"`;
-            }
-            return rewritten;
-        });
-        // Build the JSONB fields for json_build_object
-        const jsonbObjectExpr = buildJsonbObject(selectedFields);
-        // Build navigation JOINs for multi-level navigation
-        const navJoinsSQL = this.buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context);
-        // Collect nested CTE/LATERAL joins (for collections within collections)
-        const nestedCteJoins = this.collectNestedCteJoins(selectedFields);
-        const nestedCteJoinsSQL = nestedCteJoins.length > 0 ? nestedCteJoins.join('\n  ') : '';
-        // For nested collections, the source table may be aliased in a parent LATERAL
+        const rendered = { select: '', joins: '' };
+        const jsonbObjectExpr = this.renderFields(selectedFields, '', targetTable, innerTableAlias, rendered);
+        const navJoinsSQL = this.buildNavigationJoinsWithAlias(navigationJoins, innerTableAlias, targetTable, context, relationName);
         const effectiveSourceTable = context.lateralTableAliasMap?.get(sourceTable) || sourceTable;
-        // Build WHERE clause - LATERAL correlates with parent via foreign key
-        // For selectMany, the FK is on the intermediate table (joined via navJoins)
         const fkTableAlias2 = config.foreignKeyTableAlias || innerTableAlias;
         let whereSQL = `WHERE ${this.buildParentCorrelation(config, fkTableAlias2, effectiveSourceTable, foreignKey)}`;
         if (whereClause) {
-            const rewrittenWhereClause = rewriteTableReference(whereClause);
-            whereSQL += ` AND ${rewrittenWhereClause}`;
+            whereSQL += ` AND ${this.rewriteMarker(whereClause, targetTable, innerTableAlias)}`;
         }
-        // Build ORDER BY clause
         let orderBySQL = '';
         if (orderByClause) {
-            const rewrittenOrderBy = rewriteTableReference(orderByClause);
-            orderBySQL = `ORDER BY ${rewrittenOrderBy}`;
+            orderBySQL = `ORDER BY ${this.rewriteMarker(orderByClause, targetTable, innerTableAlias)}`;
         }
-        // Build DISTINCT clause
         const distinctClause = isDistinct ? 'DISTINCT ' : '';
-        // For single result, use row_to_json on the first row
-        // LIMIT 1 is applied inside the subquery
+        // Structure: SELECT json_build_object(...) FROM (SELECT ... LIMIT 1) sub
+        // Returns null if no rows (LEFT JOIN LATERAL handles this)
         const lateralSQL = `
 SELECT ${jsonbObjectExpr} as data
 FROM (
-  SELECT ${distinctClause}${allSelectFields.join(', ')}
+  SELECT ${distinctClause}${rendered.select}
   FROM "${targetTable}" "${innerTableAlias}"
   ${navJoinsSQL}
-  ${nestedCteJoinsSQL}
+  ${rendered.joins}
   ${whereSQL}
   ${orderBySQL}
   LIMIT 1