@web-ts-toolkit/access-router 0.28.0 → 0.29.0

package/index.js

@@ -90,9 +90,6 @@ var filterCollection = (collection, predicate) => {
 var findElement = (collection, predicate) => {
   return (0, import_utils.find)(collection, (0, import_sift.default)(predicate));
 };
-var matchElement = (element, predicate) => {
-  return (0, import_sift.default)(predicate)(element);
-};
 var findElementById = (collection, id) => {
   return findElement(collection, { _id: id });
 };
@@ -1195,16 +1192,33 @@ var Base = class {
     return docs;
   }
   async includeDocsCount(docs, include) {
-    const { model, path, localField, foreignField, filter: _filters } = include;
+    const { model, path, localField, foreignField, filter: _filters, args = {}, options = {} } = include;
     const svc = this.req.macl.getPublicService(model);
     if (!svc) return docs;
+    const includeLocalValues = [];
+    (0, import_utils11.forEach)(docs, (doc) => {
+      includeLocalValues.push((0, import_utils11.get)(doc, localField));
+    });
+    const filter2 = { ..._filters ?? {}, [foreignField]: { $in: (0, import_utils11.flatten)(includeLocalValues) } };
+    const result = await svc.find(
+      filter2,
+      {
+        ...args,
+        select: [foreignField]
+      },
+      {
+        ...options,
+        lean: true,
+        includePermissions: false,
+        includeCount: false
+      }
+    );
+    if (!result.success) return docs;
     for (let y = 0; y < docs.length; y++) {
       const doc = docs[y];
       const localValue = (0, import_utils11.get)(doc, localField);
-      const filter2 = { ..._filters ?? {}, [foreignField]: localValue };
-      const result = await svc.count(filter2);
-      if (!result.success) continue;
-      setDocValue(doc, path, result.data);
+      const filterFn = (row) => (0, import_utils11.intersectionBy)((0, import_utils11.castArray)(localValue), (0, import_utils11.castArray)((0, import_utils11.get)(row, foreignField)), String).length > 0;
+      setDocValue(doc, path, result.data.filter(filterFn).length);
     }
     return docs;
   }
@@ -1946,14 +1960,12 @@ var Service = class extends Base {
     const { populate, overrides } = this.resolveUpsertArgs(args);
     const { skim, includePermissions, populateAccess } = this.resolveUpsertOptions(options);
     const { filter: overrideFilter, populate: overridePopulate } = overrides ?? {};
-    const theone = await this.model.findOne({ filter: filter2 });
+    const _filter = await (overrideFilter || this.genFilter("update", filter2));
+    const query = { filter: _filter };
+    logger.debug(JSON.stringify({ op: "upsert", query }));
+    if (_filter === false) return { success: false, code: "forbidden" /* Forbidden */, query };
+    const theone = await this.model.findOne({ filter: _filter });
     if (theone) {
-      const _filter = await (overrideFilter || this.genFilter("update", filter2));
-      const query = { filter: _filter };
-      logger.debug(JSON.stringify({ op: "upsert", query }));
-      if (_filter === false) return { success: false, code: "forbidden" /* Forbidden */, query };
-      const matched = matchElement(theone, _filter);
-      if (!matched) return { success: false, code: "forbidden" /* Forbidden */, query };
       return this.updateOne(
         null,
         data,

package/index.mjs

@@ -43,9 +43,6 @@ var filterCollection = (collection, predicate) => {
 var findElement = (collection, predicate) => {
   return find(collection, sift(predicate));
 };
-var matchElement = (element, predicate) => {
-  return sift(predicate)(element);
-};
 var findElementById = (collection, id) => {
   return findElement(collection, { _id: id });
 };
@@ -1158,16 +1155,33 @@ var Base = class {
     return docs;
   }
   async includeDocsCount(docs, include) {
-    const { model, path, localField, foreignField, filter: _filters } = include;
+    const { model, path, localField, foreignField, filter: _filters, args = {}, options = {} } = include;
     const svc = this.req.macl.getPublicService(model);
     if (!svc) return docs;
+    const includeLocalValues = [];
+    forEach3(docs, (doc) => {
+      includeLocalValues.push(get4(doc, localField));
+    });
+    const filter2 = { ..._filters ?? {}, [foreignField]: { $in: flatten(includeLocalValues) } };
+    const result = await svc.find(
+      filter2,
+      {
+        ...args,
+        select: [foreignField]
+      },
+      {
+        ...options,
+        lean: true,
+        includePermissions: false,
+        includeCount: false
+      }
+    );
+    if (!result.success) return docs;
     for (let y = 0; y < docs.length; y++) {
       const doc = docs[y];
       const localValue = get4(doc, localField);
-      const filter2 = { ..._filters ?? {}, [foreignField]: localValue };
-      const result = await svc.count(filter2);
-      if (!result.success) continue;
-      setDocValue(doc, path, result.data);
+      const filterFn = (row) => intersectionBy(castArray(localValue), castArray(get4(row, foreignField)), String).length > 0;
+      setDocValue(doc, path, result.data.filter(filterFn).length);
     }
     return docs;
   }
@@ -1917,14 +1931,12 @@ var Service = class extends Base {
     const { populate, overrides } = this.resolveUpsertArgs(args);
     const { skim, includePermissions, populateAccess } = this.resolveUpsertOptions(options);
     const { filter: overrideFilter, populate: overridePopulate } = overrides ?? {};
-    const theone = await this.model.findOne({ filter: filter2 });
+    const _filter = await (overrideFilter || this.genFilter("update", filter2));
+    const query = { filter: _filter };
+    logger.debug(JSON.stringify({ op: "upsert", query }));
+    if (_filter === false) return { success: false, code: "forbidden" /* Forbidden */, query };
+    const theone = await this.model.findOne({ filter: _filter });
     if (theone) {
-      const _filter = await (overrideFilter || this.genFilter("update", filter2));
-      const query = { filter: _filter };
-      logger.debug(JSON.stringify({ op: "upsert", query }));
-      if (_filter === false) return { success: false, code: "forbidden" /* Forbidden */, query };
-      const matched = matchElement(theone, _filter);
-      if (!matched) return { success: false, code: "forbidden" /* Forbidden */, query };
       return this.updateOne(
         null,
         data,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@web-ts-toolkit/access-router",
   "description": "ACL-aware Express routers and in-memory data services for Mongoose-backed APIs",
   "homepage": "https://web-ts-toolkit.pages.dev/docs/packages/access-router",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "sideEffects": false,
   "keywords": [
     "express",
@@ -40,8 +40,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@web-ts-toolkit/express-json-router": "0.28.0",
-    "@web-ts-toolkit/utils": "0.28.0",
+    "@web-ts-toolkit/express-json-router": "0.29.0",
+    "@web-ts-toolkit/utils": "0.29.0",
     "just-diff": "^6.0.2",
     "mongoose-schema-jsonschema": "^4.0.1",
     "sift": "^17.1.3",