fix(access): condition types

shellscape · Jun 6, 2024 · 5ccd204 · 5ccd204
1 parent 20461a0
commit 5ccd204
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/access/src/structs.ts b/packages/access/src/structs.ts
@@ -80,7 +80,8 @@ export const SchemaStruct = nonempty(array(RoleStruct));
 export type Action = Infer<typeof ActionStruct>;
 export type Attributes = Infer<typeof AttributesStruct>;
 export type ConditionMethod = (typeof siftMethods)[number];
-export type Condition = Record<string, { [key in ConditionMethod]?: any }>;
+export type ConditionMethodRecord = { [key in ConditionMethod]?: any };
+export type Condition = Record<string, ConditionMethodRecord>;
 export type Conditions = Infer<typeof ConditionsStruct>;
 export type Resource = Infer<typeof ResourceStruct>;
 export type Role = Infer<typeof RoleStruct>;

diff --git a/packages/access/src/types.ts b/packages/access/src/types.ts
@@ -12,7 +12,7 @@ type FixedLengthArray<T extends any[]> = Pick<T, Exclude<keyof T, ArrayLengthMut
 
 export const ALL = '*';
 export type Condition = BaseCondition;
-export type Conditions = FixedLengthArray<['*']> | Record<string, Condition>[];
+export type Conditions = FixedLengthArray<['*']> | Condition[];
 
 export interface Dict {
   [key: string]: any;