proto.io 0.0.182 → 0.0.184

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-YpB-hXxf.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-CvKCWBvj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CWGYv9An.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-YpB-hXxf.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.js';
+import { P as ProtoService } from '../../internals/index-CvKCWBvj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CWGYv9An.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-YpB-hXxf.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-BZupzq1Y.js';
+import { P as ProtoService } from '../../internals/index-CvKCWBvj.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-CWGYv9An.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, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-YpB-hXxf.js';
+import { _ as _TValue, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-CvKCWBvj.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

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-DjrC854w.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-CDtFUuES.js');
+var random$1 = require('../../internals/random-80Vpxbxh.js');
 var _private = require('../../internals/private-Ciddhure.js');
 
 //

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-D9AowvHp.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-BSyWEK8G.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-BtYyzHJD.mjs';
 import { P as PVK } from '../../internals/private-CNw40LZ7.mjs';
 
 //

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-cKx59cIc.js';
-export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-cKx59cIc.js';
+import { P as ProtoClient } from './internals/index-CT5PbMDJ.js';
+export { c as classExtends, e as isFile, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-CT5PbMDJ.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-YpB-hXxf.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TSerializable, e as deserialize, s as serialize } from './internals/index-CvKCWBvj.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-BnDahEvz.js');
+var index = require('./internals/index-BEK58Z0z.js');
 var Decimal = require('decimal.js');
 require('./internals/index-DRq6T_5w.js');
 require('lodash');

package/dist/client.mjs

@@ -1,5 +1,5 @@
-import { e as ProtoClient } from './internals/index-CmJh3t_k.mjs';
-export { f as classExtends, d as deserialize, k as isFile, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-CmJh3t_k.mjs';
+import { e as ProtoClient } from './internals/index-CQdNVgOu.mjs';
+export { f as classExtends, d as deserialize, k as isFile, g as isObject, i as isQuery, j as isRole, h as isUser, s as serialize } from './internals/index-CQdNVgOu.mjs';
 export { Decimal } from 'decimal.js';
 import './internals/index-DyjcBbS1.mjs';
 import 'lodash';

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 import * as socket_io from 'socket.io';
 import { Router } from 'express';
 import { Server } from '@o2ter/server-js';
-import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-YpB-hXxf.js';
-export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-YpB-hXxf.js';
+import { T as TSchema, _ as _TValue, P as ProtoService, a as ProtoServiceOptions, b as ProtoServiceKeyOptions } from './internals/index-CvKCWBvj.js';
+export { D as DeserializeOptions, S as SerializeOptions, c as TFileStorage, d as TSerializable, e as deserialize, s as serialize } from './internals/index-CvKCWBvj.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-cKx59cIc.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-CT5PbMDJ.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-CDtFUuES.js');
+var random = require('./internals/random-80Vpxbxh.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-BnDahEvz.js');
+var index = require('./internals/index-BEK58Z0z.js');
 var index$1 = require('./internals/index-DRq6T_5w.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -82,9 +82,12 @@ const normalize = (x) => {
 //  THE SOFTWARE.
 //
 const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.objectId]));
-const dispatcher = (proto, options, disableSecurity) => {
+const dispatcher = (proto, options) => {
     const acls = async () => options.master ? [] : await fetchUserPerms(proto);
-    const validator = async () => new random.QueryValidator(proto, await acls(), options.master ?? false, disableSecurity);
+    const validator = async () => new random.QueryValidator(proto, await acls(), {
+        master: options.master ?? false,
+        disableSecurity: options.disableSecurity,
+    });
     return {
         async explain(query) {
             random.QueryValidator.recursiveCheck(query);
@@ -318,11 +321,17 @@ class _ProtoQuery extends index.TQuery {
         };
     }
     _dispatcher(options) {
+        const schema = this._proto.schema[this.className];
+        if (_.isNil(schema))
+            throw Error('Invalid className');
         if (this._opts.insecure) {
             if (options?.master !== true)
                 throw Error('No permission');
         }
-        return dispatcher(_serviceOf(options) ?? this._proto, options ?? {}, !!this._opts.insecure);
+        return dispatcher(_serviceOf(options) ?? this._proto, {
+            ...options ?? {},
+            disableSecurity: !!this._opts.insecure,
+        });
     }
     explain(options) {
         return this._dispatcher(options).explain(this._queryOptions);
@@ -728,6 +737,8 @@ const validateForeignField = (schema, key, dataType) => {
         throw Error(`Invalid foreign field: ${key}`);
 };
 const validateShapedObject = (schema, dataType) => {
+    if (_.isEmpty(dataType.shape))
+        throw Error('Invalid empty shape');
     for (const [key, type] of _.entries(dataType.shape)) {
         if (!key.match(random.QueryValidator.patterns.name))
             throw Error(`Invalid field name: ${key}`);
@@ -1302,7 +1313,8 @@ const fetchSessionInfo = async (proto, userId) => {
     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 _user = _.isString(userId) ? await proto.Query('User').get(userId, { master: true }) : undefined;
+            const user = proto.req ? await proto[_private.PVK].options.userResolver(proto, _user) : _user;
             const _roles = user instanceof index.TUser ? _.filter(await proto.userRoles(user), x => !_.isEmpty(x.name)) : [];
             cache[userId] = undefined;
             return { user, _roles };
@@ -1454,6 +1466,7 @@ class ProtoService extends index.ProtoType {
     constructor(options) {
         super();
         this[_private.PVK] = new ProtoInternal({
+            userResolver: (_req, user) => user,
             roleResolver: {},
             objectIdSize: 10,
             maxFetchLimit: 1000,