chaffjs 0.30.0 → 0.31.0

package/dist/facts/item-amounts.js

@@ -0,0 +1,67 @@
+import { linesOf } from "../structure/lines.js";
+import { sameMeasure, sameUnit } from "./measures.js";
+import { cellsOf, tablesOf } from "./table-facts.js";
+import { withoutEdgeMarks } from "./trim-marks.js";
+import { toleranceOf } from "./unit-tolerance.js";
+const LETTER = /\p{L}/u;
+const SCRIPTS = [/\p{Script=Hiragana}/u, /[\p{Script=Katakana}ー]/u, /\p{Script=Han}/u, /\p{Script=Latin}/u];
+const NAME_WINDOW = 80;
+const keyOf = (text) => text.normalize("NFKC").toLowerCase();
+const scriptOf = (char) => SCRIPTS.findIndex((script) => script.test(char));
+/** 二つの字の間が語の切れ目か。字でない側があるか、字の種類（仮名、漢字、英字）が変わる所。英字どうしは続いている。 */
+const isBoundary = (left, right) => left === "" || right === "" || !LETTER.test(left) || !LETTER.test(right) || scriptOf(left) !== scriptOf(right);
+const cellValue = (cell, source, measured) => measured.find((value) => value.start >= cell.start && value.end <= cell.end && source.slice(value.start, value.end) === withoutEdgeMarks(cell.text));
+/** 表の行の見出しと、その行の最初の量。同じ名前の行が二つあれば最初の行。 */
+const tableAmounts = (source, rows, measured) => {
+    const amounts = rows.flatMap((row) => {
+        const [first, ...rest] = cellsOf(row);
+        const name = first === undefined ? "" : withoutEdgeMarks(first.text);
+        const value = rest.map((cell) => cellValue(cell, source, measured)).find((found) => found !== undefined);
+        if (first === undefined || value === undefined || !LETTER.test(name) || cellValue(first, source, measured) !== undefined)
+            return [];
+        return [{ name, key: keyOf(name), measured: value }];
+    });
+    return amounts.filter((amount, index) => amounts.findIndex((other) => other.key === amount.key) === index);
+};
+/** 量のすぐ前に名前があるか（しょうゆ大さじ1、soy sauce 30 ml）。 */
+const namedBefore = (source, value, key) => {
+    const end = source.charAt(value.start - 1) === " " ? value.start - 1 : value.start;
+    const head = keyOf(source.slice(Math.max(0, end - NAME_WINDOW), end));
+    return head.endsWith(key) && isBoundary(head.charAt(head.length - key.length - 1), key.charAt(0));
+};
+const skipSpace = (text) => (text.startsWith(" ") ? text.slice(1) : text);
+/** 頭の語を一つ落とす。英字の語は、後ろに空白が要る（of は offer の頭ではない）。 */
+const dropWord = (text, words) => {
+    const word = words.map(keyOf).find((candidate) => text.startsWith(candidate) && isBoundary(candidate.slice(-1), text.charAt(candidate.length)));
+    return word === undefined ? undefined : skipSpace(text.slice(word.length));
+};
+/** つなぐ語を挟んで、量の後ろに名前があるか（30mlのしょうゆ、30 ml of the soy sauce）。 */
+const namedAfter = (source, value, key, words) => {
+    const linked = dropWord(skipSpace(keyOf(source.slice(value.end, value.end + NAME_WINDOW))), words.links);
+    if (linked === undefined)
+        return false;
+    const rest = dropWord(linked, words.determiners) ?? linked;
+    return rest.startsWith(key) && isBoundary(key.slice(-1), rest.charAt(key.length));
+};
+/** 本文の量が、表の量をどう換算しても超えるか。表より少ない量は、その一部を使う所（牛乳の半分を先に）かもしれない。 */
+const exceeds = (value, listed) => value.factors.every((a) => listed.factors.every((b) => (value.amount - value.zero) * a > (listed.amount - listed.zero) * b));
+const inTable = (value, rows) => rows.some((row) => value.start >= row.start && value.end <= row.start + row.text.length);
+/** 本文の量のうち、表の同じ品物の量と単位が違い、換算すると合わないもの。 */
+export const itemConflicts = (source, measured, words) => {
+    const rows = tablesOf(linesOf(source)).flatMap((table) => [table.header, ...table.rows]);
+    const amounts = tableAmounts(source, rows, measured);
+    if (amounts.length === 0)
+        return [];
+    return measured
+        .filter((value) => !inTable(value, rows))
+        .flatMap((value) => {
+        const item = amounts.find(({ key, measured: listed }) => listed.dimension === value.dimension && (namedBefore(source, value, key) || namedAfter(source, value, key, words)));
+        if (item === undefined ||
+            sameUnit(item.measured, value) ||
+            sameMeasure(item.measured, value, toleranceOf(value.dimension)) ||
+            !exceeds(value, item.measured))
+            return [];
+        return [{ name: item.name, measured: value, other: item.measured }];
+    });
+};
+//# sourceMappingURL=item-amounts.js.map

package/dist/facts/item-amounts.js.map

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

package/dist/facts/labelled-facts.d.ts

@@ -22,11 +22,15 @@ export type FactWords = {
     /** 名前の前に置かれる決定の前置き（協議の結果、, it was decided that）。読点を含んでも条件ではないので、外してから名前を読む。 */
     readonly leads: readonly string[];
     readonly attributes: readonly AttributePhrase[];
+    /** 区切りと値のあいだに置ける目安の語（約、about）。あれば値を目安として読む。無ければ、区切りのすぐ後ろの値だけ。 */
+    readonly valueLeads?: readonly string[];
 };
+/** approximate: 値の前に目安の語（約、about）があった。 */
 export type Fact = {
     readonly label: string;
     readonly key: string;
     readonly value: FactValue;
+    readonly approximate?: boolean;
 };
 /** 文に書いた名前付きの値。値ごとに、属性の言い回しか、区切りの前の名前を探す。 */
 export declare const labelledFacts: (source: string, values: readonly FactValue[], words: FactWords) => Fact[];

package/dist/facts/labelled-facts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"labelled-facts.d.ts","sourceRoot":"","sources":["../../src/facts/labelled-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AA4G/F,6CAA6C;AAC7C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,SAAS,EAAE,EAAE,OAAO,SAAS,KAAG,IAAI,EAO/F,CAAC"}
+{"version":3,"file":"labelled-facts.d.ts","sourceRoot":"","sources":["../../src/facts/labelled-facts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAElG,MAAM,MAAM,SAAS,GAAG;IACtB,4CAA4C;IAC5C,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,4BAA4B;IAC5B,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,eAAe,EAAE,CAAC;IAChD,iEAAiE;IACjE,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,0CAA0C;AAC1C,MAAM,MAAM,IAAI,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AA+H/H,6CAA6C;AAC7C,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,EAAE,QAAQ,SAAS,SAAS,EAAE,EAAE,OAAO,SAAS,KAAG,IAAI,EAO/F,CAAC"}

package/dist/facts/labelled-facts.js

@@ -26,6 +26,12 @@ const beforeSeparator = (head, separator) => {
         return undefined;
     return rest;
 };
+/** 頭の後ろの目安の語（「重さは約」の約、"is about" の about）を外したもの。英字の語は、前が語の切れ目のときだけ。 */
+const withoutValueLead = (head, leads) => {
+    const lowered = head.toLowerCase();
+    const lead = leads.find((word) => lowered.endsWith(word.toLowerCase()) && !(LATIN_LETTER.test(word.charAt(0)) && LATIN_LETTER.test(head.charAt(head.length - word.length - 1))));
+    return lead === undefined ? head : trimEndOf(head.slice(0, head.length - lead.length), EDGE_MARKS);
+};
 /** 英字の前置きが語の途中で切れているか（「we agreed that」は「we agreed thatching」の頭ではない）。 */
 const endsInsideWord = (text, length) => LATIN_LETTER.test(text.charAt(length - 1)) && LATIN_LETTER.test(text.charAt(length));
 /** 頭の決定の前置きを外した節。 */
@@ -40,11 +46,17 @@ const afterLastBreak = (text) => {
     return last === undefined ? text : text.slice(last.index + last[0].length);
 };
 const wordsOf = (text) => text.split(/\s+/u).filter((word) => word !== "");
+/** 語を空白で分けない言語の、名前の頭の前置き（「本体の幅」の 本体の）。前置きだけの名前は落とさない。 */
+const withoutPrefix = (key, determiners) => {
+    const prefix = determiners.find((word) => !LATIN_WORD.test(word) && key.length > word.length && key.startsWith(word));
+    return prefix === undefined ? key : key.slice(prefix.length);
+};
 /** 名前を一つの書き方に。全角と半角、大文字と小文字、空白の数を揃え、頭の冠詞を落とす。 */
 const keyOf = (label, words) => {
     const [first, ...rest] = wordsOf(label.normalize("NFKC").toLowerCase());
-    const determiners = new Set(words.determiners.map((word) => word.toLowerCase()));
-    return (first !== undefined && determiners.has(first) ? rest : [first ?? "", ...rest]).join(" ");
+    const determiners = words.determiners.map((word) => word.normalize("NFKC").toLowerCase());
+    const key = (first !== undefined && determiners.includes(first) ? rest : [first ?? "", ...rest]).join(" ");
+    return withoutPrefix(key, determiners);
 };
 const containsSeparator = (label, words) => words.separators.some((separator) => LATIN_WORD.test(separator) ? wordsOf(label.toLowerCase()).includes(separator.toLowerCase()) : label.includes(separator));
 /** 名前として使える書き方か。短く、字を含み、区切りを含まず、指すだけの語（それ、it）でない。 */
@@ -56,14 +68,17 @@ const isLabel = (label, key, words) => label.length > 0 &&
     !containsSeparator(label, words) &&
     !words.vague.some((word) => word.toLowerCase() === key);
 /** 値の後ろが文の切れ目か。行の終わり、表の升の終わり、語彙表の終わりの語。 */
+/** 値の後ろが文の切れ目か。行の終わり、表の升の終わり、語彙表の終わりの語。半角の数のまわりに空白を置く書き方（「14 cm です」）もある。 */
 const endsAfter = (source, value, words) => {
-    const after = source.slice(value.end, lineEndOf(source, value.end)).replace(MARKS_AFTER_VALUE, "");
-    if (after.trim() === "" || after.trimStart().startsWith("|"))
+    const after = source.slice(value.end, lineEndOf(source, value.end)).replace(MARKS_AFTER_VALUE, "").trimStart();
+    if (after === "" || after.startsWith("|"))
         return true;
     return words.valueEnds.some((end) => after.startsWith(end));
 };
 const labelledFact = (source, value, words) => {
-    const head = trimEndOf(source.slice(lineStartOf(source, value.start), value.start), EDGE_MARKS);
+    const written = trimEndOf(source.slice(lineStartOf(source, value.start), value.start), EDGE_MARKS);
+    const head = withoutValueLead(written, words.valueLeads ?? []);
+    const approximate = head.length < written.length ? { approximate: true } : {};
     for (const separator of words.separators) {
         const before = beforeSeparator(head, separator);
         if (before === undefined)
@@ -73,7 +88,7 @@ const labelledFact = (source, value, words) => {
             return undefined;
         const label = withoutEdgeMarks(clause);
         const key = keyOf(label, words);
-        return isLabel(label, key, words) ? { label, key, value } : undefined;
+        return isLabel(label, key, words) ? { label, key, value, ...approximate } : undefined;
     }
     return undefined;
 };

package/dist/facts/labelled-facts.js.map

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

package/dist/facts/measure-units.d.ts

@@ -0,0 +1,5 @@
+import type { ProseDocument } from "../plugin.ts";
+import type { MeasureUnit } from "./measures.ts";
+/** 単位ごとの、零点（unit-zero）と、要る文脈の語（unit-context の group がその単位の語）。 */
+export declare const measureUnitsOf: (doc: ProseDocument) => MeasureUnit[];
+//# sourceMappingURL=measure-units.d.ts.map

package/dist/facts/measure-units.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-units.d.ts","sourceRoot":"","sources":["../../src/facts/measure-units.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAOjD,iEAAiE;AACjE,eAAO,MAAM,cAAc,GAAI,KAAK,aAAa,KAAG,WAAW,EAqB9D,CAAC"}

package/dist/facts/measure-units.js

@@ -0,0 +1,28 @@
+/** 量の種類ごとの語彙表。weight が基準の単位への倍率で、同じ単位を二度書けば倍率が二つ（GB の 10^9 と 2^30）。 */
+const MEASURE_DIMENSIONS = ["unit-length", "unit-mass", "unit-time", "unit-volume", "unit-data", "unit-temperature", "unit-pressure", "unit-area"];
+const unitKey = (pattern, before) => `${before ? "<" : ">"}${pattern}`;
+/** 単位ごとの、零点（unit-zero）と、要る文脈の語（unit-context の group がその単位の語）。 */
+export const measureUnitsOf = (doc) => {
+    const zeros = new Map((doc.lexicons["unit-zero"] ?? []).map((entry) => [entry.pattern, entry.weight ?? 0]));
+    const contexts = doc.lexicons["unit-context"] ?? [];
+    return MEASURE_DIMENSIONS.flatMap((dimension) => {
+        const factors = new Map();
+        (doc.lexicons[dimension] ?? []).forEach((entry) => {
+            if (entry.weight === undefined)
+                return;
+            const before = entry.position === "before";
+            const key = unitKey(entry.pattern, before);
+            const found = factors.get(key) ?? { pattern: entry.pattern, before, weights: [] };
+            factors.set(key, { ...found, weights: [...found.weights, entry.weight] });
+        });
+        return [...factors.values()].map(({ pattern, before, weights }) => ({
+            pattern,
+            dimension,
+            factors: weights,
+            zero: zeros.get(pattern) ?? 0,
+            before,
+            context: contexts.filter((entry) => entry.group === pattern).map((entry) => entry.pattern),
+        }));
+    });
+};
+//# sourceMappingURL=measure-units.js.map

package/dist/facts/measure-units.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-units.js","sourceRoot":"","sources":["../../src/facts/measure-units.ts"],"names":[],"mappings":"AAGA,uEAAuE;AACvE,MAAM,kBAAkB,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,kBAAkB,EAAE,eAAe,EAAE,WAAW,CAAU,CAAC;AAE5J,MAAM,OAAO,GAAG,CAAC,OAAe,EAAE,MAAe,EAAU,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC;AAEhG,iEAAiE;AACjE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAkB,EAAiB,EAAE;IAClE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5G,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IACpD,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAmE,CAAC;QAC3F,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAChD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS;gBAAE,OAAO;YACvC,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC;YAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAClF,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAClE,OAAO;YACP,SAAS;YACT,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YAC7B,MAAM;YACN,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;SAC3F,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/facts/measures.d.ts

@@ -1,20 +1,39 @@
 import type { FactValue } from "./fact-values.ts";
 /**
- * 単位の付いた量（5 km、3000 m、1.5時間、2 GB）。単位は言語パッケージの語彙表から取り、量の種類（長さ、重さ…）と、基準の単位への
- * 倍率を持つ。倍率が二つある単位（1 GB は 10^9 か 2^30 バイト）は、どちらで数えても合えば合う。
+ * 単位の付いた量（5 km、3000 m、1.5時間、2 GB、180℃、大さじ1）。単位は言語パッケージの語彙表から取り、量の種類（長さ、重さ…）と、基準の単位への
+ * 倍率を持つ。倍率が二つある単位（1 GB は 10^9 か 2^30 バイト）は、どちらで数えても合えば合う。零点がずれた単位（°F）は zero を引いてから掛ける。
  */
 export type MeasureUnit = {
     readonly pattern: string;
     readonly dimension: string;
     readonly factors: readonly number[];
+    /** 基準の単位で 0 のときに、この単位で読む値（°F なら 32）。 */
+    readonly zero: number;
+    /** 数の前に書く単位（大さじ1）。 */
+    readonly before: boolean;
+    /** 同じ行にどれかが無ければ単位として読まない語（「度」はオーブンの行だけ温度）。空なら要らない。 */
+    readonly context: readonly string[];
 };
 export type Measured = FactValue & {
     readonly dimension: string;
     readonly factors: readonly number[];
+    readonly zero: number;
     readonly amount: number;
+    /** 書いた小数の桁数（1.20 なら 2）。amount は数なので末尾の 0 を持たない。 */
+    readonly decimals: number;
+};
+/** 換算して合うとみなす差。relative は大きいほうの値に対する割合、absolute は基準の単位での差。どちらかに収まれば合う。 */
+export type Tolerance = {
+    readonly relative: number;
+    readonly absolute: number;
 };
 /** 文書の中の、単位の付いた量。 */
 export declare const measuredValues: (source: string, units: readonly MeasureUnit[]) => Measured[];
-/** 二つの量が同じ量か。倍率のどの組み合わせかで、基準の単位に直した値の差が大きいほうの tolerance 以内なら同じ。 */
-export declare const sameMeasure: (left: Measured, right: Measured, tolerance: number) => boolean;
+/** 二つの量の単位が、書き方だけ違う同じ単位か（mL と ml、tablespoon と tablespoons）。 */
+export declare const sameUnit: (left: Measured, right: Measured) => boolean;
+/**
+ * 二つの量が同じ量か。倍率のどの組み合わせかで、基準の単位に直した値の差が tolerance に収まれば同じ。零点より小さい °F の量は、差として
+ * 零点を引かずに直しても合えば合う（0.5°C (1°F)）。180 °F は差としては読まないので、100 °C (180 °F) は合わない。
+ */
+export declare const sameMeasure: (left: Measured, right: Measured, tolerance: Tolerance) => boolean;
 //# sourceMappingURL=measures.d.ts.map

package/dist/facts/measures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measures.d.ts","sourceRoot":"","sources":["../../src/facts/measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAExH,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAgBhI,qBAAqB;AACrB,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,WAAW,EAAE,KAAG,QAAQ,EAmBtF,CAAC;AAEF,mEAAmE;AACnE,eAAO,MAAM,WAAW,GAAI,MAAM,QAAQ,EAAE,OAAO,QAAQ,EAAE,WAAW,MAAM,KAAG,OAM9E,CAAC"}
+{"version":3,"file":"measures.d.ts","sourceRoot":"","sources":["../../src/facts/measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,wCAAwC;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,sBAAsB;IACtB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,sDAAsD;IACtD,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,mDAAmD;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,0EAA0E;AAC1E,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAyDjF,qBAAqB;AACrB,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,EAAE,OAAO,SAAS,WAAW,EAAE,KAAG,QAAQ,EA2BtF,CAAC;AAEF,+DAA+D;AAC/D,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,EAAE,OAAO,QAAQ,KAAG,OACyF,CAAC;AAUrJ;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,QAAQ,EAAE,OAAO,QAAQ,EAAE,WAAW,SAAS,KAAG,OASnF,CAAC"}

package/dist/facts/measures.js

@@ -1,40 +1,89 @@
-/** 前に英字や数が続く数（v2、A4、1.2.3 の 2）は量ではない。日本語は数の前に空白を置かないので、仮名や漢字の後ろはよい。 */
-const NUMBER = /(?<![\p{Script=Latin}\p{N}.,])[0-9０-９]+(?:[,，][0-9０-９]{3})*(?:[.．][0-9０-９]+)?/gu;
+import { lineHasContext, standsAsUnitWord } from "./unit-word.js";
 /**
- * 数のすぐ後ろ（空白一つまで）の単位。長い単位から試す（「5分間」を 分 で切らない、min を m にしない）。
+ * 前に英字や数が続く数（v2、A4、1.2.3 の 2）と、分数の分母（1/2 の 2）は量ではない。日本語は数の前に空白を置かないので、仮名や漢字の後ろはよい。
+ * 字や数のすぐ後ろでない負の符号は数に含める（-20 °C）。20-25°C の - は範囲の印。
+ */
+const NUMBER = /(?<![\p{Script=Latin}\p{N}.,])(?<![0-9０-９][/／])[0-9０-９]+(?:[,，][0-9０-９]{3})*(?:[.．][0-9０-９]+)?/gu;
+const MINUS_SIGNS = new Set(["-", "−", "－"]);
+const BEFORE_SIGN = /[\p{L}\p{N}.,]/u;
+/** 数の頭の負の符号の位置。符号が無ければ数の頭。 */
+const signedStart = (source, start) => MINUS_SIGNS.has(source.charAt(start - 1)) && !BEFORE_SIGN.test(source.charAt(start - 2)) ? start - 1 : start;
+/** 数のすぐ後ろに分数が続く（大さじ1と1/2、1 1/2 cups、1½）。数だけを読むと量を取り違える。 */
+const FRACTION_AFTER = /^.?[0-9０-９]*[/／][0-9０-９]|^.?[½⅓⅔¼¾⅛]/u;
+const MAX_UNIT_LENGTH = 20;
+const lineAt = (source, offset) => {
+    const end = source.indexOf("\n", offset);
+    return source.slice(source.lastIndexOf("\n", offset - 1) + 1, end === -1 ? source.length : end);
+};
+const inContext = (unit, source, offset) => unit.context.length === 0 || lineHasContext(lineAt(source, offset), unit.context);
+/** 数と単位のあいだに置ける字。空白一つか、英語の複合語のハイフン（13.3-inch display）。 */
+const GAPS = new Set([" ", "-"]);
+/**
+ * 数のすぐ後ろ（空白かハイフン一つまで）の単位。長い単位から試す（「5分間」を 分 で切らない、min を m にしない）。
  * 単位の後ろに語が続く（5 miners）ものは、名前付きの値の終わり（fact-value-end）で落ちるので、ここでは見ない。
  */
-const unitAfter = (source, end, units) => {
-    const gap = source.charAt(end) === " " ? 1 : 0;
-    const rest = source.slice(end + gap, end + gap + 16);
-    const unit = units.find((candidate) => rest.startsWith(candidate.pattern));
-    return unit === undefined ? undefined : { unit, end: end + gap + unit.pattern.length };
+const unitAfter = (source, start, end, units) => {
+    const gap = GAPS.has(source.charAt(end)) ? 1 : 0;
+    const rest = source.slice(end + gap, end + gap + MAX_UNIT_LENGTH);
+    const unit = units.find((candidate) => !candidate.before &&
+        rest.startsWith(candidate.pattern) &&
+        standsAsUnitWord(candidate.pattern, candidate.context.length > 0, source.slice(end + gap + candidate.pattern.length)) &&
+        inContext(candidate, source, end));
+    return unit === undefined ? undefined : { unit, start, end: end + gap + unit.pattern.length };
+};
+/** 数のすぐ前（空白一つまで）の単位（大さじ1）。 */
+const unitBefore = (source, start, end, units) => {
+    const gap = source.charAt(start - 1) === " " ? 1 : 0;
+    const head = source.slice(Math.max(0, start - gap - MAX_UNIT_LENGTH), start - gap);
+    const unit = units.find((candidate) => candidate.before && head.endsWith(candidate.pattern) && inContext(candidate, source, start));
+    return unit === undefined ? undefined : { unit, start: start - gap - unit.pattern.length, end };
 };
 /** 文書の中の、単位の付いた量。 */
 export const measuredValues = (source, units) => {
     const longestFirst = units.toSorted((left, right) => right.pattern.length - left.pattern.length);
     return [...source.matchAll(NUMBER)].flatMap((match) => {
-        const found = unitAfter(source, match.index + match[0].length, longestFirst);
+        const end = match.index + match[0].length;
+        if (FRACTION_AFTER.test(source.slice(end, end + MAX_UNIT_LENGTH)))
+            return [];
+        const start = signedStart(source, match.index);
+        const found = unitAfter(source, start, end, longestFirst) ?? unitBefore(source, start, end, longestFirst);
         if (found === undefined)
             return [];
-        const amount = Number(match[0].normalize("NFKC").replace(/,/gu, ""));
+        const written = match[0].normalize("NFKC").replace(/,/gu, "");
+        const magnitude = Number(written);
+        const amount = start < match.index ? -magnitude : magnitude;
+        const { unit } = found;
         return [
             {
-                start: match.index,
+                start: found.start,
                 end: found.end,
                 kind: "quantity",
                 key: String(amount),
-                unit: found.unit.pattern,
-                dimension: found.unit.dimension,
-                factors: found.unit.factors,
+                unit: unit.pattern,
+                dimension: unit.dimension,
+                factors: unit.factors,
+                zero: unit.zero,
                 amount,
+                decimals: written.split(".")[1]?.length ?? 0,
             },
         ];
     });
 };
-/** 二つの量が同じ量か。倍率のどの組み合わせかで、基準の単位に直した値の差が大きいほうの tolerance 以内なら同じ。 */
-export const sameMeasure = (left, right, tolerance) => left.factors.some((a) => right.factors.some((b) => {
-    const [x, y] = [left.amount * a, right.amount * b];
-    return Math.abs(x - y) <= Math.max(Math.abs(x), Math.abs(y)) * tolerance;
-}));
+/** 二つの量の単位が、書き方だけ違う同じ単位か（mL と ml、tablespoon と tablespoons）。 */
+export const sameUnit = (left, right) => left.zero === right.zero && left.factors.length === right.factors.length && left.factors.every((factor, index) => factor === right.factors[index]);
+const agrees = (x, y, tolerance) => {
+    const difference = Math.abs(x - y);
+    return difference <= tolerance.absolute || difference <= Math.max(Math.abs(x), Math.abs(y)) * tolerance.relative;
+};
+/** 零点のずれた単位で、零点より小さい量（1 °F）。温度の読みより、差（0.5 ℃ の上昇は 0.9 °F）のことが多い。 */
+const couldBeDifference = (value) => value.zero !== 0 && Math.abs(value.amount) < Math.abs(value.zero);
+/**
+ * 二つの量が同じ量か。倍率のどの組み合わせかで、基準の単位に直した値の差が tolerance に収まれば同じ。零点より小さい °F の量は、差として
+ * 零点を引かずに直しても合えば合う（0.5°C (1°F)）。180 °F は差としては読まないので、100 °C (180 °F) は合わない。
+ */
+export const sameMeasure = (left, right, tolerance) => {
+    const difference = couldBeDifference(left) || couldBeDifference(right);
+    return left.factors.some((a) => right.factors.some((b) => agrees((left.amount - left.zero) * a, (right.amount - right.zero) * b, tolerance) ||
+        (difference && agrees(left.amount * a, right.amount * b, tolerance))));
+};
 //# sourceMappingURL=measures.js.map

package/dist/facts/measures.js.map

@@ -1 +1 @@
-{"version":3,"file":"measures.js","sourceRoot":"","sources":["../../src/facts/measures.ts"],"names":[],"mappings":"AAUA,uEAAuE;AACvE,MAAM,MAAM,GAAG,iFAAiF,CAAC;AAEjG;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,GAAW,EAAE,KAA6B,EAAkD,EAAE;IAC/H,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3E,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;AACzF,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAc,EAAE,KAA6B,EAAc,EAAE;IAC1F,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjG,OAAO,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAc,EAAE;QAChE,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC7E,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO;YACL;gBACE,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC;gBACnB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO;gBACxB,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS;gBAC/B,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO;gBAC3B,MAAM;aACP;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAc,EAAE,KAAe,EAAE,SAAiB,EAAW,EAAE,CACzF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACvB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;AAC3E,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"measures.js","sourceRoot":"","sources":["../../src/facts/measures.ts"],"names":[],"mappings":"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"}

package/dist/facts/retention-periods.d.ts

@@ -0,0 +1,51 @@
+import type { Span, Token } from "../plugin.ts";
+import type { DurationUnit } from "../derived/date-arithmetic.ts";
+/**
+ * 保存期間。文が、保存の語（保存、keep）か、期間の後に消す語（3年間を経過した…を削除、delete … 3 years after）と、期間を
+ * 一つだけ持つとき、その期間を、語の前後の名詞句（個人情報、personal information）の保存期間と読む。文書のどこでも、同じ名詞句に
+ * 違う長さが二通り書かれていれば言う。名詞句が違えば別のもの（ログは90日、アカウントの情報は1年）。
+ * 上限や下限や目安の長さ（最長、以上、約、up to、at least）は範囲なので比べない。年と月、週と日だけを換算して比べる。
+ */
+export type RetentionLength = Span & {
+    readonly amount: number;
+    readonly unit: DurationUnit;
+};
+/** position: 対象の名詞句が語の前か後ろか。後ろなら、後ろに無いとき前を読む（is retained の受け身）。 */
+export type RetentionVerb = {
+    readonly pattern: string;
+    readonly group: string;
+    readonly position: "before" | "after";
+};
+/** その組の語が期間を言うのに、期間の前か後ろに要る語（keep … for、delete … after、経過）。組に語が無ければ要らない。 */
+export type LengthMark = {
+    readonly pattern: string;
+    readonly group: string;
+    readonly position: "before" | "after";
+};
+export type WordAt = {
+    readonly pattern: string;
+    readonly position: "before" | "after";
+};
+export type RetentionWords = {
+    readonly verbs: readonly RetentionVerb[];
+    readonly marks: readonly LengthMark[];
+    /** 期間のすぐ後ろにあれば、期間が名詞を修飾している（過去3年間の記録）。 */
+    readonly modifiers: readonly string[];
+    /** 範囲や目安の印（最長、以上、up to）。 */
+    readonly bounds: readonly WordAt[];
+    /** 名詞句の中で名詞をつなぐ語（お問い合わせの記録 の の）。 */
+    readonly joiners: readonly string[];
+    /** 名詞句と、前にある保存の語のあいだの語（を、は）。無い言語は名詞句がすぐ前。 */
+    readonly objectMarks: readonly string[];
+};
+export type RetentionSentence = Span & {
+    readonly tokens: readonly Token[];
+};
+export type RetentionConflict = {
+    readonly object: string;
+    readonly value: RetentionLength;
+    readonly other: RetentionLength;
+};
+/** 同じ名詞句の保存期間が二通り。三通り以上は一覧として言わない。lengths は期間の単位を持つ数量だけ。 */
+export declare const retentionConflicts: (source: string, sentences: readonly RetentionSentence[], lengths: readonly RetentionLength[], words: RetentionWords) => RetentionConflict[];
+//# sourceMappingURL=retention-periods.d.ts.map

package/dist/facts/retention-periods.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retention-periods.d.ts","sourceRoot":"","sources":["../../src/facts/retention-periods.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE9F,mEAAmE;AACnE,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAExH,4EAA4E;AAC5E,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAErH,MAAM,MAAM,MAAM,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAA;CAAE,CAAC;AAEzF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS,aAAa,EAAE,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,0CAA0C;IAC1C,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,4BAA4B;IAC5B,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,oCAAoC;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,6CAA6C;IAC7C,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,IAAI,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAA;CAAE,CAAC;AAE7E,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAA;CAAE,CAAC;AA+K9H,4DAA4D;AAC5D,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,WAAW,SAAS,iBAAiB,EAAE,EACvC,SAAS,SAAS,eAAe,EAAE,EACnC,OAAO,cAAc,KACpB,iBAAiB,EAAoH,CAAC"}