@sushichan044/kg-core 0.5.0 → 0.6.0

package/dist/index.mjs

@@ -1544,7 +1544,7 @@ function defineMatchRule(options) {
 }
 //#endregion
 //#region src/proofreading/rules/consistent-kanji-opening.ts
-const RULE_ID$4 = "kg/consistent-kanji-opening";
+const RULE_ID$5 = "kg/consistent-kanji-opening";
 const MESSAGE = "「{{ closed }}」と「{{ opened }}」が混在しています。文脈上の使い分けか表記ゆれかを確認してください";
 const KanjiOpeningPairSchema = v.pipe(readonlyObject({
 	closed: v.pipe(v.string(), v.nonEmpty()),
@@ -1597,8 +1597,8 @@ const DEFAULT_PAIRS = [
 * Reports the first kanji occurrence of every pair the manuscript also writes in kana. Whether the
 * two spellings are a deliberate distinction is the author's call, so the finding is a warning.
 */
-function build$2(pairs) {
-	return defineParsedRule(RULE_ID$4, MESSAGE, (manuscript, report) => {
+function build$3(pairs) {
+	return defineParsedRule(RULE_ID$5, MESSAGE, (manuscript, report) => {
 		for (const { closed, opened } of pairs) {
 			if (!manuscript.displayText.includes(opened)) continue;
 			const index = manuscript.displayText.indexOf(closed);
@@ -1613,17 +1613,17 @@ function build$2(pairs) {
 		}
 	});
 }
-const consistentKanjiOpeningRule = () => build$2(DEFAULT_PAIRS);
+const consistentKanjiOpeningRule = () => build$3(DEFAULT_PAIRS);
 function createConsistentKanjiOpeningRule(options = {}) {
 	if (options.pairs === void 0) return ManuscriptResult.succeed(consistentKanjiOpeningRule());
 	const pairs = v.safeParse(PairsSchema, options.pairs);
 	if (!pairs.success) return ManuscriptResult.fail({
 		kind: "InvalidRuleOptions",
-		ruleId: RULE_ID$4,
+		ruleId: RULE_ID$5,
 		option: "pairs",
 		issues: ValidationIssue.from(pairs.issues)
 	});
-	return ManuscriptResult.succeed(build$2(pairs.output));
+	return ManuscriptResult.succeed(build$3(pairs.output));
 }
 //#endregion
 //#region src/proofreading/rules/internal/mixed-width.ts
@@ -1663,16 +1663,64 @@ const consistentNumeralWidthRule = () => defineMixedWidthRule({
 	fullwidth: /[０-９]/u
 });
 //#endregion
-//#region src/proofreading/rules/dash-character.ts
-/**
-* Stand-ins for `―`. Repeated `ー` belongs to `kg/no-consecutive-choonpu` and `−` to
-* `kg/minus-before-number`, so neither is reported twice.
-*/
-const dashCharacterRule = () => defineMatchRule({
-	id: "kg/dash-character",
-	pattern: /[—–─━﹣－]+|-{2,}/gu,
-	message: "ダッシュには「―」を使ってください"
-});
+//#region src/proofreading/rules/dash.ts
+const RULE_ID$4 = "kg/dash";
+const DEFAULT_PREFERRED = "―";
+const DashCharacterSchema = v.picklist([
+	"―",
+	"—",
+	"─"
+]);
+const DASH_LIKE_RUN = /[—–―─━﹣－-]+/gu;
+const EVEN_COUNT_MESSAGE = "連続するダッシュの数は偶数にしてください";
+function messageIdFor(run, preferred) {
+	if (run === "-") return void 0;
+	if (run !== preferred.repeat(run.length)) return "character";
+	return run.length % 2 === 1 ? "even-count" : void 0;
+}
+function build$2(preferred) {
+	const messages = {
+		character: `ダッシュには「${preferred}」を使ってください`,
+		"even-count": EVEN_COUNT_MESSAGE
+	};
+	return {
+		kind: "parsed",
+		meta: {
+			id: RULE_ID$4,
+			messages
+		},
+		check: (manuscript, context) => {
+			for (const line of splitDisplayLines(manuscript.displayText)) {
+				DASH_LIKE_RUN.lastIndex = 0;
+				let match = DASH_LIKE_RUN.exec(line.text);
+				while (match !== null) {
+					const run = match[0];
+					const messageId = messageIdFor(run, preferred);
+					if (messageId !== void 0) {
+						const start = line.start + match.index;
+						context.report({
+							range: displayRange(manuscript, start, start + run.length),
+							messageId
+						});
+					}
+					match = DASH_LIKE_RUN.exec(line.text);
+				}
+			}
+		}
+	};
+}
+const dashRule = () => build$2(DEFAULT_PREFERRED);
+function createDashRule(options = {}) {
+	if (options.preferred === void 0) return ManuscriptResult.succeed(dashRule());
+	const preferred = v.safeParse(DashCharacterSchema, options.preferred);
+	if (!preferred.success) return ManuscriptResult.fail({
+		kind: "InvalidRuleOptions",
+		ruleId: RULE_ID$4,
+		option: "preferred",
+		issues: ValidationIssue.from(preferred.issues)
+	});
+	return ManuscriptResult.succeed(build$2(preferred.output));
+}
 //#endregion
 //#region src/proofreading/rules/ellipsis-character.ts
 /**
@@ -1685,14 +1733,6 @@ const ellipsisCharacterRule = () => defineMatchRule({
 	message: "三点リーダーには「…」を使ってください"
 });
 //#endregion
-//#region src/proofreading/rules/even-dash.ts
-const evenDashRule = () => defineMatchRule({
-	id: "kg/even-dash",
-	pattern: /―+/gu,
-	accept: (match) => match[0].length % 2 === 1,
-	message: "連続するダッシュの数は偶数にしてください"
-});
-//#endregion
 //#region src/proofreading/rules/even-ellipsis.ts
 const evenEllipsisRule = () => defineMatchRule({
 	id: "kg/even-ellipsis",
@@ -1798,13 +1838,6 @@ const minusBeforeNumberRule = () => defineMatchRule({
 	message: "マイナス記号の直後には数字が必要です"
 });
 //#endregion
-//#region src/proofreading/rules/no-consecutive-choonpu.ts
-const noConsecutiveChoonpuRule = () => defineMatchRule({
-	id: "kg/no-consecutive-choonpu",
-	pattern: /ーー+/gu,
-	message: "長音符が連続しています"
-});
-//#endregion
 //#region src/proofreading/rules/no-consecutive-interpunct.ts
 const noConsecutiveInterpunctRule = () => defineMatchRule({
 	id: "kg/no-consecutive-interpunct",
@@ -1999,12 +2032,10 @@ function createDefaultProofreadingRules() {
 		punctuationBeforeClosingQuoteRule(),
 		spaceAfterQuestionOrExclamationRule(),
 		evenEllipsisRule(),
-		evenDashRule(),
+		dashRule(),
 		ellipsisCharacterRule(),
-		dashCharacterRule(),
 		noConsecutivePunctuationRule(),
 		noConsecutiveInterpunctRule(),
-		noConsecutiveChoonpuRule(),
 		minusBeforeNumberRule(),
 		maxArabicNumeralDigitsRule(),
 		fullwidthJapanesePunctuationRule(),
@@ -2012,4 +2043,4 @@ function createDefaultProofreadingRules() {
 	];
 }
 //#endregion
-export { BoldAnnotation, ComposeError, CompositionStatistics, DiagnosticOrigin, DiagnosticSeverity, DisplayRange, EmphasisAnnotation, FontPreset, FontPresetId, FontSizePt, GraphemeRange, GridCell, GridLine, GridPage, GridSettings, GridStage, InvalidRuleOptions, ItalicAnnotation, LineOffset, ManuscriptAnnotation, ManuscriptAppearanceSettings, ManuscriptCompositionSettings, ManuscriptDiagnostic, ManuscriptGeometry, ManuscriptGridLayout, ManuscriptOffsets, ManuscriptRange, ManuscriptResult, NamespacedId, PaperSize, PaperSizeId, ParseError, ParsedGrapheme, ParsedManuscript, ProofreadError, ProofreadingReport, ProofreadingRuleMeta, Rejection, RubyAnnotation, SourcePosition, SourceRange, TextRange, ValidationIssue, assertNever, composeManuscript, consistentKanjiOpeningRule, consistentLatinWidthRule, consistentNumeralWidthRule, createConsistentKanjiOpeningRule, createDefaultProofreadingRules, createMaxArabicNumeralDigitsRule, createParagraphOpeningRule, dashCharacterRule, ellipsisCharacterRule, evenDashRule, evenEllipsisRule, fullwidthJapanesePunctuationRule, kakuyomuParser, manuscriptGridComposer, maxArabicNumeralDigitsRule, minusBeforeNumberRule, mmToPt, noConsecutiveChoonpuRule, noConsecutiveInterpunctRule, noConsecutivePunctuationRule, paragraphOpeningRule, parseManuscript, pixivParser, plainTextParser, proofreadManuscript, ptToMm, punctuationBeforeClosingQuoteRule, spaceAfterQuestionOrExclamationRule, variantCharacterRule };
+export { BoldAnnotation, ComposeError, CompositionStatistics, DiagnosticOrigin, DiagnosticSeverity, DisplayRange, EmphasisAnnotation, FontPreset, FontPresetId, FontSizePt, GraphemeRange, GridCell, GridLine, GridPage, GridSettings, GridStage, InvalidRuleOptions, ItalicAnnotation, LineOffset, ManuscriptAnnotation, ManuscriptAppearanceSettings, ManuscriptCompositionSettings, ManuscriptDiagnostic, ManuscriptGeometry, ManuscriptGridLayout, ManuscriptOffsets, ManuscriptRange, ManuscriptResult, NamespacedId, PaperSize, PaperSizeId, ParseError, ParsedGrapheme, ParsedManuscript, ProofreadError, ProofreadingReport, ProofreadingRuleMeta, Rejection, RubyAnnotation, SourcePosition, SourceRange, TextRange, ValidationIssue, assertNever, composeManuscript, consistentKanjiOpeningRule, consistentLatinWidthRule, consistentNumeralWidthRule, createConsistentKanjiOpeningRule, createDashRule, createDefaultProofreadingRules, createMaxArabicNumeralDigitsRule, createParagraphOpeningRule, dashRule, ellipsisCharacterRule, evenEllipsisRule, fullwidthJapanesePunctuationRule, kakuyomuParser, manuscriptGridComposer, maxArabicNumeralDigitsRule, minusBeforeNumberRule, mmToPt, noConsecutiveInterpunctRule, noConsecutivePunctuationRule, paragraphOpeningRule, parseManuscript, pixivParser, plainTextParser, proofreadManuscript, ptToMm, punctuationBeforeClosingQuoteRule, spaceAfterQuestionOrExclamationRule, variantCharacterRule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sushichan044/kg-core",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Framework-independent parsing, composition, and proofreading for Japanese manuscripts",
   "keywords": [
     "japanese",