@via-profit/ability 2.0.0-rc.3 → 2.0.0-rc.5

package/build/playground.js

@@ -22,6 +22,18 @@ class AbilityCode {
     isNotEqual(compareWith) {
         return !this.isEqual(compareWith);
     }
+    static fromLiteral(literal) {
+        let Code = null;
+        Object.keys(this).forEach(member => {
+            if (member === literal) {
+                Code = this[member];
+            }
+        });
+        if (!Code) {
+            throw new Error(`Mismatch error. The literal ${literal} can not be find as a member of this class`);
+        }
+        return new this(Code.code);
+    }
 }
 exports.AbilityCode = AbilityCode;
 exports["default"] = AbilityCode;
@@ -43,8 +55,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityCompare = void 0;
 const AbilityCode_1 = __importDefault(__webpack_require__(/*! ./AbilityCode */ "./src/AbilityCode.ts"));
 class AbilityCompare extends AbilityCode_1.default {
-    static OR = new AbilityCompare(0);
-    static AND = new AbilityCompare(1);
+    static and = new AbilityCompare(0);
+    static or = new AbilityCompare(1);
 }
 exports.AbilityCompare = AbilityCompare;
 exports["default"] = AbilityCompare;
@@ -126,146 +138,14 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityMatch = void 0;
 const AbilityCode_1 = __importDefault(__webpack_require__(/*! ./AbilityCode */ "./src/AbilityCode.ts"));
 class AbilityMatch extends AbilityCode_1.default {
-    static PENDING = new AbilityMatch(2);
-    static MATCH = new AbilityMatch(1);
-    static MISMATCH = new AbilityMatch(0);
+    static pending = new AbilityMatch('pending');
+    static match = new AbilityMatch('match');
+    static mismatch = new AbilityMatch('mismatch');
 }
 exports.AbilityMatch = AbilityMatch;
 exports["default"] = AbilityMatch;
 
 
-/***/ }),
-
-/***/ "./src/AbilityParser.ts":
-/*!******************************!*\
-  !*** ./src/AbilityParser.ts ***!
-  \******************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AbilityParser = void 0;
-const AbilityError_1 = __webpack_require__(/*! ./AbilityError */ "./src/AbilityError.ts");
-const AbilityCondition_1 = __importDefault(__webpack_require__(/*! ./AbilityCondition */ "./src/AbilityCondition.ts"));
-class AbilityParser {
-    /**
-     * Validates the configuration object based on the provided field validation configurations.
-     * @param config - The configuration object to validate.
-     * @param fields - An array of field validation configurations.
-     * @throws {AbilityParserError} If a required field is missing or if a field has an incorrect type.
-     */
-    static validateConfig(config, fields) {
-        fields.forEach(([field, type, isRequired]) => {
-            const value = config[field];
-            if (isRequired) {
-                if (typeof value === 'undefined') {
-                    throw new AbilityError_1.AbilityParserError(`Missing required field [${field}]`);
-                }
-            }
-            switch (type) {
-                case 'array':
-                    if (typeof value !== 'object' || !Array.isArray(value)) {
-                        throw new AbilityError_1.AbilityParserError(`Field [${field}] must be an type of [${type}], bit got [${typeof value}]`);
-                    }
-                    break;
-                default:
-                    if (typeof value !== type && typeof value !== 'undefined') {
-                        throw new AbilityError_1.AbilityParserError(`Field [${field}] must be a type of [${type}], bit got [${typeof value}]`);
-                    }
-                    break;
-            }
-        });
-    }
-    /**
-     * Prepares and validates the configuration object or JSON string.
-     * @param configOrJson - The configuration object or JSON string to validate.
-     * @param fields - An array of field validation configurations.
-     * @returns The validated configuration object.
-     */
-    static prepareAndValidateConfig(configOrJson, fields) {
-        const config = typeof configOrJson === 'string'
-            ? (JSON.parse(configOrJson))
-            : configOrJson;
-        AbilityParser.validateConfig(config, fields);
-        return config;
-    }
-    /*
-    *
-    *  readonly ['order.update']: {
-    *     readonly user: {
-    *       readonly roles: readonly string[];
-    *       readonly department: string;
-    *     };
-    *     readonly order: {
-    *       readonly estimatedArrivalAt: number;
-    *       readonly status: string;
-    *     }
-    *  }
-    *
-    * */
-    /**
-     * Sets a value in a nested object structure based on a dot/bracket notation path.
-     * @param object - The target object to modify.
-     * @param path - The path to the property in dot/bracket notation.
-     * @param value - The value to set at the specified path.
-     */
-    static setValueDotValue(object, path, value) {
-        const way = path.replace(/\[/g, '.').replace(/\]/g, '').split('.');
-        const last = way.pop();
-        if (!last) {
-            throw new AbilityError_1.AbilityParserError(`Invalid path provided on a [${path}]`);
-        }
-        way.reduce((o, k, i, kk) => {
-            if (!o[k]) {
-                o[k] = isFinite(Number(kk[i + 1])) ? [] : {};
-            }
-            return o[k];
-        }, object)[last] = value;
-    }
-    /**
-     * Generates TypeScript type definitions based on the provided policies.
-     * @param policies - An array of AbilityPolicy instances.
-     * @param outPath - The output path for the generated type definitions.
-     * @returns A record containing the generated type definitions.
-     */
-    static generateTypeDefs(policies, outPath) {
-        const record = {};
-        policies.forEach(policy => {
-            policy.ruleSet.forEach(ruleSet => {
-                ruleSet.rules.forEach(rule => {
-                    const [leftFieldPath, condition, rightFiledPath] = rule.matches;
-                    let value = 'any';
-                    switch (true) {
-                        case condition.isEqual(AbilityCondition_1.default.NOT_EQUAL):
-                        case condition.isEqual(AbilityCondition_1.default.EQUAL):
-                            value = typeof rightFiledPath;
-                            break;
-                        case condition.isEqual(AbilityCondition_1.default.IN):
-                        case condition.isEqual(AbilityCondition_1.default.NOT_IN):
-                            value = `${typeof rightFiledPath}[]`;
-                            break;
-                        case condition.isEqual(AbilityCondition_1.default.MORE_OR_EQUAL):
-                        case condition.isEqual(AbilityCondition_1.default.MORE_THAN):
-                        case condition.isEqual(AbilityCondition_1.default.LESS_OR_EQUAL):
-                        case condition.isEqual(AbilityCondition_1.default.LESS_THAN):
-                            value = 'number';
-                            break;
-                    }
-                    AbilityParser.setValueDotValue(record, leftFieldPath, value);
-                });
-            });
-        });
-        console.log(JSON.stringify(record));
-        return record;
-    }
-}
-exports.AbilityParser = AbilityParser;
-exports["default"] = AbilityParser;
-
-
 /***/ }),
 
 /***/ "./src/AbilityPolicy.ts":
@@ -280,14 +160,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityPolicy = void 0;
-const AbilityRule_1 = __importDefault(__webpack_require__(/*! ./AbilityRule */ "./src/AbilityRule.ts"));
 const AbilityRuleSet_1 = __importDefault(__webpack_require__(/*! ./AbilityRuleSet */ "./src/AbilityRuleSet.ts"));
 const AbilityMatch_1 = __importDefault(__webpack_require__(/*! ./AbilityMatch */ "./src/AbilityMatch.ts"));
 const AbilityCompare_1 = __importDefault(__webpack_require__(/*! ./AbilityCompare */ "./src/AbilityCompare.ts"));
 const AbilityPolicyEffect_1 = __importDefault(__webpack_require__(/*! ./AbilityPolicyEffect */ "./src/AbilityPolicyEffect.ts"));
-const AbilityParser_1 = __importDefault(__webpack_require__(/*! ./AbilityParser */ "./src/AbilityParser.ts"));
 class AbilityPolicy {
-    matchState = AbilityMatch_1.default.PENDING;
+    matchState = AbilityMatch_1.default.pending;
     /**
      * List of rules
      */
@@ -302,7 +180,7 @@ class AbilityPolicy {
      * rules will be returns «permit» status and for the «or» - if\
      * one of the rules returns as «permit»
      */
-    compareMethod = AbilityCompare_1.default.AND;
+    compareMethod = AbilityCompare_1.default.and;
     /**
      * Policy name
      */
@@ -317,8 +195,8 @@ class AbilityPolicy {
     action;
     constructor(params) {
         const { name, id, action, effect } = params;
-        this.name = name || Symbol('name');
-        this.id = id || Symbol('id');
+        this.name = name;
+        this.id = id;
         this.action = action;
         this.effect = effect;
     }
@@ -330,40 +208,26 @@ class AbilityPolicy {
         this.ruleSet.push(ruleSet);
         return this;
     }
-    /**
-     * Add rule to the policy
-     * @param rule - The rule to add
-     */
-    addRule(rule) {
-        this.addRuleSet(new AbilityRuleSet_1.default({
-            name: rule.name,
-        }).addRule(rule, AbilityCompare_1.default.AND));
-        return this;
-    }
     /**
      * Check if the policy is matched
-     * @param resource - The resource to check
+     * @param resources - The resource to check
      */
-    check(resource) {
-        this.matchState = AbilityMatch_1.default.MISMATCH;
-        /**
-         * If policy contain a rules
-         */
-        if (this.ruleSet.length) {
-            const ruleCheckStates = [];
-            this.ruleSet.forEach(rule => {
-                const ruleCheckState = rule.check(resource);
-                ruleCheckStates.push(ruleCheckState);
-            });
-            if (AbilityCompare_1.default.AND.isEqual(this.compareMethod)) {
-                if (ruleCheckStates.every(ruleState => AbilityMatch_1.default.MATCH.isEqual(ruleState))) {
-                    this.matchState = AbilityMatch_1.default.MATCH;
-                }
+    check(resources) {
+        this.matchState = AbilityMatch_1.default.mismatch;
+        if (!this.ruleSet.length) {
+            return this.matchState;
+        }
+        const rulesetCheckStates = this.ruleSet.reduce((collect, ruleSet) => {
+            return collect.concat(ruleSet.check(resources));
+        }, []);
+        if (AbilityCompare_1.default.and.isEqual(this.compareMethod)) {
+            if (rulesetCheckStates.every(ruleState => AbilityMatch_1.default.match.isEqual(ruleState))) {
+                this.matchState = AbilityMatch_1.default.match;
             }
-            if (AbilityCompare_1.default.OR.isEqual(this.compareMethod)) {
-                if (ruleCheckStates.some(ruleState => AbilityMatch_1.default.MATCH.isEqual(ruleState))) {
-                    this.matchState = AbilityMatch_1.default.MATCH;
-                }
+        }
+        if (AbilityCompare_1.default.or.isEqual(this.compareMethod)) {
+            if (rulesetCheckStates.some(ruleState => AbilityMatch_1.default.match.isEqual(ruleState))) {
+                this.matchState = AbilityMatch_1.default.match;
             }
         }
         return this.matchState;
@@ -371,15 +235,7 @@ class AbilityPolicy {
     /**
      * Parse the config JSON format to Policy class instance
      */
-    static parse(configOrJson) {
-        const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
-            ['name', 'string', true],
-            ['action', 'string', true],
-            ['effect', 'number', true],
-            ['compareMethod', 'number', true],
-            ['ruleSet', 'array', true],
-        ]);
+    static parse(config) {
         const { id, name, ruleSet, compareMethod, action, effect } = config;
         // Create the empty policy
         const policy = new AbilityPolicy({
@@ -388,16 +244,9 @@ class AbilityPolicy {
             action,
             effect: new AbilityPolicyEffect_1.default(effect),
         });
-        policy.compareMethod = new AbilityCompare_1.default(compareMethod);
-        ruleSet.forEach(ruleOrRuleSet => {
-            // is ruleset
-            if ('rules' in ruleOrRuleSet) {
-                policy.addRuleSet(AbilityRuleSet_1.default.parse(ruleOrRuleSet));
-            }
-            // is simple rule
-            if (!('rules' in ruleOrRuleSet)) {
-                policy.addRule(AbilityRule_1.default.parse(ruleOrRuleSet));
-            }
+        policy.compareMethod = AbilityCompare_1.default.fromLiteral(compareMethod);
+        ruleSet.forEach(ruleSetConfig => {
+            policy.addRuleSet(AbilityRuleSet_1.default.parse(ruleSetConfig));
         });
         return policy;
     }
@@ -405,7 +254,7 @@ class AbilityPolicy {
         return {
             id: this.id.toString(),
             name: this.name.toString(),
-            compareMethod: this.compareMethod.code,
+            compareMethod: this.compareMethod.code.toString(),
             ruleSet: this.ruleSet.map(rule => rule.export()),
             action: this.action,
             effect: this.effect.code,
@@ -432,8 +281,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityPolicyEffect = void 0;
 const AbilityCode_1 = __importDefault(__webpack_require__(/*! ./AbilityCode */ "./src/AbilityCode.ts"));
 class AbilityPolicyEffect extends AbilityCode_1.default {
-    static DENY = new AbilityPolicyEffect(0);
-    static PERMIT = new AbilityPolicyEffect(1);
+    static deny = new AbilityPolicyEffect('deny');
+    static permit = new AbilityPolicyEffect('permit');
 }
 exports.AbilityPolicyEffect = AbilityPolicyEffect;
 exports["default"] = AbilityPolicyEffect;
@@ -458,8 +307,10 @@ const AbilityMatch_1 = __importDefault(__webpack_require__(/*! ./AbilityMatch */
 const AbilityError_1 = __webpack_require__(/*! ./AbilityError */ "./src/AbilityError.ts");
 class AbilityResolver {
     policies;
-    constructor(policies) {
-        this.policies = policies;
+    constructor(policyOrListOfPolicies) {
+        this.policies = Array.isArray(policyOrListOfPolicies)
+            ? policyOrListOfPolicies
+            : [policyOrListOfPolicies];
     }
     /**
      * Resolve policy for the resource and action
@@ -479,7 +330,7 @@ class AbilityResolver {
         const resolver = this.resolve(action, resource);
         if (resolver) {
             if (resolver.isDeny()) {
-                throw new AbilityError_1.PermissionError(['Permission denied', resolver.getPolicy()?.name?.toString()].join('. '));
+                throw new AbilityError_1.PermissionError(resolver.getPolicy()?.name?.toString() || 'Unknown permission error');
             }
         }
     }
@@ -490,7 +341,7 @@ class AbilityResolver {
      */
     getEffect() {
         const effects = this.policies.reduce((collect, policy, _index) => {
-            if (policy.matchState.isEqual(AbilityMatch_1.default.MATCH)) {
+            if (policy.matchState.isEqual(AbilityMatch_1.default.match)) {
                 return collect.concat(policy.effect);
             }
             return collect;
@@ -502,15 +353,15 @@ class AbilityResolver {
     }
     isPermit() {
         const effect = this.getEffect();
-        return effect !== null && effect.isEqual(AbilityPolicyEffect_1.default.PERMIT);
+        return effect !== null && effect.isEqual(AbilityPolicyEffect_1.default.permit);
     }
     isDeny() {
         const effect = this.getEffect();
-        return effect !== null && effect.isEqual(AbilityPolicyEffect_1.default.DENY);
+        return effect !== null && effect.isEqual(AbilityPolicyEffect_1.default.deny);
     }
     getPolicy() {
         const lastPolicy = this.policies.length ? this.policies[this.policies.length - 1] : null;
-        return lastPolicy && lastPolicy.matchState.isEqual(AbilityMatch_1.default.MATCH) ? lastPolicy : null;
+        return lastPolicy && lastPolicy.matchState.isEqual(AbilityMatch_1.default.match) ? lastPolicy : null;
     }
     /**
      * Check if the action is contained in another action
@@ -550,43 +401,53 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityRule = void 0;
 const AbilityMatch_1 = __importDefault(__webpack_require__(/*! ./AbilityMatch */ "./src/AbilityMatch.ts"));
 const AbilityCondition_1 = __importDefault(__webpack_require__(/*! ./AbilityCondition */ "./src/AbilityCondition.ts"));
-const AbilityParser_1 = __importDefault(__webpack_require__(/*! ./AbilityParser */ "./src/AbilityParser.ts"));
 class AbilityRule {
-    matches;
+    /**
+     * Subject key path like a 'user.name'
+     */
+    subject;
+    /**
+     * Resource key path like a 'user.name' or value
+     */
+    resource;
+    condition;
     name;
-    state = AbilityMatch_1.default.PENDING;
+    id;
+    state = AbilityMatch_1.default.pending;
     constructor(params) {
-        const { name, matches } = params;
-        this.name = name || Symbol('name');
-        this.matches = matches;
+        const { id, name, subject, resource, condition } = params;
+        this.id = id;
+        this.name = name;
+        this.subject = subject;
+        this.resource = resource;
+        this.condition = new AbilityCondition_1.default(condition);
     }
     /**
      * Check if the rule is matched
      * @param resource - The resource to check
      */
     check(resource) {
-        const [_subjectPathName, condition, _staticValueOrPathName] = this.matches;
         let is = false;
         const [valueS, valueO] = this.extractValues(resource);
-        if (AbilityCondition_1.default.LESS_THAN.isEqual(condition)) {
+        if (AbilityCondition_1.default.LESS_THAN.isEqual(this.condition)) {
             is = Number(valueS) < Number(valueO);
         }
-        if (AbilityCondition_1.default.LESS_OR_EQUAL.isEqual(condition)) {
+        if (AbilityCondition_1.default.LESS_OR_EQUAL.isEqual(this.condition)) {
             is = Number(valueS) <= Number(valueO);
         }
-        if (AbilityCondition_1.default.MORE_THAN.isEqual(condition)) {
+        if (AbilityCondition_1.default.MORE_THAN.isEqual(this.condition)) {
             is = Number(valueS) > Number(valueO);
         }
-        if (AbilityCondition_1.default.MORE_OR_EQUAL.isEqual(condition)) {
+        if (AbilityCondition_1.default.MORE_OR_EQUAL.isEqual(this.condition)) {
             is = Number(valueS) >= Number(valueO);
         }
-        if (AbilityCondition_1.default.EQUAL.isEqual(condition)) {
+        if (AbilityCondition_1.default.EQUAL.isEqual(this.condition)) {
             is = valueS === valueO;
         }
-        if (AbilityCondition_1.default.NOT_EQUAL.isEqual(condition)) {
+        if (AbilityCondition_1.default.NOT_EQUAL.isEqual(this.condition)) {
             is = valueS !== valueO;
         }
-        if (AbilityCondition_1.default.IN.isEqual(condition)) {
+        if (AbilityCondition_1.default.IN.isEqual(this.condition)) {
             // [<some>] and [<some>]
             if (Array.isArray(valueS) && Array.isArray(valueO)) {
                 is = valueS.some(v => valueO.find(v1 => v1 === v));
@@ -600,7 +461,7 @@ class AbilityRule {
                 is = valueS.includes(valueO);
             }
         }
-        if (AbilityCondition_1.default.NOT_IN.isEqual(condition)) {
+        if (AbilityCondition_1.default.NOT_IN.isEqual(this.condition)) {
             // [<some>] and [<some>]
             if (Array.isArray(valueS) && Array.isArray(valueO)) {
                 is = !valueS.some(v => valueO.find(v1 => v1 === v));
@@ -614,31 +475,33 @@ class AbilityRule {
                 is = !valueS.includes(valueO);
             }
         }
-        this.state = is ? AbilityMatch_1.default.MATCH : AbilityMatch_1.default.MISMATCH;
+        this.state = is ? AbilityMatch_1.default.match : AbilityMatch_1.default.mismatch;
         return this.state;
     }
     /**
-     * Extract values from the resource
-     * @param resource - The resource to extract values from
+     * Extract values from the resourceData
+     * @param resourceData - The resourceData to extract values from
      */
-    extractValues(resource) {
-        const [subjectPathName, _condition, staticValueOrPathName] = this.matches;
+    extractValues(resourceData) {
         let leftSideValue;
         let rightSideValue;
-        if (resource === null || typeof resource === 'undefined') {
+        if (resourceData === null || typeof resourceData === 'undefined') {
             return [NaN, NaN];
         }
         const isPath = (str) => {
             return typeof str === 'string' && str.match(/\./g) !== null;
         };
-        if (isPath(subjectPathName)) {
-            leftSideValue = this.getDotNotationValue(resource, subjectPathName);
+        if (isPath(this.subject)) {
+            leftSideValue = this.getDotNotationValue(resourceData, this.subject);
         }
-        if (isPath(staticValueOrPathName)) {
-            rightSideValue = this.getDotNotationValue(resource, staticValueOrPathName);
+        else {
+            leftSideValue = this.subject;
+        }
+        if (isPath(this.resource)) {
+            rightSideValue = this.getDotNotationValue(resourceData, this.resource);
         }
         else {
-            rightSideValue = staticValueOrPathName;
+            rightSideValue = this.resource;
         }
         return [leftSideValue, rightSideValue];
     }
@@ -670,27 +533,26 @@ class AbilityRule {
         }
         return resource;
     }
-    static parse(configOrJson) {
-        const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
-            ['name', 'string', true],
-            ['matches', 'array', true],
-        ]);
-        const { name, matches } = config;
-        const [leftField, condition, rightField] = matches;
+    static parse(config) {
+        const { id, name, subject, resource, condition } = config;
         return new AbilityRule({
+            id,
             name,
-            matches: [leftField, new AbilityCondition_1.default(condition), rightField],
+            subject,
+            resource,
+            condition,
         });
     }
     /**
      * Export the rule to config object
      */
     export() {
-        const [leftField, condition, rightField] = this.matches;
         return {
+            id: this.id,
             name: this.name,
-            matches: [leftField, condition.code, rightField],
+            subject: this.subject,
+            resource: this.resource,
+            condition: this.condition.code,
         };
     }
 }
@@ -715,9 +577,8 @@ exports.AbilityRuleSet = void 0;
 const AbilityRule_1 = __importDefault(__webpack_require__(/*! ./AbilityRule */ "./src/AbilityRule.ts"));
 const AbilityCompare_1 = __importDefault(__webpack_require__(/*! ./AbilityCompare */ "./src/AbilityCompare.ts"));
 const AbilityMatch_1 = __importDefault(__webpack_require__(/*! ./AbilityMatch */ "./src/AbilityMatch.ts"));
-const AbilityParser_1 = __importDefault(__webpack_require__(/*! ./AbilityParser */ "./src/AbilityParser.ts"));
 class AbilityRuleSet {
-    state = AbilityMatch_1.default.PENDING;
+    state = AbilityMatch_1.default.pending;
     /**
      * List of rules
      */
@@ -728,7 +589,7 @@ class AbilityRuleSet {
      * rules will be returns «permit» status and for the «or» - if\
      * one of the rules returns as «permit»
      */
-    compareMethod = AbilityCompare_1.default.AND;
+    compareMethod = AbilityCompare_1.default.and;
     /**
      * Group name
      */
@@ -738,9 +599,11 @@ class AbilityRuleSet {
      */
     id;
     constructor(params) {
-        const { name, id } = params || {};
-        this.name = name || Symbol('name');
-        this.id = id || Symbol('id');
+        const { name, id, compareMethod } = params;
+        this.name = name;
+        this.id = id;
+        this.compareMethod = AbilityCompare_1.default.fromLiteral(compareMethod);
+        // this.compareMethod = new AbilityCompare(compareMethod);
     }
     addRule(rule, compareMethod) {
         this.rules.push(rule);
@@ -752,21 +615,21 @@ class AbilityRuleSet {
         return this;
     }
     check(resources) {
-        this.state = AbilityMatch_1.default.MISMATCH;
+        this.state = AbilityMatch_1.default.mismatch;
         if (!this.rules.length) {
             return this.state;
         }
         const ruleCheckStates = this.rules.reduce((collect, rule) => {
             return collect.concat(rule.check(resources));
         }, []);
-        if (AbilityCompare_1.default.AND.isEqual(this.compareMethod)) {
-            if (ruleCheckStates.every(ruleState => AbilityMatch_1.default.MATCH.isEqual(ruleState))) {
-                this.state = AbilityMatch_1.default.MATCH;
+        if (AbilityCompare_1.default.and.isEqual(this.compareMethod)) {
+            if (ruleCheckStates.every(ruleState => AbilityMatch_1.default.match.isEqual(ruleState))) {
+                this.state = AbilityMatch_1.default.match;
             }
         }
-        if (AbilityCompare_1.default.OR.isEqual(this.compareMethod)) {
-            if (ruleCheckStates.some(ruleState => AbilityMatch_1.default.MATCH.isEqual(ruleState))) {
-                this.state = AbilityMatch_1.default.MATCH;
+        if (AbilityCompare_1.default.or.isEqual(this.compareMethod)) {
+            if (ruleCheckStates.some(ruleState => AbilityMatch_1.default.match.isEqual(ruleState))) {
+                this.state = AbilityMatch_1.default.match;
             }
         }
         return this.state;
@@ -774,19 +637,13 @@ class AbilityRuleSet {
     /**
      * Parse the config JSON format to Group class instance
      */
-    static parse(configOrJson) {
-        const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
-            ['name', 'string', true],
-            ['compareMethod', 'number', true],
-            ['rules', 'array', true],
-        ]);
+    static parse(config) {
         const { id, name, rules, compareMethod } = config;
         const ruleSet = new AbilityRuleSet({
+            compareMethod,
             name,
             id,
         });
-        ruleSet.compareMethod = new AbilityCompare_1.default(compareMethod);
         // Adding rules if exists
         if (rules && rules.length > 0) {
             const abilityRules = rules.map(ruleConfig => AbilityRule_1.default.parse(ruleConfig));
@@ -798,7 +655,7 @@ class AbilityRuleSet {
         return {
             id: this.id.toString(),
             name: this.name.toString(),
-            compareMethod: this.compareMethod.code,
+            compareMethod: this.compareMethod.code.toString(),
             rules: this.rules.map(rule => rule.export()),
         };
     }
@@ -823,24 +680,80 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const node_http_1 = __importDefault(__webpack_require__(/*! node:http */ "node:http"));
 const AbilityPolicy_1 = __importDefault(__webpack_require__(/*! ./AbilityPolicy */ "./src/AbilityPolicy.ts"));
 const AbilityResolver_1 = __importDefault(__webpack_require__(/*! ~/AbilityResolver */ "./src/AbilityResolver.ts"));
-const policies_json_1 = __importDefault(__webpack_require__(/*! ./policies.json */ "./src/policies.json"));
 const server = node_http_1.default.createServer();
 server.on('request', (_req, res) => {
-    new AbilityResolver_1.default(policies_json_1.default.map(p => {
-        return AbilityPolicy_1.default.parse(p);
-    })).enforce('account.read', {
+    const config = [
+        {
+            id: 'bb758c1b-1015-4894-ba25-d23156e063cf',
+            name: 'Status hui',
+            action: 'order.status',
+            effect: 'deny',
+            compareMethod: 'and',
+            ruleSet: [
+                {
+                    id: '9cc009e5-0aa9-453a-a668-cb3f418ced92',
+                    name: 'Не администратор',
+                    compareMethod: 'and',
+                    rules: [
+                        {
+                            id: '4093cd50-e54f-4062-8053-2d3b5966fad3',
+                            name: 'Нет роли администраторв',
+                            subject: 'account.roles',
+                            resource: 'administrator',
+                            condition: '<>',
+                        },
+                    ],
+                },
+            ]
+        },
+        {
+            id: 'bb758c1b-1015-4894-ba25-d23156e063cf',
+            name: 'Status hui 1',
+            action: 'order.status',
+            effect: 'permit',
+            compareMethod: 'and',
+            ruleSet: [
+                {
+                    id: '2f8f9d71-860b-4fa6-b395-9331f1f0848e',
+                    name: 'Rule set',
+                    compareMethod: 'and',
+                    rules: [
+                        {
+                            id: 'a3c7d66f-5c2d-4a24-83bc-03b0a2d9c32b',
+                            name: 'Rule 1',
+                            subject: 'order.status',
+                            resource: 'не обработан',
+                            condition: '=',
+                        },
+                        {
+                            id: 'a3c7d66f-5c2d-4a24-83bc-03b0a2d9c32b',
+                            name: 'Rule 2',
+                            subject: 'feature.status',
+                            resource: 'отменен',
+                            condition: '=',
+                        },
+                    ],
+                },
+            ],
+        },
+    ];
+    const policies = config.map(cfg => AbilityPolicy_1.default.parse(cfg));
+    const result = new AbilityResolver_1.default(policies).resolve('order.status', {
         account: {
-            id: '1',
-            roles: ['managers'],
+            roles: ['user', 'couch'],
         },
-        resource: {
-            id: '1',
+        order: {
+            status: 'не обработан',
+        },
+        feature: {
+            status: 'отменен',
+            // status: 'завершен'
         },
     });
     res.statusCode = 200;
     res.setHeader('content-type', 'application/json');
     res.write(JSON.stringify({
-        status: 'Done',
+        status: result.isDeny() ? 'deny' : 'permit',
     }));
     res.end();
 });
@@ -859,16 +772,6 @@ server.listen(8080, 'localhost', () => {
 
 module.exports = require("node:http");
 
-/***/ }),
-
-/***/ "./src/policies.json":
-/*!***************************!*\
-  !*** ./src/policies.json ***!
-  \***************************/
-/***/ ((module) => {
-
-module.exports = /*#__PURE__*/JSON.parse('[{"name":"Просмотр чужого логина разрешен только владельцу аккаунта и администраторам","action":"account.read","effect":0,"compareMethod":0,"ruleSet":[{"name":"Не владелец аккаунта и не администратор","compareMethod":1,"rules":[{"name":"Владелец аккаунта","matches":["account.id","<>","resource.id"]},{"name":"Администратор","matches":["account.roles","not in","administrator"]}]}]},{"name":"Unauthorized. Access token expected","action":"access.auth","effect":0,"compareMethod":1,"ruleSet":[{"name":"Токен - AccessToken","matches":["token.type","=","access"]},{"name":"Токен не пустой","matches":["token.id","<>","ACCESS_TOKEN_EMPTY_ID"]}]},{"id":"1121","name":"Менеджеры не могут редактировать заказы, созданные более 3-х дней назад, а так же завершенные и отменённые заявки","action":"order.update","effect":0,"compareMethod":1,"ruleSet":[{"name":"Менеджеры","compareMethod":0,"rules":[{"name":"Отдел - Менеджеры","matches":["user.department","=","managers"]},{"name":"Роль - Менеджер","matches":["user.roles","in","manager"]}]},{"name":"Заказы более 3-х дней, а так же завершённые и отменённые заказы","compareMethod":0,"rules":[{"name":"заказ создан более 3-х дней назад","matches":["order.createdDaysAgo",">",3]},{"name":"заказ завершён","matches":["order.status","=","COMPLETED"]},{"name":"заказ отменён","matches":["order.status","=","CANCELLED"]}]}]},{"name":"Менеджеры не могут создавать заказы","action":"order.create","effect":0,"compareMethod":0,"ruleSet":[{"name":"Менеджеры","compareMethod":0,"rules":[{"name":"Отдел - Менеджеры","matches":["user.department","=","managers"]},{"name":"Роль - Менеджер","matches":["user.roles","in","manager"]}]}]},{"name":"Уборщицы не могут видеть стоимость заказа","action":"order.read","effect":0,"compareMethod":0,"ruleSet":[{"name":"все из отдела уборщиц","matches":["user.department","in","cleaner"]}]}]');
-
 /***/ })
 
 /******/ 	});