@dmdata/telegram-json-types 1.1.13 → 1.1.15

package/dist/jschema-load.js

@@ -1,44 +1,48 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJSchema = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const config_1 = require("./config");
-const schemas = new Map();
-const jschemaList = (0, fs_1.readdirSync)(config_1.distDir)
-    .filter(file => /\.json$/.test(file))
-    .sort();
-jschemaList.forEach(file => {
-    const [, schemaName, schemaVersion] = file.match(/^([\w-]+)_(\w+\.\w+\.\w+)\.json$/) ?? [];
-    const schemaVersions = schemas.get(schemaName) ?? schemas.set(schemaName, new Map()).get(schemaName);
-    const jschemaFile = (0, path_1.resolve)(config_1.distDir, file);
-    schemaVersions?.set(schemaVersion, jschemaFile);
-    schemaVersions?.set('latest', jschemaFile);
-});
-async function getJSchema(name, version = 'latest') {
-    const filePath = schemas.get(name)?.get(version);
-    if (!filePath) {
-        return null;
-    }
-    return await Promise.resolve().then(() => __importStar(require(filePath)));
-}
-exports.getJSchema = getJSchema;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJSchema = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const config_1 = require("./config");
+const schemas = new Map();
+const jschemaList = (0, fs_1.readdirSync)(config_1.distDir)
+    .filter(file => /\.json$/.test(file))
+    .sort();
+jschemaList.forEach(file => {
+    const [, schemaName, schemaVersion] = file.match(/^([\w-]+)_(\w+\.\w+\.\w+)\.json$/) ?? [];
+    const schemaVersions = schemas.get(schemaName) ?? schemas.set(schemaName, new Map()).get(schemaName);
+    const jschemaFile = (0, path_1.resolve)(config_1.distDir, file);
+    schemaVersions?.set(schemaVersion, jschemaFile);
+    schemaVersions?.set('latest', jschemaFile);
+});
+async function getJSchema(name, version = 'latest') {
+    const filePath = schemas.get(name)?.get(version);
+    if (!filePath) {
+        return null;
+    }
+    return await Promise.resolve(`${filePath}`).then(s => __importStar(require(s)));
+}
+exports.getJSchema = getJSchema;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dmdata/telegram-json-types",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "scripts": {
     "build:jschema": "npx tsc --project jschema/tsconfig.json",
     "build:dist-jschema": "node ./dist/build.js",
     "prepublishOnly": "npm run build:jschema && npm run build:dist-jschema",
     "publish:npm": "npm version patch && npm publish --access=public",
-    "test": "jest",
+    "test": "npx ts-node test/sample-schema-check.test.ts",
     "type-test": "npm run build:dist-jschema && npm run test"
   },
   "repository": {
@@ -19,15 +19,14 @@
   "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",
+    "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,6 @@
+import { test } from 'node:test';
+import { deepEqual } from 'node:assert/strict';
 import Ajv from 'ajv';
-import fetch from 'node-fetch';
 import { getJSchema } from '../jschema/jschema-load';
 
 const checkSchemaTypes = [
@@ -9,6 +10,11 @@ const checkSchemaTypes = [
   'earthquake-counts',
   'earthquake-hypocenter-update',
   'earthquake-nankai',
+  'forecast-prefecture',
+  'forecast-warning-possibility',
+  'forecast-season',
+  'forecast-2week-temperature',
+  'forecast-weathermap',
   'tsunami-information',
   'volcano-information',
   'weather-information',
@@ -25,21 +31,24 @@ const ajv = new Ajv({
   strictTuples: false
 });
 
-test.each(checkSchemaTypes)('CheckSchemaType: %s', async schemaType => {
-  const sampleList = await getList(schemaType);
+for (const schemaType of checkSchemaTypes) {
+  test(schemaType, async t => {
+    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);
+    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();
-  }
-});
+      await t.test(url, () => {
+        deepEqual(validate.errors ?? [], []);
+      });
+    }
+  });
+
+}
 
 
 async function getList(schemaType: string) {

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/index.d.ts

@@ -14,6 +14,12 @@ 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 * as ForecastPrefecture from './schema/forecast-prefecture';
+import * as ForecastWarningPossibility from './schema/forecast-warning-possibility';
+import * as ForecastSeason from './schema/forecast-season';
+import * as Forecast2weekTemperature from './schema/forecast-2week-temperature';
+import * as ForecastWeathermap from './schema/forecast-weathermap';
+
 import { TelegramJSONMain } from './main';
 import { Components } from './component';
 
@@ -28,13 +34,18 @@ type All =
   TsunamiInformation.v1_0_0.Main |
   VolcanoInformation.v1_0_0.Main |
   WeatherInformation.v1_0_0.Main |
-  WeatherImpactSociety.v1_0_0.Main |
+  WeatherImpactSociety.v1_0_1.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;
+  WeatherRiverFlood.v1_0_0.Main |
+  ForecastPrefecture.v1_0_0.Main |
+  ForecastWarningPossibility.v1_0_0.Main |
+  ForecastSeason.v1_0_0.Main |
+  Forecast2weekTemperature.v1_0_0.Main |
+  ForecastWeathermap.v1_0_0.Main;
 
 export {
   EarthquakeInformation,
@@ -53,6 +64,11 @@ export {
   WeatherTyphoon,
   WeatherLandslide,
   WeatherRiverFlood,
+  ForecastPrefecture,
+  ForecastWarningPossibility,
+  ForecastSeason,
+  Forecast2weekTemperature,
+  ForecastWeathermap,
   TelegramJSONMain,
   Components,
   All

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;