feat(wip): 세력 장수 작업 중

hwe/ts/defs/API/Nation/index.ts

@@ -43,39 +43,31 @@ export type GeneralListItemP2 = GeneralListItemP1 & {
     officer_city: number,
 
 }
-export type GeneralListItemP9 = GeneralListItemP2 & {
-    owner_name: string,
-}
+
+export type RawGeneralListItem = GeneralListItemP0 | GeneralListItemP1 | GeneralListItemP2;
 
 export type GeneralListItem =
-({permission : 0} & GeneralListItemP0) |
-({permission : 1} & GeneralListItemP1) |
-({permission : 2} & GeneralListItemP2) |
-({permission : 9} & GeneralListItemP9);
+    ({ permission: 0 } & GeneralListItemP0) |
+    ({ permission: 1 } & GeneralListItemP1) |
+    ({ permission: 2 | 3 | 4 } & GeneralListItemP2);
 
 
 export type RawGeneralListP0 = ValidResponse & {
     permission: 0,
-    column: keyof GeneralListItemP0[],
-    list: ValuesOf<GeneralListItemP0>[],
+    column: (keyof GeneralListItemP0)[],
+    list: ValuesOf<GeneralListItemP0>[][],
 }
 
 export type RawGeneralListP1 = ValidResponse & {
     permission: 1,
-    column: keyof GeneralListItemP1[],
+    column: (keyof GeneralListItemP1)[],
     list: ValuesOf<GeneralListItemP1>[][],
 }
 
 export type RawGeneralListP2 = ValidResponse & {
-    permission: 2,
-    column: keyof GeneralListItemP2[],
+    permission: 2 | 3 | 4,
+    column: (keyof GeneralListItemP2)[],
     list: ValuesOf<GeneralListItemP2>[][],
 }
 
-export type RawGeneralListP9 = ValidResponse & {
-    permission: 9,
-    column: keyof GeneralListItemP9[],
-    list: ValuesOf<GeneralListItemP9>[][],
-}
-
-export type GeneralListResponse = RawGeneralListP0 | RawGeneralListP1 | RawGeneralListP2 | RawGeneralListP9;
+export type GeneralListResponse = RawGeneralListP0 | RawGeneralListP1 | RawGeneralListP2;