proto.io 0.0.210 → 0.0.212

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoClient } from './internals/index-l-Mk0lCc.js';
-export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-l-Mk0lCc.js';
+import { P as ProtoClient } from './internals/index-NF-U_3zG.js';
+export { c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-NF-U_3zG.js';
 export { Decimal } from 'decimal.js';
-export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-DIRjiWPh.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Boxwkqe0.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-Clo9hepf.js');
+var index = require('./internals/index-DfnPpl1I.js');
 var Decimal = require('decimal.js');
 require('@o2ter/utils-js');
 require('./internals/private-Ciddhure.js');

package/dist/client.mjs

@@ -1,5 +1,5 @@
-import { b as ProtoClient } from './internals/index-BgSBzm-K.mjs';
-export { c as classExtends, d as deserialize, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser, s as serialize } from './internals/index-BgSBzm-K.mjs';
+import { b as ProtoClient } from './internals/index-ZPbBr9Db.mjs';
+export { c as classExtends, d as deserialize, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser, s as serialize } from './internals/index-ZPbBr9Db.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';

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, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-DIRjiWPh.js';
-export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-DIRjiWPh.js';
+import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-Boxwkqe0.js';
+export { D as DeserializeOptions, S as SerializeOptions, d as TFileStorage, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Boxwkqe0.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-l-Mk0lCc.js';
+export { P as ProtoClient, c as classExtends, e as isFile, f as isJob, a as isObject, i as isQuery, d as isRole, b as isUser } from './internals/index-NF-U_3zG.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-CyU_Y2Ay.js');
+var random = require('./internals/random-DzvxbWAc.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-Clo9hepf.js');
+var index = require('./internals/index-DfnPpl1I.js');
 var index$1 = require('./internals/index-B8TESzd9.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
@@ -141,8 +141,8 @@ const dispatcher = (proto, options) => {
                 throw Error('File is not support insert');
             random.QueryValidator.recursiveCheck(values);
             const _validator = await validator();
-            _validator.validateCountMatches(options.className, options.countMatches ?? []);
-            const _includes = _validator.decodeIncludes(options.className, options.includes ?? ['*']);
+            const _groupMatches = _validator.decodeGroupMatches(options.className, options.groupMatches ?? {});
+            const _includes = _validator.decodeIncludes(options.className, options.includes ?? ['*'], _groupMatches);
             const _matches = _validator.decodeMatches(options.className, options.matches ?? {}, _includes);
             if (!_validator.validateCLPs(options.className, 'create'))
                 throw Error('No permission');
@@ -153,7 +153,7 @@ const dispatcher = (proto, options) => {
                         className: options.className,
                         includes: _includes,
                         matches: _matches,
-                        countMatches: options.countMatches ?? [],
+                        groupMatches: _groupMatches,
                         objectIdSize: proto[_private.PVK].options.objectIdSize
                     }, _attrs), { lockTable: options.className, retry: true });
                 }
@@ -381,7 +381,7 @@ class _ProtoQuery extends index.TQuery {
             className: this.className,
             includes: this[_private.PVK].options.includes,
             matches: this[_private.PVK].options.matches,
-            countMatches: this[_private.PVK].options.countMatches,
+            groupMatches: this[_private.PVK].options.groupMatches,
         }, values));
         if (!options?.silent)
             this._on_upsert(objs);
@@ -1080,14 +1080,13 @@ class ProtoInternal {
                 (async () => {
                     try {
                         const _roles = await roles;
-                        const payload = proto.rebind(_.filter(objects, object => {
-                            if (isMaster)
-                                return true;
+                        const payload = proto.rebind(isMaster ? objects : _.filter(objects, object => {
                             const acl = object.acl();
                             const clp = proto.schema[object.className].classLevelPermissions?.get ?? ['*'];
                             return _.some(_roles, x => _.includes(clp, x) && _.includes(acl.read, x));
                         }));
-                        await callback(event, payload);
+                        if (!_.isEmpty(payload))
+                            await callback(event, payload);
                     }
                     catch (e) {
                         proto.logger.error(e);
@@ -1743,7 +1742,7 @@ class ProtoService extends index.ProtoType {
                     className: 'File',
                     filter: index$2.QuerySelector.decode({ _expired_at: { $lt: time } }),
                     matches: {},
-                    countMatches: [],
+                    groupMatches: {},
                     includes: ['_id', '_expired_at', 'token'],
                     objectIdSize: 0
                 });
@@ -1758,7 +1757,7 @@ class ProtoService extends index.ProtoType {
                 filter: index$2.QuerySelector.decode({ _expired_at: { $lt: time } }),
                 includes: ['_id', '_expired_at'],
                 matches: {},
-                countMatches: [],
+                groupMatches: {},
                 objectIdSize: 0
             });
         }