proto.io 0.0.210 → 0.0.212

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-ycCeBd0S.mjs';
+import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-CufRbivU.mjs';
 import { P as PVK } from './internals/private-CNw40LZ7.mjs';
 import { prototypes, asyncStream, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-BgSBzm-K.mjs';
-export { b as ProtoClient, c as classExtends, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser } from './internals/index-BgSBzm-K.mjs';
+import { L as LiveQuerySubscription, T as TQuery, d as deserialize, s as serialize, a as TUser, P as ProtoType, _ as _logLevels } from './internals/index-ZPbBr9Db.mjs';
+export { b as ProtoClient, c as classExtends, h as isFile, j as isJob, e as isObject, i as isQuery, g as isRole, f as isUser } from './internals/index-ZPbBr9Db.mjs';
 import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-al1N-qi7.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -13,7 +13,7 @@ import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
 import { P as PROTO_NOTY_MSG, a as PROTO_LIVEQUERY_MSG, M as MASTER_USER_HEADER_NAME, b as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/const-Dkp7Nsv5.mjs';
-import { Q as QuerySelector } from './internals/index-DPPLcZx8.mjs';
+import { Q as QuerySelector } from './internals/index-DG9HHO_U.mjs';
 export { Decimal } from 'decimal.js';
 import queryType from 'query-types';
 import busboy from 'busboy';
@@ -138,8 +138,8 @@ const dispatcher = (proto, options) => {
                 throw Error('File is not support insert');
             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');
@@ -150,7 +150,7 @@ const dispatcher = (proto, options) => {
                         className: options.className,
                         includes: _includes,
                         matches: _matches,
-                        countMatches: options.countMatches ?? [],
+                        groupMatches: _groupMatches,
                         objectIdSize: proto[PVK].options.objectIdSize
                     }, _attrs), { lockTable: options.className, retry: true });
                 }
@@ -378,7 +378,7 @@ class _ProtoQuery extends TQuery {
             className: this.className,
             includes: this[PVK].options.includes,
             matches: this[PVK].options.matches,
-            countMatches: this[PVK].options.countMatches,
+            groupMatches: this[PVK].options.groupMatches,
         }, values));
         if (!options?.silent)
             this._on_upsert(objs);
@@ -1077,14 +1077,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);
@@ -1740,7 +1739,7 @@ class ProtoService extends ProtoType {
                     className: 'File',
                     filter: QuerySelector.decode({ _expired_at: { $lt: time } }),
                     matches: {},
-                    countMatches: [],
+                    groupMatches: {},
                     includes: ['_id', '_expired_at', 'token'],
                     objectIdSize: 0
                 });
@@ -1755,7 +1754,7 @@ class ProtoService extends ProtoType {
                 filter: QuerySelector.decode({ _expired_at: { $lt: time } }),
                 includes: ['_id', '_expired_at'],
                 matches: {},
-                countMatches: [],
+                groupMatches: {},
                 objectIdSize: 0
             });
         }