@ozdao/martyrs 0.2.481 → 0.2.483

package/README.md

@@ -16,9 +16,9 @@ We believe in the power of a single codebase for all platforms. Our mission is t
 - Mobile App Compilation – Easily compile web applications into mobile apps.
 - UI Component Library – Pre-built frontend components with customizable styles.
 - Full-Stack Modular Architecture – MVC-based system with ready-to-use modules for e-commerce, SaaS, social networks, and more.
-- Advanced Authentication & Access Control – 2FA support, role-based access management (ABAC) for organizations.
+- Advanced Authentication & Access Control – 2FA support, attribute-based access control, organizations and so on.
 - Core System Utilities – Includes caching, logging, CRUD operations, observer patterns, and more.
-- Notification System – Supports email, SMS, mobile, and web push notifications.
+- Notification System – Supports email, SMS, mobile and web push notifications.
 
 ## Prerequisites
 
@@ -32,10 +32,10 @@ Martyrs is built on modern and proven technologies:
 
 ## Installation
 
-Use npm to install Martyrs:
+Use pnpm to install Martyrs:
 
 ```bash
-npm install '@ozdao/martyrs'
+pnpm add '@ozdao/martyrs'
 ```
 
 ## Getting Started
@@ -46,15 +46,6 @@ For detailed information on how to use Martyrs, check out our [official document
 
 Community contributions are encouraged. For guidelines, see the contributing guide.
 
-## Special Thanks
-
-During the work process, we study a vast amount of open-source code and are grateful to all the programmers who have shared it. Without you, all of this would have been impossible. Special attention is deserved by the authors whose code we have fully utilized, your names will forever be in the history of OZ:
-
-- For [megasanjay](https://github.com/megasanjay) for his vue3-marquee
-- For [shentao](https://github.com/shentao) for his vue-multiselect
-- For [VictorNico](https://github.com/VictorNico) for his vue3-reactive-tel-input
-- For [sipec](https://github.com/sipec) for his vue-tags-input
-
 ## License
 
 Martyrs is licensed under the GNU GPLv3.

package/dist/{Media-CKk33U4A.js → Media-C57G7rnE.js}

@@ -1,5 +1,5 @@
 import { ref as u, computed as m, onMounted as N, onUnmounted as P, createElementBlock as c, openBlock as d, createCommentVNode as f, mergeProps as V, createElementVNode as S, toDisplayString as q } from "vue";
-import { _ as z } from "./main-BhAiwmnI.js";
+import { _ as z } from "./main-CXQqAVVb.js";
 const D = { class: "media-container" }, T = ["src", "data-src", "alt"], U = ["controls", "loop", "muted", "autoplay", "playsinline", "preload"], _ = ["src", "type"], $ = {
   key: 2,
   class: "media-placeholder"

package/dist/{Media-B1ZP3D7B.cjs → Media-DjnpKS62.cjs}

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),V=require("./main-C75EcBpE.cjs"),C={class:"media-container"},M=["src","data-src","alt"],j=["controls","loop","muted","autoplay","playsinline","preload"],N=["src","type"],O={key:2,class:"media-placeholder"},P={key:3,class:"media-error"},S={__name:"Media",props:{url:{type:String,required:!0},options:{type:Object,default:()=>({muted:!0,loop:!0,playsinline:!0,preload:"metadata"})}},setup(t){const m=t,l=e.ref(null),p=e.ref(null),s=e.ref(!1),u=e.ref(null),v=e.ref(!1);let i=null,f=!1;const d=e.computed(()=>{var o,a,n;return(n=(a=(o=m.url)==null?void 0:o.split("."))==null?void 0:a.pop())==null?void 0:n.toLowerCase()}),g=e.computed(()=>["jpg","jpeg","png","gif","webp","svg","avif"].includes(d.value)),y=e.computed(()=>["mp4","webm","ogg"].includes(d.value)),x=e.computed(()=>({mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg"})[d.value]||"");function E(){s.value=!0}function I(o){u.value=`Ошибка загрузки медиа: ${o.message}`,s.value=!1}async function w(){if(l.value)try{l.value.paused&&!f&&(await l.value.play(),f=!0)}catch(o){I(o)}}function L(){const o={root:null,rootMargin:"50px",threshold:.1};i=new IntersectionObserver(n=>{n.forEach(r=>{var c;v.value=r.isIntersecting,r.isIntersecting&&(y.value&&((c=m.options)!=null&&c.autoplay)&&w(),i.disconnect())})},o);const a=g.value?p.value:l.value;a&&i.observe(a)}return e.onMounted(()=>{L()}),e.onUnmounted(()=>{i&&i.disconnect()}),(o,a)=>{var n,r,c,k,h,b,B;return e.openBlock(),e.createElementBlock("div",C,[g.value?(e.openBlock(),e.createElementBlock("img",e.mergeProps({key:0,src:v.value?t.url:"","data-src":t.url,alt:((n=t.options)==null?void 0:n.alt)||"Image",class:["media-item",{loading:!s.value}],loading:"lazy",onLoad:E},t.options,{ref_key:"imageElement",ref:p}),null,16,M)):y.value?(e.openBlock(),e.createElementBlock("video",e.mergeProps({key:1,ref_key:"videoElement",ref:l,class:[{loading:!s.value},"media-item"],controls:!((r=t.options)!=null&&r.hideControls),loop:((c=t.options)==null?void 0:c.loop)!==!1,muted:((k=t.options)==null?void 0:k.muted)!==!1,autoplay:(h=t.options)==null?void 0:h.autoplay,playsinline:((b=t.options)==null?void 0:b.playsinline)!==!1,preload:((B=t.options)==null?void 0:B.preload)||"metadata",onLoadeddata:E},t.options),[e.createElementVNode("source",{src:t.url,type:x.value},null,8,N)],16,j)):e.createCommentVNode("",!0),s.value?e.createCommentVNode("",!0):(e.openBlock(),e.createElementBlock("div",O," Loading... ")),u.value?(e.openBlock(),e.createElementBlock("div",P,e.toDisplayString(u.value),1)):e.createCommentVNode("",!0)])}}},q=V._export_sfc(S,[["__scopeId","data-v-1f94a0e9"]]);exports.default=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),V=require("./main-De5X_RUk.cjs"),C={class:"media-container"},M=["src","data-src","alt"],j=["controls","loop","muted","autoplay","playsinline","preload"],N=["src","type"],O={key:2,class:"media-placeholder"},P={key:3,class:"media-error"},S={__name:"Media",props:{url:{type:String,required:!0},options:{type:Object,default:()=>({muted:!0,loop:!0,playsinline:!0,preload:"metadata"})}},setup(t){const m=t,l=e.ref(null),p=e.ref(null),s=e.ref(!1),u=e.ref(null),v=e.ref(!1);let i=null,f=!1;const d=e.computed(()=>{var o,a,n;return(n=(a=(o=m.url)==null?void 0:o.split("."))==null?void 0:a.pop())==null?void 0:n.toLowerCase()}),g=e.computed(()=>["jpg","jpeg","png","gif","webp","svg","avif"].includes(d.value)),y=e.computed(()=>["mp4","webm","ogg"].includes(d.value)),x=e.computed(()=>({mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg"})[d.value]||"");function E(){s.value=!0}function I(o){u.value=`Ошибка загрузки медиа: ${o.message}`,s.value=!1}async function w(){if(l.value)try{l.value.paused&&!f&&(await l.value.play(),f=!0)}catch(o){I(o)}}function L(){const o={root:null,rootMargin:"50px",threshold:.1};i=new IntersectionObserver(n=>{n.forEach(r=>{var c;v.value=r.isIntersecting,r.isIntersecting&&(y.value&&((c=m.options)!=null&&c.autoplay)&&w(),i.disconnect())})},o);const a=g.value?p.value:l.value;a&&i.observe(a)}return e.onMounted(()=>{L()}),e.onUnmounted(()=>{i&&i.disconnect()}),(o,a)=>{var n,r,c,k,h,b,B;return e.openBlock(),e.createElementBlock("div",C,[g.value?(e.openBlock(),e.createElementBlock("img",e.mergeProps({key:0,src:v.value?t.url:"","data-src":t.url,alt:((n=t.options)==null?void 0:n.alt)||"Image",class:["media-item",{loading:!s.value}],loading:"lazy",onLoad:E},t.options,{ref_key:"imageElement",ref:p}),null,16,M)):y.value?(e.openBlock(),e.createElementBlock("video",e.mergeProps({key:1,ref_key:"videoElement",ref:l,class:[{loading:!s.value},"media-item"],controls:!((r=t.options)!=null&&r.hideControls),loop:((c=t.options)==null?void 0:c.loop)!==!1,muted:((k=t.options)==null?void 0:k.muted)!==!1,autoplay:(h=t.options)==null?void 0:h.autoplay,playsinline:((b=t.options)==null?void 0:b.playsinline)!==!1,preload:((B=t.options)==null?void 0:B.preload)||"metadata",onLoadeddata:E},t.options),[e.createElementVNode("source",{src:t.url,type:x.value},null,8,N)],16,j)):e.createCommentVNode("",!0),s.value?e.createCommentVNode("",!0):(e.openBlock(),e.createElementBlock("div",O," Loading... ")),u.value?(e.openBlock(),e.createElementBlock("div",P,e.toDisplayString(u.value),1)):e.createCommentVNode("",!0)])}}},q=V._export_sfc(S,[["__scopeId","data-v-1f94a0e9"]]);exports.default=q;

package/dist/_virtual/_commonjsHelpers.cjs

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
+exports.commonjsGlobal = commonjsGlobal;
 exports.getDefaultExportFromCjs = getDefaultExportFromCjs;
 //# sourceMappingURL=_commonjsHelpers.cjs.map

package/dist/_virtual/_commonjsHelpers.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"_commonjsHelpers.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;"}
+{"version":3,"file":"_commonjsHelpers.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;"}

package/dist/_virtual/_commonjsHelpers.js

@@ -1,7 +1,9 @@
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 export {
+  commonjsGlobal,
   getDefaultExportFromCjs
 };
 //# sourceMappingURL=_commonjsHelpers.js.map

package/dist/_virtual/_commonjsHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"_commonjsHelpers.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;"}
+{"version":3,"file":"_commonjsHelpers.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/_virtual/index2.cjs

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const _commonjsHelpers = require("./_commonjsHelpers.cjs");
+const index = require("../node_modules/lodash.merge/index.cjs");
+var lodash_mergeExports = index.__require();
+const merge = /* @__PURE__ */ _commonjsHelpers.getDefaultExportFromCjs(lodash_mergeExports);
+exports.default = merge;
+//# sourceMappingURL=index2.cjs.map

package/dist/_virtual/index2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index2.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}

package/dist/_virtual/index2.js

@@ -0,0 +1,8 @@
+import { getDefaultExportFromCjs } from "./_commonjsHelpers.js";
+import { __require as requireLodash_merge } from "../node_modules/lodash.merge/index.js";
+var lodash_mergeExports = requireLodash_merge();
+const merge = /* @__PURE__ */ getDefaultExportFromCjs(lodash_mergeExports);
+export {
+  merge as default
+};
+//# sourceMappingURL=index2.js.map

package/dist/_virtual/index2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/_virtual/index3.cjs

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+var lodash_merge = { exports: {} };
+exports.__module = lodash_merge;
+//# sourceMappingURL=index3.cjs.map

package/dist/_virtual/index3.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index3.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/_virtual/index3.js

@@ -0,0 +1,5 @@
+var lodash_merge = { exports: {} };
+export {
+  lodash_merge as __module
+};
+//# sourceMappingURL=index3.js.map

package/dist/_virtual/index3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index3.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}

package/dist/{abac-XF1JVCLI.cjs → abac-6LjoG9u-.cjs}

@@ -17,8 +17,9 @@ class ABACCore {
       socket: null,
       params: {},
       _cache: /* @__PURE__ */ new Map(),
-      // Кэш результатов политик для этого контекста
-      _abac: this.abac
+      _abac: this.abac,
+      // Добавляем флаг для пропуска field policies (например, для админов)
+      skipFieldPolicies: input.skipFieldPolicies || false
     };
     if (input.req) {
       context.user = input.user || input.req.userId;
@@ -363,15 +364,27 @@ class ABACFields {
   registerFieldsPolicy(resourceName, config) {
     const normalized = {};
     for (const [pattern, conf] of Object.entries(config)) {
-      normalized[pattern] = {
-        actions: conf.actions || "*",
-        access: conf.access || "allow",
-        validator: conf.validator || null,
-        transform: conf.transform || null,
-        rule: conf.rule || "remove",
-        force: conf.force || false,
+      const { actions, ...baseSettings } = conf;
+      const base = {
+        actions: baseSettings.actions || "*",
+        access: baseSettings.access || "allow",
+        validator: baseSettings.validator || null,
+        transform: baseSettings.transform || null,
+        rule: baseSettings.rule || "remove",
+        force: baseSettings.force || false,
         pattern
       };
+      if (actions && typeof actions === "object") {
+        normalized[pattern] = {
+          base,
+          actions: Object.entries(actions).reduce((acc, [action, override]) => {
+            acc[action] = { ...base, ...override };
+            return acc;
+          }, {})
+        };
+      } else {
+        normalized[pattern] = { base };
+      }
     }
     this.configs.set(resourceName, normalized);
     return this;
@@ -380,9 +393,8 @@ class ABACFields {
    * Проверка доступа к полям
    */
   async checkFields(context, data, action = null) {
-    console.log(context);
-    if (context.skipFieldPolicies) {
-      console.log("Field policies skipped for admin/moderator");
+    const normalizedContext = this.abac.core.normalizeContext(context);
+    if (normalizedContext.skipFieldPolicies) {
       return {
         allowed: data,
         denied: [],
@@ -390,17 +402,16 @@ class ABACFields {
         transformed: data
       };
     }
-    const { resource } = context;
-    const fieldAction = action || context.action;
-    const config = context.options?.fieldsConfig || this.configs.get(resource);
+    const { resource } = normalizedContext;
+    const fieldAction = action || normalizedContext.action;
+    const config = normalizedContext.options?.fieldsConfig || this.configs.get(resource);
     if (!config) {
       return { allowed: data, denied: [], errors: [], transformed: data };
     }
-    const enrichedContext = { ...context };
     if (this.abac.policies && this.abac.policies.priorities.extensions.length > 0) {
       for (const [name, extensionFn] of this.abac.policies.priorities.extensions) {
         try {
-          await extensionFn(enrichedContext);
+          await extensionFn(normalizedContext);
         } catch (error) {
           console.error(`Extension ${name} error:`, error);
         }
@@ -412,28 +423,36 @@ class ABACFields {
       errors: [],
       transformed: null
     };
-    const ctx = { ...enrichedContext, fieldAction, cache: /* @__PURE__ */ new Map(), originalData: data };
     const rules = this._collectRules(data, config, fieldAction);
     const forced = rules.filter((r) => r.rule.force);
     const regular = rules.filter((r) => !r.rule.force);
     for (const { path, value, rule } of [...forced, ...regular]) {
-      const fieldCtx = { ...ctx, field: path, value };
       const processed = /* @__PURE__ */ new Set();
       if (processed.has(path)) continue;
       processed.add(path);
-      const hasAccess = await this._checkAccess(rule.access, fieldCtx);
+      const hasAccess = await this._checkFieldAccess(
+        rule.access,
+        normalizedContext,
+        path,
+        value
+      );
       if (!hasAccess) {
-        await this._handleDenied(result, path, rule.rule, fieldCtx);
+        await this._handleDenied(result, path, rule.rule);
         continue;
       }
       if (rule.validator && rule.access !== "optional") {
-        const validation = await this._validate(rule.validator, value, fieldCtx);
+        const validation = await this._validateField(
+          rule.validator,
+          value,
+          normalizedContext,
+          path
+        );
         if (!validation.isValid) {
           result.errors.push({ path, errors: validation.errors });
           if (rule.rule === "error") {
             throw new Error(`Validation failed: ${path}`);
           }
-          await this._handleDenied(result, path, rule.rule, fieldCtx);
+          await this._handleDenied(result, path, rule.rule);
         }
       }
     }
@@ -442,12 +461,68 @@ class ABACFields {
       if (!rule.transform) continue;
       const isDenied = result.denied.some((d) => d.path === path);
       if (isDenied) continue;
-      const fieldCtx = { ...ctx, field: path, value, currentData: result.transformed };
-      const transformed = await rule.transform(value, fieldCtx);
+      const transformed = await this._transformField(
+        rule.transform,
+        value,
+        normalizedContext,
+        path,
+        result.transformed
+      );
       this._setValue(result.transformed, path, transformed);
     }
     return result;
   }
+  /**
+   * Проверка доступа к полю
+   * @private
+   */
+  async _checkFieldAccess(access, context, fieldPath, fieldValue) {
+    if (access === "allow") return true;
+    if (access === "deny") return false;
+    if (access === "optional") return true;
+    if (typeof access === "function") {
+      try {
+        return !!await access(context, fieldPath, fieldValue);
+      } catch (e) {
+        console.error("Field access check error:", e);
+        return false;
+      }
+    }
+    return true;
+  }
+  /**
+   * Валидация поля
+   * @private
+   */
+  async _validateField(validator, value, context, fieldPath) {
+    if (typeof validator === "function") {
+      try {
+        const result = await validator(value, context, fieldPath);
+        if (typeof result === "boolean") {
+          return { isValid: result, errors: result ? [] : ["Validation failed"] };
+        }
+        return result;
+      } catch (e) {
+        return { isValid: false, errors: [e.message] };
+      }
+    }
+    if (validator && validator.validate) {
+      return validator.validate(value);
+    }
+    return { isValid: true, errors: [] };
+  }
+  /**
+   * Трансформация поля
+   * @private
+   */
+  async _transformField(transform, value, context, fieldPath, currentData) {
+    try {
+      return await transform(value, context, fieldPath, currentData);
+    } catch (error) {
+      console.error("Field transform error:", error);
+      return value;
+    }
+  }
   /**
    * Сбор применимых правил
    * @private
@@ -459,7 +534,13 @@ class ABACFields {
     for (const path of dataPaths) {
       for (const pattern of patterns) {
         if (this._matchesPattern(path, pattern)) {
-          const rule = config[pattern];
+          const fieldConfig = config[pattern];
+          let rule;
+          if (fieldConfig.actions && fieldConfig.actions[action]) {
+            rule = fieldConfig.actions[action];
+          } else {
+            rule = fieldConfig.base;
+          }
           if (this._matchesAction(rule.actions, action)) {
             rules.push({
               path,

package/dist/{abac-BuL5pUZ4.js → abac-Cf_9lCSh.js}

@@ -16,8 +16,9 @@ class ABACCore {
       socket: null,
       params: {},
       _cache: /* @__PURE__ */ new Map(),
-      // Кэш результатов политик для этого контекста
-      _abac: this.abac
+      _abac: this.abac,
+      // Добавляем флаг для пропуска field policies (например, для админов)
+      skipFieldPolicies: input.skipFieldPolicies || false
     };
     if (input.req) {
       context.user = input.user || input.req.userId;
@@ -362,15 +363,27 @@ class ABACFields {
   registerFieldsPolicy(resourceName, config) {
     const normalized = {};
     for (const [pattern, conf] of Object.entries(config)) {
-      normalized[pattern] = {
-        actions: conf.actions || "*",
-        access: conf.access || "allow",
-        validator: conf.validator || null,
-        transform: conf.transform || null,
-        rule: conf.rule || "remove",
-        force: conf.force || false,
+      const { actions, ...baseSettings } = conf;
+      const base = {
+        actions: baseSettings.actions || "*",
+        access: baseSettings.access || "allow",
+        validator: baseSettings.validator || null,
+        transform: baseSettings.transform || null,
+        rule: baseSettings.rule || "remove",
+        force: baseSettings.force || false,
         pattern
       };
+      if (actions && typeof actions === "object") {
+        normalized[pattern] = {
+          base,
+          actions: Object.entries(actions).reduce((acc, [action, override]) => {
+            acc[action] = { ...base, ...override };
+            return acc;
+          }, {})
+        };
+      } else {
+        normalized[pattern] = { base };
+      }
     }
     this.configs.set(resourceName, normalized);
     return this;
@@ -379,9 +392,8 @@ class ABACFields {
    * Проверка доступа к полям
    */
   async checkFields(context, data, action = null) {
-    console.log(context);
-    if (context.skipFieldPolicies) {
-      console.log("Field policies skipped for admin/moderator");
+    const normalizedContext = this.abac.core.normalizeContext(context);
+    if (normalizedContext.skipFieldPolicies) {
       return {
         allowed: data,
         denied: [],
@@ -389,17 +401,16 @@ class ABACFields {
         transformed: data
       };
     }
-    const { resource } = context;
-    const fieldAction = action || context.action;
-    const config = context.options?.fieldsConfig || this.configs.get(resource);
+    const { resource } = normalizedContext;
+    const fieldAction = action || normalizedContext.action;
+    const config = normalizedContext.options?.fieldsConfig || this.configs.get(resource);
     if (!config) {
       return { allowed: data, denied: [], errors: [], transformed: data };
     }
-    const enrichedContext = { ...context };
     if (this.abac.policies && this.abac.policies.priorities.extensions.length > 0) {
       for (const [name, extensionFn] of this.abac.policies.priorities.extensions) {
         try {
-          await extensionFn(enrichedContext);
+          await extensionFn(normalizedContext);
         } catch (error) {
           console.error(`Extension ${name} error:`, error);
         }
@@ -411,28 +422,36 @@ class ABACFields {
       errors: [],
       transformed: null
     };
-    const ctx = { ...enrichedContext, fieldAction, cache: /* @__PURE__ */ new Map(), originalData: data };
     const rules = this._collectRules(data, config, fieldAction);
     const forced = rules.filter((r) => r.rule.force);
     const regular = rules.filter((r) => !r.rule.force);
     for (const { path, value, rule } of [...forced, ...regular]) {
-      const fieldCtx = { ...ctx, field: path, value };
       const processed = /* @__PURE__ */ new Set();
       if (processed.has(path)) continue;
       processed.add(path);
-      const hasAccess = await this._checkAccess(rule.access, fieldCtx);
+      const hasAccess = await this._checkFieldAccess(
+        rule.access,
+        normalizedContext,
+        path,
+        value
+      );
       if (!hasAccess) {
-        await this._handleDenied(result, path, rule.rule, fieldCtx);
+        await this._handleDenied(result, path, rule.rule);
         continue;
       }
       if (rule.validator && rule.access !== "optional") {
-        const validation = await this._validate(rule.validator, value, fieldCtx);
+        const validation = await this._validateField(
+          rule.validator,
+          value,
+          normalizedContext,
+          path
+        );
         if (!validation.isValid) {
           result.errors.push({ path, errors: validation.errors });
           if (rule.rule === "error") {
             throw new Error(`Validation failed: ${path}`);
           }
-          await this._handleDenied(result, path, rule.rule, fieldCtx);
+          await this._handleDenied(result, path, rule.rule);
         }
       }
     }
@@ -441,12 +460,68 @@ class ABACFields {
       if (!rule.transform) continue;
       const isDenied = result.denied.some((d) => d.path === path);
       if (isDenied) continue;
-      const fieldCtx = { ...ctx, field: path, value, currentData: result.transformed };
-      const transformed = await rule.transform(value, fieldCtx);
+      const transformed = await this._transformField(
+        rule.transform,
+        value,
+        normalizedContext,
+        path,
+        result.transformed
+      );
       this._setValue(result.transformed, path, transformed);
     }
     return result;
   }
+  /**
+   * Проверка доступа к полю
+   * @private
+   */
+  async _checkFieldAccess(access, context, fieldPath, fieldValue) {
+    if (access === "allow") return true;
+    if (access === "deny") return false;
+    if (access === "optional") return true;
+    if (typeof access === "function") {
+      try {
+        return !!await access(context, fieldPath, fieldValue);
+      } catch (e) {
+        console.error("Field access check error:", e);
+        return false;
+      }
+    }
+    return true;
+  }
+  /**
+   * Валидация поля
+   * @private
+   */
+  async _validateField(validator, value, context, fieldPath) {
+    if (typeof validator === "function") {
+      try {
+        const result = await validator(value, context, fieldPath);
+        if (typeof result === "boolean") {
+          return { isValid: result, errors: result ? [] : ["Validation failed"] };
+        }
+        return result;
+      } catch (e) {
+        return { isValid: false, errors: [e.message] };
+      }
+    }
+    if (validator && validator.validate) {
+      return validator.validate(value);
+    }
+    return { isValid: true, errors: [] };
+  }
+  /**
+   * Трансформация поля
+   * @private
+   */
+  async _transformField(transform, value, context, fieldPath, currentData) {
+    try {
+      return await transform(value, context, fieldPath, currentData);
+    } catch (error) {
+      console.error("Field transform error:", error);
+      return value;
+    }
+  }
   /**
    * Сбор применимых правил
    * @private
@@ -458,7 +533,13 @@ class ABACFields {
     for (const path of dataPaths) {
       for (const pattern of patterns) {
         if (this._matchesPattern(path, pattern)) {
-          const rule = config[pattern];
+          const fieldConfig = config[pattern];
+          let rule;
+          if (fieldConfig.actions && fieldConfig.actions[action]) {
+            rule = fieldConfig.actions[action];
+          } else {
+            rule = fieldConfig.base;
+          }
           if (this._matchesAction(rule.actions, action)) {
             rules.push({
               path,

package/dist/globals.server.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const abac = require("./abac-XF1JVCLI.cjs");
+const abac = require("./abac-6LjoG9u-.cjs");
 const cookie = require("cookie");
 const jwt = require("jsonwebtoken");
 const uWS = require("uWebSockets.js");

package/dist/globals.server.js

@@ -1,4 +1,4 @@
-import { A as ABAC } from "./abac-BuL5pUZ4.js";
+import { A as ABAC } from "./abac-Cf_9lCSh.js";
 import * as cookie from "cookie";
 import jwt from "jsonwebtoken";
 import uWS from "uWebSockets.js";