rename

Author: neverRare

src/parser/ast.ts

@@ -86,7 +86,7 @@ export type Sentence =
   | Readonly<{
     type: "default";
     startingParticle: null | HeadedWordUnit;
-    laClauses: ReadonlyArray<ContextClause>;
+    contextClauses: ReadonlyArray<ContextClause>;
     finalClause: Clause;
     anuSeme: null | HeadedWordUnit;
     emphasis: null | Emphasis;

src/parser/composer.ts

@@ -191,7 +191,7 @@ export function sentence(sentence: Sentence): string {
     case "default":
       text = [
         ...nullableAsArray(sentence.startingParticle).map(wordUnit),
-        ...sentence.laClauses
+        ...sentence.contextClauses
           .map(contextClause)
           .map((clause) => `${clause} la`),
         clause(sentence.finalClause),

src/parser/extract.ts

@@ -117,7 +117,7 @@ export function everyWordUnitInSentence(
     case "default":
       return [
         ...nullableAsArray(sentence.startingParticle),
-        ...sentence.laClauses.flatMap(everyWordUnitInContextClause),
+        ...sentence.contextClauses.flatMap(everyWordUnitInContextClause),
         ...everyWordUnitInClause(sentence.finalClause),
         ...nullableAsArray(sentence.anuSeme),
       ];

src/parser/filter.ts

@@ -327,7 +327,7 @@ export const SENTENCE_RULE: ReadonlyArray<(sentence: Sentence) => boolean> = [
   },
   // If there is "la", there can't be starting particle e.g. taso
   (sentence) =>
-    sentence.type !== "default" || sentence.laClauses.length === 0 ||
+    sentence.type !== "default" || sentence.contextClauses.length === 0 ||
     sentence.startingParticle == null || throwError(
       new UnrecognizedError(
         `${sentence.startingParticle.word} particle with "la"`,

src/parser/parser.ts

@@ -673,7 +673,7 @@ const sentence = choice<Sentence>(
       (
         [
           startingParticle,
-          laClauses,
+          contextClauses,
           finalClause,
           anuSeme,
           emphasis,
@@ -683,7 +683,7 @@ const sentence = choice<Sentence>(
         const sentence: Sentence & { type: "default" } = {
           type: "default",
           startingParticle,
-          laClauses,
+          contextClauses,
           finalClause,
           anuSeme,
           emphasis,

src/translator/sentence.ts

@@ -130,9 +130,8 @@ function sentence(
     : sentence.punctuation;
   switch (sentence.type) {
     case "default": {
-      const laClauses = sentence.laClauses;
       const contextClauses = ArrayResult.combine(
-        ...laClauses.map(contextClause),
+        ...sentence.contextClauses.map(contextClause),
       )
         .map((clause) => clause.flat());
       if (sentence.startingParticle != null) {
@@ -142,28 +141,27 @@ function sentence(
           ),
         );
       }
-      const lastEngClause = clause(sentence.finalClause);
-      const right = nullableAsArray(sentence.anuSeme).map(anuSeme);
-      const interjectionClause =
-        sentence.laClauses.length === 0 && sentence.startingParticle == null &&
+      const finalClause = clause(sentence.finalClause);
+      const useAnuSeme = nullableAsArray(sentence.anuSeme).map(anuSeme);
+      const interjectionClause = sentence.contextClauses.length === 0 &&
           sentence.startingParticle == null
-          ? interjection(sentence.finalClause)
-          : new ArrayResult<English.Clause>();
-      const engClauses = ArrayResult.combine(
+        ? interjection(sentence.finalClause)
+        : new ArrayResult<English.Clause>();
+      const clauses = ArrayResult.combine(
         contextClauses,
-        ArrayResult.concat(interjectionClause, lastEngClause),
+        ArrayResult.concat(interjectionClause, finalClause),
       )
         .map(([contextClauses, lastClause]) => [
           ...contextClauses,
           lastClause,
-          ...right,
+          ...useAnuSeme,
         ]);
       const usePunctuation = emphasisAsPunctuation({
         emphasis: sentence.emphasis,
         interrogative: sentence.interrogative != null,
         originalPunctuation: punctuation,
       });
-      return engClauses.map((clauses) => ({
+      return clauses.map((clauses) => ({
         type: "sentence",
         clauses,
         punctuation: usePunctuation,