fix(ability): improves PackedRule type

Relates to #248
stalniy · Feb 17, 2020 · a781921 · a781921
1 parent 22262fb
commit a781921
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/packages/casl-ability/src/extra.ts b/packages/casl-ability/src/extra.ts
@@ -94,14 +94,13 @@ export function permittedFieldsOf(
 
 const joinIfArray = (value: string | string[]) => Array.isArray(value) ? value.join(',') : value;
 
-export type PackedRule = [
-  string,
-  string,
-  (UnifiedRawRule['conditions'] | 0)?,
-  (1 | 0)?,
-  (string | 0)?,
-  (string | 0)?
-];
+export type PackedRule =
+  [string, string] |
+  [string, string, UnifiedRawRule['conditions']] |
+  [string, string, UnifiedRawRule['conditions'] | 0, 1] |
+  [string, string, UnifiedRawRule['conditions'] | 0, 1 | 0, string] |
+  [string, string, UnifiedRawRule['conditions'] | 0, 1 | 0, string | 0, string]
+;
 
 export function packRules(rules: UnifiedRawRule[]): PackedRule[] {
   return rules.map(({ actions, subject, conditions, inverted, fields, reason }) => { // eslint-disable-line
@@ -111,7 +110,7 @@ export function packRules(rules: UnifiedRawRule[]): PackedRule[] {
       conditions || 0,
       inverted ? 1 : 0,
       fields ? joinIfArray(fields) : 0,
-      reason || 0
+      reason || ''
     ];
 
     while (!rule[rule.length - 1]) rule.pop();