chaffjs 0.32.0 → 0.34.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.
- package/README.md +7 -0
- package/dist/api.d.ts +7 -1
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js.map +1 -1
- package/dist/cli-text.d.ts.map +1 -1
- package/dist/cli-text.js +6 -4
- package/dist/cli-text.js.map +1 -1
- package/dist/commands/grade.d.ts.map +1 -1
- package/dist/commands/grade.js +66 -21
- package/dist/commands/grade.js.map +1 -1
- package/dist/company-kana-spelling.d.ts +6 -1
- package/dist/company-kana-spelling.d.ts.map +1 -1
- package/dist/company-kana-spelling.js +19 -2
- package/dist/company-kana-spelling.js.map +1 -1
- package/dist/company-name-ending.d.ts +7 -0
- package/dist/company-name-ending.d.ts.map +1 -0
- package/dist/company-name-ending.js +44 -0
- package/dist/company-name-ending.js.map +1 -0
- package/dist/company-names.d.ts +11 -3
- package/dist/company-names.d.ts.map +1 -1
- package/dist/company-names.js +27 -14
- package/dist/company-names.js.map +1 -1
- package/dist/cross-run.d.ts.map +1 -1
- package/dist/cross-run.js +1 -0
- package/dist/cross-run.js.map +1 -1
- package/dist/custom/no-rewrite.d.ts +3 -0
- package/dist/custom/no-rewrite.d.ts.map +1 -0
- package/dist/custom/no-rewrite.js +3 -0
- package/dist/custom/no-rewrite.js.map +1 -0
- package/dist/custom/parse.d.ts.map +1 -1
- package/dist/custom/parse.js +14 -2
- package/dist/custom/parse.js.map +1 -1
- package/dist/detectors/age-words.d.ts +5 -0
- package/dist/detectors/age-words.d.ts.map +1 -0
- package/dist/detectors/age-words.js +8 -0
- package/dist/detectors/age-words.js.map +1 -0
- package/dist/detectors/agreement-slip.d.ts.map +1 -1
- package/dist/detectors/agreement-slip.js +4 -0
- package/dist/detectors/agreement-slip.js.map +1 -1
- package/dist/detectors/annual-pay-mismatch.d.ts.map +1 -1
- package/dist/detectors/annual-pay-mismatch.js +2 -12
- package/dist/detectors/annual-pay-mismatch.js.map +1 -1
- package/dist/detectors/blank-structure.d.ts.map +1 -1
- package/dist/detectors/blank-structure.js +4 -3
- package/dist/detectors/blank-structure.js.map +1 -1
- package/dist/detectors/closing-balance-mismatch.d.ts.map +1 -1
- package/dist/detectors/closing-balance-mismatch.js +1 -0
- package/dist/detectors/closing-balance-mismatch.js.map +1 -1
- package/dist/detectors/code-fences.d.ts +5 -0
- package/dist/detectors/code-fences.d.ts.map +1 -1
- package/dist/detectors/code-fences.js +9 -0
- package/dist/detectors/code-fences.js.map +1 -1
- package/dist/detectors/condition-toki.d.ts +16 -0
- package/dist/detectors/condition-toki.d.ts.map +1 -0
- package/dist/detectors/condition-toki.js +42 -0
- package/dist/detectors/condition-toki.js.map +1 -0
- package/dist/detectors/conjugated-entry.d.ts +17 -0
- package/dist/detectors/conjugated-entry.d.ts.map +1 -0
- package/dist/detectors/conjugated-entry.js +50 -0
- package/dist/detectors/conjugated-entry.js.map +1 -0
- package/dist/detectors/content-morphemes.d.ts +2 -0
- package/dist/detectors/content-morphemes.d.ts.map +1 -1
- package/dist/detectors/content-morphemes.js +1 -1
- package/dist/detectors/content-morphemes.js.map +1 -1
- package/dist/detectors/cross-facts.d.ts.map +1 -1
- package/dist/detectors/cross-facts.js +2 -1
- package/dist/detectors/cross-facts.js.map +1 -1
- package/dist/detectors/custom.d.ts.map +1 -1
- package/dist/detectors/custom.js +8 -2
- package/dist/detectors/custom.js.map +1 -1
- package/dist/detectors/document-shape.d.ts.map +1 -1
- package/dist/detectors/document-shape.js +6 -0
- package/dist/detectors/document-shape.js.map +1 -1
- package/dist/detectors/due-date.d.ts.map +1 -1
- package/dist/detectors/due-date.js +12 -2
- package/dist/detectors/due-date.js.map +1 -1
- package/dist/detectors/fact-consistency.d.ts.map +1 -1
- package/dist/detectors/fact-consistency.js +12 -13
- package/dist/detectors/fact-consistency.js.map +1 -1
- package/dist/detectors/form-line.d.ts +9 -0
- package/dist/detectors/form-line.d.ts.map +1 -0
- package/dist/detectors/form-line.js +36 -0
- package/dist/detectors/form-line.js.map +1 -0
- package/dist/detectors/formula-amount.d.ts +3 -0
- package/dist/detectors/formula-amount.d.ts.map +1 -0
- package/dist/detectors/formula-amount.js +31 -0
- package/dist/detectors/formula-amount.js.map +1 -0
- package/dist/detectors/heading-claim.d.ts +14 -0
- package/dist/detectors/heading-claim.d.ts.map +1 -0
- package/dist/detectors/heading-claim.js +49 -0
- package/dist/detectors/heading-claim.js.map +1 -0
- package/dist/detectors/heading-echo.d.ts.map +1 -1
- package/dist/detectors/heading-echo.js +29 -1
- package/dist/detectors/heading-echo.js.map +1 -1
- package/dist/detectors/installment-total-mismatch.d.ts.map +1 -1
- package/dist/detectors/installment-total-mismatch.js +28 -19
- package/dist/detectors/installment-total-mismatch.js.map +1 -1
- package/dist/detectors/list-parallel.d.ts +5 -2
- package/dist/detectors/list-parallel.d.ts.map +1 -1
- package/dist/detectors/list-parallel.js +45 -7
- package/dist/detectors/list-parallel.js.map +1 -1
- package/dist/detectors/name-variant.d.ts.map +1 -1
- package/dist/detectors/name-variant.js +34 -7
- package/dist/detectors/name-variant.js.map +1 -1
- package/dist/detectors/number-unit.d.ts +10 -0
- package/dist/detectors/number-unit.d.ts.map +1 -1
- package/dist/detectors/number-unit.js +28 -8
- package/dist/detectors/number-unit.js.map +1 -1
- package/dist/detectors/orthographic-variant.d.ts.map +1 -1
- package/dist/detectors/orthographic-variant.js +4 -3
- package/dist/detectors/orthographic-variant.js.map +1 -1
- package/dist/detectors/orthography.d.ts.map +1 -1
- package/dist/detectors/orthography.js +16 -7
- package/dist/detectors/orthography.js.map +1 -1
- package/dist/detectors/per-unit-words.d.ts +7 -0
- package/dist/detectors/per-unit-words.d.ts.map +1 -0
- package/dist/detectors/per-unit-words.js +17 -0
- package/dist/detectors/per-unit-words.js.map +1 -0
- package/dist/detectors/period-multiple-mismatch.d.ts.map +1 -1
- package/dist/detectors/period-multiple-mismatch.js +2 -12
- package/dist/detectors/period-multiple-mismatch.js.map +1 -1
- package/dist/detectors/reference-number-variant.d.ts.map +1 -1
- package/dist/detectors/reference-number-variant.js +21 -3
- package/dist/detectors/reference-number-variant.js.map +1 -1
- package/dist/detectors/registry/condition-toki.d.ts +3 -0
- package/dist/detectors/registry/condition-toki.d.ts.map +1 -0
- package/dist/detectors/registry/condition-toki.js +3 -0
- package/dist/detectors/registry/condition-toki.js.map +1 -0
- package/dist/detectors/registry/formula-amount.d.ts +3 -0
- package/dist/detectors/registry/formula-amount.d.ts.map +1 -0
- package/dist/detectors/registry/formula-amount.js +3 -0
- package/dist/detectors/registry/formula-amount.js.map +1 -0
- package/dist/detectors/rent-multiple-mismatch.d.ts.map +1 -1
- package/dist/detectors/rent-multiple-mismatch.js +2 -12
- package/dist/detectors/rent-multiple-mismatch.js.map +1 -1
- package/dist/detectors/row-sentence-amounts.d.ts.map +1 -1
- package/dist/detectors/row-sentence-amounts.js +5 -10
- package/dist/detectors/row-sentence-amounts.js.map +1 -1
- package/dist/detectors/stated-amounts.d.ts +4 -0
- package/dist/detectors/stated-amounts.d.ts.map +1 -0
- package/dist/detectors/stated-amounts.js +12 -0
- package/dist/detectors/stated-amounts.js.map +1 -0
- package/dist/detectors/step-time-sum.d.ts.map +1 -1
- package/dist/detectors/step-time-sum.js +2 -1
- package/dist/detectors/step-time-sum.js.map +1 -1
- package/dist/detectors/structure-tree.d.ts +1 -1
- package/dist/detectors/structure-tree.d.ts.map +1 -1
- package/dist/detectors/structure-tree.js +7 -2
- package/dist/detectors/structure-tree.js.map +1 -1
- package/dist/detectors/team.d.ts.map +1 -1
- package/dist/detectors/team.js +10 -6
- package/dist/detectors/team.js.map +1 -1
- package/dist/detectors/time-order.d.ts.map +1 -1
- package/dist/detectors/time-order.js +17 -13
- package/dist/detectors/time-order.js.map +1 -1
- package/dist/detectors/unknown-word.d.ts +4 -1
- package/dist/detectors/unknown-word.d.ts.map +1 -1
- package/dist/detectors/unknown-word.js +18 -2
- package/dist/detectors/unknown-word.js.map +1 -1
- package/dist/detectors/use-interval.d.ts +1 -0
- package/dist/detectors/use-interval.d.ts.map +1 -1
- package/dist/detectors/use-interval.js +15 -10
- package/dist/detectors/use-interval.js.map +1 -1
- package/dist/detectors/use-maximum.d.ts.map +1 -1
- package/dist/detectors/use-maximum.js +3 -1
- package/dist/detectors/use-maximum.js.map +1 -1
- package/dist/eval.js +3 -3
- package/dist/eval.js.map +1 -1
- package/dist/extension/document-view.d.ts +2 -2
- package/dist/extension/document-view.d.ts.map +1 -1
- package/dist/extension/document-view.js +17 -8
- package/dist/extension/document-view.js.map +1 -1
- package/dist/extension/entry-genres.d.ts +5 -0
- package/dist/extension/entry-genres.d.ts.map +1 -0
- package/dist/extension/entry-genres.js +13 -0
- package/dist/extension/entry-genres.js.map +1 -0
- package/dist/extension/module-detector.d.ts.map +1 -1
- package/dist/extension/module-detector.js +4 -4
- package/dist/extension/module-detector.js.map +1 -1
- package/dist/extension/plugin-parse.d.ts +1 -1
- package/dist/extension/plugin-parse.d.ts.map +1 -1
- package/dist/extension/plugin-parse.js +24 -7
- package/dist/extension/plugin-parse.js.map +1 -1
- package/dist/extension/problem-text.d.ts.map +1 -1
- package/dist/extension/problem-text.js +2 -0
- package/dist/extension/problem-text.js.map +1 -1
- package/dist/facts/age-values.d.ts.map +1 -1
- package/dist/facts/age-values.js +20 -2
- package/dist/facts/age-values.js.map +1 -1
- package/dist/facts/column-units.d.ts +31 -0
- package/dist/facts/column-units.d.ts.map +1 -0
- package/dist/facts/column-units.js +37 -0
- package/dist/facts/column-units.js.map +1 -0
- package/dist/facts/fact-values.d.ts +4 -0
- package/dist/facts/fact-values.d.ts.map +1 -1
- package/dist/facts/fact-values.js +3 -1
- package/dist/facts/fact-values.js.map +1 -1
- package/dist/facts/labelled-facts.d.ts +10 -0
- package/dist/facts/labelled-facts.d.ts.map +1 -1
- package/dist/facts/labelled-facts.js +6 -1
- package/dist/facts/labelled-facts.js.map +1 -1
- package/dist/facts/per-unit.d.ts +36 -0
- package/dist/facts/per-unit.d.ts.map +1 -0
- package/dist/facts/per-unit.js +56 -0
- package/dist/facts/per-unit.js.map +1 -0
- package/dist/facts/row-sentence-amounts.d.ts +3 -12
- package/dist/facts/row-sentence-amounts.d.ts.map +1 -1
- package/dist/facts/row-sentence-amounts.js +1 -15
- package/dist/facts/row-sentence-amounts.js.map +1 -1
- package/dist/facts/table-facts.d.ts +1 -1
- package/dist/facts/table-facts.d.ts.map +1 -1
- package/dist/facts/table-facts.js +13 -9
- package/dist/facts/table-facts.js.map +1 -1
- package/dist/facts/term-values.d.ts +13 -1
- package/dist/facts/term-values.d.ts.map +1 -1
- package/dist/facts/term-values.js +71 -12
- package/dist/facts/term-values.js.map +1 -1
- package/dist/fix-plan/text.js +2 -2
- package/dist/fix-plan/text.js.map +1 -1
- package/dist/grade/baseline.d.ts +4 -2
- package/dist/grade/baseline.d.ts.map +1 -1
- package/dist/grade/baseline.js +13 -11
- package/dist/grade/baseline.js.map +1 -1
- package/dist/grade/expect-read.d.ts +16 -0
- package/dist/grade/expect-read.d.ts.map +1 -0
- package/dist/grade/expect-read.js +52 -0
- package/dist/grade/expect-read.js.map +1 -0
- package/dist/grade/expect.d.ts +50 -0
- package/dist/grade/expect.d.ts.map +1 -0
- package/dist/grade/expect.js +53 -0
- package/dist/grade/expect.js.map +1 -0
- package/dist/grade/grade-item.d.ts +1 -1
- package/dist/grade/grade-item.d.ts.map +1 -1
- package/dist/grade/grade-item.js +13 -3
- package/dist/grade/grade-item.js.map +1 -1
- package/dist/grade/item.d.ts +9 -1
- package/dist/grade/item.d.ts.map +1 -1
- package/dist/grade/item.js +32 -7
- package/dist/grade/item.js.map +1 -1
- package/dist/grade/result.d.ts +5 -0
- package/dist/grade/result.d.ts.map +1 -1
- package/dist/grade/results-read.d.ts.map +1 -1
- package/dist/grade/results-read.js +4 -2
- package/dist/grade/results-read.js.map +1 -1
- package/dist/grade/rubric-file.d.ts +23 -0
- package/dist/grade/rubric-file.d.ts.map +1 -0
- package/dist/grade/rubric-file.js +35 -0
- package/dist/grade/rubric-file.js.map +1 -0
- package/dist/grade/rubric.d.ts +2 -0
- package/dist/grade/rubric.d.ts.map +1 -1
- package/dist/grade/rubric.js +75 -47
- package/dist/grade/rubric.js.map +1 -1
- package/dist/grade/setup.d.ts +2 -1
- package/dist/grade/setup.d.ts.map +1 -1
- package/dist/grade/setup.js +2 -2
- package/dist/grade/setup.js.map +1 -1
- package/dist/grade/stamp.d.ts +2 -0
- package/dist/grade/stamp.d.ts.map +1 -1
- package/dist/grade/stamp.js +8 -2
- package/dist/grade/stamp.js.map +1 -1
- package/dist/grade/task-rubric.d.ts +16 -0
- package/dist/grade/task-rubric.d.ts.map +1 -0
- package/dist/grade/task-rubric.js +34 -0
- package/dist/grade/task-rubric.js.map +1 -0
- package/dist/grade/text.d.ts +5 -1
- package/dist/grade/text.d.ts.map +1 -1
- package/dist/grade/text.js +16 -4
- package/dist/grade/text.js.map +1 -1
- package/dist/lexicon-genres.d.ts +7 -0
- package/dist/lexicon-genres.d.ts.map +1 -0
- package/dist/lexicon-genres.js +8 -0
- package/dist/lexicon-genres.js.map +1 -0
- package/dist/name-char-reading.d.ts +5 -0
- package/dist/name-char-reading.d.ts.map +1 -1
- package/dist/name-char-reading.js +15 -0
- package/dist/name-char-reading.js.map +1 -1
- package/dist/name-end-letter.d.ts +19 -0
- package/dist/name-end-letter.d.ts.map +1 -0
- package/dist/name-end-letter.js +37 -0
- package/dist/name-end-letter.js.map +1 -0
- package/dist/name-neighbours.d.ts.map +1 -1
- package/dist/name-neighbours.js +2 -1
- package/dist/name-neighbours.js.map +1 -1
- package/dist/name-separator.d.ts +6 -0
- package/dist/name-separator.d.ts.map +1 -1
- package/dist/name-separator.js +29 -0
- package/dist/name-separator.js.map +1 -1
- package/dist/name-variants.d.ts +6 -3
- package/dist/name-variants.d.ts.map +1 -1
- package/dist/name-variants.js +37 -10
- package/dist/name-variants.js.map +1 -1
- package/dist/number-name.d.ts.map +1 -1
- package/dist/number-name.js +11 -2
- package/dist/number-name.js.map +1 -1
- package/dist/plugin.d.ts +6 -0
- package/dist/plugin.d.ts.map +1 -1
- package/dist/profile/cue-lines.d.ts +6 -0
- package/dist/profile/cue-lines.d.ts.map +1 -0
- package/dist/profile/cue-lines.js +13 -0
- package/dist/profile/cue-lines.js.map +1 -0
- package/dist/profile/parse.d.ts +1 -1
- package/dist/profile/parse.d.ts.map +1 -1
- package/dist/profile/parse.js +8 -2
- package/dist/profile/parse.js.map +1 -1
- package/dist/reference-numbers.d.ts +2 -0
- package/dist/reference-numbers.d.ts.map +1 -1
- package/dist/reference-numbers.js +1 -1
- package/dist/reference-numbers.js.map +1 -1
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +1 -0
- package/dist/run.js.map +1 -1
- package/dist/spaced-person-name.d.ts.map +1 -1
- package/dist/spaced-person-name.js +26 -1
- package/dist/spaced-person-name.js.map +1 -1
- package/dist/spacing-code.d.ts.map +1 -1
- package/dist/spacing-code.js +10 -1
- package/dist/spacing-code.js.map +1 -1
- package/dist/spacing-minority.d.ts +7 -0
- package/dist/spacing-minority.d.ts.map +1 -1
- package/dist/spacing-minority.js +14 -0
- package/dist/spacing-minority.js.map +1 -1
- package/dist/structure/closing-balance.d.ts +9 -0
- package/dist/structure/closing-balance.d.ts.map +1 -1
- package/dist/structure/closing-balance.js +34 -7
- package/dist/structure/closing-balance.js.map +1 -1
- package/dist/structure/date-range.d.ts +3 -2
- package/dist/structure/date-range.d.ts.map +1 -1
- package/dist/structure/date-range.js +4 -4
- package/dist/structure/date-range.js.map +1 -1
- package/dist/structure/definition-use.d.ts.map +1 -1
- package/dist/structure/definition-use.js +20 -1
- package/dist/structure/definition-use.js.map +1 -1
- package/dist/structure/document-context.d.ts +2 -0
- package/dist/structure/document-context.d.ts.map +1 -0
- package/dist/structure/document-context.js +42 -0
- package/dist/structure/document-context.js.map +1 -0
- package/dist/structure/fenced-lines.d.ts +7 -0
- package/dist/structure/fenced-lines.d.ts.map +1 -0
- package/dist/structure/fenced-lines.js +27 -0
- package/dist/structure/fenced-lines.js.map +1 -0
- package/dist/structure/formula-amount.d.ts +38 -0
- package/dist/structure/formula-amount.d.ts.map +1 -0
- package/dist/structure/formula-amount.js +187 -0
- package/dist/structure/formula-amount.js.map +1 -0
- package/dist/structure/installment-fee.d.ts +52 -0
- package/dist/structure/installment-fee.d.ts.map +1 -0
- package/dist/structure/installment-fee.js +110 -0
- package/dist/structure/installment-fee.js.map +1 -0
- package/dist/structure/installment-total.d.ts +7 -0
- package/dist/structure/installment-total.d.ts.map +1 -1
- package/dist/structure/installment-total.js +6 -6
- package/dist/structure/installment-total.js.map +1 -1
- package/dist/structure/labelled-date-order.d.ts +31 -9
- package/dist/structure/labelled-date-order.d.ts.map +1 -1
- package/dist/structure/labelled-date-order.js +60 -15
- package/dist/structure/labelled-date-order.js.map +1 -1
- package/dist/structure/labelled-order.d.ts +7 -1
- package/dist/structure/labelled-order.d.ts.map +1 -1
- package/dist/structure/labelled-order.js +10 -3
- package/dist/structure/labelled-order.js.map +1 -1
- package/dist/structure/line-amount-label.d.ts.map +1 -1
- package/dist/structure/line-amount-label.js +2 -1
- package/dist/structure/line-amount-label.js.map +1 -1
- package/dist/structure/line-amount.d.ts +0 -5
- package/dist/structure/line-amount.d.ts.map +1 -1
- package/dist/structure/line-amount.js +1 -10
- package/dist/structure/line-amount.js.map +1 -1
- package/dist/structure/prose-total.d.ts +8 -0
- package/dist/structure/prose-total.d.ts.map +1 -1
- package/dist/structure/prose-total.js +70 -2
- package/dist/structure/prose-total.js.map +1 -1
- package/dist/structure/runs.d.ts.map +1 -1
- package/dist/structure/runs.js +9 -1
- package/dist/structure/runs.js.map +1 -1
- package/dist/structure/signed-date-line.d.ts +15 -0
- package/dist/structure/signed-date-line.d.ts.map +1 -0
- package/dist/structure/signed-date-line.js +68 -0
- package/dist/structure/signed-date-line.js.map +1 -0
- package/dist/structure/start-end-range.d.ts +30 -0
- package/dist/structure/start-end-range.d.ts.map +1 -0
- package/dist/structure/start-end-range.js +79 -0
- package/dist/structure/start-end-range.js.map +1 -0
- package/dist/structure/tax.d.ts.map +1 -1
- package/dist/structure/tax.js +5 -3
- package/dist/structure/tax.js.map +1 -1
- package/dist/structure/total-line.d.ts.map +1 -1
- package/dist/structure/total-line.js +10 -6
- package/dist/structure/total-line.js.map +1 -1
- package/dist/structure/total.d.ts +2 -0
- package/dist/structure/total.d.ts.map +1 -1
- package/dist/structure/total.js +34 -3
- package/dist/structure/total.js.map +1 -1
- package/dist/subject-codes.d.ts +21 -0
- package/dist/subject-codes.d.ts.map +1 -0
- package/dist/subject-codes.js +79 -0
- package/dist/subject-codes.js.map +1 -0
- package/dist/unlabelled-references.d.ts +6 -2
- package/dist/unlabelled-references.d.ts.map +1 -1
- package/dist/unlabelled-references.js +11 -10
- package/dist/unlabelled-references.js.map +1 -1
- package/genres.yaml +17 -0
- package/package.json +4 -4
- package/profiles/listing.yaml +1 -1
- package/profiles/property-sale.yaml +21 -0
- package/rules/closing-balance-mismatch.yaml +3 -3
- package/rules/date-range-reversed.yaml +4 -4
- package/rules/due-before-issue.yaml +9 -5
- package/rules/fact-conflict.yaml +2 -2
- package/rules/formula-amount-mismatch.yaml +67 -0
- package/rules/heading-echo.yaml +2 -2
- package/rules/installment-total-mismatch.yaml +9 -4
- package/rules/internal-jargon.yaml +2 -2
- package/rules/latin-spacing.yaml +4 -4
- package/rules/list-item-form-mix.yaml +1 -1
- package/rules/name-variant.yaml +5 -2
- package/rules/no-lead.yaml +2 -2
- package/rules/number-without-unit.yaml +2 -2
- package/rules/orthographic-variant.yaml +3 -3
- package/rules/reference-number-variant.yaml +3 -3
- package/rules/toki-as-condition.yaml +71 -0
- package/rules/total-mismatch.yaml +4 -4
- package/rules/unknown-word.yaml +2 -2
- package/rules/use-before-definition.yaml +2 -2
- package/src/api.ts +11 -2
- package/src/cli-text.ts +6 -4
- package/src/commands/grade.ts +75 -23
- package/src/company-kana-spelling.ts +22 -2
- package/src/company-name-ending.ts +50 -0
- package/src/company-names.ts +52 -17
- package/src/cross-run.ts +1 -0
- package/src/custom/no-rewrite.ts +2 -0
- package/src/custom/parse.ts +18 -2
- package/src/detectors/age-words.ts +12 -0
- package/src/detectors/agreement-slip.ts +3 -0
- package/src/detectors/annual-pay-mismatch.ts +3 -18
- package/src/detectors/blank-structure.ts +4 -3
- package/src/detectors/closing-balance-mismatch.ts +1 -0
- package/src/detectors/code-fences.ts +10 -0
- package/src/detectors/condition-toki.ts +60 -0
- package/src/detectors/conjugated-entry.ts +53 -0
- package/src/detectors/content-morphemes.ts +2 -1
- package/src/detectors/cross-facts.ts +2 -1
- package/src/detectors/custom.ts +9 -2
- package/src/detectors/document-shape.ts +8 -0
- package/src/detectors/due-date.ts +17 -7
- package/src/detectors/fact-consistency.ts +13 -17
- package/src/detectors/form-line.ts +47 -0
- package/src/detectors/formula-amount.ts +43 -0
- package/src/detectors/heading-claim.ts +76 -0
- package/src/detectors/heading-echo.ts +32 -1
- package/src/detectors/installment-total-mismatch.ts +35 -24
- package/src/detectors/list-parallel.ts +46 -7
- package/src/detectors/name-variant.ts +45 -8
- package/src/detectors/number-unit.ts +35 -9
- package/src/detectors/orthographic-variant.ts +5 -3
- package/src/detectors/orthography.ts +17 -8
- package/src/detectors/per-unit-words.ts +24 -0
- package/src/detectors/period-multiple-mismatch.ts +2 -18
- package/src/detectors/reference-number-variant.ts +27 -5
- package/src/detectors/registry/condition-toki.ts +4 -0
- package/src/detectors/registry/formula-amount.ts +4 -0
- package/src/detectors/rent-multiple-mismatch.ts +2 -18
- package/src/detectors/row-sentence-amounts.ts +5 -20
- package/src/detectors/stated-amounts.ts +20 -0
- package/src/detectors/step-time-sum.ts +2 -1
- package/src/detectors/structure-tree.ts +7 -2
- package/src/detectors/team.ts +13 -7
- package/src/detectors/time-order.ts +6 -3
- package/src/detectors/unknown-word.ts +20 -2
- package/src/detectors/use-interval.ts +8 -4
- package/src/detectors/use-maximum.ts +3 -1
- package/src/eval.ts +3 -3
- package/src/extension/document-view.ts +18 -9
- package/src/extension/entry-genres.ts +15 -0
- package/src/extension/module-detector.ts +9 -4
- package/src/extension/plugin-parse.ts +29 -7
- package/src/extension/problem-text.ts +4 -0
- package/src/facts/age-values.ts +24 -2
- package/src/facts/column-units.ts +67 -0
- package/src/facts/fact-values.ts +11 -1
- package/src/facts/labelled-facts.ts +16 -2
- package/src/facts/per-unit.ts +105 -0
- package/src/facts/row-sentence-amounts.ts +4 -26
- package/src/facts/table-facts.ts +7 -4
- package/src/facts/term-values.ts +94 -13
- package/src/fix-plan/text.ts +2 -2
- package/src/grade/baseline.ts +20 -12
- package/src/grade/expect-read.ts +65 -0
- package/src/grade/expect.ts +74 -0
- package/src/grade/grade-item.ts +14 -3
- package/src/grade/item.ts +48 -8
- package/src/grade/result.ts +5 -0
- package/src/grade/results-read.ts +7 -2
- package/src/grade/rubric-file.ts +46 -0
- package/src/grade/rubric.ts +77 -47
- package/src/grade/setup.ts +3 -3
- package/src/grade/stamp.ts +10 -2
- package/src/grade/task-rubric.ts +39 -0
- package/src/grade/text.ts +27 -5
- package/src/lexicon-genres.ts +11 -0
- package/src/name-char-reading.ts +16 -0
- package/src/name-end-letter.ts +52 -0
- package/src/name-neighbours.ts +2 -1
- package/src/name-separator.ts +32 -0
- package/src/name-variants.ts +54 -13
- package/src/number-name.ts +12 -3
- package/src/plugin.ts +6 -0
- package/src/profile/cue-lines.ts +14 -0
- package/src/profile/parse.ts +11 -2
- package/src/reference-numbers.ts +1 -1
- package/src/run.ts +1 -0
- package/src/spaced-person-name.ts +27 -2
- package/src/spacing-code.ts +13 -2
- package/src/spacing-minority.ts +17 -0
- package/src/structure/closing-balance.ts +46 -8
- package/src/structure/date-range.ts +4 -3
- package/src/structure/definition-use.ts +24 -1
- package/src/structure/document-context.ts +46 -0
- package/src/structure/fenced-lines.ts +28 -0
- package/src/structure/formula-amount.ts +236 -0
- package/src/structure/installment-fee.ts +201 -0
- package/src/structure/installment-total.ts +6 -6
- package/src/structure/labelled-date-order.ts +105 -21
- package/src/structure/labelled-order.ts +21 -10
- package/src/structure/line-amount-label.ts +2 -1
- package/src/structure/line-amount.ts +1 -11
- package/src/structure/prose-total.ts +81 -2
- package/src/structure/runs.ts +10 -1
- package/src/structure/signed-date-line.ts +78 -0
- package/src/structure/start-end-range.ts +120 -0
- package/src/structure/tax.ts +6 -3
- package/src/structure/total-line.ts +12 -6
- package/src/structure/total.ts +42 -3
- package/src/subject-codes.ts +105 -0
- package/src/unlabelled-references.ts +24 -16
package/dist/fix-plan/text.js
CHANGED
|
@@ -60,7 +60,7 @@ export const FIX_PLAN_TEXT = {
|
|
|
60
60
|
spots: "見つけた箇所",
|
|
61
61
|
at: (line) => `${String(line)} 行目`,
|
|
62
62
|
notRunHeading: "動かなかったルール",
|
|
63
|
-
notExperimental: "
|
|
63
|
+
notExperimental: "試験中のルールは動かしていません。--experimental を付けると見ます。",
|
|
64
64
|
checksHeading: "直したあとの確かめ",
|
|
65
65
|
saveAs: (path) => `書き直したものを ${path} に保存して、次を実行します。`,
|
|
66
66
|
checksNote: "1 つめは書き直した文書の指摘、2 つめは事実が落ちていないか・足されていないか、3 つめは構成の変化です。数は chaff の出力から取り、形容詞で言わないでください。",
|
|
@@ -120,7 +120,7 @@ export const FIX_PLAN_TEXT = {
|
|
|
120
120
|
spots: "Spots",
|
|
121
121
|
at: (line) => `line ${String(line)}`,
|
|
122
122
|
notRunHeading: "Rules that did not run",
|
|
123
|
-
notExperimental: "The experimental rules did not run
|
|
123
|
+
notExperimental: "The experimental rules did not run. Add --experimental to run them.",
|
|
124
124
|
checksHeading: "Check after rewriting",
|
|
125
125
|
saveAs: (path) => `Save the rewrite as ${path} and run:`,
|
|
126
126
|
checksNote: "The first lists the rewrite's findings, the second checks that no fact was dropped or added, the third shows how the outline moved. Take the numbers from chaff's output, not adjectives.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/fix-plan/text.ts"],"names":[],"mappings":"AA+CA,MAAM,CAAC,MAAM,aAAa,GAAuB;IAC/C,EAAE,EAAE;QACF,KAAK,EAAE,uHAAuH;QAC9H,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,UAAU;QACrC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,IAAI,EAAE;QAChC,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,QAAQ,SAAS,KAAK,EAAE;QAC1D,KAAK,EACH,gGAAgG;QAClG,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,IAAI,IAAI,KAAK,GAAG;QACtD,SAAS,EAAE,qDAAqD;QAChE,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAqB,GAAG,EAAE;QAC/C,kBAAkB,EAAE,MAAM;QAC1B,WAAW,EAAE;YACX,qBAAqB;YACrB,0BAA0B;YAC1B,kDAAkD;YAClD,oCAAoC;SACrC;QACD,WAAW,EAAE,QAAQ;QACrB,QAAQ,EAAE;YACR,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;SAC7B;QACD,UAAU,EAAE;YACV,MAAM,EAAE,4BAA4B;YACpC,aAAa,EAAE,wDAAwD;YACvE,eAAe,EAAE,qBAAqB;YACtC,YAAY,EAAE,gEAAgE;YAC9E,SAAS,EAAE,yDAAyD;YACpE,SAAS,EAAE,kEAAkE;YAC7E,KAAK,EAAE,mCAAmC;YAC1C,OAAO,EAAE,gDAAgD;YACzD,KAAK,EAAE,0BAA0B;SAClC;QACD,QAAQ,EAAE;YACR,4BAA4B;YAC5B,wCAAwC;YACxC,wEAAwE;YACxE,+FAA+F;SAChG;QACD,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,KAAK,IAAI,OAAO,IAAI,KAAK,GAAG;QAC9E,UAAU,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,qCAAqC,EAAE;QACtF,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,cAAc;QAC7B,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CACrB,2BAA2B,MAAM,+DAA+D;QAClG,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK;QAC/D,cAAc,EAAE,SAAS;QACzB,SAAS,EAAE,wBAAwB;QACnC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,QAAQ,EAAE;QAC5C,YAAY,EAAE,WAAW;QACzB,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,UAAU;QACjB,OAAO,EAAE,GAAG;QACZ,MAAM,EAAE,GAAG;QACX,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,aAAa;QACtB,KAAK,EAAE,QAAQ;QACf,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK;QAClC,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/fix-plan/text.ts"],"names":[],"mappings":"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"}
|
package/dist/grade/baseline.d.ts
CHANGED
|
@@ -43,9 +43,11 @@ export type StampCheck = {
|
|
|
43
43
|
readonly differ: readonly ("rules" | "settings" | "mixed")[];
|
|
44
44
|
};
|
|
45
45
|
export declare const stampCheck: (before: readonly GradeResult[], current: Stamp) => StampCheck;
|
|
46
|
+
/** The rules the rubric names for one output: with rubric tasks, its task's rules over the top level's. */
|
|
47
|
+
export type RubricRulesOf = (result: GradeResult) => ReadonlySet<string>;
|
|
46
48
|
/**
|
|
47
49
|
* `after` compared with `before`, output by output: an output is paired with the earlier one of its id and variant.
|
|
48
|
-
* `rubricRules`: the rules the rubric names, whose increase is a regression.
|
|
50
|
+
* `rubricRules`: the rules the rubric names, whose increase is a regression; per output when the rubric has tasks.
|
|
49
51
|
*/
|
|
50
|
-
export declare const compareRuns: (before: readonly GradeResult[], after: readonly GradeResult[], rubricRules: ReadonlySet<string>) => Comparison;
|
|
52
|
+
export declare const compareRuns: (before: readonly GradeResult[], after: readonly GradeResult[], rubricRules: ReadonlySet<string> | RubricRulesOf) => Comparison;
|
|
51
53
|
//# sourceMappingURL=baseline.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseline.d.ts","sourceRoot":"","sources":["../../src/grade/baseline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAKjF,oHAAoH;AACpH,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,2FAA2F;IAC3F,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,+GAA+G;AAC/G,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,iGAAiG;IACjG,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACnF,+DAA+D;IAC/D,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,6GAA6G;AAC7G,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC,EAAE,CAAA;CAAE,CAAC;AAItJ,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,WAAW,EAAE,EAAE,SAAS,KAAK,KAAG,UAO3E,CAAC;
|
|
1
|
+
{"version":3,"file":"baseline.d.ts","sourceRoot":"","sources":["../../src/grade/baseline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI/C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAKjF,oHAAoH;AACpH,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,2FAA2F;IAC3F,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,+GAA+G;AAC/G,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,CAAC;CAC/C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,iGAAiG;IACjG,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACnF,+DAA+D;IAC/D,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CACzC,CAAC;AAEF,6GAA6G;AAC7G,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC,EAAE,CAAA;CAAE,CAAC;AAItJ,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,WAAW,EAAE,EAAE,SAAS,KAAK,KAAG,UAO3E,CAAC;AAMF,2GAA2G;AAC3G,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC;AAwDzE;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ,SAAS,WAAW,EAAE,EAAE,OAAO,SAAS,WAAW,EAAE,EAAE,aAAa,WAAW,CAAC,MAAM,CAAC,GAAG,aAAa,KAAG,UAwB7I,CAAC"}
|
package/dist/grade/baseline.js
CHANGED
|
@@ -12,13 +12,16 @@ export const stampCheck = (before, current) => {
|
|
|
12
12
|
return differ.length === 0 ? { comparable: true } : { comparable: false, differ };
|
|
13
13
|
};
|
|
14
14
|
const countIn = (result, rule) => result.findings.filter((finding) => finding.rule === rule).length;
|
|
15
|
-
const movementsOf = (pairs,
|
|
15
|
+
const movementsOf = (pairs, rubricRulesOf) => rateRows([pairs.map((pair) => pair.before), pairs.map((pair) => pair.after)]).flatMap(({ rule, unit, rates: [before = 0, after = 0] }) => {
|
|
16
16
|
const inUnit = pairs.filter((pair) => pair.after.size.unit === unit);
|
|
17
|
-
const
|
|
17
|
+
const increased = inUnit.filter((pair) => countIn(pair.after, rule) > countIn(pair.before, rule));
|
|
18
|
+
const increasedIn = increased.map((pair) => resultName(pair.after));
|
|
18
19
|
const decreasedIn = inUnit.filter((pair) => countIn(pair.after, rule) < countIn(pair.before, rule)).map((pair) => resultName(pair.after));
|
|
19
20
|
if (increasedIn.length === 0 && decreasedIn.length === 0 && before === after)
|
|
20
21
|
return [];
|
|
21
|
-
|
|
22
|
+
const graded = (pair) => rubricRulesOf(pair.after).has(rule);
|
|
23
|
+
const regressedIn = increased.filter(graded).map((pair) => resultName(pair.after));
|
|
24
|
+
return [{ movement: { rule, unit, before, after, increasedIn, decreasedIn, inRubric: inUnit.some(graded) }, regressedIn }];
|
|
22
25
|
});
|
|
23
26
|
const factKey = (fact) => `${fact.kind}\n${fact.key}`;
|
|
24
27
|
/** The facts of `after` beyond as many as `before` had of each: a fact dropped in both runs is not new. */
|
|
@@ -45,19 +48,18 @@ const itemChange = ({ before, after }) => {
|
|
|
45
48
|
};
|
|
46
49
|
const penaltyOf = (results) => results.reduce((sum, result) => sum + (result.score?.penalty ?? 0), 0);
|
|
47
50
|
const scored = (pairs) => pairs.some((pair) => pair.after.score !== undefined);
|
|
48
|
-
const regressionsOf = (newlyFailed,
|
|
51
|
+
const regressionsOf = (newlyFailed, moved, penalty) => [
|
|
49
52
|
...newlyFailed.map((id) => `${id}: passed, now fails`),
|
|
50
|
-
...
|
|
51
|
-
.filter((movement) => movement.inRubric && movement.increasedIn.length > 0)
|
|
52
|
-
.map((movement) => `rules.${movement.rule}: more findings in ${movement.increasedIn.join(", ")}`),
|
|
53
|
+
...moved.filter((entry) => entry.regressedIn.length > 0).map((entry) => `rules.${entry.movement.rule}: more findings in ${entry.regressedIn.join(", ")}`),
|
|
53
54
|
...(penalty !== undefined && penalty.after > penalty.before ? [`score.penalty ${String(penalty.before)} → ${String(penalty.after)}`] : []),
|
|
54
55
|
];
|
|
55
56
|
const pairRead = (pair) => sameReading([pair.before, pair.after]);
|
|
56
57
|
/**
|
|
57
58
|
* `after` compared with `before`, output by output: an output is paired with the earlier one of its id and variant.
|
|
58
|
-
* `rubricRules`: the rules the rubric names, whose increase is a regression.
|
|
59
|
+
* `rubricRules`: the rules the rubric names, whose increase is a regression; per output when the rubric has tasks.
|
|
59
60
|
*/
|
|
60
61
|
export const compareRuns = (before, after, rubricRules) => {
|
|
62
|
+
const rubricRulesOf = typeof rubricRules === "function" ? rubricRules : () => rubricRules;
|
|
61
63
|
const earlier = new Map(before.map((result) => [resultKey(result), result]));
|
|
62
64
|
const keys = new Set(after.map(resultKey));
|
|
63
65
|
const matched = after.flatMap((result) => {
|
|
@@ -65,7 +67,7 @@ export const compareRuns = (before, after, rubricRules) => {
|
|
|
65
67
|
return match === undefined ? [] : [{ before: match, after: result }];
|
|
66
68
|
});
|
|
67
69
|
const pairs = matched.filter(pairRead);
|
|
68
|
-
const
|
|
70
|
+
const moved = movementsOf(pairs, rubricRulesOf);
|
|
69
71
|
const newlyFailed = pairs.filter((pair) => pair.before.pass && !pair.after.pass).map((pair) => resultName(pair.after));
|
|
70
72
|
const penalty = scored(pairs) ? { before: penaltyOf(pairs.map((pair) => pair.before)), after: penaltyOf(pairs.map((pair) => pair.after)) } : undefined;
|
|
71
73
|
return {
|
|
@@ -73,12 +75,12 @@ export const compareRuns = (before, after, rubricRules) => {
|
|
|
73
75
|
onlyBefore: before.filter((result) => !keys.has(resultKey(result))).map(resultName),
|
|
74
76
|
onlyAfter: after.filter((result) => !earlier.has(resultKey(result))).map(resultName),
|
|
75
77
|
readOtherwise: matched.filter((pair) => !pairRead(pair)).map((pair) => resultName(pair.after)),
|
|
76
|
-
rules,
|
|
78
|
+
rules: moved.map((entry) => entry.movement),
|
|
77
79
|
newlyFailed,
|
|
78
80
|
newlyPassed: pairs.filter((pair) => !pair.before.pass && pair.after.pass).map((pair) => resultName(pair.after)),
|
|
79
81
|
items: pairs.map(itemChange).filter((change) => change.dropped.length + change.added.length + change.citations.length > 0),
|
|
80
82
|
...(penalty === undefined ? {} : { penalty }),
|
|
81
|
-
regressions: regressionsOf(newlyFailed,
|
|
83
|
+
regressions: regressionsOf(newlyFailed, moved, penalty),
|
|
82
84
|
};
|
|
83
85
|
};
|
|
84
86
|
//# sourceMappingURL=baseline.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseline.js","sourceRoot":"","sources":["../../src/grade/baseline.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA4CzD,MAAM,WAAW,GAAsC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAA8B,EAAE,OAAc,EAAc,EAAE;IACvF,oHAAoH;IACpH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACzH,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IACvB,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAC5F,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACjF,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACpF,CAAC,CAAC;AAIF,MAAM,OAAO,GAAG,CAAC,MAAmB,EAAE,IAAY,EAAU,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"baseline.js","sourceRoot":"","sources":["../../src/grade/baseline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type ItemReading } from "./checks.ts";
|
|
2
|
+
import { type GradeExpectResult } from "./expect.ts";
|
|
3
|
+
import type { GradeItem, ItemProblem } from "./item.ts";
|
|
4
|
+
/** Each entry chaff cannot read as exactly one fact, on the item's line: the run stops before grading (exit 2). */
|
|
5
|
+
export declare const expectProblems: (item: GradeItem, line: number, setup: {
|
|
6
|
+
readonly config: ItemReading["config"];
|
|
7
|
+
readonly genre?: string | undefined;
|
|
8
|
+
}) => Promise<ItemProblem[]>;
|
|
9
|
+
/**
|
|
10
|
+
* The output against the item's expect, read in the language and genre it was graded in. Throws for an entry that is
|
|
11
|
+
* not one fact: `chaff grade` refuses such an item before grading (expectProblems), so none reaches here.
|
|
12
|
+
*/
|
|
13
|
+
export declare const expectOfItem: (item: GradeItem, reading: ItemReading & {
|
|
14
|
+
readonly language: string;
|
|
15
|
+
}) => Promise<GradeExpectResult | undefined>;
|
|
16
|
+
//# sourceMappingURL=expect-read.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expect-read.d.ts","sourceRoot":"","sources":["../../src/grade/expect-read.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAyE,KAAK,iBAAiB,EAAkB,MAAM,aAAa,CAAC;AAC5I,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAkCxD,mHAAmH;AACnH,eAAO,MAAM,cAAc,GACzB,MAAM,SAAS,EACf,MAAM,MAAM,EACZ,OAAO;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,KACrF,OAAO,CAAC,WAAW,EAAE,CAIvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAU,MAAM,SAAS,EAAE,SAAS,WAAW,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAQ/I,CAAC"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { documentLanguage } from "../check-source.js";
|
|
2
|
+
import { factsOf } from "../commands/compare.js";
|
|
3
|
+
import { documentFromSource } from "../commands/read-document.js";
|
|
4
|
+
import { resolveGenre } from "../resolve-genre.js";
|
|
5
|
+
import { OUTPUT_PATH } from "./checks.js";
|
|
6
|
+
import { EXPECT_LISTS, entryPath, expectAgainst, factOfEntry } from "./expect.js";
|
|
7
|
+
// An item's `expect` entries read as compare reads a document, in the output's language and genre, so an entry and
|
|
8
|
+
// the output spell one fact alike.
|
|
9
|
+
const ENTRY_PATH = "expect.md";
|
|
10
|
+
const readEntry = async (list, index, entry, reading) => {
|
|
11
|
+
const prose = await documentFromSource(ENTRY_PATH, entry, { language: reading.language, genre: reading.genre }, reading.config, true);
|
|
12
|
+
const facts = factsOf(ENTRY_PATH, prose, reading.config.names ?? []);
|
|
13
|
+
const found = factOfEntry(entry, facts.extraction.atoms);
|
|
14
|
+
if ("unread" in found)
|
|
15
|
+
return { problem: { kind: found.unread === "no-fact" ? "expect-no-fact" : "expect-several-facts", detail: `${entryPath(list, index)} ${entry}` } };
|
|
16
|
+
return { entry: { list, index, entry, read: { path: ENTRY_PATH, extraction: { ...facts.extraction, atoms: [found.fact] } } } };
|
|
17
|
+
};
|
|
18
|
+
const readEntries = (expect, reading) => Promise.all(EXPECT_LISTS.flatMap((list) => expect[list].map((entry, index) => readEntry(list, index, entry, reading))));
|
|
19
|
+
/** The output's own facts, read as `chaff compare` reads the document after. */
|
|
20
|
+
const outputFacts = async (output, reading) => {
|
|
21
|
+
const prose = await documentFromSource(OUTPUT_PATH, output, { language: reading.language, genre: reading.genre }, reading.config, true);
|
|
22
|
+
return factsOf(OUTPUT_PATH, prose, reading.config.names ?? []);
|
|
23
|
+
};
|
|
24
|
+
/** The language and genre the output is graded in, as checkSource chooses them. */
|
|
25
|
+
const itemReading = (item, setup) => ({
|
|
26
|
+
config: setup.config,
|
|
27
|
+
language: item.language ?? documentLanguage(OUTPUT_PATH, item.output, setup.config),
|
|
28
|
+
genre: resolveGenre(OUTPUT_PATH, item.output, setup.config, item.genre ?? setup.genre).genre,
|
|
29
|
+
});
|
|
30
|
+
/** Each entry chaff cannot read as exactly one fact, on the item's line: the run stops before grading (exit 2). */
|
|
31
|
+
export const expectProblems = async (item, line, setup) => {
|
|
32
|
+
if (item.expect === undefined)
|
|
33
|
+
return [];
|
|
34
|
+
const read = await readEntries(item.expect, itemReading(item, setup));
|
|
35
|
+
return read.flatMap((entry) => ("problem" in entry ? [{ ...entry.problem, line }] : []));
|
|
36
|
+
};
|
|
37
|
+
/**
|
|
38
|
+
* The output against the item's expect, read in the language and genre it was graded in. Throws for an entry that is
|
|
39
|
+
* not one fact: `chaff grade` refuses such an item before grading (expectProblems), so none reaches here.
|
|
40
|
+
*/
|
|
41
|
+
export const expectOfItem = async (item, reading) => {
|
|
42
|
+
if (item.expect === undefined)
|
|
43
|
+
return undefined;
|
|
44
|
+
const read = await readEntries(item.expect, reading);
|
|
45
|
+
const entries = read.flatMap((entry) => {
|
|
46
|
+
if ("problem" in entry)
|
|
47
|
+
throw new Error(`${item.id}: ${entry.problem.detail ?? ""} is not one fact`);
|
|
48
|
+
return [entry.entry];
|
|
49
|
+
});
|
|
50
|
+
return expectAgainst(entries, await outputFacts(item.output, reading));
|
|
51
|
+
};
|
|
52
|
+
//# sourceMappingURL=expect-read.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expect-read.js","sourceRoot":"","sources":["../../src/grade/expect-read.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { Atom } from "../compare/atom.ts";
|
|
2
|
+
import { type Compared } from "../compare/outcome.ts";
|
|
3
|
+
export type GradeExpect = {
|
|
4
|
+
readonly facts: readonly string[];
|
|
5
|
+
readonly absent: readonly string[];
|
|
6
|
+
};
|
|
7
|
+
export declare const EXPECT_LISTS: readonly ["facts", "absent"];
|
|
8
|
+
export type ExpectList = (typeof EXPECT_LISTS)[number];
|
|
9
|
+
/**
|
|
10
|
+
* The field as written, or the path of its first wrong part. A key other than facts and absent is wrong, not ignored:
|
|
11
|
+
* a misspelt list would check nothing and pass every output. A missing list is an empty one.
|
|
12
|
+
*/
|
|
13
|
+
export declare const expectOf: (raw: unknown) => {
|
|
14
|
+
readonly expect: GradeExpect | undefined;
|
|
15
|
+
} | {
|
|
16
|
+
readonly wrong: string;
|
|
17
|
+
};
|
|
18
|
+
/** The one fact an entry states, or why it states none or several. */
|
|
19
|
+
export type EntryFact = {
|
|
20
|
+
readonly fact: Atom;
|
|
21
|
+
} | {
|
|
22
|
+
readonly unread: "no-fact" | "several-facts";
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* The fact an entry states. Several facts are one when exactly one of them is the whole entry: a quotation 「12,000円」
|
|
26
|
+
* is read as the quotation and the number inside it, and the entry means the quotation.
|
|
27
|
+
*/
|
|
28
|
+
export declare const factOfEntry: (entry: string, atoms: readonly Atom[]) => EntryFact;
|
|
29
|
+
/** Where an entry is in the item: `expect.facts[0]`. */
|
|
30
|
+
export declare const entryPath: (list: ExpectList, index: number) => string;
|
|
31
|
+
/** One entry as read: its list, its place, its text, and its document's facts with only the entry's fact kept. */
|
|
32
|
+
export type ReadEntry = {
|
|
33
|
+
readonly list: ExpectList;
|
|
34
|
+
readonly index: number;
|
|
35
|
+
readonly entry: string;
|
|
36
|
+
readonly read: Compared;
|
|
37
|
+
};
|
|
38
|
+
/** An entry that states one fact, compared as compare compares two documents: the output states it at least once. */
|
|
39
|
+
export declare const statesFact: (entry: Compared, output: Compared) => boolean;
|
|
40
|
+
/** What the output was checked against: how many entries, the facts it does not state, and the absent ones it does. */
|
|
41
|
+
export type GradeExpectResult = {
|
|
42
|
+
readonly checked: number;
|
|
43
|
+
readonly missing: readonly string[];
|
|
44
|
+
readonly present: readonly string[];
|
|
45
|
+
};
|
|
46
|
+
/** Each entry against the output, by the entry's text as written in the item. */
|
|
47
|
+
export declare const expectAgainst: (entries: readonly ReadEntry[], output: Compared) => GradeExpectResult;
|
|
48
|
+
/** The failure reasons: `expect.missing 12,000円`, `expect.present 15,000円`. Absent when the item had no expect. */
|
|
49
|
+
export declare const expectFailures: (result: GradeExpectResult | undefined) => string[];
|
|
50
|
+
//# sourceMappingURL=expect.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expect.d.ts","sourceRoot":"","sources":["../../src/grade/expect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKjE,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAEpG,eAAO,MAAM,YAAY,8BAA+B,CAAC;AAEzD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAQvD;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,OAAO,KAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAY9G,CAAC;AAEF,sEAAsE;AACtE,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,eAAe,CAAA;CAAE,CAAC;AAEnG;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,EAAE,OAAO,SAAS,IAAI,EAAE,KAAG,SAOnE,CAAC;AAEF,wDAAwD;AACxD,eAAO,MAAM,SAAS,GAAI,MAAM,UAAU,EAAE,OAAO,MAAM,KAAG,MAA4C,CAAC;AAEzG,kHAAkH;AAClH,MAAM,MAAM,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE/H,qHAAqH;AACrH,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,EAAE,QAAQ,QAAQ,KAAG,OAA+E,CAAC;AAE/I,uHAAuH;AACvH,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvI,iFAAiF;AACjF,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,QAAQ,KAAG,iBAI9E,CAAC;AAEH,mHAAmH;AACnH,eAAO,MAAM,cAAc,GAAI,QAAQ,iBAAiB,GAAG,SAAS,KAAG,MAAM,EAC2E,CAAC"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { outcomeOf } from "../compare/outcome.js";
|
|
2
|
+
export const EXPECT_LISTS = ["facts", "absent"];
|
|
3
|
+
const isExpectList = (key) => EXPECT_LISTS.some((list) => list === key);
|
|
4
|
+
const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5
|
+
const isEntryList = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string" && entry.trim() !== "");
|
|
6
|
+
/**
|
|
7
|
+
* The field as written, or the path of its first wrong part. A key other than facts and absent is wrong, not ignored:
|
|
8
|
+
* a misspelt list would check nothing and pass every output. A missing list is an empty one.
|
|
9
|
+
*/
|
|
10
|
+
export const expectOf = (raw) => {
|
|
11
|
+
if (raw === undefined)
|
|
12
|
+
return { expect: undefined };
|
|
13
|
+
if (!isRecord(raw))
|
|
14
|
+
return { wrong: "expect" };
|
|
15
|
+
const unknown = Object.keys(raw).find((key) => !isExpectList(key));
|
|
16
|
+
if (unknown !== undefined)
|
|
17
|
+
return { wrong: `expect.${unknown}` };
|
|
18
|
+
const wrongList = EXPECT_LISTS.find((list) => raw[list] !== undefined && !isEntryList(raw[list]));
|
|
19
|
+
if (wrongList !== undefined)
|
|
20
|
+
return { wrong: `expect.${wrongList}` };
|
|
21
|
+
const listOf = (list) => {
|
|
22
|
+
const value = raw[list];
|
|
23
|
+
return isEntryList(value) ? value : [];
|
|
24
|
+
};
|
|
25
|
+
return { expect: { facts: listOf("facts"), absent: listOf("absent") } };
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* The fact an entry states. Several facts are one when exactly one of them is the whole entry: a quotation 「12,000円」
|
|
29
|
+
* is read as the quotation and the number inside it, and the entry means the quotation.
|
|
30
|
+
*/
|
|
31
|
+
export const factOfEntry = (entry, atoms) => {
|
|
32
|
+
const [only] = atoms;
|
|
33
|
+
if (atoms.length === 1 && only !== undefined)
|
|
34
|
+
return { fact: only };
|
|
35
|
+
if (atoms.length === 0)
|
|
36
|
+
return { unread: "no-fact" };
|
|
37
|
+
const whole = atoms.filter((atom) => atom.text === entry.trim());
|
|
38
|
+
const [wholeOnly] = whole;
|
|
39
|
+
return whole.length === 1 && wholeOnly !== undefined ? { fact: wholeOnly } : { unread: "several-facts" };
|
|
40
|
+
};
|
|
41
|
+
/** Where an entry is in the item: `expect.facts[0]`. */
|
|
42
|
+
export const entryPath = (list, index) => `expect.${list}[${String(index)}]`;
|
|
43
|
+
/** An entry that states one fact, compared as compare compares two documents: the output states it at least once. */
|
|
44
|
+
export const statesFact = (entry, output) => outcomeOf(entry, output, undefined, "distinct").dropped.length === 0;
|
|
45
|
+
/** Each entry against the output, by the entry's text as written in the item. */
|
|
46
|
+
export const expectAgainst = (entries, output) => ({
|
|
47
|
+
checked: entries.length,
|
|
48
|
+
missing: entries.filter((entry) => entry.list === "facts" && !statesFact(entry.read, output)).map((entry) => entry.entry),
|
|
49
|
+
present: entries.filter((entry) => entry.list === "absent" && statesFact(entry.read, output)).map((entry) => entry.entry),
|
|
50
|
+
});
|
|
51
|
+
/** The failure reasons: `expect.missing 12,000円`, `expect.present 15,000円`. Absent when the item had no expect. */
|
|
52
|
+
export const expectFailures = (result) => result === undefined ? [] : [...result.missing.map((entry) => `expect.missing ${entry}`), ...result.present.map((entry) => `expect.present ${entry}`)];
|
|
53
|
+
//# sourceMappingURL=expect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expect.js","sourceRoot":"","sources":["../../src/grade/expect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAiB,MAAM,uBAAuB,CAAC;AAOjE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAU,CAAC;AAIzD,MAAM,YAAY,GAAG,CAAC,GAAW,EAAqB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;AAEnG,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAoC,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAE5I,MAAM,WAAW,GAAG,CAAC,KAAc,EAAqB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAE5J;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAY,EAA6E,EAAE;IAClH,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACpD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACnE,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,KAAK,EAAE,UAAU,OAAO,EAAE,EAAE,CAAC;IACjE,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClG,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,KAAK,EAAE,UAAU,SAAS,EAAE,EAAE,CAAC;IACrE,MAAM,MAAM,GAAG,CAAC,IAAgB,EAAqB,EAAE;QACrD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,CAAC,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;AAC1E,CAAC,CAAC;AAKF;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,KAAsB,EAAa,EAAE;IAC9E,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACrB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACjE,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;IAC1B,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;AAC3G,CAAC,CAAC;AAEF,wDAAwD;AACxD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,KAAa,EAAU,EAAE,CAAC,UAAU,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;AAKzG,qHAAqH;AACrH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAe,EAAE,MAAgB,EAAW,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;AAK/I,iFAAiF;AACjF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAA6B,EAAE,MAAgB,EAAqB,EAAE,CAAC,CAAC;IACpG,OAAO,EAAE,OAAO,CAAC,MAAM;IACvB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;IACzH,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;CAC1H,CAAC,CAAC;AAEH,mHAAmH;AACnH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAqC,EAAY,EAAE,CAChF,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,KAAK,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -8,5 +8,5 @@ export type GradeSetup = GradeSettings & {
|
|
|
8
8
|
readonly rubric?: Rubric | undefined;
|
|
9
9
|
};
|
|
10
10
|
/** Grades one output (spec §29.3): its findings and their rates, the facts against its reference, its quotations, and pass or fail. */
|
|
11
|
-
export declare const gradeItem: (item: GradeItem,
|
|
11
|
+
export declare const gradeItem: (item: GradeItem, runSetup: GradeSetup) => Promise<GradeResult>;
|
|
12
12
|
//# sourceMappingURL=grade-item.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grade-item.d.ts","sourceRoot":"","sources":["../../src/grade/grade-item.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAA4C,WAAW,EAA2B,KAAK,EAAE,MAAM,aAAa,CAAC;AACzH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"grade-item.d.ts","sourceRoot":"","sources":["../../src/grade/grade-item.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAA4C,WAAW,EAA2B,KAAK,EAAE,MAAM,aAAa,CAAC;AACzH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAQhD,kHAAkH;AAClH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAiFzG,uIAAuI;AACvI,eAAO,MAAM,SAAS,GAAU,MAAM,SAAS,EAAE,UAAU,UAAU,KAAG,OAAO,CAAC,WAAW,CA8B1F,CAAC"}
|
package/dist/grade/grade-item.js
CHANGED
|
@@ -6,10 +6,13 @@ import { citationsAgainst, factsAgainst, OUTPUT_PATH } from "./checks.js";
|
|
|
6
6
|
import { contextsAgainst } from "./contexts.js";
|
|
7
7
|
import { ratesOf, sizeOf } from "./rates.js";
|
|
8
8
|
import { rubricVerdict } from "./rubric-verdict.js";
|
|
9
|
+
import { rubricForTask } from "./task-rubric.js";
|
|
9
10
|
import { GRADE_TEXT } from "./text.js";
|
|
10
11
|
import { aiScoreOfDocument } from "../ai-score/of-document.js";
|
|
11
12
|
import { gradeAiScoreOf } from "./ai-score.js";
|
|
12
|
-
import { defaultVerdict } from "./verdict.js";
|
|
13
|
+
import { defaultVerdict, verdictOf } from "./verdict.js";
|
|
14
|
+
import { expectFailures } from "./expect.js";
|
|
15
|
+
import { expectOfItem } from "./expect-read.js";
|
|
13
16
|
/** The fact kinds the rubric lets change (`allow_dropped`, `allow_added`), as compare's --allow-dropped and --allow-added. */
|
|
14
17
|
const allowedBy = (rubric) => ({
|
|
15
18
|
dropped: new Set(rubric?.facts?.allowDropped ?? []),
|
|
@@ -29,6 +32,7 @@ const checkItem = async (item, setup) => {
|
|
|
29
32
|
facts: item.reference === undefined ? null : await factsAgainst(texts, reading, allowedBy(setup.rubric)),
|
|
30
33
|
cited: item.citations === undefined ? undefined : await citationsAgainst(item, item.citations, reading, ui),
|
|
31
34
|
contexts: await contextsOf(item, check.language, reading, setup.rubric),
|
|
35
|
+
expect: await expectOfItem(item, { ...reading, language: check.language }),
|
|
32
36
|
};
|
|
33
37
|
};
|
|
34
38
|
const contextsOf = async (item, outputLanguage, reading, rubric) => {
|
|
@@ -71,12 +75,17 @@ const judge = (item, checked, setup) => {
|
|
|
71
75
|
return rubricVerdict({ ...graded, size: checked.size, missingSections: missingSections(checked.check.doc, wanted), uncited }, setup.rubric);
|
|
72
76
|
};
|
|
73
77
|
/** Grades one output (spec §29.3): its findings and their rates, the facts against its reference, its quotations, and pass or fail. */
|
|
74
|
-
export const gradeItem = async (item,
|
|
78
|
+
export const gradeItem = async (item, runSetup) => {
|
|
79
|
+
const setup = item.task === undefined ? runSetup : { ...runSetup, rubric: rubricForTask(runSetup.rubric, item.task) };
|
|
75
80
|
const checked = await checkItem(item, setup);
|
|
76
|
-
const
|
|
81
|
+
const judged = judge(item, checked, setup);
|
|
82
|
+
const { score } = judged;
|
|
83
|
+
// expect is the item's own answer, so it fails the output with or without a `grade:` rubric.
|
|
84
|
+
const verdict = verdictOf([...judged.verdict.failedBecause, ...expectFailures(checked.expect)]);
|
|
77
85
|
return {
|
|
78
86
|
id: item.id,
|
|
79
87
|
...(item.variant === undefined ? {} : { variant: item.variant }),
|
|
88
|
+
...(item.task === undefined ? {} : { task: item.task }),
|
|
80
89
|
language: checked.check.language,
|
|
81
90
|
genre: checked.check.genre.genre,
|
|
82
91
|
size: checked.size,
|
|
@@ -86,6 +95,7 @@ export const gradeItem = async (item, setup) => {
|
|
|
86
95
|
facts: checked.facts,
|
|
87
96
|
citations: citationsOf(checked),
|
|
88
97
|
...(checked.contexts === undefined ? {} : { contexts: checked.contexts.contexts }),
|
|
98
|
+
...(checked.expect === undefined ? {} : { expect: checked.expect }),
|
|
89
99
|
...(score === undefined ? {} : { score }),
|
|
90
100
|
aiScore: gradeAiScoreOf(aiScoreOfDocument(checked.check.doc, checked.check.rules, checked.check.genre.genre)),
|
|
91
101
|
pass: verdict.pass,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grade-item.js","sourceRoot":"","sources":["../../src/grade/grade-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAmB,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,aAAa,CAAC;AAChH,OAAO,EAAE,eAAe,EAAqB,MAAM,eAAe,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAmB,MAAM,YAAY,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"grade-item.js","sourceRoot":"","sources":["../../src/grade/grade-item.ts"],"names":[],"mappings":"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"}
|
package/dist/grade/item.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type GradeExpect } from "./expect.ts";
|
|
1
2
|
export type GradeCitation = {
|
|
2
3
|
readonly source: string;
|
|
3
4
|
readonly address: string;
|
|
@@ -17,6 +18,10 @@ export type GradeItem = {
|
|
|
17
18
|
readonly contexts?: readonly string[] | undefined;
|
|
18
19
|
/** The prompt, model or setting that produced this output. Outputs of several variants are compared on the same ids. */
|
|
19
20
|
readonly variant?: string | undefined;
|
|
21
|
+
/** The rubric task this item is graded under (`grade.tasks.<name>`). Undefined: the top-level rubric. */
|
|
22
|
+
readonly task?: string | undefined;
|
|
23
|
+
/** Facts the output must state and facts it must not: a question's known answer. Undefined when not given. */
|
|
24
|
+
readonly expect?: GradeExpect | undefined;
|
|
20
25
|
};
|
|
21
26
|
/** The fields an item already has a meaning for: none of them can name a variant. */
|
|
22
27
|
export declare const ITEM_FIELDS: readonly string[];
|
|
@@ -26,7 +31,7 @@ export type VariantField = {
|
|
|
26
31
|
readonly required: boolean;
|
|
27
32
|
};
|
|
28
33
|
export declare const DEFAULT_VARIANT_FIELD: VariantField;
|
|
29
|
-
export type ItemProblemKind = "not-json" | "not-object" | "no-id" | "no-output" | "not-string" | "not-text-map" | "not-citations" | "citations-without-sources" | "not-contexts" | "duplicate-id" | "no-variant" | "unknown-source" | "which-source" | "unknown-language" | "unknown-genre" | "empty";
|
|
34
|
+
export type ItemProblemKind = "not-json" | "not-object" | "no-id" | "no-output" | "not-string" | "not-text-map" | "not-citations" | "citations-without-sources" | "not-contexts" | "duplicate-id" | "no-variant" | "unknown-source" | "which-source" | "unknown-language" | "unknown-genre" | "not-expect" | "expect-no-fact" | "expect-several-facts" | "unknown-task" | "empty";
|
|
30
35
|
/** Why a line cannot be graded. `detail`: the field, the value or the parser's message; `first`: the line an id was first on. */
|
|
31
36
|
export type ItemProblem = {
|
|
32
37
|
readonly kind: ItemProblemKind;
|
|
@@ -38,6 +43,8 @@ export type ItemProblem = {
|
|
|
38
43
|
export type ItemVocabulary = {
|
|
39
44
|
readonly isLanguage: (language: string) => boolean;
|
|
40
45
|
readonly genres: readonly string[];
|
|
46
|
+
/** The tasks the rubric defines. None given: an item naming a task is refused, as there is no rubric for it. */
|
|
47
|
+
readonly tasks?: readonly string[] | undefined;
|
|
41
48
|
};
|
|
42
49
|
/** One item from a value already parsed, as `grade()` receives it; `line` is 0 when it came from no file. */
|
|
43
50
|
export declare const readItem: (raw: unknown, vocabulary: ItemVocabulary, line?: number) => {
|
|
@@ -48,6 +55,7 @@ export declare const readItem: (raw: unknown, vocabulary: ItemVocabulary, line?:
|
|
|
48
55
|
/** Every item of a JSONL text, or every problem found. A blank line is skipped; no item at all is a problem, not a clean run. */
|
|
49
56
|
export declare const parseItems: (text: string, vocabulary: ItemVocabulary, variantField?: VariantField) => {
|
|
50
57
|
readonly items: readonly GradeItem[];
|
|
58
|
+
readonly lines: readonly number[];
|
|
51
59
|
} | {
|
|
52
60
|
readonly problems: readonly ItemProblem[];
|
|
53
61
|
};
|
package/dist/grade/item.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/grade/item.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/grade/item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAGzD,MAAM,MAAM,aAAa,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1G,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,uEAAuE;IACvE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,gHAAgH;IAChH,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,GAAG,SAAS,CAAC;IAC1D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,yHAAyH;IACzH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAClD,wHAAwH;IACxH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,yGAAyG;IACzG,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,8GAA8G;IAC9G,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,WAAW,EAAE,SAAS,MAAM,EAA6G,CAAC;AAEvJ,0HAA0H;AAC1H,MAAM,MAAM,YAAY,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,eAAO,MAAM,qBAAqB,EAAE,YAAkD,CAAC;AAEvF,MAAM,MAAM,eAAe,GACvB,UAAU,GACV,YAAY,GACZ,OAAO,GACP,WAAW,GACX,YAAY,GACZ,cAAc,GACd,eAAe,GACf,2BAA2B,GAC3B,cAAc,GACd,cAAc,GACd,YAAY,GACZ,gBAAgB,GAChB,cAAc,GACd,kBAAkB,GAClB,eAAe,GACf,YAAY,GACZ,gBAAgB,GAChB,sBAAsB,GACtB,cAAc,GACd,OAAO,CAAC;AAEZ,iIAAiI;AACjI,MAAM,MAAM,WAAW,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvI,mFAAmF;AACnF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,gHAAgH;IAChH,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;CAChD,CAAC;AA+HF,6GAA6G;AAC7G,eAAO,MAAM,QAAQ,GAAI,KAAK,OAAO,EAAE,YAAY,cAAc,EAAE,aAAQ,KAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAG3I,CAAC;AAgCF,iIAAiI;AACjI,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EACZ,YAAY,cAAc,EAC1B,eAAc,YAAoC,KACjD;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAA;CAa3H,CAAC"}
|