proto.io 0.0.174 → 0.0.175

package/dist/index.mjs

@@ -1,18 +1,18 @@
 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-DPRG8oW6.mjs';
+import { Q as QueryValidator, r as resolveColumn, a as resolveDataType, g as generateId } from './internals/random-BMQpRlGH.mjs';
 import { P as PVK } from './internals/private-BUpLAMZi.mjs';
-import { prototypes, asyncStream, asyncIterableToArray, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
-import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-R0gbIGc-.mjs';
-export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-R0gbIGc-.mjs';
-import { i as isPointer, a as isRelation, d as decodeUpdateOp, T as TObject, b as isShape, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index--ifyu-GL.mjs';
+import { asyncStream, prototypes, isBinaryData, base64ToBuffer } from '@o2ter/utils-js';
+import { T as TQuery, M as MASTER_USER_HEADER_NAME, a as MASTER_PASS_HEADER_NAME, A as AUTH_COOKIE_KEY, b as TUser, P as ProtoType, s as serialize, d as deserialize, U as UPLOAD_TOKEN_HEADER_NAME } from './internals/index-BPbXumUi.mjs';
+export { c as ProtoClient, e as classExtends, j as isFile, f as isObject, i as isQuery, h as isRole, g as isUser } from './internals/index-BPbXumUi.mjs';
+import { i as isPointer, a as isRelation, T as TObject, b as isShape, d as defaultObjectKeyTypes, c as isPrimitive } from './internals/index-CTsc042s.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
 import { Readable } from 'node:stream';
 import { scrypt } from 'node:crypto';
 import { promisify } from 'util';
 import { randomBytes, randomUUID } from '@o2ter/crypto-js';
-import { Q as QuerySelector } from './internals/index-C3fbOqmn.mjs';
+import { Q as QuerySelector } from './internals/index-DHQhYGsJ.mjs';
 import queryType from 'query-types';
 import busboy from 'busboy';
 export { Decimal } from 'decimal.js';
@@ -245,46 +245,6 @@ const dispatcher = (proto, options, disableSecurity) => {
     };
 };
 
-//
-//  proxy.ts
-//
-//  The MIT License
-//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-const proxy = (x) => {
-    const self = x;
-    const proxy = _.create(self);
-    for (const name of _.uniq(_.flatMap(prototypes(proxy), x => Object.getOwnPropertyNames(x)))) {
-        if (name === 'constructor')
-            continue;
-        if (_.isFunction(self[name])) {
-            proxy[name] = self[name].bind(self);
-        }
-        else {
-            Object.defineProperty(proxy, name, { get: () => self[name] });
-        }
-    }
-    return proxy;
-};
-
 //
 //  options.ts
 //
@@ -391,68 +351,16 @@ class _ProtoQuery extends TQuery {
         });
     }
     async insert(attrs, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        const object = this._proto.Object(this.className);
-        for (const [key, value] of _.toPairs(attrs)) {
-            object[PVK].mutated[key] = { $set: value };
-        }
-        if (_.isFunction(beforeSave))
-            await beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)));
         const result = this._objectMethods(await this._dispatcher(options).insert({
             className: this.className,
             includes: this[PVK].options.includes,
             matches: this[PVK].options.matches,
-        }, _.fromPairs([...object._set_entries()])));
+        }, attrs));
         if (!result)
             throw Error('Unable to insert document');
-        if (_.isFunction(afterSave)) {
-            try {
-                await afterSave(proxy(Object.setPrototypeOf({ object: result.clone(), context }, options?.session ?? this._proto)));
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
         return result;
     }
     async insertMany(values, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        if (_.isFunction(beforeSave) || _.isFunction(afterSave)) {
-            const objects = _.map(values, attr => {
-                const object = this._proto.Object(this.className);
-                for (const [key, value] of _.toPairs(attr)) {
-                    object[PVK].mutated[key] = { $set: value };
-                }
-                return object;
-            });
-            if (_.isEmpty(objects))
-                return 0;
-            if (_.isFunction(beforeSave)) {
-                await Promise.all(_.map(objects, object => beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)))));
-            }
-            await this._dispatcher(options).insertMany({
-                className: this.className,
-                includes: this[PVK].options.includes,
-                matches: this[PVK].options.matches,
-            }, _.map(objects, x => _.fromPairs([...x._set_entries()])));
-            if (_.isFunction(afterSave)) {
-                await Promise.all(_.map(objects, async (object) => {
-                    try {
-                        await afterSave(proxy(Object.setPrototypeOf({ object: object.clone(), context }, options?.session ?? this._proto)));
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }));
-            }
-            return objects.length;
-        }
         return this._dispatcher(options).insertMany({
             className: this.className,
             includes: this[PVK].options.includes,
@@ -460,216 +368,24 @@ class _ProtoQuery extends TQuery {
         }, values);
     }
     async updateOne(update, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        if (_.isFunction(beforeSave)) {
-            const object = this._objectMethods(_.first(await asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
-            if (!object)
-                return undefined;
-            object[PVK].mutated = update;
-            await beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)));
-            update = object[PVK].mutated;
-        }
-        const result = this._objectMethods(await this._dispatcher(options).updateOne(this._queryOptions, update));
-        if (result && _.isFunction(afterSave)) {
-            try {
-                await afterSave(proxy(Object.setPrototypeOf({ object: result.clone(), context }, options?.session ?? this._proto)));
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
-        return result;
+        return this._objectMethods(await this._dispatcher(options).updateOne(this._queryOptions, update));
     }
     async updateMany(update, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        if (_.isFunction(beforeSave) || _.isFunction(afterSave)) {
-            const objects = this._objectMethods(await asyncIterableToArray(this._dispatcher(options).find(this._queryOptions)));
-            if (_.isEmpty(objects))
-                return 0;
-            if (_.isFunction(beforeSave)) {
-                await Promise.all(_.map(objects, object => beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)))));
-            }
-            if (!_.isFunction(afterSave)) {
-                return this._dispatcher(options).updateMany({
-                    ...this._queryOptions,
-                    filter: { _id: { $in: _.map(objects, x => x.objectId) } },
-                }, update);
-            }
-            const updated = _.compact(await Promise.all(_.map(objects, x => this._dispatcher(options).updateOne({
-                ...this._queryOptions,
-                filter: { _id: { $eq: x.objectId } },
-            }, update))));
-            await Promise.all(_.map(updated, async (object) => {
-                try {
-                    await afterSave(proxy(Object.setPrototypeOf({ object: object.clone(), context }, options?.session ?? this._proto)));
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }));
-            return updated.length;
-        }
         return this._dispatcher(options).updateMany(this._queryOptions, update);
     }
     async upsertOne(update, setOnInsert, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        if (_.isFunction(beforeSave)) {
-            let object = this._objectMethods(_.first(await asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
-            if (object) {
-                object[PVK].mutated = update;
-            }
-            else {
-                object = this._proto.Object(this.className);
-                for (const [key, value] of _.toPairs(setOnInsert)) {
-                    object[PVK].mutated[key] = { $set: value };
-                }
-            }
-            await beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)));
-            if (object.objectId) {
-                update = object[PVK].mutated;
-            }
-            else {
-                setOnInsert = {};
-                for (const [key, update] of _.toPairs(object[PVK].mutated)) {
-                    const [op, value] = decodeUpdateOp(update);
-                    if (op === '$set') {
-                        setOnInsert[key] = value;
-                    }
-                }
-            }
-        }
         const result = this._objectMethods(await this._dispatcher(options).upsertOne(this._queryOptions, update, setOnInsert));
         if (!result)
             throw Error('Unable to upsert document');
-        if (_.isFunction(afterSave)) {
-            try {
-                await afterSave(proxy(Object.setPrototypeOf({ object: result.clone(), context }, options?.session ?? this._proto)));
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
         return result;
     }
     async upsertMany(update, setOnInsert, options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeSave = _.includes(silent, 'beforeSave') ? null : this._proto[PVK].triggers?.beforeSave?.[this.className];
-        const afterSave = _.includes(silent, 'afterSave') ? null : this._proto[PVK].triggers?.afterSave?.[this.className];
-        if (_.isFunction(beforeSave) || _.isFunction(afterSave)) {
-            const objects = this._objectMethods(await asyncIterableToArray(this._dispatcher(options).find(this._queryOptions)));
-            if (!_.isEmpty(objects) && _.isFunction(beforeSave)) {
-                await Promise.all(_.map(objects, object => beforeSave(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)))));
-            }
-            if (_.isEmpty(objects)) {
-                const result = await this._dispatcher(options).insert({
-                    className: this.className,
-                    includes: this[PVK].options.includes,
-                    matches: this[PVK].options.matches,
-                }, setOnInsert);
-                if (!result)
-                    throw Error('Unable to insert document');
-                if (_.isFunction(afterSave)) {
-                    try {
-                        await afterSave(proxy(Object.setPrototypeOf({ object: result.clone(), context }, options?.session ?? this._proto)));
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }
-                return { updated: 0, inserted: 1 };
-            }
-            if (!_.isFunction(afterSave)) {
-                return {
-                    inserted: 0,
-                    updated: await this._dispatcher(options).updateMany({
-                        ...this._queryOptions,
-                        filter: { _id: { $in: _.map(objects, x => x.objectId) } },
-                    }, update),
-                };
-            }
-            const updated = _.compact(await Promise.all(_.map(objects, x => this._dispatcher(options).updateOne({
-                ...this._queryOptions,
-                filter: { _id: { $eq: x.objectId } },
-            }, update))));
-            await Promise.all(_.map(updated, async (object) => {
-                try {
-                    await afterSave(proxy(Object.setPrototypeOf({ object: object.clone(), context }, options?.session ?? this._proto)));
-                }
-                catch (e) {
-                    console.error(e);
-                }
-            }));
-            return { updated: updated.length, inserted: 0 };
-        }
         return this._dispatcher(options).upsertMany(this._queryOptions, update, setOnInsert);
     }
     async deleteOne(options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeDelete = _.includes(silent, 'beforeDelete') ? null : this._proto[PVK].triggers?.beforeDelete?.[this.className];
-        const afterDelete = _.includes(silent, 'afterDelete') ? null : this._proto[PVK].triggers?.afterDelete?.[this.className];
-        let result;
-        if (_.isFunction(beforeDelete)) {
-            const object = this._objectMethods(_.first(await asyncIterableToArray(this._dispatcher(options).find({ ...this._queryOptions, limit: 1 }))));
-            if (!object)
-                return undefined;
-            await beforeDelete(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)));
-            result = this._objectMethods(await this._dispatcher(options).deleteOne({
-                ...this._queryOptions,
-                filter: { _id: { $eq: object.objectId } },
-            }));
-        }
-        else {
-            result = this._objectMethods(await this._dispatcher(options).deleteOne(this._queryOptions));
-        }
-        if (result && _.isFunction(afterDelete)) {
-            try {
-                await afterDelete(proxy(Object.setPrototypeOf({ object: result.clone(), context }, options?.session ?? this._proto)));
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
-        return result;
+        return this._objectMethods(await this._dispatcher(options).deleteOne(this._queryOptions));
     }
     async deleteMany(options) {
-        const context = options?.context ?? {};
-        const silent = _.castArray(options?.silent ?? []);
-        const beforeDelete = _.includes(silent, 'beforeDelete') ? null : this._proto[PVK].triggers?.beforeDelete?.[this.className];
-        const afterDelete = _.includes(silent, 'afterDelete') ? null : this._proto[PVK].triggers?.afterDelete?.[this.className];
-        if (_.isFunction(beforeDelete) || _.isFunction(afterDelete)) {
-            const objects = this._objectMethods(await asyncIterableToArray(this._dispatcher(options).find(this._queryOptions)));
-            if (_.isEmpty(objects))
-                return 0;
-            if (_.isFunction(beforeDelete)) {
-                await Promise.all(_.map(objects, object => beforeDelete(proxy(Object.setPrototypeOf({ object, context }, options?.session ?? this._proto)))));
-            }
-            await this._dispatcher(options).deleteMany({
-                ...this._queryOptions,
-                filter: { _id: { $in: _.map(objects, x => x.objectId) } },
-            });
-            if (_.isFunction(afterDelete)) {
-                await Promise.all(_.map(objects, async (object) => {
-                    try {
-                        await afterDelete(proxy(Object.setPrototypeOf({ object: object.clone(), context }, options?.session ?? this._proto)));
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }));
-            }
-            return objects.length;
-        }
         return this._dispatcher(options).deleteMany(this._queryOptions);
     }
 }
@@ -870,6 +586,46 @@ const varifyPassword = async (alg, password, options) => {
     }
 };
 
+//
+//  proxy.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+const proxy = (x) => {
+    const self = x;
+    const proxy = _.create(self);
+    for (const name of _.uniq(_.flatMap(prototypes(proxy), x => Object.getOwnPropertyNames(x)))) {
+        if (name === 'constructor')
+            continue;
+        if (_.isFunction(self[name])) {
+            proxy[name] = self[name].bind(self);
+        }
+        else {
+            Object.defineProperty(proxy, name, { get: () => self[name] });
+        }
+    }
+    return proxy;
+};
+
 //
 //  internal.ts
 //
@@ -990,7 +746,6 @@ const mergeSchema = (...schemas) => _.reduce(schemas, (acc, schema) => ({
 class ProtoInternal {
     options;
     functions = {};
-    triggers = {};
     constructor(options) {
         validateSchemaName(options.schema);
         const schema = mergeSchema(defaultSchema, options.fileStorage.schema, options.schema);
@@ -1667,26 +1422,6 @@ class ProtoService extends ProtoType {
     define(name, callback, options) {
         this[PVK].functions[name] = options ? { callback, ...options } : callback;
     }
-    beforeSave(name, callback) {
-        if (!this[PVK].triggers.beforeSave)
-            this[PVK].triggers.beforeSave = {};
-        this[PVK].triggers.beforeSave[name] = callback;
-    }
-    afterSave(name, callback) {
-        if (!this[PVK].triggers.afterSave)
-            this[PVK].triggers.afterSave = {};
-        this[PVK].triggers.afterSave[name] = callback;
-    }
-    beforeDelete(name, callback) {
-        if (!this[PVK].triggers.beforeDelete)
-            this[PVK].triggers.beforeDelete = {};
-        this[PVK].triggers.beforeDelete[name] = callback;
-    }
-    afterDelete(name, callback) {
-        if (!this[PVK].triggers.afterDelete)
-            this[PVK].triggers.afterDelete = {};
-        this[PVK].triggers.afterDelete[name] = callback;
-    }
     lockTable(className, update) {
         return this.storage.lockTable(className, update);
     }
@@ -1883,12 +1618,12 @@ const verifyRelatedBy = (relatedBy) => {
 var classesRoute = (router, proto) => {
     const defaultHandler = async (req) => {
         const { name } = req.params;
-        const { operation, context, silent, random, attributes, update, setOnInsert, relatedBy, ...options } = deserialize(req.body);
+        const { operation, random, attributes, update, setOnInsert, relatedBy, ...options } = 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);
         query[PVK].options = options;
-        const opts = { master: payload.isMaster, context, silent };
+        const opts = { master: payload.isMaster };
         switch (operation) {
             case 'explain':
                 if (!payload.isMaster)