proto.io 0.0.217 → 0.0.219

package/dist/client.d.ts

@@ -1,6 +1,6 @@
-import { P as ProtoClient } from './internals/index-BRIlS3mY.js';
-export { c as classExtends } from './internals/index-BRIlS3mY.js';
-export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-Bs8n7Q8f.js';
+import { P as ProtoClient } from './internals/index-CWhqANZM.js';
+export { c as classExtends } from './internals/index-CWhqANZM.js';
+export { D as DeserializeOptions, S as SerializeOptions, e as TNumber, f as TSerializable, g as deserialize, s as serialize } from './internals/index-82GLvDiN.js';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import 'socket.io-client';

package/dist/client.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./internals/index-DylUjD_1.js');
+var index = require('./internals/index-xHeu-AjT.js');
 var Decimal = require('decimal.js');
 require('@o2ter/utils-js');
 require('./internals/private-Ciddhure.js');
 require('lodash');
-require('./internals/index-B8TESzd9.js');
+require('./internals/index-CLKTEIj0.js');
 require('axios');
 require('./internals/const-C3I6cfav.js');
 require('@o2ter/server-js/dist/const');

package/dist/client.mjs

@@ -1,10 +1,10 @@
-import { b as ProtoClient } from './internals/index-DfqABzjr.mjs';
-export { c as classExtends, d as deserialize, s as serialize } from './internals/index-DfqABzjr.mjs';
+import { b as ProtoClient } from './internals/index-CZ5fKgiJ.mjs';
+export { c as classExtends, d as deserialize, s as serialize } from './internals/index-CZ5fKgiJ.mjs';
 export { Decimal } from 'decimal.js';
 import '@o2ter/utils-js';
 import './internals/private-CNw40LZ7.mjs';
 import 'lodash';
-import './internals/index-BzDsTt4R.mjs';
+import './internals/index-gWcE22mf.mjs';
 import 'axios';
 import './internals/const-Dkp7Nsv5.mjs';
 import '@o2ter/server-js/dist/const';

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-Bs8n7Q8f.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-Bs8n7Q8f.js';
+import { T as TSchema, a as TValueWithoutObject, P as ProtoService, b as ProtoServiceOptions, c as ProtoServiceKeyOptions } from './internals/index-82GLvDiN.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-82GLvDiN.js';
 import Decimal from 'decimal.js';
 export { Decimal } from 'decimal.js';
-export { P as ProtoClient, c as classExtends } from './internals/index-BRIlS3mY.js';
+export { P as ProtoClient, c as classExtends } from './internals/index-CWhqANZM.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import 'lodash';

package/dist/index.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var serverJs = require('@o2ter/server-js');
-var validator = require('./internals/validator-mcBCJP4P.js');
+var validator = require('./internals/validator-B5yHpyvb.js');
 var _private = require('./internals/private-Ciddhure.js');
 var utilsJs = require('@o2ter/utils-js');
-var index = require('./internals/index-DylUjD_1.js');
-var index$1 = require('./internals/index-B8TESzd9.js');
+var index = require('./internals/index-xHeu-AjT.js');
+var index$1 = require('./internals/index-CLKTEIj0.js');
 var jwt = require('jsonwebtoken');
 var node_buffer = require('node:buffer');
 var node_stream = require('node:stream');
@@ -82,7 +82,7 @@ const normalize = (x) => {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
-const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.objectId]));
+const fetchUserPerms = async (proto) => _.uniq(_.compact([..._.map(await proto.currentRoles(), x => `role:${x}`), (await proto.currentUser())?.id]));
 const dispatcher = (proto, options) => {
     const acls = async () => options.master ? [] : await fetchUserPerms(proto);
     const validator$1 = async () => new validator.QueryValidator(proto, await acls(), {
@@ -852,34 +852,34 @@ class ProtoInternal {
         return callback(proxy(payload ?? proto));
     }
     async varifyPassword(proto, user, password, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         const _user = await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id', 'password')
             .first(options);
         const { alg, ...opts } = _user?.get('password') ?? {};
         return varifyPassword(alg, password, opts);
     }
     async setPassword(proto, user, password, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         if (_.isEmpty(password))
             throw Error('Invalid password');
         const { alg, ...opts } = this.options.passwordHashOptions;
         const hashed = await passwordHash(alg, password, opts);
         await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id')
             .updateOne({
             password: { $set: hashed },
         }, options);
     }
     async unsetPassword(proto, user, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         await proto.InsecureQuery('User')
-            .equalTo('_id', user.objectId)
+            .equalTo('_id', user.id)
             .includes('_id')
             .updateOne({
             password: { $set: {} },
@@ -890,7 +890,7 @@ class ProtoInternal {
             throw Error('Invalid filename');
         }
         const updated = await proto.Query(object.className)
-            .equalTo('_id', object.objectId)
+            .equalTo('_id', object.id)
             .includes(...object.keys())
             .updateOne(object[_private.PVK].mutated, options);
         if (updated) {
@@ -970,7 +970,7 @@ class ProtoInternal {
         }
     }
     async saveFile(proto, object, options) {
-        if (object.objectId) {
+        if (object.id) {
             object = await this.updateFile(proto, object, options);
         }
         else {
@@ -981,7 +981,7 @@ class ProtoInternal {
     async deleteFile(proto, object, options) {
         object = await object.fetchIfNeeded(['token'], options);
         const deleted = await proto.Query('File')
-            .equalTo('_id', object.objectId)
+            .equalTo('_id', object.id)
             .deleteOne(options);
         if (deleted) {
             object[_private.PVK].attributes = deleted.attributes;
@@ -1390,11 +1390,11 @@ const signUser = async (proto, res, user, options) => {
         sessionId: session?.sessionId ?? cryptoJs.randomUUID(),
         createdAt: session?.createdAt?.getTime() ?? Date.now(),
         loginedAt: user ? session?.loginedAt?.getTime() ?? Date.now() : undefined,
-        user: user?.objectId,
+        user: user?.id,
         cookieOptions,
     }, options?.jwtSignOptions ?? 'login');
     res.cookie(_const.AUTH_COOKIE_KEY, token, cookieOptions);
-    sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.objectId) : {});
+    sessionInfoMap.set(res.req, user ? await fetchSessionInfo(proto, user.id) : {});
 };
 
 //
@@ -1542,13 +1542,13 @@ class ProtoService extends index.ProtoType {
         return new ProtoQuery(className, this, {});
     }
     Relation(object, key) {
-        const objectId = object.objectId;
-        if (!objectId)
+        const id = object.id;
+        if (!id)
             throw Error('Invalid object');
         return new ProtoRelationQuery(this, {
             relatedBy: {
                 className: object.className,
-                objectId,
+                id: id,
                 key,
             },
         });
@@ -1614,10 +1614,10 @@ class ProtoService extends index.ProtoType {
             while (!_.isEmpty(queue)) {
                 queue = await self.Query('Role')
                     .or(_.map(_.uniq(['roles', ...roleKeys]), k => q => q.isIntersect(k, queue)))
-                    .notContainedIn('_id', _.compact(_.map(roles, x => x.objectId)))
+                    .notContainedIn('_id', _.compact(_.map(roles, x => x.id)))
                     .includes('name')
                     .find({ master: true });
-                roles = _.uniqBy([...roles, ...queue], x => x.objectId);
+                roles = _.uniqBy([...roles, ...queue], x => x.id);
             }
             return roles;
         };
@@ -1626,7 +1626,7 @@ class ProtoService extends index.ProtoType {
         return defaultResolver();
     }
     async becomeUser(req, user, options) {
-        if (!user.objectId)
+        if (!user.id)
             throw Error('Invalid user object');
         if (req.res)
             await signUser(this, req.res, user, options);
@@ -1728,7 +1728,7 @@ class ProtoService extends index.ProtoType {
         });
     }
     refs(object, options) {
-        if (!object.objectId)
+        if (!object.id)
             throw Error('Invalid object');
         const self = this;
         return utilsJs.asyncStream(async function* () {
@@ -1892,7 +1892,7 @@ const verifyRelatedBy = (relatedBy) => {
         return;
     if (!_.isString(relatedBy.className) || _.isEmpty(relatedBy.className))
         throw Error('Invalid option');
-    if (!_.isString(relatedBy.objectId) || _.isEmpty(relatedBy.objectId))
+    if (!_.isString(relatedBy.id) || _.isEmpty(relatedBy.id))
         throw Error('Invalid option');
     if (!_.isString(relatedBy.key) || _.isEmpty(relatedBy.key))
         throw Error('Invalid option');
@@ -1903,7 +1903,7 @@ var classesRoute = (router, proto) => {
         const { operation, random, attributes, update, setOnInsert, relatedBy, silent, ...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);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.id), relatedBy.key) : payload.Query(name);
         query[_private.PVK].options = options;
         const opts = { master: payload.isMaster, silent };
         if (_.includes(['File', '_Job', '_JobScope'], name) &&
@@ -1966,7 +1966,7 @@ var classesRoute = (router, proto) => {
         const { name } = req.params;
         const { filter, sort, includes, skip, limit, relatedBy, } = req.query;
         verifyRelatedBy(relatedBy);
-        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
+        const query = relatedBy ? payload.Relation(payload.Object(relatedBy.className, relatedBy.id), 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;
@@ -2604,7 +2604,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
             const { remove: remove_livequery } = payload[_private.PVK]._liveQuery(payload, (ev, objs) => {
                 const ids = {};
                 for (const obj of objs) {
-                    ids[obj.objectId] = _.keys(_.pickBy(queries, v => {
+                    ids[obj.id] = _.keys(_.pickBy(queries, v => {
                         if (v.event !== ev || v.className !== obj.className)
                             return false;
                         return v.filter instanceof validator.QuerySelector ? v.filter.eval(obj) : v.filter;
@@ -2612,7 +2612,7 @@ const registerProtoSocket = (proto, server, endpoint) => {
                 }
                 if (_.isEmpty(ids))
                     return;
-                const payload = JSON.parse(index.serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.objectId]))));
+                const payload = JSON.parse(index.serialize(_.filter(objs, obj => !_.isEmpty(ids[obj.id]))));
                 socket.emit('ON_EV_LIVEQUERY', { ids, data: payload });
             });
             return () => {