added vocatives!

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pashto-inflector",
-  "version": "7.1.7",
+  "version": "7.2.0",
   "author": "lingdocs.com",
   "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
   "homepage": "https://verbs.lingdocs.com",

src/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/ps-react",
-  "version": "7.1.7",
+  "version": "7.2.0",
   "description": "Pashto inflector library module with React components",
   "main": "dist/components/library.js",
   "module": "dist/components/library.js",

src/components/src/InflectionsTable.tsx

@@ -43,10 +43,12 @@ const InflectionTable = ({
   inf,
   textOptions,
   hideTitle,
+  vocative,
 }: {
   inf: T.Inflections | T.PluralInflections;
   textOptions: T.TextOptions;
   hideTitle?: boolean;
+  vocative?: boolean;
 }) => {
   // const [showingExplanation, setShowingExplanation] = useState(false);
   /* istanbul ignore next */ // Insanely can't see the modal to close it
@@ -105,6 +107,8 @@ const InflectionTable = ({
         <tbody>
           {(!isPluralInfs
             ? ["Plain", "1st", "2nd"]
+            : vocative
+            ? ["Voc.", "Plur. Voc."]
             : ["Plural", "2nd Inf."]
           ).map((title, i) => (
             <tr key={title}>

src/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/inflect",
-  "version": "7.1.7",
+  "version": "7.2.0",
   "description": "Pashto inflector library",
   "main": "dist/index.js",
   "types": "dist/lib/library.d.ts",

src/lib/src/accent-helpers.test.ts

@@ -15,6 +15,7 @@ import {
   splitUpSyllables,
   hasAccents,
   countSyllables,
+  getAccentPos,
 } from "./accent-helpers";
 
 const toAccentFront = [
@@ -40,6 +41,27 @@ test(`accentOnFront should work`, () => {
   });
 });
 
+const toGetAccentPos = [
+  {
+    input: makePsString("کورنۍ", "koranúy"),
+    output: 0,
+  },
+  {
+    input: makePsString("ستړی", "stúRay"),
+    output: 1,
+  },
+  {
+    input: makePsString("لیدلی", "leedulay"),
+    output: -1,
+  },
+];
+
+test(`getAccentPos should work`, () => {
+  toGetAccentPos.forEach((item) => {
+    expect(getAccentPos(item.input)).toEqual(item.output);
+  });
+});
+
 const toAccentPastParticiple = [
   {
     input: makePsString("پرېښی", "prexay"),
@@ -59,6 +81,8 @@ test(`accentPastParticiple should work`, () => {
 
 test(`splitUpSyllables should work`, () => {
   expect(splitUpSyllables("akheestul")).toEqual(["akh", "eest", "ul"]);
+  expect(splitUpSyllables("kh")).toEqual([]);
+  expect(splitUpSyllables("x")).toEqual([]);
 });
 
 test("countSyllables", () => {
@@ -74,9 +98,19 @@ test("countSyllables", () => {
 test(`accentOnFSylsOnNFromEnd should work`, () => {
   expect(accentFSylsOnNFromEnd(["pu", "xtaa", "nu"], 0)).toBe("puxtaanú");
   expect(accentFSylsOnNFromEnd(["leed", "ul", "ay"], 1)).toBe("leedúlay");
+  expect(accentFSylsOnNFromEnd([], 0)).toBe("");
+  expect(accentFSylsOnNFromEnd("x", 0)).toBe("x");
 });
 
 test(`accentOnNFromEnd should work`, () => {
+  expect(accentOnNFromEnd({ p: "ښه", f: "xu" }, 0)).toEqual({
+    p: "ښه",
+    f: "xú",
+  });
+  expect(accentOnNFromEnd({ p: "ښ", f: "x" }, 0)).toEqual({
+    p: "ښ",
+    f: "x",
+  });
   expect(accentOnNFromEnd({ p: "پښتانه", f: "puxtaanu" }, 0)).toEqual({
     p: "پښتانه",
     f: "puxtaanú",

src/lib/src/accent-helpers.ts

@@ -85,7 +85,11 @@ export function accentFSylsOnNFromEnd(
   n: number
 ): string {
   if (typeof syls === "string") {
-    return accentFSylsOnNFromEnd(splitUpSyllables(syls), n);
+    const s = splitUpSyllables(syls);
+    if (s.length === 0) {
+      return syls;
+    }
+    return accentFSylsOnNFromEnd(s, n);
   }
   if (syls.length === 0) {
     return "";
@@ -100,9 +104,9 @@ export function accentFSylsOnNFromEnd(
 export function accentOnNFromEnd(ps: T.PsString, n: number): T.PsString {
   const fNoAccents = removeAccents(ps.f);
   const fSyls = splitUpSyllables(fNoAccents);
-  // TODO: enable this and fix the tests it breaks!!!
-  // don't add accent if only one syllable
-  // if (fSyls.length === 1) return makePsString(ps.p, fNoAccents);
+  if (fSyls.length === 0) {
+    return ps;
+  }
   return makePsString(ps.p, accentFSylsOnNFromEnd(fSyls, n));
 }
 
@@ -127,6 +131,26 @@ export function accentLetter(s: string): string {
   });
 }
 
+/**
+ * returns the position of an accent on a word, 0 being the last syllable
+ * -1 means there is no accent
+ *
+ * @param ps
+ */
+export function getAccentPos(ps: T.PsString): number {
+  const syls = splitUpSyllables(ps.f);
+  for (let i = 0; i < syls.length; i++) {
+    if (hasAccents(syls.at(-(i + 1)) || "")) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+export function accentIsOnEnd(ps: T.PsString): boolean {
+  return getAccentPos(ps) === 0;
+}
+
 export function accentPsSyllable(ps: T.PsString): T.PsString {
   return {
     p: ps.p,

src/lib/src/fp-ps.ts

@@ -76,6 +76,42 @@ export function pureSingleOrLengthOpts<A>(a: A): T.SingleOrLengthOpts<A> {
   return a;
 }
 
+export function applyPsString(
+  f:
+    | {
+        p: (x: string) => string;
+      }
+    | {
+        f: (x: string) => string;
+      }
+    | {
+        p: (x: string) => string;
+        f: (x: string) => string;
+      },
+  x: T.PsString
+): T.PsString {
+  if ("p" in f && "f" in f) {
+    return {
+      p: f.p(x.p),
+      f: f.f(x.f),
+    };
+  }
+  if ("p" in f) {
+    return {
+      p: f.p(x.p),
+      f: x.f,
+    };
+  }
+  return {
+    p: x.p,
+    f: f.f(x.f),
+  };
+}
+
+export function mapGen<A, B>(f: (x: A) => B, x: A): B {
+  return f(x);
+}
+
 /**
  * like and applicative <*> operator for SingleOrLengthOpts
  *

src/lib/src/inflection-pattern.ts

@@ -11,7 +11,7 @@ import {
 } from "./type-predicates";
 
 export function getInflectionPattern(
-  e: T.NounEntry | T.AdjectiveEntry
+  e: T.InflectableEntry
 ): T.InflectionPattern {
   return isPattern1Entry(e)
     ? T.InflectionPattern.Basic

src/lib/src/p-text-helpers.test.ts

@@ -21,7 +21,6 @@ import {
   splitDoubleWord,
   endsInConsonant,
   addOEnding,
-  endsInShwa,
   splitPsByVarients,
   endsWith,
   trimOffPs,
@@ -1596,13 +1595,6 @@ test("addOEnding", () => {
   });
 });
 
-test("endsInShwa", () => {
-  expect(endsInShwa({ p: "ښایسته", f: "xaaystú" })).toBe(true);
-  expect(endsInShwa({ p: "ښایسته", f: "xaaystu" })).toBe(true);
-  expect(endsInShwa({ p: "ښایسته", f: "xaaysta" })).toBe(false);
-  expect(endsInShwa({ p: "کور", f: "kor" })).toBe(false);
-});
-
 test("splitPsByVarients", () => {
   expect(
     splitPsByVarients({ p: "حوادث, حادثات", f: "hawáadis, haadisáat" })