prepare inflection resolver and composer

Author: neverRare

src/translator_legacy/ast.ts src/resolver_and_composer/ast.tssrc/translator_legacy/ast.ts renamed to src/resolver_and_composer/ast.ts

@@ -1,7 +1,5 @@
 import * as Dictionary from "../dictionary/type.ts";
 
-// When editing, update `./fixer.ts` as well
-
 export type Word = Readonly<{
   word: string;
   emphasis: boolean;
@@ -27,17 +25,21 @@ export type NounPhrase =
     nouns: ReadonlyArray<NounPhrase>;
   }>;
 export type Determiner = Readonly<{
-  kind: Dictionary.DeterminerType;
   determiner: Word;
+
+  // TODO: remove these two
+  kind: Dictionary.DeterminerType;
   quantity: Dictionary.Quantity;
 }>;
 export type AdjectivePhrase =
   | Readonly<{
     type: "simple";
-    kind: Dictionary.AdjectiveType;
     adverbs: ReadonlyArray<Adverb>;
     adjective: Word;
     emphasis: boolean;
+
+    // TODO: remove this
+    kind: Dictionary.AdjectiveType;
   }>
   | Readonly<{
     type: "compound";

src/translator_legacy/composer.ts src/resolver_and_composer/composer.tssrc/translator_legacy/composer.ts renamed to src/resolver_and_composer/composer.ts

@@ -5,7 +5,7 @@ import * as TokiPona from "../parser/ast.ts";
 import { UntranslatableError } from "../translator/error.ts";
 import { noEmphasis, word } from "../translator/word.ts";
 import { extractNegativeFromMultipleAdverbs } from "./adverb.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 
 export type AdjectiveWithInWay = Readonly<{
   adjective: English.AdjectivePhrase;

src/translator_legacy/adjective.ts

@@ -1,5 +1,5 @@
 import { noEmphasis } from "../translator/word.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 
 export const NOT: English.Adverb = {
   adverb: noEmphasis("not"),

src/translator_legacy/adverb.ts

@@ -1,7 +1,7 @@
 import { IterableResult } from "../compound.ts";
 import * as Dictionary from "../dictionary/type.ts";
 import { adjective, compoundAdjective } from "./adjective.ts";
-import * as EnglishComposer from "./composer.ts";
+import * as EnglishComposer from "../resolver_and_composer/composer.ts";
 import { noun, simpleNounForms } from "./noun.ts";
 import { pronoun } from "./pronoun.ts";
 import { partialSimpleVerb, verb } from "./verb.ts";

src/translator_legacy/as_string.ts

@@ -3,7 +3,7 @@ import { nullableAsArray, throwError } from "../misc/misc.ts";
 import * as TokiPona from "../parser/ast.ts";
 import { FilteredError, UntranslatableError } from "../translator/error.ts";
 import { noEmphasis } from "../translator/word.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 import { nanpa } from "./nanpa.ts";
 import { perspective, quantity } from "./noun.ts";
 import { multiplePhrases } from "./phrase.ts";

src/translator_legacy/clause.ts

@@ -3,7 +3,7 @@ import { IterableResult } from "../compound.ts";
 import * as Dictionary from "../dictionary/type.ts";
 import { FilteredError } from "../translator/error.ts";
 import { word } from "../translator/word.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 import { simpleNounForms } from "./noun.ts";
 
 function filterQuantity(

src/translator_legacy/determiner.ts

@@ -1,7 +1,7 @@
 import * as Dictionary from "../dictionary/type.ts";
 import { mapNullable } from "../misc/misc.ts";
 import { FilteredError } from "../translator/error.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 import { encodeDeterminer } from "./determiner.ts";
 
 function fixNounPhrase(noun: English.NounPhrase): English.NounPhrase {

src/translator_legacy/fixer.ts

@@ -6,7 +6,7 @@ import { ExhaustedError, TranslationTodoError } from "../translator/error.ts";
 import { number, numberAsText } from "../translator/number.ts";
 import { noEmphasis, word } from "../translator/word.ts";
 import { adjective, compoundAdjective } from "./adjective.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 import { determiner } from "./determiner.ts";
 import { nanpa } from "./nanpa.ts";
 import { noun } from "./noun.ts";

src/translator_legacy/modifier.ts

@@ -2,7 +2,7 @@ import { IterableResult } from "../compound.ts";
 import { throwError } from "../misc/misc.ts";
 import * as TokiPona from "../parser/ast.ts";
 import { FilteredError } from "../translator/error.ts";
-import * as English from "./ast.ts";
+import * as English from "../resolver_and_composer/ast.ts";
 import { phrase } from "./phrase.ts";
 
 export function nanpa(