more type annotation

Author: neverRare

src/parser/parser_lib.ts

@@ -125,7 +125,7 @@ export function error(error: ResultError): Parser<never> {
 }
 export const empty: Parser<never> = new Parser(() => ArrayResult.empty());
 export const nothing: Parser<null> = new Parser(() =>
-  new ArrayResult([{ value: null, length: 0 }])
+  new ArrayResult<ValueLength<null>>([{ value: null, length: 0 }])
 );
 export const emptyArray: Parser<ReadonlyArray<never>> = nothing.map(() => []);
 export function lookAhead<T>(parser: Parser<T>): Parser<T> {
@@ -263,7 +263,10 @@ export function matchCapture(
   return new Parser((position) => {
     const match = currentSource.slice(position).match(newRegex);
     if (match != null) {
-      return new ArrayResult([{ value: match, length: match[0].length }]);
+      return new ArrayResult<ValueLength<RegExpMatchArray>>([{
+        value: match,
+        length: match[0].length,
+      }]);
     } else {
       return generateError(position, description);
     }
@@ -281,7 +284,7 @@ export function matchString(
       currentSource.length - position >= match.length &&
       currentSource.slice(position, position + match.length) === match
     ) {
-      return new ArrayResult([{
+      return new ArrayResult<ValueLength<string>>([{
         value: match,
         length: match.length,
       }]);
@@ -291,19 +294,19 @@ export function matchString(
   });
 }
 export const allRest: Parser<string> = new Parser((position) =>
-  new ArrayResult([{
+  new ArrayResult<ValueLength<string>>([{
     value: currentSource.slice(position),
     length: currentSource.length - position,
   }])
 );
 export const end: Parser<null> = new Parser((position) =>
   position === currentSource.length
-    ? new ArrayResult([{ value: null, length: 0 }])
+    ? new ArrayResult<ValueLength<null>>([{ value: null, length: 0 }])
     : generateError(position, "end of text")
 );
 export const notEnd: Parser<null> = new Parser((position) =>
   position < currentSource.length
-    ? new ArrayResult([{ value: null, length: 0 }])
+    ? new ArrayResult<ValueLength<null>>([{ value: null, length: 0 }])
     : ArrayResult.errors([
       new UnexpectedError(
         "end of text",

src/translator/modifier.ts

@@ -226,7 +226,7 @@ export function multipleModifiers(
         inPositionPhrases.length <= 1 &&
         (nouns.length === 0 || inPositionPhrases.length === 0)
       ) {
-        adjectival = IterableResult.single({
+        adjectival = IterableResult.single<MultipleModifierTranslation>({
           type: "adjectival",
           nounPreposition: nounPrepositions[0] ?? null,
           determiners,
@@ -261,7 +261,7 @@ export function multipleModifiers(
             emphasis: false,
           }
           : null;
-        adverbial = IterableResult.single({
+        adverbial = IterableResult.single<MultipleModifierTranslation>({
           type: "adverbial",
           adverbs,
           inWayPhrase,

src/translator/noun.ts

@@ -82,20 +82,23 @@ export function fromNounForms(
           ]);
         case "condensed":
           if (singular != null && plural != null) {
-            return IterableResult.single({
+            return IterableResult.single<NounQuantity>({
               noun: condense(singular, plural),
               quantity: "condensed",
             });
           }
           // fallthrough
         case "default only":
           if (singular != null) {
-            return IterableResult.single({
+            return IterableResult.single<NounQuantity>({
               noun: singular,
               quantity: "singular",
             });
           } else {
-            return IterableResult.single({ noun: plural!, quantity: "plural" });
+            return IterableResult.single<NounQuantity>({
+              noun: plural!,
+              quantity: "plural",
+            });
           }
       }
   }

src/translator/verb.ts

@@ -213,14 +213,14 @@ function fromVerbForms(
     case "condensed":
       if (negated) {
         if (is) {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: null,
             doesNot: null,
             verb: `${present} not/${past} not/will not be`,
             postAdverb: null,
           });
         } else {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: null,
             doesNot: {
               preAdverbs: [],
@@ -233,14 +233,14 @@ function fromVerbForms(
         }
       } else {
         if (is) {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: null,
             doesNot: null,
             verb: `${present}/${past}/will be`,
             postAdverb: null,
           });
         } else {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: noAdverbs(noEmphasis("(will)")),
             doesNot: null,
             verb: condenseVerb(present, past),
@@ -316,14 +316,14 @@ function fromVerbForms(
     case "default only":
       if (negated) {
         if (is) {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: null,
             doesNot: null,
             verb: present,
             postAdverb: NOT,
           });
         } else {
-          result = IterableResult.single({
+          result = IterableResult.single<Result>({
             modal: null,
             doesNot: {
               preAdverbs: [],
@@ -335,7 +335,7 @@ function fromVerbForms(
           });
         }
       } else {
-        result = IterableResult.single({
+        result = IterableResult.single<Result>({
           modal: null,
           doesNot: null,
           verb: present,
@@ -378,7 +378,7 @@ export function verb(
       const { first } = verb;
       switch (first.type) {
         case "modal":
-          return IterableResult.single({
+          return IterableResult.single<English.VerbPhrase>({
             ...verb,
             type: "simple",
             verb: { modal: first, verbs: verb.rest },