diff --git a/package.json b/package.json index dc48ed6..1435fb6 100644 --- a/package.json +++ b/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", diff --git a/scripts/get-words.js b/scripts/get-words.js index ccbf959..586e0b8 100644 --- a/scripts/get-words.js +++ b/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"; diff --git a/src/components/BasicVerbShowCase.tsx b/src/components/BasicVerbShowCase.tsx index b1430da..7e92073 100644 --- a/src/components/BasicVerbShowCase.tsx +++ b/src/components/BasicVerbShowCase.tsx @@ -12,13 +12,13 @@ import { isPastTense, getPassiveRootsAndStems, getAbilityRootsAndStems, -} from "@lingdocs/pashto-inflector"; -import { isImperativeTense, isPerfectTense } from "@lingdocs/pashto-inflector/dist/lib/type-predicates"; +} from "@lingdocs/ps-react"; +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 { isThirdPerson } from "@lingdocs/pashto-inflector/dist/lib/phrase-building/vp-tools"; +import { getLength } from "@lingdocs/ps-react/dist/lib/src/p-text-helpers"; +import { isThirdPerson } from "@lingdocs/ps-react"; function BasicVerbShowCase({ opts, tense, passive, ability }: { opts: T.TextOptions, diff --git a/src/components/Chart.tsx b/src/components/Chart.tsx index b435bfe..e6fe0cf 100644 --- a/src/components/Chart.tsx +++ b/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 }: { diff --git a/src/components/EquativeFormChoice.js b/src/components/EquativeFormChoice.js index 84b3669..8c18a98 100644 --- a/src/components/EquativeFormChoice.js +++ b/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"); diff --git a/src/components/EquativeIllustration.tsx b/src/components/EquativeIllustration.tsx index d13165a..46de2df 100644 --- a/src/components/EquativeIllustration.tsx +++ b/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"); diff --git a/src/components/GenderTable.js b/src/components/GenderTable.js index d9d0aad..5a79adf 100644 --- a/src/components/GenderTable.js +++ b/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 }) { diff --git a/src/components/InflectionCarousel.tsx b/src/components/InflectionCarousel.tsx index 88711a1..49cb0dd 100644 --- a/src/components/InflectionCarousel.tsx +++ b/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) { diff --git a/src/components/PhraseBuilder.tsx b/src/components/PhraseBuilder.tsx index 1318407..d363324 100644 --- a/src/components/PhraseBuilder.tsx +++ b/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"; diff --git a/src/components/PronounPicker.tsx b/src/components/PronounPicker.tsx index b7cd41b..63cde30 100644 --- a/src/components/PronounPicker.tsx +++ b/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", diff --git a/src/components/Table.js b/src/components/Table.js index d4c34a0..5425b4c 100644 --- a/src/components/Table.js +++ b/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"; diff --git a/src/components/phonetics/phonemes.tsx b/src/components/phonetics/phonemes.tsx index 6e6bc5b..2130173 100644 --- a/src/components/phonetics/phonemes.tsx +++ b/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; diff --git a/src/components/phrase-diagram/BlockDiagram.tsx b/src/components/phrase-diagram/BlockDiagram.tsx index a29ade1..71f7c13 100644 --- a/src/components/phrase-diagram/BlockDiagram.tsx +++ b/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, diff --git a/src/components/phrase-diagram/EditableBlock.tsx b/src/components/phrase-diagram/EditableBlock.tsx index 6669f20..81c58fc 100644 --- a/src/components/phrase-diagram/EditableBlock.tsx +++ b/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, diff --git a/src/components/phrase-diagram/EditableEPEx.tsx b/src/components/phrase-diagram/EditableEPEx.tsx index 7f9b4ad..911b0e8 100644 --- a/src/components/phrase-diagram/EditableEPEx.tsx +++ b/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"; diff --git a/src/components/phrase-diagram/EditableVPEx.tsx b/src/components/phrase-diagram/EditableVPEx.tsx index 09e3ab7..509608c 100644 --- a/src/components/phrase-diagram/EditableVPEx.tsx +++ b/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"; diff --git a/src/content/compound-verbs/dynamic-compounds.mdx b/src/content/compound-verbs/dynamic-compounds.mdx index 00baec2..ad01c4e 100644 --- a/src/content/compound-verbs/dynamic-compounds.mdx +++ b/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"; diff --git a/src/content/compound-verbs/helper-verbs.mdx b/src/content/compound-verbs/helper-verbs.mdx index 4c30fb7..33aaf45 100644 --- a/src/content/compound-verbs/helper-verbs.mdx +++ b/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"; diff --git a/src/content/compound-verbs/intro.mdx b/src/content/compound-verbs/intro.mdx index a725a17..7c922c7 100644 --- a/src/content/compound-verbs/intro.mdx +++ b/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"; diff --git a/src/content/compound-verbs/more-on-compounds.mdx b/src/content/compound-verbs/more-on-compounds.mdx index c4e2b55..98c52a2 100644 --- a/src/content/compound-verbs/more-on-compounds.mdx +++ b/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"; diff --git a/src/content/compound-verbs/stative-compounds.mdx b/src/content/compound-verbs/stative-compounds.mdx index 911d51a..7cbfc74 100644 --- a/src/content/compound-verbs/stative-compounds.mdx +++ b/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"; diff --git a/src/content/equatives/habitual-equative.mdx b/src/content/equatives/habitual-equative.mdx index 12d8f4d..b6f75c5 100644 --- a/src/content/equatives/habitual-equative.mdx +++ b/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"; diff --git a/src/content/equatives/other-equatives.mdx b/src/content/equatives/other-equatives.mdx index 2151c72..38c4781 100644 --- a/src/content/equatives/other-equatives.mdx +++ b/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"; diff --git a/src/content/equatives/present-equative.mdx b/src/content/equatives/present-equative.mdx index 889e56f..2bf3e56 100644 --- a/src/content/equatives/present-equative.mdx +++ b/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"; diff --git a/src/content/inflection/inflection-intro.mdx b/src/content/inflection/inflection-intro.mdx index 6a33f3f..7aa1d02 100644 --- a/src/content/inflection/inflection-intro.mdx +++ b/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"; diff --git a/src/content/inflection/inflection-patterns.mdx b/src/content/inflection/inflection-patterns.mdx index 5cfc379..4149b47 100644 --- a/src/content/inflection/inflection-patterns.mdx +++ b/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"; diff --git a/src/content/nouns/arabic-plurals.mdx b/src/content/nouns/arabic-plurals.mdx index e7cea21..fa86e6b 100644 --- a/src/content/nouns/arabic-plurals.mdx +++ b/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 }) { diff --git a/src/content/nouns/bundled-plurals.mdx b/src/content/nouns/bundled-plurals.mdx index 128a0c2..4581d86 100644 --- a/src/content/nouns/bundled-plurals.mdx +++ b/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"; diff --git a/src/content/nouns/nouns-gender.mdx b/src/content/nouns/nouns-gender.mdx index 2c58d27..1373fb0 100644 --- a/src/content/nouns/nouns-gender.mdx +++ b/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"; diff --git a/src/content/nouns/nouns-plural.mdx b/src/content/nouns/nouns-plural.mdx index 4bd96f7..2d4d520 100644 --- a/src/content/nouns/nouns-plural.mdx +++ b/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"; diff --git a/src/content/nouns/nouns-unisex.mdx b/src/content/nouns/nouns-unisex.mdx index c0343b4..ec7888a 100644 --- a/src/content/nouns/nouns-unisex.mdx +++ b/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"; diff --git a/src/content/participles/intro.mdx b/src/content/participles/intro.mdx index eeb4f83..5b40478 100644 --- a/src/content/participles/intro.mdx +++ b/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"; diff --git a/src/content/phrase-structure/ap.mdx b/src/content/phrase-structure/ap.mdx index f4316e5..d223c96 100644 --- a/src/content/phrase-structure/ap.mdx +++ b/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, { diff --git a/src/content/phrase-structure/blocks-and-kids.mdx b/src/content/phrase-structure/blocks-and-kids.mdx index 659b235..e4f16cb 100644 --- a/src/content/phrase-structure/blocks-and-kids.mdx +++ b/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, { diff --git a/src/content/phrase-structure/complement.mdx b/src/content/phrase-structure/complement.mdx index bf07b37..94e93fe 100644 --- a/src/content/phrase-structure/complement.mdx +++ b/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"; diff --git a/src/content/phrase-structure/ep.mdx b/src/content/phrase-structure/ep.mdx index 96f652c..fe345cd 100644 --- a/src/content/phrase-structure/ep.mdx +++ b/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"; diff --git a/src/content/phrase-structure/np.mdx b/src/content/phrase-structure/np.mdx index ade44ec..44f6605 100644 --- a/src/content/phrase-structure/np.mdx +++ b/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, { diff --git a/src/content/phrase-structure/shortening-vps.mdx b/src/content/phrase-structure/shortening-vps.mdx index 9ba7834..e56c4b0 100644 --- a/src/content/phrase-structure/shortening-vps.mdx +++ b/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"; diff --git a/src/content/phrase-structure/vp.mdx b/src/content/phrase-structure/vp.mdx index b455b48..40145df 100644 --- a/src/content/phrase-structure/vp.mdx +++ b/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"; diff --git a/src/content/practice-tools/pronoun-picker.mdx b/src/content/practice-tools/pronoun-picker.mdx index c9b0110..31233fa 100644 --- a/src/content/practice-tools/pronoun-picker.mdx +++ b/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() { diff --git a/src/content/pronouns/pronouns-basic.mdx b/src/content/pronouns/pronouns-basic.mdx index 3b4449b..cf5d7e8 100644 --- a/src/content/pronouns/pronouns-basic.mdx +++ b/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"); diff --git a/src/content/pronouns/pronouns-directional.mdx b/src/content/pronouns/pronouns-directional.mdx index 19b406b..18c1b05 100644 --- a/src/content/pronouns/pronouns-directional.mdx +++ b/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"; diff --git a/src/content/pronouns/pronouns-mini.mdx b/src/content/pronouns/pronouns-mini.mdx index c6d2b32..a0f6bf7 100644 --- a/src/content/pronouns/pronouns-mini.mdx +++ b/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"; diff --git a/src/content/sandwiches/sandwiches.mdx b/src/content/sandwiches/sandwiches.mdx index 88c9965..a73f267 100644 --- a/src/content/sandwiches/sandwiches.mdx +++ b/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? diff --git a/src/content/sandwiches/sandwiches.tsx b/src/content/sandwiches/sandwiches.tsx index 7f4ebbf..7d2be61 100644 --- a/src/content/sandwiches/sandwiches.tsx +++ b/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, diff --git a/src/content/verbs/ability.mdx b/src/content/verbs/ability.mdx index 3f36eec..9ed1d35 100644 --- a/src/content/verbs/ability.mdx +++ b/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"; diff --git a/src/content/verbs/all-perfect-verbs.mdx b/src/content/verbs/all-perfect-verbs.mdx index ae61bab..1b6964e 100644 --- a/src/content/verbs/all-perfect-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/basic-present-verbs.ts b/src/content/verbs/basic-present-verbs.ts index 287389e..6216c7b 100644 --- a/src/content/verbs/basic-present-verbs.ts +++ b/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", [ diff --git a/src/content/verbs/future-verbs.mdx b/src/content/verbs/future-verbs.mdx index 389d75c..a874e1b 100644 --- a/src/content/verbs/future-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/imperative-verbs.mdx b/src/content/verbs/imperative-verbs.mdx index 2e3752a..c7ac0ff 100644 --- a/src/content/verbs/imperative-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/negative.mdx b/src/content/verbs/negative.mdx index 8f6f017..ff78fe8 100644 --- a/src/content/verbs/negative.mdx +++ b/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"; diff --git a/src/content/verbs/passive-voice.mdx b/src/content/verbs/passive-voice.mdx index 8a8bdb1..2537ef3 100644 --- a/src/content/verbs/passive-voice.mdx +++ b/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"; diff --git a/src/content/verbs/past-verbs.mdx b/src/content/verbs/past-verbs.mdx index d0cb146..ab574f0 100644 --- a/src/content/verbs/past-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/perfect-verbs-intro.mdx b/src/content/verbs/perfect-verbs-intro.mdx index c22b11e..27b98d2 100644 --- a/src/content/verbs/perfect-verbs-intro.mdx +++ b/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"; diff --git a/src/content/verbs/present-verbs.mdx b/src/content/verbs/present-verbs.mdx index 3339654..fd578e9 100644 --- a/src/content/verbs/present-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/roots-and-stems.mdx b/src/content/verbs/roots-and-stems.mdx index 0161d0f..9aaf22e 100644 --- a/src/content/verbs/roots-and-stems.mdx +++ b/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"; diff --git a/src/content/verbs/subjunctive-verbs.mdx b/src/content/verbs/subjunctive-verbs.mdx index aa0735e..14a0659 100644 --- a/src/content/verbs/subjunctive-verbs.mdx +++ b/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"; diff --git a/src/content/verbs/verb-aspect.mdx b/src/content/verbs/verb-aspect.mdx index 4fd728a..7ddd9a8 100644 --- a/src/content/verbs/verb-aspect.mdx +++ b/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"; diff --git a/src/content/verbs/verb-endings.mdx b/src/content/verbs/verb-endings.mdx index 0708cf1..6009c92 100644 --- a/src/content/verbs/verb-endings.mdx +++ b/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) { diff --git a/src/content/writing/diacritics.mdx b/src/content/writing/diacritics.mdx index 8d76db1..d659aa6 100644 --- a/src/content/writing/diacritics.mdx +++ b/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"; diff --git a/src/content/writing/the-five-yeys.mdx b/src/content/writing/the-five-yeys.mdx index c22bd6e..a3f31c0 100644 --- a/src/content/writing/the-five-yeys.mdx +++ b/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"; diff --git a/src/content/writing/typing-issues.mdx b/src/content/writing/typing-issues.mdx index 39639de..bf08d64 100644 --- a/src/content/writing/typing-issues.mdx +++ b/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 📱 diff --git a/src/games/GameCore.tsx b/src/games/GameCore.tsx index ccf9390..cf8bcb0 100644 --- a/src/games/GameCore.tsx +++ b/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"; diff --git a/src/games/sub-cores/EquativeGame.tsx b/src/games/sub-cores/EquativeGame.tsx index c79ed43..6a65670 100644 --- a/src/games/sub-cores/EquativeGame.tsx +++ b/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"; diff --git a/src/games/sub-cores/EquativeIdentify.tsx b/src/games/sub-cores/EquativeIdentify.tsx index de5341f..93937e0 100644 --- a/src/games/sub-cores/EquativeIdentify.tsx +++ b/src/games/sub-cores/EquativeIdentify.tsx @@ -6,8 +6,8 @@ import { randFromArray, renderEP, compileEP, -} from "@lingdocs/pashto-inflector"; -import { psStringEquals } from "@lingdocs/pashto-inflector/dist/lib/p-text-helpers"; +} from "@lingdocs/ps-react"; +import { psStringEquals } from "@lingdocs/ps-react"; import { randomEPSPool } from "./makeRandomEPS"; import { useEffect, useState } from "react"; import classNames from "classnames"; diff --git a/src/games/sub-cores/EquativeSituations.tsx b/src/games/sub-cores/EquativeSituations.tsx index dd8adc8..6739858 100644 --- a/src/games/sub-cores/EquativeSituations.tsx +++ b/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[] = [ diff --git a/src/games/sub-cores/GenderGame.tsx b/src/games/sub-cores/GenderGame.tsx index 6199e8f..eb58d3b 100644 --- a/src/games/sub-cores/GenderGame.tsx +++ b/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"; diff --git a/src/games/sub-cores/InflectionPatterns.tsx b/src/games/sub-cores/InflectionPatterns.tsx index af9fc81..19a856d 100644 --- a/src/games/sub-cores/InflectionPatterns.tsx +++ b/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; diff --git a/src/games/sub-cores/InflectionsWriting.tsx b/src/games/sub-cores/InflectionsWriting.tsx index fb8c3ba..e5b544d 100644 --- a/src/games/sub-cores/InflectionsWriting.tsx +++ b/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
Complete the inflections for the {humanReadableInflectionPattern(level, opts)} pattern word
+Complete the inflections for the {HumanReadableInflectionPattern(level, opts)} pattern word