proto.io 0.0.213 → 0.0.215

package/dist/client.d.ts

@@ -1,7 +1,7 @@
-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';
+import { P as ProtoClient } from './internals/index-CZUGnb-y.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-CZUGnb-y.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-Boxwkqe0.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-YLrO0f2D.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';
 import '@socket.io/component-emitter';

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-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 { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-YLrO0f2D.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-YLrO0f2D.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-NF-U_3zG.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-CZUGnb-y.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var random = require('./internals/random-DzvxbWAc.js');
+var validator = require('./internals/validator-m6wY35c6.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
 var index = require('./internals/index-DfnPpl1I.js');
@@ -12,11 +12,11 @@ var index$1 = require('./internals/index-B8TESzd9.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
 var node_stream = require('node:stream');
+var random = require('./internals/random-nkOQ9U6S.js');
 var node_crypto = require('node:crypto');
 var util = require('util');
 var cryptoJs = require('@o2ter/crypto-js');
 var _const = require('./internals/const-C3I6cfav.js');
-var index$2 = require('./internals/index-D8O7SinR.js');
 var Decimal = require('decimal.js');
 var queryType = require('query-types');
 var busboy = require('busboy');
@@ -85,15 +85,15 @@ const normalize = (x) => {
 const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.objectId]));
 const dispatcher = (proto, options) => {
     const acls = async () => options.master ? [] : await fetchUserPerms(proto);
-    const validator = async () => new random.QueryValidator(proto, await acls(), {
+    const validator$1 = async () => new validator.QueryValidator(proto, await acls(), {
         master: options.master ?? false,
         disableSecurity: options.disableSecurity,
     });
     const createFile = options.createFile;
     return {
         async explain(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             const decoded = _validator.decodeQuery(normalize(query), 'read');
             const isGet = _validator.isGetMethod(decoded.filter);
             if (!_validator.validateCLPs(query.className, isGet ? 'get' : 'find'))
@@ -101,15 +101,15 @@ const dispatcher = (proto, options) => {
             return proto.storage.explain(decoded);
         },
         async count(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             if (!_validator.validateCLPs(query.className, 'count'))
                 throw Error('No permission');
             return proto.storage.count(_validator.decodeQuery(normalize(query), 'read'));
         },
         async find(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             const decoded = _validator.decodeQuery(normalize(query), 'read');
             const isGet = _validator.isGetMethod(decoded.filter);
             if (!_validator.validateCLPs(query.className, isGet ? 'get' : 'find'))
@@ -117,8 +117,8 @@ const dispatcher = (proto, options) => {
             return proto.storage.find(decoded);
         },
         async nonrefs(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             const decoded = _validator.decodeQuery(normalize(query), 'read');
             const isGet = _validator.isGetMethod(decoded.filter);
             if (!_validator.validateCLPs(query.className, isGet ? 'get' : 'find'))
@@ -126,27 +126,27 @@ const dispatcher = (proto, options) => {
             return proto.storage.nonrefs(decoded);
         },
         async random(query, opts) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             const decoded = _validator.decodeQuery(normalize(query), 'read');
             const isGet = _validator.isGetMethod(decoded.filter);
             if (!_validator.validateCLPs(query.className, isGet ? 'get' : 'find'))
                 throw Error('No permission');
-            if (opts?.weight && !_validator.validateKey(query.className, opts.weight, 'read', random.QueryValidator.patterns.path))
+            if (opts?.weight && !_validator.validateKey(query.className, opts.weight, 'read', validator.QueryValidator.patterns.path))
                 throw Error('No permission');
             return proto.storage.random(decoded, opts);
         },
         async insert(options, values) {
             if (!createFile && options.className === 'File')
                 throw Error('File is not support insert');
-            random.QueryValidator.recursiveCheck(values);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(values);
+            const _validator = await validator$1();
             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');
-            const _attrs = normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', random.QueryValidator.patterns.path)));
+            const _attrs = normalize(_.map(values, attr => _validator.validateFields(options.className, attr, 'create', validator.QueryValidator.patterns.path)));
             while (true) {
                 try {
                     return await proto.storage.atomic((storage) => storage.insert({
@@ -165,22 +165,22 @@ const dispatcher = (proto, options) => {
             }
         },
         async update(query, update) {
-            random.QueryValidator.recursiveCheck(query, update);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query, update);
+            const _validator = await validator$1();
             if (!_validator.validateCLPs(query.className, 'update'))
                 throw Error('No permission');
-            return proto.storage.atomic((storage) => storage.update(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path))));
+            return proto.storage.atomic((storage) => storage.update(_validator.decodeQuery(normalize(query), 'update'), normalize(_validator.validateFields(query.className, update, 'update', validator.QueryValidator.patterns.path))));
         },
         async upsert(query, update, setOnInsert) {
             if (query.className === 'File')
                 throw Error('File is not support upsert');
-            random.QueryValidator.recursiveCheck(query, update, setOnInsert);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query, update, setOnInsert);
+            const _validator = await validator$1();
             if (!_validator.validateCLPs(query.className, 'create', 'update'))
                 throw Error('No permission');
             const _query = _validator.decodeQuery(normalize(query), 'update');
-            const _update = normalize(_validator.validateFields(query.className, update, 'update', random.QueryValidator.patterns.path));
-            const _setOnInsert = normalize(_validator.validateFields(query.className, setOnInsert, 'create', random.QueryValidator.patterns.path));
+            const _update = normalize(_validator.validateFields(query.className, update, 'update', validator.QueryValidator.patterns.path));
+            const _setOnInsert = normalize(_validator.validateFields(query.className, setOnInsert, 'create', validator.QueryValidator.patterns.path));
             while (true) {
                 try {
                     return await proto.storage.atomic((storage) => storage.upsert(_query, _update, _setOnInsert), { lockTable: query.className, retry: true });
@@ -193,8 +193,8 @@ const dispatcher = (proto, options) => {
             }
         },
         async delete(query) {
-            random.QueryValidator.recursiveCheck(query);
-            const _validator = await validator();
+            validator.QueryValidator.recursiveCheck(query);
+            const _validator = await validator$1();
             if (!_validator.validateCLPs(query.className, 'delete'))
                 throw Error('No permission');
             return proto.storage.atomic((storage) => storage.delete(_validator.decodeQuery(normalize(query), 'update')));
@@ -430,7 +430,7 @@ class ProtoRelationQuery extends _ProtoQuery {
     }
     get className() {
         const { className, key } = this._opts.relatedBy;
-        const { dataType } = random.resolveColumn(this._proto.schema, className, key);
+        const { dataType } = validator.resolveColumn(this._proto.schema, className, key);
         if (!index$1.isPointer(dataType) && !index$1.isRelation(dataType))
             throw Error(`Invalid relation key: ${key}`);
         return dataType.target;
@@ -693,7 +693,7 @@ const validateForeignField = (schema, key, dataType) => {
         return;
     if (_.isNil(schema[dataType.target]))
         throw Error(`Invalid foreign field: ${key}`);
-    const foreignField = random.resolveDataType(schema, dataType.target, dataType.foreignField);
+    const foreignField = validator.resolveDataType(schema, dataType.target, dataType.foreignField);
     if (_.isNil(foreignField))
         throw Error(`Invalid foreign field: ${key}`);
     if (index$1.isPrimitive(foreignField))
@@ -705,7 +705,7 @@ 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.fieldName))
+        if (!key.match(validator.QueryValidator.patterns.fieldName))
             throw Error(`Invalid field name: ${key}`);
         if (index$1.isShape(type)) {
             validateShapedObject(schema, type);
@@ -729,10 +729,10 @@ const validateSchemaName = (schema) => {
 };
 const validateSchema = (schema) => {
     for (const [className, _schema] of _.toPairs(schema)) {
-        if (!className.match(random.QueryValidator.patterns.className))
+        if (!className.match(validator.QueryValidator.patterns.className))
             throw Error(`Invalid class name: ${className}`);
         for (const [key, dataType] of _.toPairs(_schema.fields)) {
-            if (!key.match(random.QueryValidator.patterns.fieldName))
+            if (!key.match(validator.QueryValidator.patterns.fieldName))
                 throw Error(`Invalid field name: ${key}`);
             if (index$1.isShape(dataType)) {
                 validateShapedObject(schema, dataType);
@@ -797,7 +797,7 @@ class ProtoInternal {
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
         validateSchema(schema);
         if (!_.every(options.roleResolver?.inheritKeys, k => {
-            const type = random.resolveDataType(schema, 'Role', k);
+            const type = validator.resolveDataType(schema, 'Role', k);
             return type && index$1.isRelation(type) && _.includes(['User', 'Role'], type.target);
         })) {
             throw Error(`Invalid role keys`);
@@ -1096,7 +1096,7 @@ class ProtoInternal {
         };
     }
     liveQuery(proto, event, className, filter, callback) {
-        const _filter = _.isEmpty(filter) ? true : index$2.QuerySelector.decode(filter);
+        const _filter = _.isEmpty(filter) ? true : validator.QuerySelector.decode(filter);
         return this._liveQuery(proto, (ev, objs) => {
             if (event !== ev)
                 return;
@@ -1596,11 +1596,11 @@ class ProtoService extends index.ProtoType {
         const defaultResolver = async () => {
             const schema = self.schema;
             const userKeys = _.filter(inheritKeys, k => {
-                const type = random.resolveDataType(schema, 'Role', k);
+                const type = validator.resolveDataType(schema, 'Role', k);
                 return !!type && index$1.isRelation(type) && type.target === 'User';
             });
             const roleKeys = _.filter(inheritKeys, k => {
-                const type = random.resolveDataType(schema, 'Role', k);
+                const type = validator.resolveDataType(schema, 'Role', k);
                 return !!type && index$1.isRelation(type) && type.target === 'Role';
             });
             let queue = await self.Query('Role')
@@ -1717,7 +1717,7 @@ class ProtoService extends index.ProtoType {
         return this[_private.PVK].notify(this, data);
     }
     listen(callback, selector) {
-        const _selector = !_.isNil(selector) ? index$2.QuerySelector.decode(selector) : undefined;
+        const _selector = !_.isNil(selector) ? validator.QuerySelector.decode(selector) : undefined;
         return this[_private.PVK].listen(this, async (data) => {
             if (_selector && !_selector.eval(data))
                 return;
@@ -1740,7 +1740,7 @@ class ProtoService extends index.ProtoType {
             if (className === 'File') {
                 const found = this.storage.find({
                     className: 'File',
-                    filter: index$2.QuerySelector.decode({ _expired_at: { $lt: time } }),
+                    filter: validator.QuerySelector.decode({ _expired_at: { $lt: time } }),
                     matches: {},
                     groupMatches: {},
                     includes: ['_id', '_expired_at', 'token'],
@@ -1754,7 +1754,7 @@ class ProtoService extends index.ProtoType {
             }
             await this.storage.delete({
                 className,
-                filter: index$2.QuerySelector.decode({ _expired_at: { $lt: time } }),
+                filter: validator.QuerySelector.decode({ _expired_at: { $lt: time } }),
                 includes: ['_id', '_expired_at'],
                 matches: {},
                 groupMatches: {},
@@ -2597,7 +2597,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
         const connect = async (token) => {
             const payload = await proto.connectWithSessionToken(token);
             const { remove: remove_basic } = payload.listen(data => {
-                const ids = _.keys(_.pickBy(events, v => v instanceof index$2.QuerySelector ? v.eval(data) : v));
+                const ids = _.keys(_.pickBy(events, v => v instanceof validator.QuerySelector ? v.eval(data) : v));
                 const payload = JSON.parse(index.serialize(data));
                 if (!_.isEmpty(ids))
                     socket.emit('ON_EV_NOTIFY', { ids, data: payload });
@@ -2608,7 +2608,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
                     ids[obj.objectId] = _.keys(_.pickBy(queries, v => {
                         if (v.event !== ev || v.className !== obj.className)
                             return false;
-                        return v.filter instanceof index$2.QuerySelector ? v.filter.eval(obj) : v.filter;
+                        return v.filter instanceof validator.QuerySelector ? v.filter.eval(obj) : v.filter;
                     }));
                 }
                 if (_.isEmpty(ids))
@@ -2635,7 +2635,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
                 if (_.isBoolean(v))
                     return true;
                 try {
-                    return index$2.QuerySelector.decode(v);
+                    return validator.QuerySelector.decode(v);
                 }
                 catch (error) {
                     proto.logger.error(error);
@@ -2649,7 +2649,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
                 if (_.isBoolean(v))
                     return { event, className, filter: true };
                 try {
-                    return { event, className, filter: index$2.QuerySelector.decode(filter) };
+                    return { event, className, filter: validator.QuerySelector.decode(filter) };
                 }
                 catch (error) {
                     proto.logger.error(error);