chaffjs 0.18.0 → 0.19.0

package/README.md

@@ -1,23 +1,44 @@
 # chaff
 
-文章の読みにくいところを見つける道具。**文章は書き換えません。** 直すのは書いた人です。
+chaff は、文書の読みにくいところと、機械で確かめられる誤りを見つける道具です。日本語と英語の文書を読み、同じ文章なら何度かけても同じ結果を出します。
+文章は書き換えません。直すのは書いた人です。
+`lint` が布の繊維くずを名前にしているのと同じで、`chaff` は籾殻です。取り除くべきものの名を負っています。
 
-`lint` が布の繊維くずを名前にしているのと同じで、`chaff` は籾殻。取り除くべきものの名を負っています。
+インストールも、AI の利用登録も、言語の指定も要りません。
 
 ```bash
 npx chaffjs article.md
 ```
 
-インストールも、AI の利用登録も、言語の指定も要りません。
+```
+─── 5 行目 ───────────────────────────────────────────────────
+
+    キャッシュの仕組みについて説明します。
 
-> chaff finds what makes writing hard to read — in Japanese and English — and never rewrites the text. On an
-> English document it speaks English. Pick the kind of document (`--genre legal/contract`, `docs/manual`,
-> `academic/paper`, …) and it checks it the way that kind is written. Guide, genres and rule reference:
-> https://isamu.github.io/lab/en/
+  ⚠  見出しの繰り返し
+
+     見出し「キャッシュの仕組み」を直後の文がほぼそのまま繰り返しています
+     見出しで言ったことを次の文が繰り返すと、読者はそこで何も受け取れません。
+
+     → 見出しが約束したことの中身から書き始めてください。
+
+     このルールをゆるめる:  npx chaff relax heading-echo
+```
+
+指摘は 1 件につき 4 つ、引いた文、何が起きているか、なぜ読みにくいか、どう直すかの順に出ます。誤字脱字ではなく、文章の組み立てを見ます。たとえば次のようなところです。
+
+- 一文が長すぎて、読んでいるうちに主語を見失う
+- 太字が多すぎて、どこも目立たなくなっている
+- 見出しと同じことを、その直後の文が繰り返している
+- 「近年、〜が注目されています」など、どの記事にも当てはまる書き出し
+- 「いかがでしたか」で終わる、読者に何も残さない結び
+
+画面は文書の言語で出るので、英語の文書には英語で返ってきます。
 
 ## 文書の種類を選ぶ
 
-契約書・法令・マニュアル・論文・小説・発言録は、それぞれの書き方で書かれます。種類（ジャンル）を選ぶと、その書き方に合わせて見ます。設定は要りません。
+契約書、法令、マニュアル、論文、小説、発言録は、それぞれの書き方で書かれます。種類（ジャンル）を選ぶと、設定を書かずにその書き方に合わせて見ます。
+決めていない文書が別の種類に見えるときは、「契約書・規約のようです。--genre legal/contract を試せます」と画面が教えます。
 
 ```bash
 npx chaffjs --genre legal/contract 契約書.md    この実行だけ、契約書として見る
@@ -36,73 +57,48 @@ npx chaffjs genres                              ジャンルの一覧と、そ
 | 文学 | `literature/fiction` `literature/essay` `literature/poetry` `literature/play` |
 | 話し言葉 | `speech/address` `speech/transcript` |
 
-ジャンルを決めていない文書が別の種類に見えるときは、画面がそう言います（「契約書・規約のようです。--genre legal/contract を試せます」）。
-
-## 何を見つけるか
+## 指摘されたら
 
-誤字脱字ではなく、文章の組み立てを見ます。
-
-```
-一文が長すぎて、読んでいるうちに主語を見失う
-太字が多すぎて、どこも目立たなくなっている
-見出しと同じことを、その直後の文が繰り返している
-「近年、〜が注目されています」など、どの記事にも当てはまる書き出し
-「いかがでしたか」で終わる、読者に何も残さない結び
-```
+応じ方は 3 つです。指摘がもっともなら文章を直します。指摘は正しいがそこは意図して書いたのなら、`<!-- stet: rule-id — 理由 -->` でその箇所だけ黙らせます。
+自分たちの方針に合わないなら、`npx chaffjs relax rule-id --why "理由"` でルールのほうを変えます。
+強さは `strict` `normal` `relaxed` `off` の 4 語から選び、足りなければ上限を数で書けます（`max-sentence-length: 260`）。
 
-## 指摘のされかた
-
-1 件につき「引用 / 何が起きているか / なぜ問題か / どう直すか」の 4 つが出ます。
-
-```
-─── 41 行目 ──────────────────────────────
-
-    ここで **重要** なのは **TTL** と **整合性** です。
-
-  ⚠  太字の使いすぎ
-
-     このセクションに太字が 6 箇所あります（2 箇所まで）
-     太字は読者の目を止める道具です。多用すると、どこも目立たなくなります。
-
-     → 本当に強調したい 1〜2 箇所だけ残して、ほかは普通の文にしてください
-
-     このルールをゆるめる:  npx chaffjs relax bold-density
-```
-
-## 指摘されたら、道は 3 つ
-
-| 道 | どんなとき | やること |
-| --- | --- | --- |
-| 直す | 指摘がもっともなとき | 文章を書き直す |
-| この箇所だけ黙らせる | 指摘は正しいが、ここは意図的なとき | `<!-- stet: rule-id — 理由 -->` |
-| ルールを変える | 自分たちの方針に合わないとき | `npx chaffjs relax rule-id --why "理由"` |
-
-## 主なコマンド
+## ほかにできること
 
 ```bash
 npx chaffjs .                     この場所の Markdown を全部
 npx chaffjs article.md --watch    保存のたびに、変わったところだけ出す
-npx chaffjs init                  chaff.yaml を作る（端末ならジャンルを尋ねる）
 npx chaffjs explain bold-density  ルールの意図と根拠を読む
 npx chaffjs baseline docs/        既にある指摘を棚上げする
 npx chaffjs suppressions docs/    stet で黙らせている指摘を数える
 npx chaffjs rules --json          いまの設定を JSON で出す（AI に渡す用）
 npx chaffjs tree contract.txt     文書を番地の付いた木にする（条・項・定義・参照）
 npx chaffjs cite 原文 引用.json   引用が原文にあるかを確かめる
+npx chaffjs fix-plan 前.md        指摘をルールごとにまとめ、直す方向と確かめのコマンドを付けた「直す計画」を出す
+npx chaffjs facts 前.md           compare が照合する事実を一覧にする（書き直す前の控え）
+npx chaffjs outline 前.md 後.md   見出しの構成と形（見出しの数・節の平均・箇条書きの割合・太字）を前と後で並べる
+npx chaffjs compare 前.md 後.md   書き換えで事実（数・日付・URL・名前など）が落ちても足されてもいないかを確かめる
 npx chaffjs skill                 Claude Code の skill を入れる（--global でホームに）
 ```
 
-設定は `strict` / `normal` / `relaxed` / `off` の 4 語から選びます。それで足りないときは上限を数で書けます（`max-sentence-length: 260`）。
+言語のアダプタ（`@chaffjs/lang-ja` と `@chaffjs/lang-en`）は同梱しているので、別に入れる必要はありません。
+新しい言語のアダプタは誰でも出せます。公式は `@chaffjs/lang-<言語>`、第三者は `chaff-lang-<言語>` と名乗ります。
+`@typescript-eslint/*` と `eslint-plugin-*` の関係と同じで、chaff は公式、第三者の順に探して読みます。
 
-## 言語
+ルールは Node の関数でも書けます。一つのチームのルールは `chaff.yaml` の `custom_rules` に `type: module` で、いくつものチームで使うものはプラグインのパッケージ `chaff-plugin-<名前>` にまとめます。
+型と `defineRule` / `definePlugin` は `chaffjs/api` から読み込みます。プラグインのルールは `<名前>/<ルール>` と呼ばれ、chaff のルールと同じに `explain`・`relax`・`stet`・SARIF で扱えます。
+読み込むとそのコードが動くので、信頼できるものだけを入れてください。作り方は手引きの「[プラグインを作る](https://isamu.github.io/lab/ja/guide/writing-plugins/)」にあります。
 
-日本語と英語。言語は本文から自動で判定し、指摘の画面もその言語で出ます。アダプタ（`@chaffjs/lang-ja` / `@chaffjs/lang-en`）は同梱されているので、別に入れる必要はありません。
+## ドキュメント
 
-新しい言語のアダプタは誰でも出せます。公式は `@chaffjs/lang-<言語>`、第三者は `chaff-lang-<言語>` と名乗ってください（`@typescript-eslint/*` と `eslint-plugin-*` の関係と同じです）。chaff は公式、第三者の順に探して読みます。
+手引きとルールの一覧は [日本語のサイト](https://isamu.github.io/lab/ja/) と [英語のサイト](https://isamu.github.io/lab/en/) にあります。
+ソースは https://github.com/isamu/lab/tree/main/text です。
 
-## ドキュメント
+## In English
 
-- 手引きとルールの一覧: https://isamu.github.io/lab/ja/ （English: https://isamu.github.io/lab/en/）
-- リポジトリ: https://github.com/isamu/lab/tree/main/text
+chaff finds what makes writing hard to read, in Japanese and English, and never rewrites the text. On an English
+document it speaks English. Pick the kind of document (`--genre legal/contract`, `docs/manual`, `academic/paper`, …)
+and it checks it the way that kind is written. The guide, the genres and the reference of every rule are at
+https://isamu.github.io/lab/en/
 
 MIT

package/bin/chaff.js

@@ -1,4 +1,19 @@
 #!/usr/bin/env node
-import { main } from "../dist/cli.js";
+// On an old Node.js the CLI fails while it loads, with a SyntaxError that does not name the version. Check first,
+// with what Node.js 12 already reads: no top-level await, no "node:" imports.
+import { readFileSync } from "fs";
+import { tooOldMessage } from "../dist/node-version.js";
 
-process.exitCode = await main(process.argv.slice(2));
+const run = async () => {
+  const { main } = await import("../dist/cli.js");
+  process.exitCode = await main(process.argv.slice(2));
+};
+
+const manifest = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+const tooOld = tooOldMessage(process.versions.node, manifest.engines.node, process.env);
+if (tooOld === undefined) {
+  void run();
+} else {
+  console.error(tooOld);
+  process.exitCode = 1;
+}

package/dist/acronym-expansions.d.ts

@@ -0,0 +1,26 @@
+/** 本文の一続き（文）。start は文書の中の位置。 */
+export type ExpansionText = {
+    readonly start: number;
+    readonly text: string;
+};
+export type Expansion = {
+    readonly acronym: string;
+    readonly name: string;
+    readonly offset: number;
+};
+/**
+ * 括弧の前の語のうち、頭文字がちょうど略語になる最も短い並び（the Federal Open Market Committee (FOMC) なら
+ * Federal Open Market Committee）。頭文字の揃う並びが無ければ、展開ではない（(see Table 2) や (FOMC) の前の文）。
+ */
+export declare const nameBefore: (text: string, acronym: string) => string | undefined;
+/** 文の中の略語の展開。両方の形を、文書の中の位置の順に。 */
+export declare const expansionsIn: (body: ExpansionText) => Expansion[];
+/** 比べる形。大文字小文字、ハイフンと空白、& と and、語の終わりの複数の s は名前を変えない。 */
+export declare const comparableName: (name: string) => string;
+export type ExpansionConflict = {
+    readonly expansion: Expansion;
+    readonly first: Expansion;
+};
+/** 同じ略語の、最初の展開と違う展開。違う書き方ごとに最初の一つだけ。 */
+export declare const expansionConflicts: (expansions: readonly Expansion[]) => ExpansionConflict[];
+//# sourceMappingURL=acronym-expansions.d.ts.map

package/dist/acronym-expansions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acronym-expansions.d.ts","sourceRoot":"","sources":["../src/acronym-expansions.ts"],"names":[],"mappings":"AAIA,gCAAgC;AAChC,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AA4BrG;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,SAAS,MAAM,KAAG,MAAM,GAAG,SAWnE,CAAC;AAcF,kCAAkC;AAClC,eAAO,MAAM,YAAY,GAAI,MAAM,aAAa,KAAG,SAAS,EAY3D,CAAC;AAEF,wDAAwD;AACxD,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,MAMM,CAAC;AAErD,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAE7F,wCAAwC;AACxC,eAAO,MAAM,kBAAkB,GAAI,YAAY,SAAS,SAAS,EAAE,KAAG,iBAAiB,EActF,CAAC"}

package/dist/acronym-expansions.js

@@ -0,0 +1,88 @@
+import { namesAcronym } from "./detectors/acronym-expansion.js";
+const ACRONYM = String.raw `[A-Z][A-Z0-9&]*[A-Z]`;
+const QUOTE = String.raw `["“”'‘’「」]?`;
+/** 名前のあとに括弧で略語（Service Level Agreement (SLA)、(the "SLA")）。 */
+const NAME_FIRST = new RegExp(String.raw `[(（]\s*(?:the\s+)?${QUOTE}(?<acronym>${ACRONYM})${QUOTE}\s*[)）]`, "gu");
+/** 略語のあとに括弧で名前（SLA (Service Level Agreement)、CI（継続的インテグレーション））。 */
+const ACRONYM_FIRST = new RegExp(String.raw `(?<![\p{Script=Latin}\p{N}])(?<acronym>${ACRONYM})\s?[(（](?<name>[^()（）\n]{2,60})[)）]`, "gu");
+/** 頭文字に数えない短い語（Department of Defense の of）。 */
+const SMALL_WORDS = new Set(["of", "and", "the", "for", "to", "in", "on", "a", "an", "&", "de", "by", "with"]);
+const wordsBefore = (text) => text
+    .replaceAll(/["“”'‘’]/gu, "")
+    .trim()
+    .split(/\s+/u)
+    .filter((word) => word !== "");
+const initialsOf = (words) => words
+    .filter((word) => !SMALL_WORDS.has(word.toLowerCase()))
+    .flatMap((word) => word.split("-"))
+    .map((word) => word.charAt(0))
+    .join("")
+    .toUpperCase();
+/**
+ * 括弧の前の語のうち、頭文字がちょうど略語になる最も短い並び（the Federal Open Market Committee (FOMC) なら
+ * Federal Open Market Committee）。頭文字の揃う並びが無ければ、展開ではない（(see Table 2) や (FOMC) の前の文）。
+ */
+export const nameBefore = (text, acronym) => {
+    const words = wordsBefore(text).slice(-acronym.length * 2 - 2);
+    const letters = acronym.replaceAll("&", "");
+    const width = words.findIndex((_word, index) => initialsOf(words.slice(-(index + 1))) === letters);
+    if (width < 0)
+        return undefined;
+    const name = words.slice(-(width + 1));
+    const start = name.findIndex((word) => !SMALL_WORDS.has(word.toLowerCase()));
+    return name
+        .slice(start)
+        .join(" ")
+        .replace(/[,;:]$/u, "");
+};
+const NON_LATIN_NAME = /^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}ー・\s\p{L}\p{N}-]+$/u;
+const HAS_KANA_OR_KANJI = /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}]/u;
+/** 括弧の中の定義の語や文（以下「CI」という。、読点のある説明）は、名前ではない。 */
+const NOT_A_NAME = /以下|という|[、。,;:]/u;
+/** 略語のあとの括弧の中が、その略語の名前か。英字の名前は頭文字が揃うとき、日本語の名前は語だけのとき。 */
+const isNameAfter = (name, acronym) => {
+    if (NOT_A_NAME.test(name))
+        return false;
+    if (HAS_KANA_OR_KANJI.test(name))
+        return NON_LATIN_NAME.test(name);
+    return namesAcronym(name, acronym);
+};
+/** 文の中の略語の展開。両方の形を、文書の中の位置の順に。 */
+export const expansionsIn = (body) => {
+    const nameFirst = [...body.text.matchAll(NAME_FIRST)].flatMap((match) => {
+        const acronym = match.groups?.["acronym"] ?? "";
+        const name = nameBefore(body.text.slice(0, match.index), acronym);
+        return name === undefined ? [] : [{ acronym, name, offset: body.start + match.index }];
+    });
+    const acronymFirst = [...body.text.matchAll(ACRONYM_FIRST)].flatMap((match) => {
+        const acronym = match.groups?.["acronym"] ?? "";
+        const name = (match.groups?.["name"] ?? "").trim();
+        return isNameAfter(name, acronym) ? [{ acronym, name, offset: body.start + match.index }] : [];
+    });
+    return [...nameFirst, ...acronymFirst].toSorted((left, right) => left.offset - right.offset);
+};
+/** 比べる形。大文字小文字、ハイフンと空白、& と and、語の終わりの複数の s は名前を変えない。 */
+export const comparableName = (name) => name
+    .toLowerCase()
+    .replaceAll("&", " and ")
+    .replaceAll(/[-‐‑\s]+/gu, " ")
+    .trim()
+    .replaceAll(/(?<=\p{Script=Latin}{3})s\b/gu, "");
+/** 同じ略語の、最初の展開と違う展開。違う書き方ごとに最初の一つだけ。 */
+export const expansionConflicts = (expansions) => {
+    const firsts = new Map();
+    const reported = new Set();
+    return expansions.flatMap((expansion) => {
+        const first = firsts.get(expansion.acronym);
+        if (first === undefined) {
+            firsts.set(expansion.acronym, expansion);
+            return [];
+        }
+        const variant = `${expansion.acronym}\u0000${comparableName(expansion.name)}`;
+        if (comparableName(first.name) === comparableName(expansion.name) || reported.has(variant))
+            return [];
+        reported.add(variant);
+        return [{ expansion, first }];
+    });
+};
+//# sourceMappingURL=acronym-expansions.js.map

package/dist/acronym-expansions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acronym-expansions.js","sourceRoot":"","sources":["../src/acronym-expansions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAShE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA,sBAAsB,CAAC;AACjD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAA,aAAa,CAAC;AAEtC,8DAA8D;AAC9D,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,qBAAqB,KAAK,cAAc,OAAO,IAAI,KAAK,SAAS,EAAE,IAAI,CAAC,CAAC;AACjH,mEAAmE;AACnE,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,0CAA0C,OAAO,sCAAsC,EAAE,IAAI,CAAC,CAAC;AAE1I,+CAA+C;AAC/C,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpI,MAAM,WAAW,GAAG,CAAC,IAAY,EAAY,EAAE,CAC7C,IAAI;KACD,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;KAC5B,IAAI,EAAE;KACN,KAAK,CAAC,MAAM,CAAC;KACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;AAEnC,MAAM,UAAU,GAAG,CAAC,KAAwB,EAAU,EAAE,CACtD,KAAK;KACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;KACtD,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAClC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;KAC7B,IAAI,CAAC,EAAE,CAAC;KACR,WAAW,EAAE,CAAC;AAEnB;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,OAAe,EAAsB,EAAE;IAC9E,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC;IACnG,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAChC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,IAAI;SACR,KAAK,CAAC,KAAK,CAAC;SACZ,IAAI,CAAC,GAAG,CAAC;SACT,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,2EAA2E,CAAC;AACnG,MAAM,iBAAiB,GAAG,yDAAyD,CAAC;AACpF,+CAA+C;AAC/C,MAAM,UAAU,GAAG,iBAAiB,CAAC;AAErC,yDAAyD;AACzD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,OAAe,EAAW,EAAE;IAC7D,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnE,OAAO,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,kCAAkC;AAClC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAmB,EAAe,EAAE;IAC/D,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACtE,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAClE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACzF,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;AAC/F,CAAC,CAAC;AAEF,wDAAwD;AACxD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE,CACrD,IAAI;KACD,WAAW,EAAE;KACb,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC;KACxB,UAAU,CAAC,YAAY,EAAE,GAAG,CAAC;KAC7B,IAAI,EAAE;KACN,UAAU,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAC;AAIrD,wCAAwC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAgC,EAAuB,EAAE;IAC1F,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,OAAO,GAAG,GAAG,SAAS,CAAC,OAAO,SAAS,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9E,IAAI,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,OAAO,EAAE,CAAC;QACtG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/announced-count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"announced-count.d.ts","sourceRoot":"","sources":["../src/announced-count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAQ,MAAM,aAAa,CAAC;AAGpD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,wBAAwB;IACxB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,0BAA0B;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,mCAAmC;IACnC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,uCAAuC;IACvC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,6CAA6C;IAC7C,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAyHtI,eAAO,MAAM,wBAAwB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,UAAU,EAAE,EAAE,OAAO,UAAU,KAAG,aAAa,EAIvH,CAAC"}
+{"version":3,"file":"announced-count.d.ts","sourceRoot":"","sources":["../src/announced-count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAQ,MAAM,aAAa,CAAC;AAGpD;;;;GAIG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,wBAAwB;IACxB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,0BAA0B;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,mCAAmC;IACnC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,uCAAuC;IACvC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,6CAA6C;IAC7C,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAmKtI,eAAO,MAAM,wBAAwB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,UAAU,EAAE,EAAE,OAAO,UAAU,KAAG,aAAa,EAIvH,CAAC"}

package/dist/announced-count.js

@@ -47,17 +47,32 @@ const isHedged = (sentence, phrase, words) => {
         words.hedgesAfter.some((hedge) => afters.some((after) => startsWithWord(after, hedge.toLowerCase()))));
 };
 const COLON_END = /[:：][ \t]*$/u;
-/** 数える語の無い数は、先を指す語のすぐ後ろでだけ（the following two:）。「under $75:」の金額を数に読まない。 */
-const pointsAhead = (sentence, phrase, anchors) => {
+/**
+ * 数字か、語の切れ目で区切った英語の数の語（two）。英字や点に続く数字は版や名前の一部（v2、1.2）なので数えない。
+ * 漢数字は「一緒」「一般」の中にもあるので数えない。
+ */
+const numberPattern = (words) => {
+    const latin = words.numbers.filter((number) => isLatin(number[0]));
+    const digits = String.raw `(?<![A-Za-z.])\p{Nd}`;
+    return new RegExp(latin.length === 0 ? digits : `${digits}|(?<![A-Za-z])(?:${alternation(latin)})(?![A-Za-z])`, "iu");
+};
+/**
+ * 数える語の無い数は、先を指す語のすぐ後ろでだけ（the following two:）。「under $75:」の金額を数に読まない。
+ * 先を指す語が無く、終わりのコロンだけが予告なら、コロンが渡すのはその手前のいちばん近い数。数の後ろにまだ数があれば
+ * （「1 つのページにまとめていましたが、2 ページに分けました:」）、その数は予告の数ではない。
+ */
+const pointsAhead = (sentence, phrase, anchors, number) => {
     const before = sentence.slice(0, phrase.start).toLowerCase();
     const lowered = anchors.map((anchor) => anchor.toLowerCase());
     if (!phrase.counted)
         return lowered.some((anchor) => endsWithWord(before.trimEnd(), anchor));
-    return COLON_END.test(sentence.trimEnd()) || lowered.some((anchor) => before.includes(anchor));
+    if (lowered.some((anchor) => before.includes(anchor)))
+        return true;
+    return COLON_END.test(sentence.trimEnd()) && !number.test(sentence.slice(phrase.end));
 };
 /** 最後の一文の予告。数がちょうど一つで、目安や順番でなく、先を指しているときだけ。 */
-const announcedIn = (sentence, words, pattern) => {
-    const phrases = [...sentence.matchAll(pattern)].map((match) => ({
+const announcedIn = (sentence, words, patterns) => {
+    const phrases = [...sentence.matchAll(patterns.phrase)].map((match) => ({
         start: match.index,
         numberEnd: match.index + (match[1] ?? "").length,
         end: match.index + match[0].length,
@@ -67,7 +82,7 @@ const announcedIn = (sentence, words, pattern) => {
     const only = phrases.length === 1 ? phrases[0] : undefined;
     if (only === undefined || only.announced < 1 || isHedged(sentence, only, words))
         return undefined;
-    return pointsAhead(sentence, only, words.anchors) ? only : undefined;
+    return pointsAhead(sentence, only, words.anchors, patterns.number) ? only : undefined;
 };
 /** 位置から空白と改行を読み飛ばした先。 */
 const pastSpace = (source, at) => {
@@ -81,7 +96,26 @@ const neighboursOf = (source, lists) => ({
 });
 /** 空白だけを挟んで前か後ろに別の箇条書きが続く。印が変わって二つに割れた一つの並びかもしれず、数を決められない。 */
 const hasNeighbour = (source, list, neighbours) => neighbours.ends.has(list.start) || neighbours.starts.has(pastSpace(source, list.end));
-const mismatchOf = ({ source, words, pattern, neighbours }, list) => {
+/**
+ * 分類した箇条書き（「- **実運用**: CLI / Telegram」）の行は、ラベルの後ろに項目を区切って並べる。予告の数は区切った項目の数かもしれない。
+ * 区切りは斜線だけ。読点とコンマは項目の説明の文の中にも書くので（「UI: rename the button to Save, continue」）区切りに数えない。
+ * 行内のコードの中の斜線（`a/b`）も数えない。
+ */
+const CATEGORY_ITEM = /^[ \t]*(?:[-*+]|\d{1,9}[.)])[ \t]+[^:：\n]{1,40}[:：][ \t]*(?<members>\S[^\n]*)/u;
+const MEMBER_SEPARATOR = /[/／]/u;
+const INLINE_CODE = /`[^`\n]*`/gu;
+const membersOf = (item) => CATEGORY_ITEM.exec(item)
+    ?.groups?.["members"]?.replace(INLINE_CODE, "code")
+    .split(MEMBER_SEPARATOR)
+    .filter((member) => member.trim() !== "").length;
+/** どの行も分類の形なら、区切って並べた項目の数の和。一行でも違えば undefined。 */
+const categorisedCount = (source, list) => {
+    const counts = list.itemSpans.map((item) => membersOf(source.slice(item.start, item.end)));
+    return counts.every((count) => count !== undefined) ? counts.reduce((sum, count) => sum + (count ?? 0), 0) : undefined;
+};
+/** 予告の数が、行の数か、分類した行に並べた項目の数に合う。 */
+const matchesList = (announced, source, list) => announced === list.items.length || announced === categorisedCount(source, list);
+const mismatchOf = ({ source, words, patterns, neighbours }, list) => {
     if (hasNeighbour(source, list.span, neighbours))
         return [];
     const lead = leadBefore(source, list.span.start);
@@ -89,8 +123,8 @@ const mismatchOf = ({ source, words, pattern, neighbours }, list) => {
         return [];
     const sentenceStart = lastSentenceStart(lead.text);
     const sentence = lead.text.slice(sentenceStart);
-    const phrase = announcedIn(sentence, words, pattern);
-    if (phrase === undefined || phrase.announced === list.items.length)
+    const phrase = announcedIn(sentence, words, patterns);
+    if (phrase === undefined || matchesList(phrase.announced, source, list))
         return [];
     const offset = lead.start + sentenceStart + phrase.start;
     return [{ offset, phrase: sentence.slice(phrase.start, phrase.end).trim(), announced: phrase.announced, listed: list.items.length }];
@@ -98,7 +132,7 @@ const mismatchOf = ({ source, words, pattern, neighbours }, list) => {
 export const announcedCountMismatches = (source, lists, words) => {
     if (words.counters.length === 0)
         return [];
-    const context = { source, words, pattern: phrasePattern(words), neighbours: neighboursOf(source, lists) };
+    const context = { source, words, patterns: { phrase: phrasePattern(words), number: numberPattern(words) }, neighbours: neighboursOf(source, lists) };
     return lists.flatMap((list) => mismatchOf(context, list));
 };
 //# sourceMappingURL=announced-count.js.map

package/dist/announced-count.js.map

@@ -1 +1 @@
-{"version":3,"file":"announced-count.js","sourceRoot":"","sources":["../src/announced-count.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"announced-count.js","sourceRoot":"","sources":["../src/announced-count.ts"],"names":[],"mappings":"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"}

package/dist/announced-list.d.ts

@@ -0,0 +1,30 @@
+import type { Lexicon, Sentence, Token } from "./plugin.ts";
+export type ListMember = {
+    readonly name: string;
+    readonly offset: number;
+};
+export type ListStatement = {
+    readonly group: string;
+    readonly offset: number;
+    readonly members: readonly ListMember[];
+};
+export type OutsideMember = {
+    readonly member: ListMember;
+    readonly announced: ListStatement;
+};
+/**
+ * 並んだ名前を、語の並びの順に読む。固有名詞が続けば一つの名前、つなぐ語（and、と、、）は名前の区切り。ほかの語に当たったら止まる。
+ * 名前で始まらなければ一覧ではない（supported on the web）。
+ */
+export declare const namesInOrder: (tokens: readonly Token[], joiners: ReadonlySet<string>, source: string) => ListMember[];
+/** 一覧を読む言葉。frames は一覧を言う語、joiners は名前をつなぐ語、negations は打ち消しの語（小文字）。 */
+export type ListWords = {
+    readonly frames: Lexicon;
+    readonly joiners: ReadonlySet<string>;
+    readonly negations: ReadonlySet<string>;
+};
+/** 文の中の、一覧を言う語と、その隣の名前。group の無い語は比べる相手が決まらないので読まない。打ち消した文も読まない。 */
+export declare const listStatementsIn: (sentence: Sentence, words: ListWords, source: string) => ListStatement[];
+/** 最初に挙げた一覧より後の文で、同じ組の語が言う、一覧に無い名前。名前ごとに最初の一つ。 */
+export declare const outsideMembers: (statements: readonly ListStatement[]) => OutsideMember[];
+//# sourceMappingURL=announced-list.d.ts.map

package/dist/announced-list.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"announced-list.d.ts","sourceRoot":"","sources":["../src/announced-list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAgB,QAAQ,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAM1E,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,UAAU,EAAE,CAAA;CAAE,CAAC;AAEzH,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAA;CAAE,CAAC;AAoB/F;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,QAAQ,SAAS,KAAK,EAAE,EAAE,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,QAAQ,MAAM,KAAG,UAAU,EAU/G,CAAC;AAcF,sEAAsE;AACtE,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAMrI,oEAAoE;AACpE,eAAO,MAAM,gBAAgB,GAAI,UAAU,QAAQ,EAAE,OAAO,SAAS,EAAE,QAAQ,MAAM,KAAG,aAAa,EAapG,CAAC;AAmBF,kDAAkD;AAClD,eAAO,MAAM,cAAc,GAAI,YAAY,SAAS,aAAa,EAAE,KAAG,aAAa,EAoBlF,CAAC"}

package/dist/announced-list.js

@@ -0,0 +1,95 @@
+import { entryRanges } from "./detectors/lexicon-match.js";
+const UPPER = /\p{Lu}/u;
+/**
+ * 名前の語。固有名詞のほか、大文字を含む名詞（macOS、Linux）。日本語の解析器は英字の名前を名詞とも固有名詞とも読むので、
+ * 品詞だけでは同じ一覧の名前が揃わない。
+ */
+const isNameToken = (token) => token.pos === "PROPN" || (token.pos === "NOUN" && UPPER.test(token.surface));
+const isJoiner = (token, joiners) => joiners.has(token.surface.toLowerCase());
+/** 名前の語の並び（前へ読んだときは逆順）から、source の上の名前。 */
+const memberOf = (run, source) => {
+    if (run.length === 0)
+        return undefined;
+    const start = Math.min(...run.map((token) => token.span.start));
+    const end = Math.max(...run.map((token) => token.span.end));
+    return { name: source.slice(start, end).replaceAll(/\s+/gu, " "), offset: start };
+};
+/**
+ * 並んだ名前を、語の並びの順に読む。固有名詞が続けば一つの名前、つなぐ語（and、と、、）は名前の区切り。ほかの語に当たったら止まる。
+ * 名前で始まらなければ一覧ではない（supported on the web）。
+ */
+export const namesInOrder = (tokens, joiners, source) => {
+    const runs = [[]];
+    tokens.every((token) => {
+        const current = runs.at(-1) ?? [];
+        if (isNameToken(token))
+            current.push(token);
+        else if (isJoiner(token, joiners) && current.length > 0)
+            runs.push([]);
+        else
+            return false;
+        return true;
+    });
+    return runs.flatMap((run) => memberOf(run, source) ?? []);
+};
+/** 一覧の語の、一つの現れから読んだ名前。before の語は後ろの名前を、after の語は前の名前を読む。 */
+const membersAt = (tokens, entry, range, joiners, source) => entry.position === "after"
+    ? namesInOrder(tokens.slice(0, range.start).toReversed(), joiners, source).toReversed()
+    : namesInOrder(tokens.slice(range.end), joiners, source);
+/** 打ち消した文（neither is available on Docker Hub、Linux には対応していません）は、一覧に足す名前ではなく、外す名前を言う。 */
+const isNegated = (tokens, negations) => tokens.some((token) => negations.has(token.surface.toLowerCase()) || negations.has((token.lemma ?? "").toLowerCase()));
+/** 文の中の、一覧を言う語と、その隣の名前。group の無い語は比べる相手が決まらないので読まない。打ち消した文も読まない。 */
+export const listStatementsIn = (sentence, words, source) => {
+    const tokens = sentence.tokens ?? [];
+    const { frames, joiners } = words;
+    if (isNegated(tokens, words.negations))
+        return [];
+    return frames.flatMap((entry) => {
+        const group = entry.group;
+        if (group === undefined)
+            return [];
+        return entryRanges(sentence, entry).flatMap((range) => {
+            const members = membersAt(tokens, entry, range, joiners, source);
+            const offset = tokens[range.start]?.span.start ?? sentence.span.start;
+            return members.length === 0 ? [] : [{ group, offset, members }];
+        });
+    });
+};
+/** 比べる形。大文字小文字・幅・空白は名前を変えない。 */
+const comparable = (name) => name.normalize("NFKC").toLowerCase().replaceAll(/\s+/gu, "");
+/** 二つ以上の名前を挙げた最初の文。組ごとに一つ。 */
+const announcements = (statements) => statements.reduce((found, statement) => {
+    if (statement.members.length >= 2 && !found.has(statement.group))
+        found.set(statement.group, statement);
+    return found;
+}, new Map());
+/**
+ * 後の文が、一覧と一つも重ならない二つ以上の名前を挙げていれば、別のものの一覧（RIS は EndNote と RefWorks、BibTeX は BibDesk と LaTeX）。
+ * そこから先は、一つだけ名前を言う文がどちらの一覧の続きか決まらないので、その組は比べない。
+ */
+const isAnotherList = (statement, known) => statement.members.length >= 2 && !statement.members.some((member) => known.has(comparable(member.name)));
+/** 最初に挙げた一覧より後の文で、同じ組の語が言う、一覧に無い名前。名前ごとに最初の一つ。 */
+export const outsideMembers = (statements) => {
+    const ordered = statements.toSorted((left, right) => left.offset - right.offset);
+    const announced = announcements(ordered);
+    const reported = new Set();
+    const ambiguous = new Set();
+    return ordered.flatMap((statement) => {
+        const list = announced.get(statement.group);
+        if (list === undefined || statement.offset <= list.offset || ambiguous.has(statement.group))
+            return [];
+        const known = new Set(list.members.map((member) => comparable(member.name)));
+        if (isAnotherList(statement, known)) {
+            ambiguous.add(statement.group);
+            return [];
+        }
+        return statement.members.flatMap((member) => {
+            const key = `${statement.group}\u0000${comparable(member.name)}`;
+            if (known.has(comparable(member.name)) || reported.has(key))
+                return [];
+            reported.add(key);
+            return [{ member, announced: list }];
+        });
+    });
+};
+//# sourceMappingURL=announced-list.js.map

package/dist/announced-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"announced-list.js","sourceRoot":"","sources":["../src/announced-list.ts"],"names":[],"mappings":"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"}