From 8458da2d7cbbc50bf3c87dca6d5c01be884798d9 Mon Sep 17 00:00:00 2001
From: Hunter Richardson <hrichardson8@gmail.com>
Date: Sun, 23 Jun 2024 14:47:58 -0500
Subject: [PATCH] Correct frontend errors

---
 src/extensions/string.ts      |  5 +++
 src/facies/calculare.vue      | 14 +++----
 src/facies/gustulare.vue      |  6 +--
 src/facies/inflectere.vue     | 46 ++++++++++++++-------
 src/facies/specere.vue        | 77 +++++++++++++++++++++++++----------
 src/miscella/enumerationes.ts |  1 -
 src/praebeunda/verba.ts       | 22 +++++++---
 7 files changed, 117 insertions(+), 54 deletions(-)

diff --git a/src/extensions/string.ts b/src/extensions/string.ts
index 8e7be59..018b9ca 100644
--- a/src/extensions/string.ts
+++ b/src/extensions/string.ts
@@ -21,6 +21,7 @@ declare global {
     startsWithVowel(): boolean;
     removeMacra(): string;
     capitalize(): string;
+    isCapitalized(): boolean;
   }
 }
 
@@ -50,3 +51,7 @@ String.prototype.removeMacra = function (): string {
 String.prototype.capitalize = function (): string {
   return (this.at(0) ?? '').toUpperCase().concat(this.slice(1));
 };
+
+String.prototype.isCapitalized = function(): boolean {
+  return /[A-ZĀĒĪŌȲ]/.test(this.at(0) ?? '');
+}
diff --git a/src/facies/calculare.vue b/src/facies/calculare.vue
index 0fb5235..2b56f18 100644
--- a/src/facies/calculare.vue
+++ b/src/facies/calculare.vue
@@ -22,11 +22,11 @@
   };
 
   const actus: string[][] = [
-    [ ' I ', ' C ', ' · ', ' + ' ],
-    [ ' V ', ' D ', ' : ', ' - ' ],
-    [ ' X ', ' M ', ' ∴ ', ' • ' ],
-    [ ' L ', ' | ', ' × ', ' ÷ ' ],
-    [ ' = ', ' N ', ' S ', ' % ' ]
+    [ 'I', 'C', '·', '+' ],
+    [ 'V', 'D', ':', '-' ],
+    [ 'X', 'M', '∴', '•' ],
+    [ 'L', '|', '×', '÷' ],
+    [ '=', 'N', 'S', '%' ]
   ];
 
   export default defineComponent({
@@ -130,9 +130,9 @@
   <v-card :text='praesentes.romanus' />
   <div class='text-center' v-for='linea in actus' :key='linea'>
     <span class='text-center' v-for='littera in linea' :key='littera'>
-      <v-card :text='littera' :id='`actus_${littera.trim()}`'
+      <v-card :text=` ${littera} ` :id='`actus_${littera}`'
               :disabled='licta(littera)' density='comfortable'
-              @click='ponatur(littera.trim());'
+              @click='ponatur(littera);'
               position='absolute' border hover />
     </span>
   </div>
diff --git a/src/facies/gustulare.vue b/src/facies/gustulare.vue
index 1c6b88d..6821046 100644
--- a/src/facies/gustulare.vue
+++ b/src/facies/gustulare.vue
@@ -2,8 +2,7 @@
   import { defineComponent } from 'vue'
   import Gustulus from '../scriptura/gustulus'
 
-  defineProps({ gustulus: Gustulus });
-  export default defineComponent({ props: [ 'gustulus' ] })
+  export default defineComponent({ props: { gustulus: Gustulus } })
 </script>
 
 <template>
@@ -12,7 +11,6 @@
       v-model="gustulus.visibile"
       :color="gustulus.color"
       :timeout="gustulus.vita"
-      :text="gustulus.nuntium"
-    />
+      :text="gustulus.nuntium" />
   </template>
 </template>
diff --git a/src/facies/inflectere.vue b/src/facies/inflectere.vue
index a040849..bded4aa 100644
--- a/src/facies/inflectere.vue
+++ b/src/facies/inflectere.vue
@@ -1,10 +1,13 @@
 <script setup lang='ts' generic='Hoc extends Multiplex'>
-  import { defineComponent } from 'vue';
   import Tabula from '../tabulae/tabula';
   import type { Faciendum } from '../praebeunda/interfecta';
-  import type { Eventus } from '../miscella/dictionarium';
 
-  defineProps<Hoc>({ eventus: Eventus });
+  defineProps<{
+    eventus: {
+      referendum: Faciendum<Hoc>,
+      categoria: string
+    }
+  }>();
 
   type Columnae = {
     title: string,
@@ -12,12 +15,14 @@
     filter: (verbum: Hoc, colamen: string) => boolean
   }[];
 
-  const agendum: Faciendum<Hoc> = eventus.value?.referendum as Faciendum<Hoc>;
+  const agendum: Faciendum<Hoc> = eventus.value?.referendum;
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const tabula: Tabula<Hoc> | null = agendum?.putetur() ?? null;
 
   const categoria: string = eventus.value?.categoria ?? '';
   const anglica: boolean = Cocutor.se.ipse().edatur('lingua') === 'anglica';
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const columnae: Columnae = Multiplex.colamina(categoria).map(columna => {
     return {
       title: (anglica ? anglicum(columna) : columna).toUpperCase(),
@@ -44,14 +49,14 @@
       figura = 'nomenActum';
       break;
     case agendum instanceof Agenda.NumeramenAgendum:
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
       figura = 'numeramenAgendum';
       break;
   }
 </script>
 
 <script lang='ts'>
-  import type { ModelRef } from 'vue';
-  import { defineModel } from 'vue';
+  import { defineComponent, defineModel, type ModelRef } from 'vue';
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   import specere from './specere.vue';
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -63,6 +68,7 @@
   import Cocutor from '../miscella/cocutor';
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   import { genera, gradi, anglicum } from '../miscella/enumerationes';
+  import type { Referendum } from '../praebeunda/interfecta'
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const verbum: ModelRef<Verbum | undefined, string> = defineModel<Verbum>('verbum');
@@ -200,17 +206,27 @@
             referendum: referendum,
             categoria: eventus.categoria
           };
-        };
+        }
       }
     }, async mounted (): Promise<void> {
-      this.haec = await omnes();
+      this.haec = await this.omnes();
+
+      switch (this.haec?.length ?? 0) {
+        case 1:
+          this.verbum = this.haec.first();
+          break;
+        case 0:
+          break;
+        default:
+          this.seligenda = [
+            ...new Set((this.haec as Hoc[])
+              .map(verbum => verbum.valores())
+              .map(valor => Object.values(valor))
+              .flat())
+          ];
 
-      this.seligenda = [
-        ...new Set((this.haec as Hoc[])
-          .map(verbum => verbum.valores())
-          .map(valor => Object.values(valor))
-          .flat())
-      ];
+          break;
+      }
 
       return new Promise(() => this.onerans = false);
     }
@@ -222,7 +238,7 @@
   <template v-if='verbum'>
     <specere :verbum='verbum' @blur='verbum = undefined;' />
   </template>
-  <template v-else>
+  <template v-else-if='eventus'>
     <div id='colamina'>
       <horizontal-scroll>
         <v-chip-group v-for='seligendum in seligenda' :key='seligendum'
diff --git a/src/facies/specere.vue b/src/facies/specere.vue
index fc207df..388d434 100644
--- a/src/facies/specere.vue
+++ b/src/facies/specere.vue
@@ -1,35 +1,42 @@
 <script lang='ts'>
-  import { defineComponent, defineModel } from 'vue';
+  import { defineComponent, defineModel, type ModelRef } from 'vue';
+  import Gustulus from '../scriptura/gustulus';
+  import gustulare from './gustulare.vue';
   import { Verbum, Multiplex, Actus, Numerus } from '../praebeunda/verba';
   import Locutor from '../miscella/locutor';
   import inflectere from './inflectere.vue';
   import Cocutor from '../miscella/cocutor';
+  import { Encliticum } from '../miscella/enumerationes';
   import type { Eventus } from '../miscella/dictionarium';
   import type { NumeramenAgendum } from '../praebeunda/agenda';
-  import type { ModelRef } from 'vue';
-  import Gustulus from '../scriptura/gustulus';
-  import gustulare from './gustulare.vue';
 
   const eventus: ModelRef<Eventus | undefined, string> = defineModel<Eventus>('eventus');
-
   const lingua: string | undefined = Cocutor.se.ipse().edatur('lingua');
-  const multiplex: boolean = false;
-  const valores: string[] = []
-
-  defineProps({ verbum: Verbum });
+  const locutor: Locutor = Locutor.se.ipse();
 
   export default defineComponent({
     components: { gustulare, inflectere },
-    props: [ 'verbum' ],
+    props: { verbum: Verbum },
 
-    data() {
+    data (): {
+      gustulus: Gustulus,
+      eventus: Eventus | undefined,
+      anglica: boolean,
+      propriabile: boolean,
+      multiplex: boolean,
+      valores: string[],
+      enclitica: string[],
+      encliticum: string
+    } {
       return {
         gustulus: new Gustulus({}),
         eventus: eventus.value,
         anglica: lingua === 'anglica',
-        multiplex: multiplex,
-        valores: valores,
-        locutor: Locutor.se.ipse()
+        propriabile: false,
+        multiplex: false,
+        valores: [],
+        enclitica: Object.keys(Encliticum),
+        encliticum: ''
       };
     },
 
@@ -37,7 +44,7 @@
       async aperi (): Promise<void> {
         switch (this.verbum?.categoria) {
           case 'actus': {
-            const actus: Actus = verbum as Actus;
+            const actus: Actus = this.verbum as Actus;
             if (actus.modus === 'participium') {
               this.eventus = {
                 referendum: await actus.participialis(),
@@ -48,7 +55,7 @@
             break;
           }
           case 'numerus': {
-            const numerus: Numerus = verbum as Numerus;
+            const numerus: Numerus = this.verbum as Numerus;
             const agendum: NumeramenAgendum | null = await numerus.numeramen();
             if (agendum) {
               this.eventus = {
@@ -59,12 +66,33 @@
             break;
           }
         }
+      }, adde (): void {
+        if (this.verbum) {
+          if ([ this.multiplex, this.encliticum ].all()) {
+            (this.verbum as Multiplex).encliticum = this.encliticum;
+          }
+
+          locutor.addatur(this.verbum);
+        }
+      }, addeProprium (): void {
+        if ([ this.verbum, this.propriabile ].all()) {
+          this.verbum.scriptum = this.verbum.scriptum.capitalize();
+        }
+
+        this.adde();
       }
     },
 
     mounted(): void {
-      this.multiplex = this.verbum.value instanceof Multiplex;
-      this.valores = this.multiplex ? (this.verbum.value as Multiplex)?.valores() : [];
+      this.multiplex = this.verbum ? this.verbum instanceof Multiplex : false;
+      this.valores = this.multiplex ? (this.verbum as Multiplex)?.valores() : [];
+
+      this.propriabile = [
+        this.multiplex, [
+          'nomen', 'adiectivum'
+        ].includes(verbum?.categoria),
+        !verbum?.scriptum.isCapitalized()
+      ].all();
     }
   });
 </script>
@@ -81,13 +109,20 @@
           <v-chip v-for='valor in valores' :key='valor' :text='valor' :id="`valor_${valor}`"
                   selected-class='text-primary' prepend-icon='category' />
         </v-chip-group>
+        <v-select density='compact' id='enclitica' v-model='encliticum'
+                  :title="anglica ? 'Enclitics' : 'Enclitica'"
+                  :items='enclitica' chips flat open-on-clear />
       </template>
       <v-btn-toggle>
         <template v-if='verbum?.paratumne()'>
-          <v-btn icon='chat_add_on' :text="anglica ? 'Add this to my phrase' : 'Adde hoc locutioni'"
-                 id='adde' @click='locutor.addatur(verbum as Verbum);' />
+          <v-btn icon='chat_add_on' id='adde' @click='adde();'
+                 :text="anglica ? 'Add this to my phrase' : 'Adde hoc locutioni'" />
+        </template>
+        <template v-if='propriabile'>
+          <v-bnt icon='chat_add_on' id='addeProprium' @click='addeProprium();'
+                 :text="anglica ? 'Add this to my phrase as a proper name' : 'Adde hoc locutioni ut proprium'" />
         </template>
-        <template v-if="verbum?.categoria === 'numerus'">
+        <template v-else-if="verbum?.categoria === 'numerus'">
           <v-btn icon='quick_reference' id='aperi' @click='aperi();' :text="anglica ? 'Open' : 'Refer'" />
         </template>
         <template v-else-if="verbum?.categoria === 'actus' &&
diff --git a/src/miscella/enumerationes.ts b/src/miscella/enumerationes.ts
index 37ac8c1..5fbad0d 100644
--- a/src/miscella/enumerationes.ts
+++ b/src/miscella/enumerationes.ts
@@ -1,5 +1,4 @@
 export enum Encliticum {
-  Nolens = '',
   Interrogans = 'ne',
   Coniugans = 'que',
   Eligens = 've'
diff --git a/src/praebeunda/verba.ts b/src/praebeunda/verba.ts
index 90a0ad5..ccadd2f 100644
--- a/src/praebeunda/verba.ts
+++ b/src/praebeunda/verba.ts
@@ -1,14 +1,15 @@
-import Structor from './structor';
 import LectorVerbalis from '../lectores/verbalis';
 import * as Enumerationes from '../miscella/enumerationes';
 import Numerator from '../miscella/numerator';
 import { AdiectivumAgendum, NumeramenAgendum, type Agendum, type Positor } from './agenda';
+import Structor from './structor';
 
 export class Verbum {
   static readonly Errator: (exemplar: string, res: string) => Error = (
     exemplar: string,
     res: string
   ) => new Error(["Malu'st", exemplar, res].join(' '));
+
   readonly unicum: symbol = Symbol();
   categoria: string = '';
   protected _scriptum: string = '';
@@ -83,7 +84,7 @@ export abstract class Multiplex extends Verbum {
     }
   }
 
-  private _encliticum: string = Enumerationes.Encliticum.Nolens;
+  private _encliticum: string = '';
 
   abstract valores(): string[];
 
@@ -91,11 +92,20 @@ export abstract class Multiplex extends Verbum {
     return this._encliticum;
   }
 
-  set encliticum(valor: Enumerationes.Encliticum) {
-    this._encliticum = valor;
+  set encliticum (valor: string) {
+    if ([
+      !valor,
+      Object.keys(Enumerationes.Encliticum).includes(valor ?? '')
+    ].any()) {
+      if (this._encliticum) {
+        this.scriptum = this.scriptum.replace(`${this._encliticum}$`, '');
+      }
+
+      this._encliticum = valor ?? '';
 
-    if (valor) {
-      this.scriptum = this.scriptum.concat(valor);
+      if (this._encliticum) {
+        this.scriptum = this.scriptum.concat(this._encliticum);
+      }
     }
   }
 }