move filtering of "of"

Author: neverRare

src/translator/fixer.ts

@@ -29,7 +29,7 @@ function fixNounPhrase(noun: English.NounPhrase): English.NounPhrase {
         determiners: fixMultipleDeterminers(noun.determiners),
         adjectives: fixMultipleAdjectives(noun.adjectives),
         postCompound: mapNullable(noun.postCompound, fixNounPhrase),
-        prepositions: noun.prepositions.map(fixPreposition),
+        prepositions: fixMultiplePrepositions(noun.prepositions),
       };
     case "compound":
       return {
@@ -212,15 +212,15 @@ function fixVerbPhrase(verb: English.VerbPhrase): English.VerbPhrase {
         contentClause: mapNullable(verb.contentClause, fixClause),
         object: mapNullable(verb.object, fixNounPhrase),
         objectComplement: mapNullable(verb.objectComplement, fixComplement),
-        prepositions: verb.prepositions.map(fixPreposition),
+        prepositions: fixMultiplePrepositions(verb.prepositions),
       };
     case "compound":
       return {
         ...verb,
         verbs: verb.verbs.map(fixVerbPhrase),
         object: mapNullable(verb.object, fixNounPhrase),
         objectComplement: mapNullable(verb.objectComplement, fixComplement),
-        prepositions: verb.prepositions.map(fixPreposition),
+        prepositions: fixMultiplePrepositions(verb.prepositions),
       };
   }
 }
@@ -245,6 +245,18 @@ function fixPreposition(
     object: fixNounPhrase(preposition.object),
   };
 }
+function fixMultiplePrepositions(
+  prepositions: ReadonlyArray<English.Preposition>,
+): ReadonlyArray<English.Preposition> {
+  if (
+    prepositions.filter((preposition) => preposition.preposition.word === "of")
+      .length > 1
+  ) {
+    throw new FilteredError('multiple "of"');
+  } else {
+    return prepositions.map(fixPreposition);
+  }
+}
 function fixClause(clause: English.Clause): English.Clause {
   switch (clause.type) {
     case "simple":

src/translator/modifier.ts

@@ -32,7 +32,7 @@ export type AdjectivalModifier = Readonly<{
   determiners: ReadonlyArray<English.Determiner>;
   adjectives: ReadonlyArray<English.AdjectivePhrase>;
   name: null | string;
-  ofPhrase: null | English.NounPhrase;
+  ofPhrase: ReadonlyArray<English.NounPhrase>;
 }>;
 export type AdverbialModifier = Readonly<{
   adverbs: ReadonlyArray<English.Adverb>;
@@ -208,7 +208,6 @@ export function multipleModifiers(
 
       let adjectival: IterableResult<MultipleModifierTranslation>;
       if (
-        nouns.length <= 1 &&
         nounPrepositions.length <= 1 &&
         adverbs.length === 0 &&
         names.length <= 1
@@ -219,7 +218,7 @@ export function multipleModifiers(
           determiners,
           adjectives,
           name: names[0] ?? null,
-          ofPhrase: nouns[0] ?? null,
+          ofPhrase: nouns,
         });
       } else {
         adjectival = IterableResult.empty();

src/translator/phrase.ts

@@ -69,7 +69,7 @@ function nounPhrase(
         modifier.name,
         (name): English.AdjectiveName => ({ adjective: "named", name }),
       );
-    const prepositions = nullableAsArray(modifier.ofPhrase)
+    const prepositions = modifier.ofPhrase
       .map((object) => nounAsPreposition(object, "of"));
     const { nounPreposition } = modifier;
     const headNoun = fromNounForms(noun, quantity)