move final translator

Author: neverRare

src/main.ts

@@ -13,7 +13,6 @@ import { dictionaryParser } from "../dictionary/parser.ts";
 import PROJECT_DATA from "../project_data.json" with { type: "json" };
 import { loadCustomDictionary } from "./dictionary.ts";
 import { checkLocalStorage, setIgnoreError } from "./local_storage.ts";
-import { translate } from "./translator.ts";
 import { PositionedError } from "./parser/parser_lib.ts";
 import { settings } from "./settings.ts";
 import {
@@ -22,6 +21,7 @@ import {
   resetElementsToCurrent,
   resetElementsToDefault,
 } from "./settings_frontend.ts";
+import { translate } from "./translator/translator.ts";
 
 const DICTIONARY_AUTO_PARSE_THRESHOLD = 9000;
 

src/repl.ts

@@ -3,7 +3,7 @@
 import { unescape } from "@std/html/entities";
 import entityList from "@std/html/named-entity-list.json" with { type: "json" };
 import { repeatArray } from "../misc/misc.ts";
-import { translate } from "./translator.ts";
+import { translate } from "./translator/translator.ts";
 
 if (import.meta.main) {
   // deno-lint-ignore no-console

src/translator.ts

@@ -1,11 +1,33 @@
-import { ArrayResult } from "../array_result.ts";
+import { distinct } from "@std/collections/distinct";
+import { shuffle } from "@std/random/shuffle";
+import { deduplicateErrors } from "../../misc/deduplicate_errors.ts";
+import { errors } from "../../telo_misikeke/telo_misikeke.js";
+import { ArrayResult, ArrayResultError } from "../array_result.ts";
 import { parser } from "../parser/parser.ts";
+import { settings } from "../settings.ts";
 import * as EnglishComposer from "./composer.ts";
 import { multipleSentences } from "./sentence.ts";
 
-export function translate(text: string): ArrayResult<string> {
-  return parser
-    .parse(text)
+export function translate(tokiPona: string): ArrayResult<string> {
+  const arrayResult = parser
+    .parse(tokiPona)
     .flatMap(multipleSentences)
     .map(EnglishComposer.multipleSentences);
+  if (!arrayResult.isError()) {
+    const values = distinct(arrayResult.array);
+    if (settings.randomize) {
+      return new ArrayResult(shuffle(values));
+    } else {
+      return new ArrayResult(values);
+    }
+  } else {
+    const teloMisikekeErrors = settings.teloMisikeke
+      ? errors(tokiPona)
+        .map((message) => new ArrayResultError(message, { isHtml: true }))
+      : [];
+    const error = teloMisikekeErrors.length === 0
+      ? deduplicateErrors(arrayResult.errors)
+      : teloMisikekeErrors;
+    return ArrayResult.errors(error);
+  }
 }