up

package.json

@@ -7,7 +7,7 @@
     "@formkit/auto-animate": "^1.0.0-beta.1",
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@lingdocs/lingdocs-main": "^0.3.3",
-    "@lingdocs/pashto-inflector": "^4.0.3",
+    "@lingdocs/ps-react": "^5.1.1",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
@@ -41,6 +41,7 @@
     "web-vitals": "^1.0.1"
   },
   "scripts": {
+    "infup": "yarn upgrade @lingdocs/ps-react --latest",
     "bump-dep": "yarn install && git add . && git commit -m up && git push origin master",
     "start": "react-scripts start",
     "start-w-user": "REACT_APP_ENV=dev react-scripts start",

scripts/get-words.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const fetch = require("node-fetch");
-// const { readDictionary } = require("@lingdocs/pashto-inflector");
 const path = require("path");
 const wordsPath = path.join(".", "src", "words");
 const wordsFile = "raw-words.ts";

src/components/BasicVerbShowCase.tsx

@@ -12,13 +12,13 @@ import {
     isPastTense,
     getPassiveRootsAndStems,
     getAbilityRootsAndStems,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
-import { isImperativeTense, isPerfectTense } from "@lingdocs/pashto-inflector/dist/lib/type-predicates";
+import { isImperativeTense, isPerfectTense } from "@lingdocs/ps-react/dist/lib/src/type-predicates";
 import { useState } from "react";
 import Carousel from "./Carousel";
 import { basicVerbs, intransitivePastVerbs } from "../content/verbs/basic-present-verbs";
-import { getLength } from "@lingdocs/pashto-inflector/dist/lib/p-text-helpers";
+import { getLength } from "@lingdocs/ps-react/dist/lib/src/p-text-helpers";
-import { isThirdPerson } from "@lingdocs/pashto-inflector/dist/lib/phrase-building/vp-tools";
+import { isThirdPerson } from "@lingdocs/ps-react";
 
 function BasicVerbShowCase({ opts, tense, passive, ability }: {
     opts: T.TextOptions,

src/components/Chart.tsx

@@ -1,7 +1,7 @@
 import {
     Types as T,
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 
 function Chart({ titleRow, children, opts }: {

src/components/EquativeFormChoice.js

@@ -2,7 +2,7 @@ import { useState } from "react";
 import {
     VerbFormDisplay,
     ButtonSelect,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 function EquativeFormChoice({forms, opts}) {
     const [choice, setChoice] = useState("pure");

src/components/EquativeIllustration.tsx

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import {
     ButtonSelect,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 export function EquativeIllustration() {
     const [choice, setChoice] = useState<"p" | "f" | "e">("f");

src/components/GenderTable.js

@@ -1,7 +1,7 @@
 import {
     InlinePs,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import genderColors from "../lib/gender-colors";
 
 export default function GenderTable({ rows }) {

src/components/InflectionCarousel.tsx

@@ -7,7 +7,7 @@ import {
     defaultTextOptions as opts,
     getEnglishWord,
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 function InflectionCarousel({ items }: { items: (T.NounEntry | T.AdjectiveEntry)[] }) {
     if (!items.length) {

src/components/PhraseBuilder.tsx

@@ -1,4 +1,4 @@
-import { useStickyState } from "@lingdocs/pashto-inflector";
+import { useStickyState } from "@lingdocs/ps-react";
 import {
     Types as T,
     ButtonSelect,
@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     EntrySelect,
     VPExplorer,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { useEffect } from "react";
 import entryFeeder from "../lib/entry-feeder";
 

src/components/PronounPicker.tsx

@@ -4,7 +4,7 @@ import {
     Types as T,
     ButtonSelect,
     useStickyState,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 const gColors = {
     masc: "LightSkyBlue",

src/components/Table.js

@@ -1,6 +1,6 @@
 import {
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 export const femColor = "#FFECEF"
 export const mascColor = "#C1D5F4";
 

src/components/phonetics/phonemes.tsx

@@ -1,4 +1,4 @@
-import { Types as T } from "@lingdocs/pashto-inflector";
+import { Types as T } from "@lingdocs/ps-react";
 
 interface ILetter {
   letter: string;

src/components/phrase-diagram/BlockDiagram.tsx

@@ -5,7 +5,7 @@ import {
     NPBlock,
     APBlock,
     getEnglishFromRendered,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 function BlockDiagram({ opts, children }: {
     opts: T.TextOptions,

src/components/phrase-diagram/EditableBlock.tsx

@@ -2,7 +2,7 @@ import {
     Types as T,
     NPPicker,
     APPicker,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import {
     useEffect,
     useRef,

src/components/phrase-diagram/EditableEPEx.tsx

@@ -2,7 +2,7 @@ import {
     Types as T,
     EPDisplay,
     EPPicker,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import entryFeeder from "../../lib/entry-feeder";
 import { useState } from "react";
 import ReactGA from "react-ga";

src/components/phrase-diagram/EditableVPEx.tsx

@@ -3,7 +3,7 @@ import {
     VPDisplay,
     VPPicker,
     vpsReducer,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import entryFeeder from "../../lib/entry-feeder";
 import { useState } from "react";
 import ReactGA from "react-ga";

src/content/compound-verbs/dynamic-compounds.mdx

@@ -8,7 +8,7 @@ import {
     InlinePs,
     RootsAndStems,
     getVerbInfo,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video, Complement, BlockTerm, BlocksIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/compound-verbs/helper-verbs.mdx

@@ -8,7 +8,7 @@ import {
     InlinePs,
     RootsAndStems,
     getVerbInfo,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video, Complement, BlocksIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/compound-verbs/intro.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/compound-verbs/more-on-compounds.mdx

@@ -8,7 +8,7 @@ import {
     InlinePs,
     RootsAndStems,
     getVerbInfo,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video, Complement, BlockTerm, BlocksIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/compound-verbs/stative-compounds.mdx

@@ -9,7 +9,7 @@ import {
     RootsAndStems,
     getVerbInfo,
     conjugateVerb,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video, Complement, BlockTerm, BlocksIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/equatives/habitual-equative.mdx

@@ -9,7 +9,7 @@ import {
     Examples,
     concatPsString,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Markdown from "markdown-to-jsx";
 import EquativeFormChoice from "../../components/EquativeFormChoice";

src/content/equatives/other-equatives.mdx

@@ -22,7 +22,7 @@ import {
     concatPsString,
     InlinePs,
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import EquativeFormChoice from "../../components/EquativeFormChoice";
 import Formula from "../../components/formula/Formula";

src/content/equatives/present-equative.mdx

@@ -24,7 +24,7 @@ import {
     ButtonSelect,
     addToForm,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import {
     equativeGamePresent,
 } from "../../games/games";

src/content/inflection/inflection-intro.mdx

@@ -17,7 +17,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Carousel from "../../components/Carousel";
 import Table from "../../components/Table";
 import InlineInflectionButton from "../../components/InlineInflectionButton";

src/content/inflection/inflection-patterns.mdx

@@ -22,7 +22,7 @@ import {
     InflectionsTable,
     inflectWord,
     typePredicates as tp,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import InflectionCarousel from "../../components/InflectionCarousel";
 import { nouns, adjectives } from "../../words/words";
 import { startingWord } from "../../lib/starting-word";

src/content/nouns/arabic-plurals.mdx

@@ -6,7 +6,7 @@ import {
     Examples,
     InlinePs,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Table from "../../components/Table";
 
 export function ArabicPluralTable({ children }) {

src/content/nouns/bundled-plurals.mdx

@@ -6,7 +6,7 @@ import {
     Examples,
     InlinePs,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Table from "../../components/Table";
 import penBundle from "../../images/pen-bundle.jpg";
 

src/content/nouns/nouns-gender.mdx

@@ -7,7 +7,7 @@ import {
     InlinePs,
     Examples,
     firstVariation,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import genderColors from "../../lib/gender-colors";
 import GenderTable from "../../components/GenderTable";
 import Link from "../../components/Link";

src/content/nouns/nouns-plural.mdx

@@ -6,7 +6,7 @@ import {
     Examples,
     InlinePs,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Table from "../../components/Table";
 import Link from "../../components/Link";
 

src/content/nouns/nouns-unisex.mdx

@@ -6,7 +6,7 @@ import {
     Examples,
     InlinePs,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Table from "../../components/Table";
 import Link from "../../components/Link";
 import GenderTable from "../../components/GenderTable";

src/content/participles/intro.mdx

@@ -5,7 +5,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Link from "../../components/Link";
 import participleMeme from "./participle-meme.jpg";
 import psmd from "../../lib/psmd";

src/content/phrase-structure/ap.mdx

@@ -7,7 +7,7 @@ import {
     InlinePs,
     Examples,
     makeNounSelection,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EditableBlock, {

src/content/phrase-structure/blocks-and-kids.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     InlinePs,
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EditableBlock, {

src/content/phrase-structure/complement.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     InlinePs,
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import { NP, VP, EP, BlocksIcon, Sandwich } from "../../components/terms-links";

src/content/phrase-structure/ep.mdx

@@ -7,7 +7,7 @@ import {
     InlinePs,
     Examples,
     makeNounSelection,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EquativeIllustration from "../../components/EquativeIllustration";

src/content/phrase-structure/np.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     InlinePs,
     Examples,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EditableBlock, {

src/content/phrase-structure/shortening-vps.mdx

@@ -8,7 +8,7 @@ import {
     Examples,
     makeNounSelection,
     role
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EquativeIllustration from "../../components/EquativeIllustration";

src/content/phrase-structure/vp.mdx

@@ -8,7 +8,7 @@ import {
     Examples,
     makeNounSelection,
     role
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import EquativeIllustration from "../../components/EquativeIllustration";

src/content/practice-tools/pronoun-picker.mdx

@@ -10,7 +10,7 @@ import {
     randomPerson,
     randomSubjObj,
     isInvalidSubjObjCombo,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { useState } from "react";
 
 export function RPicker() {

src/content/pronouns/pronouns-basic.mdx

@@ -19,7 +19,7 @@ import {
     grammarUnits,
     VerbTable,
     ButtonSelect,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 export function PronounInflectionChoice({ pronouns, far }) {
     const [choice, setChoice] = React.useState("plain");

src/content/pronouns/pronouns-directional.mdx

@@ -19,7 +19,7 @@ import {
     VerbTable,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 

src/content/pronouns/pronouns-mini.mdx

@@ -19,7 +19,7 @@ import {
     VerbTable,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import bigAndLittleBrother from "../../images/big-and-little-brother.jpg";
 import Link from "../../components/Link";

src/content/sandwiches/sandwiches.mdx

@@ -6,7 +6,7 @@ import Link from "../../components/Link";
 import {
     Examples,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import sandwiches from "./sandwiches";
 
 ## What are Sandwiches?

src/content/sandwiches/sandwiches.tsx

@@ -1,6 +1,6 @@
 import {
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 type SandwichInfo = {
     pre?: T.PsString,

src/content/verbs/ability.mdx

@@ -11,7 +11,7 @@ import {
     getVerbInfo,
     getAbilityRootsAndStems,
     removeFVarients,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, Camera, Video, BlocksIcon } from "../../components/terms-links";
 import Carousel from "../../components/Carousel";
 import psmd from "../../lib/psmd";

src/content/verbs/all-perfect-verbs.mdx

@@ -8,7 +8,7 @@ import {
     InlinePs,
     Pashto,
     Phonetics,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, EP, Camera, Video, KingIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/basic-present-verbs.ts

@@ -1,6 +1,6 @@
 import {
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { wordQuery } from "../../words/words";
 
 export const basicVerbs: T.VerbEntry[] = wordQuery("verbs", [

src/content/verbs/future-verbs.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import cousins from "./cousins.png";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/imperative-verbs.mdx

@@ -7,7 +7,7 @@ import {
     Examples,
     InlinePs,
     removeFVarients,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Carousel from "../../components/Carousel";
 import Link from "../../components/Link";

src/content/verbs/negative.mdx

@@ -10,7 +10,7 @@ import {
     RootsAndStems,
     getVerbInfo,
     removeFVarients,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Link from "../../components/Link";
 import { BlockTerm, KidsSection, PerfectiveHead, VP } from "../../components/terms-links.tsx";
 import psmd from "../../lib/psmd";

src/content/verbs/passive-voice.mdx

@@ -10,7 +10,7 @@ import {
     conjugateVerb,
     getVerbInfo,
     getPassiveRootsAndStems,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon, Camera, Video } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/past-verbs.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, KingIcon, ServantIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/perfect-verbs-intro.mdx

@@ -8,7 +8,7 @@ import {
     InlinePs,
     Pashto,
     Phonetics,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { KidsSection, VP, EP, Camera, Video, KingIcon } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/present-verbs.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import Formula from "../../components/formula/Formula";

src/content/verbs/roots-and-stems.mdx

@@ -22,7 +22,7 @@ import {
     RootsAndStems,
     getVerbInfo,
     removeFVarients,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import shuffle from "../../lib/shuffle-array";
 import Carousel from "../../components/Carousel";
 import { verbs as verbsRaw } from "../../words/words";

src/content/verbs/subjunctive-verbs.mdx

@@ -7,7 +7,7 @@ import {
     Examples,
     InlinePs,
     removeFVarients,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import cousins from "./cousins.png";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";

src/content/verbs/verb-aspect.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import imperfectiveTimeline from "./imperfective-time.svg";
 import perfectiveTimeline from "./perfective-time.svg";

src/content/verbs/verb-endings.mdx

@@ -20,7 +20,7 @@ import {
     grammarUnits,
     VerbFormDisplay,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import Link from "../../components/Link";
 
 export function addTail(form) {

src/content/writing/diacritics.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 

src/content/writing/the-five-yeys.mdx

@@ -6,7 +6,7 @@ import {
     defaultTextOptions as opts,
     Examples,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 

src/content/writing/typing-issues.mdx

@@ -5,7 +5,7 @@ title: Typing Issues ⌨
 import {
     defaultTextOptions as opts,
     InlinePs,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 ## Finding a good keyboard 📱
 

src/games/GameCore.tsx

@@ -18,7 +18,7 @@ import {
 import {
     randFromArray,
     Types,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import ReactGA from "react-ga";
 import { isProd } from "../lib/isProd";
 import autoAnimate from "@formkit/auto-animate";

src/games/sub-cores/EquativeGame.tsx

@@ -12,7 +12,7 @@ import {
     flattenLengths,
     InlinePs,
     grammarUnits,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { randomEPSPool } from "./makeRandomEPS";
 
 const kidsColor = "#017BFE";

src/games/sub-cores/EquativeIdentify.tsx

@@ -6,8 +6,8 @@ import {
     randFromArray,
     renderEP,
     compileEP,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
-import { psStringEquals } from "@lingdocs/pashto-inflector/dist/lib/p-text-helpers";
+import { psStringEquals } from "@lingdocs/ps-react";
 import { randomEPSPool } from "./makeRandomEPS";
 import { useEffect, useState } from "react";
 import classNames from "classnames";

src/games/sub-cores/EquativeSituations.tsx

@@ -2,7 +2,7 @@ import GameCore from "../GameCore";
 import {
     humanReadableEquativeTense,
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 
 const tenses: T.EquativeTense[] = [

src/games/sub-cores/GenderGame.tsx

@@ -11,7 +11,7 @@ import {
     typePredicates as tp,
     firstVariation,
     randFromArray,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { nouns } from "../../words/words";
 import { categorize } from "../../lib/categorize";
 

src/games/sub-cores/InflectionPatterns.tsx

@@ -5,10 +5,10 @@ import {
     Examples,
     defaultTextOptions as opts,
     firstVariation,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 import { nouns, adjectives } from "../../words/words";
-import * as tp from "@lingdocs/pashto-inflector/dist/lib/type-predicates";
+import * as tp from "@lingdocs/ps-react/dist/lib/src/type-predicates";
 
 const amount = 20;
 const timeLimit = 150;

src/games/sub-cores/InflectionsWriting.tsx

@@ -6,13 +6,13 @@ import {
     defaultTextOptions as opts,
     firstVariation,
     inflectWord,
-    humanReadableInflectionPattern,
+    HumanReadableInflectionPattern,
     isUnisexSet,
     InflectionsTable,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 import { nouns, adjectives } from "../../words/words";
-import { isAdverbEntry } from "@lingdocs/pashto-inflector/dist/lib/type-predicates";
+import { isAdverbEntry } from "@lingdocs/ps-react/dist/lib/src/type-predicates";
 import { ChangeEvent, FormEvent, useEffect, useRef, useState } from "react";
 import { comparePs } from "../../lib/game-utils";
 
@@ -85,7 +85,7 @@ export default function InflectionsWriting({ inChapter, id, link, level }: {
     
     function Instructions() {
         return <div>
-            <p className="lead">Complete the inflections for the <strong>{humanReadableInflectionPattern(level, opts)}</strong> pattern word</p>
+            <p className="lead">Complete the inflections for the <strong>{HumanReadableInflectionPattern(level, opts)}</strong> pattern word</p>
         </div>
     }
 

src/games/sub-cores/UnisexNounGame.tsx

@@ -12,7 +12,7 @@ import {
     firstVariation,
     typePredicates as tp,
     randFromArray,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { nouns } from "../../words/words";
 import { intoPatterns } from "../../lib/categorize";
 

src/games/sub-cores/VerbFormulas.tsx

@@ -5,11 +5,11 @@ import {
     InlinePs,
     grammarUnits,
     defaultTextOptions as opts,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 import { CSSProperties, useEffect, useState } from "react";
 import classNames from "classnames";
-import { isImperativeTense } from "@lingdocs/pashto-inflector/dist/lib/type-predicates";
+import { isImperativeTense } from "@lingdocs/ps-react/dist/lib/src/type-predicates";
 
 const amount = 12;
 const timeLimit = 125;

src/games/sub-cores/VerbGame.tsx

@@ -27,15 +27,15 @@ import {
     blank,
     kidsBlank,
     isPashtoScript,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
-import { isPastTense, isThirdPerson } from "@lingdocs/pashto-inflector/dist/lib/phrase-building/vp-tools";
+import { isPastTense, isThirdPerson } from "@lingdocs/ps-react";
 import { maybeShuffleArray } from "../../lib/shuffle-array";
-import { getVerbFromBlocks } from "@lingdocs/pashto-inflector/dist/lib/phrase-building/blocks-utils";
+import { getVerbFromBlocks } from "@lingdocs/ps-react/dist/lib/src/phrase-building/blocks-utils";
-import { baParticle } from "@lingdocs/pashto-inflector/dist/lib/grammar-units";
+import { baParticle } from "@lingdocs/ps-react/dist/lib/src/grammar-units";
 import { intransitivePastVerbs } from "../../content/verbs/basic-present-verbs";
 import { makePool } from "../../lib/pool";
 import { wordQuery } from "../../words/words";
-import { isImperativeTense } from "@lingdocs/pashto-inflector/dist/lib/type-predicates";
+import { isImperativeTense } from "@lingdocs/ps-react/dist/lib/src/type-predicates";
 
 const kidsColor = "#017BFE";
 

src/games/sub-cores/VerbSituations.tsx

@@ -2,7 +2,7 @@ import GameCore from "../GameCore";
 import {
     humanReadableVerbForm,
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 
 const tenses: T.VerbTense[] = [

src/games/sub-cores/makeRandomEPS.ts

@@ -3,7 +3,7 @@ import {
     typePredicates as tp,
     makeNounSelection,
     randFromArray,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { makePool } from "../../lib/pool";
 import { wordQuery } from "../../words/words";
 

src/lib/categorize.ts

@@ -3,7 +3,7 @@ import {
   // super weird, need to es-lint disable this this
   // eslint-disable-next-line
   Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 const {
   isPattern1Entry,
   isPattern2Entry,

src/lib/english-pronoun-tools.ts

@@ -1,4 +1,4 @@
-import { Types as T } from "@lingdocs/pashto-inflector";
+import { Types as T } from "@lingdocs/ps-react";
 
 const englishPronouns = {
     subject: [

src/lib/entry-feeder.ts

@@ -1,4 +1,4 @@
-import { Types as T } from "@lingdocs/pashto-inflector";
+import { Types as T } from "@lingdocs/ps-react";
 import {
     nouns,
     verbs,

src/lib/game-utils.ts

@@ -5,7 +5,7 @@ import {
     standardizePashto,
     standardizePhonetics,
     flattenLengths,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { removeAShort } from "./misc-helpers";
 
 export function getPercentageDone(current: number, total: number): number {

src/lib/oldtestsuite.txt

@@ -8,7 +8,7 @@ import {
 } from "./equative-machine";
 import {
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 // INPUTS
 // Person (pronoun) - subject only

src/lib/pool.tsx

@@ -1,4 +1,4 @@
-import { randFromArray } from "@lingdocs/pashto-inflector";
+import { randFromArray } from "@lingdocs/ps-react";
 import equal from "fast-deep-equal";
 
 /**

src/lib/shuffle-array.ts

@@ -1,6 +1,6 @@
 // https://stackoverflow.com/a/2450976
 
-import { randFromArray } from "@lingdocs/pashto-inflector";
+import { randFromArray } from "@lingdocs/ps-react";
 
 function shuffleArray<T>(arr: Readonly<Array<T>>): Array<T> {
     let currentIndex = arr.length, temporaryValue, randomIndex;

src/lib/starting-word.ts

@@ -1,7 +1,7 @@
 import shuffle from "./shuffle-array";
 import {
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 
 export const startingWord = (words: Readonly<(T.NounEntry | T.AdjectiveEntry)[]>, p: string) => {
     const firstWord = words.find(w => w.p === p);

src/types/gramm-types.d.ts

@@ -1,6 +1,6 @@
 type Pronoun = {
     type: "pronoun",
     pronounType: "near" | "far",
-    person: import("@lingdocs/pashto-inflector").Types.Person,
+    person: import("@lingdocs/ps-react").Types.Person,
 };
 

src/user-context.tsx

@@ -6,7 +6,7 @@ import {
 } from "@lingdocs/lingdocs-main";
 import {
   useStickyState,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { CronJob } from "cron";
 import { postSavedResults } from "./lib/game-results";
 

src/words/words.ts

@@ -4,7 +4,7 @@ import {
     removeFVarients,
     typePredicates as tp,
     Types as T,
-} from "@lingdocs/pashto-inflector";
+} from "@lingdocs/ps-react";
 import { categorize } from "../lib/categorize";
 import { removeAShort } from "../lib/misc-helpers";
 

yarn.lock

@@ -338,6 +338,13 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-module-imports@^7.16.7":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.13", "@babel/helper-module-transforms@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz#7c75b987d6dfd5b48e575648f81eaac891539509"
@@ -370,6 +377,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb"
   integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==
 
+"@babel/helper-plugin-utils@^7.18.6":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+
 "@babel/helper-remap-async-to-generator@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz#170365f4140e2d20e5c88f8ba23c24468c296878"
@@ -417,6 +429,11 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
+"@babel/helper-string-parser@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+
 "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
@@ -427,6 +444,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
+"@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
@@ -723,6 +745,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-jsx@^7.17.12":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
+  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -1331,6 +1360,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.18.3":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
+  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.10.4", "@babel/template@^7.12.13", "@babel/template@^7.3.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
@@ -1396,6 +1432,15 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.18.6":
+  version "7.19.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
+  integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1419,6 +1464,35 @@
   resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18"
   integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
 
+"@emotion/babel-plugin@^11.10.0":
+  version "11.10.2"
+  resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz#879db80ba622b3f6076917a1e6f648b1c7d008c7"
+  integrity sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/plugin-syntax-jsx" "^7.17.12"
+    "@babel/runtime" "^7.18.3"
+    "@emotion/hash" "^0.9.0"
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/serialize" "^1.1.0"
+    babel-plugin-macros "^3.1.0"
+    convert-source-map "^1.5.0"
+    escape-string-regexp "^4.0.0"
+    find-root "^1.1.0"
+    source-map "^0.5.7"
+    stylis "4.0.13"
+
+"@emotion/cache@^11.10.0":
+  version "11.10.3"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.3.tgz#c4f67904fad10c945fea5165c3a5a0583c164b87"
+  integrity sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==
+  dependencies:
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/sheet" "^1.2.0"
+    "@emotion/utils" "^1.2.0"
+    "@emotion/weak-memoize" "^0.3.0"
+    stylis "4.0.13"
+
 "@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0":
   version "11.5.0"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62"
@@ -1435,6 +1509,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
+"@emotion/hash@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7"
+  integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==
+
 "@emotion/is-prop-valid@^0.7.3":
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc"
@@ -1452,6 +1531,11 @@
   resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50"
   integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==
 
+"@emotion/memoize@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
+  integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==
+
 "@emotion/react@^11.1.1":
   version "11.5.0"
   resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.5.0.tgz#19b5771bbfbda5e8517e948a2d9064810f0022bd"
@@ -1465,6 +1549,20 @@
     "@emotion/weak-memoize" "^0.2.5"
     hoist-non-react-statics "^3.3.1"
 
+"@emotion/react@^11.8.1":
+  version "11.10.4"
+  resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.4.tgz#9dc6bccbda5d70ff68fdb204746c0e8b13a79199"
+  integrity sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    "@emotion/babel-plugin" "^11.10.0"
+    "@emotion/cache" "^11.10.0"
+    "@emotion/serialize" "^1.1.0"
+    "@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
+    "@emotion/utils" "^1.2.0"
+    "@emotion/weak-memoize" "^0.3.0"
+    hoist-non-react-statics "^3.3.1"
+
 "@emotion/serialize@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965"
@@ -1476,26 +1574,62 @@
     "@emotion/utils" "^1.0.0"
     csstype "^3.0.2"
 
+"@emotion/serialize@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.0.tgz#b1f97b1011b09346a40e9796c37a3397b4ea8ea8"
+  integrity sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==
+  dependencies:
+    "@emotion/hash" "^0.9.0"
+    "@emotion/memoize" "^0.8.0"
+    "@emotion/unitless" "^0.8.0"
+    "@emotion/utils" "^1.2.0"
+    csstype "^3.0.2"
+
 "@emotion/sheet@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f"
   integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ==
 
+"@emotion/sheet@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.0.tgz#771b1987855839e214fc1741bde43089397f7be5"
+  integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==
+
 "@emotion/unitless@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
+"@emotion/unitless@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
+  integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==
+
+"@emotion/use-insertion-effect-with-fallbacks@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df"
+  integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==
+
 "@emotion/utils@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af"
   integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==
 
+"@emotion/utils@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
+  integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==
+
 "@emotion/weak-memoize@^0.2.5":
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
   integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
+"@emotion/weak-memoize@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
+  integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
+
 "@eslint/eslintrc@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
@@ -1517,6 +1651,11 @@
   resolved "https://registry.yarnpkg.com/@formkit/auto-animate/-/auto-animate-1.0.0-beta.1.tgz#aec5fd2ea5e499ceb7eb117c7fd1217a7f100748"
   integrity sha512-I3OWOBaPZKSJL4bsooXI8kC3q7bcgibD2oML0P/Lir6MnbvUe/0/7EH8br024juvM/Ulm9C9xGx9CJUQYrOWSA==
 
+"@formkit/auto-animate@^1.0.0-beta.3":
+  version "1.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@formkit/auto-animate/-/auto-animate-1.0.0-beta.3.tgz#d5eb724ccb44afba9348df32ce0b8bb10037a7ee"
+  integrity sha512-glsi+ytwQpxT/Ctr9GtcIfVr4dO6mJ04mQbNU8MFSdCdqMopHtyfU5Fib0+9lNFIeR0luY4/0NW95/2R5pKsag==
+
 "@fortawesome/fontawesome-free@^5.15.4":
   version "5.15.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
@@ -1804,18 +1943,18 @@
     rambda "^6.7.0"
     react-select "^5.2.2"
 
-"@lingdocs/pashto-inflector@^4.0.3":
+"@lingdocs/ps-react@^5.1.1":
-  version "4.0.3"
+  version "5.1.1"
-  resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.3.tgz#606a551bdb60e1fe836d41f0204dec8b372b97e5"
+  resolved "https://npm.lingdocs.com/@lingdocs%2fps-react/-/ps-react-5.1.1.tgz#b3dbaf630e85458029962bd20241b53d32f9efb8"
-  integrity sha512-YQVyhfAlWj3QLEZnYtkLhCUFsnDh1V+Vt9dagp335M4xQV5ke3DJp7b2LSxoIOmSbeflTXC6UPHUgAZ9Xb9KKA==
+  integrity sha512-Ng3TCyv/kN389GiWx69d3iv7D4l6zjYNz6DDwKRDJddq8C+J6qlfqnIe+iEMu8qJ1hlcVNKxJ/sNTeCIK8CFog==
   dependencies:
-    "@formkit/auto-animate" "^1.0.0-beta.1"
+    "@formkit/auto-animate" "^1.0.0-beta.3"
     classnames "^2.2.6"
     jsurl2 "^2.1.0"
     lz-string "^1.4.4"
     pbf "^3.2.1"
-    rambda "^6.7.0"
+    rambda "^7.3.0"
-    react-select "^5.2.2"
+    react-select "^5.4.0"
 
 "@mdx-js/mdx@^0.15.5":
   version "0.15.7"
@@ -3269,6 +3408,15 @@ babel-plugin-macros@2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
+babel-plugin-macros@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
+
 babel-plugin-named-asset-import@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"
@@ -4224,6 +4372,13 @@ convert-source-map@^0.3.3:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
   integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
 
+convert-source-map@^1.5.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -5213,6 +5368,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.14.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -5783,6 +5943,11 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
+find-root@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
 find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -6848,6 +7013,13 @@ is-core-module@^2.0.0, is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -9256,6 +9428,11 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -10350,6 +10527,11 @@ rambda@^6.7.0:
   resolved "https://registry.yarnpkg.com/rambda/-/rambda-6.9.0.tgz#17cd0b0c427295e00e8fe12de5bd63884502a9a4"
   integrity sha512-yosVdGg1hNGkXPzqGiOYNEpXKjEOxzUCg2rB0l+NKdyCaSf4z+i5ojbN0IqDSezMMf71YEglI+ZUTgTffn5afw==
 
+rambda@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.3.0.tgz#90e440ead53030a216093865d8d97997a80868ca"
+  integrity sha512-RFVofZYaG2TaVcxjnM0ejdVWf/59rFq1f57OGnjP3GT/bthzFw0GVr5rkP9PKbVlEuF/Y7bOVPLfiiYfxq/EWQ==
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -10706,6 +10888,19 @@ react-select@^5.2.2:
     prop-types "^15.6.0"
     react-transition-group "^4.3.0"
 
+react-select@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.4.0.tgz#81f6ac73906126706f104751ee14437bd16798f4"
+  integrity sha512-CjE9RFLUvChd5SdlfG4vqxZd55AZJRrLrHzkQyTYeHlpOztqcgnyftYAolJ0SGsBev6zAs6qFrjm6KU3eo2hzg==
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+    "@emotion/cache" "^11.4.0"
+    "@emotion/react" "^11.8.1"
+    "@types/react-transition-group" "^4.4.0"
+    memoize-one "^5.0.0"
+    prop-types "^15.6.0"
+    react-transition-group "^4.3.0"
+
 react-smooth-collapse@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/react-smooth-collapse/-/react-smooth-collapse-2.1.0.tgz#64be7af94b61d6d203d9a09af0fba671f9b5983c"
@@ -11191,6 +11386,15 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.1
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@^1.19.0:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -11753,10 +11957,10 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
@@ -12137,6 +12341,11 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
+stylis@4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"
+  integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==
+
 stylis@^4.0.10:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"
@@ -12176,6 +12385,11 @@ supports-hyperlinks@^2.0.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 svg-parser@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"