.github/workflows/check-inflections.yml

@@ -0,0 +1,26 @@
+name: Check Inflections
+
+on:
+  push:
+    branches: ["*"]
+  pull_request:
+    branches: ["*"]
+
+  workflow_dispatch:
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    env:
+      LINGDOCS_DICTIONARY_URL: ${{ secrets.LINGDOCS_DICTIONARY_URL }}
+      LINGDOCS_NPM_TOKEN: ${{ secrets.LINGDOCS_NPM_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+      - name: run script
+        run: |
+          yarn install-r
+          yarn check-all-inflections

.github/workflows/ci.yml

@@ -26,4 +26,3 @@ jobs:
           yarn build-library
           yarn build-website
           yarn test --silent
-          yarn check-all-inflections

check-all-inflections.ts

@@ -2,7 +2,6 @@ import * as T from "./src/types";
 import { inflectWord } from "./src/lib/src/pashto-inflector";
 import * as tp from "./src/lib/src/type-predicates";
 import { conjugateVerb } from "./src/lib/src/verb-conjugation";
-import fetch from "node-fetch";
 
 // Script to try inflecting all the words in the dictionary and make sure that
 // no errors are thrown in the process
@@ -16,7 +15,6 @@ type InflectionError = {
 
 async function checkAll() {
   const res = await fetch(process.env.LINGDOCS_DICTIONARY_URL);
-  // @ts-ignore
   const { entries }: T.Dictionary = await res.json();
   const errors: InflectionError[] = [];
 
@@ -31,7 +29,7 @@ async function checkAll() {
         err: e.toString(),
       });
     }
-    if (tp.isVerbDictionaryEntry(entry)) {
+    if (tp.isVerbEntry(entry)) {
       const complement = entry.l
         ? entries.find((e) => e.ts === entry.l)
         : undefined;
@@ -43,16 +41,6 @@ async function checkAll() {
           err: "verb complement missing",
         });
       } else {
-        try {
-          conjugateVerb(entry, complement);
-        } catch (e) {
-          errors.push({
-            ts: entry.ts,
-            p: entry.p,
-            f: entry.f,
-            err: e,
-          });
-        }
       }
     }
   });

get-words.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2024 lingdocs.com
+ * Copyright (c) 2021 lingdocs.com
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -13,23 +13,15 @@ const nounAdjCollectionPath = path.join(".", "vocab", "nouns-adjs");
 const verbTsFiles = fs.readdirSync(verbCollectionPath);
 const nounAdjTsFiles = fs.readdirSync(nounAdjCollectionPath);
 
-const allVerbTsS = [
+const allVerbTsS = [...new Set(verbTsFiles.reduce((arr, fileName) => {
-  ...new Set(
-    verbTsFiles.reduce((arr, fileName) => {
     const TsS = require("./vocab/verbs/"+fileName);
     return [...arr, ...TsS];
-    }, [])
+}, []))];
-  ),
-];
 
-const allNounAdjTsS = [
+const allNounAdjTsS = [...new Set(nounAdjTsFiles.reduce((arr, fileName) => {
-  ...new Set(
+    const TsS = require("./vocab/nouns-adjs/"+fileName).map(x => x.ts);
-    nounAdjTsFiles.reduce((arr, fileName) => {
-      const TsS = require("./vocab/nouns-adjs/" + fileName).map((x) => x.ts);
     return [...arr, ...TsS];
-    }, [])
+}, []))];
-  ),
-];
 
 fetch("https://account.lingdocs.com/dictionary/entries", {
     method: "POST",
@@ -37,13 +29,11 @@ fetch("https://account.lingdocs.com/dictionary/entries", {
         "Content-Type": "application/json",
     },
     body: JSON.stringify({ ids: [...allNounAdjTsS, ...allVerbTsS] }),
-})
+}).then(res => res.json()).then(res => {
-  .then((res) => res.json())
+  const verbs = res.results.filter(x => "entry" in x);
-  .then((res) => {
-    const verbs = res.results.filter((x) => "entry" in x);
   const verbsContent = `
 /**
- * Copyright (c) 2024 lingdocs.com
+ * Copyright (c) 2021 lingdocs.com
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -58,10 +48,10 @@ const verbs: {
 }[] = ${JSON.stringify(verbs)};
 export default verbs as VerbEntry[];`;
   fs.writeFileSync("./src/verbs.ts", verbsContent);
-    const nounsAdjs = res.results.filter((x) => !("entry" in x));
+  const nounsAdjs = res.results.filter(x => !("entry" in x));
   const nounsAdjsContent = `
 /**
- * Copyright (c) 2024 lingdocs.com
+ * Copyright (c) 2021 lingdocs.com
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -74,7 +64,7 @@ const nounsAdjs: DictionaryEntry[] = ${JSON.stringify(nounsAdjs)};
 export default nounsAdjs;`;
   fs.writeFileSync("./src/nouns-adjs.ts", nounsAdjsContent);
   console.log("fetched words from dictionary");
-    const missingEc = res.results.filter((x) => "entry" in x && !x.entry.ec);
+  const missingEc = res.results.filter(x => "entry" in x && !x.entry.ec);
   if (missingEc.length) {
     console.log("verbs missing ec");
     console.log(missingEc);
@@ -84,3 +74,4 @@ export default nounsAdjs;`;
     console.log(res.notFound);
   }
 });
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pashto-inflector",
-  "version": "7.4.1",
+  "version": "7.4.0",
   "author": "lingdocs.com",
   "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
   "homepage": "https://verbs.lingdocs.com",
@@ -21,7 +21,7 @@
     "@types/react-dom": "^17.0.2",
     "bootstrap": "^4.6.0",
     "jest-extended": "^4.0.1",
-    "node-fetch": "^3.3.2",
+    "node-fetch": "^3.2.10",
     "node-fetch-commonjs": "^3.2.4",
     "pbf": "^3.2.1",
     "react": "^17.0.1",

src/components/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@lingdocs/ps-react",
-  "version": "7.4.1",
+  "version": "7.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@lingdocs/ps-react",
-      "version": "7.4.1",
+      "version": "7.4.0",
       "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.4.1",
+  "version": "7.4.0",
   "description": "Pashto inflector library module with React components",
   "main": "dist/components/library.js",
   "module": "dist/components/library.js",

src/lib/package.json

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

src/lib/src/dyn-comp-aux-verbs.ts

@@ -576,228 +576,4 @@ export const dynamicAuxVerbs: Array<{
       ec: "send,sends,sending,sent,sent",
     },
   },
-  {
-    entry: {
-      ts: 1577299232429,
-      i: 1770,
-      p: "بدلول",
-      f: "badlawúl",
-      g: "badlawul",
-      e: "to change, to adapt, exchange, replace",
-      r: 4,
-      c: "v. stat. comp. trans.",
-      l: 1577299160732,
-      ec: "change",
-      a: 1,
-    },
-    complement: {
-      ts: 1577299160732,
-      i: 1761,
-      p: "بدل",
-      f: "badál",
-      g: "badal",
-      e: "changed, different, exchanged",
-      r: 4,
-      c: "adj.",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527812856,
-      i: 14629,
-      p: "لیکل",
-      f: "leekúl",
-      g: "leekul",
-      e: "to write, draw",
-      r: 3,
-      c: "v. trans./gramm. trans.",
-      ec: "write,writes,writing,wrote,written",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527812280,
-      i: 1425,
-      p: "اېښودل",
-      f: "exodúl",
-      g: "exodul",
-      e: "to put, put down, set in place, install, plant, plug in, invest, lay/build",
-      r: 4,
-      c: "v. trans.",
-      psp: "ږد",
-      psf: "Gd",
-      noOo: true,
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527811395,
-      i: 6849,
-      p: "خپرول",
-      f: "khparawul",
-      g: "khparawul",
-      e: "to spread, disperse, open, unfold, publicize, distribute",
-      r: 3,
-      c: "v. stat. comp. trans.",
-      l: 1527816071,
-      ec: "spread,spreads,spreading,spread",
-    },
-    complement: {
-      ts: 1527816071,
-      i: 6874,
-      p: "خپور",
-      f: "khpor",
-      g: "khpor",
-      e: "spread, dispersed, publicized, published",
-      r: 4,
-      c: "adj.",
-      infap: "خپاره",
-      infaf: "khpaaru",
-      infbp: "خپر",
-      infbf: "khpar",
-    },
-  },
-  {
-    entry: {
-      ts: 1527818218,
-      i: 18245,
-      p: "ویستل",
-      f: "weestul",
-      g: "weestul",
-      e: "to take out, throw out, drive out, discard, chuck, toss, extract",
-      r: 4,
-      c: "v. trans.",
-      psp: "باس",
-      psf: "báas",
-      ssp: "وباس",
-      ssf: "óobaas",
-      diacExcept: true,
-      a: 1,
-    },
-    complement: {
-      ts: 1527818218,
-      i: 18245,
-      p: "ویستل",
-      f: "weestul",
-      g: "weestul",
-      e: "to take out, throw out, drive out, discard, chuck, toss, extract",
-      r: 4,
-      c: "v. trans.",
-      psp: "باس",
-      psf: "báas",
-      ssp: "وباس",
-      ssf: "óobaas",
-      diacExcept: true,
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527811293,
-      i: 10992,
-      p: "ښودل",
-      f: "xodúl",
-      g: "xodul",
-      e: "to show; to teach; to suit, look good with (fig.), befit",
-      r: 4,
-      c: "v. trans.",
-      psp: "ښای",
-      psf: "xaay",
-      ec: "show,shows,showing,showed,shown",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527816012,
-      i: 14685,
-      p: "ماتول",
-      f: "maatawúl",
-      g: "maatawul",
-      e: "to break, split, defeat",
-      r: 4,
-      c: "v. stat. comp. trans.",
-      l: 1527816011,
-      ec: "break,breaks,breaking,broke,broken",
-      a: 1,
-    },
-    complement: {
-      ts: 1527816011,
-      i: 14677,
-      p: "مات",
-      f: "maat",
-      g: "maat",
-      e: "broken, split, defeated",
-      r: 4,
-      c: "adj.",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527812222,
-      i: 6879,
-      p: "ختمول",
-      f: "khatumawúl",
-      g: "khatumawul",
-      e: "to finish, complete, end, use up, destroy, kill",
-      r: 4,
-      c: "v. stat. comp. trans.",
-      l: 1527812221,
-      ec: "finish",
-      a: 1,
-    },
-    complement: {
-      ts: 1527812221,
-      i: 6878,
-      p: "ختم",
-      f: "khátum",
-      g: "khatum",
-      e: "finished, completed, ended, done",
-      r: 4,
-      c: "adj.",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527821309,
-      i: 2173,
-      p: "بندول",
-      f: "bandawúl",
-      g: "bandawul",
-      e: "to close, block, stop, barricade, cut off, restrain, hold back",
-      r: 3,
-      c: "v. stat. comp. trans.",
-      l: 1577301753727,
-      ec: "close",
-      a: 1,
-    },
-    complement: {
-      ts: 1577301753727,
-      i: 2158,
-      p: "بند",
-      f: "band",
-      g: "band",
-      e: "closed, blocked, stopped",
-      c: "adj.",
-      a: 1,
-    },
-  },
-  {
-    entry: {
-      ts: 1527817750,
-      i: 9964,
-      p: "سکل",
-      f: "skul",
-      g: "skul",
-      e: "to drink",
-      r: 3,
-      c: "v. trans.",
-      ec: "drink,drinks,drinking,drank,drank",
-    },
-  },
 ];

src/lib/src/misc-helpers.ts

@@ -40,10 +40,6 @@ export function ensureNonComboVerbInfo(i: T.VerbInfo): T.NonComboVerbInfo {
   return "stative" in i ? i.stative : "transitive" in i ? i.transitive : i;
 }
 
-export function ensureVerbConjugation(o: T.VerbOutput): T.VerbConjugation {
-  return "stative" in o ? o.stative : "transitive" in o ? o.transitive : o;
-}
-
 export function pickPersInf<T>(
   s: T.OptionalPersonInflections<T>,
   persInf: T.PersonInflectionsField

src/lib/src/verb-conjugation.ts

@@ -40,8 +40,6 @@ import {
   chooseParticipleInflection,
   spaceInForm,
   noPersInfs,
-  ensureNonComboVerbInfo,
-  ensureVerbConjugation,
 } from "./misc-helpers";
 import * as T from "../../types";
 
@@ -76,20 +74,16 @@ export function conjugateVerb(
   if (info.type === "transitive or grammatically transitive simple") {
     return {
       info,
-      transitive: ensureVerbConjugation(
+      transitive: conjugateVerb(
-        conjugateVerb(
         { ...entry, c: entry.c ? entry.c.replace("/gramm. trans.", "") : "" },
         dummyEntry,
         info.transitive
-        )
+      ) as T.VerbConjugation,
-      ),
+      grammaticallyTransitive: conjugateVerb(
-      grammaticallyTransitive: ensureVerbConjugation(
-        conjugateVerb(
         { ...entry, c: entry.c ? entry.c?.replace("trans./", "") : "" },
         dummyEntry,
         info.grammaticallyTransitive
-        )
+      ) as T.VerbConjugation,
-      ),
     };
   }
 
@@ -99,20 +93,16 @@ export function conjugateVerb(
   ) {
     return {
       info,
-      stative: ensureVerbConjugation(
+      stative: conjugateVerb(
-        conjugateVerb(
         { ...entry, c: entry.c ? entry.c.replace("dyn./", "") : "" },
         dummyEntry,
         info.stative
-        )
+      ) as T.VerbConjugation,
-      ),
+      dynamic: conjugateVerb(
-      dynamic: ensureVerbConjugation(
-        conjugateVerb(
         { ...entry, c: entry.c ? entry.c.replace("/stat.", "") : "" },
         dummyEntry,
         info.dynamic
-        )
+      ) as T.VerbConjugation,
-      ),
     };
   }
 
@@ -120,7 +110,7 @@ export function conjugateVerb(
     return conjugateDynamicCompound(info);
   }
 
-  const nonComboInfo = ensureNonComboVerbInfo(info);
+  const nonComboInfo = info as T.NonComboVerbInfo;
 
   const conjugation: T.VerbConjugation = {
     info: nonComboInfo,
@@ -131,9 +121,11 @@ export function conjugateVerb(
     perfect: makePerfectContent(nonComboInfo),
     ...("singularForm" in info
       ? {
-          singularForm: ensureVerbConjugation(
+          singularForm: conjugateVerb(
-            conjugateVerb(entry, complement, info.singularForm)
+            entry,
-          ),
+            complement,
+            info.singularForm
+          ) as T.VerbConjugation,
         }
       : {}),
     // if transitive include passive voice
@@ -161,7 +153,7 @@ function conjugateDynamicCompound(
   //     && info.auxVerb.p === "کېدل"
   // );
   const auxConj = enforceObject(
-    ensureVerbConjugation(conjugateVerb(info.auxVerb, info.auxVerbComplement)),
+    conjugateVerb(info.auxVerb, info.auxVerbComplement) as T.VerbConjugation,
     info.objComplement.person
   );
   const complement = info.objComplement.plural

src/lib/src/verb-info.ts

@@ -45,7 +45,6 @@ import {
   getAuxTransitivity,
   chooseParticipleInflection,
   noPersInfs,
-  ensureNonComboVerbInfo,
 } from "./misc-helpers";
 import * as T from "../../types";
 import { isTlulVerb } from "./type-predicates";
@@ -284,9 +283,10 @@ function getDynamicCompoundInfo(
   const yulEnding = null;
   const objComplement = getObjComplementInfo(entry, comp, forceSingular);
   const auxVerb = getDynamicAuxVerb(entry);
-  const auxVerbInfo = ensureNonComboVerbInfo(
+  const auxVerbInfo = getVerbInfo(
-    getVerbInfo(auxVerb.entry, auxVerb.complement)
+    auxVerb.entry,
-  );
+    auxVerb.complement
+  ) as T.NonComboVerbInfo;
   const compUsed = objComplement.plural
     ? objComplement.plural
     : objComplement.entry;

yarn.lock

@@ -1237,115 +1237,120 @@
   resolved "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"
   integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
 
-"@esbuild/android-arm64@0.18.20":
+"@esbuild/aix-ppc64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
-  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
 
-"@esbuild/android-arm@0.18.20":
+"@esbuild/android-arm64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
-  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
 
-"@esbuild/android-x64@0.18.20":
+"@esbuild/android-arm@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
-  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
 
-"@esbuild/darwin-arm64@0.18.20":
+"@esbuild/android-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
-  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
 
-"@esbuild/darwin-x64@0.18.20":
+"@esbuild/darwin-arm64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
-  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
 
-"@esbuild/freebsd-arm64@0.18.20":
+"@esbuild/darwin-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
-  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
 
-"@esbuild/freebsd-x64@0.18.20":
+"@esbuild/freebsd-arm64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
-  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
 
-"@esbuild/linux-arm64@0.18.20":
+"@esbuild/freebsd-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
-  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
 
-"@esbuild/linux-arm@0.18.20":
+"@esbuild/linux-arm64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
-  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
 
-"@esbuild/linux-ia32@0.18.20":
+"@esbuild/linux-arm@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
-  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
 
-"@esbuild/linux-loong64@0.18.20":
+"@esbuild/linux-ia32@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
-  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
 
-"@esbuild/linux-mips64el@0.18.20":
+"@esbuild/linux-loong64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
-  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
 
-"@esbuild/linux-ppc64@0.18.20":
+"@esbuild/linux-mips64el@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
-  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
 
-"@esbuild/linux-riscv64@0.18.20":
+"@esbuild/linux-ppc64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
-  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
 
-"@esbuild/linux-s390x@0.18.20":
+"@esbuild/linux-riscv64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
-  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
 
-"@esbuild/linux-x64@0.18.20":
+"@esbuild/linux-s390x@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
-  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
 
-"@esbuild/netbsd-x64@0.18.20":
+"@esbuild/linux-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
-  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
 
-"@esbuild/openbsd-x64@0.18.20":
+"@esbuild/netbsd-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
-  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
 
-"@esbuild/sunos-x64@0.18.20":
+"@esbuild/openbsd-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
-  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
 
-"@esbuild/win32-arm64@0.18.20":
+"@esbuild/sunos-x64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
-  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
 
-"@esbuild/win32-ia32@0.18.20":
+"@esbuild/win32-arm64@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
-  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
 
-"@esbuild/win32-x64@0.18.20":
+"@esbuild/win32-ia32@0.21.5":
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
-  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
 
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
@@ -4756,33 +4761,34 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
-esbuild@~0.18.20:
+esbuild@~0.21.5:
-  version "0.18.20"
+  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
-  integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
   optionalDependencies:
-    "@esbuild/android-arm" "0.18.20"
+    "@esbuild/aix-ppc64" "0.21.5"
-    "@esbuild/android-arm64" "0.18.20"
+    "@esbuild/android-arm" "0.21.5"
-    "@esbuild/android-x64" "0.18.20"
+    "@esbuild/android-arm64" "0.21.5"
-    "@esbuild/darwin-arm64" "0.18.20"
+    "@esbuild/android-x64" "0.21.5"
-    "@esbuild/darwin-x64" "0.18.20"
+    "@esbuild/darwin-arm64" "0.21.5"
-    "@esbuild/freebsd-arm64" "0.18.20"
+    "@esbuild/darwin-x64" "0.21.5"
-    "@esbuild/freebsd-x64" "0.18.20"
+    "@esbuild/freebsd-arm64" "0.21.5"
-    "@esbuild/linux-arm" "0.18.20"
+    "@esbuild/freebsd-x64" "0.21.5"
-    "@esbuild/linux-arm64" "0.18.20"
+    "@esbuild/linux-arm" "0.21.5"
-    "@esbuild/linux-ia32" "0.18.20"
+    "@esbuild/linux-arm64" "0.21.5"
-    "@esbuild/linux-loong64" "0.18.20"
+    "@esbuild/linux-ia32" "0.21.5"
-    "@esbuild/linux-mips64el" "0.18.20"
+    "@esbuild/linux-loong64" "0.21.5"
-    "@esbuild/linux-ppc64" "0.18.20"
+    "@esbuild/linux-mips64el" "0.21.5"
-    "@esbuild/linux-riscv64" "0.18.20"
+    "@esbuild/linux-ppc64" "0.21.5"
-    "@esbuild/linux-s390x" "0.18.20"
+    "@esbuild/linux-riscv64" "0.21.5"
-    "@esbuild/linux-x64" "0.18.20"
+    "@esbuild/linux-s390x" "0.21.5"
-    "@esbuild/netbsd-x64" "0.18.20"
+    "@esbuild/linux-x64" "0.21.5"
-    "@esbuild/openbsd-x64" "0.18.20"
+    "@esbuild/netbsd-x64" "0.21.5"
-    "@esbuild/sunos-x64" "0.18.20"
+    "@esbuild/openbsd-x64" "0.21.5"
-    "@esbuild/win32-arm64" "0.18.20"
+    "@esbuild/sunos-x64" "0.21.5"
-    "@esbuild/win32-ia32" "0.18.20"
+    "@esbuild/win32-arm64" "0.21.5"
-    "@esbuild/win32-x64" "0.18.20"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
 
 escalade@^3.0.2, escalade@^3.1.1:
   version "3.1.1"
@@ -5619,7 +5625,7 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-tsconfig@^4.7.2:
+get-tsconfig@^4.7.5:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
   integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
@@ -7870,10 +7876,10 @@ node-fetch-commonjs@^3.2.4:
     formdata-polyfill "^4.0.10"
     web-streams-polyfill "^3.1.1"
 
-node-fetch@^3.3.2:
+node-fetch@^3.2.10:
-  version "3.3.2"
+  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.2.tgz#d1e889bacdf733b4ff3b2b243eb7a12866a0b78b"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz"
-  integrity sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==
+  integrity sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==
   dependencies:
     data-uri-to-buffer "^4.0.0"
     fetch-blob "^3.1.4"
@@ -10521,14 +10527,6 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@^0.5.21:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
   version "0.5.20"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"
@@ -11179,14 +11177,13 @@ tsutils@^3.17.1, tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tsx@^3.14.0:
+tsx@^4.16.5:
-  version "3.14.0"
+  version "4.16.5"
-  resolved "https://registry.yarnpkg.com/tsx/-/tsx-3.14.0.tgz#be6e2176b6f210fe8f48124fb6e22e0f075e927b"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.16.5.tgz#49c2a8f4d4d66bd7cf538e23e7368a1919a9a1ca"
-  integrity sha512-xHtFaKtHxM9LOklMmJdI3BEnQq/D5F73Of2E1GDrITi9sgoVkvIsrQUTY1G8FlmGtA+awCI4EBlTRRYxkL2sRg==
+  integrity sha512-ArsiAQHEW2iGaqZ8fTA1nX0a+lN5mNTyuGRRO6OW3H/Yno1y9/t1f9YOI1Cfoqz63VAthn++ZYcbDP7jPflc+A==
   dependencies:
-    esbuild "~0.18.20"
+    esbuild "~0.21.5"
-    get-tsconfig "^4.7.2"
+    get-tsconfig "^4.7.5"
-    source-map-support "^0.5.21"
   optionalDependencies:
     fsevents "~2.3.3"