unconventional 1.11.0 → 1.12.0

package/dist/core/base.model.js

@@ -210,11 +210,19 @@ class BaseModel extends Document {
             return;
         const dataArray = Array.isArray(data) ? data : [data];
         const propSummary = Object.entries(this.schema.props);
-        for (const item of dataArray) {
+        for (let item of dataArray) {
             for (const [key, options] of propSummary) {
                 // Mask private fields. Skip 1st level if relationsOnly.
-                if (!relationsOnly && options.private && key in item) {
-                    item[key] = undefined;
+                if (!relationsOnly && key in item && options.private != null) {
+                    if (Array.isArray(item[key])) {
+                        item[key] = item[key].filter(rel => !(0, utils_1.evaluate)(options.private, item, rel));
+                        if (item[key].length === 0)
+                            continue;
+                    }
+                    else if ((0, utils_1.evaluate)(options.private, item, item[key])) {
+                        item[key] = undefined;
+                        continue;
+                    }
                 }
                 // Mask private fields in relations
                 if (options.relation && item[key]) {

package/dist/types/decorator.types.d.ts

@@ -63,9 +63,9 @@ export interface PropOptions<T = any, S extends typeof BaseModel = any, P extend
     /** Give the Property a default Value */
     default?: T | (() => T);
     /** Protect field from edits by non-privileged users */
-    system?: boolean;
+    system?: boolean | ((model: InstanceType<S>, field: T extends typeof BaseModel ? InstanceType<T> : T) => boolean);
     /** Hide field in responses to non-privileged users */
-    private?: boolean;
+    private?: boolean | ((model: InstanceType<S>, field: T extends typeof BaseModel ? InstanceType<T> : T) => boolean);
     /** Relational field data */
     relation?: T extends typeof BaseModel ? Relation<T, S, P> : never;
 }

package/dist/utils/array.utils.d.ts

@@ -2,3 +2,5 @@
 export declare const equalArrays: <T>(a: T[], b: T[]) => boolean;
 /** Checks whether an object has no keys and/or the value for every key is undefined */
 export declare function isEmpty(obj: any): boolean;
+/** Evaluate a direct or functional value */
+export declare function evaluate<T, F extends (...args: any[]) => T>(value: T | F | undefined, ...args: Parameters<F>): T | undefined;

package/dist/utils/array.utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.equalArrays = void 0;
+exports.evaluate = exports.isEmpty = exports.equalArrays = void 0;
 /** Compares two arrays and returns true if they contain the same elements, regardless of order */
 const equalArrays = (a, b) => {
     if (a.length !== b.length)
@@ -26,3 +26,8 @@ function isEmpty(obj) {
     return true;
 }
 exports.isEmpty = isEmpty;
+/** Evaluate a direct or functional value */
+function evaluate(value, ...args) {
+    return value instanceof Function ? value(...args) : value;
+}
+exports.evaluate = evaluate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unconventional",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "A complete server built on Cloudflare Workers/Pages",
   "keywords": [
     "cloudflare",
@@ -39,9 +39,9 @@
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs",
     "docs:serve": "vitepress serve docs",
-    "release:major": "changelog -M && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version major && git push origin && git push origin --tags",
-    "release:minor": "changelog -m && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version minor && git push origin && git push origin --tags",
-    "release:patch": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version patch && git push origin && git push origin --tags"
+    "release:major": "changelog -M && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version major",
+    "release:minor": "changelog -m && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version minor",
+    "release:patch": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version patch"
   },
   "peerDependencies": {
     "hono": "^4",