@dmdata/telegram-json-types 1.0.9-jschema.1 → 1.1.1

package/types/schema/tsunami-information/1.0.0.d.ts

@@ -1,5 +1,6 @@
-import { Earthquake } from '../../component/earthquake';
-import { TelegramJSONMain } from '../../main';
+import { TelegramJSONMain } from '@t/main';
+import { CodeName } from '@t/component/code-name';
+import { Earthquake } from '@t/component/earthquake';
 
 
 export namespace TsunamiInformation {
@@ -8,28 +9,36 @@ export namespace TsunamiInformation {
     version: '1.0.0';
   }
 
-  export interface TsunamiForecastKind {
-    code: string;
-    name: string;
-    lastKind: {
-      code: string;
-      name: string;
-    };
+  export interface TsunamiForecastKindLastKind extends CodeName {
   }
 
-  export interface TsunamiForecastFirstHeight {
-    arrivalTime?: string;
-    condition?: '津波到達中と推測' | '第１波の到達を確認' | 'ただちに津波来襲と予測';
-    revise?: '追加' | '更新';
+  export interface TsunamiForecastKind extends CodeName {
+    lastKind: TsunamiForecastKindLastKind;
   }
 
-  export interface TsunamiForecastMaxHeightValue {
+  export type TsunamiForecastFirstHeight = ({
+    arrivalTime: string;
+    condition?: 'ただちに津波来襲と予測';
+  } | {
+    arrivalTime: never;
+    condition: '津波到達中と推測' | '第１波の到達を確認';
+  }) &
+    {
+      revise?: '追加' | '更新';
+    };
+
+  export type TsunamiForecastMaxHeightValue = {
     type: '津波の高さ';
     unit: 'm';
-    value: string | null;
+  } & ({
+    value: string;
     over?: true;
+    condition: never;
+  } | {
+    value: null;
+    over: never;
     condition?: '巨大' | '高い';
-  }
+  });
 
   export interface TsunamiForecastMaxHeight {
     height: TsunamiForecastMaxHeightValue;
@@ -37,19 +46,15 @@ export namespace TsunamiInformation {
     revise?: '追加' | '更新';
   }
 
-  export interface TsunamiForecastStation {
-    code: string;
-    name: string;
+  export interface TsunamiForecastStation extends CodeName {
     highTideDateTime: string;
     firstHeight: TsunamiForecastFirstHeight;
   }
 
-  export interface TsunamiForecast {
-    code: string;
-    name: string;
+  export interface TsunamiForecast extends CodeName {
     kind: TsunamiForecastKind;
-    firstHeight: TsunamiForecastFirstHeight;
-    maxHeight: TsunamiForecastMaxHeight;
+    firstHeight?: TsunamiForecastFirstHeight;
+    maxHeight?: TsunamiForecastMaxHeight;
     stations?: TsunamiForecastStation[] | never;
   }
 
@@ -61,31 +66,45 @@ export namespace TsunamiInformation {
     stations?: TsunamiForecastStation[];
   }
 
-  export interface TsunamiObservationStationFirstHeight {
+  export type TsunamiObservationStationFirstHeight = ({
     arrivalTime: string;
-    initial?: '押し' | '引き';
-    condition?: '第１波識別不能';
+    initial: '押し' | '引き';
+    condition: never;
+  } | {
+    arrivalTime: never;
+    initial: never;
+    condition: '第１波識別不能';
+  }) & {
     revise?: '追加' | '更新';
-  }
+  };
 
   export interface TsunamiObservationStationMaxHeightValue {
     type: 'これまでの最大波の高さ';
     unit: 'm';
-    value: string | null;
+    value: string;
     over?: true;
     condition?: '上昇中';
   }
 
-  export interface TsunamiObservationStationMaxHeight {
-    dateTime?: string;
-    height?: TsunamiObservationStationMaxHeightValue;
-    condition?: '微弱' | '観測中' | '重要';
-    revise?: '追加' | '更新';
-  }
-
-  export interface TsunamiObservationStation {
-    code: string;
-    name: string;
+  export type TsunamiObservationStationMaxHeight =
+    ({
+      dateTime: string;
+      height: TsunamiObservationStationMaxHeightValue;
+      condition?: '重要';
+    } | {
+      dateTime: string;
+      height: never;
+      condition: '微弱';
+    } | {
+      dateTime: never;
+      height: never;
+      condition: '観測中';
+    }) &
+    {
+      revise?: '追加' | '更新';
+    }
+
+  export interface TsunamiObservationStation extends CodeName {
     sensor?: string;
     firstHeight: TsunamiObservationStationFirstHeight;
     maxHeight: TsunamiObservationStationMaxHeight;
@@ -113,23 +132,23 @@ export namespace TsunamiInformation {
     revise?: '追加' | '更新';
   }
 
-  export interface TsunamiEstimationMaxHeightValue {
-    type: '津波の高さ';
-    unit: 'm';
-    value: string | null;
-    over?: true;
-  }
-
-  export interface TsunamiEstimationMaxHeight {
-    dateTime?: string;
-    height?: TsunamiEstimationMaxHeightValue;
-    condition?: '微弱' | '観測中' | '重要';
-    revise?: '追加' | '更新';
-  }
+  export type TsunamiEstimationMaxHeightValue = TsunamiForecastMaxHeightValue;
+
+  export type TsunamiEstimationMaxHeight =
+    ({
+      dateTime: string;
+      height: TsunamiEstimationMaxHeightValue;
+      condition?: '重要';
+    } | {
+      dateTime: never;
+      height: never;
+      condition: '推定中';
+    }) &
+    {
+      revise?: '追加' | '更新';
+    };
 
-  export interface TsunamiEstimation {
-    code: string;
-    name: string;
+  export interface TsunamiEstimation extends CodeName {
     firstHeight: TsunamiEstimationFirstHeight;
     maxHeight: TsunamiEstimationMaxHeight;
   }
@@ -140,7 +159,7 @@ export namespace TsunamiInformation {
 
   export interface PublicBodyVTSE51Tsunami {
     forecasts: TsunamiForecastVXSE51[];
-    observations: TsunamiObservationVXSE51[];
+    observations?: TsunamiObservationVXSE51[];
   }
 
   export interface PublicBodyVTSE52Tsunami {
@@ -156,7 +175,7 @@ export namespace TsunamiInformation {
     };
   };
 
-  export interface ChancelBody {
+  export interface CancelBody {
     text: string;
   }
 
@@ -186,10 +205,13 @@ export namespace TsunamiInformation {
     _schema: Schema;
     type: '津波警報・注意報・予報a';
     title: string;
-    infoKind: '津波警報・注意報・予報';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime?: string;
     eventId: string;
     serialNo: null;
-    infoType: '発表' | '訂正';
+    infoKind: '津波警報・注意報・予報';
     body: PublicBodyVTSE41;
   }
 
@@ -197,10 +219,13 @@ export namespace TsunamiInformation {
     _schema: Schema;
     type: '津波情報a';
     title:  '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
-    infoKind:'津波情報';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
     eventId: string;
     serialNo: string;
-    infoType: '発表' | '訂正';
+    infoKind:'津波情報';
     body: PublicBodyVTSE51;
   }
 
@@ -209,22 +234,29 @@ export namespace TsunamiInformation {
     _schema: Schema;
     type: '沖合の津波観測に関する情報';
     title: '沖合の津波観測に関する情報';
-    infoKind: '津波情報';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
     eventId: string;
     serialNo: string;
-    infoType: '発表' | '訂正';
+    infoKind: '津波情報';
     body: PublicBodyVTSE52;
   }
 
 
 
-  export interface Channel extends TelegramJSONMain {
-    type: '大津波警報・津波警報・津波予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
+  export interface Cancel extends TelegramJSONMain {
+    type: '津波警報・注意報・予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
     infoType: '取消';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
     eventId: string;
-    body: ChancelBody;
+    infoKind: '津波警報・注意報・予報'| '津波情報';
+    body: CancelBody;
   }
 
-  export type Main = (PublicVTSE41 | PublicVTSE51 | PublicVTSE52) | Channel;
+  export type Main = (PublicVTSE41 | PublicVTSE51 | PublicVTSE52) | Cancel;
 
 }

package/types/schema/tsunami-information/index.d.ts

@@ -5,5 +5,3 @@ export {
   v1_0_0 as Latest,
   v1_0_0
 };
-
-export default v1_0_0;