chaffjs 0.29.0 → 0.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (198) hide show
  1. package/dist/derived/session-hours.d.ts +26 -0
  2. package/dist/derived/session-hours.d.ts.map +1 -0
  3. package/dist/derived/session-hours.js +29 -0
  4. package/dist/derived/session-hours.js.map +1 -0
  5. package/dist/derived/time-lengths.d.ts +37 -0
  6. package/dist/derived/time-lengths.d.ts.map +1 -0
  7. package/dist/derived/time-lengths.js +168 -0
  8. package/dist/derived/time-lengths.js.map +1 -0
  9. package/dist/derived/unit-counts.d.ts +7 -0
  10. package/dist/derived/unit-counts.d.ts.map +1 -0
  11. package/dist/derived/unit-counts.js +13 -0
  12. package/dist/derived/unit-counts.js.map +1 -0
  13. package/dist/derived/working-hours.d.ts +36 -0
  14. package/dist/derived/working-hours.d.ts.map +1 -0
  15. package/dist/derived/working-hours.js +55 -0
  16. package/dist/derived/working-hours.js.map +1 -0
  17. package/dist/detectors/acronym-expansion.d.ts +1 -1
  18. package/dist/detectors/acronym-expansion.d.ts.map +1 -1
  19. package/dist/detectors/acronym-expansion.js +46 -2
  20. package/dist/detectors/acronym-expansion.js.map +1 -1
  21. package/dist/detectors/capitalised-term.d.ts +44 -0
  22. package/dist/detectors/capitalised-term.d.ts.map +1 -0
  23. package/dist/detectors/capitalised-term.js +101 -0
  24. package/dist/detectors/capitalised-term.js.map +1 -0
  25. package/dist/detectors/date-outside-period.d.ts.map +1 -1
  26. package/dist/detectors/date-outside-period.js +4 -1
  27. package/dist/detectors/date-outside-period.js.map +1 -1
  28. package/dist/detectors/derived-numbers.d.ts +2 -0
  29. package/dist/detectors/derived-numbers.d.ts.map +1 -1
  30. package/dist/detectors/derived-numbers.js +72 -18
  31. package/dist/detectors/derived-numbers.js.map +1 -1
  32. package/dist/detectors/name-variant.d.ts.map +1 -1
  33. package/dist/detectors/name-variant.js +57 -10
  34. package/dist/detectors/name-variant.js.map +1 -1
  35. package/dist/detectors/party-order.d.ts +3 -0
  36. package/dist/detectors/party-order.d.ts.map +1 -0
  37. package/dist/detectors/party-order.js +46 -0
  38. package/dist/detectors/party-order.js.map +1 -0
  39. package/dist/detectors/registry/connection-time-short.d.ts +3 -0
  40. package/dist/detectors/registry/connection-time-short.d.ts.map +1 -0
  41. package/dist/detectors/registry/connection-time-short.js +3 -0
  42. package/dist/detectors/registry/connection-time-short.js.map +1 -0
  43. package/dist/detectors/registry/duration-product-mismatch.d.ts +3 -0
  44. package/dist/detectors/registry/duration-product-mismatch.d.ts.map +1 -0
  45. package/dist/detectors/registry/duration-product-mismatch.js +3 -0
  46. package/dist/detectors/registry/duration-product-mismatch.js.map +1 -0
  47. package/dist/detectors/registry/party-order.d.ts +3 -0
  48. package/dist/detectors/registry/party-order.d.ts.map +1 -0
  49. package/dist/detectors/registry/party-order.js +3 -0
  50. package/dist/detectors/registry/party-order.js.map +1 -0
  51. package/dist/detectors/registry/requirement-lists.d.ts +3 -0
  52. package/dist/detectors/registry/requirement-lists.d.ts.map +1 -0
  53. package/dist/detectors/registry/requirement-lists.js +3 -0
  54. package/dist/detectors/registry/requirement-lists.js.map +1 -0
  55. package/dist/detectors/registry/return-type.d.ts +3 -0
  56. package/dist/detectors/registry/return-type.d.ts.map +1 -0
  57. package/dist/detectors/registry/return-type.js +3 -0
  58. package/dist/detectors/registry/return-type.js.map +1 -0
  59. package/dist/detectors/requirement-lists.d.ts +3 -0
  60. package/dist/detectors/requirement-lists.d.ts.map +1 -0
  61. package/dist/detectors/requirement-lists.js +46 -0
  62. package/dist/detectors/requirement-lists.js.map +1 -0
  63. package/dist/detectors/return-type.d.ts +3 -0
  64. package/dist/detectors/return-type.d.ts.map +1 -0
  65. package/dist/detectors/return-type.js +24 -0
  66. package/dist/detectors/return-type.js.map +1 -0
  67. package/dist/detectors/structure-tree.d.ts.map +1 -1
  68. package/dist/detectors/structure-tree.js +9 -1
  69. package/dist/detectors/structure-tree.js.map +1 -1
  70. package/dist/detectors/time-order.d.ts +1 -0
  71. package/dist/detectors/time-order.d.ts.map +1 -1
  72. package/dist/detectors/time-order.js +30 -4
  73. package/dist/detectors/time-order.js.map +1 -1
  74. package/dist/detectors/undefined-term.d.ts.map +1 -1
  75. package/dist/detectors/undefined-term.js +19 -3
  76. package/dist/detectors/undefined-term.js.map +1 -1
  77. package/dist/document.d.ts.map +1 -1
  78. package/dist/document.js +4 -1
  79. package/dist/document.js.map +1 -1
  80. package/dist/facts/table-facts.d.ts +2 -0
  81. package/dist/facts/table-facts.d.ts.map +1 -1
  82. package/dist/facts/table-facts.js +2 -0
  83. package/dist/facts/table-facts.js.map +1 -1
  84. package/dist/name-variants.d.ts +6 -1
  85. package/dist/name-variants.d.ts.map +1 -1
  86. package/dist/name-variants.js +68 -0
  87. package/dist/name-variants.js.map +1 -1
  88. package/dist/name-word-order.d.ts +49 -0
  89. package/dist/name-word-order.d.ts.map +1 -0
  90. package/dist/name-word-order.js +114 -0
  91. package/dist/name-word-order.js.map +1 -0
  92. package/dist/plugin.d.ts +7 -0
  93. package/dist/plugin.d.ts.map +1 -1
  94. package/dist/return-type.d.ts +33 -0
  95. package/dist/return-type.d.ts.map +1 -0
  96. package/dist/return-type.js +302 -0
  97. package/dist/return-type.js.map +1 -0
  98. package/dist/structure/connection-times.d.ts +56 -0
  99. package/dist/structure/connection-times.d.ts.map +1 -0
  100. package/dist/structure/connection-times.js +165 -0
  101. package/dist/structure/connection-times.js.map +1 -0
  102. package/dist/structure/date-order-tie.d.ts +13 -0
  103. package/dist/structure/date-order-tie.d.ts.map +1 -0
  104. package/dist/structure/date-order-tie.js +61 -0
  105. package/dist/structure/date-order-tie.js.map +1 -0
  106. package/dist/structure/date-order.d.ts +2 -2
  107. package/dist/structure/date-order.d.ts.map +1 -1
  108. package/dist/structure/date-order.js +26 -9
  109. package/dist/structure/date-order.js.map +1 -1
  110. package/dist/structure/date-outside-period.d.ts +6 -0
  111. package/dist/structure/date-outside-period.d.ts.map +1 -1
  112. package/dist/structure/date-outside-period.js +49 -3
  113. package/dist/structure/date-outside-period.js.map +1 -1
  114. package/dist/structure/date-range.d.ts +5 -2
  115. package/dist/structure/date-range.d.ts.map +1 -1
  116. package/dist/structure/date-range.js +37 -9
  117. package/dist/structure/date-range.js.map +1 -1
  118. package/dist/structure/leg-times.d.ts +2 -0
  119. package/dist/structure/leg-times.d.ts.map +1 -1
  120. package/dist/structure/leg-times.js +13 -0
  121. package/dist/structure/leg-times.js.map +1 -1
  122. package/dist/structure/party-order.d.ts +33 -0
  123. package/dist/structure/party-order.d.ts.map +1 -0
  124. package/dist/structure/party-order.js +79 -0
  125. package/dist/structure/party-order.js.map +1 -0
  126. package/dist/structure/requirement-lists.d.ts +37 -0
  127. package/dist/structure/requirement-lists.d.ts.map +1 -0
  128. package/dist/structure/requirement-lists.js +89 -0
  129. package/dist/structure/requirement-lists.js.map +1 -0
  130. package/dist/structure/time-order.d.ts +21 -0
  131. package/dist/structure/time-order.d.ts.map +1 -1
  132. package/dist/structure/time-order.js +5 -6
  133. package/dist/structure/time-order.js.map +1 -1
  134. package/dist/structure/version-order.d.ts +2 -0
  135. package/dist/structure/version-order.d.ts.map +1 -1
  136. package/dist/structure/version-order.js +10 -0
  137. package/dist/structure/version-order.js.map +1 -1
  138. package/dist/surname-near.d.ts +6 -0
  139. package/dist/surname-near.d.ts.map +1 -0
  140. package/dist/surname-near.js +31 -0
  141. package/dist/surname-near.js.map +1 -0
  142. package/dist/table-cells.d.ts +13 -0
  143. package/dist/table-cells.d.ts.map +1 -0
  144. package/dist/table-cells.js +36 -0
  145. package/dist/table-cells.js.map +1 -0
  146. package/dist/table-names.d.ts +42 -0
  147. package/dist/table-names.d.ts.map +1 -0
  148. package/dist/table-names.js +94 -0
  149. package/dist/table-names.js.map +1 -0
  150. package/package.json +3 -3
  151. package/rules/connection-time-short.yaml +52 -0
  152. package/rules/date-outside-period.yaml +4 -4
  153. package/rules/duration-mismatch.yaml +7 -4
  154. package/rules/duration-product-mismatch.yaml +73 -0
  155. package/rules/name-variant.yaml +8 -2
  156. package/rules/party-order.yaml +84 -0
  157. package/rules/required-listed-as-preferred.yaml +102 -0
  158. package/rules/return-type-mismatch.yaml +79 -0
  159. package/rules/undefined-term.yaml +21 -7
  160. package/src/derived/session-hours.ts +62 -0
  161. package/src/derived/time-lengths.ts +226 -0
  162. package/src/derived/unit-counts.ts +18 -0
  163. package/src/derived/working-hours.ts +97 -0
  164. package/src/detectors/acronym-expansion.ts +57 -2
  165. package/src/detectors/capitalised-term.ts +147 -0
  166. package/src/detectors/date-outside-period.ts +4 -1
  167. package/src/detectors/derived-numbers.ts +94 -21
  168. package/src/detectors/name-variant.ts +71 -13
  169. package/src/detectors/party-order.ts +50 -0
  170. package/src/detectors/registry/connection-time-short.ts +4 -0
  171. package/src/detectors/registry/duration-product-mismatch.ts +4 -0
  172. package/src/detectors/registry/party-order.ts +4 -0
  173. package/src/detectors/registry/requirement-lists.ts +4 -0
  174. package/src/detectors/registry/return-type.ts +4 -0
  175. package/src/detectors/requirement-lists.ts +65 -0
  176. package/src/detectors/return-type.ts +30 -0
  177. package/src/detectors/structure-tree.ts +12 -1
  178. package/src/detectors/time-order.ts +40 -5
  179. package/src/detectors/undefined-term.ts +20 -3
  180. package/src/document.ts +4 -1
  181. package/src/facts/table-facts.ts +3 -0
  182. package/src/name-variants.ts +76 -1
  183. package/src/name-word-order.ts +149 -0
  184. package/src/plugin.ts +5 -0
  185. package/src/return-type.ts +361 -0
  186. package/src/structure/connection-times.ts +226 -0
  187. package/src/structure/date-order-tie.ts +86 -0
  188. package/src/structure/date-order.ts +41 -14
  189. package/src/structure/date-outside-period.ts +72 -7
  190. package/src/structure/date-range.ts +45 -9
  191. package/src/structure/leg-times.ts +15 -0
  192. package/src/structure/party-order.ts +115 -0
  193. package/src/structure/requirement-lists.ts +145 -0
  194. package/src/structure/time-order.ts +8 -7
  195. package/src/structure/version-order.ts +10 -0
  196. package/src/surname-near.ts +31 -0
  197. package/src/table-cells.ts +41 -0
  198. package/src/table-names.ts +113 -0
@@ -0,0 +1,165 @@
1
+ import { lineNumberAt, linesOf } from "./lines.js";
2
+ import { runsOf } from "./runs.js";
3
+ import { crossesZones, dayShiftOf, markBefore, markSoonAfter, wordOffsets, zonesIn, } from "./time-marks.js";
4
+ const SECONDS_PER_MINUTE = 60;
5
+ /** 文の切れ目。leg-times.ts と同じ。 */
6
+ const BREAK = /[。.;;!?!?]|\.\s/gu;
7
+ /** 括弧書き。中に括弧を入れ子にしたものは、内側から一つずつ外す。 */
8
+ const BRACKETED = /[((][^()()]*[))]/gu;
9
+ /** 「within 10 minutes」の within と長さの間に挟んでよい字の数。 */
10
+ const BOUND_GAP = 1;
11
+ /** 発ってから着くまでの間が、書いた移動の時間より短いか。間が負なら(時刻が戻る)、夜をまたいだのか書き間違いか決められないので言わない。 */
12
+ export const isTooShort = (gapSeconds, travelMinutes) => gapSeconds >= 0 && gapSeconds < travelMinutes * SECONDS_PER_MINUTE;
13
+ /** 二つの時刻に書いた日付が比べられるか。両方に無いか、同じ書き方で同じ日付なら同じ日。 */
14
+ export const isSameDate = (left, right) => left === right;
15
+ /** 時間帯の印を見て、二つの行の時刻をそのまま比べられるか。どちらかが時間帯をまたぐか、印が違えば比べない。 */
16
+ export const isSameZone = (left, right, words) => {
17
+ const [leftZones, rightZones] = [zonesIn(left, words), zonesIn(right, words)];
18
+ if (crossesZones(leftZones) || crossesZones(rightZones))
19
+ return false;
20
+ return (leftZones[0]?.text ?? "") === (rightZones[0]?.text ?? "");
21
+ };
22
+ /** 括弧書きを外した残り。 */
23
+ export const outsideBrackets = (text) => {
24
+ const stripped = text.replace(BRACKETED, " ");
25
+ return stripped === text ? text : outsideBrackets(stripped);
26
+ };
27
+ /** text に移動の語が一語として書かれているか。大文字と小文字は区別しない。 */
28
+ export const mentionsTravel = (text, cues) => {
29
+ const lower = text.toLowerCase();
30
+ return cues.some((cue) => wordOffsets(lower, cue.pattern.toLowerCase()).length > 0);
31
+ };
32
+ /** 行の中で、at から to までを含む文の範囲(行の頭からの位置)。 */
33
+ export const sentenceAround = (text, at, to) => {
34
+ const breaks = [...text.matchAll(BREAK)].map((match) => ({ start: match.index, end: match.index + match[0].length }));
35
+ const start = breaks.filter((cut) => cut.end <= at).at(-1)?.end ?? 0;
36
+ const end = breaks.find((cut) => cut.start >= to)?.start ?? text.length;
37
+ return { start, end };
38
+ };
39
+ const lineAt = (lines, offset) => {
40
+ const number = lineNumberAt(lines, offset);
41
+ return number === undefined ? undefined : lines[number - 1];
42
+ };
43
+ /** 長さが上限として書かれている(10分以内、within 10 minutes)か。 */
44
+ const isBound = (inputs, line, length) => {
45
+ const head = inputs.source.slice(line.start, length.start).toLowerCase();
46
+ return markSoonAfter(inputs.source, length.end, inputs.travel.bounds, []) !== undefined || markBefore(head, inputs.travel.bounds, BOUND_GAP) !== undefined;
47
+ };
48
+ /** 移動の時間を書いた長さか。同じ文に移動の語があり、上限として書いたものではない。 */
49
+ const isTravel = (inputs, line, length) => {
50
+ const sentence = sentenceAround(line.text, length.start - line.start, length.end - line.start);
51
+ return mentionsTravel(line.text.slice(sentence.start, sentence.end), inputs.travel.cues) && !isBound(inputs, line, length);
52
+ };
53
+ /** 時刻の前の、同じ行に書いた最後の日付。 */
54
+ const dateOf = (inputs, line, time) => inputs.dates.filter((date) => date.start >= line.start && date.end <= time.start).at(-1)?.value;
55
+ const shiftOf = (inputs, line, time) => dayShiftOf(inputs.source.slice(line.start, time.start), inputs.source, time.end, inputs.words);
56
+ const written = (inputs, span) => inputs.source.slice(span.start, span.end);
57
+ const issueOf = (inputs, leg, length) => ({
58
+ offset: leg.to.start,
59
+ values: {
60
+ time: written(inputs, leg.to),
61
+ from: written(inputs, leg.from),
62
+ gap: Math.round((leg.to.seconds - leg.from.seconds) / SECONDS_PER_MINUTE),
63
+ travel: written(inputs, length),
64
+ },
65
+ });
66
+ const dayOf = (inputs, line) => inputs.days.find((stops) => stops.some((stop) => stop.offset >= line.start && stop.offset <= line.start + line.text.length));
67
+ const OPENERS = new Set(["(", "("]);
68
+ const CLOSERS = new Set([")", ")"]);
69
+ /** at から to までを囲む一番内側の括弧の中身の範囲(行の頭からの位置)。囲む括弧が無ければ undefined。 */
70
+ export const bracketAround = (text, at, to) => {
71
+ const open = text
72
+ .slice(0, at)
73
+ .split("")
74
+ .reduceRight((scan, char, index) => {
75
+ if (scan.found !== undefined)
76
+ return scan;
77
+ if (CLOSERS.has(char))
78
+ return { ...scan, depth: scan.depth + 1 };
79
+ if (!OPENERS.has(char))
80
+ return scan;
81
+ return scan.depth === 0 ? { ...scan, found: index } : { ...scan, depth: scan.depth - 1 };
82
+ }, { depth: 0, found: undefined }).found;
83
+ if (open === undefined)
84
+ return undefined;
85
+ const close = text
86
+ .slice(to)
87
+ .split("")
88
+ .findIndex((char) => CLOSERS.has(char));
89
+ return close === -1 ? undefined : { start: open + 1, end: to + close };
90
+ };
91
+ /**
92
+ * 移動そのものを書いた予定か。頭に時刻を書いた予定で、移動の語が括弧の外(行の本文)にある。長さを囲む括弧の中に移動の語が
93
+ * あれば(「(福岡空港から地下鉄で約10分)」)、その括弧はこの予定までの移動を添えたもので、予定は移動ではない。
94
+ */
95
+ const isMoveLine = (inputs, line, length) => {
96
+ const aside = bracketAround(line.text, length.start - line.start, length.end - line.start);
97
+ if (aside !== undefined && mentionsTravel(line.text.slice(aside.start, aside.end), inputs.travel.cues))
98
+ return false;
99
+ return dayOf(inputs, line) !== undefined && mentionsTravel(outsideBrackets(line.text), inputs.travel.cues);
100
+ };
101
+ /** 移動そのものを書いた予定の時刻と、同じ日の次の予定の時刻。 */
102
+ const scheduledLeg = (inputs, line) => {
103
+ const day = dayOf(inputs, line);
104
+ const index = day?.findIndex((stop) => stop.offset >= line.start) ?? -1;
105
+ const [start, next] = [day?.[index], day?.[index + 1]];
106
+ if (start === undefined || next === undefined || start.shift !== 0 || next.shift !== 0 || start.zone.startsWith("local:"))
107
+ return undefined;
108
+ const timeAt = (offset) => inputs.times.find((time) => time.start === offset);
109
+ const [from, to] = [timeAt(start.offset), timeAt(next.offset)];
110
+ return from === undefined || to === undefined ? undefined : { from, to };
111
+ };
112
+ /** 時刻と同じ並び(続いた箇条書きや表の行)か同じ行にある、その時刻より前の時刻。 */
113
+ const timesBeside = (inputs, line, to) => {
114
+ const run = runsOf(inputs.source).find((lines) => lines.some((row) => row.start === line.start));
115
+ const inScope = (time) => (time.start >= line.start && time.end <= to.start) || (run?.some((row) => time.start >= row.start && time.end <= row.end) ?? false);
116
+ return inputs.times.filter((time) => time.end <= to.start && inScope(time));
117
+ };
118
+ /** 日付を書いた時刻なら、文書のそれより前の同じ日付の時刻。日付が無ければ、同じ並びか同じ行の、日付の無い前の時刻。 */
119
+ const timesBefore = (inputs, lines, line, to) => {
120
+ const date = dateOf(inputs, line, to);
121
+ const candidates = date === undefined ? timesBeside(inputs, line, to) : inputs.times.filter((time) => time.end <= to.start);
122
+ return candidates.filter((time) => {
123
+ const own = lineAt(lines, time.start);
124
+ return own !== undefined && isSameDate(dateOf(inputs, own, time), date);
125
+ });
126
+ };
127
+ /**
128
+ * 移動の時間を添えた時刻。予定の行ならその頭の時刻、文なら移動の文の中かその後ろの、最初の着でない時刻。
129
+ * 移動の文より前の時刻は、移動の前の予定で、移動して着く先ではない。
130
+ */
131
+ const arrivalTarget = (inputs, line, length) => {
132
+ const stop = dayOf(inputs, line)?.find((candidate) => candidate.offset >= line.start && candidate.offset <= line.start + line.text.length);
133
+ if (stop !== undefined)
134
+ return inputs.times.find((time) => time.start === stop.offset);
135
+ const sentenceStart = line.start + sentenceAround(line.text, length.start - line.start, length.end - line.start).start;
136
+ return inputs.times.find((time) => time.start >= sentenceStart && time.end <= line.start + line.text.length && !inputs.arrivals.has(time.start));
137
+ };
138
+ /** 移動の時間を添えた時刻と、そのすぐ前の着の時刻。すぐ前の時刻が着でなければ、どこから移動したのか分からない。 */
139
+ const arrivingLeg = (inputs, lines, line, length) => {
140
+ const to = arrivalTarget(inputs, line, length);
141
+ if (to === undefined)
142
+ return undefined;
143
+ const from = timesBefore(inputs, lines, line, to).at(-1);
144
+ const fromLine = from === undefined ? undefined : lineAt(lines, from.start);
145
+ if (from === undefined || fromLine === undefined || !inputs.arrivals.has(from.start))
146
+ return undefined;
147
+ if (shiftOf(inputs, fromLine, from) !== 0 || shiftOf(inputs, line, to) !== 0 || !isSameZone(fromLine.text, line.text, inputs.words))
148
+ return undefined;
149
+ return { from, to };
150
+ };
151
+ /** 移動の時間を書いた長さごとに、間の足りない乗り継ぎ。同じ時刻は一度だけ言う。 */
152
+ export const shortConnections = (inputs) => {
153
+ const lines = linesOf(inputs.source);
154
+ const issues = inputs.lengths.flatMap((length) => {
155
+ const line = lineAt(lines, length.start);
156
+ if (line === undefined || !isTravel(inputs, line, length))
157
+ return [];
158
+ const leg = isMoveLine(inputs, line, length) ? scheduledLeg(inputs, line) : arrivingLeg(inputs, lines, line, length);
159
+ return leg !== undefined && isTooShort(leg.to.seconds - leg.from.seconds, length.minutes) ? [issueOf(inputs, leg, length)] : [];
160
+ });
161
+ return issues
162
+ .filter((issue, index) => issues.findIndex((other) => other.offset === issue.offset) === index)
163
+ .toSorted((left, right) => left.offset - right.offset);
164
+ };
165
+ //# sourceMappingURL=connection-times.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"connection-times.js","sourceRoot":"","sources":["../../src/structure/connection-times.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ /**
2
+ * 隣どうしの二つの日付が入れ替わったように見えて、どちらを取り除いても同じだけ揃う(引き分け)とき、同じ項目の手がかりで決める。
3
+ * 項目がみな版を持ち、版が向きに沿って並ぶなら、並びの位置は版が裏付ける。位置に照らして逆らう相手の多い日付を指す。
4
+ * 版が無いか、版も乱れているなら、二つだけが入れ替わった並びに限り、外側の隣(前の日付の前、後ろの日付の後ろ)から遠いほうを指す。書き間違えた日付は隣から跳ぶ。
5
+ * どちらでも決まらなければ undefined(呼ぶ側はこれまでどおり後ろを指す)。
6
+ */
7
+ export type TieEntry = {
8
+ readonly value: string;
9
+ readonly version: string | undefined;
10
+ };
11
+ /** 引き分けの二つ(before = at - 1、after = at)のうち外れたほう。決まらなければ undefined。 */
12
+ export declare const breakDateTie: (entries: readonly TieEntry[], before: number, after: number, direction: number) => number | undefined;
13
+ //# sourceMappingURL=date-order-tie.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,61 @@
1
+ import { versionsAlong } from "./version-order.js";
2
+ const DAY_MS = 86_400_000;
3
+ const MONTHS_PER_YEAR = 12;
4
+ /** 年の無い月日(09-14)を日数にするための、閏年の仮の年。 */
5
+ const LEAP_YEAR = 2000;
6
+ /** 同じ書き方の日付どうしで差をとれる数。年月日と月日は日数、年月は月数。 */
7
+ const pointOf = (value) => {
8
+ const full = /^(\d{4})-(\d{2})-(\d{2})$/u.exec(value);
9
+ if (full !== null)
10
+ return Date.UTC(Number(full[1]), Number(full[2]) - 1, Number(full[3])) / DAY_MS;
11
+ const month = /^(\d{4})-(\d{2})$/u.exec(value);
12
+ if (month !== null)
13
+ return Number(month[1]) * MONTHS_PER_YEAR + Number(month[2]);
14
+ const day = /^(\d{2})-(\d{2})$/u.exec(value);
15
+ return day === null ? undefined : Date.UTC(LEAP_YEAR, Number(day[1]) - 1, Number(day[2])) / DAY_MS;
16
+ };
17
+ /** 位置に照らして向きに逆らう相手の数。 */
18
+ const disagreements = (values, index, direction) => values.filter((other, at) => {
19
+ if (at === index)
20
+ return false;
21
+ const [earlier, later] = at < index ? [other, values[index] ?? ""] : [values[index] ?? "", other];
22
+ return Math.sign(later.localeCompare(earlier)) === -direction;
23
+ }).length;
24
+ /** 多いほうを指す。同じなら決めない。 */
25
+ const larger = (before, after, scores) => {
26
+ if (scores[0] === scores[1])
27
+ return undefined;
28
+ return scores[0] > scores[1] ? before : after;
29
+ };
30
+ const byVersion = (entries, before, after, direction) => {
31
+ if (!versionsAlong(entries.map((entry) => entry.version), direction))
32
+ return undefined;
33
+ const values = entries.map((entry) => entry.value);
34
+ return larger(before, after, [disagreements(values, before, direction), disagreements(values, after, direction)]);
35
+ };
36
+ const distance = (entries, from, to) => {
37
+ const start = pointOf(entries[from]?.value ?? "");
38
+ const end = pointOf(entries[to]?.value ?? "");
39
+ return start === undefined || end === undefined ? undefined : Math.abs(end - start);
40
+ };
41
+ /** from から to へ、向きに逆らわない(等しくてもよい)。 */
42
+ const along = (from, to, direction) => Math.sign(to.localeCompare(from)) !== -direction;
43
+ /** 隣どうしの入れ替わりだけ: 外側の二つが向きに沿い、入れ替わった二つがどちらもその間に収まる。乱れが広い並びでは、外側の隣も当てにならない。 */
44
+ const isSwap = (values, before, after, direction) => {
45
+ const [outerBefore, outerAfter] = [values[before - 1], values[after + 1]];
46
+ if (outerBefore === undefined || outerAfter === undefined)
47
+ return false;
48
+ return [values[before] ?? "", values[after] ?? ""].every((value) => along(outerBefore, value, direction) && along(value, outerAfter, direction));
49
+ };
50
+ const byGap = (entries, before, after, direction) => {
51
+ if (!isSwap(entries.map((entry) => entry.value), before, after, direction))
52
+ return undefined;
53
+ const outerBefore = distance(entries, before - 1, before);
54
+ const outerAfter = distance(entries, after, after + 1);
55
+ if (outerBefore === undefined || outerAfter === undefined)
56
+ return undefined;
57
+ return larger(before, after, [outerBefore, outerAfter]);
58
+ };
59
+ /** 引き分けの二つ(before = at - 1、after = at)のうち外れたほう。決まらなければ undefined。 */
60
+ export const breakDateTie = (entries, before, after, direction) => byVersion(entries, before, after, direction) ?? byGap(entries, before, after, direction);
61
+ //# sourceMappingURL=date-order-tie.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"date-order-tie.js","sourceRoot":"","sources":["../../src/structure/date-order-tie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUnD,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,qCAAqC;AACrC,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,0CAA0C;AAC1C,MAAM,OAAO,GAAG,CAAC,KAAa,EAAsB,EAAE;IACpD,MAAM,IAAI,GAAG,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACtD,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;IACnG,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjF,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;AACrG,CAAC,CAAC;AAEF,yBAAyB;AACzB,MAAM,aAAa,GAAG,CAAC,MAAyB,EAAE,KAAa,EAAE,SAAiB,EAAU,EAAE,CAC5F,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;IAC1B,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAC/B,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;AAChE,CAAC,CAAC,CAAC,MAAM,CAAC;AAEZ,wBAAwB;AACxB,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,KAAa,EAAE,MAAiC,EAAsB,EAAE;IACtG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,OAA4B,EAAE,MAAc,EAAE,KAAa,EAAE,SAAiB,EAAsB,EAAE;IACvH,IACE,CAAC,aAAa,CACZ,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EACrC,SAAS,CACV;QAED,OAAO,SAAS,CAAC;IACnB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;AACpH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,OAA4B,EAAE,IAAY,EAAE,EAAU,EAAsB,EAAE;IAC9F,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC9C,OAAO,KAAK,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC;AACtF,CAAC,CAAC;AAEF,sCAAsC;AACtC,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAU,EAAE,SAAiB,EAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC;AAEzH,6EAA6E;AAC7E,MAAM,MAAM,GAAG,CAAC,MAAyB,EAAE,MAAc,EAAE,KAAa,EAAE,SAAiB,EAAW,EAAE;IACtG,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1E,IAAI,WAAW,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;AACnJ,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,OAA4B,EAAE,MAAc,EAAE,KAAa,EAAE,SAAiB,EAAsB,EAAE;IACnH,IACE,CAAC,MAAM,CACL,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EACnC,MAAM,EACN,KAAK,EACL,SAAS,CACV;QAED,OAAO,SAAS,CAAC;IACnB,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;IACvD,IAAI,WAAW,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5E,OAAO,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAA4B,EAAE,MAAc,EAAE,KAAa,EAAE,SAAiB,EAAsB,EAAE,CACjI,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC"}
@@ -28,9 +28,9 @@ export declare const siblingHeadingRuns: (headings: readonly HeadingSpan[]) => H
28
28
  export declare const longestInOrder: (values: readonly string[], direction: number) => number;
29
29
  /**
30
30
  * 向きに逆らう一歩(at - 1 から at)のうち、並びから外れているほう。取り除いたとき残りが長く揃うほうを指す。
31
- * 前を取っても後ろを取っても同じだけ揃う(隣どうしの入れ替わり)なら、どちらとも決められないので後ろを指す。
31
+ * 前を取っても後ろを取っても同じだけ揃う(隣どうしの入れ替わり)なら、tieBreak が決めたほう、決まらなければ後ろを指す。
32
32
  */
33
- export declare const outOfPlace: (values: readonly string[], at: number, direction: number) => number;
33
+ export declare const outOfPlace: (values: readonly string[], at: number, direction: number, tieBreak?: (before: number, after: number) => number | undefined) => number;
34
34
  export declare const dateOrderBreaks: (source: string, points: readonly DatedPoint[], headings?: readonly HeadingSpan[]) => StructureIssue[];
35
35
  export {};
36
36
  //# sourceMappingURL=date-order.d.ts.map
@@ -1 +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;AAIlD;;;;;;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;AA8B9I,mDAAmD;AACnD,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,MAAM,EAAE,EAAE,WAAW,MAAM,KAAG,MAO3E,CAAC;AAOJ;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,MAAM,EAAE,EAAE,IAAI,MAAM,EAAE,WAAW,MAAM,KAAG,MAC6B,CAAC;AA4BpH,eAAO,MAAM,eAAe,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,UAAU,EAAE,EAAE,WAAU,SAAS,WAAW,EAAO,KAAG,cAAc,EAIjI,CAAC"}
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;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"}
@@ -1,5 +1,7 @@
1
1
  import { siblingHeadingRunsOf } from "./heading-runs.js";
2
2
  import { runsOf } from "./runs.js";
3
+ import { breakDateTie } from "./date-order-tie.js";
4
+ import { leadingVersion } from "./version-order.js";
3
5
  /** 並びとして比べられる日付の書き方。年月日、年月、月日は、同じ書き方どうしでしか比べない。 */
4
6
  const PRECISIONS = [/^\d{4}-\d{2}-\d{2}$/u, /^\d{4}-\d{2}$/u, /^\d{2}-\d{2}$/u];
5
7
  /**
@@ -12,13 +14,22 @@ const onlyDateIn = (line, points) => {
12
14
  const inside = points.filter((point) => point.offset >= line.start && point.offset <= line.end);
13
15
  return inside.length === 1 ? inside[0] : undefined;
14
16
  };
15
- const datedLines = (run, points) => run.flatMap((line) => {
17
+ /** 見出しの #、箇条書きの記号、表の最初の |。 */
18
+ const LINE_MARKER = /^[ \t]*(?:#{1,6}|[-*+]|\d{1,3}[.)]|\|)?[ \t]*/u;
19
+ const entryOf = (source, line, points) => {
16
20
  const date = onlyDateIn(line, points);
17
- return date === undefined ? [] : [date];
21
+ if (date === undefined)
22
+ return undefined;
23
+ const text = source.slice(line.start, line.end);
24
+ return { ...date, version: leadingVersion(text.slice(LINE_MARKER.exec(text)?.[0].length ?? 0)) };
25
+ };
26
+ const datedLines = (source, run, points) => run.flatMap((line) => {
27
+ const entry = entryOf(source, line, points);
28
+ return entry === undefined ? [] : [entry];
18
29
  });
19
30
  /** 見出しの並びは、日付を一つ持つ見出しが続くあいだだけ。日付の無い見出しが混じる並び(問いに更新日を添えた FAQ)は、日付で並べたものではない。 */
20
- const datedStretches = (run, points) => run.reduce((stretches, heading) => {
21
- const date = onlyDateIn(heading, points);
31
+ const datedStretches = (source, run, points) => run.reduce((stretches, heading) => {
32
+ const date = entryOf(source, heading, points);
22
33
  if (date === undefined)
23
34
  return [...stretches, []];
24
35
  return [...stretches.slice(0, -1), [...(stretches.at(-1) ?? []), date]];
@@ -36,9 +47,15 @@ const mostlyInOrder = (values, direction) => longestInOrder(values, direction) *
36
47
  const without = (values, index) => values.filter((_, at) => at !== index);
37
48
  /**
38
49
  * 向きに逆らう一歩(at - 1 から at)のうち、並びから外れているほう。取り除いたとき残りが長く揃うほうを指す。
39
- * 前を取っても後ろを取っても同じだけ揃う(隣どうしの入れ替わり)なら、どちらとも決められないので後ろを指す。
50
+ * 前を取っても後ろを取っても同じだけ揃う(隣どうしの入れ替わり)なら、tieBreak が決めたほう、決まらなければ後ろを指す。
40
51
  */
41
- export const outOfPlace = (values, at, direction) => longestInOrder(without(values, at - 1), direction) > longestInOrder(without(values, at), direction) ? at - 1 : at;
52
+ export const outOfPlace = (values, at, direction, tieBreak = () => undefined) => {
53
+ const withoutBefore = longestInOrder(without(values, at - 1), direction);
54
+ const withoutAfter = longestInOrder(without(values, at), direction);
55
+ if (withoutBefore === withoutAfter)
56
+ return tieBreak(at - 1, at) ?? at;
57
+ return withoutBefore > withoutAfter ? at - 1 : at;
58
+ };
42
59
  /** 外れた日付に、前の日付を添える。先頭の日付には前が無いので、次の日付を添える。 */
43
60
  const issueAt = (dated, at) => {
44
61
  const point = dated[at];
@@ -57,14 +74,14 @@ const againstMajority = (dated) => {
57
74
  return signs.flatMap((sign, index) => {
58
75
  if (sign !== -majority)
59
76
  return [];
60
- return issueAt(dated, outOfPlace(values, index + 1, majority));
77
+ return issueAt(dated, outOfPlace(values, index + 1, majority, (before, after) => breakDateTie(dated, before, after, majority)));
61
78
  });
62
79
  };
63
80
  const breaksIn = (dated) => (samePrecision(dated) ? againstMajority(dated) : []);
64
81
  /** 見出しを箇条書きの中に書けば(「- ## 3.1.0 - 2026-10-02」)、同じ日付が両方の並びに入る。一度だけ言う。 */
65
82
  const oncePerOffset = (issues) => issues.filter((issue, index) => issues.findIndex((other) => other.offset === issue.offset) === index);
66
83
  export const dateOrderBreaks = (source, points, headings = []) => oncePerOffset([
67
- ...runsOf(source).flatMap((run) => breaksIn(datedLines(run, points))),
68
- ...siblingHeadingRuns(headings).flatMap((run) => datedStretches(run, points).flatMap(breaksIn)),
84
+ ...runsOf(source).flatMap((run) => breaksIn(datedLines(source, run, points))),
85
+ ...siblingHeadingRuns(headings).flatMap((run) => datedStretches(source, run, points).flatMap(breaksIn)),
69
86
  ]);
70
87
  //# sourceMappingURL=date-order.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"date-order.js","sourceRoot":"","sources":["../../src/structure/date-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date-order.js","sourceRoot":"","sources":["../../src/structure/date-order.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,8 @@ import { type DateMention, type Period, type PeriodWords } from "./stated-period
5
5
  * 地の文の日付は、年の無いもの(2月12日(金)の午前は…)だけを比べる。年のある日付は、過去の回や別の年の出来事を挙げることが多い。
6
6
  * 期間の前後に置く予定(前泊、follow-up)、締め切りや予約の日、過去の回を言う語(period-aside)が、その行、文、節の見出しにあれば比べない。
7
7
  * 年の無い期間(12月28日〜1月4日)は年をまたいで読む。
8
+ * 文書の仕事の期間(開講期間:…)を文書の頭か概要の節で書いたものは文書全体の期間で、後ろのどの節でも、締め切りの語(period-deadline)のある項目や文の、
9
+ * 期間の終わりより後の年のある日付を指す(課題の提出が学期の後)。期間の前の締め切り(申込締切)と、旅行期間のように後に締め切りが来てよい期間は比べない。
8
10
  */
9
11
  export type HeadingSpan = {
10
12
  readonly start: number;
@@ -17,6 +19,10 @@ type Span = {
17
19
  };
18
20
  export type OutsideWords = PeriodWords & {
19
21
  readonly asides: readonly string[];
22
+ /** 文書の仕事がその中で済む期間の語(開講期間、Term)。この期間は締め切りとだけ比べる。 */
23
+ readonly terms: readonly string[];
24
+ readonly deadlines: readonly string[];
25
+ readonly overviews: readonly string[];
20
26
  };
21
27
  /** 期間の中か。両方に年があれば年月日で、どちらかに年が無ければ月日で比べ、終わりが始まりより前の月日は年をまたぐ期間と読む。 */
22
28
  export declare const insidePeriod: (value: string, period: Pick<Period, "start" | "end">) => boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"date-outside-period.d.ts","sourceRoot":"","sources":["../../src/structure/date-outside-period.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAgB,KAAK,WAAW,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnG;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACnG,KAAK,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAQhF,oEAAoE;AACpE,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,EAAE,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,KAAG,OAInF,CAAC;AAWF,8BAA8B;AAC9B,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,KAAG,OAOjE,CAAC;AAkEF,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,OAAO,SAAS,WAAW,EAAE,EAC7B,UAAU,SAAS,WAAW,EAAE,EAChC,WAAW,SAAS,IAAI,EAAE,EAC1B,OAAO,YAAY,KAClB,cAAc,EAQhB,CAAC"}
1
+ {"version":3,"file":"date-outside-period.d.ts","sourceRoot":"","sources":["../../src/structure/date-outside-period.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAgB,KAAK,WAAW,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnG;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACnG,KAAK,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,mDAAmD;IACnD,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC,CAAC;AAQF,oEAAoE;AACpE,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,EAAE,QAAQ,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,KAAK,CAAC,KAAG,OAInF,CAAC;AAWF,8BAA8B;AAC9B,eAAO,MAAM,QAAQ,GAAI,MAAM,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,KAAG,OAOjE,CAAC;AA6HF,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,OAAO,SAAS,WAAW,EAAE,EAC7B,UAAU,SAAS,WAAW,EAAE,EAChC,WAAW,SAAS,IAAI,EAAE,EAC1B,OAAO,YAAY,KAClB,cAAc,EAMhB,CAAC"}
@@ -54,6 +54,8 @@ const statedPeriods = (source, lines, dates, headings, words) => {
54
54
  });
55
55
  return found.map(({ period, line }, index) => ({
56
56
  ...period,
57
+ line,
58
+ nextPeriod: found[index + 1]?.line.start ?? source.length,
57
59
  scopeStart: scopeStart(source, lines, line),
58
60
  scopeEnd: scopeEnd(line, found[index + 1]?.line.start ?? source.length, headings, source.length),
59
61
  }));
@@ -76,11 +78,55 @@ const outsideOne = (date, period, context, asides) => {
76
78
  return false;
77
79
  return !surroundings(date, line, item, context).some((text) => mentions(text, asides));
78
80
  };
81
+ const boundaryPattern = (word) => {
82
+ const target = escapeRegExp(word.toLowerCase());
83
+ return /[a-z]/u.test(word.toLowerCase()) ? new RegExp(`(?<![a-z])${target}(?![a-z])`, "gu") : new RegExp(target, "gu");
84
+ };
85
+ /** 締め切りの語を除いた文。「提出期限」の「期限」、「submit by」の「submit」は、期間の外に置く語として読まない。 */
86
+ const withoutWords = (text, words) => words.toSorted((left, right) => right.length - left.length).reduce((rest, word) => rest.replace(boundaryPattern(word), " "), text.toLowerCase());
87
+ /** 節の見出しの並び(その行の見出しと、それを囲む浅い見出し)。 */
88
+ const enclosingHeadings = (offset, headings) => headings
89
+ .filter((heading) => heading.start < offset)
90
+ .toReversed()
91
+ .reduce((chain, heading) => (heading.depth < (chain.at(-1)?.depth ?? Infinity) ? [...chain, heading] : chain), []);
92
+ /** 文書の仕事の期間か: 表題(文書の頭の # の見出し)のほかの見出しより前か、概要の節(period-overview-heading)の行。 */
93
+ const isDocumentTerm = (period, context, overviews) => {
94
+ const sections = context.headings.filter((heading, index) => heading.start < period.line.start && !(index === 0 && heading.depth === 1));
95
+ if (sections.length === 0)
96
+ return true;
97
+ return enclosingHeadings(period.line.start, context.headings).some((heading) => mentions(context.source.slice(heading.start, heading.end), overviews));
98
+ };
99
+ const afterEnd = (value, period) => hasYear(value) && hasYear(period.end) && value > period.end;
100
+ const lateDeadline = (date, period, context, words) => {
101
+ if (!DAY_VALUE.test(date.value) || !afterEnd(date.value, period))
102
+ return false;
103
+ const line = containing(context.lines, date.offset);
104
+ if (line === undefined)
105
+ return false;
106
+ const texts = surroundings(date, line, isItem(context.source.slice(line.start, line.end), line, context.headings), context);
107
+ if (!mentions(texts[0] ?? "", words.deadlines))
108
+ return false;
109
+ return !texts.some((text) => mentions(withoutWords(text, words.deadlines), words.asides));
110
+ };
111
+ const issueOf = (source, date, period) => ({
112
+ offset: date.offset,
113
+ values: { date: source.slice(date.offset, date.end), period: period.written },
114
+ });
115
+ /** 期間の行の後ろ、同じ節の日程の日付で、期間の外のもの。 */
116
+ const outsideInSection = (dates, context, words) => statedPeriods(context.source, context.lines, dates, context.headings, words).flatMap((period) => dates
117
+ .filter((date) => date.offset > period.scopeStart && date.offset < period.scopeEnd && outsideOne(date, period, context, words.asides))
118
+ .map((date) => issueOf(context.source, date, period)));
119
+ /** 文書の仕事の期間の行の後ろ、次の仕事の期間の行までの、期間の終わりより後の締め切り。 */
120
+ const lateDeadlines = (dates, context, words) => statedPeriods(context.source, context.lines, dates, context.headings, { ...words, labels: words.terms })
121
+ .filter((period) => isDocumentTerm(period, context, words.overviews))
122
+ .flatMap((period) => dates
123
+ .filter((date) => date.offset > period.line.end && date.offset < period.nextPeriod && lateDeadline(date, period, context, words))
124
+ .map((date) => issueOf(context.source, date, period)));
79
125
  export const datesOutsidePeriod = (source, dates, headings, sentences, words) => {
80
126
  const lines = linesOf(source);
81
127
  const context = { source, lines, headings, sentences };
82
- return statedPeriods(source, lines, dates, headings, words).flatMap((period) => dates
83
- .filter((date) => date.offset > period.scopeStart && date.offset < period.scopeEnd && outsideOne(date, period, context, words.asides))
84
- .map((date) => ({ offset: date.offset, values: { date: source.slice(date.offset, date.end), period: period.written } })));
128
+ const inSection = outsideInSection(dates, context, words);
129
+ const reported = new Set(inSection.map((issue) => issue.offset));
130
+ return [...inSection, ...lateDeadlines(dates, context, words).filter((issue) => !reported.has(issue.offset))];
85
131
  };
86
132
  //# sourceMappingURL=date-outside-period.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"date-outside-period.js","sourceRoot":"","sources":["../../src/structure/date-outside-period.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date-outside-period.js","sourceRoot":"","sources":["../../src/structure/date-outside-period.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAmD,MAAM,oBAAoB,CAAC;AAqBnG,MAAM,SAAS,GAAG,yCAAyC,CAAC;AAC5D,MAAM,SAAS,GAAG,2BAA2B,CAAC;AAE9C,MAAM,OAAO,GAAG,CAAC,KAAa,EAAW,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,CAAC;AACjF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAEzE,oEAAoE;AACpE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,MAAqC,EAAW,EAAE;IAC5F,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,IAAI,MAAM,CAAC,GAAG,CAAC;IACjG,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxF,OAAO,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,MAAc,EAAU,EAAE,CACzC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IAChD,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AACzD,CAAC,EAAE,EAAE,CAAC,CAAC;AAET,MAAM,UAAU,GAAG,CAAoB,KAAsB,EAAE,MAAc,EAAoB,EAAE,CACjG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC;AAEnE,8BAA8B;AAC9B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,KAAwB,EAAW,EAAE;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACjC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1D,OAAO,IAAI,MAAM,CAAC,aAAa,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAIF;;;GAGG;AACH,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,KAAsB,EAAE,IAAU,EAAU,EAAE;IAChF,MAAM,UAAU,GAAG,CAAC,IAAU,EAAW,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/F,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AACtF,CAAC,CAAC;AAEF,2DAA2D;AAC3D,MAAM,OAAO,GAAG,CAAC,IAAU,EAAE,QAAgC,EAAU,EAAE,CACvE,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;AAEpH,0CAA0C;AAC1C,MAAM,QAAQ,GAAG,CAAC,IAAU,EAAE,IAAY,EAAE,QAAgC,EAAE,MAAc,EAAU,EAAE;IACtG,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,EAAE,KAAK,IAAI,MAAM,CAAC;IAChH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CACpB,MAAc,EACd,KAAsB,EACtB,KAA6B,EAC7B,QAAgC,EAChC,KAAmB,EACT,EAAE;IACZ,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1F,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7C,GAAG,MAAM;QACT,IAAI;QACJ,UAAU,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM;QACzD,UAAU,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC;QAC3C,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;KACjG,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,IAAU,EAAE,QAAgC,EAAW,EAAE,CACrF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAIjG,+CAA+C;AAC/C,MAAM,YAAY,GAAG,CAAC,IAAiB,EAAE,IAAU,EAAE,IAAa,EAAE,OAAgB,EAAY,EAAE;IAChG,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AACrI,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,IAAiB,EAAE,MAAc,EAAE,OAAgB,EAAE,MAAyB,EAAW,EAAE;IAC7G,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAClF,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxF,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACzF,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;IAC/C,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAChD,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,MAAM,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACzH,CAAC,CAAC;AAEF,qEAAqE;AACrE,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,KAAwB,EAAU,EAAE,CACtE,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;AAEnJ,qCAAqC;AACrC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,QAAgC,EAAiB,EAAE,CAC5F,QAAQ;KACL,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;KAC3C,UAAU,EAAE;KACZ,MAAM,CAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;AAEtI,8EAA8E;AAC9E,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,OAAgB,EAAE,SAA4B,EAAW,EAAE;IACjG,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;IACzI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;AACzJ,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,MAAc,EAAW,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC;AAEzH,MAAM,YAAY,GAAG,CAAC,IAAiB,EAAE,MAAc,EAAE,OAAgB,EAAE,KAAmB,EAAW,EAAE;IACzG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/E,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IAC5H,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5F,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,MAAc,EAAE,IAAiB,EAAE,MAAc,EAAkB,EAAE,CAAC,CAAC;IACtF,MAAM,EAAE,IAAI,CAAC,MAAM;IACnB,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE;CAC9E,CAAC,CAAC;AAEH,kCAAkC;AAClC,MAAM,gBAAgB,GAAG,CAAC,KAA6B,EAAE,OAAgB,EAAE,KAAmB,EAAoB,EAAE,CAClH,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAC9F,KAAK;KACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;KACrI,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CACxD,CAAC;AAEJ,iDAAiD;AACjD,MAAM,aAAa,GAAG,CAAC,KAA6B,EAAE,OAAgB,EAAE,KAAmB,EAAoB,EAAE,CAC/G,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;KACrG,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;KACpE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAClB,KAAK;KACF,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;KAChI,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CACxD,CAAC;AAEN,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAAc,EACd,KAA6B,EAC7B,QAAgC,EAChC,SAA0B,EAC1B,KAAmB,EACD,EAAE;IACpB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAY,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAChE,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAChH,CAAC,CAAC"}
@@ -30,6 +30,9 @@ export type RangeFrame = {
30
30
  };
31
31
  /** 語彙表の「from … to」を、前の語と間の語に分ける。「…」の無い語は組ではない。 */
32
32
  export declare const rangeFrameOf: (pattern: string) => RangeFrame | undefined;
33
- /** 隣り合う二つの日付のうち、期間をなし、終わりが始まりより前のもの。期間の書き出しを指し、書いたままの期間を見せる。 */
34
- export declare const reversedRanges: (source: string, dates: readonly DatedSpan[], words: RangeWords) => StructureIssue[];
33
+ /**
34
+ * 隣り合う二つの日付のうち、期間をなし、終わりが始まりより前のもの。期間の書き出しを指し、書いたままの期間を見せる。
35
+ * isLabelled は、その位置の日付が期間の語で始まる行(Dates: …)の、語より後ろにあるか。
36
+ */
37
+ export declare const reversedRanges: (source: string, dates: readonly DatedSpan[], words: RangeWords, isLabelled?: (offset: number) => boolean) => StructureIssue[];
35
38
  //# sourceMappingURL=date-range.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"date-range.d.ts","sourceRoot":"","sources":["../../src/structure/date-range.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,UAAU,GAAG;IACvB,sBAAsB;IACtB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,gEAAgE;IAChE,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IACvC,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,qEAAqE;IACrE,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC,CAAC;AAcF,gFAAgF;AAChF,eAAO,MAAM,sBAAsB,GAAI,MAAM,MAAM,EAAE,UAAU,SAAS,MAAM,EAAE,KAAG,MAMlF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,kDAAkD;AAClD,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,KAAG,UAAU,GAAG,SAG3D,CAAC;AAmFF,gEAAgE;AAChE,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,SAAS,EAAE,EAAE,OAAO,UAAU,KAAG,cAAc,EAM1G,CAAC"}
1
+ {"version":3,"file":"date-range.d.ts","sourceRoot":"","sources":["../../src/structure/date-range.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,UAAU,GAAG;IACvB,sBAAsB;IACtB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,gEAAgE;IAChE,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,CAAC;IACvC,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,qEAAqE;IACrE,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC,CAAC;AAcF,gFAAgF;AAChF,eAAO,MAAM,sBAAsB,GAAI,MAAM,MAAM,EAAE,UAAU,SAAS,MAAM,EAAE,KAAG,MAMlF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,kDAAkD;AAClD,eAAO,MAAM,YAAY,GAAI,SAAS,MAAM,KAAG,UAAU,GAAG,SAG3D,CAAC;AA+GF;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,QAAQ,MAAM,EACd,OAAO,SAAS,SAAS,EAAE,EAC3B,OAAO,UAAU,EACjB,aAAY,CAAC,MAAM,EAAE,MAAM,KAAK,OAAqB,KACpD,cAAc,EAMb,CAAC"}