refactor misc items

Author: neverRare

dictionary/misc.ts

@@ -34,3 +34,18 @@ export function flattenError(error: unknown): ReadonlyArray<unknown> {
 export function throwError(error: unknown): never {
   throw error;
 }
+export function compound(
+  elements: ReadonlyArray<string>,
+  conjunction: string,
+  repeat: boolean,
+): string {
+  if (repeat || elements.length <= 2) {
+    return elements.join(` ${conjunction} `);
+  } else {
+    const lastIndex = elements.length - 1;
+    const init = elements.slice(0, lastIndex);
+    const last = elements[lastIndex];
+    const initText = init.map((item) => `${item},`).join(" ");
+    return `${initText} ${conjunction} ${last}`;
+  }
+}

misc/misc.ts

@@ -10,7 +10,6 @@ if (typeof LIVE_RELOAD !== "undefined" && LIVE_RELOAD) {
 }
 
 import { dictionary } from "../dictionary/dictionary.ts";
-import { asComment } from "../dictionary/misc.ts";
 import PROJECT_DATA from "../project_data.json" with { type: "json" };
 import { ArrayResultError, isArrayResult } from "./array_result.ts";
 import { loadCustomDictionary } from "./dictionary.ts";
@@ -293,13 +292,6 @@ function main(): void {
     }
   });
 }
-function extractErrorMessage(error: unknown): string {
-  if (error instanceof Error) {
-    return error.message;
-  } else {
-    return `${error}`;
-  }
-}
 
 if (document.readyState === "loading") {
   document.addEventListener("DOMContentLoaded", main);
@@ -315,3 +307,16 @@ const unused = [...new Array(localStorage.length).keys()]
 for (const key of unused) {
   localStorage.removeItem(key);
 }
+
+function extractErrorMessage(error: unknown): string {
+  if (error instanceof Error) {
+    return error.message;
+  } else {
+    return `${error}`;
+  }
+}
+export function asComment(text: string): string {
+  return text
+    .replaceAll(/^/mg, "# ")
+    .replaceAll(/^#\s+$/mg, "#");
+}

src/main.ts

@@ -1,5 +1,5 @@
 import { extractArrayResultError } from "../array_result.ts";
-import { flattenError, throwError } from "../../misc/misc.ts";
+import { compound, flattenError, throwError } from "../../misc/misc.ts";
 import { settings } from "../settings.ts";
 import {
   Clause,
@@ -150,10 +150,18 @@ export const MULTIPLE_MODIFIERS_RULES: ReadonlyArray<
         }
       });
       const duplicate = findDuplicate(words);
-      if (duplicate == null) {
+      if (duplicate.size === 0) {
         return true;
       } else {
-        throw new UnrecognizedError(`duplicate "${duplicate}" in modifier`);
+        const repeatConjunction = false;
+        const list = compound(
+          [...duplicate].map((word) => `"${word}"`),
+          "and",
+          repeatConjunction,
+        );
+        throw new UnrecognizedError(
+          `duplicate ${list} in modifier`,
+        );
       }
     }
   },
@@ -428,14 +436,15 @@ function phraseHasTopLevelEmphasis(phrase: Phrase): boolean {
       return phrase.emphasis != null;
   }
 }
-function findDuplicate<T>(iterable: Iterable<T>): null | T {
-  const set = new Set();
+function findDuplicate<T>(iterable: Iterable<T>): Set<T> {
+  const unique = new Set<T>();
+  const duplicates = new Set<T>();
   for (const value of iterable) {
-    if (set.has(value)) {
-      return value;
+    if (unique.has(value)) {
+      duplicates.add(value);
     } else {
-      set.add(value);
+      unique.add(value);
     }
   }
-  return null;
+  return duplicates;
 }

src/parser/filter.ts

@@ -1,4 +1,4 @@
-import { nullableAsArray } from "../../misc/misc.ts";
+import { compound, nullableAsArray } from "../../misc/misc.ts";
 import * as English from "./ast.ts";
 
 const EMPHASIS_STARTING_TAG = "<strong>";
@@ -11,21 +11,6 @@ function word(word: English.Word): string {
     return word.word;
   }
 }
-function compound(
-  elements: ReadonlyArray<string>,
-  conjunction: string,
-  depth: number,
-): string {
-  if (depth !== 0 || elements.length <= 2) {
-    return elements.join(` ${conjunction} `);
-  } else {
-    const lastIndex = elements.length - 1;
-    const init = elements.slice(0, lastIndex);
-    const last = elements[lastIndex];
-    const initText = init.map((item) => `${item},`).join(" ");
-    return `${initText} ${conjunction} ${last}`;
-  }
-}
 export function noun(phrases: English.NounPhrase, depth: number): string {
   switch (phrases.type) {
     case "simple": {
@@ -44,7 +29,7 @@ export function noun(phrases: English.NounPhrase, depth: number): string {
       return compound(
         phrases.nouns.map((phrase) => noun(phrase, depth + 1)),
         phrases.conjunction,
-        depth,
+        depth !== 0,
       );
   }
 }
@@ -62,7 +47,7 @@ export function adjective(
       text = compound(
         phrases.adjective.map((phrase) => adjective(phrase, depth + 1)),
         phrases.conjunction,
-        depth,
+        depth !== 0,
       );
   }
   return word({ word: text, emphasis: phrases.emphasis });
@@ -111,7 +96,7 @@ export function verb(phrase: English.VerbPhrase, depth: number): string {
       text = compound(
         phrase.verbs.map((item) => verb(item, depth + 1)),
         phrase.conjunction,
-        depth,
+        depth !== 0,
       );
   }
   return [

src/translator/composer.ts

@@ -140,7 +140,7 @@ export function fixDeterminer(
 function prettyPrintDeterminers(
   determiners: ReadonlyArray<English.Determiner>,
 ): string {
-  return `(${determiners.map(({ determiner }) => determiner).join(` `)})`;
+  return `(${determiners.map(({ determiner }) => determiner).join(" ")})`;
 }
 function encodeDeterminer(
   strings: TemplateStringsArray,
@@ -152,7 +152,7 @@ function encodeDeterminer(
       .join("");
 }
 function filterSet<T>(
-  set: Iterable<readonly [condition: boolean, value: T]>,
+  set: ReadonlyArray<readonly [condition: boolean, value: T]>,
 ): ReadonlyArray<T> {
-  return [...set].filter(([condition]) => condition).map(([_, value]) => value);
+  return set.filter(([condition]) => condition).map(([_, value]) => value);
 }