refactor

Author: neverRare

src/translator/adjective.ts

@@ -82,7 +82,7 @@ export function compoundAdjective(
     ]);
   }
 }
-export function rankAdjective(kind: Dictionary.AdjectiveType): number {
+function rankAdjective(kind: Dictionary.AdjectiveType) {
   return [
     "opinion",
     "size",

src/translator/as_string.ts

@@ -2,10 +2,16 @@ import * as Dictionary from "../../dictionary/type.ts";
 import { IterableResult } from "../compound.ts";
 import { adjective, compoundAdjective } from "./adjective.ts";
 import * as EnglishComposer from "./composer.ts";
-import { nounAsPlainString, simpleNounForms } from "./noun.ts";
+import { noun, simpleNounForms } from "./noun.ts";
 import { pronoun } from "./pronoun.ts";
 import { partialVerb, verb } from "./verb.ts";
 
+function nounAsPlainString(
+  definition: Dictionary.Noun,
+): IterableResult<string> {
+  return noun({ definition, reduplicationCount: 1, emphasis: false })
+    .map((noun) => EnglishComposer.noun(noun, 0));
+}
 export function definitionAsPlainString(
   definition: Dictionary.Definition,
 ): IterableResult<string> {

src/translator/composer.ts

@@ -71,7 +71,7 @@ function complement(complement: English.Complement) {
       return adjective(complement.adjective, 0);
   }
 }
-export function adverbVerb(verbAdverb: English.AdverbVerb): string {
+function adverbVerb(verbAdverb: English.AdverbVerb) {
   const { preAdverb, verb, postAdverb } = verbAdverb;
   return [
     ...preAdverb.map(({ adverb }) => adverb),

src/translator/modifier.ts

@@ -43,9 +43,7 @@ export type AdverbialModifier = Readonly<{
 export type MultipleModifierTranslation =
   | (Readonly<{ type: "adjectival" }> & AdjectivalModifier)
   | (Readonly<{ type: "adverbial" }> & AdverbialModifier);
-export function defaultModifier(
-  wordUnit: TokiPona.WordUnit,
-): IterableResult<ModifierTranslation> {
+function defaultModifier(wordUnit: TokiPona.WordUnit) {
   const emphasis = wordUnit.emphasis != null;
   switch (wordUnit.type) {
     case "number":
@@ -148,9 +146,7 @@ export function defaultModifier(
     }
   }
 }
-export function pi(
-  insidePhrase: TokiPona.Phrase,
-): IterableResult<ModifierTranslation> {
+function pi(insidePhrase: TokiPona.Phrase) {
   return phrase({
     phrase: insidePhrase,
     place: "object",

src/translator/noun.ts

@@ -4,7 +4,6 @@ import { IterableResult } from "../compound.ts";
 import { settings } from "../settings.ts";
 import { adjective } from "./adjective.ts";
 import * as English from "./ast.ts";
-import * as EnglishComposer from "./composer.ts";
 import { determiner, extractNegativeFromDeterminers } from "./determiner.ts";
 import { condense } from "./misc.ts";
 import { word } from "./word.ts";
@@ -124,12 +123,6 @@ export function noun(
       emphasis: false,
     }));
 }
-export function nounAsPlainString(
-  definition: Dictionary.Noun,
-): IterableResult<string> {
-  return noun({ definition, reduplicationCount: 1, emphasis: false })
-    .map((noun) => EnglishComposer.noun(noun, 0));
-}
 export function perspective(noun: English.NounPhrase): Dictionary.Perspective {
   switch (noun.type) {
     case "simple":

src/translator/verb.ts

@@ -38,16 +38,16 @@ export type PartialCompoundVerb =
     }>
     & VerbObjects
   );
-export function condenseVerb(present: string, past: string): string {
+function condenseVerb(present: string, past: string) {
   const [first, ...rest] = present.split(" ");
   const second = past.split(" ")[0];
   return [condense(first, second), ...rest].join(" ");
 }
-export function addModal(
+function addModal(
   modal: string,
   verb: PartialVerb,
   takeNegative: boolean,
-): PartialVerb {
+) {
   if (verb.modal == null) {
     const newRest = nullableAsArray(verb.first)
       .map((first) => {
@@ -152,7 +152,7 @@ export function partialVerb(
       phraseEmphasis: false,
     }));
 }
-export function everyPartialVerb(
+function everyPartialVerb(
   verb: PartialCompoundVerb,
 ): ReadonlyArray<PartialVerb> {
   switch (verb.type) {
@@ -175,13 +175,13 @@ export function forObject(verb: PartialCompoundVerb): boolean | string {
   }
 }
 // TODO: handle negatives
-export function fromVerbForms(
+function fromVerbForms(
   options: Readonly<{
     verbForms: Dictionary.VerbForms;
     perspective: Dictionary.Perspective;
     quantity: English.Quantity;
   }>,
-): IterableResult<Readonly<{ modal: null | string; verb: string }>> {
+) {
   const { verbForms, perspective, quantity } = options;
   const is = verbForms.presentSingular === "is";
   const presentSingular = is && perspective === "first"