@dmdata/telegram-json-types 1.1.16 → 1.1.18

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

@@ -3,6 +3,7 @@ import { deepEqual } from 'node:assert/strict';
 import Ajv from 'ajv';
 import { getJSchema } from '../jschema/jschema-load';
 
+const sampleUrl = 'https://sample.dmdata.jp';
 const checkSchemaTypes = [
   'eew-information',
   'earthquake-information',
@@ -52,12 +53,14 @@ for (const schemaType of checkSchemaTypes) {
 
 
 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)) ?? []
+  const query = new URLSearchParams({ prefix: `conversion/json/schema/${schemaType}`, delimiter: '' });
+  const url = `${sampleUrl}/?` + query.toString();
+
+  return await fetch(url, { headers: { accept: 'application/xml' } })
+    .then(res => res.text())
+    .then(xml => xml
+      .match(/<Key>.+?\.json<\/Key>/g)
+      ?.map(element => element.replace(/^<Key>(.+?\.json)<\/Key>$/, '$1'))
+      .map(href => `${sampleUrl}/${encodeURIComponent(href)}`) ?? []
     );
 }

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

@@ -17,12 +17,12 @@ export namespace EarthquakeInformation {
 
   export interface IntensityMaxIntOnRevise extends Components.CodeName {
     maxInt?: IntensityClass;
-    revise?: '上方修正' | '追加';
+    revise?: '上方修正' | '下方修正' | '追加';
   }
 
   export interface IntensityCity extends Components.CodeName {
     maxInt?: IntensityClass;
-    revise?: '上方修正' | '追加';
+    revise?: '上方修正' | '下方修正' | '追加';
     condition?: '震度５弱以上未入電';
   }
 

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

@@ -246,7 +246,7 @@ export namespace TsunamiInformation {
 
 
   export interface Cancel extends TelegramJSONMain {
-    type: '津波警報・注意報・予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
+    type: '津波警報・注意報・予報a' | '津波情報a' | '沖合の津波観測に関する情報';
     infoType: '取消';
     targetDateTimeDubious?: never;
     targetDuration?: never;
@@ -256,6 +256,6 @@ export namespace TsunamiInformation {
     body: CancelBody;
   }
 
-  export type Main = (PublicVTSE41 | PublicVTSE51 | PublicVTSE52) | Cancel;
+  export type Main = PublicVTSE41 | PublicVTSE51 | PublicVTSE52 | Cancel;
 
 }

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

@@ -164,8 +164,8 @@ export namespace TsunamiInformation {
   }
 
   export interface TsunamiEstimationFirstHeight {
-    arrivalTime: string;
-    condition?: '早いところでは既に津波到達と推定';
+    arrivalTime?: string;
+    condition: '早いところでは既に津波到達と推定';
     revise?: '追加' | '更新';
   }
 
@@ -283,7 +283,7 @@ export namespace TsunamiInformation {
 
 
   export interface Cancel extends TelegramJSONMain {
-    type: '津波警報・注意報・予報a' | '津波情報a' | '各地の満潮時刻・津波到達予想時刻に関する情報' | '津波観測に関する情報';
+    type: '津波警報・注意報・予報a' | '津波情報a' | '沖合の津波観測に関する情報';
     infoType: '取消';
     targetDateTimeDubious?: never;
     targetDuration?: never;
@@ -293,6 +293,6 @@ export namespace TsunamiInformation {
     body: CancelBody;
   }
 
-  export type Main = (PublicVTSE41 | PublicVTSE51 | PublicVTSE52) | Cancel;
+  export type Main = PublicVTSE41 | PublicVTSE51 | PublicVTSE52 | Cancel;
 
 }