chaffjs 0.34.0 → 0.36.0

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

@@ -2,6 +2,7 @@ import type { DatedPoint } from "./due-date.ts";
 import type { StructureIssue } from "./issues.ts";
 import type { Line } from "./lines.ts";
 import { type OrderLabel, type PairWords } from "./labelled-order.ts";
+import type { VersionWords } from "./versioned-label.ts";
 import { type PeriodWords } from "./stated-period.ts";
 /**
  * Two labelled dates that must come in order: a line (or a list item, or a table's first column) starting with an
@@ -63,6 +64,8 @@ export type PairedReading = {
     readonly spans?: PairSpans | undefined;
     readonly whole?: string | undefined;
     readonly signers?: readonly OrderLabel[] | undefined;
+    /** The words that join a version to a label (End of support for 5.0.0, 3.0.0 のサポート終了日). */
+    readonly versions?: VersionWords | undefined;
 };
 /**
  * Every pair of a dated-pair lexicon: the entries of one group with position before label the earlier date, those with
@@ -73,5 +76,5 @@ export type PairedReading = {
  * quote's mistake and a points statement's normal order.
  * reading.spans.entries are the dated-span lexicon's entries, for the span words a group reads by the period's start.
  */
-export declare const pairedDatesOutOfOrder: (source: string, dates: readonly OrderDate[], labels: readonly OrderLabel[], passed: readonly string[], maxLineGap: number, { spans, whole, signers }?: PairedReading) => PairedIssue[];
+export declare const pairedDatesOutOfOrder: (source: string, dates: readonly OrderDate[], labels: readonly OrderLabel[], passed: readonly string[], maxLineGap: number, { spans, whole, signers, versions }?: PairedReading) => PairedIssue[];
 //# sourceMappingURL=labelled-date-order.d.ts.map

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

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

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

@@ -78,12 +78,12 @@ const withoutRepeats = (issues) => issues.filter((issue, index) => issues.findIn
  * quote's mistake and a points statement's normal order.
  * reading.spans.entries are the dated-span lexicon's entries, for the span words a group reads by the period's start.
  */
-export const pairedDatesOutOfOrder = (source, dates, labels, passed, maxLineGap, { spans, whole = source, signers = [] } = {}) => withoutRepeats(labelPairsOf(labels).flatMap((pair) => {
+export const pairedDatesOutOfOrder = (source, dates, labels, passed, maxLineGap, { spans, whole = source, signers = [], versions } = {}) => withoutRepeats(labelPairsOf(labels).flatMap((pair) => {
     const context = contextOf(labels, pair.group);
     if (context.length > 0 && !namesDocumentKind(whole, context))
         return [];
     const fromStart = spanStartsOf(spans?.entries ?? [], pair.group);
-    const words = { ...pair, passed, maxLineGap, spans, fromStart, signers: signersOf(signers, pair.group) };
+    const words = { ...pair, passed, maxLineGap, spans, fromStart, signers: signersOf(signers, pair.group), versions };
     return datesOutOfOrder(source, dates, words).map(({ earlier, later }) => ({
         offset: Math.max(later.date.offset, earlier.date.offset),
         values: { later: later.date.value, earlier: earlier.date.value, later_label: later.label, earlier_label: earlier.label },

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

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

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

@@ -1,4 +1,5 @@
 import { type Line } from "./lines.ts";
+import { type VersionWords } from "./versioned-label.ts";
 /**
  * Two labelled points that must come in order: a line (or a list item, or a table's first column) starting with an
  * earlier-side word and one starting with a later-side word, each giving one point. What a point is (a date, a time of
@@ -21,6 +22,8 @@ export type PairWords = {
      * pointOf decides whether the line is one. A signature closes the whole document, so it is read at any distance.
      */
     readonly signers?: readonly string[] | undefined;
+    /** The words that join a version to a label (End of support for 5.0.0, 3.0.0 のサポート終了日). */
+    readonly versions?: VersionWords | undefined;
 };
 /** A labelled point: the word that labels it, as the lexicon writes it. span is set when the point ends a stated period. */
 export type LabelledPoint = {

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

@@ -1 +1 @@
-{"version":3,"file":"labelled-order.d.ts","sourceRoot":"","sources":["../../src/structure/labelled-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKhD;;;;GAIG;AAEH,wHAAwH;AACxH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,iHAAiH;IACjH,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,yGAAyG;IACzG,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAClD,CAAC;AAEF,4HAA4H;AAC5H,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAElI,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAA;CAAE,CAAC;AAE3F,sHAAsH;AACtH,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC;AAwCzI,oHAAoH;AACpH,MAAM,MAAM,WAAW,GAAG;IACxB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IAClD,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;CAC/D,CAAC;AAwBF,wFAAwF;AACxF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,EAAE,SAAS,OAAO,EAAE,UAAS,WAAgB,KAAG,SAAS,EAMzH,CAAC;AAEF,mHAAmH;AACnH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC;AAE/I,iIAAiI;AACjI,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAKzG,wEAAwE;AACxE,eAAO,MAAM,YAAY,GAAI,QAAQ,SAAS,UAAU,EAAE,KAAG,SAAS,EAKjE,CAAC"}
+{"version":3,"file":"labelled-order.d.ts","sourceRoot":"","sources":["../../src/structure/labelled-order.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIhD,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9E;;;;GAIG;AAEH,wHAAwH;AACxH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,iHAAiH;IACjH,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,yGAAyG;IACzG,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IACjD,2FAA2F;IAC3F,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAC9C,CAAC;AAEF,4HAA4H;AAC5H,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAElI,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAA;CAAE,CAAC;AAE3F,sHAAsH;AACtH,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,SAAS,MAAM,EAAE,KAAK,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC;AA8CzI,oHAAoH;AACpH,MAAM,MAAM,WAAW,GAAG;IACxB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IAClD,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;CAC/D,CAAC;AAwBF,wFAAwF;AACxF,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,EAAE,SAAS,OAAO,EAAE,UAAS,WAAgB,KAAG,SAAS,EAMzH,CAAC;AAEF,mHAAmH;AACnH,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC;AAE/I,iIAAiI;AACjI,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAKzG,wEAAwE;AACxE,eAAO,MAAM,YAAY,GAAI,QAAQ,SAAS,UAAU,EAAE,KAAG,SAAS,EAKjE,CAAC"}

package/dist/structure/labelled-order.js

@@ -2,16 +2,21 @@ import { linesOf } from "./lines.js";
 import { tableAround } from "./key-value-row.js";
 import { signerRoleOf } from "./signed-date-line.js";
 import { isTotalLabel } from "./total.js";
-const labelOf = (text, words) => words.find((word) => isTotalLabel(text, [word]));
+import { withoutLabelVersion } from "./versioned-label.js";
+const isVersionedLabel = (text, word, versions) => {
+    const bare = versions === undefined ? undefined : withoutLabelVersion(text, word, versions);
+    return bare !== undefined && isTotalLabel(bare, [word]);
+};
+const labelOf = (text, words, versions) => words.find((word) => isTotalLabel(text, [word]) || isVersionedLabel(text, word, versions));
 const signerOf = (text, words) => {
     const role = signerRoleOf(text, words.signers ?? []);
     return role === undefined ? undefined : { kind: "later", label: role, signed: true };
 };
 const kindOf = (text, words) => {
-    const earlier = labelOf(text, words.earlier);
+    const earlier = labelOf(text, words.earlier, words.versions);
     if (earlier !== undefined)
         return { kind: "earlier", label: earlier };
-    const later = labelOf(text, words.later);
+    const later = labelOf(text, words.later, words.versions);
     return later === undefined ? signerOf(text, words) : { kind: "later", label: later };
 };
 const withinGap = (later, earlier, maxLineGap) => later.signed === true || Math.abs(later.line - earlier.line) < maxLineGap;

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

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

package/dist/structure/list-lead-in.d.ts

@@ -0,0 +1,19 @@
+import type { Sentence, Span } from "../plugin.ts";
+/** 項目の文の頭の印の範囲（"(a)"、"①"）。番号は文の中身ではない。項目の文でなければ undefined。 */
+export declare const itemMarkerSpan: (sentence: Sentence) => Span | undefined;
+/**
+ * 項目の印の形（"(1)"、"(a)"、"(i)"、"①"、"・"）。番号そのものは数えない。
+ * 1 字の i・v・x は、同じ括弧の英字の項目がその前の字（h・u・w）で終わっていれば英字、でなければローマ数字。
+ */
+export declare const markerShape: (text: string, lastLetters: ReadonlyMap<string, string>) => {
+    readonly shape: string;
+    readonly letter?: string;
+} | undefined;
+/**
+ * 箇条書きの項目の文（listItem）ごとの、導入の文。近い順で、導入が項目なら、その導入も続ける。
+ * 導入は、並びの最初の項目のすぐ前の文で、「—」「:」「：」で終わるもの。同じ段落（空行を挟まない）の中で、同じ形の項目どうしは
+ * 同じ導入の下にある。
+ * sentences は文書の順。source は sentences の span の座標の文字列。
+ */
+export declare const listLeadIns: (source: string, sentences: readonly Sentence[]) => Map<Sentence, readonly Sentence[]>;
+//# sourceMappingURL=list-lead-in.d.ts.map

package/dist/structure/list-lead-in.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-lead-in.d.ts","sourceRoot":"","sources":["../../src/structure/list-lead-in.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AA8BnD,8DAA8D;AAC9D,eAAO,MAAM,cAAc,GAAI,UAAU,QAAQ,KAAG,IAAI,GAAG,SAG1D,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,aAAa,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,KAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAQ3I,CAAC;AAqBF;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,EAAE,WAAW,SAAS,QAAQ,EAAE,KAAG,GAAG,CAAC,QAAQ,EAAE,SAAS,QAAQ,EAAE,CAgB7G,CAAC"}

package/dist/structure/list-lead-in.js

@@ -0,0 +1,85 @@
+// 箇条書きの項目の文が、どの導入の文の下にあるか。「(3) If … no such resolution is made—\n(a) the Commissioner must issue …」の
+// (a) は (3) の条件の下にあり、(a) だけを読むと条件が落ちる。
+/** 導入の文の終わり。この後に項目が並ぶ（"must include—"、"is made:"、「承認した場合：」）。 */
+const LEAD_IN_END = /[:：—–]\s*$/u;
+/** 空行。そこで段落が改まり、導入はそこを越えて探さない。 */
+const BLANK_LINE = /\n[^\S\n]*\n/u;
+/** 項目の頭の印: 開き括弧、番号か記号（囲み数字や仮名は 1 字）、閉じ括弧か点。 */
+const MARKER = /^\s*([(（［[]?)([0-9０-９]+|[a-zA-Zａ-ｚＡ-Ｚ]+|[一二三四五六七八九十]+|\S)([)）］\].．]?)/u;
+/** 1 字のローマ数字。英字の並び（(h) の次の (i)）でもありうる。 */
+const SINGLE_ROMAN = /^[ivxIVX]$/u;
+const ROMAN = /^(?:[ivxlc]{2,}|[IVXLC]{2,})$/u;
+const labelClass = (label) => {
+    if (/^[0-9０-９]+$/u.test(label))
+        return "1";
+    if (ROMAN.test(label) || SINGLE_ROMAN.test(label))
+        return /[a-z]/u.test(label) ? "i" : "I";
+    if (/^[a-zａ-ｚ]+$/u.test(label))
+        return "a";
+    if (/^[A-ZＡ-Ｚ]+$/u.test(label))
+        return "A";
+    if (/^[一二三四五六七八九十]+$/u.test(label))
+        return "一";
+    if (/^[\p{Script=Katakana}\p{Script=Hiragana}]$/u.test(label))
+        return "イ";
+    if (/^[①-⑳㉑-㉟㊱-㊿]$/u.test(label))
+        return "①";
+    if (/^[⑴-⒇]$/u.test(label))
+        return "⑴";
+    return label;
+};
+/** 項目の文の頭の印の範囲（"(a)"、"①"）。番号は文の中身ではない。項目の文でなければ undefined。 */
+export const itemMarkerSpan = (sentence) => {
+    const match = sentence.listItem === true ? MARKER.exec(sentence.text) : null;
+    return match === null ? undefined : { start: sentence.span.start, end: sentence.span.start + match[0].length };
+};
+const previousLetter = (label) => String.fromCharCode(label.charCodeAt(0) - 1);
+/**
+ * 項目の印の形（"(1)"、"(a)"、"(i)"、"①"、"・"）。番号そのものは数えない。
+ * 1 字の i・v・x は、同じ括弧の英字の項目がその前の字（h・u・w）で終わっていれば英字、でなければローマ数字。
+ */
+export const markerShape = (text, lastLetters) => {
+    const match = MARKER.exec(text);
+    const [, open = "", label, close = ""] = match ?? [];
+    if (label === undefined)
+        return undefined;
+    const letterShape = `${open}${/[a-z]/u.test(label) ? "a" : "A"}${close}`;
+    const continuesLetters = SINGLE_ROMAN.test(label) && lastLetters.get(letterShape) === previousLetter(label);
+    const shape = continuesLetters ? letterShape : `${open}${labelClass(label)}${close}`;
+    return shape === letterShape ? { shape, letter: label } : { shape };
+};
+const newBlock = () => ({ lastByShape: new Map(), lastLetters: new Map(), leadIn: undefined });
+/** 項目の導入の文: すぐ前の文が導入で、それより後に同じ形の項目（兄弟）が無ければその文とその導入、でなければ兄弟の導入。 */
+const leadInsOf = (block, shape) => {
+    const sibling = block.lastByShape.get(shape);
+    const leadIn = block.leadIn;
+    if (sibling !== undefined && (leadIn === undefined || sibling.at >= leadIn.at))
+        return sibling.entry.leadIns;
+    return leadIn === undefined ? [] : [leadIn.entry.sentence, ...leadIn.entry.leadIns];
+};
+/**
+ * 箇条書きの項目の文（listItem）ごとの、導入の文。近い順で、導入が項目なら、その導入も続ける。
+ * 導入は、並びの最初の項目のすぐ前の文で、「—」「:」「：」で終わるもの。同じ段落（空行を挟まない）の中で、同じ形の項目どうしは
+ * 同じ導入の下にある。
+ * sentences は文書の順。source は sentences の span の座標の文字列。
+ */
+export const listLeadIns = (source, sentences) => {
+    const found = new Map();
+    let block = newBlock();
+    sentences.forEach((sentence, at) => {
+        const previous = sentences[at - 1];
+        if (previous !== undefined && BLANK_LINE.test(source.slice(previous.span.end, sentence.span.start)))
+            block = newBlock();
+        const marker = sentence.listItem === true ? markerShape(sentence.text, block.lastLetters) : undefined;
+        const entry = { sentence, leadIns: marker === undefined ? [] : leadInsOf(block, marker.shape) };
+        if (marker !== undefined) {
+            found.set(sentence, entry.leadIns);
+            block.lastByShape.set(marker.shape, { at, entry });
+            if (marker.letter !== undefined)
+                block.lastLetters.set(marker.shape, marker.letter.at(-1) ?? "");
+        }
+        block.leadIn = LEAD_IN_END.test(sentence.text) ? { at, entry } : undefined;
+    });
+    return found;
+};
+//# sourceMappingURL=list-lead-in.js.map

package/dist/structure/list-lead-in.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-lead-in.js","sourceRoot":"","sources":["../../src/structure/list-lead-in.ts"],"names":[],"mappings":"AAEA,qGAAqG;AACrG,uCAAuC;AAEvC,gEAAgE;AAChE,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,kCAAkC;AAClC,MAAM,UAAU,GAAG,eAAe,CAAC;AAEnC,+CAA+C;AAC/C,MAAM,MAAM,GAAG,wEAAwE,CAAC;AAExF,0CAA0C;AAC1C,MAAM,YAAY,GAAG,aAAa,CAAC;AACnC,MAAM,KAAK,GAAG,gCAAgC,CAAC;AAE/C,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE;IAC3C,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC3C,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC3F,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC3C,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC3C,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC/C,IAAI,6CAA6C,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC1E,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC7C,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IACvC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAoB,EAAE;IACrE,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7E,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;AACjH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/F;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,WAAwC,EAAoE,EAAE;IACtJ,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,EAAE,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;IACrD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,WAAW,GAAG,GAAG,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC;IACzE,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC;IAC5G,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC;IACrF,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;AACtE,CAAC,CAAC;AAWF,MAAM,QAAQ,GAAG,GAAU,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;AAEtG,mEAAmE;AACnE,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,KAAa,EAAuB,EAAE;IACrE,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;IAC7G,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,SAA8B,EAAsC,EAAE;IAChH,MAAM,KAAK,GAAG,IAAI,GAAG,EAAiC,CAAC;IACvD,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,KAAK,GAAG,QAAQ,EAAE,CAAC;QACxH,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtG,MAAM,KAAK,GAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACvG,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACnD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS;gBAAE,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/dist/structure/list-numbering.d.ts

@@ -1,17 +1,33 @@
 import type { Span } from "../plugin.ts";
 import type { StructureIssue } from "./issues.ts";
-/** One item's written number: where the item starts, the number and the number as written (「4.」). */
+/** One item's written number: where the item starts and ends, its column, the number and the number as written (「4.」). */
 export type WrittenNumber = {
     readonly offset: number;
     readonly number: number;
     readonly label: string;
+    readonly indent?: number;
+    readonly end?: number;
 };
 /** The number written at the start of each item, or undefined when an item has none (a bulleted list). */
 export declare const writtenNumbers: (source: string, itemSpans: readonly Span[]) => WrittenNumber[] | undefined;
+/** The last number of an ordered list nested in an item, if there is one. */
+export type NestedLast = (item: WrittenNumber) => number | undefined;
 /**
- * Each item whose number is not one more than the item before it. A list that writes one number on every item (「1.」 on
- * each, which Markdown counts up) is numbered by the renderer, not by the writer, and is not read. An item numbered 1
+ * For an item, the last number of the ordered list inside it that ends last (the outermost one, when lists nested in
+ * each other end together). lists are the item spans of every list in the document; bulleted lists are left out.
+ */
+export declare const nestedLastFinder: (source: string, lists: readonly (readonly Span[])[]) => NestedLast;
+/**
+ * Each item whose number is not one more than the item it follows. A list that writes one number on every item (「1.」
+ * on each, which Markdown counts up) is numbered by the renderer, not by the writer, and is not read. An item numbered 1
  * starts a new count, as the structure rule reads a 1 that follows other items.
  */
-export declare const listNumberBreaks: (items: readonly WrittenNumber[]) => StructureIssue[];
+export declare const listNumberBreaks: (items: readonly WrittenNumber[], nestedLast?: NestedLast) => StructureIssue[];
+type ListSpans = {
+    readonly span: Span;
+    readonly itemSpans: readonly Span[];
+};
+/** The breaks in the document's lists that are checked; every list, checked or not, tells which ordered list sits inside an item. */
+export declare const listsNumberBreaks: (source: string, lists: readonly ListSpans[], isChecked: (list: ListSpans) => boolean) => StructureIssue[];
+export {};
 //# sourceMappingURL=list-numbering.d.ts.map

package/dist/structure/list-numbering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-numbering.d.ts","sourceRoot":"","sources":["../../src/structure/list-numbering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAIlD,qGAAqG;AACrG,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzG,0GAA0G;AAC1G,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,WAAW,SAAS,IAAI,EAAE,KAAG,aAAa,EAAE,GAAG,SAQ7F,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,SAAS,aAAa,EAAE,KAAG,cAAc,EAOhF,CAAC"}
+{"version":3,"file":"list-numbering.d.ts","sourceRoot":"","sources":["../../src/structure/list-numbering.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAKlD,0HAA0H;AAC1H,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAcF,0GAA0G;AAC1G,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,WAAW,SAAS,IAAI,EAAE,KAAG,aAAa,EAAE,GAAG,SAM7F,CAAC;AAEF,6EAA6E;AAC7E,MAAM,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,MAAM,GAAG,SAAS,CAAC;AAUrE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,KAAG,UAStF,CAAC;AAsCF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,SAAS,aAAa,EAAE,EAAE,aAAY,UAA4B,KAAG,cAAc,EAM1H,CAAC;AAEF,KAAK,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,IAAI,EAAE,CAAA;CAAE,CAAC;AAE9E,qIAAqI;AACrI,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,SAAS,EAAE,EAAE,WAAW,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,KAAG,cAAc,EAMtI,CAAC"}

package/dist/structure/list-numbering.js

@@ -1,27 +1,83 @@
 const ITEM_NUMBER = /^(?<number>\d{1,9})(?<delimiter>[.)])[ \t]/u;
+const TAB_WIDTH = 4;
+/** The column an offset sits at, a tab counted to the next stop of four as CommonMark counts it. */
+const columnAt = (source, offset) => Array.from(source.slice(source.lastIndexOf("\n", offset - 1) + 1, offset)).reduce((column, char) => (char === "\t" ? column + TAB_WIDTH - (column % TAB_WIDTH) : column + 1), 0);
+const numberAt = (source, span) => {
+    const found = ITEM_NUMBER.exec(source.slice(span.start, span.end))?.groups;
+    return found === undefined ? undefined : { number: Number(found["number"]), label: `${found["number"] ?? ""}${found["delimiter"] ?? ""}` };
+};
 /** The number written at the start of each item, or undefined when an item has none (a bulleted list). */
 export const writtenNumbers = (source, itemSpans) => {
     const numbers = itemSpans.map((span) => {
-        const found = ITEM_NUMBER.exec(source.slice(span.start, span.end))?.groups;
-        return found === undefined
-            ? undefined
-            : { offset: span.start, number: Number(found["number"]), label: `${found["number"] ?? ""}${found["delimiter"] ?? ""}` };
+        const found = numberAt(source, span);
+        return found === undefined ? undefined : { offset: span.start, end: span.end, ...found, indent: columnAt(source, span.start) };
     });
     return numbers.every((entry) => entry !== undefined) ? numbers : undefined;
 };
+const orderedListOf = (source, spans) => {
+    const first = spans[0];
+    const last = writtenNumbers(source, spans)?.at(-1);
+    return first === undefined || last === undefined ? [] : [{ start: first.start, end: last.end ?? last.offset, last: last.number }];
+};
+/**
+ * For an item, the last number of the ordered list inside it that ends last (the outermost one, when lists nested in
+ * each other end together). lists are the item spans of every list in the document; bulleted lists are left out.
+ */
+export const nestedLastFinder = (source, lists) => {
+    const ordered = lists.flatMap((spans) => orderedListOf(source, spans));
+    return (item) => ordered
+        .filter((list) => list.start > item.offset && list.end <= (item.end ?? item.offset))
+        .reduce((best, list) => (best === undefined || list.end > best.end || (list.end === best.end && list.start < best.start) ? list : best), undefined)?.last;
+};
+const indentOf = (item) => item.indent ?? 0;
 /**
- * Each item whose number is not one more than the item before it. A list that writes one number on every item (「1.」 on
- * each, which Markdown counts up) is numbered by the renderer, not by the writer, and is not read. An item numbered 1
+ * Which item each item's number follows. An item at the same indentation follows the last one there. An item indented
+ * deeper starts a nested count (CommonMark can still put it in the same list, when the indentation falls short of the
+ * parent's text), unless it carries on the count above it: the parent's number plus one (a slip of indentation), or
+ * one past the last number of the list nested in the parent (that list, carried on at a different indentation).
+ */
+const comparedPairs = (items, nestedLast) => {
+    const open = [];
+    return items.map((item) => {
+        const popped = [];
+        for (let top = open.at(-1); top !== undefined && indentOf(top) > indentOf(item); top = open.at(-1)) {
+            popped.push(top);
+            open.pop();
+        }
+        const parent = open.at(-1);
+        if (parent !== undefined && indentOf(parent) === indentOf(item)) {
+            open[open.length - 1] = item;
+            return { item, previous: parent };
+        }
+        if (parent === undefined) {
+            open.push(item);
+            return { item, previous: popped.at(-1) };
+        }
+        if (item.number === parent.number + 1) {
+            open[open.length - 1] = { ...item, indent: indentOf(parent) };
+            return { item, previous: parent };
+        }
+        open.push(item);
+        return { item, previous: item.number === 1 || item.number === (nestedLast(parent) ?? 0) + 1 ? undefined : parent };
+    });
+};
+/**
+ * Each item whose number is not one more than the item it follows. A list that writes one number on every item (「1.」
+ * on each, which Markdown counts up) is numbered by the renderer, not by the writer, and is not read. An item numbered 1
  * starts a new count, as the structure rule reads a 1 that follows other items.
  */
-export const listNumberBreaks = (items) => {
+export const listNumberBreaks = (items, nestedLast = () => undefined) => {
     if (new Set(items.map((item) => item.number)).size < 2)
         return [];
-    return items.flatMap((item, index) => {
-        const previous = items[index - 1];
+    return comparedPairs(items, nestedLast).flatMap(({ item, previous }) => {
         if (previous === undefined || item.number === previous.number + 1 || item.number === 1)
             return [];
         return [{ offset: item.offset, values: { previous: previous.label, label: item.label, expected: previous.number + 1, found: item.number } }];
     });
 };
+/** The breaks in the document's lists that are checked; every list, checked or not, tells which ordered list sits inside an item. */
+export const listsNumberBreaks = (source, lists, isChecked) => {
+    const nestedLast = nestedLastFinder(source, lists.map((list) => list.itemSpans));
+    return lists.filter(isChecked).flatMap((list) => listNumberBreaks(writtenNumbers(source, list.itemSpans) ?? [], nestedLast));
+};
 //# sourceMappingURL=list-numbering.js.map

package/dist/structure/list-numbering.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-numbering.js","sourceRoot":"","sources":["../../src/structure/list-numbering.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,GAAG,6CAA6C,CAAC;AAKlE,0GAA0G;AAC1G,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,SAA0B,EAA+B,EAAE;IACxG,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC;QAC3E,OAAO,KAAK,KAAK,SAAS;YACxB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;IAC5H,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7E,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAA+B,EAAoB,EAAE;IACpF,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAClE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAClC,IAAI,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAClG,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/I,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"list-numbering.js","sourceRoot":"","sources":["../../src/structure/list-numbering.ts"],"names":[],"mappings":"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"}

package/dist/structure/listed-paragraph.d.ts

@@ -0,0 +1,16 @@
+import type { StructureNode } from "../plugin.ts";
+/** 本文の行頭に箇条書きで書かれた番号。全角は半角の数にする（「２．」は 2）。Pure. */
+export declare const listedNumbers: (body: string) => ReadonlySet<number>;
+/** 「3.3」を条の番地「3」と項の番号 3 に分ける。項の先まで指す（3.3.1）か、項が数でなければ undefined。Pure. */
+export declare const articleParagraph: (target: string) => {
+    readonly article: string;
+    readonly paragraph: number;
+} | undefined;
+/**
+ * 木が項を一つも読まなかった条ごとの、箇条書きの番号。条の本文は一度だけ読む。同じ番地の条が二つあれば、どちらかに書いてあればよい。
+ * nodes は木を平らにしたもの。Pure.
+ */
+export declare const listedParagraphsByArticle: (nodes: readonly StructureNode[], source: string) => ReadonlyMap<string, ReadonlySet<number>>;
+/** 参照（第3条第3項）の項を、その条の箇条書きが書いているか。Pure. */
+export declare const isListedParagraph: (target: string, listed: ReadonlyMap<string, ReadonlySet<number>>) => boolean;
+//# sourceMappingURL=listed-paragraph.d.ts.map

package/dist/structure/listed-paragraph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"listed-paragraph.d.ts","sourceRoot":"","sources":["../../src/structure/listed-paragraph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAOlD,kDAAkD;AAClD,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,WAAW,CAAC,MAAM,CAM5D,CAAC;AAEJ,yEAAyE;AACzE,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,KAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAK5G,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,GAAI,OAAO,SAAS,aAAa,EAAE,EAAE,QAAQ,MAAM,KAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAUlI,CAAC;AAEF,0CAA0C;AAC1C,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,EAAE,QAAQ,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,KAAG,OAGpG,CAAC"}

package/dist/structure/listed-paragraph.js

@@ -0,0 +1,37 @@
+// 箇条書きで書いた項。規程は条の下の項を「1. 」「２．」の箇条書きで書くことがあり、木はそれを項として読まない。
+/** 行頭の箇条書きの番号（「1. 」「２．」）。前の空白（全角も）を飛ばし、全角の数字と点も読む。 */
+const LIST_MARK = /^[ \t\u3000]*(?<n>[0-9０-９]{1,3})[.．]/u;
+/** 本文の行頭に箇条書きで書かれた番号。全角は半角の数にする（「２．」は 2）。Pure. */
+export const listedNumbers = (body) => new Set(body.split("\n").flatMap((line) => {
+    const written = LIST_MARK.exec(line)?.groups?.["n"];
+    return written === undefined ? [] : [Number(written.normalize("NFKC"))];
+}));
+/** 「3.3」を条の番地「3」と項の番号 3 に分ける。項の先まで指す（3.3.1）か、項が数でなければ undefined。Pure. */
+export const articleParagraph = (target) => {
+    const parts = target.split(".");
+    const [article, paragraph] = parts;
+    if (parts.length !== 2 || article === undefined || paragraph === undefined || !/^\d{1,3}$/u.test(paragraph))
+        return undefined;
+    return { article, paragraph: Number(paragraph) };
+};
+/**
+ * 木が項を一つも読まなかった条ごとの、箇条書きの番号。条の本文は一度だけ読む。同じ番地の条が二つあれば、どちらかに書いてあればよい。
+ * nodes は木を平らにしたもの。Pure.
+ */
+export const listedParagraphsByArticle = (nodes, source) => {
+    const byArticle = new Map();
+    nodes
+        .filter((node) => node.kind === "article" && !node.children.some((child) => child.kind === "item"))
+        .forEach((article) => {
+        const numbers = byArticle.get(article.address) ?? new Set();
+        listedNumbers(source.slice(article.span.start, article.span.end)).forEach((number) => numbers.add(number));
+        byArticle.set(article.address, numbers);
+    });
+    return byArticle;
+};
+/** 参照（第3条第3項）の項を、その条の箇条書きが書いているか。Pure. */
+export const isListedParagraph = (target, listed) => {
+    const wanted = articleParagraph(target);
+    return wanted !== undefined && listed.get(wanted.article)?.has(wanted.paragraph) === true;
+};
+//# sourceMappingURL=listed-paragraph.js.map

package/dist/structure/listed-paragraph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"listed-paragraph.js","sourceRoot":"","sources":["../../src/structure/listed-paragraph.ts"],"names":[],"mappings":"AAEA,2DAA2D;AAE3D,sDAAsD;AACtD,MAAM,SAAS,GAAG,uCAAuC,CAAC;AAE1D,kDAAkD;AAClD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAuB,EAAE,CACjE,IAAI,GAAG,CACL,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;IAChC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;IACpD,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC,CAAC,CACH,CAAC;AAEJ,yEAAyE;AACzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAwE,EAAE;IACvH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9H,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAA+B,EAAE,MAAc,EAA4C,EAAE;IACrI,MAAM,SAAS,GAAG,IAAI,GAAG,EAAuB,CAAC;IACjD,KAAK;SACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;SAClG,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;QACpE,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3G,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACL,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,0CAA0C;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,MAAgD,EAAW,EAAE;IAC7G,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;AAC5F,CAAC,CAAC"}

package/dist/structure/modal-conflict.d.ts

@@ -17,13 +17,18 @@ export type ModalConflict = {
     readonly earlier: ModalStatement;
 };
 export declare const CONTENT: ReadonlySet<string>;
-/** 文の中身の語を、原形の小文字で、重ねずに並べたもの。様相の語の範囲にかかる語は外す。 */
+/**
+ * 文の中身の語を、原形の小文字で、重ねずに並べたもの。様相の語の範囲にかかる語は外す。
+ * 打ち消しの印の付いた機能語（negationsMarked）は、近くの中身の語に印を付ける（negatedWords）。様相の語の中の打ち消し（must not）は数えない。
+ */
 export declare const contentKey: (tokens: readonly Token[], markers: readonly Span[]) => string;
 /**
  * 様相の語を一つだけ持つ文の、様相と中身。二つ以上持つ文（shall do A and shall not do B）は、どの語がどの行為にかかるかが
  * 中身の語の集まりからは分からないので外す。品詞の無い文も外す。
+ * leadIns は箇条書きの項目の文の導入の文（listLeadIns）。項目の中身には導入の中身の語を足す。導入の条件（"If … is made—"）は
+ * 項目の行為の条件なので、違う導入の下の項目どうしは、同じ行為を決めていない。
  */
-export declare const modalStatements: (obligations: readonly Obligation[], sentences: readonly Sentence[]) => ModalStatement[];
+export declare const modalStatements: (obligations: readonly Obligation[], sentences: readonly Sentence[], leadIns?: ReadonlyMap<Sentence, readonly Sentence[]>) => ModalStatement[];
 /** 前に同じ中身で逆の様相を書いた文がある文。中身と様相の組ごとに、最初の文と比べる。 */
 export declare const modalConflicts: (statements: readonly ModalStatement[]) => ModalConflict[];
 //# sourceMappingURL=modal-conflict.d.ts.map

package/dist/structure/modal-conflict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal-conflict.d.ts","sourceRoot":"","sources":["../../src/structure/modal-conflict.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAK1D,4CAA4C;AAC5C,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1H,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/H,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAErG,eAAO,MAAM,OAAO,EAAE,WAAW,CAAC,MAAM,CAA6C,CAAC;AActF,iDAAiD;AACjD,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,KAAK,EAAE,EAAE,SAAS,SAAS,IAAI,EAAE,KAAG,MASlE,CAAC;AAiBf;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,aAAa,SAAS,UAAU,EAAE,EAAE,WAAW,SAAS,QAAQ,EAAE,KAAG,cAAc,EAelH,CAAC;AAEF,gDAAgD;AAChD,eAAO,MAAM,cAAc,GAAI,YAAY,SAAS,cAAc,EAAE,KAAG,aAAa,EAUnF,CAAC"}
+{"version":3,"file":"modal-conflict.d.ts","sourceRoot":"","sources":["../../src/structure/modal-conflict.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAM1D,4CAA4C;AAC5C,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1H,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/H,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAErG,eAAO,MAAM,OAAO,EAAE,WAAW,CAAC,MAAM,CAA6C,CAAC;AActF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,KAAK,EAAE,EAAE,SAAS,SAAS,IAAI,EAAE,KAAG,MAclE,CAAC;AAqBf;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,aAAa,SAAS,UAAU,EAAE,EAClC,WAAW,SAAS,QAAQ,EAAE,EAC9B,UAAS,WAAW,CAAC,QAAQ,EAAE,SAAS,QAAQ,EAAE,CAAa,KAC9D,cAAc,EA8BhB,CAAC;AAEF,gDAAgD;AAChD,eAAO,MAAM,cAAc,GAAI,YAAY,SAAS,cAAc,EAAE,KAAG,aAAa,EAUnF,CAAC"}