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

package/index.mjs

@@ -116,7 +116,8 @@ function setDocValue(doc, path, value) {
 }
 function getDocPermissions(modelName, doc) {
   const docPermissionField = getModelOption(modelName, "documentPermissionField");
-  return getDocValue(doc, docPermissionField, {});
+  const permissions = getDocValue(doc, docPermissionField, {});
+  return isPlainObject2(permissions) ? permissions : {};
 }
 function toObject(doc) {
   return isDocument(doc) ? doc.toObject() : doc;
@@ -874,7 +875,8 @@ var AccessRuntime = class {
   }
   getModelRef(modelName, refPath) {
     this.ensureModelMeta(modelName);
-    return get3(this.modelRefs, `${modelName}.${refPath}`, null);
+    const value = get3(this.modelRefs, `${modelName}.${refPath}`, null);
+    return isString4(value) ? value : null;
   }
   getModelSub(modelName) {
     this.ensureModelMeta(modelName);
@@ -1236,12 +1238,14 @@ var Base = class {
 // src/services/service.ts
 import {
   castArray as castArray2,
+  compact as compact2,
   isArray as isArray6,
   isBoolean as isBoolean3,
   isFunction as isFunction3,
   omit,
   pick as pick4,
-  uniq as uniq2
+  uniq as uniq2,
+  uniqBy
 } from "@web-ts-toolkit/utils";
 import { diff } from "just-diff";
 
@@ -2065,7 +2069,7 @@ var Service = class extends Base {
     return resolveExistsOptions(this, options);
   }
   async getFieldPermissionAccess(ids) {
-    const uniqueIds = uniq2(ids.map((id) => String(id)).filter(Boolean));
+    const uniqueIds = compact2(uniqBy(ids, (id) => String(id)).map((id) => String(id)));
     if (uniqueIds.length === 0) {
       return {
         readIds: /* @__PURE__ */ new Set(),
@@ -2546,6 +2550,7 @@ var Cache = class {
 import {
   castArray as castArray4,
   arrayToRecord,
+  hasOwn as hasOwn2,
   isArray as isArray8,
   isBoolean as isBoolean4,
   isEmpty as isEmpty2,
@@ -2556,6 +2561,7 @@ import {
 } from "@web-ts-toolkit/utils";
 
 // src/permission.ts
+import { hasOwn } from "@web-ts-toolkit/utils";
 var Permission = class {
   constructor(permissions) {
     this.permissions = { ...permissions };
@@ -2571,7 +2577,7 @@ var Permission = class {
     return [permissionOrPermissions].concat(permissions);
   }
   hasKey(permission) {
-    return Object.prototype.hasOwnProperty.call(this.permissions, permission);
+    return hasOwn(this.permissions, permission);
   }
   has(permission) {
     return this.permissions[permission] === true;
@@ -2621,7 +2627,7 @@ function optimizeAndFilter(clausesInput) {
     }
     let canMerge = true;
     for (const [key, value] of Object.entries(clause)) {
-      if (Object.prototype.hasOwnProperty.call(mergedClause, key) && !isEqual(mergedClause[key], value)) {
+      if (hasOwn2(mergedClause, key) && !isEqual(mergedClause[key], value)) {
         canMerge = false;
         break;
       }
@@ -2966,7 +2972,7 @@ var Core = class {
       permissionSchema,
       access,
       baseFields,
-      hasPermission: (key) => permissions.has(key) || docPermissions[this.removePrefix(key, modelPermissionPrefix)],
+      hasPermission: (key) => permissions.has(key) || Boolean(docPermissions[this.removePrefix(key, modelPermissionPrefix)]),
       functionArgs: [permissions, docPermissions]
     });
   }
@@ -2981,7 +2987,7 @@ var Core = class {
       permissionSchema,
       access,
       baseFields,
-      hasPermission: (key) => permissions.has(key) || docPermissions[this.removePrefix(key, modelPermissionPrefix)],
+      hasPermission: (key) => permissions.has(key) || Boolean(docPermissions[this.removePrefix(key, modelPermissionPrefix)]),
       functionArgs: [permissions, docPermissions]
     });
   }
@@ -3271,7 +3277,7 @@ function guard(condition) {
         return next(new JsonRouter2.clientErrors.UnauthorizedError());
       }
       const docPermissions = getDocPermissions(modelName, result.data);
-      phas = (key) => permissions.has(key) || docPermissions[key];
+      phas = (key) => permissions.has(key) || Boolean(docPermissions[key]);
       cond = _cond;
     }
     const { stringHandler, arrayHandler } = createValidator(phas);

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.29.0",
+  "version": "0.31.0",
   "sideEffects": false,
   "keywords": [
     "express",
@@ -40,8 +40,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@web-ts-toolkit/express-json-router": "0.29.0",
-    "@web-ts-toolkit/utils": "0.29.0",
+    "@web-ts-toolkit/express-json-router": "0.31.0",
+    "@web-ts-toolkit/utils": "0.31.0",
     "just-diff": "^6.0.2",
     "mongoose-schema-jsonschema": "^4.0.1",
     "sift": "^17.1.3",