proto.io 0.0.153 → 0.0.155

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-m4WmZoWj.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-BLVOKfv3.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DSU589g6.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-m4WmZoWj.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.js';
+import { P as ProtoService } from '../../internals/index-BLVOKfv3.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DSU589g6.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-m4WmZoWj.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DeD3CiUK.js';
+import { P as ProtoService } from '../../internals/index-BLVOKfv3.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-DSU589g6.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, n as EventData, T as TSchema, o as DecodedQuery, F as FindOptions, Q as QuerySelector, p as DecodedSortOption, I as InsertOptions, q as TValue, r as FindOneOptions, t as TUpdateOp, u as FieldSelectorExpression, v as QueryExpression, w as TStorage, x as TransactionOptions, h as TObject, y as TQueryRandomOptions, z as TPubSub } from '../../internals/index-m4WmZoWj.js';
+import { _ as _TValue, n as EventData, T as TSchema, o as DecodedQuery, F as FindOptions, R as RelationOptions, Q as QuerySelector, p as DecodedSortOption, I as InsertOptions, q as TValue, r as FindOneOptions, t as TUpdateOp, u as FieldSelectorExpression, v as QueryExpression, w as TStorage, x as TransactionOptions, h as TObject, y as TQueryRandomOptions, z as TPubSub } from '../../internals/index-BLVOKfv3.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';
@@ -85,7 +85,7 @@ declare class QueryCompiler {
     private _encodeIncludes;
     private _baseSelectQuery;
     private _refetch;
-    _selectQuery(query: DecodedQuery<FindOptions>, options?: _SelectOptions | ((x: {
+    _selectQuery(query: DecodedQuery<FindOptions & RelationOptions>, options?: _SelectOptions | ((x: {
         fetchName: string;
     }) => _SelectOptions)): SQL;
     private _modifyQuery;
@@ -134,6 +134,10 @@ interface SqlDialect {
         className: string;
         name: string;
     }): Record<string, SQL>;
+    encodeRelation(compiler: QueryCompiler, context: CompileContext, parent: {
+        className: string;
+        name: string;
+    }, relatedBy: NonNullable<RelationOptions['relatedBy']>): SQL;
     encodeSortKey(compiler: QueryCompiler, parent: {
         className?: string;
         name: string;
@@ -188,13 +192,13 @@ declare abstract class SqlStorage implements TStorage {
     protected abstract _query(text: string, values: any[]): ReturnType<typeof asyncStream<any>>;
     abstract _refs(schema: Record<string, TSchema>, className: string, keys: string[], item: SQL): SQL;
     query(sql: SQL): _o2ter_utils_js.AsyncStream<any>;
-    abstract _explain(compiler: QueryCompiler, query: DecodedQuery<FindOptions>): PromiseLike<any>;
+    abstract _explain(compiler: QueryCompiler, query: DecodedQuery<FindOptions & RelationOptions>): PromiseLike<any>;
     private _decodeShapedObject;
     protected _decodeObject(className: string, attrs: Record<string, any>): TObject;
-    explain(query: DecodedQuery<FindOptions>): Promise<any>;
-    count(query: DecodedQuery<FindOptions>): Promise<number>;
-    find(query: DecodedQuery<FindOptions>): AsyncGenerator<TObject, void, unknown>;
-    random(query: DecodedQuery<FindOptions>, opts?: TQueryRandomOptions): AsyncGenerator<TObject, void, unknown>;
+    explain(query: DecodedQuery<FindOptions & RelationOptions>): Promise<any>;
+    count(query: DecodedQuery<FindOptions & RelationOptions>): Promise<number>;
+    find(query: DecodedQuery<FindOptions & RelationOptions>): AsyncGenerator<TObject, void, unknown>;
+    random(query: DecodedQuery<FindOptions & RelationOptions>, opts?: TQueryRandomOptions): AsyncGenerator<TObject, void, unknown>;
     refs(object: TObject, classNames: string[], roles?: string[]): AsyncGenerator<TObject, void, unknown>;
     nonrefs(query: DecodedQuery<FindOptions>): AsyncGenerator<TObject, void, unknown>;
     insert(options: InsertOptions, attrs: Record<string, TValue>): Promise<TObject | undefined>;

package/dist/adapters/storage/progres.js

@@ -11,7 +11,7 @@ var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
 var index$1 = require('../../internals/index-CSNRyhjB.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-DBDmz54D.js');
+var random$1 = require('../../internals/random-DfnhGdY1.js');
 var _private = require('../../internals/private-CSB1Ep4g.js');
 
 //
@@ -286,35 +286,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 ``}
@@ -2293,6 +2296,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
 //
@@ -2329,6 +2369,7 @@ const PostgresDialect = {
     encodeFieldExpression,
     encodeQueryExpression,
     encodePopulate,
+    encodeRelation,
     encodeSortKey,
     random,
 };