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

package/dist/AbilityPolicy.d.ts

@@ -1,4 +1,4 @@
-import AbilityRule, { AbilityRuleConfig } from './AbilityRule';
+import AbilityRule from './AbilityRule';
 import AbilityRuleSet, { AbilityRuleSetConfig } from './AbilityRuleSet';
 import AbilityMatch from './AbilityMatch';
 import AbilityCompare from './AbilityCompare';
@@ -7,9 +7,9 @@ export type AbilityPolicyConfig = {
     readonly action: string;
     readonly effect: number;
     readonly compareMethod: number;
-    readonly ruleSet: (AbilityRuleConfig | AbilityRuleSetConfig)[];
-    readonly id?: string;
-    readonly name?: string;
+    readonly ruleSet: AbilityRuleSetConfig[];
+    readonly id: string;
+    readonly name: string;
 };
 export declare class AbilityPolicy<Resources extends object = object> {
     matchState: AbilityMatch;
@@ -31,20 +31,20 @@ export declare class AbilityPolicy<Resources extends object = object> {
     /**
      * Policy name
      */
-    name: string | symbol;
+    name: string;
     /**
      * Policy ID
      */
-    id: string | symbol;
+    id: string;
     /**
      * Soon
      */
     action: string;
     constructor(params: {
+        id: string;
+        name: string;
         action: string;
         effect: AbilityPolicyEffect;
-        name?: string | symbol;
-        id?: string | symbol;
     });
     /**
      * Add rule set to the policy

package/dist/AbilityRule.d.ts

@@ -2,16 +2,19 @@ import AbilityMatch from './AbilityMatch';
 import AbilityCondition from './AbilityCondition';
 export type AbilityRuleMatches = [string, AbilityCondition, string | number | boolean];
 export type AbilityRuleConfig = {
-    readonly name?: string | symbol;
+    readonly id: string;
+    readonly name: string;
     readonly matches: [string, string, string | number | boolean];
 };
 export declare class AbilityRule<Resources extends object = object> {
     matches: AbilityRuleMatches;
-    name: string | symbol;
+    name: string;
+    id: string;
     state: AbilityMatch;
     constructor(params: {
-        matches: AbilityRuleMatches;
-        name?: string | symbol;
+        readonly id: string;
+        readonly name: string;
+        readonly matches: AbilityRuleMatches;
     });
     /**
      * Check if the rule is matched

package/dist/AbilityRuleSet.d.ts

@@ -2,7 +2,7 @@ import AbilityRule, { AbilityRuleConfig } from './AbilityRule';
 import AbilityCompare from './AbilityCompare';
 import AbilityMatch from './AbilityMatch';
 export type AbilityRuleSetConfig = {
-    readonly id?: string | symbol;
+    readonly id: string;
     readonly name: string;
     readonly compareMethod: number;
     readonly rules: AbilityRuleConfig[];
@@ -23,14 +23,14 @@ export declare class AbilityRuleSet<Resources extends object = object> {
     /**
      * Group name
      */
-    name: string | symbol;
+    name: string;
     /**
      * Group ID
      */
-    id: string | symbol;
-    constructor(params?: {
-        name?: string | symbol;
-        id?: string | symbol;
+    id: string;
+    constructor(params: {
+        name: string;
+        id: string;
     });
     addRule(rule: AbilityRule, compareMethod: AbilityCompare): this;
     addRules(rules: AbilityRule[], compareMethod: AbilityCompare): this;

package/dist/index.js

@@ -259,7 +259,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AbilityPolicy = void 0;
-const AbilityRule_1 = __importDefault(__webpack_require__(476));
 const AbilityRuleSet_1 = __importDefault(__webpack_require__(402));
 const AbilityMatch_1 = __importDefault(__webpack_require__(909));
 const AbilityCompare_1 = __importDefault(__webpack_require__(923));
@@ -296,8 +295,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;
     }
@@ -315,6 +314,7 @@ class AbilityPolicy {
      */
     addRule(rule) {
         this.addRuleSet(new AbilityRuleSet_1.default({
+            id: rule.id,
             name: rule.name,
         }).addRule(rule, AbilityCompare_1.default.AND));
         return this;
@@ -352,7 +352,7 @@ class AbilityPolicy {
      */
     static parse(configOrJson) {
         const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
+            ['id', 'string', true],
             ['name', 'string', true],
             ['action', 'string', true],
             ['effect', 'number', true],
@@ -368,15 +368,8 @@ class AbilityPolicy {
             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));
-            }
+        ruleSet.forEach(ruleSetConfig => {
+            policy.addRuleSet(AbilityRuleSet_1.default.parse(ruleSetConfig));
         });
         return policy;
     }
@@ -524,10 +517,12 @@ const AbilityParser_1 = __importDefault(__webpack_require__(189));
 class AbilityRule {
     matches;
     name;
+    id;
     state = AbilityMatch_1.default.PENDING;
     constructor(params) {
-        const { name, matches } = params;
-        this.name = name || Symbol('name');
+        const { id, name, matches } = params;
+        this.id = id;
+        this.name = name;
         this.matches = matches;
     }
     /**
@@ -642,13 +637,14 @@ class AbilityRule {
     }
     static parse(configOrJson) {
         const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
+            ['id', 'string', true],
             ['name', 'string', true],
             ['matches', 'array', true],
         ]);
-        const { name, matches } = config;
+        const { id, name, matches } = config;
         const [leftField, condition, rightField] = matches;
         return new AbilityRule({
+            id,
             name,
             matches: [leftField, new AbilityCondition_1.default(condition), rightField],
         });
@@ -659,6 +655,7 @@ class AbilityRule {
     export() {
         const [leftField, condition, rightField] = this.matches;
         return {
+            id: this.id,
             name: this.name,
             matches: [leftField, condition.code, rightField],
         };
@@ -705,9 +702,9 @@ class AbilityRuleSet {
      */
     id;
     constructor(params) {
-        const { name, id } = params || {};
-        this.name = name || Symbol('name');
-        this.id = id || Symbol('id');
+        const { name, id } = params;
+        this.name = name;
+        this.id = id;
     }
     addRule(rule, compareMethod) {
         this.rules.push(rule);
@@ -743,7 +740,7 @@ class AbilityRuleSet {
      */
     static parse(configOrJson) {
         const config = AbilityParser_1.default.prepareAndValidateConfig(configOrJson, [
-            ['id', 'string', false],
+            ['id', 'string', true],
             ['name', 'string', true],
             ['compareMethod', 'number', true],
             ['rules', 'array', true],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@via-profit/ability",
   "support": "https://via-profit.ru",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "description": "Via-Profit Ability service",
   "keywords": [
     "ability",