@via-profit/ability 3.6.5 → 3.7.1

package/dist/index.js

@@ -30,6 +30,8 @@ function brand$3(code) {
 }
 const AbilityCondition = {
     equals: brand$3('='),
+    defined: brand$3('defined'),
+    not_defined: brand$3('not_defined'),
     not_equals: brand$3('<>'),
     greater_than: brand$3('>'),
     less_than: brand$3('<'),
@@ -62,6 +64,8 @@ function fromLiteral(literal) {
         length_equals: AbilityCondition.length_equals,
         always: AbilityCondition.always,
         never: AbilityCondition.never,
+        defined: AbilityCondition.defined,
+        not_defined: AbilityCondition.not_defined,
     };
     const value = map[literal];
     if (!value) {
@@ -102,6 +106,10 @@ function toLiteral(cond) {
             return 'always';
         case AbilityCondition.never:
             return 'never';
+        case AbilityCondition.defined:
+            return 'defined';
+        case AbilityCondition.not_defined:
+            return 'not_defined';
         default:
             return 'never';
     }
@@ -124,15 +132,6 @@ const AbilityMatch = {
     disabled: brand$2('disabled'),
 };
 
-const colors = {
-    reset: '\x1b[0m',
-    green: '\x1b[32m',
-    red: '\x1b[31m',
-    blue: '\x1b[34m',
-    yellow: '\x1b[33m',
-    white: '\x1b[37m',
-    gray: '\x1b[90m',
-};
 class AbilityExplain {
     type;
     children;
@@ -148,27 +147,36 @@ class AbilityExplain {
     }
     toString(indentPrefix = '', isLast = true) {
         const isMatch = this.match === AbilityMatch.match;
-        const mark = isMatch ? `${colors.green}✓${colors.reset}` : `${colors.red}✗${colors.reset}`;
+        const isMismatch = this.match === AbilityMatch.mismatch;
+        const isPending = this.match === AbilityMatch.pending;
+        // const isDisabled = this.match === AbilityMatch.disabled;
+        const mark = isMatch
+            ? `<match ✓>`
+            : isMismatch
+                ? `<mismatch ✗>`
+                : isPending
+                    ? `<pending …>`
+                    : `<disabled ⊘>`;
         let label;
         switch (this.type) {
             case 'policy':
-                label = `${colors.blue}POLICY${colors.reset}`;
+                label = `POLICY`;
                 break;
             case 'ruleSet':
-                label = `${colors.yellow}RULESET${colors.reset}`;
+                label = `RULESET`;
                 break;
             default:
-                label = `${colors.white}RULE${colors.reset}`;
+                label = `RULE`;
         }
         const branch = indentPrefix.length === 0
             ? ''
             : isLast
-                ? `${colors.gray}└─${colors.reset} `
-                : `${colors.gray}├─${colors.reset} `;
+                ? `└─ `
+                : `├─ `;
         let out = `${indentPrefix}${branch}${label} ${this.name} — ${mark}`;
         if (this.debugInfo)
-            out += ` ${colors.gray}(${this.debugInfo})${colors.reset}`;
-        const nextIndent = indentPrefix + (isLast ? '   ' : `${colors.gray}│  ${colors.reset}`);
+            out += ` (${this.debugInfo})`;
+        const nextIndent = indentPrefix + (isLast ? '   ' : `│  `);
         this.children.forEach((child, idx) => {
             out += '\n' + child.toString(nextIndent, idx === this.children.length - 1);
         });
@@ -181,6 +189,7 @@ class AbilityExplainRule extends AbilityExplain {
             type: 'rule',
             match: rule.state,
             name: rule.name,
+            debugInfo: `${rule.subject} ${rule.condition} ${JSON.stringify(rule.resource)}`,
         });
     }
 }
@@ -219,11 +228,13 @@ class AbilityResult {
      * Useful for debugging, logging, or building UI tools that visualize permission logic.
      */
     explain() {
-        return this.strategy.policies
+        const resMarker = this.strategy.isDenied() ? '== DENIED==' : '== ALLOWED ==';
+        const policiesExplain = this.strategy.policies
             .map(policy => {
             return new AbilityExplainPolicy(policy).toString();
         })
             .join('\n');
+        return `${resMarker}\n${policiesExplain}\n`;
     }
     decisive() {
         return this.strategy.decisivePolicy();
@@ -243,7 +254,17 @@ class AbilityResult {
     };
 }
 
+function brand$1(code) {
+    return code;
+}
+const AbilityPolicyEffect = {
+    deny: brand$1('deny'),
+    permit: brand$1('permit'),
+};
+
 class AbilityResolver {
+    onDeny;
+    onAllow;
     StrategyClass;
     policyEntries;
     constructor(
@@ -252,6 +273,8 @@ class AbilityResolver {
      */
     policyOrListOfPolicies, strategy, options = {}) {
         const policies = this.toArray(policyOrListOfPolicies);
+        this.onDeny = options.onDeny;
+        this.onAllow = options.onAllow;
         const filtered = options.tags
             ? policies.filter(p => p.tags.some(tag => options.tags.includes(tag)))
             : policies;
@@ -289,11 +312,19 @@ class AbilityResolver {
         // 3. Use strategy
         const strategy = new this.StrategyClass(filteredPolicies);
         const effect = strategy.evaluate();
-        return new AbilityResult(effect, strategy);
+        const result = new AbilityResult(effect, strategy);
+        if (effect === AbilityPolicyEffect.deny && this.onDeny) {
+            this.onDeny(result);
+        }
+        if (effect === AbilityPolicyEffect.permit && this.onAllow) {
+            this.onAllow(result);
+        }
+        return result;
     }
-    enforce(permission, resource, environment) {
+    enforce(permission, resource, environment, options) {
         const result = this.resolve(permission, resource, environment);
         if (result.isDenied()) {
+            options?.onDeny && options?.onDeny(result);
             throw new AbilityError(`Permission denied`);
         }
     }
@@ -414,7 +445,7 @@ class AbilityTypeGenerator {
                                 environmentStructure[action] = {};
                             }
                             const existingEnvType = environmentStructure[action][envPath];
-                            const targetType = ruleType; // или 'unknown', если хочешь жёстко
+                            const targetType = ruleType;
                             if (existingEnvType && existingEnvType !== targetType) {
                                 environmentStructure[action][envPath] = `${existingEnvType} | ${targetType}`;
                             }
@@ -1002,14 +1033,6 @@ class AbilityPolicy {
     }
 }
 
-function brand$1(code) {
-    return code;
-}
-const AbilityPolicyEffect = {
-    deny: brand$1('deny'),
-    permit: brand$1('permit'),
-};
-
 /**
  * Represents a rule that defines a condition to be checked against a subject and resource.
  */
@@ -1061,6 +1084,8 @@ class AbilityRule {
     static valueLen = (v) => this.isString(v) || Array.isArray(v) ? v.length : null;
     static operatorHandlers = {
         [toLiteral(AbilityCondition.always)]: () => true,
+        [toLiteral(AbilityCondition.defined)]: (a) => typeof a !== 'undefined',
+        [toLiteral(AbilityCondition.not_defined)]: (a) => typeof a === 'undefined',
         [toLiteral(AbilityCondition.never)]: () => false,
         [toLiteral(AbilityCondition.equals)]: (a, b) => a === b,
         [toLiteral(AbilityCondition.not_equals)]: (a, b) => a !== b,
@@ -1600,6 +1625,7 @@ const TokenTypes = {
     NULL: brand('NULL'),
     EQ_NULL: brand('EQ_NULL'),
     NOT_EQ_NULL: brand('NOT_EQ_NULL'),
+    DEFINED: brand('DEFINED'),
     NOT_EQ: brand('NOT_EQ'),
     LEN_GT: brand('LEN_GT'),
     LEN_LT: brand('LEN_LT'),
@@ -1650,9 +1676,11 @@ class AbilityDSLLexer {
         'true',
         'false',
         'null',
+        'defined',
         'contains',
         'includes',
         'length',
+        'len',
         'has',
         'in',
         'gt',
@@ -1866,11 +1894,11 @@ class AbilityDSLLexer {
         const startLine = this.line;
         const startColumn = this.column;
         const start = this.pos;
-        // Первый сегмент
+        // First segment
         while (!this.isAtEnd() && /[a-zA-Z0-9_*]/.test(this.peek())) {
             this.advance();
         }
-        // Сегменты через точку
+        // dots segments
         while (!this.isAtEnd() && this.peek() === '.') {
             this.advance(); // dot
             if (!/[a-zA-Z_*]/.test(this.peek())) {
@@ -1887,7 +1915,7 @@ class AbilityDSLLexer {
         if (word === 'never') {
             return new AbilityDSLToken(TokenTypes.NEVER, word, startLine, startColumn);
         }
-        // Если есть точка — это путь (identifier или permission)
+        // (identifier or permission)
         if (word.includes('.')) {
             const last = this.tokens[this.tokens.length - 1];
             if (last?.type === TokenTypes.EFFECT) {
@@ -1897,16 +1925,13 @@ class AbilityDSLLexer {
             }
             return new AbilityDSLToken(TokenTypes.IDENTIFIER, word, startLine, startColumn);
         }
-        // Ключевые слова
         if (this.keywords.has(word)) {
-            // Эффекты
             if (word === 'permit' || word === 'allow') {
                 return new AbilityDSLToken(TokenTypes.EFFECT, 'permit', startLine, startColumn);
             }
             if (word === 'deny' || word === 'forbidden') {
                 return new AbilityDSLToken(TokenTypes.EFFECT, 'deny', startLine, startColumn);
             }
-            // Групповые ключевые слова
             if (word === 'all') {
                 return new AbilityDSLToken(TokenTypes.ALL, word, startLine, startColumn);
             }
@@ -1919,13 +1944,15 @@ class AbilityDSLLexer {
             if (word === 'if') {
                 return new AbilityDSLToken(TokenTypes.IF, word, startLine, startColumn);
             }
-            // Булевы и null
             if (word === 'true' || word === 'false') {
                 return new AbilityDSLToken(TokenTypes.BOOLEAN, word, startLine, startColumn);
             }
             if (word === 'null') {
                 return new AbilityDSLToken(TokenTypes.NULL, word, startLine, startColumn);
             }
+            if (word === 'defined') {
+                return new AbilityDSLToken(TokenTypes.DEFINED, word, startLine, startColumn);
+            }
             if (word === 'except') {
                 return new AbilityDSLToken(TokenTypes.EXCEPT, word, startLine, startColumn);
             }
@@ -2077,7 +2104,8 @@ class AbilityDSLTokenStream {
         if (this.eof()) {
             return false;
         }
-        return this.peek().type === type;
+        const p = this.peek().type;
+        return p === type;
     }
     match(type) {
         if (this.check(type)) {
@@ -2513,6 +2541,7 @@ class AbilityDSLParser {
         const operatorConsumesValue = operator !== TokenTypes.EQ_NULL &&
             operator !== TokenTypes.NOT_EQ_NULL &&
             operator !== TokenTypes.NULL &&
+            operator !== TokenTypes.DEFINED &&
             operator !== TokenTypes.ALWAYS &&
             operator !== TokenTypes.NEVER;
         if (operatorConsumesValue) {
@@ -2565,42 +2594,46 @@ class AbilityDSLParser {
         this.stream.reset();
         // "length equals"
         this.stream.mark();
-        if (this.matchWord('length') && this.matchWord('equals')) {
+        if ((this.matchWord('length') || this.matchWord('len')) && this.matchWord('equals')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_equals, operator: TokenTypes.LEN_EQ };
         }
         this.stream.reset();
         // "length ="
         this.stream.mark();
-        if (this.matchWord('length') && this.matchSymbol('=')) {
+        if ((this.matchWord('length') || this.matchWord('len')) && this.matchSymbol('=')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_equals, operator: TokenTypes.LEN_EQ };
         }
         this.stream.reset();
         // "length greater than"
         this.stream.mark();
-        if (this.matchWord('length') && this.matchWord('greater') && this.matchWord('than')) {
+        if ((this.matchWord('length') || this.matchWord('len')) &&
+            this.matchWord('greater') &&
+            this.matchWord('than')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_greater_than, operator: TokenTypes.LEN_GT };
         }
         this.stream.reset();
         // "length >"
         this.stream.mark();
-        if (this.matchWord('length') && this.matchSymbol('>')) {
+        if ((this.matchWord('length') || this.matchWord('len')) && this.matchSymbol('>')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_greater_than, operator: TokenTypes.LEN_GT };
         }
         this.stream.reset();
         // "length less than"
         this.stream.mark();
-        if (this.matchWord('length') && this.matchWord('less') && this.matchWord('than')) {
+        if ((this.matchWord('length') || this.matchWord('len')) &&
+            this.matchWord('less') &&
+            this.matchWord('than')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_less_than, operator: TokenTypes.LEN_LT };
         }
         this.stream.reset();
         // "length <"
         this.stream.mark();
-        if (this.matchWord('length') && this.matchSymbol('<')) {
+        if ((this.matchWord('length') || this.matchWord('len')) && this.matchSymbol('<')) {
             this.stream.commit();
             return { condition: AbilityCondition.length_less_than, operator: TokenTypes.LEN_LT };
         }
@@ -2728,6 +2761,20 @@ class AbilityDSLParser {
             }
         }
         this.stream.reset();
+        // is defined
+        this.stream.mark();
+        if (this.matchWord('is') && this.matchWord('defined')) {
+            this.stream.commit();
+            return { condition: AbilityCondition.defined, operator: TokenTypes.DEFINED };
+        }
+        this.stream.reset();
+        // is not defined
+        this.stream.mark();
+        if (this.matchWord('is') && this.matchWord('not') && this.matchWord('defined')) {
+            this.stream.commit();
+            return { condition: AbilityCondition.not_defined, operator: TokenTypes.DEFINED };
+        }
+        this.stream.reset();
         // Single token (symbol or keyword)
         const token = this.stream.peek();
         if (token.type !== TokenTypes.SYMBOL &&
@@ -2799,7 +2846,8 @@ class AbilityDSLParser {
         if ((token.type === TokenTypes.KEYWORD ||
             token.type === TokenTypes.IDENTIFIER ||
             token.type === TokenTypes.ALWAYS ||
-            token.type === TokenTypes.NEVER) &&
+            token.type === TokenTypes.NEVER ||
+            token.type === TokenTypes.DEFINED) &&
             token.value === word) {
             this.stream.next();
             return true;
@@ -2837,6 +2885,11 @@ class AbilityDSLParser {
             this.stream.syntaxError(`Unexpected ${token.type} in value position`, token);
         }
         this.stream.next();
+        // if (token.type === TokenTypes.IDENTIFIER) {
+        //   this.stream.next();
+        //
+        //   return this.parseValue();
+        // }
         // CHECK THIS SWITCH COMPARE
         switch (token.type) {
             case TokenTypes.STRING:
@@ -2847,8 +2900,10 @@ class AbilityDSLParser {
                 return token.value === 'true';
             case TokenTypes.NULL:
                 return null;
+            case TokenTypes.DEFINED:
+                return typeof token.value !== 'undefined';
             case TokenTypes.IDENTIFIER:
-                return token.value;
+                return null;
             default: {
                 this.stream.syntaxError(`Unexpected value token "${token.value}"`, token, [
                     TokenTypes.KEYWORD,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@via-profit/ability",
   "support": "https://via-profit.ru",
-  "version": "3.6.5",
+  "version": "3.7.1",
   "description": "Via-Profit Ability service",
   "keywords": [
     "ability",
@@ -34,7 +34,8 @@
     "bench": "npm run build && node ./bench/benchmark.js",
     "test": "jest",
     "lint": "tsc --noEmit && eslint --fix .",
-    "pretty": "prettier --write ./src"
+    "pretty": "prettier --write ./src",
+    "postinstall": "node scripts/postinstall.js"
   },
   "repository": {
     "type": "git",