chaffjs 0.28.0 → 0.30.0

package/dist/structure/connection-times.d.ts

@@ -0,0 +1,56 @@
+import type { StructureIssue } from "./issues.ts";
+import type { Stop } from "./time-order.ts";
+import { type DateSpan, type Mark, type TimeSpan, type TimeWords } from "./time-marks.ts";
+/**
+ * 乗り継ぎの間が、文書に書いた移動の時間より短い所。移動の時間は、移動の語（移動、徒歩、地下鉄、by Metro、coach。語彙表
+ * travel-time-word）と同じ文に書いた長さ（約10分、about 40 minutes）だけを使う。実際にかかる時間は推し量らない。
+ * 移動の始まりと終わりの時刻は二通りに読む。
+ * - 移動そのものを書いた予定（「10:00 京都駅から貸切バスで清水寺へ（約30分）」）は、その時刻に発ち、同じ日の次の予定までに着く。
+ * - 予定に添えた移動の時間（「09:55 博多駅で合流（福岡空港から地下鉄で約10分）」）や、時刻の無い移動の文に続けて書いた時刻は、
+ *   すぐ前の着の時刻（「福岡 09:50着」、表の到着の列）から移動して、その時刻に間に合う。
+ * 日付が違う、翌日の印がある、時刻が戻る（夜をまたぐ）、時間帯の印が違う所は比べない。
+ */
+/** 移動の時間として読む長さ。minutes は分。 */
+export type TravelLength = {
+    readonly start: number;
+    readonly end: number;
+    readonly minutes: number;
+};
+/** cues は移動を言う語、bounds は長さを上限として言う語（以内、within）。上限の長さは、それより早く着けるので使わない。 */
+export type TravelWords = {
+    readonly cues: readonly Mark[];
+    readonly bounds: readonly Mark[];
+};
+export type ConnectionInputs = {
+    readonly source: string;
+    readonly times: readonly TimeSpan[];
+    readonly dates: readonly DateSpan[];
+    readonly words: TimeWords;
+    readonly travel: TravelWords;
+    readonly lengths: readonly TravelLength[];
+    readonly arrivals: ReadonlySet<number>;
+    readonly days: readonly (readonly Stop[])[];
+};
+/** 発ってから着くまでの間が、書いた移動の時間より短いか。間が負なら（時刻が戻る）、夜をまたいだのか書き間違いか決められないので言わない。 */
+export declare const isTooShort: (gapSeconds: number, travelMinutes: number) => boolean;
+/** 二つの時刻に書いた日付が比べられるか。両方に無いか、同じ書き方で同じ日付なら同じ日。 */
+export declare const isSameDate: (left: string | undefined, right: string | undefined) => boolean;
+/** 時間帯の印を見て、二つの行の時刻をそのまま比べられるか。どちらかが時間帯をまたぐか、印が違えば比べない。 */
+export declare const isSameZone: (left: string, right: string, words: TimeWords) => boolean;
+/** 括弧書きを外した残り。 */
+export declare const outsideBrackets: (text: string) => string;
+/** text に移動の語が一語として書かれているか。大文字と小文字は区別しない。 */
+export declare const mentionsTravel: (text: string, cues: readonly Mark[]) => boolean;
+/** 行の中で、at から to までを含む文の範囲（行の頭からの位置）。 */
+export declare const sentenceAround: (text: string, at: number, to: number) => {
+    start: number;
+    end: number;
+};
+/** at から to までを囲む一番内側の括弧の中身の範囲（行の頭からの位置）。囲む括弧が無ければ undefined。 */
+export declare const bracketAround: (text: string, at: number, to: number) => {
+    start: number;
+    end: number;
+} | undefined;
+/** 移動の時間を書いた長さごとに、間の足りない乗り継ぎ。同じ時刻は一度だけ言う。 */
+export declare const shortConnections: (inputs: ConnectionInputs) => StructureIssue[];
+//# sourceMappingURL=connection-times.d.ts.map

package/dist/structure/connection-times.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connection-times.d.ts","sourceRoot":"","sources":["../../src/structure/connection-times.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAOL,KAAK,QAAQ,EACb,KAAK,IAAI,EACT,KAAK,QAAQ,EACb,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;GAQG;AAEH,+BAA+B;AAC/B,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtG,0EAA0E;AAC1E,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAA;CAAE,CAAC;AAE/F,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;CAC7C,CAAC;AAWF,0EAA0E;AAC1E,eAAO,MAAM,UAAU,GAAI,YAAY,MAAM,EAAE,eAAe,MAAM,KAAG,OAA6E,CAAC;AAErJ,iDAAiD;AACjD,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,GAAG,SAAS,EAAE,OAAO,MAAM,GAAG,SAAS,KAAG,OAAyB,CAAC;AAE3G,2DAA2D;AAC3D,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,OAAO,SAAS,KAAG,OAI1E,CAAC;AAEF,kBAAkB;AAClB,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,KAAG,MAG9C,CAAC;AAEF,6CAA6C;AAC7C,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,MAAM,SAAS,IAAI,EAAE,KAAG,OAGpE,CAAC;AAEF,yCAAyC;AACzC,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM,EAAE,IAAI,MAAM,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAKjG,CAAC;AA8CF,iEAAiE;AACjE,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM,EAAE,IAAI,MAAM,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,SAmBrG,CAAC;AA+DF,6CAA6C;AAC7C,eAAO,MAAM,gBAAgB,GAAI,QAAQ,gBAAgB,KAAG,cAAc,EAWzE,CAAC"}

package/dist/structure/connection-times.js

@@ -0,0 +1,165 @@
+import { lineNumberAt, linesOf } from "./lines.js";
+import { runsOf } from "./runs.js";
+import { crossesZones, dayShiftOf, markBefore, markSoonAfter, wordOffsets, zonesIn, } from "./time-marks.js";
+const SECONDS_PER_MINUTE = 60;
+/** 文の切れ目。leg-times.ts と同じ。 */
+const BREAK = /[。．;；!?！？]|\.\s/gu;
+/** 括弧書き。中に括弧を入れ子にしたものは、内側から一つずつ外す。 */
+const BRACKETED = /[(（][^()（）]*[)）]/gu;
+/** 「within 10 minutes」の within と長さの間に挟んでよい字の数。 */
+const BOUND_GAP = 1;
+/** 発ってから着くまでの間が、書いた移動の時間より短いか。間が負なら（時刻が戻る）、夜をまたいだのか書き間違いか決められないので言わない。 */
+export const isTooShort = (gapSeconds, travelMinutes) => gapSeconds >= 0 && gapSeconds < travelMinutes * SECONDS_PER_MINUTE;
+/** 二つの時刻に書いた日付が比べられるか。両方に無いか、同じ書き方で同じ日付なら同じ日。 */
+export const isSameDate = (left, right) => left === right;
+/** 時間帯の印を見て、二つの行の時刻をそのまま比べられるか。どちらかが時間帯をまたぐか、印が違えば比べない。 */
+export const isSameZone = (left, right, words) => {
+    const [leftZones, rightZones] = [zonesIn(left, words), zonesIn(right, words)];
+    if (crossesZones(leftZones) || crossesZones(rightZones))
+        return false;
+    return (leftZones[0]?.text ?? "") === (rightZones[0]?.text ?? "");
+};
+/** 括弧書きを外した残り。 */
+export const outsideBrackets = (text) => {
+    const stripped = text.replace(BRACKETED, " ");
+    return stripped === text ? text : outsideBrackets(stripped);
+};
+/** text に移動の語が一語として書かれているか。大文字と小文字は区別しない。 */
+export const mentionsTravel = (text, cues) => {
+    const lower = text.toLowerCase();
+    return cues.some((cue) => wordOffsets(lower, cue.pattern.toLowerCase()).length > 0);
+};
+/** 行の中で、at から to までを含む文の範囲（行の頭からの位置）。 */
+export const sentenceAround = (text, at, to) => {
+    const breaks = [...text.matchAll(BREAK)].map((match) => ({ start: match.index, end: match.index + match[0].length }));
+    const start = breaks.filter((cut) => cut.end <= at).at(-1)?.end ?? 0;
+    const end = breaks.find((cut) => cut.start >= to)?.start ?? text.length;
+    return { start, end };
+};
+const lineAt = (lines, offset) => {
+    const number = lineNumberAt(lines, offset);
+    return number === undefined ? undefined : lines[number - 1];
+};
+/** 長さが上限として書かれている（10分以内、within 10 minutes）か。 */
+const isBound = (inputs, line, length) => {
+    const head = inputs.source.slice(line.start, length.start).toLowerCase();
+    return markSoonAfter(inputs.source, length.end, inputs.travel.bounds, []) !== undefined || markBefore(head, inputs.travel.bounds, BOUND_GAP) !== undefined;
+};
+/** 移動の時間を書いた長さか。同じ文に移動の語があり、上限として書いたものではない。 */
+const isTravel = (inputs, line, length) => {
+    const sentence = sentenceAround(line.text, length.start - line.start, length.end - line.start);
+    return mentionsTravel(line.text.slice(sentence.start, sentence.end), inputs.travel.cues) && !isBound(inputs, line, length);
+};
+/** 時刻の前の、同じ行に書いた最後の日付。 */
+const dateOf = (inputs, line, time) => inputs.dates.filter((date) => date.start >= line.start && date.end <= time.start).at(-1)?.value;
+const shiftOf = (inputs, line, time) => dayShiftOf(inputs.source.slice(line.start, time.start), inputs.source, time.end, inputs.words);
+const written = (inputs, span) => inputs.source.slice(span.start, span.end);
+const issueOf = (inputs, leg, length) => ({
+    offset: leg.to.start,
+    values: {
+        time: written(inputs, leg.to),
+        from: written(inputs, leg.from),
+        gap: Math.round((leg.to.seconds - leg.from.seconds) / SECONDS_PER_MINUTE),
+        travel: written(inputs, length),
+    },
+});
+const dayOf = (inputs, line) => inputs.days.find((stops) => stops.some((stop) => stop.offset >= line.start && stop.offset <= line.start + line.text.length));
+const OPENERS = new Set(["(", "（"]);
+const CLOSERS = new Set([")", "）"]);
+/** at から to までを囲む一番内側の括弧の中身の範囲（行の頭からの位置）。囲む括弧が無ければ undefined。 */
+export const bracketAround = (text, at, to) => {
+    const open = text
+        .slice(0, at)
+        .split("")
+        .reduceRight((scan, char, index) => {
+        if (scan.found !== undefined)
+            return scan;
+        if (CLOSERS.has(char))
+            return { ...scan, depth: scan.depth + 1 };
+        if (!OPENERS.has(char))
+            return scan;
+        return scan.depth === 0 ? { ...scan, found: index } : { ...scan, depth: scan.depth - 1 };
+    }, { depth: 0, found: undefined }).found;
+    if (open === undefined)
+        return undefined;
+    const close = text
+        .slice(to)
+        .split("")
+        .findIndex((char) => CLOSERS.has(char));
+    return close === -1 ? undefined : { start: open + 1, end: to + close };
+};
+/**
+ * 移動そのものを書いた予定か。頭に時刻を書いた予定で、移動の語が括弧の外（行の本文）にある。長さを囲む括弧の中に移動の語が
+ * あれば（「（福岡空港から地下鉄で約10分）」）、その括弧はこの予定までの移動を添えたもので、予定は移動ではない。
+ */
+const isMoveLine = (inputs, line, length) => {
+    const aside = bracketAround(line.text, length.start - line.start, length.end - line.start);
+    if (aside !== undefined && mentionsTravel(line.text.slice(aside.start, aside.end), inputs.travel.cues))
+        return false;
+    return dayOf(inputs, line) !== undefined && mentionsTravel(outsideBrackets(line.text), inputs.travel.cues);
+};
+/** 移動そのものを書いた予定の時刻と、同じ日の次の予定の時刻。 */
+const scheduledLeg = (inputs, line) => {
+    const day = dayOf(inputs, line);
+    const index = day?.findIndex((stop) => stop.offset >= line.start) ?? -1;
+    const [start, next] = [day?.[index], day?.[index + 1]];
+    if (start === undefined || next === undefined || start.shift !== 0 || next.shift !== 0 || start.zone.startsWith("local:"))
+        return undefined;
+    const timeAt = (offset) => inputs.times.find((time) => time.start === offset);
+    const [from, to] = [timeAt(start.offset), timeAt(next.offset)];
+    return from === undefined || to === undefined ? undefined : { from, to };
+};
+/** 時刻と同じ並び（続いた箇条書きや表の行）か同じ行にある、その時刻より前の時刻。 */
+const timesBeside = (inputs, line, to) => {
+    const run = runsOf(inputs.source).find((lines) => lines.some((row) => row.start === line.start));
+    const inScope = (time) => (time.start >= line.start && time.end <= to.start) || (run?.some((row) => time.start >= row.start && time.end <= row.end) ?? false);
+    return inputs.times.filter((time) => time.end <= to.start && inScope(time));
+};
+/** 日付を書いた時刻なら、文書のそれより前の同じ日付の時刻。日付が無ければ、同じ並びか同じ行の、日付の無い前の時刻。 */
+const timesBefore = (inputs, lines, line, to) => {
+    const date = dateOf(inputs, line, to);
+    const candidates = date === undefined ? timesBeside(inputs, line, to) : inputs.times.filter((time) => time.end <= to.start);
+    return candidates.filter((time) => {
+        const own = lineAt(lines, time.start);
+        return own !== undefined && isSameDate(dateOf(inputs, own, time), date);
+    });
+};
+/**
+ * 移動の時間を添えた時刻。予定の行ならその頭の時刻、文なら移動の文の中かその後ろの、最初の着でない時刻。
+ * 移動の文より前の時刻は、移動の前の予定で、移動して着く先ではない。
+ */
+const arrivalTarget = (inputs, line, length) => {
+    const stop = dayOf(inputs, line)?.find((candidate) => candidate.offset >= line.start && candidate.offset <= line.start + line.text.length);
+    if (stop !== undefined)
+        return inputs.times.find((time) => time.start === stop.offset);
+    const sentenceStart = line.start + sentenceAround(line.text, length.start - line.start, length.end - line.start).start;
+    return inputs.times.find((time) => time.start >= sentenceStart && time.end <= line.start + line.text.length && !inputs.arrivals.has(time.start));
+};
+/** 移動の時間を添えた時刻と、そのすぐ前の着の時刻。すぐ前の時刻が着でなければ、どこから移動したのか分からない。 */
+const arrivingLeg = (inputs, lines, line, length) => {
+    const to = arrivalTarget(inputs, line, length);
+    if (to === undefined)
+        return undefined;
+    const from = timesBefore(inputs, lines, line, to).at(-1);
+    const fromLine = from === undefined ? undefined : lineAt(lines, from.start);
+    if (from === undefined || fromLine === undefined || !inputs.arrivals.has(from.start))
+        return undefined;
+    if (shiftOf(inputs, fromLine, from) !== 0 || shiftOf(inputs, line, to) !== 0 || !isSameZone(fromLine.text, line.text, inputs.words))
+        return undefined;
+    return { from, to };
+};
+/** 移動の時間を書いた長さごとに、間の足りない乗り継ぎ。同じ時刻は一度だけ言う。 */
+export const shortConnections = (inputs) => {
+    const lines = linesOf(inputs.source);
+    const issues = inputs.lengths.flatMap((length) => {
+        const line = lineAt(lines, length.start);
+        if (line === undefined || !isTravel(inputs, line, length))
+            return [];
+        const leg = isMoveLine(inputs, line, length) ? scheduledLeg(inputs, line) : arrivingLeg(inputs, lines, line, length);
+        return leg !== undefined && isTooShort(leg.to.seconds - leg.from.seconds, length.minutes) ? [issueOf(inputs, leg, length)] : [];
+    });
+    return issues
+        .filter((issue, index) => issues.findIndex((other) => other.offset === issue.offset) === index)
+        .toSorted((left, right) => left.offset - right.offset);
+};
+//# sourceMappingURL=connection-times.js.map

package/dist/structure/connection-times.js.map

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

package/dist/structure/counted-amounts.d.ts

@@ -0,0 +1,12 @@
+import type { Amount } from "./total.ts";
+/**
+ * 数を足してよい助数詞（16単位、4コマ、3 credits）が付いた数。解析器が助数詞と読まない語（単位、コマ）もここで数量にする。
+ * 助数詞の語は total-mismatch の語彙表（summed-counter）から取る。同じ組（group）の語（credit と credits）は同じ単位として足す。
+ */
+export type SummedCounter = {
+    readonly pattern: string;
+    readonly unit: string;
+};
+/** 文書の中の、足してよい助数詞の付いた数。木がすでに数量として読んだもの（known）とは重ねない。 */
+export declare const countedAmounts: (source: string, counters: readonly SummedCounter[], known: readonly Amount[]) => Amount[];
+//# sourceMappingURL=counted-amounts.d.ts.map

package/dist/structure/counted-amounts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"counted-amounts.d.ts","sourceRoot":"","sources":["../../src/structure/counted-amounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AA0BhF,wDAAwD;AACxD,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,UAAU,SAAS,aAAa,EAAE,EAAE,OAAO,SAAS,MAAM,EAAE,KAAG,MAAM,EAQnH,CAAC"}

package/dist/structure/counted-amounts.js

@@ -0,0 +1,30 @@
+/** 前に英字や数や小数点が続く数（v2、A4、1.2.3 の 2）は読まない。日本語は数の前に空白を置かないので、仮名や漢字の後ろはよい。 */
+const NUMBER = /(?<![\p{Script=Latin}\p{N}.,．，])[0-9０-９]+(?:[,，][0-9０-９]{3})*(?:[.．][0-9０-９]+)?/gu;
+/** 助数詞に文字や数、つなぎの - _ が詰めて続くもの（3単位目、4コマ漫画、3 unit-priced）は、別の語の一部。 */
+const CONTINUES_WORD = /^[\p{L}\p{N}_-]/u;
+/** 序数の印（第3回）。 */
+const ORDINAL_MARK = "第";
+/** 助数詞を探す長さ。どの助数詞よりも長い。 */
+const LOOKAHEAD = 32;
+const valueOf = (written) => Number(written.normalize("NFKC").replace(/,/gu, ""));
+/** 数のすぐ後ろ（空白一つまで）の助数詞。長い語から試す。大文字小文字は区別しない（4 Credits）。 */
+const counterAfter = (source, end, counters) => {
+    const gap = source.charAt(end) === " " ? 1 : 0;
+    const rest = source.slice(end + gap, end + gap + LOOKAHEAD).toLowerCase();
+    const counter = counters.find((candidate) => rest.startsWith(candidate.pattern.toLowerCase()) && !CONTINUES_WORD.test(rest.slice(candidate.pattern.length)));
+    return counter === undefined ? undefined : { unit: counter.unit, end: end + gap + counter.pattern.length };
+};
+const overlapsAny = (start, end, amounts) => amounts.some((amount) => start < amount.end && amount.offset < end);
+/** 文書の中の、足してよい助数詞の付いた数。木がすでに数量として読んだもの（known）とは重ねない。 */
+export const countedAmounts = (source, counters, known) => {
+    const longestFirst = counters.toSorted((left, right) => right.pattern.length - left.pattern.length);
+    return [...source.matchAll(NUMBER)].flatMap((match) => {
+        if (source.charAt(match.index - 1) === ORDINAL_MARK)
+            return [];
+        const found = counterAfter(source, match.index + match[0].length, longestFirst);
+        if (found === undefined || overlapsAny(match.index, found.end, known))
+            return [];
+        return [{ offset: match.index, end: found.end, value: valueOf(match[0]), unit: found.unit }];
+    });
+};
+//# sourceMappingURL=counted-amounts.js.map

package/dist/structure/counted-amounts.js.map

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

package/dist/structure/date-order-tie.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 隣どうしの二つの日付が入れ替わったように見えて、どちらを取り除いても同じだけ揃う（引き分け）とき、同じ項目の手がかりで決める。
+ * 項目がみな版を持ち、版が向きに沿って並ぶなら、並びの位置は版が裏付ける。位置に照らして逆らう相手の多い日付を指す。
+ * 版が無いか、版も乱れているなら、二つだけが入れ替わった並びに限り、外側の隣（前の日付の前、後ろの日付の後ろ）から遠いほうを指す。書き間違えた日付は隣から跳ぶ。
+ * どちらでも決まらなければ undefined（呼ぶ側はこれまでどおり後ろを指す）。
+ */
+export type TieEntry = {
+    readonly value: string;
+    readonly version: string | undefined;
+};
+/** 引き分けの二つ（before = at - 1、after = at）のうち外れたほう。決まらなければ undefined。 */
+export declare const breakDateTie: (entries: readonly TieEntry[], before: number, after: number, direction: number) => number | undefined;
+//# sourceMappingURL=date-order-tie.d.ts.map

package/dist/structure/date-order-tie.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"date-order-tie.d.ts","sourceRoot":"","sources":["../../src/structure/date-order-tie.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AA2ExF,qEAAqE;AACrE,eAAO,MAAM,YAAY,GAAI,SAAS,SAAS,QAAQ,EAAE,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,EAAE,WAAW,MAAM,KAAG,MAAM,GAAG,SAC7B,CAAC"}

package/dist/structure/date-order-tie.js

@@ -0,0 +1,61 @@
+import { versionsAlong } from "./version-order.js";
+const DAY_MS = 86_400_000;
+const MONTHS_PER_YEAR = 12;
+/** 年の無い月日（09-14）を日数にするための、閏年の仮の年。 */
+const LEAP_YEAR = 2000;
+/** 同じ書き方の日付どうしで差をとれる数。年月日と月日は日数、年月は月数。 */
+const pointOf = (value) => {
+    const full = /^(\d{4})-(\d{2})-(\d{2})$/u.exec(value);
+    if (full !== null)
+        return Date.UTC(Number(full[1]), Number(full[2]) - 1, Number(full[3])) / DAY_MS;
+    const month = /^(\d{4})-(\d{2})$/u.exec(value);
+    if (month !== null)
+        return Number(month[1]) * MONTHS_PER_YEAR + Number(month[2]);
+    const day = /^(\d{2})-(\d{2})$/u.exec(value);
+    return day === null ? undefined : Date.UTC(LEAP_YEAR, Number(day[1]) - 1, Number(day[2])) / DAY_MS;
+};
+/** 位置に照らして向きに逆らう相手の数。 */
+const disagreements = (values, index, direction) => values.filter((other, at) => {
+    if (at === index)
+        return false;
+    const [earlier, later] = at < index ? [other, values[index] ?? ""] : [values[index] ?? "", other];
+    return Math.sign(later.localeCompare(earlier)) === -direction;
+}).length;
+/** 多いほうを指す。同じなら決めない。 */
+const larger = (before, after, scores) => {
+    if (scores[0] === scores[1])
+        return undefined;
+    return scores[0] > scores[1] ? before : after;
+};
+const byVersion = (entries, before, after, direction) => {
+    if (!versionsAlong(entries.map((entry) => entry.version), direction))
+        return undefined;
+    const values = entries.map((entry) => entry.value);
+    return larger(before, after, [disagreements(values, before, direction), disagreements(values, after, direction)]);
+};
+const distance = (entries, from, to) => {
+    const start = pointOf(entries[from]?.value ?? "");
+    const end = pointOf(entries[to]?.value ?? "");
+    return start === undefined || end === undefined ? undefined : Math.abs(end - start);
+};
+/** from から to へ、向きに逆らわない（等しくてもよい）。 */
+const along = (from, to, direction) => Math.sign(to.localeCompare(from)) !== -direction;
+/** 隣どうしの入れ替わりだけ: 外側の二つが向きに沿い、入れ替わった二つがどちらもその間に収まる。乱れが広い並びでは、外側の隣も当てにならない。 */
+const isSwap = (values, before, after, direction) => {
+    const [outerBefore, outerAfter] = [values[before - 1], values[after + 1]];
+    if (outerBefore === undefined || outerAfter === undefined)
+        return false;
+    return [values[before] ?? "", values[after] ?? ""].every((value) => along(outerBefore, value, direction) && along(value, outerAfter, direction));
+};
+const byGap = (entries, before, after, direction) => {
+    if (!isSwap(entries.map((entry) => entry.value), before, after, direction))
+        return undefined;
+    const outerBefore = distance(entries, before - 1, before);
+    const outerAfter = distance(entries, after, after + 1);
+    if (outerBefore === undefined || outerAfter === undefined)
+        return undefined;
+    return larger(before, after, [outerBefore, outerAfter]);
+};
+/** 引き分けの二つ（before = at - 1、after = at）のうち外れたほう。決まらなければ undefined。 */
+export const breakDateTie = (entries, before, after, direction) => byVersion(entries, before, after, direction) ?? byGap(entries, before, after, direction);
+//# sourceMappingURL=date-order-tie.js.map

package/dist/structure/date-order-tie.js.map

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

package/dist/structure/date-order.d.ts

@@ -1,7 +1,8 @@
 import type { StructureIssue } from "./issues.ts";
 /**
- * 日程として並べた日付の順番。箇条書きの続いた項目か、表の続いた行で、日付をちょうど一つ持つものを並びとして読む。
- * 並びの向き（古い順か新しい順か）は多いほうで決め、それに逆らう一歩だけを言う。新しい順に並べた履歴は正しい並び。
+ * 日程として並べた日付の順番。箇条書きの続いた項目、表の続いた行、同じ親の下で同じ深さに並ぶ見出しで、
+ * 日付をちょうど一つ持つものを並びとして読む。
+ * 並びの向き（古い順か新しい順か）は多いほうで決め、それに逆らう一歩ごとに、その前後のうち並びから外れた日付を言う。新しい順に並べた履歴は正しい並び。
  * 向きが決まらない並び（上がりと下がりが同じ数）は何も言わない。逆らう一歩を言えるのは、日付が 4 つ以上の並びだけになる。
  * 向きに沿って並ぶ日付が半分以下の並びは、日付でなく別のもの（名前、版）で並べた一覧として何も言わない。
  */
@@ -9,7 +10,27 @@ export type DatedPoint = {
     readonly offset: number;
     readonly value: string;
 };
+/** 並びの一行（箇条書きの項目、表の行、見出し）の原文の範囲。 */
+type Span = {
+    readonly start: number;
+    readonly end: number;
+};
+/** 見出しの深さと原文の範囲。 */
+export type HeadingSpan = Span & {
+    readonly depth: number;
+};
+/**
+ * 同じ親の下で同じ深さに並ぶ見出し（変更履歴の版ごとの見出し）。浅い見出しが来たら、それより深い並びは閉じる。
+ * 深い見出し（### 追加）は並びを切らず、親ごとに別の並びになる。
+ */
+export declare const siblingHeadingRuns: (headings: readonly HeadingSpan[]) => HeadingSpan[][];
 /** 向きに沿って並べられる日付の最大の数（間を飛ばしてよい。等しい日付は向きに逆らわない）。 */
 export declare const longestInOrder: (values: readonly string[], direction: number) => number;
-export declare const dateOrderBreaks: (source: string, points: readonly DatedPoint[]) => StructureIssue[];
+/**
+ * 向きに逆らう一歩（at - 1 から at）のうち、並びから外れているほう。取り除いたとき残りが長く揃うほうを指す。
+ * 前を取っても後ろを取っても同じだけ揃う（隣どうしの入れ替わり）なら、tieBreak が決めたほう、決まらなければ後ろを指す。
+ */
+export declare const outOfPlace: (values: readonly string[], at: number, direction: number, tieBreak?: (before: number, after: number) => number | undefined) => number;
+export declare const dateOrderBreaks: (source: string, points: readonly DatedPoint[], headings?: readonly HeadingSpan[]) => StructureIssue[];
+export {};
 //# sourceMappingURL=date-order.d.ts.map

package/dist/structure/date-order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date-order.d.ts","sourceRoot":"","sources":["../../src/structure/date-order.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAGlD;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAiB7E,mDAAmD;AACnD,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,MAAM,EAAE,EAAE,WAAW,MAAM,KAAG,MAO3E,CAAC;AAoBJ,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,UAAU,EAAE,KAAG,cAAc,EAI1F,CAAC"}
+{"version":3,"file":"date-order.d.ts","sourceRoot":"","sources":["../../src/structure/date-order.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAMlD;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAK7E,oCAAoC;AACpC,KAAK,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,oBAAoB;AACpB,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,SAAS,WAAW,EAAE,KAAG,WAAW,EAAE,EAA0D,CAAC;AA2C9I,mDAAmD;AACnD,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,MAAM,EAAE,EAAE,WAAW,MAAM,KAAG,MAO3E,CAAC;AAOJ;;;GAGG;AACH,eAAO,MAAM,UAAU,GACrB,QAAQ,SAAS,MAAM,EAAE,EACzB,IAAI,MAAM,EACV,WAAW,MAAM,EACjB,WAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAA2B,KAChF,MAKF,CAAC;AA+BF,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,UAAU,EAAE,EAAE,WAAU,SAAS,WAAW,EAAO,KAAG,cAAc,EAIjI,CAAC"}

package/dist/structure/date-order.js

@@ -1,11 +1,39 @@
+import { siblingHeadingRunsOf } from "./heading-runs.js";
 import { runsOf } from "./runs.js";
+import { breakDateTie } from "./date-order-tie.js";
+import { leadingVersion } from "./version-order.js";
 /** 並びとして比べられる日付の書き方。年月日、年月、月日は、同じ書き方どうしでしか比べない。 */
 const PRECISIONS = [/^\d{4}-\d{2}-\d{2}$/u, /^\d{4}-\d{2}$/u, /^\d{2}-\d{2}$/u];
-/** 行ごとの日付。ちょうど一つの行だけを並びに入れる。二つある行（期間）はどちらを並べたのか決められない。 */
-const datedLines = (run, points) => run.flatMap((line) => {
+/**
+ * 同じ親の下で同じ深さに並ぶ見出し（変更履歴の版ごとの見出し）。浅い見出しが来たら、それより深い並びは閉じる。
+ * 深い見出し（### 追加）は並びを切らず、親ごとに別の並びになる。
+ */
+export const siblingHeadingRuns = (headings) => siblingHeadingRunsOf(headings, (heading) => heading);
+/** 一行のただ一つの日付。二つある行（期間）はどちらを並べたのか決められないので、並びに入れない。 */
+const onlyDateIn = (line, points) => {
     const inside = points.filter((point) => point.offset >= line.start && point.offset <= line.end);
-    return inside.length === 1 && inside[0] !== undefined ? [inside[0]] : [];
+    return inside.length === 1 ? inside[0] : undefined;
+};
+/** 見出しの #、箇条書きの記号、表の最初の |。 */
+const LINE_MARKER = /^[ \t]*(?:#{1,6}|[-*+]|\d{1,3}[.)]|\|)?[ \t]*/u;
+const entryOf = (source, line, points) => {
+    const date = onlyDateIn(line, points);
+    if (date === undefined)
+        return undefined;
+    const text = source.slice(line.start, line.end);
+    return { ...date, version: leadingVersion(text.slice(LINE_MARKER.exec(text)?.[0].length ?? 0)) };
+};
+const datedLines = (source, run, points) => run.flatMap((line) => {
+    const entry = entryOf(source, line, points);
+    return entry === undefined ? [] : [entry];
 });
+/** 見出しの並びは、日付を一つ持つ見出しが続くあいだだけ。日付の無い見出しが混じる並び（問いに更新日を添えた FAQ）は、日付で並べたものではない。 */
+const datedStretches = (source, run, points) => run.reduce((stretches, heading) => {
+    const date = entryOf(source, heading, points);
+    if (date === undefined)
+        return [...stretches, []];
+    return [...stretches.slice(0, -1), [...(stretches.at(-1) ?? []), date]];
+}, [[]]);
 const samePrecision = (dated) => PRECISIONS.some((pattern) => dated.every((point) => pattern.test(point.value)));
 /** 上がりが多ければ 1、下がりが多ければ -1、同じ数なら 0（向きを決めない）。 */
 const majorityOf = (up, down) => Math.sign(up - down);
@@ -16,23 +44,44 @@ export const longestInOrder = (values, direction) => Math.max(0, ...values.reduc
 }, []));
 /** 日付のうち向きに沿うものが過半を占める。ひとつふたつの書き間違いなら残りが揃うが、名前順の一覧は揃わない。 */
 const mostlyInOrder = (values, direction) => longestInOrder(values, direction) * 2 > values.length;
-/** 多いほうの向きに逆らう一歩。後ろの項目の日付を指す。 */
+const without = (values, index) => values.filter((_, at) => at !== index);
+/**
+ * 向きに逆らう一歩（at - 1 から at）のうち、並びから外れているほう。取り除いたとき残りが長く揃うほうを指す。
+ * 前を取っても後ろを取っても同じだけ揃う（隣どうしの入れ替わり）なら、tieBreak が決めたほう、決まらなければ後ろを指す。
+ */
+export const outOfPlace = (values, at, direction, tieBreak = () => undefined) => {
+    const withoutBefore = longestInOrder(without(values, at - 1), direction);
+    const withoutAfter = longestInOrder(without(values, at), direction);
+    if (withoutBefore === withoutAfter)
+        return tieBreak(at - 1, at) ?? at;
+    return withoutBefore > withoutAfter ? at - 1 : at;
+};
+/** 外れた日付に、前の日付を添える。先頭の日付には前が無いので、次の日付を添える。 */
+const issueAt = (dated, at) => {
+    const point = dated[at];
+    if (point === undefined)
+        return [];
+    const neighbour = at === 0 ? { next: dated[1]?.value ?? "" } : { previous: dated[at - 1]?.value ?? "" };
+    return [{ offset: point.offset, values: { date: point.value, ...neighbour } }];
+};
+/** 多いほうの向きに逆らう一歩ごとに、並びから外れた日付を指す。 */
 const againstMajority = (dated) => {
-    const steps = dated
-        .slice(1)
-        .map((point, index) => ({ point, previous: dated[index], sign: Math.sign(point.value.localeCompare(dated[index]?.value ?? "")) }));
-    const up = steps.filter((step) => step.sign > 0).length;
-    const down = steps.filter((step) => step.sign < 0).length;
-    const majority = majorityOf(up, down);
     const values = dated.map((point) => point.value);
+    const signs = values.slice(1).map((value, index) => Math.sign(value.localeCompare(values[index] ?? "")));
+    const majority = majorityOf(signs.filter((sign) => sign > 0).length, signs.filter((sign) => sign < 0).length);
     if (majority === 0 || !mostlyInOrder(values, majority))
         return [];
-    return steps
-        .filter((step) => step.sign === -majority)
-        .map((step) => ({ offset: step.point.offset, values: { date: step.point.value, previous: step.previous?.value ?? "" } }));
+    return signs.flatMap((sign, index) => {
+        if (sign !== -majority)
+            return [];
+        return issueAt(dated, outOfPlace(values, index + 1, majority, (before, after) => breakDateTie(dated, before, after, majority)));
+    });
 };
-export const dateOrderBreaks = (source, points) => runsOf(source).flatMap((run) => {
-    const dated = datedLines(run, points);
-    return samePrecision(dated) ? againstMajority(dated) : [];
-});
+const breaksIn = (dated) => (samePrecision(dated) ? againstMajority(dated) : []);
+/** 見出しを箇条書きの中に書けば（「- ## 3.1.0 - 2026-10-02」）、同じ日付が両方の並びに入る。一度だけ言う。 */
+const oncePerOffset = (issues) => issues.filter((issue, index) => issues.findIndex((other) => other.offset === issue.offset) === index);
+export const dateOrderBreaks = (source, points, headings = []) => oncePerOffset([
+    ...runsOf(source).flatMap((run) => breaksIn(datedLines(source, run, points))),
+    ...siblingHeadingRuns(headings).flatMap((run) => datedStretches(source, run, points).flatMap(breaksIn)),
+]);
 //# sourceMappingURL=date-order.js.map

package/dist/structure/date-order.js.map

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

package/dist/structure/date-outside-period.d.ts

@@ -0,0 +1,33 @@
+import type { StructureIssue } from "./issues.ts";
+import { type DateMention, type Period, type PeriodWords } from "./stated-period.ts";
+/**
+ * 書いた期間の外の日付。期間の語で始まる一行（旅行期間：…）が期間を書き、その後ろ、同じ節の中の箇条書きの項目、表の行、見出しの日付を比べる。
+ * 地の文の日付は、年の無いもの（2月12日（金）の午前は…）だけを比べる。年のある日付は、過去の回や別の年の出来事を挙げることが多い。
+ * 期間の前後に置く予定（前泊、follow-up）、締め切りや予約の日、過去の回を言う語（period-aside）が、その行、文、節の見出しにあれば比べない。
+ * 年の無い期間（12月28日〜1月4日）は年をまたいで読む。
+ * 文書の仕事の期間（開講期間：…）を文書の頭か概要の節で書いたものは文書全体の期間で、後ろのどの節でも、締め切りの語（period-deadline）のある項目や文の、
+ * 期間の終わりより後の年のある日付を指す（課題の提出が学期の後）。期間の前の締め切り（申込締切）と、旅行期間のように後に締め切りが来てよい期間は比べない。
+ */
+export type HeadingSpan = {
+    readonly start: number;
+    readonly end: number;
+    readonly depth: number;
+};
+type Span = {
+    readonly start: number;
+    readonly end: number;
+};
+export type OutsideWords = PeriodWords & {
+    readonly asides: readonly string[];
+    /** 文書の仕事がその中で済む期間の語（開講期間、Term）。この期間は締め切りとだけ比べる。 */
+    readonly terms: readonly string[];
+    readonly deadlines: readonly string[];
+    readonly overviews: readonly string[];
+};
+/** 期間の中か。両方に年があれば年月日で、どちらかに年が無ければ月日で比べ、終わりが始まりより前の月日は年をまたぐ期間と読む。 */
+export declare const insidePeriod: (value: string, period: Pick<Period, "start" | "end">) => boolean;
+/** 英字の語は語の切れ目で、ほかは含むかで照らす。 */
+export declare const mentions: (text: string, words: readonly string[]) => boolean;
+export declare const datesOutsidePeriod: (source: string, dates: readonly DateMention[], headings: readonly HeadingSpan[], sentences: readonly Span[], words: OutsideWords) => StructureIssue[];
+export {};
+//# sourceMappingURL=date-outside-period.d.ts.map