proto.io 0.0.153 → 0.0.155

package/dist/adapters/storage/progres.mjs

@@ -7,7 +7,7 @@ import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
 import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-tU-lsQqj.mjs';
 import '@o2ter/crypto-js';
-import { _ as _resolveColumn, g as generateId, Q as QueryValidator } from '../../internals/random-KZTFMK9-.mjs';
+import { _ as _resolveColumn, g as generateId, Q as QueryValidator } from '../../internals/random-DXre8Q46.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //
@@ -282,35 +282,38 @@ class QueryCompiler {
     }
     _baseSelectQuery(query, options) {
         const context = this._makeContext(query);
-        const populates = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, context, populate));
-        const stages = _.fromPairs(_.flatMap(_.values(populates), (p) => _.toPairs(p)));
+        const _stages = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, context, populate));
+        const stages = _.fromPairs(_.flatMap(_.values(_stages), (p) => _.toPairs(p)));
         const fetchName = `_fetch_$${query.className.toLowerCase()}`;
-        const _filter = this._encodeFilter(context, { className: query.className, name: fetchName }, query.filter);
-        const _populates = this._selectPopulateMap(context, query.className, fetchName);
-        const _joins = _.compact(_.map(_populates, ({ join }) => join));
-        const _includes = {
+        const parent = { className: query.className, name: fetchName };
+        const baseFilter = this._encodeFilter(context, parent, query.filter);
+        const populates = this._selectPopulateMap(context, query.className, fetchName);
+        const joins = _.compact(_.map(populates, ({ join }) => join));
+        const includes = {
             literal: [
                 ...this._selectIncludes(fetchName, context.includes),
-                ..._.flatMap(_populates, ({ columns }) => columns),
+                ..._.flatMap(populates, ({ columns }) => columns),
             ],
             separator: ',\n',
         };
         const _options = _.isFunction(options) ? options({ fetchName }) : options;
+        const filter = _.compact([
+            baseFilter,
+            _options?.extraFilter,
+            query.relatedBy && this.dialect.encodeRelation(this, context, parent, query.relatedBy),
+        ]);
         return {
             stages,
             fetchName,
             context: context,
             query: sql `
         SELECT ${_options?.select ? _options?.select : sql `*`} FROM (
-          SELECT ${_includes}
+          SELECT ${includes}
           FROM ${{ identifier: query.className }} AS ${{ identifier: fetchName }}
-          ${!_.isEmpty(_joins) ? { literal: _joins, separator: '\n' } : sql ``}
+          ${!_.isEmpty(joins) ? { literal: joins, separator: '\n' } : sql ``}
           ${this.selectLock ? this.isUpdate ? sql `FOR UPDATE NOWAIT` : sql `FOR SHARE NOWAIT` : sql ``}
         ) AS ${{ identifier: fetchName }}
-        ${_filter || _options?.extraFilter ? sql `WHERE ${{
-                literal: _.map(_.compact([_filter, _options?.extraFilter]), x => sql `(${x})`),
-                separator: ' AND '
-            }}` : sql ``}
+        ${!_.isEmpty(filter) ? sql `WHERE ${{ literal: _.map(filter, x => sql `(${x})`), separator: ' AND ' }}` : sql ``}
         ${_options?.sort ? _options?.sort : sql ``}
         ${!_.isEmpty(query.sort) ? sql `ORDER BY ${this._encodeSort(query.sort, { className: query.className, name: fetchName })}` : sql ``}
         ${query.limit ? sql `LIMIT ${{ literal: `${query.limit}` }}` : sql ``}
@@ -2289,6 +2292,43 @@ const encodePopulate = (compiler, context, parent, remix) => {
     });
 };
 
+//
+//  relation.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+const encodeRelation = (compiler, context, parent, relatedBy) => {
+    const name = `_relation_$${relatedBy.className.toLowerCase()}`;
+    const _local = (field) => sql `${{ identifier: parent.name }}.${{ identifier: field }}`;
+    const _foreign = (field) => sql `${{ identifier: name }}.${{ identifier: field }}`;
+    return sql `
+  EXISTS (
+    SELECT 1
+    FROM ${{ identifier: relatedBy.className }} AS ${{ identifier: name }}
+    WHERE ${_foreign('_id')} = ${{ value: relatedBy.objectId }} AND ${sql `(${{ quote: parent.className + '$' }} || ${_local('_id')})`} = ANY(${_foreign(relatedBy.key)})
+  )
+  `;
+};
+
 //
 //  index.ts
 //
@@ -2325,6 +2365,7 @@ const PostgresDialect = {
     encodeFieldExpression,
     encodeQueryExpression,
     encodePopulate,
+    encodeRelation,
     encodeSortKey,
     random,
 };