chaffjs 0.15.0 → 0.16.0

package/src/structure/markdown-path.ts

@@ -1,6 +1,6 @@
 import { extname } from "node:path";
 
-const MARKDOWN = [".md", ".markdown", ".mdx"];
+const MARKDOWN: ReadonlySet<string> = new Set([".md", ".markdown", ".mdx"]);
 
 /** 見出しとコードの範囲を Markdown として読むか。.txt の契約書は行頭の番号だけで木にする。 */
-export const isMarkdownPath = (path: string): boolean => MARKDOWN.includes(extname(path).toLowerCase());
+export const isMarkdownPath = (path: string): boolean => MARKDOWN.has(extname(path).toLowerCase());

package/src/structure/numbering.ts

@@ -46,4 +46,4 @@ export const numberingBreaks = (tree: StructureNode): StructureIssue[] =>
   inDocumentOrder(tree)
     .flatMap(sequencesOf)
     .flatMap(breaksIn)
-    .sort((left, right) => left.offset - right.offset);
+    .toSorted((left, right) => left.offset - right.offset);

package/src/structure/relative-find.ts

@@ -233,5 +233,5 @@ export const relativeMentions = (
   const bare = bareMentions(text, patterns, vocabulary, number, [...absolute, ...named]);
   return [...named, ...bare]
     .filter((mention) => !substituted.some((span) => span.start <= mention.start && mention.start < span.end))
-    .sort((left, right) => left.start - right.start);
+    .toSorted((left, right) => left.start - right.start);
 };

package/src/structure/sexp.ts

@@ -8,7 +8,7 @@ const atom = (value: string | number): string => (typeof value === "number" ? St
 /** 属性はキーの順に並べる。同じ木から毎回同じ文字列を出すため。 */
 const keywords = (node: StructureNode): string[] => [
   ...Object.keys(node.attrs)
-    .sort((left, right) => left.localeCompare(right, "en"))
+    .toSorted((left, right) => left.localeCompare(right, "en"))
     .flatMap((key) => {
       const value = node.attrs[key];
       return value === undefined ? [] : [`:${key} ${atom(value)}`];

package/src/structure/unnumbered.ts

@@ -24,9 +24,9 @@ export const unnumberedUnit = (line: string, open: readonly OpenUnit[], rule: Ru
   if (rule === undefined) return undefined;
   const rest = patternOf(rule.indent).exec(line)?.groups?.["rest"];
   if (rest === undefined) return undefined;
-  const holder = [...open].reverse().find((unit) => unit.numbered.kind === rule.inside);
+  const holder = open.findLast((unit) => unit.numbered.kind === rule.inside);
   if (holder === undefined || !holder.bodyOnLine) return undefined;
-  const previous = [...open].reverse().find((unit) => unit.numbered.depth === rule.depth)?.numbered;
+  const previous = open.findLast((unit) => unit.numbered.depth === rule.depth)?.numbered;
   if (previous !== undefined && previous.label !== "") return undefined;
   const number = String((previous === undefined ? 1 : Number(previous.number)) + 1);
   return { kind: "item", depth: rule.depth, number, absolute: false, label: "", heading: "", rest: rest.trim(), ordinal: Number(number) };

package/src/team-names.ts

@@ -0,0 +1,39 @@
+import type { Span } from "./plugin.ts";
+
+const SPACE = /\s/u;
+const ESCAPE = /[.*+?^${}()|[\]\\]/gu;
+const WHITESPACE_RUN = String.raw`\s+`;
+const WRAP = String.raw`(?:\r?\n[ \t]*)?`;
+
+/** 名前の中の空白は空白の並びに当て、字と字の間には折り返しの改行を許す。本文の行は好きな所で折れる。 */
+const patternOf = (name: string): RegExp => {
+  const pieces = Array.from(name.trim()).reduce<string[]>((acc, char) => {
+    const previous = acc.at(-1);
+    if (SPACE.test(char)) return previous === WHITESPACE_RUN ? acc : [...acc, WHITESPACE_RUN];
+    const escaped = char.replace(ESCAPE, "\\$&");
+    return previous === undefined || previous === WHITESPACE_RUN ? [...acc, escaped] : [...acc, WRAP, escaped];
+  }, []);
+  return new RegExp(pieces.join(""), "gu");
+};
+
+const occurrences = (text: string, name: string): Span[] =>
+  name.trim().length === 0 ? [] : [...text.matchAll(patternOf(name))].map((match) => ({ start: match.index, end: match.index + match[0].length }));
+
+const merged = (spans: readonly Span[]): Span[] =>
+  spans
+    .toSorted((left, right) => left.start - right.start)
+    .reduce<Span[]>((acc, span) => {
+      const last = acc.at(-1);
+      if (last !== undefined && span.start < last.end) acc[acc.length - 1] = { start: last.start, end: Math.max(last.end, span.end) };
+      else acc.push(span);
+      return acc;
+    }, []);
+
+/**
+ * チームが chaff.yaml の names に並べた名前が、text のどこにあるか。綴りは書かれたとおり（Apple と apple は別）。
+ * 重なる出現は 1 つの範囲にまとめる。接するだけなら別の名前（並んだ 2 つの名前は 2 つと数える）。位置は text の先頭を 0 とする。
+ */
+export const nameSpans = (text: string, names: readonly string[]): Span[] => merged(names.flatMap((name) => occurrences(text, name)));
+
+/** [start, end) が names の範囲のどれかと重なるか。 */
+export const touchesAny = (spans: readonly Span[], start: number, end: number): boolean => spans.some((span) => start < span.end && span.start < end);

package/src/ui.ts

@@ -19,5 +19,12 @@ export const hostLanguage = (configLanguage: string | undefined, env: Readonly<R
   return locale !== undefined && locale.toLowerCase().startsWith("ja") ? "ja" : "en";
 };
 
+/** Several documents end with one closing: in their language when they share one, else the host's. */
+export const sharedLanguage = (languages: readonly string[], host: UiLanguage): UiLanguage => {
+  const distinct = new Set(languages.map((language) => uiLanguageOf(language)));
+  const [only] = [...distinct];
+  return distinct.size === 1 && only !== undefined ? only : host;
+};
+
 /** Text in both languages. Each module keeps its own, next to where it is used. */
 export type Texts<T> = Readonly<Record<UiLanguage, T>>;

package/src/version.ts

@@ -21,7 +21,7 @@ export const versionLines = (raw: unknown): string[] => {
   const dependencies = isRecord(raw) && isRecord(raw["dependencies"]) ? raw["dependencies"] : {};
   const bundled = Object.entries(dependencies)
     .filter((entry): entry is [string, string] => BUNDLED.test(entry[0]) && typeof entry[1] === "string")
-    .sort(([left], [right]) => left.localeCompare(right))
+    .toSorted(([left], [right]) => left.localeCompare(right))
     .map(([name, version]) => `${name} ${version}`);
   return [`chaffjs ${versionOf(raw)}`, ...bundled];
 };

package/src/watch.ts

@@ -7,24 +7,24 @@ const SETTLE_MS = 120;
 export type Snapshot = Readonly<Record<string, number>>;
 
 export const snapshotOf = (findings: readonly Finding[]): Snapshot =>
-  findings.reduce<Record<string, number>>((acc, finding) => ({ ...acc, [finding.rule]: (acc[finding.rule] ?? 0) + 1 }), {});
+  Object.fromEntries(findings.reduce((counts, finding) => counts.set(finding.rule, (counts.get(finding.rule) ?? 0) + 1), new Map<string, number>()));
 
 const total = (snapshot: Snapshot): number => Object.values(snapshot).reduce((sum, count) => sum + count, 0);
 
 /**
  * 差分だけを出す。書いている最中に全件を出し直されると、何が変わったのか分からない。
- * workflow spec §11。
+ * workflow spec §11。`unit` takes the count after the change, which sets the English noun ("0 → 1 finding").
  */
-export const describeChange = (before: Snapshot, after: Snapshot, unit = " 件"): string | undefined => {
+export const describeChange = (before: Snapshot, after: Snapshot, unit: (count: number) => string = () => " 件"): string | undefined => {
   const rules = [...new Set([...Object.keys(before), ...Object.keys(after)])];
   const moved = rules
     .map((rule) => ({ rule, delta: (after[rule] ?? 0) - (before[rule] ?? 0) }))
     .filter((entry) => entry.delta !== 0)
-    .sort((left, right) => left.rule.localeCompare(right.rule, "en"));
+    .toSorted((left, right) => left.rule.localeCompare(right.rule, "en"));
   if (moved.length === 0) return undefined;
   const detail = moved.map((entry) => `${entry.delta > 0 ? "+" : ""}${entry.delta} ${entry.rule}`).join(", ");
   const mark = total(after) < total(before) ? "✓" : "✗";
-  return `${mark} ${total(before)} → ${total(after)}${unit}   (${detail})`;
+  return `${mark} ${total(before)} → ${total(after)}${unit(total(after))}   (${detail})`;
 };
 
 export const clock = (): string => new Date().toTimeString().slice(0, 8);