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

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

@@ -0,0 +1,54 @@
+import Ajv from 'ajv';
+import fetch from 'node-fetch';
+import { getJSchema } from '../jschema/jschema-load';
+
+const checkSchemaTypes = [
+  'eew-information',
+  'earthquake-information',
+  'earthquake-explanation',
+  'earthquake-counts',
+  'earthquake-hypocenter-update',
+  'earthquake-nankai',
+  'tsunami-information',
+  'volcano-information',
+  'weather-information',
+  'weather-impact-society',
+  'weather-early',
+  'weather-warning',
+  'weather-tornado',
+  'weather-typhoon',
+  'weather-landslide',
+  'weather-river-flood'
+];
+
+const ajv = new Ajv({
+  strictTuples: false
+});
+
+test.each(checkSchemaTypes)('CheckSchemaType: %s', async schemaType => {
+  const sampleList = await getList(schemaType);
+
+  for (let i = 0; i < sampleList.length; i++) {
+    const url = sampleList[i];
+    const json: any = await fetch(url).then(res => res.json());
+    const schema = await getJSchema(json._schema.type, json._schema.version);
+    const validate = ajv.compile(schema);
+    const valid = validate(json);
+
+    console.group(url);
+    expect(validate.errors ?? []).toEqual([]);
+    console.groupEnd();
+  }
+});
+
+
+async function getList(schemaType: string) {
+  const url = `https://sample.dmdata.jp/conversion/json/schema/${schemaType}/`;
+  return await fetch(url).then(res => res.text())
+    .then(html => html
+      .replace(/^.+?<pre>.+?<hr>(.+?)<\/pre>.+?$/s, '$1')
+      .match(/<a\shref="(.+?)">/g)
+      ?.map(a => url + a.replace(/^<a\shref="(.+?)">$/, '$1'))
+      .filter(href => /\.json$/.test(href)) ?? []
+    );
+}

package/tsconfig.json

@@ -1,20 +1,28 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2020",
-    "sourceMap": false,
-    "alwaysStrict": true,
-    "noImplicitThis": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "esModuleInterop": true,
-    "baseUrl": "./",
-    "paths": {
-      "@/types/*": [
-        "./types/*"
-      ]
-    }
-  },
-}
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2020",
+    "sourceMap": false,
+    "alwaysStrict": true,
+    "noImplicitThis": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "esModuleInterop": true,
+    "baseUrl": "./",
+    "paths": {
+      "@t/*": [
+        "./types/*"
+      ]
+    }
+  },
+  "include": [
+    "types/**/*",
+    "test/**/*"
+  ],
+  "exclude": [
+    "jschema",
+    "node_modules"
+  ]
+}

package/types/component/code-name.ts

@@ -0,0 +1,4 @@
+export interface CodeName {
+  code: string;
+  name: string;
+}

package/types/index.d.ts

@@ -6,7 +6,34 @@ import * as EarthquakeNankai from './schema/earthquake-nankai';
 import * as EewInformation from './schema/eew-information';
 import * as TsunamiInformation from './schema/tsunami-information';
 import * as VolcanoInformation from './schema/volcano-information';
+import * as WeatherInformation from './schema/weather-information';
+import * as WeatherImpactSociety from './schema/weather-impact-society';
+import * as WeatherEarly from './schema/weather-early';
+import * as WeatherWarning from './schema/weather-warning';
+import * as WeatherTornado from './schema/weather-tornado';
 import * as WeatherTyphoon from './schema/weather-typhoon';
+import * as WeatherLandslide from './schema/weather-landslide';
+import * as WeatherRiverFlood from './schema/weather-river-flood';
+import { TelegramJSONMain } from './main';
+
+type All =
+  EarthquakeInformation.v1_0_0.Main |
+  EarthquakeInformation.v1_1_0.Main |
+  EarthquakeExplanation.v1_0_0.Main |
+  EarthquakeCounts.v1_0_0.Main |
+  EarthquakeHypocenterUpdate.v1_0_0.Main |
+  EarthquakeNankai.v1_0_0.Main |
+  EewInformation.v1_0_0.Main |
+  TsunamiInformation.v1_0_0.Main |
+  VolcanoInformation.v1_0_0.Main |
+  WeatherInformation.v1_0_0.Main |
+  WeatherImpactSociety.v1_0_0.Main |
+  WeatherEarly.v1_0_0.Main |
+  WeatherWarning.v1_0_0.Main |
+  WeatherTornado.v1_0_0.Main |
+  WeatherTyphoon.v1_0_0.Main |
+  WeatherLandslide.v1_0_0.Main |
+  WeatherRiverFlood.v1_0_0.Main;
 
 export {
   EarthquakeInformation,
@@ -17,5 +44,14 @@ export {
   EewInformation,
   TsunamiInformation,
   VolcanoInformation,
-  WeatherTyphoon
+  WeatherInformation,
+  WeatherImpactSociety,
+  WeatherEarly,
+  WeatherWarning,
+  WeatherTornado,
+  WeatherTyphoon,
+  WeatherLandslide,
+  WeatherRiverFlood,
+  TelegramJSONMain,
+  All
 };

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

@@ -1,69 +1,69 @@
-import { TelegramJSONMain } from '@/types/main';
-
-export namespace EarthquakeCounts {
-  export interface Schema {
-    type: 'earthquake-counts';
-    version: '1.0.0';
-  }
-
-  export interface EarthquakeCountTargetTime {
-    start: string;
-    end: string;
-  }
-
-  export interface EarthquakeCountValues {
-    all: string | null;
-    felt: string | null;
-  }
-
-  export interface EarthquakeCount {
-    type: '１時間地震回数' | '累計地震回数' | '地震回数';
-    targetTime: EarthquakeCountTargetTime;
-    values: EarthquakeCountValues;
-  }
-
-  export interface Comments {
-    free: string;
-  }
-
-  export interface PublicBody {
-    earthquakeCounts?: EarthquakeCount;
-    nextAdvisory?: string;
-    text?: string;
-    comments?: Comments;
-  }
-
-  export interface CancelBody {
-    text: string;
-  }
-
-  export interface Public extends TelegramJSONMain {
-    _schema: Schema;
-    type: '地震回数に関する情報';
-    title: '地震回数に関する情報';
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: string;
-    infoKind: '地震回数情報';
-    body: PublicBody;
-  }
-
-  export interface Cancel extends TelegramJSONMain {
-    _schema: Schema;
-    type: '地震回数に関する情報';
-    title: '地震回数に関する情報';
-    infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: string;
-    infoKind: '地震回数情報';
-    body: CancelBody;
-  }
-
-  export type Main = Public | Cancel;
-}
+import { TelegramJSONMain } from '@t/main';
+
+export namespace EarthquakeCounts {
+  export interface Schema {
+    type: 'earthquake-counts';
+    version: '1.0.0';
+  }
+
+  export interface EarthquakeCountTargetTime {
+    start: string;
+    end: string;
+  }
+
+  export interface EarthquakeCountValues {
+    all: string | null;
+    felt: string | null;
+  }
+
+  export interface EarthquakeCount {
+    type: '１時間地震回数' | '累積地震回数' | '地震回数';
+    targetTime: EarthquakeCountTargetTime;
+    values: EarthquakeCountValues;
+  }
+
+  export interface Comments {
+    free: string;
+  }
+
+  export interface PublicBody {
+    earthquakeCounts?: EarthquakeCount[];
+    nextAdvisory?: string;
+    text?: string;
+    comments?: Comments;
+  }
+
+  export interface CancelBody {
+    text: string;
+  }
+
+  export interface Public extends TelegramJSONMain {
+    _schema: Schema;
+    type: '地震回数に関する情報';
+    title: '地震回数に関する情報';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: string;
+    infoKind: '地震回数情報';
+    body: PublicBody;
+  }
+
+  export interface Cancel extends TelegramJSONMain {
+    _schema: Schema;
+    type: '地震回数に関する情報';
+    title: '地震回数に関する情報';
+    infoType: '取消';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: string;
+    infoKind: '地震回数情報';
+    body: CancelBody;
+  }
+
+  export type Main = Public | Cancel;
+}

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

@@ -1,57 +1,57 @@
-import { TelegramJSONMain } from '@/types/main';
-
-export namespace EarthquakeExplanation {
-  export interface Schema {
-    type: 'earthquake-explanation';
-    version: '1.0.0';
-  }
-
-  export interface Naming {
-    text: string;
-    en?: string;
-  }
-
-  export interface Comments {
-    free: string;
-  }
-
-  export interface PublicBody {
-    naming?: Naming;
-    text: string;
-    comments?: Comments;
-  }
-
-  export interface CancelBody {
-    text: string;
-  }
-
-  export interface Public extends TelegramJSONMain {
-    _schema: Schema;
-    type: '地震の活動状況等に関する情報';
-    title: '地震の活動状況等に関する情報';
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '地震の活動状況等に関する情報';
-    body: PublicBody;
-  }
-
-  export interface Cancel extends TelegramJSONMain {
-    _schema: Schema;
-    type: '地震の活動状況等に関する情報';
-    title: '地震の活動状況等に関する情報';
-    infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '地震の活動状況等に関する情報';
-    body: CancelBody;
-  }
-
-  export type Main = Public | Cancel;
-}
+import { TelegramJSONMain } from '@t/main';
+
+export namespace EarthquakeExplanation {
+  export interface Schema {
+    type: 'earthquake-explanation';
+    version: '1.0.0';
+  }
+
+  export interface Naming {
+    text: string;
+    en?: string;
+  }
+
+  export interface Comments {
+    free: string;
+  }
+
+  export interface PublicBody {
+    naming?: Naming;
+    text: string;
+    comments?: Comments;
+  }
+
+  export interface CancelBody {
+    text: string;
+  }
+
+  export interface Public extends TelegramJSONMain {
+    _schema: Schema;
+    type: '地震の活動状況等に関する情報';
+    title: '地震の活動状況等に関する情報';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '地震の活動状況等に関する情報';
+    body: PublicBody;
+  }
+
+  export interface Cancel extends TelegramJSONMain {
+    _schema: Schema;
+    type: '地震の活動状況等に関する情報';
+    title: '地震の活動状況等に関する情報';
+    infoType: '取消';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '地震の活動状況等に関する情報';
+    body: CancelBody;
+  }
+
+  export type Main = Public | Cancel;
+}

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

@@ -1,53 +1,53 @@
-import { TelegramJSONMain } from '../../main';
-import { Earthquake } from '../../component/earthquake';
-
-export namespace EarthquakeHypocenterUpdate {
-  export interface Schema {
-    type: 'earthquake-hypocenter-update';
-    version: '1.0.0';
-  }
-
-  export interface Comments {
-    free: string;
-  }
-
-  export interface PublicBody {
-    earthquake: Earthquake;
-    text: string;
-    comments?: Comments;
-  }
-
-  export interface CancelBody {
-    text: string;
-  }
-
-  export interface Public extends TelegramJSONMain {
-    _schema: Schema;
-    type: '顕著な地震の震源要素更新のお知らせ';
-    title: '顕著な地震の震源要素更新のお知らせ';
-    infoType: '発表' | '訂正';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '震源要素更新のお知らせ';
-    body: PublicBody;
-  }
-
-  export interface Cancel extends TelegramJSONMain {
-    _schema: Schema;
-    type: '顕著な地震の震源要素更新のお知らせ';
-    title: '顕著な地震の震源要素更新のお知らせ';
-    infoType: '取消';
-    targetDateTimeDubious: never;
-    targetDuration: never;
-    validDateTime: never;
-    eventId: string;
-    serialNo: null;
-    infoKind: '震源要素更新のお知らせ';
-    body: CancelBody;
-  }
-
-  export type Main = Public | Cancel;
-}
+import { TelegramJSONMain } from '@t/main';
+import { Earthquake } from '@t/component/earthquake';
+
+export namespace EarthquakeHypocenterUpdate {
+  export interface Schema {
+    type: 'earthquake-hypocenter-update';
+    version: '1.0.0';
+  }
+
+  export interface Comments {
+    free: string;
+  }
+
+  export interface PublicBody {
+    earthquake: Earthquake;
+    text?: string;
+    comments?: Comments;
+  }
+
+  export interface CancelBody {
+    text: string;
+  }
+
+  export interface Public extends TelegramJSONMain {
+    _schema: Schema;
+    type: '顕著な地震の震源要素更新のお知らせ';
+    title: '顕著な地震の震源要素更新のお知らせ';
+    infoType: '発表' | '訂正';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '震源要素更新のお知らせ';
+    body: PublicBody;
+  }
+
+  export interface Cancel extends TelegramJSONMain {
+    _schema: Schema;
+    type: '顕著な地震の震源要素更新のお知らせ';
+    title: '顕著な地震の震源要素更新のお知らせ';
+    infoType: '取消';
+    targetDateTimeDubious: never;
+    targetDuration: never;
+    validDateTime: never;
+    eventId: string;
+    serialNo: null;
+    infoKind: '震源要素更新のお知らせ';
+    body: CancelBody;
+  }
+
+  export type Main = Public | Cancel;
+}

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

@@ -1,41 +1,35 @@
-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 EarthquakeInformation {
   export interface Schema {
     type: 'earthquake-information';
-    version: '1.1.0';
+    version: '1.0.0';
   }
 
   export type IntensityClass = '1' | '2' | '3' | '4' | '5-' | '5+' | '6-' | '6+' | '7';
 
-  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 Comment = {
     free?: string;
@@ -50,19 +44,19 @@ 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 interface PublicBodyVXSE51 {