feat: update strategy

src/spectra.ts

@@ -28,15 +28,15 @@ export class Spectra {
       (p) => p.getEffect() === 'DENY'
     );
 
-    const shouldDeny = denyPolicies.every((p) => {
+    const shouldDeny = denyPolicies.some((p) => {
       return Evaluator.evaluate(relatedData, p.getFilter());
     });
 
     if (shouldDeny) {
       return false;
     }
 
-    return allowPolicies.every((p) => {
+    return allowPolicies.some((p) => {
       return Evaluator.evaluate(relatedData, p.getFilter());
     });
   }
@@ -65,13 +65,13 @@ export class Spectra {
         (p) => p.getEffect() === 'DENY'
       );
 
-      const shouldDeny = denyPolicies.every((p) => {
+      const shouldDeny = denyPolicies.some((p) => {
         return Evaluator.evaluate(relatedData, p.getFilter());
       });
 
       const applied = shouldDeny
         ? false
-        : allowPolicies.every((p) => {
+        : allowPolicies.some((p) => {
             return Evaluator.evaluate(relatedData, p.getFilter());
           });
 

src/utils/expression.ts

@@ -111,6 +111,10 @@ export function isValidOrExpressionDefinition(
     return false;
   }
 
+  if (expression.or.length <= 1) {
+    return false;
+  }
+
   return true;
 }
 

test/debugger.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, test } from '@jest/globals';
+import { Spectra, Policy, BinaryExpression, and } from '@/index';
+import debug_and from './fixtures/debug_and.json';
+
+describe('Debugger', () => {
+  test('basic usage', () => {
+    const allowPolicy = new Policy({
+      filter: and([debug_and as any]),
+      permissions: ['EDIT_FILE'],
+      effect: 'ALLOW',
+    });
+
+    const denyPolicy = new Policy({
+      filter: new BinaryExpression('user.id', '=', 2),
+      permissions: ['EDIT_FILE'],
+      effect: 'DENY',
+    });
+
+    const reporter = Spectra.debug(
+      [allowPolicy, denyPolicy],
+      () => ({ 'user.id': 1 }),
+      'EDIT_FILE'
+    );
+
+    expect(reporter).toBeTruthy();
+  });
+});

test/fixtures/debug_and.json

@@ -0,0 +1,18 @@
+{
+  "and": [
+    ["user.id", "<>", null],
+    { "not": ["user.name", "!=", null] },
+    {
+      "or": [
+        ["team.name", "<>", null],
+        ["team.remark", "!=", null]
+      ]
+    },
+    {
+      "and": [
+        ["file.size", ">", 0],
+        ["file.name", "<>", null]
+      ]
+    }
+  ]
+}

test/policies.test.ts

@@ -1,36 +1,41 @@
 import { describe, expect, test } from '@jest/globals';
-import { Policy, BinaryExpression, Spectra } from '@/index';
+import { Policy, BinaryExpression, not, and, AndExpression } from '@/index';
 
 describe('Policies', () => {
-  test('getter', () => {
-    const allowPolicy = new Policy({
-      filter: new BinaryExpression('user.id', '=', 1),
-      permissions: ['EDIT_FILE'],
-      effect: 'ALLOW',
+  test('get properties', () => {
+    const policy = new Policy({
+      description: 'Readonly policy',
+      permissions: ['READ_ONLY'],
+      effect: 'DENY',
+      filter: new BinaryExpression('user.id', '=', 2),
     });
 
-    expect(allowPolicy.getEffect()).toBe('ALLOW');
+    expect(policy.getEffect()).toBe('DENY');
+    expect(policy.getPermissions()).toEqual(['READ_ONLY']);
+    expect(policy.getDescription()).toEqual('Readonly policy');
+    expect(policy.getFilter().getFields()).toEqual(['user.id']);
   });
 
   test('complex policies', () => {
     const allowPolicy = new Policy({
-      filter: new BinaryExpression('user.id', '=', 1),
-      permissions: ['EDIT_FILE'],
+      filter: and([
+        ['user.id', '<>', 0],
+        {
+          or: [
+            ['team.name', '<>', null],
+            ['team.alias', '!=', { ref: 'team.name' }],
+          ],
+        },
+        not(['user.name', '=', null]),
+        new AndExpression([
+          new BinaryExpression('file.id', '!=', 0),
+          new BinaryExpression('file.name', '<>', null),
+        ]),
+      ]),
+      permissions: ['READ_ONLY'],
       effect: 'ALLOW',
     });
 
-    const denyPolicy = new Policy({
-      filter: new BinaryExpression('user.id', '=', 2),
-      permissions: ['EDIT_FILE'],
-      effect: 'DENY',
-    });
-
-    const result = Spectra.validate(
-      [allowPolicy, denyPolicy],
-      { load: () => ({ 'user.id': 1 }) },
-      'EDIT_FILE'
-    );
-
-    expect(result).toBe(true);
+    expect(allowPolicy.getFilter()).toBeTruthy();
   });
 });