remove unneeded generics

Author: neverRare

src/translator/adjective.ts

@@ -91,7 +91,7 @@ export function fixAdjective(
   adjective: ReadonlyArray<English.AdjectivePhrase>,
 ): ReadonlyArray<English.AdjectivePhrase> {
   return adjective
-    .flatMap<English.AdjectivePhrase & { type: "simple" }>((adjective) => {
+    .flatMap((adjective) => {
       switch (adjective.type) {
         case "simple":
           return [adjective];

src/translator/clause.ts

@@ -22,57 +22,55 @@ function phraseClause(
     andParticle: "en",
     includeVerb: false,
   })
-    .map<English.Clause>(
-      (phrase) => {
-        switch (phrase.type) {
-          case "noun":
-            return {
-              type: "subject phrase",
-              subject: phrase.noun,
-            };
-          case "adjective":
-            return {
-              type: "default",
-              subject: {
-                type: "simple",
-                determiner: [],
-                adjective: [],
-                noun: {
-                  word: "it",
-                  emphasis: false,
-                },
-                quantity: "singular",
-                perspective: "third",
-                postAdjective: null,
-                postCompound: null,
-                preposition: [],
+    .map((phrase) => {
+      switch (phrase.type) {
+        case "noun":
+          return {
+            type: "subject phrase",
+            subject: phrase.noun,
+          };
+        case "adjective":
+          return {
+            type: "default",
+            subject: {
+              type: "simple",
+              determiner: [],
+              adjective: [],
+              noun: {
+                word: "it",
                 emphasis: false,
               },
+              quantity: "singular",
+              perspective: "third",
+              postAdjective: null,
+              postCompound: null,
+              preposition: [],
+              emphasis: false,
+            },
+            verb: {
+              type: "default",
               verb: {
-                type: "default",
-                verb: {
-                  modal: null,
-                  verb: [noAdverbs(noEmphasis("is"))],
-                },
-                subjectComplement: {
-                  type: "adjective",
-                  adjective: phrase.adjective,
-                },
-                contentClause: null,
-                object: null,
-                objectComplement: null,
-                preposition: nullableAsArray(phrase.inWayPhrase)
-                  .map((object) => nounAsPreposition(object, "in")),
-                hideVerb: true,
+                modal: null,
+                verb: [noAdverbs(noEmphasis("is"))],
               },
-              preposition: [],
-              hideSubject: true,
-            };
-          case "verb":
-            throw new FilteredError("verb as interjection");
-        }
-      },
-    );
+              subjectComplement: {
+                type: "adjective",
+                adjective: phrase.adjective,
+              },
+              contentClause: null,
+              object: null,
+              objectComplement: null,
+              preposition: nullableAsArray(phrase.inWayPhrase)
+                .map((object) => nounAsPreposition(object, "in")),
+              hideVerb: true,
+            },
+            preposition: [],
+            hideSubject: true,
+          };
+        case "verb":
+          throw new FilteredError("verb as interjection");
+      }
+    });
 }
 function liClause(
   clause: TokiPona.Clause & { type: "li clause" },
@@ -138,14 +136,14 @@ function iWish(
 function oClause(
   clause: TokiPona.Clause & { type: "o clause" },
 ): ArrayResult<English.Clause> {
-  const subject = clause.subjects != null
+  const subject: ArrayResult<English.NounPhrase> = clause.subjects != null
     ? multiplePhrasesAsNoun({
       phrases: clause.subjects,
       place: "subject",
       includeGerund: true,
       andParticle: "en",
     })
-    : new ArrayResult<English.NounPhrase>([{
+    : new ArrayResult([{
       type: "simple",
       determiner: [],
       adjective: [],
@@ -162,7 +160,7 @@ function oClause(
       const subjectPerspective = perspective(subject);
       return ArrayResult.concat(
         verb(predicate, subjectPerspective, subject.quantity)
-          .map<English.Clause>((verb) => iWish(subject, verb)),
+          .map((verb) => iWish(subject, verb)),
         ArrayResult.from(() =>
           verb(
             addModalToAll(

src/translator/modifier.ts

@@ -52,7 +52,7 @@ export function defaultModifier(
   const emphasis = wordUnit.emphasis != null;
   switch (wordUnit.type) {
     case "number":
-      return number(wordUnit.words).map<ModifierTranslation>((number) => {
+      return number(wordUnit.words).map((number) => {
         const quantity = number === 1 ? "singular" : "plural";
         return {
           type: "determiner" as const,
@@ -77,7 +77,7 @@ export function defaultModifier(
           switch (definition.type) {
             case "noun":
               return noun({ definition, reduplicationCount, emphasis })
-                .map<ModifierTranslation>((noun) => ({
+                .map((noun) => ({
                   type: "noun",
                   noun,
                 }));
@@ -87,7 +87,7 @@ export function defaultModifier(
                 reduplicationCount,
                 emphasis,
               })
-                .map<ModifierTranslation>((noun) => ({
+                .map((noun) => ({
                   type: "noun preposition",
                   noun,
                   preposition: definition.preposition,
@@ -106,7 +106,7 @@ export function defaultModifier(
                 reduplicationCount,
                 emphasis: wordUnit.emphasis != null,
               })
-                .map<ModifierTranslation>((determiner) => ({
+                .map((determiner) => ({
                   type: "determiner",
                   determiner,
                 }));
@@ -116,7 +116,7 @@ export function defaultModifier(
                 reduplicationCount,
                 emphasis: wordUnit.emphasis,
               })
-                .map<ModifierTranslation>((adjective) => ({
+                .map((adjective) => ({
                   type: "adjective",
                   adjective,
                 }));
@@ -126,12 +126,12 @@ export function defaultModifier(
                 reduplicationCount,
                 emphasis: wordUnit.emphasis,
               })
-                .map<ModifierTranslation>((adjective) => ({
+                .map((adjective) => ({
                   type: "adjective",
                   adjective,
                 }));
             case "adverb":
-              return new ArrayResult<ModifierTranslation>([{
+              return new ArrayResult([{
                 type: "adverb",
                 adverb: word({
                   word: definition.adverb,
@@ -257,7 +257,7 @@ export function multipleModifiers(
         inPositionPhrase.length <= 1 &&
         (noun.length === 0 || inPositionPhrase.length === 0)
       ) {
-        adjectival = new ArrayResult<MultipleModifierTranslation>([{
+        adjectival = new ArrayResult([{
           type: "adjectival",
           nounPreposition: nounPreposition[0] ?? null,
           determiner,
@@ -292,7 +292,7 @@ export function multipleModifiers(
             emphasis: false,
           }
           : null;
-        adverbial = new ArrayResult<MultipleModifierTranslation>([{
+        adverbial = new ArrayResult([{
           type: "adverbial",
           adverb,
           inWayPhrase,

src/translator/phrase.ts

@@ -193,7 +193,7 @@ function defaultPhrase(
       } else if (
         includeVerb && headWord.type === "verb" && modifier.type === "adverbial"
       ) {
-        return new ArrayResult<PhraseTranslation>([{
+        return new ArrayResult([{
           type: "verb",
           verb: {
             ...verbPhrase({ emphasis, verb: headWord, modifier }),
@@ -243,7 +243,7 @@ export function phrase(
       if (includeVerb) {
         return preposition(phrase)
           .map(prepositionAsVerb)
-          .map<PhraseTranslation>((verb) => ({
+          .map((verb) => ({
             type: "verb",
             verb: { ...verb, type: "simple" },
           }));

src/translator/predicate.ts

@@ -192,7 +192,7 @@ export function predicate(
         ...tokiPonaPredicate.predicates
           .map((predicates) => predicate(predicates, andParticle)),
       )
-        .map<PartialCompoundVerb>((predicates) => ({
+        .map((predicates) => ({
           type: "compound",
           conjunction: CONJUNCTION[tokiPonaPredicate.type],
           verb: predicates,

src/translator/preposition.ts

@@ -39,7 +39,7 @@ export function preposition(
           : throwError(new FilteredError(`${phrases.type} as indirect object`))
       ),
   )
-    .map<English.Preposition>(([preposition, adverb, object]) => ({
+    .map(([preposition, adverb, object]) => ({
       adverb,
       preposition,
       object,

src/translator/sentence.ts

@@ -144,7 +144,7 @@ function sentence(
     }
     case "filler":
       return filler(sentence.filler)
-        .map<English.Sentence>((interjection) => ({
+        .map((interjection) => ({
           type: "sentence",
           clauses: [{
             type: "interjection",

src/translator/verb.ts

@@ -221,7 +221,7 @@ export function verb(
           perspective,
           quantity,
         })
-          .map<English.VerbPhrase>((verb) => ({
+          .map((verb) => ({
             ...partialVerb,
             type: "default",
             verb: {

src/translator/word_unit.ts

@@ -37,10 +37,10 @@ function defaultWordUnit(
               definition,
               emphasis: emphasis != null,
             })
-              .map<WordUnitTranslation>((noun) => ({ ...noun, type: "noun" }));
+              .map((noun) => ({ ...noun, type: "noun" }));
           }
         case "personal pronoun":
-          return new ArrayResult<WordUnitTranslation>([{
+          return new ArrayResult([{
             ...partialPronoun({
               ...options,
               pronoun: definition,
@@ -53,7 +53,7 @@ function defaultWordUnit(
             return new ArrayResult();
           } else {
             return adjective({ ...options, definition })
-              .map<WordUnitTranslation>((adjective) => ({
+              .map((adjective) => ({
                 type: "adjective",
                 adjective,
               }));
@@ -63,7 +63,7 @@ function defaultWordUnit(
             ...options,
             adjectives: definition.adjective,
           })
-            .map<WordUnitTranslation>((adjective) => ({
+            .map((adjective) => ({
               type: "adjective",
               adjective,
             }));
@@ -73,7 +73,7 @@ function defaultWordUnit(
             definition,
             emphasis: emphasis != null,
           })
-            .map<WordUnitTranslation>((verb) => ({ ...verb, type: "verb" }));
+            .map((verb) => ({ ...verb, type: "verb" }));
         default:
           return new ArrayResult();
       }
@@ -90,7 +90,7 @@ export function wordUnit(
   switch (wordUnit.type) {
     case "number":
       return number(wordUnit.words)
-        .map<WordUnitTranslation>((number) => ({
+        .map((number) => ({
           type: "noun",
           determiner: [],
           adjective: [],