Skip to content

Commit c24d113

Browse files
azuclaude
azu
and
claude
committed
feat: 型安全性向上とモダンなJavaScript記法の採用
- TypeScriptの厳密な型定義を追加（anyをすべて削除） - String.prototype.matchAllとUnicodeフラグ(/u)を採用 - while文での代入式をfor...ofループに置き換え - 絵文字の正規表現でUnicodeフラグを使用してサロゲートペア対応 - 非null assertion演算子を安全なnullish coalescing演算子に変更 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent e6a6256 commit c24d113

File tree

6 files changed

+78
-66
lines changed

6 files changed

+78
-66
lines changed

‎biome.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
"rules": {
1818
"recommended": true,
1919
"suspicious": {
20-
"noExplicitAny": "warn",
21-
"noImplicitAnyLet": "warn",
22-
"noAssignInExpressions": "warn",
23-
"noMisleadingCharacterClass": "warn"
20+
"noExplicitAny": "error",
21+
"noImplicitAnyLet": "error",
22+
"noAssignInExpressions": "error",
23+
"noMisleadingCharacterClass": "error"
2424
},
2525
"style": {
26-
"noNonNullAssertion": "warn"
26+
"noNonNullAssertion": "error"
2727
},
2828
"correctness": {
29-
"noUnusedVariables": "warn"
29+
"noUnusedVariables": "error"
3030
}
3131
}
3232
},

‎src/rules/ai-tech-writing-guideline.ts‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import type { AnyTxtNode } from "@textlint/ast-node-types";
12
import { matchPatterns } from "@textlint/regexp-string-matcher";
2-
import type { TextlintRuleModule } from "@textlint/types";
3+
import type { TextlintRuleContext, TextlintRuleModule } from "@textlint/types";
34
import { StringSource } from "textlint-util-to-string";
45

56
/**
@@ -9,7 +10,7 @@ import { StringSource } from "textlint-util-to-string";
910
* https://github.com/textlint-ja/textlint-rule-preset-ai-writing/blob/main/docs/tech-writing-guidelines.md
1011
*/
1112

12-
export interface Options {
13+
type Options = {
1314
// If node's text includes allowed patterns, does not report.
1415
// Can be string or RegExp-like string ("/pattern/flags")
1516
allows?: string[];
@@ -21,9 +22,9 @@ export interface Options {
2122
disableStructureGuidance?: boolean;
2223
// Enable document-level analysis
2324
enableDocumentAnalysis?: boolean;
24-
}
25+
};
2526

26-
const rule: TextlintRuleModule<Options> = (context, options = {}) => {
27+
const rule: TextlintRuleModule<Options> = (context: TextlintRuleContext, options = {}) => {
2728
const { Syntax, report, locator } = context;
2829
const allows = options.allows ?? [];
2930
const disableRedundancyGuidance = options.disableRedundancyGuidance ?? false;
@@ -190,8 +191,9 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
190191
* 機械的な段落と箇条書きの組み合わせパターンを検出
191192
* 注意: コロン関連のパターンは no-ai-colon-continuation ルールで処理されます
192193
*/
193-
const detectMechanicalListIntroPattern = (node: any) => {
194-
const children = node.children || [];
194+
const detectMechanicalListIntroPattern = (node: AnyTxtNode) => {
195+
const nodeObj = node as AnyTxtNode & { children?: AnyTxtNode[] };
196+
const children = nodeObj.children || [];
195197

196198
for (let i = 0; i < children.length - 1; i++) {
197199
const currentNode = children[i];
@@ -200,7 +202,7 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
200202
// Paragraph → List のパターンを検出
201203
if (currentNode.type === "Paragraph" && nextNode.type === "List") {
202204
// Paragraphの最後の文字列ノードを取得
203-
const paragraphSource = new StringSource(currentNode, {
205+
const paragraphSource = new StringSource(currentNode as never, {
204206
replacer({ node, emptyValue }) {
205207
if (node.type === "Code" || node.type === "InlineCode") {
206208
return emptyValue();
@@ -217,7 +219,9 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
217219
// 注意: コロンパターンは no-ai-colon-continuation で処理されるため削除
218220

219221
// パターン: 「例えば。」「具体的には。」など、接続表現+句点で終わる段落
220-
if (/(?:例えば|具体的には|詳細には|以下|次に|また)。[\s]*$/.test(paragraphText.trim())) {
222+
const connectivePattern = /(?:例えば|具体的には|詳細には|以下|次に|また)。[\s]*$/;
223+
const connectiveMatch = paragraphText.trim().match(connectivePattern);
224+
if (connectiveMatch) {
221225
isDetected = true;
222226
message =
223227
"【構造化】接続表現と句点で終わる文の直後の箇条書きは機械的な印象を与える可能性があります。「たとえば、次のような点があります。」のような自然な導入文を検討してください。";
@@ -246,7 +250,7 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
246250
/**
247251
* 構造化ガイダンスに関する文書レベルの検出処理
248252
*/
249-
const processDocumentStructureGuidance = (node: any) => {
253+
const processDocumentStructureGuidance = (node: AnyTxtNode) => {
250254
if (disableStructureGuidance) {
251255
return;
252256
}
@@ -265,9 +269,9 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
265269
/**
266270
* 段落内のガイダンスパターンを検出・報告
267271
*/
268-
const processParagraphGuidance = (node: any) => {
272+
const processParagraphGuidance = (node: AnyTxtNode) => {
269273
// StringSourceを使用してコードブロックを除外したテキストを取得
270-
const source = new StringSource(node, {
274+
const source = new StringSource(node as never, {
271275
replacer({ node, emptyValue }) {
272276
// コードブロック、インラインコードを除外
273277
if (node.type === "Code" || node.type === "InlineCode") {
@@ -298,13 +302,13 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
298302
for (const { pattern, message, category } of allGuidancePatterns) {
299303
const matches = text.matchAll(pattern);
300304
for (const match of matches) {
301-
const index = match.index ?? 0;
305+
const index: number = match.index ?? 0;
302306

303307
// プレーンテキストの位置を元のノード内の位置に変換
304308
const originalIndex = source.originalIndexFromIndex(index);
305309
const originalEndIndex = source.originalIndexFromIndex(index + match[0].length);
306310

307-
if (originalIndex !== undefined && originalEndIndex !== undefined) {
311+
if (typeof originalIndex === "number" && typeof originalEndIndex === "number") {
308312
const originalRange = [originalIndex, originalEndIndex] as const;
309313

310314
// カテゴリ別のメトリクスを更新
@@ -323,7 +327,7 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
323327
/**
324328
* 文書全体の品質分析結果を報告
325329
*/
326-
const processDocumentAnalysis = (node: any) => {
330+
const processDocumentAnalysis = (node: AnyTxtNode) => {
327331
// 文書全体の分析を実行（enableDocumentAnalysisがtrueの場合）
328332
if (enableDocumentAnalysis && hasDocumentIssues) {
329333
const totalIssues = Object.values(documentQualityMetrics).reduce((sum, count) => sum + count, 0);

‎src/rules/no-ai-colon-continuation.ts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
import type { AnyTxtNode } from "@textlint/ast-node-types";
12
import { matchPatterns } from "@textlint/regexp-string-matcher";
3+
import type { TextlintRuleContext, TextlintRuleModule } from "@textlint/types";
24
import { tokenize } from "kuromojin";
35
import { StringSource } from "textlint-util-to-string";
46

7+
type Options = {
8+
allows?: string[];
9+
disableCodeBlock?: boolean;
10+
disableList?: boolean;
11+
disableQuote?: boolean;
12+
disableTable?: boolean;
13+
};
14+
515
/**
616
* コロンの直後にブロック要素が続くパターンを検出するルール
717
*
@@ -15,7 +25,7 @@ import { StringSource } from "textlint-util-to-string";
1525
* - 「次のように使用します」
1626
* - 「以下の手順で実行してください」
1727
*/
18-
const rule = (context: any, options: any = {}) => {
28+
const rule: TextlintRuleModule<Options> = (context: TextlintRuleContext, options: Options = {}) => {
1929
const { Syntax, RuleError, report, getSource, locator } = context;
2030
const allows = options.allows ?? [];
2131
const disableCodeBlock = options.disableCodeBlock ?? false;
@@ -25,7 +35,7 @@ const rule = (context: any, options: any = {}) => {
2535

2636
// AST走査で隣接するノードの組み合わせをチェック
2737

28-
const checkColonContinuation = async (paragraphNode: any, nextNode: any) => {
38+
const checkColonContinuation = async (paragraphNode: AnyTxtNode, nextNode: AnyTxtNode) => {
2939
// Paragraphノードのテキストを取得
3040
const paragraphText = getSource(paragraphNode);
3141

@@ -43,7 +53,7 @@ const rule = (context: any, options: any = {}) => {
4353
}
4454

4555
// StringSourceを使ってMarkdownを取り除いたテキストを取得
46-
const stringSource = new StringSource(paragraphNode);
56+
const stringSource = new StringSource(paragraphNode as never);
4757
const plainText = stringSource.toString().trim();
4858

4959
// プレーンテキストでもコロン（半角・全角）で終わっているかチェック
@@ -146,7 +156,7 @@ const rule = (context: any, options: any = {}) => {
146156
};
147157

148158
return {
149-
async [Syntax.Document](node: any) {
159+
async [Syntax.Document](node: AnyTxtNode & { children: AnyTxtNode[] }) {
150160
// ドキュメントの子ノードを順番にチェック
151161
for (const [i, currentNode] of node.children.entries()) {
152162
const nextNode = node.children[i + 1];

‎src/rules/no-ai-emphasis-patterns.ts‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { matchPatterns } from "@textlint/regexp-string-matcher";
2-
import type { TextlintRuleModule } from "@textlint/types";
2+
import type { TextlintRuleContext, TextlintRuleModule } from "@textlint/types";
33

4-
export interface Options {
4+
type Options = {
55
// 指定したパターンにマッチする場合、エラーを報告しません
66
// 文字列または正規表現パターン ("/pattern/flags") で指定可能
77
allows?: string[];
88
// 絵文字と太字の組み合わせパターンの検出を無効にする
99
disableEmojiEmphasisPatterns?: boolean;
1010
// 情報系プレフィックスパターンの検出を無効にする
1111
disableInfoPatterns?: boolean;
12-
}
12+
};
1313

14-
const rule: TextlintRuleModule<Options> = (context, options = {}) => {
14+
const rule: TextlintRuleModule<Options> = (context: TextlintRuleContext, options = {}) => {
1515
const { Syntax, RuleError, report, getSource, locator } = context;
1616
const allows = options.allows ?? [];
1717
const disableEmojiEmphasisPatterns = options.disableEmojiEmphasisPatterns ?? false;
@@ -56,17 +56,17 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
5656
return;
5757
}
5858

59-
const emojiEmphasizeMatches: RegExpExecArray[] = [];
59+
const emojiEmphasizeMatches: RegExpMatchArray[] = [];
6060

6161
// 絵文字 + 太字の組み合わせパターンを検出
6262
if (!disableEmojiEmphasisPatterns) {
63-
// 絵文字の正規表現を修正（サロゲートペア対応）
64-
const emojiEmphasizePattern = /([ℹ️🔍✅❌⚠️💡📝📋📌🔗🎯🚀⭐✨💯🔥📊📈])\s*\*\*([^*]+)\*\*/g;
63+
// 絵文字の正規表現を修正（Unicodeフラグでサロゲートペア対応）
64+
const emojiEmphasizePattern =
65+
/(ℹ️|🔍|✅|❌|⚠️|💡|📝|📋|📌|🔗|🎯|🚀|⭐|✨|💯|🔥|📊|📈)\s*\*\*([^*]+)\*\*/gu;
6566

66-
let match;
67-
while ((match = emojiEmphasizePattern.exec(text)) !== null) {
68-
const matchStart = match.index;
69-
const matchEnd = match.index + match[0].length;
67+
for (const match of text.matchAll(emojiEmphasizePattern)) {
68+
const matchStart = match.index ?? 0;
69+
const matchEnd = matchStart + match[0].length;
7070

7171
emojiEmphasizeMatches.push(match);
7272

@@ -86,16 +86,15 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
8686
if (!disableInfoPatterns) {
8787
const infoPrefixPattern = new RegExp(`\\*\\*(${infoPatterns.join("|")})([：:].*?)?\\*\\*`, "g");
8888

89-
let match;
90-
while ((match = infoPrefixPattern.exec(text)) !== null) {
91-
const matchStart = match.index;
92-
const matchEnd = match.index + match[0].length;
89+
for (const match of text.matchAll(infoPrefixPattern)) {
90+
const matchStart = match.index ?? 0;
91+
const matchEnd = matchStart + match[0].length;
9392
const prefixText = match[1];
9493

9594
// 絵文字+太字のマッチと重複していないかチェック
9695
const isOverlapping = emojiEmphasizeMatches.some((emojiMatch) => {
97-
const emojiStart = emojiMatch.index!;
98-
const emojiEnd = emojiMatch.index! + emojiMatch[0].length;
96+
const emojiStart = emojiMatch.index ?? 0;
97+
const emojiEnd = emojiStart + emojiMatch[0].length;
9998
return matchStart < emojiEnd && matchEnd > emojiStart;
10099
});
101100

@@ -125,16 +124,16 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
125124
}
126125
}
127126

128-
const emojiEmphasizeMatches: RegExpExecArray[] = [];
127+
const emojiEmphasizeMatches: RegExpMatchArray[] = [];
129128

130129
// リストアイテム内での絵文字 + 太字パターンを検出
131130
if (!disableEmojiEmphasisPatterns) {
132-
const emojiEmphasizePattern = /([ℹ️🔍✅❌⚠️💡📝📋📌🔗🎯🚀⭐✨💯🔥📊📈])\s*\*\*([^*]+)\*\*/g;
131+
const emojiEmphasizePattern =
132+
/(ℹ️|🔍|✅|❌|⚠️|💡|📝|📋|📌|🔗|🎯|🚀|⭐|✨|💯|🔥|📊|📈)\s*\*\*([^*]+)\*\*/gu;
133133

134-
let match;
135-
while ((match = emojiEmphasizePattern.exec(text)) !== null) {
136-
const matchStart = match.index;
137-
const matchEnd = match.index + match[0].length;
134+
for (const match of text.matchAll(emojiEmphasizePattern)) {
135+
const matchStart = match.index ?? 0;
136+
const matchEnd = matchStart + match[0].length;
138137

139138
emojiEmphasizeMatches.push(match);
140139

@@ -154,16 +153,15 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
154153
if (!disableInfoPatterns) {
155154
const infoPrefixPattern = new RegExp(`\\*\\*(${infoPatterns.join("|")})([：:].*?)?\\*\\*`, "g");
156155

157-
let match;
158-
while ((match = infoPrefixPattern.exec(text)) !== null) {
159-
const matchStart = match.index;
160-
const matchEnd = match.index + match[0].length;
156+
for (const match of text.matchAll(infoPrefixPattern)) {
157+
const matchStart = match.index ?? 0;
158+
const matchEnd = matchStart + match[0].length;
161159
const prefixText = match[1];
162160

163161
// 絵文字+太字のマッチと重複していないかチェック
164162
const isOverlapping = emojiEmphasizeMatches.some((emojiMatch) => {
165-
const emojiStart = emojiMatch.index!;
166-
const emojiEnd = emojiMatch.index! + emojiMatch[0].length;
163+
const emojiStart = emojiMatch.index ?? 0;
164+
const emojiEnd = emojiStart + emojiMatch[0].length;
167165
return matchStart < emojiEnd && matchEnd > emojiStart;
168166
});
169167

‎src/rules/no-ai-hype-expressions.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { matchPatterns } from "@textlint/regexp-string-matcher";
2-
import type { TextlintRuleModule } from "@textlint/types";
2+
import type { TextlintRuleContext, TextlintRuleModule } from "@textlint/types";
33

4-
export interface Options {
4+
type Options = {
55
// If node's text includes allowed patterns, does not report.
66
// Can be string or RegExp-like string ("/pattern/flags")
77
allows?: string[];
88
// Disable specific categories of hype expressions
99
disableAbsolutenessPatterns?: boolean;
1010
disableAbstractPatterns?: boolean;
1111
disabledPredictivePatterns?: boolean;
12-
}
12+
};
1313

14-
const rule: TextlintRuleModule<Options> = (context, options = {}) => {
14+
const rule: TextlintRuleModule<Options> = (context: TextlintRuleContext, options = {}) => {
1515
const { Syntax, RuleError, report, getSource, locator } = context;
1616
const allows = options.allows ?? [];
1717
const disableAbsolutenessPatterns = options.disableAbsolutenessPatterns ?? false;
@@ -176,7 +176,7 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
176176
for (const { pattern, message } of patterns) {
177177
const matches = text.matchAll(pattern);
178178
for (const match of matches) {
179-
const index = match.index ?? 0;
179+
const index: number = match.index ?? 0;
180180
const matchRange = [index, index + match[0].length] as const;
181181
const ruleError = new RuleError(message, {
182182
padding: locator.range(matchRange)

‎src/rules/no-ai-list-formatting.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { matchPatterns } from "@textlint/regexp-string-matcher";
2-
import type { TextlintRuleModule } from "@textlint/types";
2+
import type { TextlintRuleContext, TextlintRuleModule } from "@textlint/types";
33

4-
export interface Options {
4+
type Options = {
55
// If node's text includes allowed patterns, does not report.
66
// Can be string or RegExp-like string ("/pattern/flags")
77
allows?: string[];
88
// Disable specific pattern checks
99
disableBoldListItems?: boolean;
1010
disableEmojiListItems?: boolean;
11-
}
11+
};
1212

13-
const rule: TextlintRuleModule<Options> = (context, options = {}) => {
13+
const rule: TextlintRuleModule<Options> = (context: TextlintRuleContext, options = {}) => {
1414
const { Syntax, RuleError, report, getSource, locator } = context;
1515
const allows = options.allows ?? [];
1616
const disableBoldListItems = options.disableBoldListItems ?? false;
@@ -80,9 +80,9 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
8080
// Check for bold list item pattern: - **text**: description
8181
if (!disableBoldListItems) {
8282
const boldListPattern = /^[\s]*[-*+]\s+\*\*([^*]+)\*\*\s*:/;
83-
const boldMatch = text.match(boldListPattern);
83+
const boldMatch: RegExpMatchArray | null = text.match(boldListPattern);
8484
if (boldMatch) {
85-
const matchStart = boldMatch.index ?? 0;
85+
const matchStart: number = boldMatch.index ?? 0;
8686
const matchEnd = matchStart + boldMatch[0].length;
8787
const matchRange = [matchStart, matchEnd] as const;
8888
const ruleError = new RuleError(
@@ -97,10 +97,10 @@ const rule: TextlintRuleModule<Options> = (context, options = {}) => {
9797

9898
// Check for emoji list items
9999
if (!disableEmojiListItems) {
100-
const emojiMatch = text.match(flashyEmojiPattern);
100+
const emojiMatch: RegExpMatchArray | null = text.match(flashyEmojiPattern);
101101
if (emojiMatch) {
102102
const emoji = emojiMatch[0];
103-
const emojiIndex = emojiMatch.index ?? 0;
103+
const emojiIndex: number = emojiMatch.index ?? 0;
104104
const matchRange = [emojiIndex, emojiIndex + emoji.length] as const;
105105
const ruleError = new RuleError(
106106
`リストアイテムでの絵文字「${emoji}」の使用は、読み手によっては機械的な印象を与える場合があります。テキストベースの表現も検討してみてください。`,

0 commit comments

Comments
 (0)