✨ feat(scriptor): support all forms of an adjective

Adds comparative, superlative, and adverb forms
hugo-t-b · Jun 26, 2024 · 4730985 · 4730985
1 parent b5c0461
commit 4730985
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,9 +7,15 @@
     "erunt",
     "ibus",
     "isse",
+    "issima",
+    "issimum",
+    "issimus",
     "isti",
     "istis",
     "ntis",
-    "orum"
+    "orum",
+    "rima",
+    "rimum",
+    "rimus"
   ]
 }
diff --git a/scriptor/tests/adjectives.test.ts b/scriptor/tests/adjectives.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import scriptor from "..";
 
+const acer = "acer, acris, acre";
 const aeger = "aeger, aegra, aegrum";
 const celer = "celer, celeris, celere";
 const felix = "felix, felicis";
@@ -433,9 +434,10 @@ describe("Neuter plural", () => {
   });
 });
 
-test.todo("Comparative", () => {
+test("Comparative", () => {
   const form = "comparative";
 
+  expect(scriptor(acer, form)).toBe("acrior, acrius");
   expect(scriptor(aeger, form)).toBe("aegrior, aegrius");
   expect(scriptor(celer, form)).toBe("celerior, celerius");
   expect(scriptor(fortis, form)).toBe("fortior, fortius");
@@ -444,9 +446,10 @@ test.todo("Comparative", () => {
   expect(scriptor(liber, form)).toBe("liberior, liberius");
 });
 
-test.todo("Superlative", () => {
+test("Superlative", () => {
   const form = "superlative";
 
+  expect(scriptor(acer, form)).toBe("acerrimus, acerrima, acerrimum");
   expect(scriptor(aeger, form)).toBe("aegerrimus, aegerrima, aegerrimum");
   expect(scriptor(celer, form)).toBe("celerrimus, celerrima, celerrimum");
   expect(scriptor(fortis, form)).toBe("fortissimus, fortissima, fortissimum");
@@ -455,8 +458,7 @@ test.todo("Superlative", () => {
   expect(scriptor(liber, form)).toBe("liberrimus, liberrima, liberrimum");
 });
 
-
-test.todo("Adverb", () => {
+test("Adverb", () => {
   const form = "adverb";
 
   expect(scriptor(aeger, form)).toBe("aegre");

diff --git a/scriptor/utils/adjective.ts b/scriptor/utils/adjective.ts
@@ -1,9 +1,15 @@
 import { z } from "zod";
 
-export const AdjectiveForm = z.tuple([
-  z.enum([ "nominative", "vocative", "accusative", "genitive", "dative", "ablative" ]),
-  z.enum([ "feminine", "masculine", "neuter" ]),
-  z.enum([ "singular", "plural" ])
+export const AdjectiveForm = z.union([
+  z.tuple([
+    z.enum([ "nominative", "vocative", "accusative", "genitive", "dative", "ablative" ]),
+    z.enum([ "feminine", "masculine", "neuter" ]),
+    z.enum([ "singular", "plural" ])
+  ]),
+
+  z.tuple([
+    z.enum([ "comparative", "superlative", "adverb" ])
+  ])
 ]);
 
 const PatternA = z.tuple([
@@ -197,4 +203,23 @@ export default class Adjective {
   get ablative_neuter_plural() {
     return this.ablative_masculine_plural;
   }
+
+  get comparative() {
+    return `${this.#stem}ior, ${this.#stem}ius`;
+  }
+
+  get superlative() {
+    if (this.nominative_masculine_singular.endsWith("er")) {
+      return `${this.nominative_masculine_singular}rimus, ${this.nominative_masculine_singular}rima, ${this.nominative_masculine_singular}rimum`;
+    }
+
+    return this.#stem.endsWith("er")
+      ? `${this.#stem}rimus, ${this.#stem}rima, ${this.#stem}rimum`
+      : `${this.#stem}issimus, ${this.#stem}issima, ${this.#stem}issimum`
+  }
+
+  get adverb() {
+    if (this.#pattern === "A") return `${this.#stem}e`;
+    return this.#stem.endsWith("nt") ? `${this.#stem}er` : `${this.#stem}iter`;
+  }
 };