Merge pull request #337 from SaekiTominaga/tsconfig/verbatim-module-s…

…yntax TypeScript の `verbatimModuleSyntax` オプションの有効化
SaekiTominaga · Jul 9, 2023 · 155f74f · 155f74f
2 parents 7b12627 + 5056cc2
commit 155f74f
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 67 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
 		"@w0s/eslint-config": "^3.0.0",
 		"@w0s/markuplint-config": "^2.5.0",
 		"@w0s/stylelint-config": "^1.2.0",
-		"@w0s/tsconfig": "^1.0.1",
+		"@w0s/tsconfig": "^1.2.0",
 		"ajv-cli": "^5.0.0",
 		"brotlin": "^1.1.0",
 		"cross-env": "^7.0.3",

diff --git a/packages/backend/node/src/ControllerInterface.ts b/packages/backend/node/src/ControllerInterface.ts
@@ -1,4 +1,4 @@
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 
 export default interface ControllerInterface {
 	/**

diff --git a/packages/backend/node/src/app.ts b/packages/backend/node/src/app.ts
@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import compression from 'compression';
-import express, { NextFunction, Request, Response } from 'express';
+import express, { type NextFunction, type Request, type Response } from 'express';
 import Log4js from 'log4js';
 import qs from 'qs';
 import AkamatsuGenerator from './controller/AkamatsuGenerator.js';
@@ -15,7 +15,7 @@ import CrawlerResourceLogController from './controller/CrawlerResourceLogControl
 import HttpBasicAuth from './util/HttpBasicAuth.js';
 import HttpResponse from './util/HttpResponse.js';
 import TokyuCarHistoryController from './controller/TokyuCarHistoryController.js';
-import { W0SJp as Configure } from '../../configure/type/common.js';
+import type { W0SJp as Configure } from '../../configure/type/common.js';
 
 /* 設定ファイル読み込み */
 const config = <Configure>JSON.parse(await fs.promises.readFile('configure/common.json', 'utf8'));

diff --git a/packages/backend/node/src/controller/AkamatsuGenerator.ts b/packages/backend/node/src/controller/AkamatsuGenerator.ts
@@ -3,16 +3,16 @@ import path from 'node:path';
 import ejs from 'ejs';
 import Sharp from 'sharp';
 import StringEscapeHtml from '@saekitominaga/string-escape-html';
-import { Request, Response } from 'express';
-import { Result as ValidationResult, ValidationError } from 'express-validator';
+import type { Request, Response } from 'express';
+import type { Result as ValidationResult, ValidationError } from 'express-validator';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import AkamatsuGeneratorValidator from '../validator/AkamatsuGeneratorValidator.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/akamatsu-generator.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/akamatsu-generator.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * 赤松健セリフジェネレーター

diff --git a/packages/backend/node/src/controller/ContactCompletedController.ts b/packages/backend/node/src/controller/ContactCompletedController.ts
@@ -1,13 +1,13 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import ContactValidator from '../validator/ContactValidator.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/contact.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/contact.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * 問い合わせ・完了

diff --git a/packages/backend/node/src/controller/ContactInputController.ts b/packages/backend/node/src/controller/ContactInputController.ts
@@ -1,11 +1,11 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
-import { NoName as Configure } from '../../../configure/type/contact.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type ControllerInterface from '../ControllerInterface.js';
+import type { NoName as Configure } from '../../../configure/type/contact.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * 問い合わせ・入力

diff --git a/packages/backend/node/src/controller/ContactSendController.ts b/packages/backend/node/src/controller/ContactSendController.ts
@@ -1,16 +1,16 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
 import nodemailer from 'nodemailer';
-import { Request, Response } from 'express';
-import { Result as ValidationResult, ValidationError } from 'express-validator';
+import type { Request, Response } from 'express';
+import type { Result as ValidationResult, ValidationError } from 'express-validator';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import ContactValidator from '../validator/ContactValidator.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/contact.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/contact.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * 問い合わせ・送信

diff --git a/packages/backend/node/src/controller/CrawlerNewsController.ts b/packages/backend/node/src/controller/CrawlerNewsController.ts
@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import CrawlerNewsDao from '../dao/CrawlerNewsDao.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/crawler-news.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/crawler-news.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * ウェブ巡回（ニュース）

diff --git a/packages/backend/node/src/controller/CrawlerNewsDataController.ts b/packages/backend/node/src/controller/CrawlerNewsDataController.ts
@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import CrawlerNewsDataDao from '../dao/CrawlerNewsDataDao.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/crawler-news.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/crawler-news.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * ウェブ巡回（ニュース）

diff --git a/packages/backend/node/src/controller/CrawlerResourceController.ts b/packages/backend/node/src/controller/CrawlerResourceController.ts
@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import CrawlerResourceDao from '../dao/CrawlerResourceDao.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/crawler-resource.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/crawler-resource.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * ウェブ巡回（リソース）

diff --git a/packages/backend/node/src/controller/CrawlerResourceLogController.ts b/packages/backend/node/src/controller/CrawlerResourceLogController.ts
@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import * as Diff from 'diff';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import HttpResponse from '../util/HttpResponse.js';
 import RequestUtil from '../util/RequestUtil.js';
-import { NoName as Configure } from '../../../configure/type/crawler-resource.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/crawler-resource.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * ウェブ巡回（リソース・ログ表示）

diff --git a/packages/backend/node/src/controller/TokyuCarHistoryController.ts b/packages/backend/node/src/controller/TokyuCarHistoryController.ts
@@ -1,16 +1,16 @@
 import fs from 'node:fs';
 import dayjs from 'dayjs';
 import ejs from 'ejs';
-import { Request, Response } from 'express';
-import { Result as ValidationResult, ValidationError } from 'express-validator';
+import type { Request, Response } from 'express';
+import type { Result as ValidationResult, ValidationError } from 'express-validator';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import Controller from '../Controller.js';
-import ControllerInterface from '../ControllerInterface.js';
+import type ControllerInterface from '../ControllerInterface.js';
 import RequestUtil from '../util/RequestUtil.js';
 import TokyuCarHistoryDao from '../dao/TokyuCarHistoryDao.js';
 import TokyuCarHistoryValidator from '../validator/TokyuCarHistoryValidator.js';
-import { NoName as Configure } from '../../../configure/type/tokyu-car-history.js';
-import { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
+import type { NoName as Configure } from '../../../configure/type/tokyu-car-history.js';
+import type { W0SJp as ConfigureCommon } from '../../../configure/type/common.js';
 
 /**
  * 東急電車形態研究・車歴表

diff --git a/packages/backend/node/src/util/HttpBasicAuth.ts b/packages/backend/node/src/util/HttpBasicAuth.ts
@@ -1,7 +1,7 @@
 import basicAuth from 'basic-auth';
 // @ts-expect-error: ts(7016)
 import htpasswd from 'htpasswd-js';
-import { Request } from 'express';
+import type { Request } from 'express';
 
 export interface Credentials {
 	username: string;

diff --git a/packages/backend/node/src/util/HttpResponse.ts b/packages/backend/node/src/util/HttpResponse.ts
@@ -1,7 +1,7 @@
 import path from 'node:path';
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 import StringEscapeHtml from '@saekitominaga/string-escape-html';
-import { W0SJp as Configure } from '../../../configure/type/common.js';
+import type { W0SJp as Configure } from '../../../configure/type/common.js';
 
 type HttpAuthType = 'Basic' | 'Bearer' | 'Digest' | 'HOBA' | 'Mutual' | 'Negotiate' | 'OAuth' | 'SCRAM-SHA-1' | 'SCRAM-SHA-256' | 'vapid';
 

diff --git a/packages/backend/node/src/validator/AkamatsuGeneratorValidator.ts b/packages/backend/node/src/validator/AkamatsuGeneratorValidator.ts
@@ -1,6 +1,6 @@
-import { body, Result, ValidationError, validationResult } from 'express-validator';
-import { Request } from 'express';
-import { NoName as Configure } from '../../../configure/type/akamatsu-generator.js';
+import { body, Result, type ValidationError, validationResult } from 'express-validator';
+import type { Request } from 'express';
+import type { NoName as Configure } from '../../../configure/type/akamatsu-generator.js';
 
 /**
  * 赤松健セリフジェネレーター

diff --git a/packages/backend/node/src/validator/ContactValidator.ts b/packages/backend/node/src/validator/ContactValidator.ts
@@ -1,6 +1,6 @@
-import { body, query, Result, ValidationError, validationResult } from 'express-validator';
-import { Request } from 'express';
-import { NoName as Configure } from '../../../configure/type/contact.js';
+import { body, query, Result, type ValidationError, validationResult } from 'express-validator';
+import type { Request } from 'express';
+import type { NoName as Configure } from '../../../configure/type/contact.js';
 
 /**
  * 問い合わせ

diff --git a/packages/backend/node/src/validator/TokyuCarHistoryValidator.ts b/packages/backend/node/src/validator/TokyuCarHistoryValidator.ts
@@ -1,6 +1,6 @@
-import { query, Result, ValidationError, validationResult } from 'express-validator';
-import { Request } from 'express';
-import { NoName as Configure } from '../../../configure/type/tokyu-car-history.js';
+import { query, Result, type ValidationError, validationResult } from 'express-validator';
+import type { Request } from 'express';
+import type { NoName as Configure } from '../../../configure/type/tokyu-car-history.js';
 
 /**
  * 東急電車形態研究・車歴表

diff --git a/packages/frontend/node/src/BuildComponent.ts b/packages/frontend/node/src/BuildComponent.ts
@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-import { NoName as Configure } from '../../configure/type/build.js';
+import type { NoName as Configure } from '../../configure/type/build.js';
 
 export default class BuildComponent {
 	protected readonly config: Configure; // Configure

diff --git a/packages/frontend/node/src/build.ts b/packages/frontend/node/src/build.ts
@@ -1,4 +1,4 @@
-import Component from './BuildComponentInterface.js';
+import type Component from './BuildComponentInterface.js';
 
 /* コンポーネント */
 const COMPONENT_DIR = './build'; // 格納ディレクトリ

diff --git a/packages/frontend/node/src/build/Css.ts b/packages/frontend/node/src/build/Css.ts
@@ -4,7 +4,7 @@ import prettier from 'prettier';
 import slash from 'slash';
 import { globby } from 'globby';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 import PrettierUtil from '../util/PrettierUtil.js';
 
 /**

diff --git a/packages/frontend/node/src/build/Feed.ts b/packages/frontend/node/src/build/Feed.ts
@@ -6,7 +6,7 @@ import jsdom from 'jsdom';
 import prettier from 'prettier';
 import xmlFormat from 'xml-formatter';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 import PrettierUtil from '../util/PrettierUtil.js';
 
 /**

diff --git a/packages/frontend/node/src/build/Html.ts b/packages/frontend/node/src/build/Html.ts
@@ -7,7 +7,7 @@ import { globby } from 'globby';
 import { JSDOM } from 'jsdom';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 import HtmlComponentAnchorAmazonAssociate from './component/HtmlAnchorAmazonAssociate.js';
 import HtmlComponentAnchorIcon from './component/HtmlAnchorIcon.js';
 import HtmlComponentBook from './component/HtmlBook.js';

diff --git a/packages/frontend/node/src/build/HtmlImageSize.ts b/packages/frontend/node/src/build/HtmlImageSize.ts
@@ -4,7 +4,7 @@ import { globby } from 'globby';
 import { imageSize } from 'image-size';
 import { JSDOM } from 'jsdom';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 
 /**
  * HTML 中の <img> 要素の width, height 属性値が実際の画像サイズと一致しているかどうかチェックする

diff --git a/packages/frontend/node/src/build/Sitemap.ts b/packages/frontend/node/src/build/Sitemap.ts
@@ -6,7 +6,7 @@ import { globby } from 'globby';
 import xmlFormat from 'xml-formatter';
 import HtmlStructuredData from '@w0s.jp/util/dist/HtmlStructuredData.js';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 import PageUrl from '../util/PageUrl.js';
 
 /**

diff --git a/packages/frontend/node/src/build/Svg.ts b/packages/frontend/node/src/build/Svg.ts
@@ -3,7 +3,7 @@ import path from 'node:path';
 import slash from 'slash';
 import { loadConfig, optimize } from 'svgo';
 import BuildComponent from '../BuildComponent.js';
-import BuildComponentInterface from '../BuildComponentInterface.js';
+import type BuildComponentInterface from '../BuildComponentInterface.js';
 
 /**
  * SVG ビルド