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

package/index.js

@@ -67,14 +67,14 @@ __export(index_exports, {
   setModelOptions: () => setModelOptions
 });
 module.exports = __toCommonJS(index_exports);
-var import_utils27 = require("@web-ts-toolkit/utils");
+var import_utils28 = require("@web-ts-toolkit/utils");
 
 // src/middleware.ts
 var import_express_json_router2 = __toESM(require("@web-ts-toolkit/express-json-router"));
-var import_utils20 = require("@web-ts-toolkit/utils");
+var import_utils21 = require("@web-ts-toolkit/utils");
 
 // src/core.ts
-var import_utils19 = require("@web-ts-toolkit/utils");
+var import_utils20 = require("@web-ts-toolkit/utils");
 
 // src/runtime.ts
 var import_mongoose3 = __toESM(require("mongoose"));
@@ -163,7 +163,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 (0, import_utils3.isPlainObject)(permissions) ? permissions : {};
 }
 function toObject(doc) {
   return isDocument(doc) ? doc.toObject() : doc;
@@ -921,7 +922,8 @@ var AccessRuntime = class {
   }
   getModelRef(modelName, refPath) {
     this.ensureModelMeta(modelName);
-    return (0, import_utils10.get)(this.modelRefs, `${modelName}.${refPath}`, null);
+    const value = (0, import_utils10.get)(this.modelRefs, `${modelName}.${refPath}`, null);
+    return (0, import_utils10.isString)(value) ? value : null;
   }
   getModelSub(modelName) {
     this.ensureModelMeta(modelName);
@@ -2094,7 +2096,7 @@ var Service = class extends Base {
     return resolveExistsOptions(this, options);
   }
   async getFieldPermissionAccess(ids) {
-    const uniqueIds = (0, import_utils13.uniq)(ids.map((id) => String(id)).filter(Boolean));
+    const uniqueIds = (0, import_utils13.compact)((0, import_utils13.uniqBy)(ids, (id) => String(id)).map((id) => String(id)));
     if (uniqueIds.length === 0) {
       return {
         readIds: /* @__PURE__ */ new Set(),
@@ -2572,9 +2574,10 @@ var Cache = class {
 };
 
 // src/core-shared.ts
-var import_utils17 = require("@web-ts-toolkit/utils");
+var import_utils18 = require("@web-ts-toolkit/utils");
 
 // src/permission.ts
+var import_utils17 = require("@web-ts-toolkit/utils");
 var Permission = class {
   constructor(permissions) {
     this.permissions = { ...permissions };
@@ -2590,7 +2593,7 @@ var Permission = class {
     return [permissionOrPermissions].concat(permissions);
   }
   hasKey(permission) {
-    return Object.prototype.hasOwnProperty.call(this.permissions, permission);
+    return (0, import_utils17.hasOwn)(this.permissions, permission);
   }
   has(permission) {
     return this.permissions[permission] === true;
@@ -2610,10 +2613,10 @@ var permission_default = Permission;
 
 // src/core-shared.ts
 function isAndFilter(filter2) {
-  return !!filter2 && (0, import_utils17.isPlainObject)(filter2) && Object.keys(filter2).length === 1 && (0, import_utils17.isArray)(filter2.$and);
+  return !!filter2 && (0, import_utils18.isPlainObject)(filter2) && Object.keys(filter2).length === 1 && (0, import_utils18.isArray)(filter2.$and);
 }
 function isMergeableClause(filter2) {
-  return !!filter2 && (0, import_utils17.isPlainObject)(filter2) && Object.keys(filter2).every((key) => !key.startsWith("$"));
+  return !!filter2 && (0, import_utils18.isPlainObject)(filter2) && Object.keys(filter2).every((key) => !key.startsWith("$"));
 }
 function optimizeAndFilter(clausesInput) {
   const clauses = [];
@@ -2628,7 +2631,7 @@ function optimizeAndFilter(clausesInput) {
     }
   }
   const dedupedClauses = clauses.filter(
-    (clause, index) => clauses.findIndex((item) => (0, import_utils17.isEqual)(item, clause)) === index
+    (clause, index) => clauses.findIndex((item) => (0, import_utils18.isEqual)(item, clause)) === index
   );
   const mergedClause = {};
   const remainingClauses = [];
@@ -2640,7 +2643,7 @@ function optimizeAndFilter(clausesInput) {
     }
     let canMerge = true;
     for (const [key, value] of Object.entries(clause)) {
-      if (Object.prototype.hasOwnProperty.call(mergedClause, key) && !(0, import_utils17.isEqual)(mergedClause[key], value)) {
+      if ((0, import_utils18.hasOwn)(mergedClause, key) && !(0, import_utils18.isEqual)(mergedClause[key], value)) {
         canMerge = false;
         break;
       }
@@ -2651,24 +2654,24 @@ function optimizeAndFilter(clausesInput) {
     }
     Object.assign(mergedClause, clause);
   }
-  const finalClauses = (0, import_utils17.isEmpty)(mergedClause) ? remainingClauses : [mergedClause, ...remainingClauses];
+  const finalClauses = (0, import_utils18.isEmpty)(mergedClause) ? remainingClauses : [mergedClause, ...remainingClauses];
   if (finalClauses.length === 0) return null;
   if (finalClauses.length === 1) return finalClauses[0];
   return { $and: finalClauses };
 }
 function normalizeFilter(filter2) {
   if (filter2 === false) return false;
-  if (!filter2 || !(0, import_utils17.isPlainObject)(filter2) || (0, import_utils17.isEmpty)(filter2)) return null;
+  if (!filter2 || !(0, import_utils18.isPlainObject)(filter2) || (0, import_utils18.isEmpty)(filter2)) return null;
   if (!isAndFilter(filter2)) {
     return filter2;
   }
   return optimizeAndFilter(filter2.$and);
 }
 async function resolveIdentifierFilter(req, idField, resolveIdFilter, id) {
-  if ((0, import_utils17.isFunction)(resolveIdFilter)) {
+  if ((0, import_utils18.isFunction)(resolveIdFilter)) {
     return await resolveIdFilter.call(req, id);
   }
-  if ((0, import_utils17.isString)(idField)) {
+  if ((0, import_utils18.isString)(idField)) {
     return { [idField]: id };
   }
   return { _id: id };
@@ -2684,11 +2687,11 @@ async function resolveAccessFilter({
 }) {
   let nextFilter = normalizeFilter(filter2);
   const overrideFilterFn = getOption(`overrideFilter.${access}`, null);
-  if ((0, import_utils17.isFunction)(overrideFilterFn)) {
+  if ((0, import_utils18.isFunction)(overrideFilterFn)) {
     nextFilter = normalizeFilter(await overrideFilterFn.call(req, nextFilter, permissions));
   }
   const baseFilterFn = getOption(`baseFilter.${access}`, null);
-  if (!(0, import_utils17.isFunction)(baseFilterFn)) return nextFilter || {};
+  if (!(0, import_utils18.isFunction)(baseFilterFn)) return nextFilter || {};
   const baseFilter = normalizeFilter(
     cache.has(cacheKey) ? cache.get(cacheKey) : await baseFilterFn.call(req, permissions)
   );
@@ -2708,33 +2711,33 @@ async function setRequestPermissions(req) {
   const requestPermissionField = getGlobalOption("requestPermissionField");
   if (req[requestPermissionField]) return;
   const globalPermissions = getGlobalOption("globalPermissions");
-  if (!(0, import_utils17.isFunction)(globalPermissions)) return;
+  if (!(0, import_utils18.isFunction)(globalPermissions)) return;
   const permissions = await globalPermissions.call(req, req);
-  if ((0, import_utils17.isPlainObject)(permissions)) req[requestPermissionField] = permissions;
-  else if ((0, import_utils17.isArray)(permissions)) req[requestPermissionField] = (0, import_utils17.arrayToRecord)(permissions);
-  else if ((0, import_utils17.isString)(permissions)) req[requestPermissionField] = { [permissions]: true };
+  if ((0, import_utils18.isPlainObject)(permissions)) req[requestPermissionField] = permissions;
+  else if ((0, import_utils18.isArray)(permissions)) req[requestPermissionField] = (0, import_utils18.arrayToRecord)(permissions);
+  else if ((0, import_utils18.isString)(permissions)) req[requestPermissionField] = { [permissions]: true };
 }
 async function evaluateRouteGuard(req, permissions, routeGuard) {
   const phas = (key) => permissions.has(key);
   const { stringHandler, arrayHandler } = createValidator(phas);
-  if ((0, import_utils17.isBoolean)(routeGuard)) {
+  if ((0, import_utils18.isBoolean)(routeGuard)) {
     return routeGuard === true;
   }
-  if ((0, import_utils17.isString)(routeGuard)) {
+  if ((0, import_utils18.isString)(routeGuard)) {
     return stringHandler(routeGuard);
   }
-  if ((0, import_utils17.isArray)(routeGuard)) {
+  if ((0, import_utils18.isArray)(routeGuard)) {
     return arrayHandler(routeGuard);
   }
-  if ((0, import_utils17.isFunction)(routeGuard)) {
+  if ((0, import_utils18.isFunction)(routeGuard)) {
     return routeGuard.call(req, permissions);
   }
   return false;
 }
 async function callHookChain(req, hook, doc, permissions, context) {
-  const hooks = (0, import_utils17.castArray)(hook);
+  const hooks = (0, import_utils18.castArray)(hook);
   for (let x = 0; x < hooks.length; x++) {
-    if ((0, import_utils17.isFunction)(hooks[x])) {
+    if ((0, import_utils18.isFunction)(hooks[x])) {
       doc = await hooks[x].call(req, doc, permissions, context);
     }
   }
@@ -2757,13 +2760,13 @@ async function collectSchemaFields({
     if (baseFields.includes(key)) continue;
     const val = permissionSchema[key];
     const value = val && val[access] || val;
-    if ((0, import_utils17.isBoolean)(value)) {
+    if ((0, import_utils18.isBoolean)(value)) {
       if (value) fields.push(key);
-    } else if ((0, import_utils17.isString)(value)) {
+    } else if ((0, import_utils18.isString)(value)) {
       if (stringHandler(value)) fields.push(key);
-    } else if ((0, import_utils17.isArray)(value)) {
+    } else if ((0, import_utils18.isArray)(value)) {
       if (arrayHandler(value)) fields.push(key);
-    } else if ((0, import_utils17.isFunction)(value)) {
+    } else if ((0, import_utils18.isFunction)(value)) {
       if (await value.call(req, ...functionArgs)) fields.push(key);
     }
   }
@@ -2852,7 +2855,7 @@ async function runDecorateAllHook({
 }
 
 // src/acl/select-resolution.ts
-var import_utils18 = require("@web-ts-toolkit/utils");
+var import_utils19 = require("@web-ts-toolkit/utils");
 async function collectAllowedFieldsForRequest({
   req,
   permissionSchema,
@@ -2920,15 +2923,15 @@ async function resolveSelectForRequest({
       const excludeall = normalizedSelect.every((v) => v.startsWith("-"));
       if (excludeall) {
         normalizedSelect = normalizedSelect.map((v) => v.substring(1));
-        fields = (0, import_utils18.difference)(fields, normalizedSelect);
+        fields = (0, import_utils19.difference)(fields, normalizedSelect);
         if (excludeid) fields.push("-_id");
       } else {
-        fields = (0, import_utils18.intersection)(normalizedSelect, fields.concat(excludeid ? "-_id" : "_id"));
+        fields = (0, import_utils19.intersection)(normalizedSelect, fields.concat(excludeid ? "-_id" : "_id"));
       }
     }
     return fields.concat(alwaysSelectFields);
   }
-  return (0, import_utils18.intersection)(normalizedSelect, fields);
+  return (0, import_utils19.intersection)(normalizedSelect, fields);
 }
 
 // src/core.ts
@@ -2942,10 +2945,10 @@ var Core = class {
   getIdentifier(modelName) {
     const resolveIdFilter = getModelOption(modelName, "resolveIdFilter");
     const idField = getModelOption(modelName, "idField");
-    if ((0, import_utils19.isFunction)(resolveIdFilter)) {
+    if ((0, import_utils20.isFunction)(resolveIdFilter)) {
       return null;
     }
-    if ((0, import_utils19.isString)(idField)) {
+    if ((0, import_utils20.isString)(idField)) {
       return idField;
     }
     return "_id";
@@ -2985,7 +2988,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]
     });
   }
@@ -3000,7 +3003,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]
     });
   }
@@ -3023,11 +3026,11 @@ var Core = class {
   async genPopulate(modelName, access = "read", _populate = null) {
     if (!_populate) return [];
     let populate = Array.isArray(_populate) ? _populate : [_populate];
-    populate = (0, import_utils19.compact)(
+    populate = (0, import_utils20.compact)(
       await Promise.all(
         populate.map(async (p) => {
-          const populateAccess = !(0, import_utils19.isString)(p) && p.access ? p.access : access;
-          const ret = (0, import_utils19.isString)(p) ? { path: p } : {
+          const populateAccess = !(0, import_utils20.isString)(p) && p.access ? p.access : access;
+          const ret = (0, import_utils20.isString)(p) ? { path: p } : {
             path: p.path,
             select: normalizeSelect(p.select)
           };
@@ -3047,10 +3050,10 @@ var Core = class {
   }
   async validate(modelName, allowedData, access, context) {
     const validate = getModelOption(modelName, `validate.${access}`, null);
-    if ((0, import_utils19.isFunction)(validate)) {
+    if ((0, import_utils20.isFunction)(validate)) {
       const permissions = this.getGlobalPermissions();
       return validate.call(this.req, allowedData, permissions, context);
-    } else if ((0, import_utils19.isBoolean)(validate) || (0, import_utils19.isArray)(validate)) {
+    } else if ((0, import_utils20.isBoolean)(validate) || (0, import_utils20.isArray)(validate)) {
       return validate;
     } else {
       return true;
@@ -3075,7 +3078,7 @@ var Core = class {
     const changeOptions = getModelOption(modelName, `onChange`, {});
     for (let x = 0; x < context.modifiedPaths.length; x++) {
       const mpath = context.modifiedPaths[x];
-      if ((0, import_utils19.isFunction)(changeOptions[mpath])) {
+      if ((0, import_utils20.isFunction)(changeOptions[mpath])) {
         await changeOptions[mpath].call(
           this.req,
           context.originalDocumentSnapshot[mpath],
@@ -3099,7 +3102,7 @@ var Core = class {
   async genDocPermissions(modelName, doc, access, context) {
     const docPermissionsFn = getModelOption(modelName, `docPermissions.${access}`, null);
     let docPermissions = {};
-    if ((0, import_utils19.isFunction)(docPermissionsFn)) {
+    if ((0, import_utils20.isFunction)(docPermissionsFn)) {
       const permissions = this.getGlobalPermissions();
       try {
         docPermissions = await docPermissionsFn.call(this.req, doc, permissions, context);
@@ -3147,7 +3150,7 @@ var Core = class {
       readExists ? this.genAllowedFields(modelName, doc, "read") : [],
       updateExists ? this.genAllowedFields(modelName, doc, "update") : []
     ]);
-    const viewObj = (0, import_utils19.reduce)(
+    const viewObj = (0, import_utils20.reduce)(
       views,
       (ret, view) => {
         ret[view] = true;
@@ -3155,7 +3158,7 @@ var Core = class {
       },
       {}
     );
-    const editObj = (0, import_utils19.reduce)(
+    const editObj = (0, import_utils20.reduce)(
       edits,
       (ret, view) => {
         ret[view] = true;
@@ -3179,9 +3182,9 @@ var Core = class {
     return runDecorateAllHook({ req: this.req, hook: decorateAll, docs, permissions, context });
   }
   runTasks(modelName, docObject, task) {
-    const tasks = (0, import_utils19.compact)((0, import_utils19.castArray)(task));
+    const tasks = (0, import_utils20.compact)((0, import_utils20.castArray)(task));
     if (tasks.length === 0) return docObject;
-    (0, import_utils19.forEach)(tasks, (task2) => {
+    (0, import_utils20.forEach)(tasks, (task2) => {
       const { type, args, options } = task2;
       switch (type) {
         case "COPY_AND_DEPOPULATE":
@@ -3212,9 +3215,9 @@ var Core = class {
       }
       const [, field, op] = keys2;
       const subOption = getExactModelOption(modelName, `operationAccess.${access}`);
-      if ((0, import_utils19.isUndefined)(subOption)) {
+      if ((0, import_utils20.isUndefined)(subOption)) {
         const subFieldOption = getExactModelOption(modelName, `operationAccess.subs.${field}`);
-        if ((0, import_utils19.isUndefined)(subFieldOption)) {
+        if ((0, import_utils20.isUndefined)(subFieldOption)) {
           const opOption = getModelOption(modelName, `operationAccess.${op}`);
           return this.canActivate(opOption);
         }
@@ -3264,25 +3267,25 @@ function guard(condition) {
     const permissions = req[PERMISSIONS];
     let cond = condition;
     let phas = (key) => permissions.has(key);
-    if ((0, import_utils20.isPlainObject)(condition)) {
+    if ((0, import_utils21.isPlainObject)(condition)) {
       const { modelName, id, condition: _cond } = condition;
       const svc = req.macl.getPublicService(modelName);
       const select = getModelOption(modelName, `alwaysSelectFields.read`, void 0);
-      let _id = (0, import_utils20.isString)(id) ? id : null;
-      if ((0, import_utils20.isPlainObject)(id)) {
+      let _id = (0, import_utils21.isString)(id) ? id : null;
+      if ((0, import_utils21.isPlainObject)(id)) {
         const { type = "param", key } = id;
         if (type === "param") {
           const paramValue = req.params[key];
-          _id = (0, import_utils20.isArray)(paramValue) ? paramValue[0] ?? null : paramValue ?? null;
+          _id = (0, import_utils21.isArray)(paramValue) ? paramValue[0] ?? null : paramValue ?? null;
         } else if (type === "query") {
           const _qval = req.query[key];
-          if ((0, import_utils20.isArray)(_qval)) _id = _qval.length > 0 ? _qval[0] : null;
+          if ((0, import_utils21.isArray)(_qval)) _id = _qval.length > 0 ? _qval[0] : null;
           else _id = _qval;
         } else {
           _id = null;
         }
       }
-      if (!(0, import_utils20.isString)(_id) || !_id) {
+      if (!(0, import_utils21.isString)(_id) || !_id) {
         return next(new import_express_json_router2.default.clientErrors.BadRequestError());
       }
       const result = await svc._read(_id, { select });
@@ -3290,15 +3293,15 @@ function guard(condition) {
         return next(new import_express_json_router2.default.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);
-    if ((0, import_utils20.isString)(cond)) {
+    if ((0, import_utils21.isString)(cond)) {
       if (stringHandler(cond)) return next();
-    } else if ((0, import_utils20.isArray)(cond)) {
+    } else if ((0, import_utils21.isArray)(cond)) {
       if (arrayHandler(cond)) return next();
-    } else if ((0, import_utils20.isFunction)(cond)) {
+    } else if ((0, import_utils21.isFunction)(cond)) {
       const result = await cond.call(req, permissions);
       if (!!result) return next();
     }
@@ -3311,7 +3314,7 @@ var import_express2 = __toESM(require("express"));
 
 // src/routers/model-router.ts
 var import_express_json_router5 = __toESM(require("@web-ts-toolkit/express-json-router"));
-var import_utils24 = require("@web-ts-toolkit/utils");
+var import_utils25 = require("@web-ts-toolkit/utils");
 
 // src/routers/router-mutation.ts
 var MODEL_BUILD_TIME_OPTION_KEYS = /* @__PURE__ */ new Set([
@@ -4251,7 +4254,7 @@ var rootDataQueryEntrySchema = import_zod5.z.union([
 var rootQuerySchema = import_zod5.z.array(import_zod5.z.union([rootModelQueryEntrySchema, rootDataQueryEntrySchema]));
 
 // src/routers/shared.ts
-var import_utils21 = require("@web-ts-toolkit/utils");
+var import_utils22 = require("@web-ts-toolkit/utils");
 
 // src/routers/model-router-collection-routes.ts
 function setModelCollectionRoutes(context) {
@@ -4269,14 +4272,14 @@ function setModelCollectionRoutes(context) {
     await context.assertAllowed(req, "list");
     const { skip, limit, page, page_size, skim, include_permissions, include_count, include_extra_headers } = parseQuery(requestSchemas.listQuery, req.query);
     const svc = context.getPublicService(req);
-    const includeCount = (0, import_utils21.parseBooleanString)(include_count);
-    const includeExtraHeaders = (0, import_utils21.parseBooleanString)(include_extra_headers);
+    const includeCount = (0, import_utils22.parseBooleanString)(include_count);
+    const includeExtraHeaders = (0, import_utils22.parseBooleanString)(include_extra_headers);
     const result = await svc._list(
       {},
       { skip, limit, page, pageSize: page_size },
       {
-        skim: (0, import_utils21.parseBooleanString)(skim),
-        includePermissions: (0, import_utils21.parseBooleanString)(include_permissions),
+        skim: (0, import_utils22.parseBooleanString)(skim),
+        includePermissions: (0, import_utils22.parseBooleanString)(include_permissions),
         includeCount
       }
     );
@@ -4331,7 +4334,7 @@ function setModelCollectionRoutes(context) {
       context.getRequestSchema("requestSchemas.create")
     );
     const svc = context.getPublicService(req);
-    const result = await svc._create(data, {}, { includePermissions: (0, import_utils21.parseBooleanString)(include_permissions) });
+    const result = await svc._create(data, {}, { includePermissions: (0, import_utils22.parseBooleanString)(include_permissions) });
     handleResultError(result);
     return formatModelCreatedResponse(result);
   });
@@ -4365,7 +4368,7 @@ function setModelCollectionRoutes(context) {
       data,
       { select, populate, tasks },
       {
-        includePermissions: includePermissions ?? (0, import_utils21.parseBooleanString)(include_permissions),
+        includePermissions: includePermissions ?? (0, import_utils22.parseBooleanString)(include_permissions),
         populateAccess
       }
     );
@@ -4459,8 +4462,8 @@ function setModelDocumentRoutes(context) {
       id,
       {},
       {
-        includePermissions: (0, import_utils21.parseBooleanString)(include_permissions),
-        tryList: (0, import_utils21.parseBooleanString)(try_list)
+        includePermissions: (0, import_utils22.parseBooleanString)(include_permissions),
+        tryList: (0, import_utils22.parseBooleanString)(try_list)
       }
     );
     handleResultError(result);
@@ -4545,8 +4548,8 @@ function setModelDocumentRoutes(context) {
       data,
       {},
       {
-        returningAll: (0, import_utils21.parseBooleanString)(returning_all),
-        includePermissions: (0, import_utils21.parseBooleanString)(include_permissions)
+        returningAll: (0, import_utils22.parseBooleanString)(returning_all),
+        includePermissions: (0, import_utils22.parseBooleanString)(include_permissions)
       }
     );
     handleResultError(result);
@@ -4584,8 +4587,8 @@ function setModelDocumentRoutes(context) {
       data,
       { select, populate, tasks },
       {
-        returningAll: returningAll ?? (0, import_utils21.parseBooleanString)(returning_all),
-        includePermissions: includePermissions ?? (0, import_utils21.parseBooleanString)(include_permissions),
+        returningAll: returningAll ?? (0, import_utils22.parseBooleanString)(returning_all),
+        includePermissions: includePermissions ?? (0, import_utils22.parseBooleanString)(include_permissions),
         populateAccess
       }
     );
@@ -4613,8 +4616,8 @@ function setModelDocumentRoutes(context) {
       body,
       {},
       {
-        returningAll: (0, import_utils21.parseBooleanString)(returning_all),
-        includePermissions: (0, import_utils21.parseBooleanString)(include_permissions)
+        returningAll: (0, import_utils22.parseBooleanString)(returning_all),
+        includePermissions: (0, import_utils22.parseBooleanString)(include_permissions)
       }
     );
     handleResultError(result);
@@ -4650,8 +4653,8 @@ function setModelDocumentRoutes(context) {
       data,
       { select, populate, tasks },
       {
-        returningAll: returningAll ?? (0, import_utils21.parseBooleanString)(returning_all),
-        includePermissions: includePermissions ?? (0, import_utils21.parseBooleanString)(include_permissions),
+        returningAll: returningAll ?? (0, import_utils22.parseBooleanString)(returning_all),
+        includePermissions: includePermissions ?? (0, import_utils22.parseBooleanString)(include_permissions),
         populateAccess
       }
     );
@@ -4717,7 +4720,7 @@ function setModelDocumentRoutes(context) {
 }
 
 // src/routers/model-router-subdocument-routes.ts
-var import_utils22 = require("@web-ts-toolkit/utils");
+var import_utils23 = require("@web-ts-toolkit/utils");
 function setModelSubDocumentRoutes(context) {
   const subs = getModelSub(context.modelName);
   for (let x = 0; x < subs.length; x++) {
@@ -4808,7 +4811,7 @@ function setModelSubDocumentRoutes(context) {
           context.getRequestSchema("requestSchemas.subRead")
         );
         const populate = body.populate;
-        const normalizedPopulate = Array.isArray(populate) ? populate.map((item) => (0, import_utils22.isString)(item) ? { path: item } : item) : (0, import_utils22.isString)(populate) ? { path: populate } : populate ?? [];
+        const normalizedPopulate = Array.isArray(populate) ? populate.map((item) => (0, import_utils23.isString)(item) ? { path: item } : item) : (0, import_utils23.isString)(populate) ? { path: populate } : populate ?? [];
         const svc = context.getPublicService(req);
         const result = await svc.readSub(id, sub, subId, { select: body.select ?? [], populate: normalizedPopulate });
         handleResultError(result);
@@ -4886,11 +4889,11 @@ function setModelSubDocumentRoutes(context) {
 }
 
 // src/openapi/route-registration.ts
-var import_utils23 = require("@web-ts-toolkit/utils");
+var import_utils24 = require("@web-ts-toolkit/utils");
 function registerOpenApiRoute(runtime, basePath, defaultTag, route) {
   runtime.registerOpenApiRoute({
     ...route,
-    path: (0, import_utils23.normalizeUrlPath)(basePath + route.path),
+    path: (0, import_utils24.normalizeUrlPath)(basePath + route.path),
     tags: route.tags ?? [defaultTag]
   });
 }
@@ -4898,8 +4901,8 @@ function registerOpenApiRoute(runtime, basePath, defaultTag, route) {
 // src/routers/model-router.ts
 var clientErrors2 = import_express_json_router5.default.clientErrors;
 function setOption(parentKey, optionKey, option) {
-  const key = (0, import_utils24.isUndefined)(option) ? parentKey : `${parentKey}.${optionKey}`;
-  const value = (0, import_utils24.isUndefined)(option) ? optionKey : option;
+  const key = (0, import_utils25.isUndefined)(option) ? parentKey : `${parentKey}.${optionKey}`;
+  const value = (0, import_utils25.isUndefined)(option) ? optionKey : option;
   assertMutableRouterOption("model", key);
   this.runtime.setModelOption(this.modelName, key, value);
   return this;
@@ -5060,7 +5063,7 @@ var ModelRouter = class {
     this.runtime.setModelOptions(modelName, initialOptions);
     attachRuntimeToModel(modelName, this.runtime);
     this.options = this.runtime.getModelOptions(modelName);
-    this.fullBasePath = (0, import_utils24.normalizeUrlPath)(this.options.parentPath + this.options.basePath);
+    this.fullBasePath = (0, import_utils25.normalizeUrlPath)(this.options.parentPath + this.options.basePath);
     this.modelName = modelName;
     this.router = new import_express_json_router5.default(this.options.basePath, createSetCore(this.runtime), accessRouterResponseHandler);
     this.model = new model_default(modelName);
@@ -5132,13 +5135,13 @@ var ModelRouter = class {
   }
   logEndpoints() {
     runWithRuntime(this.runtime, () => {
-      (0, import_utils24.forEach)(this.router.endpoints, ({ method, path }) => {
-        logger.info(`${(0, import_utils24.padEnd)(method, 6)} ${(0, import_utils24.normalizeUrlPath)(this.options.parentPath + path)}`);
+      (0, import_utils25.forEach)(this.router.endpoints, ({ method, path }) => {
+        logger.info(`${(0, import_utils25.padEnd)(method, 6)} ${(0, import_utils25.normalizeUrlPath)(this.options.parentPath + path)}`);
       });
     });
   }
   set(keyOrOptions, value) {
-    if (arguments.length === 2 && (0, import_utils24.isString)(keyOrOptions)) {
+    if (arguments.length === 2 && (0, import_utils25.isString)(keyOrOptions)) {
       assertMutableRouterOption("model", keyOrOptions);
       this.runtime.setModelOption(
         this.modelName,
@@ -5146,7 +5149,7 @@ var ModelRouter = class {
         value
       );
     }
-    if (arguments.length === 1 && (0, import_utils24.isPlainObject)(keyOrOptions)) {
+    if (arguments.length === 1 && (0, import_utils25.isPlainObject)(keyOrOptions)) {
       assertMutableRouterOptions("model", keyOrOptions);
       this.runtime.setModelOptions(this.modelName, keyOrOptions);
     }
@@ -5169,7 +5172,7 @@ var ModelRouter = class {
 
 // src/routers/root-router.ts
 var import_express_json_router6 = __toESM(require("@web-ts-toolkit/express-json-router"));
-var import_utils25 = require("@web-ts-toolkit/utils");
+var import_utils26 = require("@web-ts-toolkit/utils");
 
 // src/core-data.ts
 var DataCore = class {
@@ -5342,7 +5345,7 @@ var createErrorResult = (code, detail) => ({
   code,
   errors: [{ detail }]
 });
-var normalizeSubPopulate = (populate) => Array.isArray(populate) ? populate.map((item) => (0, import_utils25.isString)(item) ? { path: item } : item) : (0, import_utils25.isString)(populate) ? { path: populate } : populate ?? [];
+var normalizeSubPopulate = (populate) => Array.isArray(populate) ? populate.map((item) => (0, import_utils26.isString)(item) ? { path: item } : item) : (0, import_utils26.isString)(populate) ? { path: populate } : populate ?? [];
 var RootRouter = class {
   constructor(options = { basePath: "", operationAccess: true }, runtime = defaultRuntime) {
     this.modelOperations = {
@@ -5416,7 +5419,7 @@ var RootRouter = class {
     this.setRoutes();
   }
   registerOpenApiRoute(route) {
-    registerOpenApiRoute(this.runtime, (0, import_utils25.normalizeUrlPath)(this.basename), "root", route);
+    registerOpenApiRoute(this.runtime, (0, import_utils26.normalizeUrlPath)(this.basename), "root", route);
   }
   wrapResult(index, item, result) {
     return {
@@ -5477,7 +5480,7 @@ var RootRouter = class {
   groupItemsByOrder(items) {
     return items.reduce((acc, item, index) => {
       let order = 0;
-      if ((0, import_utils25.isNumber)(item.order)) {
+      if ((0, import_utils26.isNumber)(item.order)) {
         order = item.order < 0 ? 0 : item.order;
       }
       if (!acc[order]) {
@@ -5501,7 +5504,7 @@ var RootRouter = class {
         const arrResult = await Promise.all(groupedItems[x].map(({ item, index }) => this.processOp(req, item, index)));
         results.push(...arrResult);
       }
-      return (0, import_utils25.orderBy)(results, ["index"], ["asc"]);
+      return (0, import_utils26.orderBy)(results, ["index"], ["asc"]);
     });
     this.registerOpenApiRoute({
       method: "post",
@@ -5518,11 +5521,11 @@ var RootRouter = class {
 
 // src/routers/data-router.ts
 var import_express_json_router7 = __toESM(require("@web-ts-toolkit/express-json-router"));
-var import_utils26 = require("@web-ts-toolkit/utils");
+var import_utils27 = require("@web-ts-toolkit/utils");
 var clientErrors4 = import_express_json_router7.default.clientErrors;
 function setOption2(parentKey, optionKey, option) {
-  const key = (0, import_utils26.isUndefined)(option) ? parentKey : `${parentKey}.${optionKey}`;
-  const value = (0, import_utils26.isUndefined)(option) ? optionKey : option;
+  const key = (0, import_utils27.isUndefined)(option) ? parentKey : `${parentKey}.${optionKey}`;
+  const value = (0, import_utils27.isUndefined)(option) ? optionKey : option;
   assertMutableRouterOption("data", key);
   this.runtime.setDataOption(this.dataName, key, value);
   return this;
@@ -5558,7 +5561,7 @@ var DataRouter = class {
     this.runtime = runtime;
     this.runtime.setDataOptions(dataName, initialOptions);
     this.options = this.runtime.getDataOptions(dataName);
-    this.fullBasePath = (0, import_utils26.normalizeUrlPath)(this.options.parentPath + this.options.basePath);
+    this.fullBasePath = (0, import_utils27.normalizeUrlPath)(this.options.parentPath + this.options.basePath);
     this.dataName = dataName;
     this.router = new import_express_json_router7.default(this.options.basePath, createSetDataCore(this.runtime), accessRouterResponseHandler);
     this.setCollectionRoutes();
@@ -5591,8 +5594,8 @@ var DataRouter = class {
         req.query
       );
       const svc = this.getService(req);
-      const includeCount = (0, import_utils21.parseBooleanString)(include_count);
-      const includeExtraHeaders = (0, import_utils21.parseBooleanString)(include_extra_headers);
+      const includeCount = (0, import_utils22.parseBooleanString)(include_count);
+      const includeExtraHeaders = (0, import_utils22.parseBooleanString)(include_extra_headers);
       const result = await svc.find(
         {},
         { skip, limit, page, pageSize: page_size },
@@ -5710,11 +5713,11 @@ var DataRouter = class {
     });
   }
   set(keyOrOptions, value) {
-    if (arguments.length === 2 && (0, import_utils26.isString)(keyOrOptions)) {
+    if (arguments.length === 2 && (0, import_utils27.isString)(keyOrOptions)) {
       assertMutableRouterOption("data", keyOrOptions);
       this.runtime.setDataOption(this.dataName, keyOrOptions, value);
     }
-    if (arguments.length === 1 && (0, import_utils26.isPlainObject)(keyOrOptions)) {
+    if (arguments.length === 1 && (0, import_utils27.isPlainObject)(keyOrOptions)) {
       assertMutableRouterOptions("data", keyOrOptions);
       this.runtime.setDataOptions(this.dataName, keyOrOptions);
     }
@@ -5834,7 +5837,7 @@ function createRuntimeApi(runtime) {
   wtt2.runtime = runtime;
   wtt2.createRouter = function(modelName, options) {
     const resolvedModelName = typeof modelName === "string" ? modelName : modelName && "modelName" in modelName ? modelName.modelName : modelName;
-    return (0, import_utils27.isUndefined)(options) ? new RootRouter(modelName, runtime) : new ModelRouter(resolvedModelName, options, runtime);
+    return (0, import_utils28.isUndefined)(options) ? new RootRouter(modelName, runtime) : new ModelRouter(resolvedModelName, options, runtime);
   };
   wtt2.createDataRouter = function(dataName, options) {
     return new DataRouter(dataName, options, runtime);
@@ -5844,10 +5847,10 @@ function createRuntimeApi(runtime) {
   };
   wtt2.combineRoutes = combineRoutes;
   wtt2.set = function(keyOrOptions, value) {
-    if (arguments.length === 2 && (0, import_utils27.isString)(keyOrOptions)) {
+    if (arguments.length === 2 && (0, import_utils28.isString)(keyOrOptions)) {
       return runtime.setGlobalOption(keyOrOptions, value);
     }
-    if (arguments.length === 1 && (0, import_utils27.isPlainObject)(keyOrOptions)) {
+    if (arguments.length === 1 && (0, import_utils28.isPlainObject)(keyOrOptions)) {
       return runtime.setGlobalOptions(keyOrOptions);
     }
   };