package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "pashto-inflector",
-  "version": "7.3.1",
+  "version": "7.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "pashto-inflector",
-      "version": "7.3.1",
+      "version": "7.2.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pashto-inflector",
-  "version": "7.3.1",
+  "version": "7.2.2",
   "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/App.tsx

@@ -20,7 +20,7 @@ import Hider from "./components/src/Hider";
 import InflectionDemo from "./demo-components/InflectionDemo";
 import SpellingDemo from "./demo-components/SpellingDemo";
 import ParserDemo from "./demo-components/ParserDemo";
-// import InflectionTable from "./components/src/InflectionsTable";
+import InflectionTable from "./components/src/InflectionsTable";
 
 function App() {
   const [showingTextOptions, setShowingTextOptions] = useStickyState<boolean>(

src/components/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@lingdocs/ps-react",
-  "version": "7.3.1",
+  "version": "7.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@lingdocs/ps-react",
-      "version": "7.3.1",
+      "version": "7.2.2",
       "license": "MIT",
       "dependencies": {
         "@formkit/auto-animate": "^1.0.0-beta.3",

src/components/package.json

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

src/components/src/blocks/Block.tsx

@@ -600,27 +600,6 @@ function Sandwich({
   );
 }
 
-function Demonstrative({
-  opts,
-  script,
-  children,
-}: {
-  opts: T.TextOptions;
-  script: "p" | "f";
-  children: T.Rendered<T.DemonstrativeSelection> | undefined;
-}) {
-  if (!children) {
-    return null;
-  }
-  return (
-    <div className="text-center">
-      <Border padding={"1rem"}>{children.ps[script]}</Border>
-      <div>DEM</div>
-      <SubText>{children.e}</SubText>
-    </div>
-  );
-}
-
 function CompNounBlock({
   opts,
   noun,
@@ -633,7 +612,7 @@ function CompNounBlock({
   return (
     <div className="text-center">
       <Border
-        // extraClassName={`${!inside && hasPossesor} ? "pt-2" : ""`}
+        extraClassName={`!inside && hasPossesor ? "pt-2" : ""`}
         padding={"1rem"}
       >
         {flattenLengths(noun.ps)[0][script]}
@@ -673,9 +652,6 @@ export function NPBlock({
           </Possesors>,
         ]
       : []),
-    <Demonstrative opts={opts} script={script}>
-      {np.selection.demonstrative ? np.selection.demonstrative : undefined}
-    </Demonstrative>,
     <Adjectives opts={opts} script={script}>
       {np.selection.adjectives}
     </Adjectives>,
@@ -683,15 +659,12 @@ export function NPBlock({
       {" "}
       {flattenLengths(np.selection.ps)[0][script]}
     </div>,
-  ].filter((x) => {
+  ];
-    // @ts-ignore
-    return x !== " ";
-  });
   const el = script === "p" ? elements.reverse() : elements;
   return (
     <div className="text-center">
       <Border
-        // extraClassName={`!inside && hasPossesor ? "pt-2" : ""`}
+        extraClassName={`!inside && hasPossesor ? "pt-2" : ""`}
         padding={
           inside
             ? "0.3rem"
@@ -786,9 +759,6 @@ function Adjectives({
     return null;
   }
   const c = script === "p" ? children.reverse() : children;
-  if (c.length === 0) {
-    return null;
-  }
   return (
     <em className="mr-1">
       {c.map((a) => a.ps[0][script]).join(" ")}

src/components/src/np-picker/AdjectiveManager.tsx

@@ -1,21 +1,27 @@
 import * as T from "../../../types";
 import { useState } from "react";
 import AdjectivePicker from "./AdjectivePicker";
+import classNames from "classnames";
 
 function AdjectiveManager(props: {
-  adjectives: T.AdjectiveSelection[];
+    adjectives: T.AdjectiveSelection[],
-  entryFeeder: T.EntryFeeder;
+    entryFeeder: T.EntryFeeder,
-  opts: T.TextOptions;
+    opts: T.TextOptions,
-  onChange: (adjs: T.AdjectiveSelection[]) => void;
+    demonstrative: T.NounSelection["demonstrative"],
-  phraseIsComplete: boolean;
+    onChange: (adjs: T.AdjectiveSelection[]) => void,
+    onDemonstrativeChange: (dem: T.NounSelection["demonstrative"]) => void,
+    phraseIsComplete: boolean,
 }) {
     const [adding, setAdding] = useState<boolean>(false);
+    const [addingDemonstrative, setAddingDemonstrative] = useState<boolean>(false);
     function handleChange(i: number) {
         return (a: T.AdjectiveSelection | undefined) => {
             if (a === undefined) return;
             const updated = [...props.adjectives];
             updated[i] = a;
-      props.onChange(updated.filter((x): x is T.AdjectiveSelection => !!x));
+            props.onChange(
+                updated.filter((x): x is T.AdjectiveSelection => !!x)
+            );
         };
     }
     function deleteAdj(i: number) {
@@ -26,15 +32,16 @@ function AdjectiveManager(props: {
     function handleAddNew(a: T.AdjectiveSelection | undefined) {
         if (a === undefined) return;
         setAdding(false);
-    props.onChange([a, ...props.adjectives]);
+        props.onChange([
+            a,
+            ...props.adjectives,
+        ]);
     }
     // const flippedList = [...props.adjectives];
     // flippedList.reverse();
     // console.log(props.adjectives);
-  return (
+    return <div className="mb-1">
-    <div className="mb-1">
+        {adding && <div>
-      {adding && (
-        <div>
             <div className="d-flex flex-row justify-content-between mb-1">
                 <div>Add Adjective</div>
                 <div className="clickable" onClick={() => setAdding(false)}>
@@ -49,21 +56,29 @@ function AdjectiveManager(props: {
                 opts={props.opts}
                 onChange={handleAddNew}
             />
+        </div>}
+        {addingDemonstrative && <div>
+            <div className="d-flex flex-row justify-content-between mb-1">
+                <div>Add Demonstrative</div>
+                <div className="clickable" onClick={() => {
+                    setAddingDemonstrative(false);
+                    props.onDemonstrativeChange(undefined);
+                }}>
+                    <i className="fas fa-trash" />
                 </div>
-      )}
+            </div>
-
+            <DemonstrativePicker
-      {props.adjectives.map((adj, i) => (
+                demonstrative={props.demonstrative}
-        <div key={i}>
+                onChange={props.onDemonstrativeChange}
+            />
+        </div>}
+        {props.adjectives.map((adj, i) => <div key={i}>
             <div className="d-flex flex-row justify-content-between">
                 <div>Adjective</div>
                 <div className="d-flex flex-row align-items-baseline">
-              {!!props.adjectives.length && !adding && (
+                    {!!props.adjectives.length && !adding && <div>
-                <div>
+                        <div className="clickable h6" onClick={() => setAdding(true)}>+ Adj.</div>
-                  <div className="clickable h6" onClick={() => setAdding(true)}>
+                    </div>}
-                    + Adj.
-                  </div>
-                </div>
-              )}
                     <div onClick={deleteAdj(i)} className="ml-4">
                         <div className="fas fa-trash" />
                     </div>
@@ -78,21 +93,61 @@ function AdjectiveManager(props: {
                 opts={props.opts}
                 onChange={handleChange(i)}
             />
+        </div>)}
+        {!adding && !props.adjectives.length && <div className="h6 clickable" style={{ float: "right" }}>
+            <div className="clickable" onClick={() => setAdding(true)}>+ Adj.</div>
+        </div>}
+        {/* {!addingDemonstrative && !props.demonstrative && <h6 className="clickable mr-2" style={{ float: "right" }}>
+            <div className="clickable" onClick={() => setAddingDemonstrative(true)}>+ Demons.</div>
+        </h6>} */}
+    </div>;
+}
+
+function DemonstrativePicker({ demonstrative, onChange }: {
+    demonstrative: T.NounSelection["demonstrative"],
+    onChange: (dem: T.NounSelection["demonstrative"]) => void,
+}) {
+    function handleDChange(d: "daa" | "hagha" | "dagha") {
+        if (!demonstrative) {
+            onChange({
+                type: "demonstrative",
+                demonstrative: d,
+                hideNoun: false,
+            });
+        } else {
+            onChange({
+                ...demonstrative,
+                demonstrative: d,
+            });
+        }
+    }
+    return <div className="d-flex flex-row justify-content-around py-1">
+        <div>
+            <button
+                className={classNames("btn", "btn-outline-secondary", { active: demonstrative?.demonstrative === "daa" })}
+                onClick={() => handleDChange("daa")}
+            >دا</button>
         </div>
-      ))}
+        <div>
-      {!adding && !props.adjectives.length && (
+            <button
-        <div className="h6 clickable" style={{ float: "right" }}>
+                className={classNames("btn", "btn-outline-secondary", { active: demonstrative?.demonstrative === "hagha" })}
-          <div className="clickable" onClick={() => setAdding(true)}>
+                onClick={() => handleDChange("hagha")}
-            + Adj.
+            >هغه</button>
         </div>
+        <div>
+            <button
+                className={classNames("btn", "btn-outline-secondary", { active: demonstrative?.demonstrative === "dagha" })}
+                onClick={() => handleDChange("dagha")}
+            >دغه</button>
         </div>
-      )}
+    </div>;
-    </div>
-  );
 }
 
 function remove<X>(arr: X[], i: number): X[] {
-  return [...arr.slice(0, i), ...arr.slice(i + 1)];
+    return [
+        ...arr.slice(0, i),
+        ...arr.slice(i + 1),
+    ];
 }
 
 export default AdjectiveManager;

src/components/src/np-picker/DemonstrativePicker.tsx

@@ -1,59 +0,0 @@
-import * as T from "../../../types";
-import classNames from "classnames";
-
-export default function DemonstrativePicker({
-  demonstrative,
-  onChange,
-}: {
-  demonstrative: T.NounSelection["demonstrative"];
-  onChange: (dem: T.NounSelection["demonstrative"]) => void;
-}) {
-  function handleDChange(d: "daa" | "hagha" | "dagha") {
-    if (!demonstrative) {
-      onChange({
-        type: "demonstrative",
-        demonstrative: d,
-        hideNoun: false,
-      });
-    } else {
-      onChange({
-        ...demonstrative,
-        demonstrative: d,
-      });
-    }
-  }
-  return (
-    <div className="d-flex flex-row justify-content-around py-1">
-      <div>
-        <button
-          className={classNames("btn", "btn-outline-secondary", {
-            active: demonstrative?.demonstrative === "daa",
-          })}
-          onClick={() => handleDChange("daa")}
-        >
-          دا
-        </button>
-      </div>
-      <div>
-        <button
-          className={classNames("btn", "btn-outline-secondary", {
-            active: demonstrative?.demonstrative === "dagha",
-          })}
-          onClick={() => handleDChange("dagha")}
-        >
-          دغه
-        </button>
-      </div>
-      <div>
-        <button
-          className={classNames("btn", "btn-outline-secondary", {
-            active: demonstrative?.demonstrative === "hagha",
-          })}
-          onClick={() => handleDChange("hagha")}
-        >
-          هغه
-        </button>
-      </div>
-    </div>
-  );
-}

src/components/src/np-picker/NPNounPicker.tsx

@@ -6,8 +6,6 @@ import InlinePs from "../InlinePs";
 // import { isFemNounEntry, isPattern1Entry, isPattern2Entry, isPattern3Entry, isPattern4Entry, isPattern5Entry, isPattern6FemEntry } from "../../lib/type-predicates";
 import EntrySelect from "../EntrySelect";
 import AdjectiveManager from "./AdjectiveManager";
-import { useState } from "react";
-import DemonstrativePicker from "./DemonstrativePicker";
 
 // const filterOptions = [
 //     {
@@ -63,8 +61,6 @@ function NPNounPicker(props: {
   opts: T.TextOptions;
   phraseIsComplete: boolean;
 }) {
-  const [addingDemonstrative, setAddingDemonstrative] =
-    useState<boolean>(false);
   // const [patternFilter, setPatternFilter] = useState<FilterPattern | undefined>(undefined);
   // const [showFilter, setShowFilter] = useState<boolean>(false)
   // const nounsFiltered = props.nouns
@@ -88,7 +84,7 @@ function NPNounPicker(props: {
       });
     }
   }
-  function handleDemonstrativeChange(
+  function handleDemonstrativeUpdate(
     demonstrative: undefined | T.NounSelection["demonstrative"]
   ) {
     if (props.noun) {
@@ -100,36 +96,6 @@ function NPNounPicker(props: {
   }
   return (
     <div style={{ maxWidth: "225px", minWidth: "125px" }}>
-      {!addingDemonstrative && !props.noun?.demonstrative ? (
-        <div>
-          <span
-            className="clickable text-muted"
-            onClick={() => setAddingDemonstrative(true)}
-          >
-            + Demonstrative
-          </span>
-        </div>
-      ) : (
-        <div>
-          <div className="d-flex flex-row justify-content-between mb-1">
-            <div>{!props.noun?.demonstrative ? "Add" : ""} Demonstrative</div>
-            <div
-              className="clickable"
-              onClick={() => {
-                handleDemonstrativeChange(undefined);
-                setAddingDemonstrative(false);
-              }}
-            >
-              <i className="fas fa-trash" />
-            </div>
-          </div>
-          <DemonstrativePicker
-            demonstrative={props.noun?.demonstrative}
-            onChange={handleDemonstrativeChange}
-          />
-        </div>
-      )}
-
       {/* {showFilter && <div className="mb-2 text-center">
             <div className="d-flex flex-row justify-content-between">
                 <div className="text-small mb-1">Filter by inflection pattern</div>
@@ -147,9 +113,11 @@ function NPNounPicker(props: {
         <AdjectiveManager
           phraseIsComplete={props.phraseIsComplete}
           adjectives={props.noun?.adjectives}
+          demonstrative={props.noun.demonstrative}
           entryFeeder={props.entryFeeder}
           opts={props.opts}
           onChange={handelAdjectivesUpdate}
+          onDemonstrativeChange={handleDemonstrativeUpdate}
         />
       )}
       <div className="h6">Noun</div>

src/components/src/np-picker/NPPicker.tsx

@@ -1,62 +1,48 @@
 import PronounPicker from "./NPPronounPicker";
 import NounPicker from "./NPNounPicker";
 import ParticiplePicker from "./NPParticiplePicker";
-import { randomPerson } from "../../../lib/src/np-tools";
+import {
+    randomPerson,
+} from "../../../lib/src/np-tools";
 import { useState, useEffect } from "react";
 import * as T from "../../../types";
 import { isSecondPerson } from "../../../lib/src/misc-helpers";
 
 const npTypes: T.NPType[] = ["pronoun", "noun", "participle"];
 
-// TODO: BUG WITH PICKING IMPERATIVE FORMS OUTSIDE OF SECOND PERSON!
-
 export const shrunkenBackground = "rgba(255, 206, 43, 0.15)";
 
 function NPPicker(props: {
-  heading?: JSX.Element | string;
+    heading?: JSX.Element | string,
-  onChange: (nps: T.NPSelection | undefined) => void;
+    onChange: (nps: T.NPSelection | undefined) => void,
-  np: T.NPSelection | undefined;
+    np: T.NPSelection | undefined,
-  counterPart: T.NPSelection | T.VerbObject | undefined;
+    counterPart: T.NPSelection | T.VerbObject | undefined,
-  role: "subject" | "object" | "ergative" | "possesor";
+    role: "subject" | "object" | "ergative" | "possesor",
-  opts: T.TextOptions;
+    opts: T.TextOptions,
-  cantClear?: boolean;
+    cantClear?: boolean,
-  is2ndPersonPicker?: boolean;
+    is2ndPersonPicker?: boolean,
-  entryFeeder: T.EntryFeeder;
+    entryFeeder: T.EntryFeeder,
-  phraseIsComplete: boolean;
+    phraseIsComplete: boolean,
-  isShrunk?: boolean;
+    isShrunk?: boolean,
-  isRemoved?: boolean;
+    isRemoved?: boolean,
 }) {
-  if (
+    if (props.is2ndPersonPicker && ((props.np?.selection.type !== "pronoun") || !isSecondPerson(props.np.selection.person))) {
-    props.is2ndPersonPicker &&
-    (props.np?.selection.type !== "pronoun" ||
-      !isSecondPerson(props.np.selection.person))
-  ) {
         throw new Error("can't use 2ndPerson NPPicker without a pronoun");
     } 
     const [addingPoss, setAddingPoss] = useState<boolean>(false);
-  const [npType, setNpType] = useState<T.NPType | undefined>(
+    const [npType, setNpType] = useState<T.NPType | undefined>(props.np ? props.np.selection.type : undefined);
-    props.np ? props.np.selection.type : undefined
-  );
     const onChange = (np: T.NPSelection | undefined) => {
         props.onChange(ensureSingleShrink(props.np, np));
-    if (
+        if ((np?.selection.type === "noun" || np?.selection.type === "participle") && np.selection.possesor) {
-      (np?.selection.type === "noun" || np?.selection.type === "participle") &&
-      np.selection.possesor
-    ) {
             setAddingPoss(true);
         }
         setAddingPoss(false);
-  };
+    }
     useEffect(() => {
         setNpType(props.np ? props.np.selection.type : undefined);
     }, [props.np]);
     function handleClear() {
-    if (
+        if (props.np && props.np.selection.type === "noun" && props.np.selection.dynamicComplement) return;
-      props.np &&
-      props.np.selection.type === "noun" &&
-      props.np.selection.dynamicComplement
-    )
-      return;
         setNpType(undefined);
         onChange(undefined);
     }
@@ -93,10 +79,7 @@ function NPPicker(props: {
         const isNewPosesser = checkForNewPossesor(p, props.np.selection.possesor);
         const possesor: T.PossesorSelection = {
             np: p,
-      shrunken:
+            shrunken: (!isNewPosesser && props.np.selection.possesor) ? props.np.selection.possesor.shrunken : false,
-        !isNewPosesser && props.np.selection.possesor
-          ? props.np.selection.possesor.shrunken
-          : false,
         };
         onChange({
             type: "NP",
@@ -107,13 +90,7 @@ function NPPicker(props: {
         });
     }
     function handleToggleShrunken() {
-    if (
+        if (!props.np || props.np.selection.type === "pronoun" || !props.np.selection.possesor || !props.phraseIsComplete) return;
-      !props.np ||
-      props.np.selection.type === "pronoun" ||
-      !props.np.selection.possesor ||
-      !props.phraseIsComplete
-    )
-      return;
         onChange({
             type: "NP",
             selection: {
@@ -125,43 +102,31 @@ function NPPicker(props: {
             },
         });
     }
-  const isDynamicComplement =
+    const isDynamicComplement = props.np && props.np.selection.type === "noun" && props.np.selection.dynamicComplement;
-    props.np &&
+    const clearButton = (!props.cantClear && !props.is2ndPersonPicker && !isDynamicComplement) 
-    props.np.selection.type === "noun" &&
+        ? <button className="btn btn-sm btn-light mb-2" onClick={handleClear}>X</button>
-    props.np.selection.dynamicComplement;
+        : <div></div>;
-  const clearButton =
+    const possesiveLabel = props.np?.selection.type === "participle" ? "Subj/Obj" : "Possesor";
-    !props.cantClear && !props.is2ndPersonPicker && !isDynamicComplement ? (
+    return <div style={{
-      <button className="btn btn-sm btn-light mb-2" onClick={handleClear}>
-        X
-      </button>
-    ) : (
-      <div></div>
-    );
-  const possesiveLabel =
-    props.np?.selection.type === "participle" ? "Subj/Obj" : "Possesor";
-  return (
-    <div
-      style={{
         opacity: props.isRemoved ? 0.5 : 1,
-      }}
+    }}>
-    >
         <div className="d-flex flex-row justify-content-between">
             <div></div>
             <div>
-          {typeof props.heading === "string" ? (
+                {typeof props.heading === "string"
-            <div className="h5 text-center">{props.heading}</div>
+                    ? <div className="h5 text-center">{props.heading}</div>
-          ) : (
+                    : props.heading}
-            props.heading
+            </div>
-          )}
+            <div>
+                {npType && clearButton}
             </div>
-        <div>{npType && clearButton}</div>
         </div>
         <div style={{ minWidth: "9rem" }}>
-        {!npType && (
+                {!npType && <div className="text-center">
-          <div className="text-center">
+                    <div className="h6 mr-3">
-            <div className="h6 mr-3">Choose NP</div>
+                        Choose NP
-            {npTypes.map((npt) => (
+                    </div>
-              <div key={npt} className="mb-2">
+                    {npTypes.map((npt) => <div key={npt} className="mb-2">
                         <button
                             key={npt}
                             type="button"
@@ -170,43 +135,22 @@ function NPPicker(props: {
                         >
                             {npt}
                         </button>
-              </div>
+                </div>)}
-            ))}
+            </div>}
-          </div>
+            {(props.np && props.np.selection.type !== "pronoun" && (props.np.selection.possesor || addingPoss)) && <div className="mb-3" style={{
-        )}
-        {props.np &&
-          props.np.selection.type !== "pronoun" &&
-          (props.np.selection.possesor || addingPoss) && (
-            <div
-              className="mb-3"
-              style={{
                 paddingLeft: "0.65rem",
                 borderLeft: "2px solid grey",
-                background:
+                background: (props.np.selection.possesor?.shrunken && !props.isShrunk) ? shrunkenBackground : "inherit",
-                  props.np.selection.possesor?.shrunken && !props.isShrunk
+            }}>
-                    ? shrunkenBackground
-                    : "inherit",
-              }}
-            >
                 <div className="d-flex flex-row text-muted mb-2">
                     <div>{possesiveLabel}:</div>
-                {props.np.selection.possesor &&
+                    {(props.np.selection.possesor && !props.isShrunk && props.phraseIsComplete) && <div className="clickable ml-3 mr-2" onClick={handleToggleShrunken}>
-                  !props.isShrunk &&
-                  props.phraseIsComplete && (
-                    <div
-                      className="clickable ml-3 mr-2"
-                      onClick={handleToggleShrunken}
-                    >
                         {!props.np.selection.possesor.shrunken ? "🪄" : "👶"}
-                    </div>
+                    </div>}
-                  )}
+                    <div className="clickable ml-2" onClick={() => {
-                <div
-                  className="clickable ml-2"
-                  onClick={() => {
                         setAddingPoss(false);
                         handlePossesiveChange(undefined);
-                  }}
+                    }}>
-                >
                         <i className="fas fa-trash" />  
                     </div>
                 </div>
@@ -215,91 +159,54 @@ function NPPicker(props: {
                     onChange={handlePossesiveChange}
                     counterPart={undefined}
                     cantClear
-                np={
+                    np={props.np.selection.possesor ? props.np.selection.possesor.np : undefined}
-                  props.np.selection.possesor
-                    ? props.np.selection.possesor.np
-                    : undefined
-                }
                     role="possesor"
                     opts={props.opts}
                     entryFeeder={props.entryFeeder}
                 />
-            </div>
+            </div>}
-          )}
+            {(npType === "noun" || npType === "participle") && props.np && !addingPoss && <div>
-        {(npType === "noun" || npType === "participle") &&
+                <span className="clickable text-muted" onClick={() => setAddingPoss(true)}>+ {possesiveLabel}</span>
-          props.np &&
+            </div>}
-          !addingPoss && (
+            {(npType === "pronoun" && props.np?.selection.type === "pronoun")
-            <div>
+                ? <PronounPicker
-              <span
-                className="clickable text-muted"
-                onClick={() => setAddingPoss(true)}
-              >
-                + {possesiveLabel}
-              </span>
-            </div>
-          )}
-        {npType === "pronoun" && props.np?.selection.type === "pronoun" ? (
-          <PronounPicker
                     role={props.role}
                     pronoun={props.np.selection}
                     onChange={(p) => onChange({ type: "NP", selection: p })}
                     is2ndPersonPicker={props.is2ndPersonPicker}
                     opts={props.opts}
                 />
-        ) : npType === "noun" ? (
+                : npType === "noun"
-          <NounPicker
+                ? <NounPicker
                     phraseIsComplete={props.phraseIsComplete}
                     entryFeeder={props.entryFeeder}
-            noun={
+                    noun={(props.np && props.np.selection.type === "noun") ? props.np.selection : undefined}
-              props.np && props.np.selection.type === "noun"
+                    onChange={(s) => onChange(s ? { type: "NP", selection: s } : undefined)}
-                ? props.np.selection
-                : undefined
-            }
-            onChange={(s) =>
-              onChange(s ? { type: "NP", selection: s } : undefined)
-            }
                     opts={props.opts}
                 />
-        ) : npType === "participle" ? (
+                : npType === "participle"
-          <ParticiplePicker
+                ? <ParticiplePicker
                     entryFeeder={props.entryFeeder.verbs}
-            participle={
+                    participle={(props.np && props.np.selection.type === "participle") ? props.np.selection : undefined}
-              props.np && props.np.selection.type === "participle"
+                    onChange={(s) => onChange(s ? { type: "NP", selection: s } : undefined)}
-                ? props.np.selection
-                : undefined
-            }
-            onChange={(s) =>
-              onChange(s ? { type: "NP", selection: s } : undefined)
-            }
                     opts={props.opts}
                 />
-        ) : null}
+                : null
+            }
         </div>
-    </div>
+    </div>;
-  );
 }
 
-function ensureSingleShrink(
+function ensureSingleShrink(old: T.NPSelection | undefined, s: T.NPSelection | undefined): T.NPSelection | undefined {
-  old: T.NPSelection | undefined,
-  s: T.NPSelection | undefined
-): T.NPSelection | undefined {
     if (!s) return s;
     function countShrinks(np: T.NPSelection): number {
         if (np.selection.type === "pronoun") return 0;
         if (!np.selection.possesor) return 0;
-    return (
+        return (np.selection.possesor.shrunken ? 1 : 0) + countShrinks(np.selection.possesor.np);
-      (np.selection.possesor.shrunken ? 1 : 0) +
-      countShrinks(np.selection.possesor.np)
-    );
     }
     function keepNewShrink(old: T.NPSelection, n: T.NPSelection): T.NPSelection {
         if (n.selection.type === "pronoun") return n;
-    if (
+        if (old.selection.type === "pronoun" || !n.selection.possesor || !old.selection.possesor) return n;
-      old.selection.type === "pronoun" ||
-      !n.selection.possesor ||
-      !old.selection.possesor
-    )
-      return n;
         if (n.selection.possesor.shrunken && !old.selection.possesor.shrunken) {
             return {
                 type: "NP",
@@ -314,7 +221,7 @@ function ensureSingleShrink(
         }
         return {
             type: "NP",
-      selection: {
+            selection:{
                 ...n.selection,
                 possesor: {
                     shrunken: false,
@@ -345,10 +252,7 @@ function ensureSingleShrink(
     return keepNewShrink(old, s);
 }
 
-function checkForNewPossesor(
+function checkForNewPossesor(n: T.NPSelection | undefined, old: T.PossesorSelection | undefined): boolean {
-  n: T.NPSelection | undefined,
-  old: T.PossesorSelection | undefined
-): boolean {
     if (!old || !n) {
         return true;
     }
@@ -359,10 +263,7 @@ function checkForNewPossesor(
     if (n.selection.type === "noun" && old.np.selection.type === "noun") {
         return n.selection.entry.ts !== old.np.selection.entry.ts;
     }
-  if (
+    if (n.selection.type === "participle" && old.np.selection.type === "participle") {
-    n.selection.type === "participle" &&
-    old.np.selection.type === "participle"
-  ) {
         return n.selection.verb.entry.ts !== old.np.selection.verb.entry.ts;
     }
     return false;

src/demo-components/InflectionDemo.tsx

@@ -81,6 +81,7 @@ function InflectionDemo({ opts }: { opts: T.TextOptions }) {
     const v = e.target.value;
     const value = v === "all" ? v : (Number(v) as T.InflectionPattern);
     setPattern(value);
+    console.log({ word });
     if (word && !tp.isPattern(value)(word)) {
       setWord(undefined);
     }

src/index.js

@@ -1,16 +1,17 @@
-import React from "react";
+import React from 'react';
-import ReactDOM from "react-dom";
+import ReactDOM from 'react-dom';
-import "./index.css";
+import './index.css';
-import App from "./App";
+import App from './App';
-import reportWebVitals from "./reportWebVitals";
+import reportWebVitals from './reportWebVitals';
 import "@fortawesome/fontawesome-free/css/all.css";
-import "bootstrap/dist/css/bootstrap.css";
+import 'bootstrap/dist/css/bootstrap.css';
-import "./App.css";
+import './App.css';
 
 ReactDOM.render(
-  // <React.StrictMode>
+  <React.StrictMode>
-  <App />, // </React.StrictMode>,
+    <App />
-  document.getElementById("root")
+  </React.StrictMode>,
+  document.getElementById('root')
 );
 
 // If you want to start measuring performance in your app, pass a function

src/lib/package.json

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

src/lib/src/inflections-and-vocative.ts

@@ -26,7 +26,7 @@ import {
   isNounEntry,
   isNumberEntry,
 } from "./type-predicates";
-import { semigroupPsString } from "../src/fp-ps";
+import { semigroupPsString } from "../dist/lib/src/fp-ps";
 
 const concatPs = semigroupPsString.concat;
 

src/lib/src/phrase-building/make-selections.ts

@@ -81,6 +81,6 @@ export function makeNounSelection(
     possesor: !complementType ? old?.possesor : undefined,
     dynamicComplement: complementType === "dynamic",
     genStativeComplement: complementType === "generative stative",
-    demonstrative: old?.demonstrative,
+    demonstrative: undefined,
   };
 }

src/lib/src/phrase-building/np-tools.ts

@@ -12,26 +12,19 @@ function getBaseAndAdjectives({
     return getSandwichPsBaseAndAdjectives(selection);
   }
   const adjs = "adjectives" in selection && selection.adjectives;
-  const demons = ("demonstrative" in selection &&
-    selection.demonstrative?.ps) || { p: "", f: "" };
   if (!adjs) {
-    // TODO: does this ever get used??
+    return flattenLengths(selection.ps);
-    return flattenLengths(selection.ps).map((x) => concatPsString(demons, x));
   }
-
   return flattenLengths(selection.ps).map((p) =>
     concatPsString(
-      demons,
-      // demons ? " " : "",
       adjs.reduce(
-        (accum, curr) => {
+        (accum, curr) =>
-          // TODO: with variations of adjs? {
+          // TODO: with variations of adjs?
-          return concatPsString(
+          concatPsString(
             accum,
-            accum.p === "" && accum.f === "" ? "" : "", //" ",
+            accum.p === "" && accum.f === "" ? "" : " ",
             curr.ps[0]
-          );
+          ),
-        },
         { p: "", f: "" }
       ),
       " ",
@@ -206,10 +199,7 @@ function addArticlesAndAdjs(
         ? " (f.)"
         : " (m.)"
       : "";
-    const demonstrative = np.demonstrative ? ` ${np.demonstrative.e}` : "";
+    return `${articles}${adjs}${word}${genderTag}`;
-    return `${
-      np.demonstrative ? "" : articles
-    }${demonstrative}${adjs}${word}${genderTag}`;
   } catch (e) {
     return undefined;
   }

src/lib/src/phrase-building/render-np.ts

@@ -131,61 +131,34 @@ export function renderNounSelection(
     ps: pashto,
     e: english,
     possesor: renderPossesor(n.possesor, role),
-    demonstrative: renderDemonstrative({
+    demonstrative: renderDemonstrative(
-      demonstrative: n.demonstrative,
+      n.demonstrative,
-      inflected,
+      inflected && n.number === "plural"
-      plural: n.number === "plural",
+    ),
-      gender: n.gender,
-    }),
   };
 }
 
-function renderDemonstrative({
+function renderDemonstrative(
-  demonstrative,
+  demonstrative: T.DemonstrativeSelection | undefined,
-  inflected,
+  plurInflected: boolean
-  plural,
+): T.Rendered<T.DemonstrativeSelection> | undefined {
-  gender,
-}: {
-  demonstrative: T.DemonstrativeSelection | undefined;
-  inflected: boolean;
-  plural: boolean;
-  gender: T.Gender;
-}): T.Rendered<T.DemonstrativeSelection> | undefined {
   if (!demonstrative) {
     return undefined;
   }
-  const ps =
+  return {
+    ...demonstrative,
+    ps:
       demonstrative.demonstrative === "daa"
-      ? inflected
+        ? plurInflected
           ? { p: "دې", f: "de" }
           : { p: "دا", f: "daa" }
         : demonstrative.demonstrative === "dagha"
-      ? inflected
+        ? plurInflected
-        ? plural
+          ? { p: "دغه", f: "dágha" }
-          ? { p: "دغو", f: "dágho" }
+          : { p: "دغو", f: "dágho" }
-          : gender === "masc"
+        : plurInflected
-          ? { p: "دغه", f: "dághu" }
+        ? { p: "هغه", f: "hágha" }
-          : { p: "دغې", f: "dághe" }
+        : { p: "هغو", f: "hágho" },
-        : { p: "دغه", f: "dágha" }
-      : inflected
-      ? plural
-        ? { p: "هغو", f: "hágho" }
-        : gender === "masc"
-        ? { p: "هغه", f: "hághu" }
-        : { p: "هغې", f: "hághe" }
-      : { p: "هغه", f: "hágha" };
-  const e =
-    demonstrative.demonstrative === "hagha"
-      ? plural
-        ? "those"
-        : "that"
-      : plural
-      ? "these"
-      : "this";
-  return {
-    ...demonstrative,
-    ps,
-    e,
   };
 }
 

src/lib/src/phrase-building/vps-reducer.ts

@@ -1,8 +1,13 @@
 import * as T from "../../../types";
-import { isInvalidSubjObjCombo } from "./vp-tools";
+import {
+    isInvalidSubjObjCombo,
+} from "./vp-tools";
 import { switchSubjObj } from "./vp-tools";
 import { ensure2ndPersSubjPronounAndNoConflict } from "./vp-tools";
-import { isPerfectTense, isImperativeTense } from "../type-predicates";
+import {
+    isPerfectTense,
+    isImperativeTense,
+} from "../type-predicates";
 import { checkForMiniPronounsError } from "./compile";
 import {
     adjustObjectSelection,
@@ -14,100 +19,73 @@ import {
     setAP,
     shiftBlock,
 } from "./blocks-utils";
-import {
+import { changeStatDyn, changeTransitivity, makeVPSelectionState } from "./verb-selection";
-  changeStatDyn,
-  changeTransitivity,
-  makeVPSelectionState,
-} from "./verb-selection";
 
-export type VpsReducerAction =
+export type VpsReducerAction = {
-  | {
+    type: "load vps",
-      type: "load vps";
+    payload: T.VPSelectionState,
-      payload: T.VPSelectionState;
+} | {
-    }
+    type: "set subject",
-  | {
-      type: "set subject";
     payload: {
-        subject: T.NPSelection | undefined;
+        subject: T.NPSelection | undefined,
-        skipPronounConflictCheck?: boolean;
+        skipPronounConflictCheck?: boolean,
-      };
+    },
-    }
+} | {
-  | {
+    type: "set object",
-      type: "set object";
+    payload: T.NPSelection | undefined,
-      payload: T.NPSelection | undefined;
+} | {
-    }
+    type: "swap subj/obj",
-  | {
+} | {
-      type: "swap subj/obj";
+    type: "set form",
-    }
+    payload: T.FormVersion,
-  | {
+} | {
-      type: "set form";
+    type: "set voice",
-      payload: T.FormVersion;
+    payload: "active" | "passive",
-    }
+} | {
-  | {
+    type: "set transitivity",
-      type: "set voice";
+    payload: "transitive" | "grammatically transitive",
-      payload: "active" | "passive";
+} | {
-    }
+    type: "set statDyn",
-  | {
+    payload: "stative" | "dynamic",
-      type: "set transitivity";
+} | {
-      payload: "transitive" | "grammatically transitive";
+    type: "set negativity",
-    }
+    payload: "true" | "false",
-  | {
+} | {
-      type: "set statDyn";
+    type: "set tense",
-      payload: "stative" | "dynamic";
+    payload: T.VerbTense | T.PerfectTense | T.ImperativeTense | undefined,
-    }
+} | {
-  | {
+    type: "set tense category",
-      type: "set negativity";
+    payload: "basic" | "modal" | "perfect" | "imperative",
-      payload: "true" | "false";
+} | {
-    }
+    type: "toggle servant shrink",
-  | {
+} | {
-      type: "set tense";
+    type: "toggle king remove",
-      payload: T.VerbTense | T.PerfectTense | T.ImperativeTense | undefined;
+} |{
-    }
+    type: "set verb",
-  | {
+    payload: T.VerbEntry,
-      type: "set tense category";
+} | {
-      payload: "basic" | "modal" | "perfect" | "imperative";
+    type: "insert new AP",
-    }
+} | {
-  | {
+    type: "set AP",
-      type: "toggle servant shrink";
-    }
-  | {
-      type: "toggle king remove";
-    }
-  | {
-      type: "set verb";
-      payload: T.VerbEntry;
-    }
-  | {
-      type: "insert new AP";
-    }
-  | {
-      type: "set AP";
     payload: {
-        index: number;
+        index: number,
-        AP: T.APSelection | undefined;
+        AP: T.APSelection | undefined,
-      };
+    },
-    }
+} | {
-  | {
+    type: "remove AP",
-      type: "remove AP";
+    payload: number,
-      payload: number;
+} | {
-    }
+    type: "shift block",
-  | {
-      type: "shift block";
     payload: {
-        index: number;
+        index: number,
-        direction: "back" | "forward";
+        direction: "back" | "forward",
-      };
+    },
-    }
+} | {
-  | {
+    type: "set externalComplement",
-      type: "set externalComplement";
+    payload: T.ComplementSelection | undefined,
-      payload: T.ComplementSelection | undefined;
+}
-    };
 
-export function vpsReducer(
+export function vpsReducer(vps: T.VPSelectionState, action: VpsReducerAction, sendAlert?: (msg: string) => void): T.VPSelectionState {
-  vps: T.VPSelectionState,
-  action: VpsReducerAction,
-  sendAlert?: (msg: string) => void
-): T.VPSelectionState {
     function doReduce(): T.VPSelectionState {
         if (action.type === "load vps") {
             return action.payload;
@@ -115,7 +93,11 @@ export function vpsReducer(
         if (action.type === "set subject") {
             const { subject, skipPronounConflictCheck } = action.payload;
             const object = getObjectSelection(vps.blocks).selection;
-      if (!skipPronounConflictCheck && hasPronounConflict(subject, object)) {
+            if (
+                !skipPronounConflictCheck
+                &&
+                hasPronounConflict(subject, object)
+            ) {
                 if (sendAlert) sendAlert("That combination of pronouns is not allowed");
                 return vps;
             }
@@ -128,7 +110,7 @@ export function vpsReducer(
             if (!vps.verb) return vps;
             const objectB = getObjectSelection(vps.blocks).selection;
             const subjectB = getSubjectSelection(vps.blocks).selection;
-      if (objectB === "none" || typeof objectB === "number") {
+            if ((objectB === "none") || (typeof objectB === "number")) {
                 return vps;
             }
             const object = action.payload;
@@ -164,11 +146,8 @@ export function vpsReducer(
                     return {
                         ...vps,
                         blocks: adjustObjectSelection(
-              adjustSubjectSelection(
+                            adjustSubjectSelection(vps.blocks, typeof object === "object" ? object : undefined),
-                vps.blocks,
+                            "none",
-                typeof object === "object" ? object : undefined
-              ),
-              "none"
                         ),
                         verb: {
                             ...vps.verb,
@@ -181,7 +160,7 @@ export function vpsReducer(
                         ...vps,
                         blocks: adjustObjectSelection(
                             adjustSubjectSelection(vps.blocks, undefined),
-              typeof subject === "object" ? subject : undefined
+                            typeof subject === "object" ? subject : undefined,
                         ),
                         verb: {
                             ...vps.verb,
@@ -238,8 +217,7 @@ export function vpsReducer(
                     verb: {
                         ...vps.verb,
                         verbTense: tense,
-            tenseCategory:
+                        tenseCategory: vps.verb.tenseCategory === "perfect"
-              vps.verb.tenseCategory === "perfect"
                             ? "basic"
                             : vps.verb.tenseCategory,
                     },
@@ -266,7 +244,7 @@ export function vpsReducer(
                         ...vps.verb,
                         tenseCategory: category,
                     },
-        };
+                }
             }
             return {
                 ...vps,
@@ -327,14 +305,13 @@ export function vpsReducer(
             const selection = action.payload;
             return {
                 ...vps,
-        externalComplement:
+                externalComplement: selection === undefined
-          selection === undefined
+                    // TODO: this is a bit messy
-            ? // TODO: this is a bit messy
                     // when using the ComplementPicker with an EP - undefined means it hasn't been selected
                     // when using the ComplementPicker with a VP - undefined means there can be no complement
-              { type: "complement", selection: { type: "unselected" } }
+                    ? { type: "complement", selection: { type: "unselected" }}
                     : selection,
-      };
+            }
         }
         throw new Error("unknown vpsReducer state");
     }
@@ -347,18 +324,10 @@ export function vpsReducer(
     return modified;
 }
 
-function hasPronounConflict(
+function hasPronounConflict(subject: T.NPSelection | undefined, object: undefined | T.VerbObject): boolean {
-  subject: T.NPSelection | undefined,
+    const subjPronoun = (subject && subject.selection.type === "pronoun") ? subject.selection : undefined;
-  object: undefined | T.VerbObject
+    const objPronoun = (object && typeof object === "object" && object.selection.type === "pronoun") ? object.selection : undefined; 
-): boolean {
-  const subjPronoun =
-    subject && subject.selection.type === "pronoun"
-      ? subject.selection
-      : undefined;
-  const objPronoun =
-    object && typeof object === "object" && object.selection.type === "pronoun"
-      ? object.selection
-      : undefined;
     if (!subjPronoun || !objPronoun) return false;
     return isInvalidSubjObjCombo(subjPronoun.person, objPronoun.person);
 }
+

src/types.ts

@@ -1026,7 +1026,6 @@ export type Rendered<
       demonstrative: DemonstrativeSelection["demonstrative"];
       hideNoun: boolean;
       ps: PsString;
-      e: string;
     }
   : T extends ComplementSelection
   ? {