proto.io 0.0.160 → 0.0.162

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-CXPH5Pup.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BraAbRER.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-C1NwI5ZD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-LYC1mup1.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/index-be1VYBY2.mjs';
-import { Q as QuerySelector } from '../../internals/index-tU-lsQqj.mjs';
+import { Q as QuerySelector } from '../../internals/index-S5Bq-KsU.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
 import 'util';
 import 'zlib';
 import '../../internals/private-BUpLAMZi.mjs';
-import '../../internals/index-BmRuvHVZ.mjs';
+import '../../internals/index-ByfpVHca.mjs';
 import 'decimal.js';
 
 //

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

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-CXPH5Pup.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BraAbRER.js';
+import { P as ProtoService } from '../../internals/index-C1NwI5ZD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-LYC1mup1.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-CXPH5Pup.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BraAbRER.js';
+import { P as ProtoService } from '../../internals/index-C1NwI5ZD.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-LYC1mup1.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, 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-CXPH5Pup.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-C1NwI5ZD.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.mjs

@@ -1,13 +1,13 @@
 import _ from 'lodash';
-import { a as isPointer, b as isRelation, i as isShape, d as decodeUpdateOp, s as shapePaths, e as isPrimitive, T as TObject, f as isVector, _ as _decodeValue, g as _encodeValue, h as dimensionOf, j as _typeof } from '../../internals/index-BmRuvHVZ.mjs';
+import { i as isPointer, a as isRelation, b as isShape, d as decodeUpdateOp, s as shapePaths, e as isPrimitive, T as TObject, f as isVector, _ as _decodeValue, g as _encodeValue, h as dimensionOf, j as _typeof } from '../../internals/index-ByfpVHca.mjs';
 import { Pool, types } from 'pg';
 import QueryStream from 'pg-query-stream';
 import { asyncStream } from '@o2ter/utils-js';
 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 { 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-S5Bq-KsU.mjs';
 import '@o2ter/crypto-js';
-import { a as resolveColumn, r as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-DifCxbl6.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-w8WDYQEe.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-sFLwlp-C.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-sFLwlp-C.js';
+import { P as ProtoClient } from './internals/index-DlvbXwIt.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DlvbXwIt.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-CXPH5Pup.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-C1NwI5ZD.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

package/dist/client.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-Bs06MNCK.js');
+var index = require('./internals/index-4YC13MvT.js');
 var Decimal = require('decimal.js');
 require('./internals/index-CVutVPmd.js');
 require('lodash');

package/dist/client.mjs

@@ -1,7 +1,7 @@
-import { c as ProtoClient } from './internals/index-B01TqoO1.mjs';
-export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-B01TqoO1.mjs';
+import { c as ProtoClient } from './internals/index-CupbSHHH.mjs';
+export { e as classExtends, d as deserialize, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser, s as serialize } from './internals/index-CupbSHHH.mjs';
 export { Decimal } from 'decimal.js';
-import './internals/index-BmRuvHVZ.mjs';
+import './internals/index-ByfpVHca.mjs';
 import 'lodash';
 import './internals/private-BUpLAMZi.mjs';
 import '@o2ter/utils-js';

package/dist/index.d.ts

@@ -2,11 +2,11 @@ import * as socket_io from 'socket.io';
 import * as socket_io_dist_typed_events from 'socket.io/dist/typed-events';
 import * as express_serve_static_core from 'express-serve-static-core';
 import { Server, RequestHandler } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-CXPH5Pup.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-CXPH5Pup.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-C1NwI5ZD.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-C1NwI5ZD.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-sFLwlp-C.js';
+export { P as ProtoClient, c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-DlvbXwIt.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -7,7 +7,7 @@ var serverJs = require('@o2ter/server-js');
 var random = require('./internals/random-uT4D0y_q.js');
 var _private = require('./internals/private-CSB1Ep4g.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-Bs06MNCK.js');
+var index = require('./internals/index-4YC13MvT.js');
 var index$1 = require('./internals/index-CVutVPmd.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -319,19 +319,19 @@ const _serviceOf = (options) => options?.session instanceof ProtoService ? optio
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
-class ProtoQuery extends index.TQuery {
+class _ProtoQuery extends index.TQuery {
     _proto;
     _opts;
-    constructor(className, proto, opts) {
-        super(className);
+    constructor(proto, opts) {
+        super();
         this._proto = proto;
         this._opts = opts;
     }
     get _queryOptions() {
         return {
+            ...this[_private.PVK].options,
             className: this.className,
             relatedBy: this._opts.relatedBy,
-            ...this[_private.PVK].options,
         };
     }
     _dispatcher(options) {
@@ -347,11 +347,6 @@ class ProtoQuery extends index.TQuery {
     count(options) {
         return this._dispatcher(options).count(this._queryOptions);
     }
-    clone(options) {
-        const clone = new ProtoQuery(this.className, this._proto, this._opts);
-        clone[_private.PVK].options = options ?? { ...this[_private.PVK].options };
-        return clone;
-    }
     _objectMethods(object) {
         return this._proto.rebind(object);
     }
@@ -541,6 +536,38 @@ class ProtoQuery extends index.TQuery {
         return this._dispatcher(options).deleteMany(this._queryOptions);
     }
 }
+class ProtoQuery extends _ProtoQuery {
+    _className;
+    constructor(className, proto, opts) {
+        super(proto, opts);
+        this._className = className;
+    }
+    get className() {
+        return this._className;
+    }
+    clone(options) {
+        const clone = new ProtoQuery(this.className, this._proto, this._opts);
+        clone[_private.PVK].options = options ?? { ...this[_private.PVK].options };
+        return clone;
+    }
+}
+class ProtoRelationQuery extends _ProtoQuery {
+    constructor(proto, opts) {
+        super(proto, opts);
+    }
+    get className() {
+        const { className, key } = this._opts.relatedBy;
+        const { dataType } = random.resolveColumn(this._proto.schema, className, key);
+        if (!index$1.isPointer(dataType) && !index$1.isRelation(dataType))
+            throw Error(`Invalid relation key: ${key}`);
+        return dataType.target;
+    }
+    clone(options) {
+        const clone = new ProtoRelationQuery(this._proto, this._opts);
+        clone[_private.PVK].options = options ?? { ...this[_private.PVK].options };
+        return clone;
+    }
+}
 
 //
 //  defaults.ts
@@ -1171,13 +1198,24 @@ const sessionId = (proto, request) => {
     const session = _session(proto, request);
     return sessionMap.get(request)?.sessionId ?? session?.sessionId;
 };
-const sessionInfoMap = new WeakMap();
+const userCacheMap = new WeakMap;
 const fetchSessionInfo = async (proto, userId) => {
-    const user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
-    const roles = user instanceof index.TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
+    if (!userId)
+        return {};
+    if (!userCacheMap.has(proto[_private.PVK]))
+        userCacheMap.set(proto[_private.PVK], {});
+    const cache = userCacheMap.get(proto[_private.PVK]);
+    if (_.isNil(cache[userId]))
+        cache[userId] = (async () => {
+            const user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
+            const _roles = user instanceof index.TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
+            cache[userId] = undefined;
+            return { user, _roles };
+        })();
+    const { user, _roles } = await cache[userId];
     return {
-        _roles: roles,
-        user: user instanceof index.TUser ? user : undefined,
+        user: user?.clone(),
+        _roles: _.map(_roles, x => x.clone()),
     };
 };
 const sessionWithToken = async (proto, token) => {
@@ -1189,6 +1227,7 @@ const sessionWithToken = async (proto, token) => {
         loginedAt: info?.user ? session?.loginedAt : undefined,
     };
 };
+const sessionInfoMap = new WeakMap();
 const session = async (proto, request) => {
     const session = _session(proto, request);
     const cached = sessionInfoMap.get(request);
@@ -1372,11 +1411,11 @@ class ProtoService extends index.ProtoType {
     Query(className) {
         return new ProtoQuery(className, this, {});
     }
-    Relation(className, object, key) {
+    Relation(object, key) {
         const objectId = object.objectId;
         if (!objectId)
             throw Error('Invalid object');
-        return new ProtoQuery(className, this, {
+        return new ProtoRelationQuery(this, {
             relatedBy: {
                 className: object.className,
                 objectId,
@@ -1661,64 +1700,70 @@ const verifyRelatedBy = (relatedBy) => {
         throw Error('Invalid option');
 };
 var classesRoute = (router, proto) => {
+    const defaultHandler = async (req) => {
+        const { name } = req.params;
+        const { operation, context, silent, random, attributes, update, setOnInsert, relatedBy, ...options } = index.deserialize(req.body);
+        verifyRelatedBy(relatedBy);
+        const payload = proto.connect(req);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
+        query[_private.PVK].options = options;
+        const opts = { master: payload.isMaster, context, silent };
+        switch (operation) {
+            case 'explain':
+                if (!payload.isMaster)
+                    throw Error('No permission');
+                return query.explain(opts);
+            case 'count': return query.count(opts);
+            case 'find':
+                {
+                    const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
+                    query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
+                    if (query[_private.PVK].options.limit > maxFetchLimit)
+                        throw Error('Query over limit');
+                    return await query.find(opts);
+                }
+            case 'random':
+                {
+                    const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
+                    query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
+                    if (query[_private.PVK].options.limit > maxFetchLimit)
+                        throw Error('Query over limit');
+                    return await query.random(random, opts);
+                }
+            case 'nonrefs':
+                {
+                    const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
+                    query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
+                    if (query[_private.PVK].options.limit > maxFetchLimit)
+                        throw Error('Query over limit');
+                    return await query.nonrefs(opts);
+                }
+            case 'insert': return query.insert(attributes, opts);
+            case 'insertMany': return query.insertMany(attributes, opts);
+            case 'updateOne': return query.updateOne(update, opts);
+            case 'upsertOne': return query.upsertOne(update, setOnInsert, opts);
+            case 'deleteOne': return query.deleteOne(opts);
+            case 'deleteMany': return query.deleteMany(opts);
+            default: throw Error('Invalid operation');
+        }
+    };
     router.post('/classes/:name', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
         const classes = proto.classes();
         if (!_.includes(classes, name))
             return res.sendStatus(404);
-        await response(res, async () => {
-            const { operation, context, silent, random, attributes, update, setOnInsert, relatedBy, ...options } = index.deserialize(req.body);
-            verifyRelatedBy(relatedBy);
-            const payload = proto.connect(req);
-            const query = relatedBy ? payload.Relation(name, payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
-            query[_private.PVK].options = options;
-            const opts = { master: payload.isMaster, context, silent };
-            switch (operation) {
-                case 'explain':
-                    if (!payload.isMaster)
-                        throw Error('No permission');
-                    return query.explain(opts);
-                case 'count': return query.count(opts);
-                case 'find':
-                    {
-                        const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
-                        query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
-                        if (query[_private.PVK].options.limit > maxFetchLimit)
-                            throw Error('Query over limit');
-                        return await query.find(opts);
-                    }
-                case 'random':
-                    {
-                        const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
-                        query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
-                        if (query[_private.PVK].options.limit > maxFetchLimit)
-                            throw Error('Query over limit');
-                        return await query.random(random, opts);
-                    }
-                case 'nonrefs':
-                    {
-                        const maxFetchLimit = payload[_private.PVK].options.maxFetchLimit;
-                        query[_private.PVK].options.limit = query[_private.PVK].options.limit ?? maxFetchLimit;
-                        if (query[_private.PVK].options.limit > maxFetchLimit)
-                            throw Error('Query over limit');
-                        return await query.nonrefs(opts);
-                    }
-                case 'insert': return query.insert(attributes, opts);
-                case 'insertMany': return query.insertMany(attributes, opts);
-                case 'updateOne': return query.updateOne(update, opts);
-                case 'upsertOne': return query.upsertOne(update, setOnInsert, opts);
-                case 'deleteOne': return query.deleteOne(opts);
-                case 'deleteMany': return query.deleteMany(opts);
-                default: throw Error('Invalid operation');
-            }
-        });
+        await response(res, () => defaultHandler(req));
+    });
+    router.post('/relation', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        await response(res, () => defaultHandler(req));
     });
     const createQuery = (payload, req, checkLimit) => {
         const { name } = req.params;
         const { filter, sort, includes, skip, limit, relatedBy, } = req.query;
         verifyRelatedBy(relatedBy);
-        const query = relatedBy ? payload.Relation(name, payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
         query[_private.PVK].options.filter = !_.isEmpty(filter) && _.isString(filter) ? _.castArray(index.deserialize(filter)) : [];
         query[_private.PVK].options.sort = _.isPlainObject(sort) && _.every(_.values(sort), _.isNumber) ? sort : undefined;
         query[_private.PVK].options.includes = _.isArray(includes) && _.every(includes, _.isString) ? includes : undefined;
@@ -1743,6 +1788,11 @@ var classesRoute = (router, proto) => {
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).find({ master: payload.isMaster }));
     });
+    router.get('/relation', queryType.middleware(), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        const payload = proto.connect(req);
+        await response(res, async () => createQuery(payload, req, true).find({ master: payload.isMaster }));
+    });
     router.get('/classes/:name/random', queryType.middleware(), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
@@ -1755,6 +1805,14 @@ var classesRoute = (router, proto) => {
             throw Error('Invalid operation');
         await response(res, async () => createQuery(payload, req, true).random({ weight }, { master: payload.isMaster }));
     });
+    router.get('/relation/random', queryType.middleware(), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        const payload = proto.connect(req);
+        const { weight } = req.query;
+        if (_.isEmpty(weight) || !_.isString(weight))
+            throw Error('Invalid operation');
+        await response(res, async () => createQuery(payload, req, true).random({ weight }, { master: payload.isMaster }));
+    });
     router.get('/classes/:name/nonrefs', queryType.middleware(), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name } = req.params;
@@ -1764,6 +1822,11 @@ var classesRoute = (router, proto) => {
         const payload = proto.connect(req);
         await response(res, async () => createQuery(payload, req, true).nonrefs({ master: payload.isMaster }));
     });
+    router.get('/relation/nonrefs', queryType.middleware(), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        const payload = proto.connect(req);
+        await response(res, async () => createQuery(payload, req, true).nonrefs({ master: payload.isMaster }));
+    });
     router.get('/classes/:name/:id', async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         const { name, id } = req.params;
@@ -1804,6 +1867,13 @@ var classesRoute = (router, proto) => {
         const payload = proto.connect(req);
         await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
     });
+    router.delete('/relation', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
+        res.setHeader('Cache-Control', ['no-cache', 'no-store']);
+        if (!_.isEmpty(req.body))
+            return res.sendStatus(400);
+        const payload = proto.connect(req);
+        await response(res, () => createQuery(payload, req, false).deleteMany({ master: payload.isMaster }));
+    });
     router.delete('/classes/:name/:id', serverJs.Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
         if (!_.isEmpty(req.body))