@dmdata/telegram-json-types 1.1.13 → 1.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmdata/telegram-json-types",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "scripts": {
     "build:jschema": "npx tsc --project jschema/tsconfig.json",
     "build:dist-jschema": "node ./dist/build.js",
@@ -19,15 +19,16 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^27.4.0",
-    "@types/node": "^14.18.9",
-    "@types/node-fetch": "^2.5.12",
-    "ajv": "^8.9.0",
-    "jest": "^27.4.7",
-    "node-fetch": "^2.6.7",
-    "ts-jest": "^27.1.3",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.5",
-    "typescript-json-schema": "^0.53.0"
+    "@types/jest": "^29.5.11",
+    "@types/node": "^20.11.15",
+    "ajv": "^8.12.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3",
+    "typescript-json-schema": "^0.62.0"
+  },
+  "engines": {
+    "node": ">=18"
   }
 }

package/test/sample-schema-check.test.ts

@@ -1,5 +1,4 @@
 import Ajv from 'ajv';
-import fetch from 'node-fetch';
 import { getJSchema } from '../jschema/jschema-load';
 
 const checkSchemaTypes = [

package/types/component/coordinate.d.ts

@@ -11,15 +11,15 @@ interface CoordinateNormal<Geo> {
     value: string;
   };
   height?: UnitValueNotNull<'高さ', 'm'>;
-  condition: never;
-  geodeticSystem: Geo;
+  condition?: never;
+  geodeticSystem?: Geo;
 }
 
 interface CoordinateUnknown {
-  latitude: never;
-  longitude: never;
-  height: never;
-  geodeticSystem: never;
+  latitude?: never;
+  longitude?: never;
+  height?: never;
+  geodeticSystem?: never;
   condition: '不明';
 }
 

package/types/component/earthquake.d.ts

@@ -5,12 +5,12 @@ interface DepthBase {
   type: '深さ';
   unit: 'km';
   value: string | null;
-  condition: string | never;
+  condition?: string | never;
 }
 
 interface DepthNormal extends DepthBase {
   value: string;
-  condition: never;
+  condition?: never;
 }
 
 interface DepthShallow extends DepthBase {
@@ -35,12 +35,12 @@ interface MagnitudeBase {
   type: 'マグニチュード';
   unit: 'Mj' | 'M';
   value: string | null;
-  condition: string | never;
+  condition?: string | never;
 }
 
 interface MagnitudeNormal extends MagnitudeBase {
   value: string;
-  condition: never;
+  condition?: never;
 }
 
 interface MagnitudeUnknown extends MagnitudeBase {

package/types/component/unit-value.d.ts

@@ -2,12 +2,12 @@ export type UnitValue<Type = string, Unit = string, Condition = never> = {
   type: Type;
   unit: Unit;
   value: string | null;
-  condition: Condition
+  condition?: Condition;
 };
 
 export type UnitValueNotNull<Type = string, Unit = string, Condition = never> = {
   type: Type;
   unit: Unit;
   value: string;
-  condition: Condition
+  condition?: Condition;
 };

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

@@ -42,9 +42,9 @@ export namespace EarthquakeCounts {
     type: '地震回数に関する情報';
     title: '地震回数に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '地震回数情報';
@@ -56,9 +56,9 @@ export namespace EarthquakeCounts {
     type: '地震回数に関する情報';
     title: '地震回数に関する情報';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '地震回数情報';

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

@@ -30,9 +30,9 @@ export namespace EarthquakeExplanation {
     type: '地震の活動状況等に関する情報';
     title: '地震の活動状況等に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '地震の活動状況等に関する情報';
@@ -44,9 +44,9 @@ export namespace EarthquakeExplanation {
     type: '地震の活動状況等に関する情報';
     title: '地震の活動状況等に関する情報';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '地震の活動状況等に関する情報';

package/types/schema/earthquake-hypocenter-update/1.0.0.d.ts

@@ -26,9 +26,9 @@ export namespace EarthquakeHypocenterUpdate {
     type: '顕著な地震の震源要素更新のお知らせ';
     title: '顕著な地震の震源要素更新のお知らせ';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震源要素更新のお知らせ';
@@ -40,9 +40,9 @@ export namespace EarthquakeHypocenterUpdate {
     type: '顕著な地震の震源要素更新のお知らせ';
     title: '顕著な地震の震源要素更新のお知らせ';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震源要素更新のお知らせ';

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

@@ -77,7 +77,7 @@ export namespace EarthquakeInformation {
     comments: Comments;
   }
 
-  export interface PublicBodyVXZSE40 {
+  export interface PublicBodyVZSE40 {
     text: string;
   }
 
@@ -90,9 +90,9 @@ export namespace EarthquakeInformation {
     type: '震度速報';
     title: '震度速報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震度速報';
@@ -104,9 +104,9 @@ export namespace EarthquakeInformation {
     type: '震源に関する情報';
     title: '震源に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震源速報';
@@ -118,9 +118,9 @@ export namespace EarthquakeInformation {
     type: '震源・震度に関する情報';
     title: '震源・震度情報' | '遠地地震に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '地震情報';
@@ -132,13 +132,13 @@ export namespace EarthquakeInformation {
     type: '地震・津波に関するお知らせ';
     title: '地震・津波に関するお知らせ';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '地震・津波に関するお知らせ';
-    body: PublicBodyVXZSE40;
+    body: PublicBodyVZSE40;
   }
 
   export interface Cancel extends TelegramJSONMain {
@@ -146,9 +146,9 @@ export namespace EarthquakeInformation {
     type: '震度速報' | '震源に関する情報' | '震源・震度に関する情報' | '地震・津波に関するお知らせ';
     title: '震度速報' | '震源に関する情報' | '震源・震度情報' | '遠地地震に関する情報' | '地震・津波に関するお知らせ';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     infoKind: '震度速報' | '震源速報' | '地震情報' | '地震・津波に関するお知らせ';
     body: CancelBody;

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

@@ -35,17 +35,24 @@ export namespace EarthquakeInformation {
   export type IntensityLgMaxInt = IntensityMaxIntOnRevise & {
     maxLgInt: LgIntensityClass;
   };
+
+  export interface IntensityPeriodicBand extends Omit<Components.UnitValueNotNull<void, '秒台'>, 'type'> {
+  }
+
+  export interface IntensitySva extends Omit<Components.UnitValueNotNull<void, 'cm/s'>, 'type'> {
+  }
+
   export type IntensityLgStationPrePeriod = {
-    periodicBand: Components.UnitValueNotNull<never, '秒台'>;
+    periodicBand: IntensityPeriodicBand;
     lgInt: LgIntensityClass;
-    sva: Components.UnitValueNotNull<never, 'cm/s'>;
+    sva: IntensitySva;
   };
 
   export interface IntensityLgStation extends Components.CodeName {
     int?: IntensityClass;
     revise?: '上方修正' | '下方修正' | '追加';
     lgInt: LgIntensityClass;
-    sva: Components.UnitValueNotNull<never, 'cm/s'>;
+    sva: IntensitySva;
     prePeriods: IntensityLgStationPrePeriod[];
   }
 
@@ -59,6 +66,16 @@ export namespace EarthquakeInformation {
       text: string;
       codes: string[];
     };
+    uri?: string;
+  }
+
+  export interface CommentsVXSE51Or52 extends Comments {
+    var?: never;
+    uri?: never;
+  }
+
+  export interface CommentsVXSE53 extends Comments {
+    uri?: never;
   }
 
 
@@ -89,20 +106,20 @@ export namespace EarthquakeInformation {
   export interface PublicBodyVXSE51 {
     intensity: IntensityVXSE51;
     text?: string;
-    comments: Omit<Comments, 'var'>;
+    comments: CommentsVXSE51Or52;
   }
 
   export interface PublicBodyVXSE52 {
     earthquake: Components.Earthquake;
     text?: string;
-    comments: Omit<Comments, 'var'>;
+    comments: CommentsVXSE51Or52;
   }
 
   export interface PublicBodyVXSE53 {
     earthquake: Components.Earthquake;
     intensity?: IntensityVXSE53;
     text?: string;
-    comments: Comments;
+    comments: CommentsVXSE53;
   }
 
   export interface PublicBodyVXSE62 {
@@ -112,7 +129,7 @@ export namespace EarthquakeInformation {
     comments: Comments;
   }
 
-  export interface PublicBodyVXZSE40 {
+  export interface PublicBodyVZSE40 {
     text: string;
   }
 
@@ -125,9 +142,9 @@ export namespace EarthquakeInformation {
     type: '震度速報';
     title: '震度速報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震度速報';
@@ -139,9 +156,9 @@ export namespace EarthquakeInformation {
     type: '震源に関する情報';
     title: '震源に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '震源速報';
@@ -153,9 +170,9 @@ export namespace EarthquakeInformation {
     type: '震源・震度に関する情報';
     title: '震源・震度情報' | '遠地地震に関する情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '地震情報';
@@ -167,9 +184,9 @@ export namespace EarthquakeInformation {
     type: '長周期地震動に関する観測情報';
     title: '長周期地震動に関する観測情報';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '長周期地震動に関する観測情報';
@@ -181,13 +198,13 @@ export namespace EarthquakeInformation {
     type: '地震・津波に関するお知らせ';
     title: '地震・津波に関するお知らせ';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '地震・津波に関するお知らせ';
-    body: PublicBodyVXZSE40;
+    body: PublicBodyVZSE40;
   }
 
   export interface Cancel extends TelegramJSONMain {
@@ -195,9 +212,9 @@ export namespace EarthquakeInformation {
     type: '震度速報' | '震源に関する情報' | '震源・震度に関する情報' | '長周期地震動に関する観測情報' | '地震・津波に関するお知らせ';
     title: '震度速報' | '震源に関する情報' | '震源・震度情報' | '遠地地震に関する情報' | '長周期地震動に関する観測情報' | '地震・津波に関するお知らせ';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     infoKind: '震度速報' | '震源速報' | '地震情報' | '長周期地震動に関する観測情報' | '地震・津波に関するお知らせ';
     body: CancelBody;

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

@@ -32,9 +32,9 @@ export namespace EarthquakeNankai {
     type: '南海トラフ地震臨時情報';
     title: string;
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '南海トラフ地震に関連する情報';
@@ -46,9 +46,9 @@ export namespace EarthquakeNankai {
     type: '南海トラフ地震関連解説情報';
     title: string;
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '南海トラフ地震に関連する情報';
@@ -60,9 +60,9 @@ export namespace EarthquakeNankai {
     type: '南海トラフ地震関連解説情報';
     title: string;
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: null;
     infoKind: '南海トラフ地震に関連する情報';
@@ -74,9 +74,9 @@ export namespace EarthquakeNankai {
     type: '南海トラフ地震臨時情報' | '南海トラフ地震関連解説情報';
     title: string;
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     infoKind: '南海トラフ地震に関連する情報';
     body: CancelBody;

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

@@ -89,11 +89,11 @@ export namespace EewInformation {
 
   export interface IntensityRegionReached extends IntensityRegion {
     condition: '既に主要動到達と推測';
-    arrivalTime: never;
+    arrivalTime?: never;
   }
 
   export interface IntensityRegionUnReached extends IntensityRegion {
-    condition: never;
+    condition?: never;
     arrivalTime: string;
   }
 
@@ -128,7 +128,7 @@ export namespace EewInformation {
 
   export interface PublicCommonBody {
     isLastInfo: boolean;
-    isCanceled: boolean;
+    isCanceled: false;
     isWarning: boolean;
     zones?: WarningArea[];
     prefectures?: WarningArea[];
@@ -141,7 +141,7 @@ export namespace EewInformation {
 
   export interface PublicRealtimeBody {
     isLastInfo: boolean;
-    isCanceled: boolean;
+    isCanceled: false;
     earthquake: Earthquake;
     intensity?: IntensityRealtime;
     text?: string;
@@ -164,9 +164,9 @@ export namespace EewInformation {
     type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）';
     title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '緊急地震速報';
@@ -178,9 +178,9 @@ export namespace EewInformation {
     type: 'リアルタイム震度';
     title: 'リアルタイム震度';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '緊急地震速報';
@@ -193,9 +193,9 @@ export namespace EewInformation {
     type: '緊急地震速報配信テスト';
     title: '緊急地震速報配信テスト';
     infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '緊急地震速報';
@@ -207,9 +207,9 @@ export namespace EewInformation {
     type: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | 'リアルタイム震度' | '緊急地震速報配信テスト';
     title: '緊急地震速報（予報）' | '緊急地震速報（地震動予報）' | '緊急地震速報（警報）' | 'リアルタイム震度' | '緊急地震速報配信テスト';
     infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
+    targetDateTimeDubious?: never;
+    targetDuration?: never;
+    validDateTime?: never;
     eventId: string;
     serialNo: string;
     infoKind: '緊急地震速報';