@dmdata/telegram-json-types 1.0.9-jschema.2 → 1.1.2

package/types/schema/earthquake-information/1.1.0.d.ts

@@ -1,6 +1,7 @@
-import { Earthquake } from '../../component/earthquake';
-import { TelegramJSONMain } from '../../main';
-import { UnitValueNotNull } from '../../component/unit-value';
+import { TelegramJSONMain } from '@t/main';
+import { CodeName } from '@t/component/code-name';
+import { Earthquake } from '@t/component/earthquake';
+import { UnitValueNotNull } from '@t/component/unit-value';
 
 export namespace EarthquakeInformation {
   export interface Schema {
@@ -12,33 +13,26 @@ export namespace EarthquakeInformation {
   export type LpgmIntensityClass = '0' | '1' | '2' | '3' | '4';
   export type LpgmCategory = '1' | '2' | '3' | '4';
 
-  export type IntensityMaxInt = {
-    name: string;
-    code: string;
+  export interface IntensityMaxInt extends CodeName {
     maxInt: IntensityClass;
-  };
-  export type IntensityMaxIntOnRevise = {
-    name: string;
-    code: string;
+  }
+
+  export interface IntensityMaxIntOnRevise extends CodeName {
     maxInt?: IntensityClass;
     revise?: '上方修正' | '追加';
   }
 
-  export type IntensityCity = {
-    name: string;
-    code: string;
+  export interface IntensityCity extends CodeName {
     maxInt?: IntensityClass;
     revise?: '上方修正' | '追加';
     condition?: '震度５弱以上未入電';
-  };
+  }
 
-  export type IntensityStation = {
-    name: string;
-    code: string;
+  export interface IntensityStation extends CodeName {
     int: IntensityClass | '!5-';
     revise?: '上方修正' | '追加';
     condition?: '震度５弱以上未入電';
-  };
+  }
 
   export type IntensityLpgmMaxInt = IntensityMaxIntOnRevise & {
     maxLpgmInt: LpgmIntensityClass;
@@ -67,28 +61,28 @@ export namespace EarthquakeInformation {
   };
 
 
-  export type IntensityVXSE51 = {
+  export interface IntensityVXSE51 {
     maxInt: IntensityClass;
     prefectures: IntensityMaxInt[];
     regions: IntensityMaxInt[];
-  };
+  }
 
-  export type IntensityVXSE53 = {
+  export interface IntensityVXSE53 {
     maxInt: IntensityClass;
     prefectures: IntensityMaxIntOnRevise[];
     regions: IntensityMaxIntOnRevise[];
     cities: IntensityCity[];
     stations: IntensityStation[];
-  };
+  }
 
-  export type IntensityVXSE62 = {
+  export interface IntensityVXSE62 {
     maxInt: IntensityClass;
     maxLpgmInt: LpgmIntensityClass;
     lpgmCategory: LpgmCategory;
     prefectures: IntensityLpgmMaxInt[];
     regions: IntensityLpgmMaxInt[];
     stations: IntensityLpgmStation[];
-  };
+  }
 
 
   export interface PublicBodyVXSE51 {

package/types/schema/earthquake-nankai/1.0.0.d.ts

@@ -1,87 +1,86 @@
-import { TelegramJSONMain } from '@/types/main';
-
-export namespace EarthquakeNankai {
-  export interface Schema {
-    type: 'earthquake-nankai';
-    version: '1.0.0';
-  }
-
-  export interface EarthquakeInfoKind {
-    code: string;
-    name: string;
-  }
-
-  export interface EarthquakeInfo {
-    kind?: EarthquakeInfoKind;
-    text: string;
-    appendix?: string;
-  }
-
-
-  export interface PublicBody {
-    earthquakeInfo?: EarthquakeInfo;
-    nextAdvisory?: string;
-    text?: string;
-  }
-
-  export interface CancelBody {
-    text: string;
-  }
-
-  export interface PublicVYSE50 extends TelegramJSONMain {
-    _schema: Schema;
-    type: '南海トラフ地震臨時情報';
-    title: string;
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '南海トラフ地震に関連する情報';
-    body: PublicBody;
-  }
-
-  export interface PublicVYSE51 extends TelegramJSONMain {
-    _schema: Schema;
-    type: '南海トラフ地震関連解説情報';
-    title: string;
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: string;
-    infoKind: '南海トラフ地震に関連する情報';
-    body: PublicBody;
-  }
-
-  export interface PublicVYSE52 extends TelegramJSONMain {
-    _schema: Schema;
-    type: '南海トラフ地震関連解説情報';
-    title: string;
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '南海トラフ地震に関連する情報';
-    body: PublicBody;
-  }
-
-  export interface Cancel extends TelegramJSONMain {
-    _schema: Schema;
-    type: '南海トラフ地震臨時情報' | '南海トラフ地震関連解説情報';
-    title: string;
-    infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    infoKind: '南海トラフ地震に関連する情報';
-    body: CancelBody;
-  }
-
-  export type Main = PublicVYSE50 | PublicVYSE51 | PublicVYSE52 | Cancel;
-}
+import { TelegramJSONMain } from '@t/main';
+import { CodeName } from '@t/component/code-name';
+
+export namespace EarthquakeNankai {
+  export interface Schema {
+    type: 'earthquake-nankai';
+    version: '1.0.0';
+  }
+
+  export interface EarthquakeInfoKind extends CodeName{
+  }
+
+  export interface EarthquakeInfo {
+    kind?: EarthquakeInfoKind;
+    text: string;
+    appendix?: string;
+  }
+
+
+  export interface PublicBody {
+    earthquakeInfo?: EarthquakeInfo;
+    nextAdvisory?: string;
+    text?: string;
+  }
+
+  export interface CancelBody {
+    text: string;
+  }
+
+  export interface PublicVYSE50 extends TelegramJSONMain {
+    _schema: Schema;
+    type: '南海トラフ地震臨時情報';
+    title: string;
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '南海トラフ地震に関連する情報';
+    body: PublicBody;
+  }
+
+  export interface PublicVYSE51 extends TelegramJSONMain {
+    _schema: Schema;
+    type: '南海トラフ地震関連解説情報';
+    title: string;
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: string;
+    infoKind: '南海トラフ地震に関連する情報';
+    body: PublicBody;
+  }
+
+  export interface PublicVYSE52 extends TelegramJSONMain {
+    _schema: Schema;
+    type: '南海トラフ地震関連解説情報';
+    title: string;
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '南海トラフ地震に関連する情報';
+    body: PublicBody;
+  }
+
+  export interface Cancel extends TelegramJSONMain {
+    _schema: Schema;
+    type: '南海トラフ地震臨時情報' | '南海トラフ地震関連解説情報';
+    title: string;
+    infoType: '取消';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    infoKind: '南海トラフ地震に関連する情報';
+    body: CancelBody;
+  }
+
+  export type Main = PublicVYSE50 | PublicVYSE51 | PublicVYSE52 | Cancel;
+}

package/types/schema/earthquake-nankai/index.d.ts

@@ -1,4 +1,4 @@
-import { EarthquakeExplanation as v1_0_0 } from './1.0.0';
+import { EarthquakeNankai as v1_0_0 } from './1.0.0';
 
 
 export {

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

@@ -1,6 +1,7 @@
-import { TelegramJSONMain } from '@/types/main';
-import { Coordinate } from '@/types/component/coordinate';
-import { UnitValueNotNull } from '@/types/component/unit-value';
+import { TelegramJSONMain } from '@t/main';
+import { CodeName } from '@t/component/code-name';
+import { Coordinate } from '@t/component/coordinate';
+import { UnitValueNotNull } from '@t/component/unit-value';
 
 
 export namespace EewInformation {
@@ -12,24 +13,18 @@ export namespace EewInformation {
   export type IntensityClass = '0' | '1' | '2' | '3' | '4' | '5-' | '5+' | '6-' | '6+' | '7';
   export type LpgmIntensityClass = '0' | '1' | '2' | '3' | '4';
 
-  export interface WarningAreaKind {
-    code: string;
-    name: string;
-    lastKind: {
-      code: string;
-      name: string;
-    };
+  export interface WarningAreaKindLastKind extends CodeName {
+  }
+
+  export interface WarningAreaKind extends CodeName {
+    lastKind: WarningAreaKindLastKind;
   }
 
-  export interface WarningArea {
-    code: string;
-    name: string;
+  export interface WarningArea extends CodeName {
     kind: WarningAreaKind;
   }
 
-  export interface EarthquakeHypocenterReduce {
-    code: string;
-    name: string;
+  export interface EarthquakeHypocenterReduce extends CodeName {
   }
 
   export interface EarthquakeHypocenterAccuracy {
@@ -42,9 +37,7 @@ export namespace EewInformation {
     numberOfMagnitudeCalculation: '0' | '1' | '2' | '3' | '4' | '5';
   }
 
-  export interface EarthquakeHypocenter {
-    code: string;
-    name: string;
+  export interface EarthquakeHypocenter extends CodeName {
     coordinate: Coordinate<'日本測地系'>;
     depth: UnitValueNotNull<'深さ', 'km'>;
     reduce: EarthquakeHypocenterReduce;
@@ -83,12 +76,13 @@ export namespace EewInformation {
     maxIntChangeReason: '0' | '1' | '2' | '3' | '4' | '9';
   }
 
-  export interface IntensityRegion {
-    code: string;
-    name: string;
+  export interface IntensityRegionKind extends CodeName {
+  }
+
+  export interface IntensityRegion extends CodeName {
     forecastMaxInt: IntensityForecastMaxInt;
     forecastLpgmMaxInt?: IntensityForecastLpgmMaxInt;
-    kind: WarningAreaKind;
+    kind: IntensityRegionKind;
   }
 
 
@@ -119,7 +113,7 @@ export namespace EewInformation {
     comments: Comment;
   }
 
-  export interface PublicTesting {
+  export interface PublicTestingBody {
     isLastInfo: false;
     text: string;
   }
@@ -145,8 +139,8 @@ export namespace EewInformation {
 
   export interface PublicTesting extends TelegramJSONMain {
     _schema: Schema;
-    type: '緊急地震速報テスト';
-    title: '緊急地震速報テスト';
+    type: '緊急地震速報配信テスト';
+    title: '緊急地震速報配信テスト';
     infoType: '発表' | '訂正';
     targetDateTimeDubious: never;
     targetDuration: never;
@@ -154,13 +148,13 @@ export namespace EewInformation {
     eventId: string;
     serialNo: string;
     infoKind: '緊急地震速報';
-    body: PublicTesting;
+    body: PublicTestingBody;
   }
 
   export interface Cancel extends TelegramJSONMain {
     _schema: Schema;
-    type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報テスト';
-    title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報テスト';
+    type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報配信テスト';
+    title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | '緊急地震速報配信テスト';
     infoType: '取消';
     targetDateTimeDubious: never;
     targetDuration: never;

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

@@ -1,5 +1,6 @@
-import { TelegramJSONMain } from '@/types/main';
-import { Earthquake } from '@/types/component/earthquake';
+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 {
@@ -228,7 +247,7 @@ export namespace TsunamiInformation {
 
 
   export interface Cancel extends TelegramJSONMain {
-    type: '大津波警報・津波警報・津波予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
+    type: '津波警報・注意報・予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
     infoType: '取消';
     targetDateTimeDubious: never;
     targetDuration: never;