preposition clause are context only

Author: neverRare

src/parser/ast.ts

@@ -74,12 +74,12 @@ export type Clause =
     type: "o clause";
     subjects: null | MultiplePhrases;
     predicates: Predicate;
-  }>
-  | Readonly<
-    { type: "prepositions"; prepositions: ReadonlyArray<Preposition> }
-  >;
+  }>;
 export type ContextClause =
   | Clause
+  | Readonly<
+    { type: "prepositions"; prepositions: ReadonlyArray<Preposition> }
+  >
   | (Readonly<{ type: "nanpa" }> & Nanpa)
   | (Readonly<{ type: "anu"; anu: HeadedWordUnit }>);
 export type Sentence =

src/parser/composer.ts

@@ -171,12 +171,12 @@ export function clause(clause: Clause): string {
         multiplePredicates(clause.predicates, "o"),
       ]
         .join(" ");
-    case "prepositions":
-      return clause.prepositions.map(preposition).join(" ");
   }
 }
 export function contextClause(contextClause: ContextClause): string {
   switch (contextClause.type) {
+    case "prepositions":
+      return contextClause.prepositions.map(preposition).join(" ");
     case "nanpa":
       return nanpa(contextClause);
     case "anu":

src/parser/extract.ts

@@ -94,14 +94,14 @@ export function everyWordUnitInClause(clause: Clause): ReadonlyArray<WordUnit> {
           .flatMap(everyWordUnitInMultiplePhrases),
         ...everyWordUnitInMultiplePredicates(clause.predicates),
       ];
-    case "prepositions":
-      return clause.prepositions.flatMap(everyWordUnitInPreposition);
   }
 }
 export function everyWordUnitInContextClause(
   contextClause: ContextClause,
 ): ReadonlyArray<WordUnit> {
   switch (contextClause.type) {
+    case "prepositions":
+      return contextClause.prepositions.flatMap(everyWordUnitInPreposition);
     case "nanpa":
       return everyWordUnitInNanpa(contextClause);
     case "anu":

src/parser/filter.ts

@@ -261,8 +261,6 @@ export const CLAUSE_RULE: ReadonlyArray<(clause: Clause) => boolean> = [
           return true;
         }
         break;
-      case "prepositions":
-        return true;
     }
     if (
       everyPhraseInMultiplePhrases(phrases).some(hasPrepositionInPhrase)

src/parser/parser.ts

@@ -559,18 +559,6 @@ const clause = choice<Clause>(
       predicates,
       explicitLi: false,
     })),
-  sequence(
-    preposition,
-    many(optionalComma.with(preposition)),
-  )
-    .map(
-      ([preposition, morePreposition]) => [preposition, ...morePreposition],
-    )
-    .sortBy((prepositions) => -prepositions.length)
-    .map((prepositions) => ({
-      type: "prepositions",
-      prepositions,
-    })),
   subjectPhrases
     .map((phrases) => ({ type: "phrases", phrases })),
   subjectPhrases
@@ -605,6 +593,18 @@ const clause = choice<Clause>(
 )
   .filter(filter(CLAUSE_RULE));
 const contextClause = choice<ContextClause>(
+  sequence(
+    preposition,
+    many(optionalComma.with(preposition)),
+  )
+    .map(
+      ([preposition, morePreposition]) => [preposition, ...morePreposition],
+    )
+    .sortBy((prepositions) => -prepositions.length)
+    .map((prepositions) => ({
+      type: "prepositions",
+      prepositions,
+    })),
   nanpa.map((nanpa) => ({ ...nanpa, type: "nanpa" })),
   wordUnit(new Set(["anu"]), '"anu"').map((anu) => ({ type: "anu", anu })),
   clause,

src/translator/clause.ts

@@ -200,14 +200,13 @@ export function clause(clause: TokiPona.Clause): ArrayResult<English.Clause> {
       return liClause(clause);
     case "o clause":
       return oClause(clause);
-    case "prepositions":
-      return new ArrayResult(new TranslationTodoError(clause.type));
   }
 }
 export function contextClause(
   contextClause: TokiPona.ContextClause,
 ): ArrayResult<English.Clause> {
   switch (contextClause.type) {
+    case "prepositions":
     case "nanpa":
     case "anu":
       return new ArrayResult(