npm - prostgles-server - Versions diffs - 4.2.671 → 4.2.673 - Mend

prostgles-server 4.2.671 → 4.2.673

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (119) hide show

package/dist/DboBuilder/QueryBuilder/getComputedJoinQuery.js ADDED Viewed

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getComputedJoinQuery = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const getTableJoinQuery_1 = require("../ViewHandler/getTableJoinQuery");
+const dboBuilderUtils_1 = require("../dboBuilderUtils");
+const asNameAlias_1 = require("../../utils/asNameAlias");
+const getJoinQuery_1 = require("./getJoinQuery");
+const getComputedJoinQuery = (parent, child) => {
+    const alias = child.tableAlias ?? child.table;
+    const nestedSorts = parent.orderByItems.filter((item) => item.nested?.joinAlias.raw === child.joinAlias.raw);
+    const fields = child.select.filter((field) => field.selected ||
+        child.orderByItems.some((item) => item.key === field.alias) ||
+        nestedSorts.some((item) => item.nested?.selectItemAlias === field.alias));
+    const selectedFields = fields.filter((field) => field.selected);
+    const sortColumns = child.orderByItems
+        .map((item) => item.key)
+        .filter((column) => !fields.some((field) => field.alias === column));
+    const pathTables = child.joinPath.map((path, index, paths) => {
+        const isLast = index === paths.length - 1;
+        return {
+            ...path,
+            alias: isLast ? alias : (0, getTableJoinQuery_1.getTableJoinAlias)(path.table, index),
+            expression: isLast ? child.source.expression : path.table,
+        };
+    });
+    const conditions = pathTables.map((path, index) => (0, getTableJoinQuery_1.getJoinOnCondition)({
+        ...path,
+        leftAlias: index ?
+            pathTables[index - 1].alias.escaped
+            : (parent.tableAlias?.escaped ?? parent.table.escaped),
+        rightAlias: path.alias.escaped,
+        getLeftColName: (column) => (0, prostgles_types_1.asName)(!index ? (parent.source.joinColumns?.[column] ?? column) : column),
+        getRightColName: (column) => (0, prostgles_types_1.asName)(index === pathTables.length - 1 ? (child.source.joinColumns?.[column] ?? column) : column),
+    }));
+    const hasAggregates = fields.some((field) => field.type === "aggregation");
+    const groupBy = hasAggregates ?
+        fields
+            .flatMap((field, index) => (field.type === "aggregation" ? [] : [index + 1]))
+            .concat(sortColumns.map((_, index) => fields.length + index + 1))
+        : [];
+    const orderBy = (0, dboBuilderUtils_1.prepareOrderByQuery)(child.orderByItems, alias.raw).join(", ");
+    const rowOrderBy = (0, dboBuilderUtils_1.prepareOrderByQuery)(child.orderByItems, alias.raw, (key) => fields.find((field) => field.alias === key)?.getQuery(alias.raw)).join(", ");
+    const rows = [
+        `SELECT ${fields
+            .map((field) => `${field.getQuery(alias.raw)} AS ${(0, prostgles_types_1.asName)(field.alias)}`)
+            .concat(sortColumns.map((column) => (0, asNameAlias_1.asNameAlias)(column, alias.raw)))
+            .join(", ")}`,
+        ...pathTables.map((path, index) => index ?
+            `INNER JOIN ${path.expression} ${path.alias.escaped} ON (${conditions[index]})`
+            : `FROM ${path.expression} ${path.alias.escaped}`),
+        `WHERE ${[conditions[0], child.whereOpts.condition]
+            .filter(Boolean)
+            .map((condition) => `(${condition})`)
+            .join(" AND ")}`,
+        groupBy.length ? `GROUP BY ${groupBy.join(", ")}` : "",
+        hasAggregates ?
+            `HAVING ${["count(*) > 0", child.having]
+                .filter(Boolean)
+                .map((condition) => `(${condition})`)
+                .join(" AND ")}`
+            : "",
+        rowOrderBy,
+        child.limit === null ? "" : `LIMIT ${child.limit}`,
+        child.offset ? `OFFSET ${child.offset}` : "",
+    ]
+        .filter(Boolean)
+        .join("\n");
+    const projection = selectedFields.map((field) => (0, asNameAlias_1.asNameAlias)(field.alias, alias.raw)).join(", ");
+    const aggregate = `json_agg((SELECT row_to_json(projected.*) FROM (SELECT ${projection}) projected) ${orderBy}) AS ${getJoinQuery_1.JSON_AGG_FIELD_NAME}`;
+    const query = [
+        `SELECT ${[aggregate, ...nestedSorts.map((item) => item.nested.wrapperQuerySortItem)].join(", ")}`,
+        `FROM (${rows}) ${alias.escaped}`,
+        child.isLeftJoin ? "" : "HAVING count(*) > 0",
+    ]
+        .filter(Boolean)
+        .join("\n");
+    return {
+        type: "cte",
+        resultAlias: { raw: getJoinQuery_1.JSON_AGG_FIELD_NAME, escaped: getJoinQuery_1.JSON_AGG_FIELD_NAME },
+        firstJoinTableJoinFields: [],
+        isOrJoin: false,
+        joinLines: [
+            `${child.isLeftJoin ? "LEFT" : "INNER"} JOIN LATERAL (${query}) ${alias.escaped} ON TRUE`,
+        ],
+        cteLines: [],
+    };
+};
+exports.getComputedJoinQuery = getComputedJoinQuery;
+//# sourceMappingURL=getComputedJoinQuery.js.map

package/dist/DboBuilder/QueryBuilder/getComputedJoinQuery.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"getComputedJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getComputedJoinQuery.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts CHANGED Viewed

@@ -19,7 +19,7 @@ export declare const JSON_AGG_FIELD_NAME = "prostgles_json_agg_result_field";
  * Used for LIMIT and for sorting
  */
 export declare const NESTED_ROWID_FIELD_NAME = "prostgles_rowid_field";
-type GetJoinQueryResult = {
+export type GetJoinQueryResult = {
     resultAlias: PGIdentifier;
     firstJoinTableJoinFields: string[];
     isOrJoin: boolean;
@@ -38,7 +38,7 @@ type GetJoinQueryResult = {
   ) target_table
   ON ...condition
  */
-export declare const getJoinQuery: (viewHandler: ViewHandler, { q1, q2 }: Args) => GetJoinQueryResult;
+export declare const getJoinQuery: (_viewHandler: ViewHandler, { q1, q2 }: Args) => GetJoinQueryResult;
 export type SelectItemNested = SelectItemValidated & {
     query: string;
     isJoinCol: boolean;

package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGvE,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM;;;CAMzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,oCAAoC,CAAC;AACrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAgB/D,~~KAAK~~,kBAAkB,GAAG;~~IACxB~~,WAAW,EAAE,YAAY,CAAC;IAC1B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GAAI,~~aAAa~~,WAAW,EAAE,YAAY,IAAI,KAAG,~~kBAqIzE~~,CAAC;AAwFF,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC"}
1	+ {"version":3,"file":"getJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAGvE,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,QAAQ,CAAC;IACb,EAAE,EAAE,YAAY,CAAC;IACjB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM;;;CAMzC,CAAC;AAEF,eAAO,MAAM,mBAAmB,oCAAoC,CAAC;AACrE;;GAEG;AACH,eAAO,MAAM,uBAAuB,0BAA0B,CAAC;AAgB/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,YAAY,CAAC;IAC1B,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC;IACZ,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,YAAY,GAAI,cAAc,WAAW,EAAE,YAAY,IAAI,KAAG,kBAgI1E,CAAC;AAwFF,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC"}

package/dist/DboBuilder/QueryBuilder/getJoinQuery.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJoinQuery = exports.NESTED_ROWID_FIELD_NAME = exports.JSON_AGG_FIELD_NAME = exports.getJoinCol = void 0;
 const prostgles_types_1 = require("prostgles-types");
-const parseJoinPath_1 = require("../ViewHandler/parseJoinPath");
+const getComputedJoinQuery_1 = require("./getComputedJoinQuery");
 const getSelectQuery_1 = require("./getSelectQuery");
 const getTableJoinQuery_1 = require("../ViewHandler/getTableJoinQuery");
 const DboBuilder_1 = require("../DboBuilder");
@@ -43,17 +43,13 @@ const getJoinTable = (tableName, pathIndex, isLastTableAlias) => {
   ) target_table
   ON ...condition
  */
-const getJoinQuery = (viewHandler, { q1, q2 }) => {
-    const paths = (0, parseJoinPath_1.parseJoinPath)({
-        rootTable: q1.table.raw,
-        rawPath: q2.joinPath,
-        viewHandler: viewHandler,
-        allowMultiOrJoin: true,
-        addShortestJoinIfMissing: true,
-    });
+const getJoinQuery = (_viewHandler, { q1, q2 }) => {
+    const paths = q2.joinPath;
     if (q2.joins?.length) {
         throw new Error("Nested joins not supported yet");
     }
+    if (paths.some((path) => path.computedJoin))
+        return (0, getComputedJoinQuery_1.getComputedJoinQuery)(q1, q2);
     const targetTableAliasRaw = q2.tableAlias?.raw || q2.table.raw;
     const targetTableAlias = (0, prostgles_types_1.asName)(targetTableAliasRaw);
     const firstJoinTablePath = paths[0];

package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAoD;AAEpD,~~gEAA6D~~;~~AAG7D~~,qDAAwF;AAExF,wEAAsE;AACtE,8CAAuE;AACvE,yDAAsD;AAQtD;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,IAAA,wBAAM,EAAC,iBAAiB,GAAG,OAAO,CAAC,CAAC;IAClD,OAAO;QACL,KAAK;QACL,UAAU,EAAE,GAAG,IAAA,wBAAM,EAAC,OAAO,CAAC,OAAO,KAAK,EAAE;KAC7C,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEW,QAAA,mBAAmB,GAAG,iCAAiC,CAAC;AACrE;;GAEG;AACU,QAAA,uBAAuB,GAAG,uBAAuB,CAAC;AAE/D,MAAM,YAAY,GAAG,CACnB,SAAiB,EACjB,SAAiB,EACjB,gBAAoC,EACpC,EAAE;IACF,MAAM,QAAQ,GAAG,gBAAgB,IAAI,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;IACnE,OAAO;QACL,kEAAkE;QAClE,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,IAAA,wBAAM,EAAC,QAAQ,CAAC;QACvB,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC;AAWF;;;;;;;;;;GAUG;AACI,MAAM,YAAY,GAAG,CAAC,~~WAAwB~~,EAAE,EAAE,EAAE,EAAE,EAAE,EAAQ,EAAsB,EAAE;~~IAC7F~~,MAAM,KAAK,GAAG,~~IAAA~~,~~6BAAa~~,~~EAAC~~;~~QAC1B~~,~~SAAS~~,EAAE,~~EAAE,~~CAAC,KAAK,CAAC~~,GAAG~~;~~QACvB~~,~~OAAO~~,~~EAAE~~,~~EAAE~~,CAAC,~~QAAQ;QACpB~~,~~WAAW~~,~~EAAE~~,~~WAAW~~;~~QACxB~~,~~gBAAgB,EAAE,~~IAAI~~;QACtB~~,~~wBAAwB~~,~~EAAE~~,IAAI~~;KAC/B~~,CAAC,CAAC~~;IAEH~~,IAAI,EAAE,CAAC,~~KAAK~~,~~EAAE~~,~~MAAM~~,~~EAAE,~~CAAC;~~QACrB~~,~~MAAM~~,~~IAAI~~,~~KAAK~~,~~CAAC~~,~~gCAAgC~~,~~CAAC~~,CAAC~~;IACpD~~,CAAC;~~IACD~~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~~AArIW~~,QAAA,YAAY,~~gBAqIvB~~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"}
1	+ {"version":3,"file":"getJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getJoinQuery.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAM7D,eAAO,MAAM,WAAW,GACtB,aAAa,WAAW,EACxB,QAAQ,MAAM,EACd,eAAc,YAAY,GAAG;IAAE,mBAAmB,CAAC,EAAE,YAAY,CAAA;CAAE,aAAK,EACxE,YAAY,eAAe,GAAG,SAAS,EACvC,aAAa,WAAW,GAAG,SAAS,KACnC,OAAO,CAAC,QAAQ,~~CAsOlB~~,CAAC"}
1	+ {"version":3,"file":"getNewQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAEL,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAM7D,eAAO,MAAM,WAAW,GACtB,aAAa,WAAW,EACxB,QAAQ,MAAM,EACd,eAAc,YAAY,GAAG;IAAE,mBAAmB,CAAC,EAAE,YAAY,CAAA;CAAE,aAAK,EACxE,YAAY,eAAe,GAAG,SAAS,EACvC,aAAa,WAAW,GAAG,SAAS,KACnC,OAAO,CAAC,QAAQ,CA2OlB,CAAC"}

package/dist/DboBuilder/QueryBuilder/getNewQuery.js CHANGED Viewed

@@ -39,6 +39,7 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
         return (0, prepareWhere_1.prepareWhere)(viewHandler, {
             filter,
             select: undefined,
+            selectParams,
             filterFields: allowedFilterFields,
             tableAlias: selectExpressionAlias,
             localParams,
@@ -169,7 +170,11 @@ const getNewQuery = async (viewHandler, filter, selectParams = {}, tableRules, l
         source,
         joins: joinQueries,
         where: filterOpts.where,
-        whereOpts: filterOpts,
+        whereOpts: {
+            ...filterOpts,
+            columnsUsed: [...filterOpts.columnsUsed, ...(havingOpts?.columnsUsed ?? [])],
+            exists: [...filterOpts.exists, ...(havingOpts?.exists ?? [])],
+        },
         having: havingOpts?.condition ?? "",
         isLeftJoin: false,
         limit: prepareLimitQuery(selectParams.limit, validatedRules),

package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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~~QACrB~~,MAAM,EAAE,UAAU,EAAE,SAAS,IAAI,EAAE;QACnC,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,iBAAiB,CAAC,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC;QAC5D,YAAY,EAAE,IAAA,mCAAgB,EAC5B,YAAY,CAAC,OAAO,EACpB,oBAAoB,EACpB,YAAY,CAAC,mBAAmB,EAChC,MAAM,EACN,WAAW,CACZ;QACD,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC,MAAM,CAAC;KAChD,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QACpF,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;~~AA5OW~~,QAAA,WAAW,~~eA4OtB~~;AAEF,MAAM,kBAAkB,GAAG,CAAC,MAAe,EAAE,EAAE;IAC7C,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,OAAO,MAAO,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACxB,QAAmC,IAAI,EACvC,CAAsB,EACP,EAAE;IACjB,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,MAAM,8CAA8C,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACd,MAAM,gBAAgB,CAAC;IACzB,CAAC;IAED,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,2DAA2D;IAC3D,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC/E,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;IACvF,CAAC;SAAM,CAAC;QACN,2DAA2D;QAC3D,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,QAAS,EAAE,CAAC;YAC1F,MAAM,CACJ,oBAAoB,MAAM,8CAA8C,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
1	+ {"version":3,"file":"getNewQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getNewQuery.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/QueryBuilder/getQuerySource.d.ts CHANGED Viewed

@@ -5,11 +5,13 @@ import type { PGIdentifier } from "../DboBuilder";
 import type { ViewHandler } from "../ViewHandler/ViewHandler";
 declare const GET_TABLE_EXPRESSION: unique symbol;
 type SelectRuleWithTableExpression = SelectRule & {
-    [GET_TABLE_EXPRESSION]?: (request: SelectRequestData) => Awaitable<string | undefined>;
+    [GET_TABLE_EXPRESSION]?: (request: SelectRequestData) => Awaitable<string | Pick<QuerySource, "expression" | "joinColumns"> | undefined>;
 };
 export type QuerySource = {
     expression: string;
     alias?: PGIdentifier;
+    /** Private source columns used only by registered relationships. */
+    joinColumns?: Record<string, string>;
 };
 export declare const withTableExpression: <T extends SelectRule>(selectRule: T, getTableExpression: NonNullable<SelectRuleWithTableExpression[typeof GET_TABLE_EXPRESSION]>) => T;
 export declare const getQuerySource: (viewHandler: ViewHandler, tableRules: ParsedTableRule | undefined, filter: SelectRequestData["filter"], params: SelectParams, preferredAlias?: PGIdentifier) => Promise<QuerySource>;

package/dist/DboBuilder/QueryBuilder/getQuerySource.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getQuerySource.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,QAAA,MAAM,oBAAoB,eAA+B,CAAC;AAG1D,KAAK,6BAA6B,GAAG,UAAU,GAAG;IAChD,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;~~CACxF~~,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,CAAC;~~CACtB~~,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,UAAU,EACtD,YAAY,CAAC,EACb,oBAAoB,WAAW,CAAC,6BAA6B,CAAC,OAAO,oBAAoB,CAAC,CAAC,KAC1F,CAEF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,aAAa,WAAW,EACxB,YAAY,eAAe,GAAG,SAAS,EACvC,QAAQ,iBAAiB,CAAC,QAAQ,CAAC,EACnC,QAAQ,YAAY,EACpB,iBAAiB,YAAY,KAC5B,OAAO,CAAC,WAAW,~~CAerB~~,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,uBAAuB,WAAW,WAEnE,CAAC"}
1	+ {"version":3,"file":"getQuerySource.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,UAAU,EACX,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,QAAA,MAAM,oBAAoB,eAA+B,CAAC;AAG1D,KAAK,6BAA6B,GAAG,UAAU,GAAG;IAChD,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,CAAC,GAAG,SAAS,CAAC,CAAC;CAC1I,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,UAAU,EACtD,YAAY,CAAC,EACb,oBAAoB,WAAW,CAAC,6BAA6B,CAAC,OAAO,oBAAoB,CAAC,CAAC,KAC1F,CAEF,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,aAAa,WAAW,EACxB,YAAY,eAAe,GAAG,SAAS,EACvC,QAAQ,iBAAiB,CAAC,QAAQ,CAAC,EACnC,QAAQ,YAAY,EACpB,iBAAiB,YAAY,KAC5B,OAAO,CAAC,WAAW,CAgBrB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,uBAAuB,WAAW,WAEnE,CAAC"}

package/dist/DboBuilder/QueryBuilder/getQuerySource.js CHANGED Viewed

@@ -17,8 +17,9 @@ const getQuerySource = async (viewHandler, tableRules, filter, params, preferred
             { raw: TABLE_EXPRESSION_ALIAS, escaped: (0, prostgles_types_1.asName)(TABLE_EXPRESSION_ALIAS) }
             : undefined);
     return {
-        expression: tableExpression ?? viewHandler.escapedName,
+        expression: typeof tableExpression === "object" ? tableExpression.expression : tableExpression ?? viewHandler.escapedName,
         alias,
+        joinColumns: typeof tableExpression === "object" ? tableExpression.joinColumns : undefined,
     };
 };
 exports.getQuerySource = getQuerySource;

package/dist/DboBuilder/QueryBuilder/getQuerySource.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getQuerySource.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAU5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC1D,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;~~AAWrD~~,MAAM,mBAAmB,GAAG,CACjC,UAAa,EACb,kBAA2F,EACxF,EAAE;IACL,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,UAAuC,EACvC,MAAmC,EACnC,MAAoB,EACpB,cAA6B,EACP,EAAE;IACxB,MAAM,UAAU,GAAG,UAAU,EAAE,MAAmD,CAAC;IACnF,MAAM,kBAAkB,GAAG,UAAU,EAAE,CAAC,oBAAoB,CAAC,CAAC;IAC9D,MAAM,eAAe,GACnB,kBAAkB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,KAAK,GACT,cAAc;QACd,CAAC,eAAe,CAAC,CAAC;YAChB,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,EAAE,IAAA,wBAAM,EAAC,sBAAsB,CAAC,EAAE;YAC1E,CAAC,CAAC,SAAS,CAAC,CAAC;IAEf,OAAO;QACL,UAAU,EAAE,eAAe,IAAI,WAAW,CAAC,WAAW;~~QACtD~~,KAAK;~~KACN~~,CAAC;AACJ,CAAC,CAAC;~~AArBW~~,QAAA,cAAc,~~kBAqBzB~~;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,UAAU,EAAE,KAAK,EAAe,EAAE,EAAE;IACtE,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}
1	+ {"version":3,"file":"getQuerySource.js","sourceRoot":"","sources":["../../../lib/DboBuilder/QueryBuilder/getQuerySource.ts"],"names":[],"mappings":";;;AAAA,qDAA4D;AAU5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC1D,MAAM,sBAAsB,GAAG,4BAA4B,CAAC;AAarD,MAAM,mBAAmB,GAAG,CACjC,UAAa,EACb,kBAA2F,EACxF,EAAE;IACL,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEK,MAAM,cAAc,GAAG,KAAK,EACjC,WAAwB,EACxB,UAAuC,EACvC,MAAmC,EACnC,MAAoB,EACpB,cAA6B,EACP,EAAE;IACxB,MAAM,UAAU,GAAG,UAAU,EAAE,MAAmD,CAAC;IACnF,MAAM,kBAAkB,GAAG,UAAU,EAAE,CAAC,oBAAoB,CAAC,CAAC;IAC9D,MAAM,eAAe,GACnB,kBAAkB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,MAAM,KAAK,GACT,cAAc;QACd,CAAC,eAAe,CAAC,CAAC;YAChB,EAAE,GAAG,EAAE,sBAAsB,EAAE,OAAO,EAAE,IAAA,wBAAM,EAAC,sBAAsB,CAAC,EAAE;YAC1E,CAAC,CAAC,SAAS,CAAC,CAAC;IAEf,OAAO;QACL,UAAU,EAAE,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,IAAI,WAAW,CAAC,WAAW;QACzH,KAAK;QACL,WAAW,EAAE,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;KAC3F,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,UAAU,EAAE,KAAK,EAAe,EAAE,EAAE;IACtE,OAAO,GAAG,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B"}

package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import type pgPromise from "pg-promise";
 import type { AnyObject, ColumnInfo, FieldFilter, SubscribeParams, SubscriptionChannels, SubscriptionHandler } from "prostgles-types";
 import type { TableEvent } from "../../Logging";
 import type { DB } from "../../Prostgles";
-import type { Join } from "../../ProstglesTypes";
+import type { ColumnJoin } from "../../ProstglesTypes";
 import type { ParsedTableRule } from "../../PublishParser/PublishParser";
 import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
 import type { TableDefinition } from "../../TableConfig/TableConfigTypes";
@@ -27,7 +27,7 @@ export declare class ViewHandler {
     columnSet: Set<string>;
     tableOrViewInfo: TableSchema;
     tsColumnDefs: string[];
-    joins: Join[];
+    joins: ColumnJoin[];
     joinGraph?: Graph;
     joinPaths: JoinPaths;
     dboBuilder: DboBuilder;

package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,~~IAAI~~,EAAE,MAAM,sBAAsB,CAAC;~~AACjD~~,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAQ,KAAK,MAAM,EAAE,KAAK,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAKpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,WAAW;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,~~IAAI~~,EAAE,CAAC;~~IACd~~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"}
1	+ {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAQ,KAAK,MAAM,EAAE,KAAK,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAKpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAI1C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,WAAW;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACzC,KAAK,EAAE,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;IAEvE,EAAE,CAAC,EAAE;QACH,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;KACrB,CAAC;IACF,IAAI,SAAS,6BAEZ;IAED,IAAI,MAAM,YAET;IACD,SAAS,SAAM;IACf,QAAQ,UAAS;gBACL,EACV,EAAE,EACF,MAAM,EACN,UAAU,EACV,eAAe,EACf,EAAE,EACF,SAAS,EACT,KAAK,GACN,EAAE;QACD,EAAE,EAAE,EAAE,CAAC;QACP,eAAe,EAAE,WAAW,CAAC;QAC7B,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QACzC,KAAK,EAAE,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;QACvE,EAAE,CAAC,EAAE;YAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAAC,IAAI,EAAE,aAAa,CAAA;SAAE,CAAC;QACrD,SAAS,EAAE,SAAS,CAAC;KACtB;IA2BD,YAAY,GAAI,aAAa,WAAW,GAAG,SAAS,+BAElD;IAEF,cAAc,GAAI,aAAa,WAAW,GAAG,SAAS;;;kBAEpD;IAEF,gBAAgB,GAAI,eAAe,MAAM,EAAE,aAAa,WAAW,UAgBjE;IAEF,aAAa;eAGF,YAAY;eACZ,MAAM;eACN,MAAM;aACR,MAAM,GAAG,SAAS;kBACb,MAAM,GAAG,SAAS;OAE5B;IACJ,aAAa,cAAqB;IAElC,IAAI,GAAI,kDAML,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,MAAM,GAAG,aAAa,CAAC,GAAG;QACxD,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,0BAoBC;IAEF,gBAAgB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAiBzF,iBAAiB;;;;;;;2BAAgC;IAEjD,WAAW,CAAC,MAAM,EAAE,GAAG;IAKvB,OAAO,6LAAsB;IAE7B,UAAU;;;qLAAyB;IAEnC,iBAAiB,wIAAqC;IAEtD,IAAI,2NAAmB;IAEjB,OAAO,CACX,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,kBAAkB,EACjC,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC;IA+BT,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAEzB,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,oBAAoB,CAAC;IAqBhC,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,GAC5D,OAAO,CAAC,mBAAmB,CAAC;IAC/B,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,EAC5B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC;IAehC,KAAK,sOAAoB;IACzB,IAAI,sOAAmB;IAEvB,sBAAsB,CACpB,YAAY,EAAE,WAAW,YAAM,EAC/B,YAAY,EAAE,WAAW,EACzB,WAAW,UAAO,GACjB,MAAM,EAAE;IAqBX,gBAAgB,CACd,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,WAAW,EAC7B,sBAAsB,UAAQ,GAC7B,MAAM,EAAE;IAiBX,gBAAgB,CACd,WAAW,GAAE,WAAiB,EAC9B,WAAW,UAAO,EAClB,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,MAAM,EAAE;CAGZ;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa,MAAM,EAAE,SAQxF,CAAC"}

package/dist/DboBuilder/ViewHandler/ViewHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AASA,qDAAqE;AAQrE,6CAAkD;AAElD,8CAAoE;AAEpE,iFAA8E;AAC9E,8CAA2C;AAE3C,mCAAgC;AAChC,iCAAoE;AACpE,mEAA6D;AAC7D,uCAAoC;AACpC,yDAAsD;AACtD,iCAA8B;AAE9B,2CAAwC;AACxC,2DAAwD;AAQxD,MAAa,WAAW;IACtB,EAAE,CAAK;IACP,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,OAAO,CAAyB;IAChC,eAAe,CAAe;IAC9B,YAAY,CAAW;IACvB,SAAS,CAAc;IACvB,eAAe,CAAc;IAC7B,YAAY,GAAa,EAAE,CAAC;IAC5B,KAAK,~~CAAS~~;~~IACd~~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"}
1	+ {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { ExistsFilterConfig, LocalParams } from "../DboBuilder";
 import type { ViewHandler } from "./ViewHandler";
-export declare function getExistsCondition(this: ViewHandler, eConfig: ExistsFilterConfig, rootTableAlias: string | undefined, localParams: LocalParams | undefined): Promise<string>;
+export declare function getExistsCondition(this: ViewHandler, eConfig: ExistsFilterConfig, rootTableAlias: string | undefined, localParams: LocalParams | undefined, rootJoinColumns: Record<string, string> | undefined): Promise<string>;
 //# sourceMappingURL=getExistsCondition.d.ts.map

package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,WAAW,EAAE,WAAW,GAAG,SAAS,~~GACnC~~,OAAO,CAAC,MAAM,CAAC,~~CA0EjB~~"}
1	+ {"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GAClD,OAAO,CAAC,MAAM,CAAC,CA6EjB"}

package/dist/DboBuilder/ViewHandler/getExistsCondition.js CHANGED Viewed

@@ -5,7 +5,7 @@ const prostgles_types_1 = require("prostgles-types");
 const getQuerySource_1 = require("../QueryBuilder/getQuerySource");
 const getTableJoinQuery_1 = require("./getTableJoinQuery");
 const prepareWhere_1 = require("./prepareWhere");
-async function getExistsCondition(eConfig, rootTableAlias, localParams) {
+async function getExistsCondition(eConfig, rootTableAlias, localParams, rootJoinColumns) {
     const rootTable = this.name;
     const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
     const { targetTableFilter } = eConfig;
@@ -51,6 +51,7 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams) {
         localParams,
     });
     const { source: targetSource, where: finalWhere } = whereOpts;
+    eConfig.targetTableColumns = whereOpts.columnsUsed;
     let innerQuery = [
         `SELECT 1`,
         `FROM ${(0, getQuerySource_1.getQuerySourceSQL)(targetSource)}`,
@@ -63,6 +64,8 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams) {
             type: "EXISTS",
             finalWhere,
             finalTableExpression: targetSource.expression,
+            rootJoinColumns,
+            targetJoinColumns: targetSource.joinColumns,
         });
         innerQuery = query;
     }

package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;AASA,~~gDA+EC~~;~~AAvFD~~,qDAA8C;AAG9C,mEAAmE;AACnE,2DAA2E;AAE3E,iDAA8C;AAEvC,KAAK,UAAU,kBAAkB,CAEtC,OAA2B,EAC3B,cAAkC,EAClC,WAAoC;~~IAEpC~~,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEnF,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IAEtC,mCAAmC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,6BAAW,CAAC,QAAQ,CAAC,EAAgB,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM;YACJ,KAAK,EAAE,CAAC,yBAAyB,CAAC;YAClC,OAAO,EAAE,0BAA0B;SACpC,CAAC;IACJ,CAAC;IAED,uGAAuG;IACvG,IAAI,WAAW,EAAE,eAAe,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3D,MAAM,+DAA+D,CAAC;IACxE,CAAC;IAED,IAAI,gBAAgB,GAAgC,SAAS,CAAC;IAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9F,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,qBAAqB,WAAW,YAAY,CAAC;IACrD,CAAC;IACD,IAAI,WAAW,EAAE,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;YACnC,MAAM,mCAAmC,CAAC;QAC5C,CAAC;QACD,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,2BAA2B,CAChF;YACE,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,EACD,WAAW,CAAC,KAAK,CAClB,CAAC;QAEF,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAAE,MAAM,YAAY,CAAC;IACnD,CAAC;IAED,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE;QACjD,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,EAAE;QAChB,MAAM,EAAE,iBAAiB;QACzB,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY;QACpD,YAAY,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY;QACpD,SAAS,EAAE,gBAAgB;QAC3B,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,WAAW;QACvB,WAAW;KACZ,CAAC,CAAC;IACH,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;~~IAE9D~~,IAAI,UAAU,GAAG;QACf,UAAU;QACV,QAAQ,IAAA,kCAAiB,EAAC,YAAY,CAAC,EAAE;QACzC,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KAC7C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,qCAAiB,EAAC;YAClC,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,cAAc,EAAE,cAAc,IAAI,SAAS;YAC3C,IAAI,EAAE,QAAQ;YACd,UAAU;YACV,oBAAoB,EAAE,YAAY,CAAC,UAAU;~~SAC9C~~,CAAC,CAAC;QACH,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,UAAU,OAAO,CAAC;AACxE,CAAC"}
1	+ {"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsFilters.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,GAAG,EAAE,aAAa,WAAW,KAAG,kBAAkB,~~EAyE1F~~,CAAC"}
1	+ {"version":3,"file":"getExistsFilters.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,gBAAgB,GAAI,QAAQ,GAAG,EAAE,aAAa,WAAW,KAAG,kBAAkB,EA2E1F,CAAC"}

package/dist/DboBuilder/ViewHandler/getExistsFilters.js CHANGED Viewed

@@ -35,6 +35,7 @@ const getExistsFilters = (filter, viewHandler) => {
                 isJoined: false,
                 existType: key,
                 targetTableFilter: filterValue[firstKey],
+                targetTableColumns: [],
                 targetTable: firstKey,
             };
             return res;
@@ -60,6 +61,7 @@ const getExistsFilters = (filter, viewHandler) => {
                 allowMultiOrJoin: true,
             }),
             targetTableFilter,
+            targetTableColumns: [],
         };
     });
     return existsConfigs;

package/dist/DboBuilder/ViewHandler/getExistsFilters.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsFilters.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":";;;AACA,qDAAuD;AAGvD,mDAAgD;AAEzC,MAAM,gBAAgB,GAAG,CAAC,MAAW,EAAE,WAAwB,EAAwB,EAAE;IAC9F,wBAAwB;IACxB,MAAM,GAAG,GACP,gMAAgM,CAAC;IACnM,MAAM,aAAa,GAAyB,IAAA,yBAAO,EAAC,MAAM,CAAC;SACxD,MAAM,CACL,CAAC,CAAC,EAAqC,EAAE,CACvC,6BAAW,CAAC,QAAQ,CAAC,CAAe,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CACjF;SACA,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAEhC;;;;WAIG;QACH,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,UAAU,GACd,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAErF,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAE,CAAC;QAE9B;;WAEG;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,sFAAsF,CAAC;YACtG,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,sCAAsC,MAAM,EAAE,CAAC;YACvD,CAAC;YACD,MAAM,WAAW,GAAG,QAAQ,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBACpD,MAAM,SAAS,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,MAAM,EAAE,CAAC;YACpE,CAAC;YACD,MAAM,GAAG,GAAuB;gBAC9B,QAAQ,EAAE,KAAK;gBACf,SAAS,EAAE,GAAG;gBACd,iBAAiB,EAAE,WAAW,CAAC,QAAQ,CAAC;gBACxC,WAAW,EAAE,QAAQ;aACtB,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC;QAED;;WAEG;QACH,MAAM,gBAAgB,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC,GAC7B,UAAU,CAAC,CAAC;YACV,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC;YACxC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,GAAG;YACd,IAAI;YACJ,UAAU,EAAE,IAAA,6BAAa,EAAC;gBACxB,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,WAAW,CAAC,IAAI;gBAC3B,WAAW;gBACX,gBAAgB,EAAE,IAAI;aACvB,CAAC;YACF,iBAAiB;~~SAClB~~,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;~~AAzEW~~,QAAA,gBAAgB,~~oBAyE3B~~"}
1	+ {"version":3,"file":"getExistsFilters.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsFilters.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts CHANGED Viewed

@@ -6,20 +6,23 @@ type getTableJoinsArgs = {
     finalWhere?: string;
     finalTableExpression?: string;
     path: ParsedJoinPath[];
+    rootJoinColumns?: Record<string, string>;
+    targetJoinColumns?: Record<string, string>;
 };
-export declare const getTableJoinQuery: ({ path, type, rootTableAlias, finalWhere, finalTableExpression, }: getTableJoinsArgs) => {
+export declare const getTableJoinQuery: ({ path, type, rootTableAlias, finalWhere, finalTableExpression, rootJoinColumns, targetJoinColumns, }: getTableJoinsArgs) => {
     targetAlias: string;
     query: string;
 };
 export declare const getTableJoinAlias: (table: string, pathIndex: number) => PGIdentifier;
 type GetJoinOnConditionArgs = {
     on: Record<string, string>[];
+    computedJoin?: ParsedJoinPath["computedJoin"];
     leftAlias: string;
     rightAlias: string;
     getLeftColName?: (col: string) => string;
     getRightColName?: (col: string) => string;
 };
-export declare const getJoinOnConditions: ({ on, leftAlias, rightAlias, getLeftColName, getRightColName, }: GetJoinOnConditionArgs) => string[];
+export declare const getJoinOnConditions: ({ on, leftAlias, rightAlias, getLeftColName, getRightColName, computedJoin, }: GetJoinOnConditionArgs) => string[];
 export declare const getJoinOnCondition: (args: GetJoinOnConditionArgs) => string;
 export {};
 //# sourceMappingURL=getTableJoinQuery.d.ts.map

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;~~AAEtD~~,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,cAAc,EAAE,CAAC;~~CACxB~~,CAAC;AACF,eAAO,MAAM,iBAAiB,GAAI,~~mEAM~~/B,iBAAiB,KAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;~~CA6D1D~~,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,EAAE,WAAW,MAAM,KAAG,YAIpE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,~~iEAMjC,~~sBAAsB,~~aAQxB~~,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,sBAAsB,WAE9D,CAAC"}
1	+ {"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C,CAAC;AACF,eAAO,MAAM,iBAAiB,GAAI,uGAQ/B,iBAAiB,KAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CA8E1D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,EAAE,WAAW,MAAM,KAAG,YAIpE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,+EAOjC,sBAAsB,aAaxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,sBAAsB,WAE9D,CAAC"}

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js CHANGED Viewed

@@ -2,21 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJoinOnCondition = exports.getJoinOnConditions = exports.getTableJoinAlias = exports.getTableJoinQuery = void 0;
 const prostgles_types_1 = require("prostgles-types");
-const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableExpression, }) => {
+const computedJoins_1 = require("../joins/computedJoins");
+const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableExpression, rootJoinColumns, targetJoinColumns, }) => {
     const [firstPath] = path;
     if (!firstPath) {
         throw `Cannot create join query for empty path`;
     }
     const getTableAlias = (table, pathIndex) => (0, exports.getTableJoinAlias)(table, pathIndex).escaped;
     const query = path
-        .map(({ table, on }, i) => {
+        .map(({ table, on, computedJoin }, i) => {
         const tableName = table;
         const tableAlias = getTableAlias(table, i);
         const prevTableAlias = i === 0 ? rootTableAlias : getTableAlias(path[i - 1].table, i - 1);
         const onCondition = (0, exports.getJoinOnCondition)({
             on,
+            computedJoin,
             leftAlias: prevTableAlias,
             rightAlias: tableAlias,
+            getLeftColName: (column) => (0, prostgles_types_1.asName)(computedJoin && !i ? (rootJoinColumns?.[column] ?? column) : column),
+            getRightColName: (column) => (0, prostgles_types_1.asName)(computedJoin && i === path.length - 1 ?
+                (targetJoinColumns?.[column] ?? column)
+                : column),
         });
         const isExists = type === "EXISTS";
         const joinType = isExists ? "INNER" : type;
@@ -30,9 +36,13 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableE
         const whereJoinCondition = isLast && isExists ?
             `WHERE (${[
                 (0, exports.getJoinOnCondition)({
-                    on: firstPath.on,
+                    ...firstPath,
                     leftAlias: rootTableAlias,
                     rightAlias: getTableAlias(firstPath.table, 0),
+                    getLeftColName: (column) => (0, prostgles_types_1.asName)(firstPath.computedJoin ? (rootJoinColumns?.[column] ?? column) : column),
+                    getRightColName: (column) => (0, prostgles_types_1.asName)(firstPath.computedJoin && path.length === 1 ?
+                        (targetJoinColumns?.[column] ?? column)
+                        : column),
                 }),
                 finalWhere,
             ]
@@ -62,7 +72,12 @@ const getTableJoinAlias = (table, pathIndex) => {
     return { raw, escaped: (0, prostgles_types_1.asName)(raw) };
 };
 exports.getTableJoinAlias = getTableJoinAlias;
-const getJoinOnConditions = ({ on, leftAlias, rightAlias, getLeftColName = prostgles_types_1.asName, getRightColName = prostgles_types_1.asName, }) => {
+const getJoinOnConditions = ({ on, leftAlias, rightAlias, getLeftColName = prostgles_types_1.asName, getRightColName = prostgles_types_1.asName, computedJoin, }) => {
+    if (computedJoin) {
+        return [
+            (0, computedJoins_1.getComputedJoinSQL)(computedJoin, leftAlias, rightAlias, getLeftColName, getRightColName),
+        ];
+    }
     return on.map((constraint) => Object.entries(constraint)
         .map(([leftCol, rightCol]) => {
         return `${leftAlias}.${getLeftColName(leftCol)} = ${rightAlias}.${getRightColName(rightCol)}`;