proto.io 0.0.154 → 0.0.156

package/dist/index.mjs

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import { Server } from '@o2ter/server-js';
-import { Q as QueryValidator, g as generateId } from './internals/random-KZTFMK9-.mjs';
+import { Q as QueryValidator, g as generateId } from './internals/random-DLFngtjg.mjs';
 import { P as PVK } from './internals/private-BUpLAMZi.mjs';
 import { 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-c-CaNuVY.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-c-CaNuVY.mjs';
+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-B01TqoO1.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-B01TqoO1.mjs';
 import { d as decodeUpdateOp, T as TObject, i as isShape, a as isPointer, b as isRelation, c as defaultObjectKeyTypes, e as isPrimitive } from './internals/index-BmRuvHVZ.mjs';
 import jwt from 'jsonwebtoken';
 import { Blob } from 'node:buffer';
@@ -292,22 +292,25 @@ const proxy = (x) => {
 //
 class ProtoQuery extends TQuery {
     _proto;
-    constructor(className, proto) {
+    _opts;
+    constructor(className, proto, opts) {
         super(className);
         this._proto = proto;
+        this._opts = opts;
     }
     get _queryOptions() {
         return {
             className: this.className,
+            relatedBy: this._opts.relatedBy,
             ...this[PVK].options,
         };
     }
     _dispatcher(options) {
-        if (this instanceof InsecureProtoQuery) {
+        if (this._opts.insecure) {
             if (options?.master !== true)
                 throw Error('No permission');
         }
-        return dispatcher(options?.session ?? this._proto, options ?? {}, this instanceof InsecureProtoQuery);
+        return dispatcher(options?.session ?? this._proto, options ?? {}, !!this._opts.insecure);
     }
     explain(options) {
         return this._dispatcher(options).explain(this._queryOptions);
@@ -316,7 +319,7 @@ class ProtoQuery extends TQuery {
         return this._dispatcher(options).count(this._queryOptions);
     }
     clone(options) {
-        const clone = new ProtoQuery(this.className, this._proto);
+        const clone = new ProtoQuery(this.className, this._proto, this._opts);
         clone[PVK].options = options ?? { ...this[PVK].options };
         return clone;
     }
@@ -509,13 +512,6 @@ class ProtoQuery extends TQuery {
         return this._dispatcher(options).deleteMany(this._queryOptions);
     }
 }
-class InsecureProtoQuery extends ProtoQuery {
-    clone(options) {
-        const clone = new InsecureProtoQuery(this.className, this._proto);
-        clone[PVK].options = options ?? { ...this[PVK].options };
-        return clone;
-    }
-}
 
 //
 //  defaults.ts
@@ -1345,10 +1341,22 @@ class ProtoService extends ProtoType {
         return _.keys(this[PVK].options.schema);
     }
     Query(className) {
-        return new ProtoQuery(className, this);
+        return new ProtoQuery(className, this, {});
+    }
+    Relation(className, object, key) {
+        const objectId = object.objectId;
+        if (!objectId)
+            throw Error('Invalid object');
+        return new ProtoQuery(className, this, {
+            relatedBy: {
+                className: object.className,
+                objectId,
+                key,
+            },
+        });
     }
     InsecureQuery(className) {
-        return new InsecureProtoQuery(className, this);
+        return new ProtoQuery(className, this, { insecure: true });
     }
     get sessionId() {
         if (this.session)
@@ -1613,6 +1621,16 @@ const decodeFormStream = (req, onFile) => {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
+const verifyRelatedBy = (relatedBy) => {
+    if (!_.isPlainObject(relatedBy))
+        return;
+    if (!_.isString(relatedBy.className) || _.isEmpty(relatedBy.className))
+        throw Error('Invalid option');
+    if (!_.isString(relatedBy.objectId) || _.isEmpty(relatedBy.objectId))
+        throw Error('Invalid option');
+    if (!_.isString(relatedBy.key) || _.isEmpty(relatedBy.key))
+        throw Error('Invalid option');
+};
 var classesRoute = (router, proto) => {
     router.post('/classes/:name', Server.text({ type: '*/*' }), async (req, res) => {
         res.setHeader('Cache-Control', ['no-cache', 'no-store']);
@@ -1621,9 +1639,10 @@ var classesRoute = (router, proto) => {
         if (!_.includes(classes, name))
             return res.sendStatus(404);
         await response(res, async () => {
-            const { operation, context, silent, random, attributes, update, setOnInsert, ...options } = deserialize(req.body);
+            const { operation, context, silent, random, attributes, update, setOnInsert, relatedBy, ...options } = deserialize(req.body);
+            verifyRelatedBy(relatedBy);
             const payload = proto.connect(req);
-            const query = payload.Query(name);
+            const query = relatedBy ? payload.Relation(name, payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
             query[PVK].options = options;
             const opts = { master: payload.isMaster, context, silent };
             switch (operation) {
@@ -1668,8 +1687,9 @@ var classesRoute = (router, proto) => {
     });
     const createQuery = (payload, req, checkLimit) => {
         const { name } = req.params;
-        const query = payload.Query(name);
-        const { filter, sort, includes, skip, limit, } = req.query;
+        const { filter, sort, includes, skip, limit, relatedBy, } = req.query;
+        verifyRelatedBy(relatedBy);
+        const query = relatedBy ? payload.Relation(name, payload.Object(relatedBy.className, relatedBy.objectId), relatedBy.key) : payload.Query(name);
         query[PVK].options.filter = !_.isEmpty(filter) && _.isString(filter) ? _.castArray(deserialize(filter)) : [];
         query[PVK].options.sort = _.isPlainObject(sort) && _.every(_.values(sort), _.isNumber) ? sort : undefined;
         query[PVK].options.includes = _.isArray(includes) && _.every(includes, _.isString) ? includes : undefined;