diff --git a/.gitignore b/.gitignore index ddd0589..2c74fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ lerna-debug.log* # fetched vocab src/verbs.ts src/nouns-adjs.ts +vocab/mini-dict-entries.ts # testing /coverage diff --git a/check-all-inflections.ts b/check-all-inflections.ts index 5ff048e..9afb2ed 100644 --- a/check-all-inflections.ts +++ b/check-all-inflections.ts @@ -15,7 +15,7 @@ type InflectionError = { async function checkAll() { console.log("Checking inflection functions on all dictionary words"); - const res = await fetch(process.env.LINGDOCS_DICTIONARY_URL); + const res = await fetch(process.env.LINGDOCS_DICTIONARY_URL + ".json"); const { entries }: T.Dictionary = await res.json(); const errors: InflectionError[] = []; diff --git a/get-mini-dict.ts b/get-mini-dict.ts new file mode 100644 index 0000000..3a3c94c --- /dev/null +++ b/get-mini-dict.ts @@ -0,0 +1,22 @@ +import * as T from "./src/types"; +import fs from "fs"; + +import { entries as collection } from "./vocab/mini-dict-tss"; + +const res = await fetch( + "https://storage.lingdocs.com/dictionary/dictionary.json" +); +const dictionary = (await res.json()) as T.Dictionary; + +const entries: T.DictionaryEntry[] = dictionary.entries.filter((x) => + collection.includes(x.ts) +); + +const contents = `import { DictionaryEntry } from "../src/types"; +// DO NOT MODIFY - GENERATED FROM mini-dict-tss.ts +export const entries: DictionaryEntry[] = [ +${entries.map((e) => `\t${JSON.stringify(e)},`).join("\n")} +]; +`; + +fs.writeFileSync("./vocab/mini-dict-entries.ts", contents); diff --git a/jest.config.js b/jest.config.js index 284c275..aceeed4 100644 --- a/jest.config.js +++ b/jest.config.js @@ -6,6 +6,7 @@ export default { "ts-jest", { tsconfig: "tsconfig.app.json", + diagnostics: false, }, ], }, diff --git a/package-lock.json b/package-lock.json index 2850649..c7cefd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,16 @@ { "name": "pashto-inflector-website", - "version": "7.6.5", + "version": "7.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pashto-inflector-website", - "version": "7.6.5", + "version": "7.7.0", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", "bootstrap": "4.6.1", + "json-edit-react": "^1.15.7", "react": "^18.3.1", "react-bootstrap": "1.5.1", "react-dom": "^18.3.1", @@ -5443,6 +5444,19 @@ "dev": true, "license": "MIT" }, + "node_modules/json-edit-react": { + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/json-edit-react/-/json-edit-react-1.15.7.tgz", + "integrity": "sha512-PMw7FSTVrY23m5tdwDFxqjVL4OHyR/zSkPIu1BhKVJofW+l0I93moevs7CWTD+3ZWA/m8OtKpxYV3CQ30OlNJA==", + "license": "MIT", + "dependencies": { + "object-property-assigner": "^1.3.0", + "object-property-extractor": "^1.0.11" + }, + "peerDependencies": { + "react": ">=16.0.0" + } + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -5837,6 +5851,18 @@ "node": ">=0.10.0" } }, + "node_modules/object-property-assigner": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object-property-assigner/-/object-property-assigner-1.3.0.tgz", + "integrity": "sha512-19A0RsC9rP9klCKHDPL/MeERxeopV9wyMNfP+eD2uKOafzLjF+OUEN4FoP6RAlCFHmerBPJ4ohNv/WrgaNpeIA==", + "license": "MIT" + }, + "node_modules/object-property-extractor": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-property-extractor/-/object-property-extractor-1.0.11.tgz", + "integrity": "sha512-VnDQcyN0FTXZ0hMZS/CTb2QkIssZ9XKB8zlf5rnFh1HjFQX1P73EHawavSztBOiPDGqAPNXebv4agjhF9eACAw==", + "license": "MIT" + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", diff --git a/package.json b/package.json index 1a42171..7d81dae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pashto-inflector-website", - "version": "7.6.5", + "version": "7.7.0", "type": "module", "scripts": { "patch": "npm version patch --no-git-tag-version && cd src/lib && npm version patch --no-git-tag-version && cd ../components && npm version patch --no-git-tag-version", @@ -14,12 +14,13 @@ "build-website": "tsc -b && vite build", "build-components": "rm -rf src/components/dist && tsc --project src/components/tsconfig.json && cd src/components && node post-build.cjs", "build-lib": "rm -rf src/lib/dist && tsc --project src/lib/tsconfig.json && tsup src/lib/library.ts --format cjs && mv dist/library.cjs src/lib/dist/lib", - "get-words": "node get-words.cjs", + "get-words": "node get-words.cjs && tsx get-mini-dict.ts", "check-all-inflections": "tsx check-all-inflections.ts" }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", "bootstrap": "4.6.1", + "json-edit-react": "^1.15.7", "react": "^18.3.1", "react-bootstrap": "1.5.1", "react-dom": "^18.3.1", diff --git a/src/App.tsx b/src/App.tsx index 1ef3bd1..9020946 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -19,7 +19,7 @@ import { entryFeeder } from "./demo-components/entryFeeder"; 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 ParserDemo from "./demo-components/ParserDemo"; // import InflectionTable from "./components/src/InflectionsTable"; function App() { @@ -31,7 +31,6 @@ function App() { defualtTextOptions, "textOpts1" ); - const [dictionaryReady, setDictionaryIsReady] = useState(false); const [theme, setTheme] = useStickyState<"light" | "dark">("light", "theme1"); const [showing, setShowing] = useState(""); function handleHiderClick(label: string) { @@ -39,14 +38,14 @@ function App() { } useEffect(() => { - console.log("WILL INIT"); dictionary .initialize() - .then(() => { - console.log("DONE INIT"); - setDictionaryIsReady(true); - }) - .catch(console.error); + .catch(console.error) + .then((res) => { + if (res && res.response === "loaded from saved") { + dictionary.update(); + } + }); }, []); useEffect(() => { @@ -99,7 +98,6 @@ function App() {

Pashto Inflector

- {dictionaryReady &&
READY
}

- handleHiderClick("parser")} > - - + + */} (""); - const [result, setResult] = useState< - ReturnType["success"] - >([]); + const [result, setResult] = useState([]); + // ReturnType["success"] const [errors, setErrors] = useState([]); function handleInput(value: string) { if (!value) { @@ -62,7 +66,11 @@ function ParserDemo({ setErrors([]); return; } - const { success, errors } = parsePhrase(tokenizer(value)); + const res = parseNoun(tokenizer(value), dictionary, undefined, []); + const success = res.filter((x) => !x.tokens.length).map((x) => x.body); + const errors = [ + ...new Set(res.flatMap(({ errors }) => errors.map((e) => e.message))), + ]; setText(value); setErrors(errors); setResult(success); @@ -127,8 +135,8 @@ function ParserDemo({

Did you mean:
)} - - {result.map((res) => + + {/* {result.map((res) => "inflected" in res ? ( ) : "verb" in res ? ( @@ -166,7 +174,7 @@ function ParserDemo({ 
{JSON.stringify(res, null, "  ")}
) - )} + )} */}
AST diff --git a/src/lib/package.json b/src/lib/package.json index be70dc0..f35087a 100644 --- a/src/lib/package.json +++ b/src/lib/package.json @@ -1,6 +1,6 @@ { "name": "@lingdocs/inflect", - "version": "7.6.5", + "version": "7.7.0", "description": "Pashto inflector library", "main": "dist/lib/library.cjs", "module": "dist/lib/library.js", diff --git a/src/lib/src/dictionary/dictionary.ts b/src/lib/src/dictionary/dictionary.ts index 07286d8..690330e 100644 --- a/src/lib/src/dictionary/dictionary.ts +++ b/src/lib/src/dictionary/dictionary.ts @@ -31,9 +31,44 @@ function nounLookup(p: string): T.NounEntry[] { return res.filter(tp.isNounEntry); } -export const dictionary = { +function otherLookup( + key: keyof T.DictionaryEntry, + p: string +): T.DictionaryEntry[] { + if (!dictDb.collection) { + return []; + } + return dictDb.collection.find({ [key]: p }); +} + +function specialPluralLookup(p: string): T.NounEntry[] { + if (!dictDb.collection) { + return []; + } + const regex = new RegExp(`(^|\\s|,)${p}($|,)`); + return dictDb.collection + .find({ + $or: [{ ppp: { $regex: regex } }, { app: { $regex: regex } }], + }) + .filter(tp.isNounEntry); +} + +export type DictionaryAPI = { + initialize: () => ReturnType; + update: () => ReturnType; + queryP: (p: string) => T.DictionaryEntry[]; + adjLookup: (p: string) => T.AdjectiveEntry[]; + nounLookup: (p: string) => T.NounEntry[]; + otherLookup: (key: keyof T.DictionaryEntry, p: string) => T.DictionaryEntry[]; + specialPluralLookup: (p: string) => T.NounEntry[]; +}; + +export const dictionary: DictionaryAPI = { initialize: async () => await dictDb.initialize(), + update: async () => await dictDb.updateDictionary(() => null), queryP: memoizedQueryP, adjLookup: memoize(adjLookup), nounLookup: memoize(nounLookup), + otherLookup: memoize(otherLookup), + specialPluralLookup: memoize(specialPluralLookup), }; diff --git a/src/lib/src/fp-ps.ts b/src/lib/src/fp-ps.ts index d1f5c7c..cda0f4f 100644 --- a/src/lib/src/fp-ps.ts +++ b/src/lib/src/fp-ps.ts @@ -53,6 +53,20 @@ export function fmapParseResult( })); } +export function fFlatMapParseResult( + f: (x: A) => B[], + x: T.ParseResult[] +): T.ParseResult[] { + return x.flatMap>((xi) => { + const bodies = f(xi.body); + return bodies.map((body) => ({ + tokens: xi.tokens, + body, + errors: xi.errors, + })); + }); +} + export function fmapSingleOrLengthOpts( f: (x: A) => B, x: T.SingleOrLengthOpts @@ -216,3 +230,35 @@ export function mapVerbRenderedOutput( return fmapVB(v); } } + +/** + * a type predicate OR combinator + */ +export function orTp( + f: (x: A) => x is B, + g: (x: A) => x is C +): (x: A) => x is B | C { + return (x: A) => f(x) || g(x); +} + +/** + * a type predicate AND combinator + */ +export function andTp( + f: (x: A) => x is B, + g: (x: A) => x is C +): (x: A) => x is B & C { + return (x: A) => f(x) && g(x); +} + +/** + * a type predicate successive AND combinator + * the second predicate is based on the first predicate + * being true and narrows the type further + */ +export function andSuccTp( + f: (x: A) => x is B, + g: (x: B) => x is C +): (x: A) => x is B & C { + return (x: A) => f(x) && g(x); +} diff --git a/src/lib/src/inflection-pattern.ts b/src/lib/src/inflection-pattern.ts index 2b5190f..7585699 100644 --- a/src/lib/src/inflection-pattern.ts +++ b/src/lib/src/inflection-pattern.ts @@ -13,6 +13,7 @@ import { export function getInflectionPattern( e: T.InflectableEntry ): T.InflectionPattern { + if (e.noInf) return 0; return isPattern1Entry(e) ? T.InflectionPattern.Basic : isPattern2Entry(e) diff --git a/src/lib/src/inflections-and-vocative.ts b/src/lib/src/inflections-and-vocative.ts index 7a1207b..850bd2c 100644 --- a/src/lib/src/inflections-and-vocative.ts +++ b/src/lib/src/inflections-and-vocative.ts @@ -20,6 +20,7 @@ import { removeDuplicates } from "./phrase-building/vp-tools"; import { isAdjOrUnisexNounEntry, isAnimNounEntry, + isDeterminerEntry, isFemNounEntry, isInflectableEntry, isMascNounEntry, @@ -59,7 +60,6 @@ export function getInfsAndVocative( if (!isInflectableEntry(entryR)) { return false; } - // @ts-ignore const entry: T.InflectableEntry = entryR as T.InflectableEntry; const pattern = getInflectionPattern(entry); if ( @@ -77,8 +77,15 @@ export function getInfsAndVocative( }), }; } + if ("c" in entry && entry.c?.includes("fam.") && isMascNounEntry(entry)) { + return { + vocative: familialMascVocative(entry, plurals), + }; + } const gender: T.Gender | "unisex" = - isAdjOrUnisexNounEntry(entry) || isNumberEntry(entry) + isAdjOrUnisexNounEntry(entry) || + isNumberEntry(entry) || + isDeterminerEntry(entry) ? "unisex" : isMascNounEntry(entry) ? "masc" @@ -101,6 +108,20 @@ export function getInfsAndVocative( return aggregateInfsAndVoc(masc, fem); } +function familialMascVocative( + entry: T.MascNounEntry, + plurals: Plurals +): T.PluralInflections | undefined { + if (endsInConsonant(entry) || hasShwaEnding(entry)) { + const plr = genderPlural("masc", plurals); + const { vocative } = pattern1Masc({ entry, plurals: plr }); + return { + masc: [vocative[0], plr] as T.PluralInflectionSet, + }; + } + return undefined; +} + type PatternInput = { entry: T.DictionaryEntryNoFVars | T.NounEntry | T.InflectableEntry; plurals: T.PsString[]; @@ -179,17 +200,12 @@ function vocFemAnimException({ "plural missing for feminine animate exception noun " + entry.p ); } - // TODO: HANDLE BETTER WITH PLURALS! - const plurBase = mapPsString( - (x) => x.slice(0, -1), - makePsString(entry.ppp, entry.ppf) - ); const base = countSyllables(entry) === 1 ? accentOnNFromEnd(entry, 0) : psStringFromEntry(entry); return { - fem: [[concatPs(base, e)], addPlurals([concatPs(plurBase, o)], plurals)], + fem: [[concatPs(base, e)], plurals as T.ArrayOneOrMore], }; } diff --git a/src/lib/src/nouns-plural.ts b/src/lib/src/nouns-plural.ts index d800a37..aed31ba 100644 --- a/src/lib/src/nouns-plural.ts +++ b/src/lib/src/nouns-plural.ts @@ -183,8 +183,6 @@ export function makePlural( }; } function addLongVowelSuffix(gender: "masc" | "fem"): T.PluralInflectionSet { - if (pashtoPlural) { - } const base = removeEndTick(makePsString(w.p, w.f)); const baseWOutAccents = removeAccents(base); const space = diff --git a/src/lib/src/parsing/lookup.ts b/src/lib/src/parsing/lookup.ts index 6b09998..74cc575 100644 --- a/src/lib/src/parsing/lookup.ts +++ b/src/lib/src/parsing/lookup.ts @@ -69,7 +69,7 @@ function nounAdjLookup(s: Partial): T.DictionaryEntry[] { .includes(value as string) ); } - // @ts-expect-error because + // @ts-expect-error its ok return nounsAdjs.filter((e) => e[key] === value) as T.DictionaryEntry[]; } diff --git a/src/lib/src/parsing/mini-test-dictionary.ts b/src/lib/src/parsing/mini-test-dictionary.ts new file mode 100644 index 0000000..700f8a0 --- /dev/null +++ b/src/lib/src/parsing/mini-test-dictionary.ts @@ -0,0 +1,39 @@ +import * as T from "../../../types"; +import type { DictionaryAPI } from "../dictionary/dictionary"; +import { isAdjectiveEntry, isNounEntry } from "../type-predicates"; +import { entries } from "../../../../vocab/mini-dict-entries"; + +const queryP = (p: string) => entries.filter((e) => e.p === p); +function adjLookup(p: string): T.AdjectiveEntry[] { + return queryP(p).filter(isAdjectiveEntry) as T.AdjectiveEntry[]; +} + +function nounLookup(p: string): T.NounEntry[] { + return queryP(p).filter(isNounEntry) as T.NounEntry[]; +} + +function otherLookup( + key: keyof T.DictionaryEntry, + p: string +): T.DictionaryEntry[] { + return entries.filter((e) => e[key] === p); +} + +function specialPluralLookup(p: string): T.NounEntry[] { + const regex = new RegExp(`(^|\\s|,)${p}($|,)`); + return entries.filter( + (e) => (e.ppp?.match(regex) || e.app?.match(regex)) && isNounEntry(e) + ) as T.NounEntry[]; +} + +export const testDictionary: DictionaryAPI = { + // @ts-expect-error we won't mock the initialization + initialize: async () => 0, + // @ts-expect-error not perfect mocking because won't need that + update: async () => ({ response: "updated" }), + queryP, + adjLookup, + nounLookup, + otherLookup, + specialPluralLookup, +}; diff --git a/src/lib/src/parsing/parse-adjective-new.test.ts b/src/lib/src/parsing/parse-adjective-new.test.ts new file mode 100644 index 0000000..eff44b4 --- /dev/null +++ b/src/lib/src/parsing/parse-adjective-new.test.ts @@ -0,0 +1,289 @@ +import { makeAdjectiveSelection } from "../phrase-building/make-selections"; +import * as T from "../../../types"; +import { parseAdjective } from "./parse-adjective-new"; +import { tokenizer } from "./tokenizer"; +import { testDictionary } from "./mini-test-dictionary"; + +const khufa = testDictionary.adjLookup("خفه")[0]; +const ghut = testDictionary.adjLookup("غټ")[0]; +const sturey = testDictionary.adjLookup("ستړی")[0]; +const naray = testDictionary.adjLookup("نری")[0]; +const zor = testDictionary.adjLookup("زوړ")[0]; +const sheen = testDictionary.adjLookup("شین")[0]; + +const tests: { + category: string; + cases: { + input: string; + output: { + inflection: (0 | 1 | 2)[]; + gender: T.Gender[]; + selection: T.AdjectiveSelection; + }[]; + }[]; +}[] = [ + { + category: "pattern 1", + cases: [ + { + input: "غټ", + output: [ + { + selection: makeAdjectiveSelection(ghut), + inflection: [0, 1], + gender: ["masc"], + }, + ], + }, + { + input: "غټه", + output: [ + { + selection: makeAdjectiveSelection(ghut), + inflection: [0], + gender: ["fem"], + }, + ], + }, + { + input: "غټې", + output: [ + { + selection: makeAdjectiveSelection(ghut), + inflection: [1], + gender: ["fem"], + }, + ], + }, + { + input: "غټو", + output: [ + { + selection: makeAdjectiveSelection(ghut), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, + { + category: "pattern 2", + cases: [ + { + input: "ستړی", + output: [ + { + selection: makeAdjectiveSelection(sturey), + inflection: [0], + gender: ["masc"], + }, + ], + }, + { + input: "ستړې", + output: [ + { + selection: makeAdjectiveSelection(sturey), + inflection: [0, 1], + gender: ["fem"], + }, + ], + }, + { + input: "ستړو", + output: [ + { + selection: makeAdjectiveSelection(sturey), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, + { + category: "pattern 3", + cases: [ + { + input: "نری", + output: [ + { + selection: makeAdjectiveSelection(naray), + inflection: [0], + gender: ["masc"], + }, + ], + }, + { + input: "نري", + output: [ + { + selection: makeAdjectiveSelection(naray), + inflection: [1], + gender: ["masc"], + }, + ], + }, + { + input: "نرۍ", + output: [ + { + selection: makeAdjectiveSelection(naray), + inflection: [0, 1], + gender: ["fem"], + }, + ], + }, + { + input: "نرو", + output: [ + { + selection: makeAdjectiveSelection(naray), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + { + input: "نریو", + output: [ + { + selection: makeAdjectiveSelection(naray), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, + { + category: "non-inflecting", + cases: [ + { + input: "خفه", + output: [ + { + selection: makeAdjectiveSelection(khufa), + inflection: [0, 1, 2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, + { + category: "pattern 4", + cases: [ + { + input: "زوړ", + output: [ + { + selection: makeAdjectiveSelection(zor), + inflection: [0], + gender: ["masc"], + }, + ], + }, + { + input: "زاړه", + output: [ + { + selection: makeAdjectiveSelection(zor), + inflection: [1], + gender: ["masc"], + }, + ], + }, + { + input: "زړه", + output: [ + { + selection: makeAdjectiveSelection(zor), + inflection: [0], + gender: ["fem"], + }, + ], + }, + { + input: "زړې", + output: [ + { + selection: makeAdjectiveSelection(zor), + inflection: [1], + gender: ["fem"], + }, + ], + }, + { + input: "زړو", + output: [ + { + selection: makeAdjectiveSelection(zor), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, + { + category: "pattern 5", + cases: [ + { + input: "شین", + output: [ + { + selection: makeAdjectiveSelection(sheen), + inflection: [0], + gender: ["masc"], + }, + ], + }, + { + input: "شنه", + output: [ + { + selection: makeAdjectiveSelection(sheen), + inflection: [1], + gender: ["masc"], + }, + { + selection: makeAdjectiveSelection(sheen), + inflection: [0], + gender: ["fem"], + }, + ], + }, + { + input: "شنو", + output: [ + { + selection: makeAdjectiveSelection(sheen), + inflection: [2], + gender: ["masc", "fem"], + }, + ], + }, + ], + }, +]; + +describe("parsing adjectives", () => { + tests.forEach(({ category, cases }) => { + test(category, () => { + cases.forEach(({ input, output }) => { + const tokens = tokenizer(input); + const possibilities = parseAdjective(tokens, testDictionary).map( + (x) => x.body + ); + expect(possibilities).toEqual( + output.map((o) => ({ + ...o, + given: input, + })) + ); + }); + }); + }); +}); diff --git a/src/lib/src/parsing/parse-adjective-new.ts b/src/lib/src/parsing/parse-adjective-new.ts new file mode 100644 index 0000000..5a8a016 --- /dev/null +++ b/src/lib/src/parsing/parse-adjective-new.ts @@ -0,0 +1,34 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { fmapParseResult } from "../fp-ps"; +import { makeAdjectiveSelection } from "../phrase-building/make-selections"; +import * as tp from "../type-predicates"; +import { parseInflectableWord } from "./parse-inflectable-word"; + +export function parseAdjective( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult<{ + inflection: (0 | 1 | 2)[]; + gender: T.Gender[]; + given: string; + selection: T.AdjectiveSelection; +}>[] { + if (tokens.length === 0) { + return []; + } + const adjectives = parseInflectableWord( + tokens, + dictionary, + tp.isAdjectiveEntry + ); + return fmapParseResult( + (r) => ({ + inflection: r.inflection, + gender: r.gender, + given: r.given, + selection: makeAdjectiveSelection(r.entry as T.AdjectiveEntry), + }), + adjectives + ); +} diff --git a/src/lib/src/parsing/parse-fem-noun.ts b/src/lib/src/parsing/parse-fem-noun.ts new file mode 100644 index 0000000..5e95d53 --- /dev/null +++ b/src/lib/src/parsing/parse-fem-noun.ts @@ -0,0 +1,261 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { andSuccTp } from "../fp-ps"; +import { pashtoConsonants } from "../pashto-consonants"; +import * as tp from "../type-predicates"; +import { returnParseResults } from "./utils"; + +type FemNounBaseParse = T.InflectableBaseParse; + +export function parseFemNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + return [ + plainPlural, + parsePattern1, + parsePattern2, + parsePattern3, + parseEeEnding, + ].flatMap((f) => f(tokens, dictionary)); +} +function plainPlural( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const plurLookup = (p: string) => + dictionary + .queryP(p) + .filter(andSuccTp(tp.isFemNounEntry, tp.isPluralNounEntry)); + const plain = plurLookup(first.s).map((entry) => ({ + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + })); + const inflected = first.s.endsWith("و") + ? (() => { + const base = first.s.slice(0, -1); + const guesses = [first.s, base + "ه", base + "ې"]; + return guesses.flatMap(plurLookup).map((entry) => ({ + inflection: [2], + gender: ["fem"], + entry, + given: first.s, + })); + })() + : []; + return returnParseResults(rest, [...plain, ...inflected]); +} + +function parsePattern1( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const p1Lookup = (p: string) => + dictionary + .queryP(p) + .filter(andSuccTp(tp.isFemNounEntry, tp.isPattern1Entry)); + const plain = first.s.endsWith("ه") + ? p1Lookup(first.s).map((entry) => ({ + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + })) + : []; + const withoutA = pashtoConsonants.includes(first.s[first.s.length - 1]) + ? p1Lookup(first.s).map((entry) => ({ + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + })) + : []; + const inflected = first.s.endsWith("ې") + ? p1Lookup(first.s.slice(0, -1) + "ه").map((entry) => ({ + inflection: [1], + gender: ["fem"], + entry, + given: first.s, + })) + : []; + const doubleInflected = first.s.endsWith("و") + ? p1Lookup(first.s.slice(0, -1) + "ه").map((entry) => ({ + inflection: [2], + gender: ["fem"], + entry, + given: first.s, + })) + : []; + return returnParseResults(rest, [ + ...plain, + ...withoutA, + ...inflected, + ...doubleInflected, + ]); +} + +function parsePattern2( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ې")) { + return dictionary + .queryP(first.s) + .filter( + andSuccTp( + andSuccTp(tp.isFemNounEntry, tp.isPattern2Entry), + tp.isSingularEntry + ) + ) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0, 1], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("و")) { + const eGuess = first.s.endsWith("یو") + ? first.s.slice(0, -1) + : first.s.slice(0, -1) + "ې"; + return dictionary + .queryP(eGuess) + .filter(andSuccTp(tp.isFemNounEntry, tp.isPattern2Entry)) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } + return []; +} + +function parsePattern3( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ۍ")) { + return dictionary + .queryP(first.s) + .filter( + andSuccTp( + andSuccTp(tp.isFemNounEntry, tp.isPattern3Entry), + tp.isSingularEntry + ) + ) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0, 1], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("و")) { + const eGuess = first.s.endsWith("یو") + ? first.s.slice(0, -2) + "ۍ" + : first.s.slice(0, -1) + "ۍ"; + return dictionary + .queryP(eGuess) + .filter(andSuccTp(tp.isFemNounEntry, tp.isPattern3Entry)) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } + return []; +} + +function parseEeEnding( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ي")) { + return dictionary + .queryP(first.s) + .filter(tp.isPattern6FemEntry) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("ۍ")) { + return dictionary + .queryP(first.s.slice(0, -1) + "ي") + .filter(tp.isPattern6FemEntry) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [1], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("و")) { + const eGuess = first.s.endsWith("یو") + ? first.s.slice(0, -2) + "ي" + : first.s.slice(0, -1) + "ي"; + return dictionary + .queryP(eGuess) + .filter(tp.isPattern6FemEntry) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } + return []; +} diff --git a/src/lib/src/parsing/parse-inflectable-word.ts b/src/lib/src/parsing/parse-inflectable-word.ts new file mode 100644 index 0000000..0e7f1a7 --- /dev/null +++ b/src/lib/src/parsing/parse-inflectable-word.ts @@ -0,0 +1,289 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { andSuccTp, orTp } from "../fp-ps"; +import * as tp from "../type-predicates"; + +export function parseInflectableWord( + tokens: Readonly, + dictionary: DictionaryAPI, + tpf: (e: T.DictionaryEntry) => e is W +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + return [ + parseNonInflecting, + parsePattern1, + parsePattern2or3, + parsePattern4or5, + ].flatMap((f) => f(tokens, dictionary, tpf)); +} + +function parseNonInflecting( + tokens: Readonly, + dictionary: DictionaryAPI, + tpf: (e: T.DictionaryEntry) => e is W +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const matches = dictionary + .queryP(first.s) + .filter(andSuccTp(tpf, tp.isNonInflectingEntry)); + return matches.map((entry) => ({ + tokens: rest, + body: { + inflection: tp.isNounEntry(entry) ? [0, 1] : [0, 1, 2], + gender: ["masc", "fem"], + entry, + given: first.s, + }, + errors: [], + })); +} + +function parsePattern1( + tokens: Readonly, + dictionary: DictionaryAPI, + tpf: (e: T.DictionaryEntry) => e is W +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const p1Lookup = (p: string) => + dictionary + .queryP(p) + .filter( + (e) => tpf(e) && tp.isPattern1Entry(e) && !e.c.includes("fam.") + ) as T.Pattern1Entry[]; + const mascPlainOrInflected = p1Lookup(first.s).map((entry) => ({ + tokens: rest, + body: { + inflection: entry.c.includes("pl.") ? [0] : [0, 1], + gender: ["masc"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })); + const femPlain = first.s.endsWith("ه") + ? p1Lookup(first.s.slice(0, -1)).map((entry) => ({ + tokens: rest, + body: { + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + const femInflected = first.s.endsWith("ې") + ? p1Lookup(first.s.slice(0, -1)).map((entry) => ({ + tokens: rest, + body: { + inflection: [1], + gender: ["fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + const doubleInflected = first.s.endsWith("و") + ? [ + ...p1Lookup(first.s.slice(0, -1)), + ...p1Lookup(first.s.slice(0, -1) + "ه"), + ].map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["masc", "fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + return [ + ...mascPlainOrInflected, + ...femPlain, + ...femInflected, + ...doubleInflected, + ]; +} + +function parsePattern2or3( + tokens: Readonly, + dictionary: DictionaryAPI, + tpf: (e: T.DictionaryEntry) => e is W +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ی")) { + return dictionary + .queryP(first.s) + .filter(andSuccTp(tpf, orTp(tp.isPattern2Entry, tp.isPattern3Entry))) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0], + gender: ["masc"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("ي")) { + return dictionary + .queryP(first.s.slice(0, -1) + "ی") + .filter(andSuccTp(tpf, orTp(tp.isPattern2Entry, tp.isPattern3Entry))) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [1], + gender: ["masc"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("ې")) { + return dictionary + .queryP(first.s.slice(0, -1) + "ی") + .filter(andSuccTp(tpf, tp.isPattern2Entry)) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0, 1], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("ۍ")) { + return dictionary + .queryP(first.s.slice(0, -1) + "ی") + .filter(andSuccTp(tpf, tp.isPattern3Entry)) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0, 1], + gender: ["fem"], + entry, + given: first.s, + }, + errors: [], + })); + } else if (first.s.endsWith("و")) { + const eGuess = first.s.endsWith("یو") + ? first.s.slice(0, -1) + : first.s.slice(0, -1) + "ی"; + return dictionary + .queryP(eGuess) + .filter(andSuccTp(tpf, orTp(tp.isPattern2Entry, tp.isPattern3Entry))) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["masc", "fem"], + entry, + given: first.s, + }, + errors: [], + })); + } + return []; +} + +function parsePattern4or5( + tokens: Readonly, + dictionary: DictionaryAPI, + tpf: (e: T.DictionaryEntry) => e is W +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const f = andSuccTp(tpf, orTp(tp.isPattern4Entry, tp.isPattern5Entry)); + const plainMasc = dictionary + .queryP(first.s) + .filter(f) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0], + gender: ["masc"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })); + const firstMasc = first.s.endsWith("ه") + ? dictionary + .otherLookup("infap", first.s) + .filter(f) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [1], + gender: ["masc"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + const femPlain = first.s.endsWith("ه") + ? dictionary + .otherLookup("infbp", first.s.slice(0, -1)) + .filter(f) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [0], + gender: ["fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + const femFirst = first.s.endsWith("ې") + ? dictionary + .otherLookup("infbp", first.s.slice(0, -1)) + .filter(f) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [1], + gender: ["fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + const second = first.s.endsWith("و") + ? dictionary + .otherLookup("infbp", first.s.slice(0, -1)) + .filter(f) + .map((entry) => ({ + tokens: rest, + body: { + inflection: [2], + gender: ["masc", "fem"], + entry, + given: first.s, + } satisfies T.InflectableBaseParse, + errors: [], + })) + : []; + + return [...plainMasc, ...firstMasc, ...femPlain, ...femFirst, ...second]; +} diff --git a/src/lib/src/parsing/parse-irregular-plural.ts b/src/lib/src/parsing/parse-irregular-plural.ts new file mode 100644 index 0000000..c88e1b6 --- /dev/null +++ b/src/lib/src/parsing/parse-irregular-plural.ts @@ -0,0 +1,77 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import * as tp from "../type-predicates"; +import { returnParseResults } from "./utils"; + +export function parseIrregularPlural( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const plain = dictionary + .specialPluralLookup(first.s) + .filter(tp.isNounEntry) + .map>((entry) => ({ + entry, + gender: tp.isFemNounEntry(entry) ? "fem" : "masc", + inflected: false, + given: first.s, + plural: true, + })); + const inflected = first.s.endsWith("و") + ? dictionary + .specialPluralLookup(first.s.slice(0, -1) + "(ه|ې|ع)?") + .filter(tp.isNounEntry) + .map>((entry) => ({ + entry, + gender: tp.isFemNounEntry(entry) ? "fem" : "masc", + inflected: true, + given: first.s, + plural: true, + })) + : []; + const inflectedAfterLong = first.s.endsWith("وو") + ? dictionary + .specialPluralLookup(first.s.slice(0, -2)) + .filter((e) => tp.isNounEntry(e) && e.app?.endsWith("ا")) + .map>((entry) => ({ + entry, + gender: tp.isFemNounEntry(entry) ? "fem" : "masc", + inflected: true, + given: first.s, + plural: true, + })) + : []; + const inflectedAfterLongSep = (() => { + if (tokens.length < 2) { + return []; + } + if (tokens[1].s !== "وو") { + return []; + } + return returnParseResults( + tokens.slice(2), + dictionary + .specialPluralLookup(first.s) + .filter((e) => tp.isNounEntry(e) && e.app?.endsWith("ا")) + .map>((entry) => ({ + entry, + gender: tp.isFemNounEntry(entry) ? "fem" : "masc", + inflected: true, + given: first.s, + plural: true, + })) + ); + })(); + return [ + ...returnParseResults(rest, [ + ...plain, + ...inflected, + ...inflectedAfterLong, + ]), + ...inflectedAfterLongSep, + ]; +} diff --git a/src/lib/src/parsing/parse-noun.test.ts b/src/lib/src/parsing/parse-noun-new.test.ts similarity index 72% rename from src/lib/src/parsing/parse-noun.test.ts rename to src/lib/src/parsing/parse-noun-new.test.ts index 8d7ca11..51900cc 100644 --- a/src/lib/src/parsing/parse-noun.test.ts +++ b/src/lib/src/parsing/parse-noun-new.test.ts @@ -1,50 +1,53 @@ import { - makeAdjectiveSelection, + // makeAdjectiveSelection, makeNounSelection, } from "../phrase-building/make-selections"; import * as T from "../../../types"; -import { lookup, wordQuery } from "./lookup"; -import { parseNoun } from "./parse-noun"; +// import { lookup } from "./lookup"; +import { parseNoun } from "./parse-noun-new"; import { tokenizer } from "./tokenizer"; -import { isCompleteResult } from "./utils"; +// import { isCompleteResult } from "./utils"; +import { testDictionary } from "./mini-test-dictionary"; -const sor = wordQuery("سوړ", "adj"); -const zor = wordQuery("زوړ", "adj"); -const sturey = wordQuery("ستړی", "adj"); -const ghut = wordQuery("غټ", "adj"); -const sarey = wordQuery("سړی", "noun"); -const dostee = wordQuery("دوستي", "noun"); -const wreejze = wordQuery("وریژې", "noun"); -const xudza = wordQuery("ښځه", "noun"); -const kursuy = wordQuery("کرسۍ", "noun"); -const daktar = wordQuery("ډاکټر", "noun"); -const malguray = wordQuery("ملګری", "noun"); -const lmasay = wordQuery("لمسی", "noun"); -const melma = wordQuery("مېلمه", "noun"); -const shpoon = wordQuery("شپون", "noun"); -const tanoor = wordQuery("تنور", "noun"); -const kor = wordQuery("کور", "noun"); -const khur = wordQuery("خر", "noun"); -const ghur = wordQuery("غر", "noun"); -const mor = wordQuery("مور", "noun"); -const plaar = wordQuery("پلار", "noun"); -const oobu = wordQuery("اوبه", "noun"); -const ghanum = wordQuery("غنم", "noun"); -const laar = wordQuery("لار", "noun"); -const qaazee = wordQuery("قاضي", "noun"); -const waadu = wordQuery("واده", "noun"); -const maamaa = wordQuery("ماما", "noun"); -const peesho = wordQuery("پیشو", "noun"); -const duaa = wordQuery("دعا", "noun"); -const zooy = wordQuery("زوی", "noun"); -const nabee = wordQuery("نبي", "noun"); -const lafz = wordQuery("لفظ", "noun"); +// const sor = testDictionary.adjLookup("سوړ")[0]; +// const zor = testDictionary.adjLookup("زوړ")[0]; +// const sturey = testDictionary.adjLookup("ستړی")[0]; +// const ghut = testDictionary.adjLookup("غټ")[0]; +const sarey = testDictionary.nounLookup("سړی")[0]; +const dostee = testDictionary.nounLookup("دوستي")[0]; +const wreejze = testDictionary.nounLookup("وریژې")[0]; +const xudza = testDictionary.nounLookup("ښځه")[0]; +const hatkaruy = testDictionary.nounLookup("هتکړۍ")[0]; +const kursuy = testDictionary.nounLookup("کرسۍ")[0]; +const daktar = testDictionary.nounLookup("ډاکټر")[0]; +const malguray = testDictionary.nounLookup("ملګری")[0]; +const lmasay = testDictionary.nounLookup("لمسی")[0]; +const melma = testDictionary.nounLookup("مېلمه")[0]; +const shpoon = testDictionary.nounLookup("شپون")[0]; +const tanoor = testDictionary.nounLookup("تنور")[0]; +const kor = testDictionary.nounLookup("کور")[0]; +const khur = testDictionary.nounLookup("خر")[0]; +const ghur = testDictionary.nounLookup("غر")[0]; +const mor = testDictionary.nounLookup("مور")[0]; +const plaar = testDictionary.nounLookup("پلار")[0]; +const oobu = testDictionary.nounLookup("اوبه")[0]; +const ghanum = testDictionary.nounLookup("غنم")[0]; +const laar = testDictionary.nounLookup("لار")[0]; +const qaazee = testDictionary.nounLookup("قاضي")[0]; +const waadu = testDictionary.nounLookup("واده")[0]; +const maamaa = testDictionary.nounLookup("ماما")[0]; +const peesho = testDictionary.nounLookup("پیشو")[0]; +const kaarghu = testDictionary.nounLookup("کارغه")[0]; +const aloo = testDictionary.nounLookup("الو")[0]; +const duaa = testDictionary.nounLookup("دعا")[0]; +const zooy = testDictionary.nounLookup("زوی")[0]; +const loor = testDictionary.nounLookup("لور")[0]; +const nabee = testDictionary.nounLookup("نبي")[0]; +const lafz = testDictionary.nounLookup("لفظ")[0]; // TODO: test for adjective errors etc -// TODO: زړو should not be hearts // bundled plural - -// TODO: FIX ماماګان +// TODO: منابع const tests: { category: string; @@ -211,6 +214,12 @@ const tests: { }, ], }, + ], + }, + { + category: "group/plural nouns", + // to do fem plural تسبیج, هټکرۍ, مایع + cases: [ { input: "وریژې", output: [ @@ -236,7 +245,97 @@ const tests: { }, ], }, - // fem nouns missing ه + { + input: "اوبه", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(oobu, undefined), + number: "plural", + gender: "fem", + }, + }, + ], + }, + { + input: "اوبو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(oobu, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "هتکړۍ", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(hatkaruy, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "هتکړیو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(hatkaruy, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "هتکړو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(hatkaruy, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "غنم", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(ghanum, undefined), + number: "plural", + gender: "masc", + }, + }, + ], + }, + { + input: "غنمو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(ghanum, undefined), + number: "plural", + }, + }, + ], + }, + ], + }, + { + category: "fem nouns missing ه", + cases: [ { input: "لار", output: [ @@ -690,7 +789,6 @@ const tests: { }, { category: "pattern 5", - // TODO: should غر also be considered inflected? cases: [ { input: "غر", @@ -826,82 +924,43 @@ const tests: { ], }, { - category: "irregular words", + category: "misc people words", cases: [ { - input: "اوبه", + input: "پلار", output: [ { inflected: false, selection: { - ...makeNounSelection(oobu, undefined), - number: "plural", - gender: "fem", + ...makeNounSelection(plaar, undefined), + gender: "masc", }, }, - ], - }, - { - input: "اوبو", - output: [ { inflected: true, - selection: { - ...makeNounSelection(oobu, undefined), - number: "plural", - }, - }, - ], - }, - { - input: "غنم", - output: [ - { - inflected: false, - selection: { - ...makeNounSelection(ghanum, undefined), - number: "plural", - gender: "masc", - }, + selection: makeNounSelection(plaar, undefined), }, ], }, { - input: "غنمو", - output: [ - { - inflected: true, - selection: { - ...makeNounSelection(ghanum, undefined), - number: "plural", - }, - }, - ], + input: "پلارو", + output: [], }, { - input: "پلار", + input: "قاضي", output: [ { inflected: false, selection: { - ...makeNounSelection(plaar, undefined), + ...makeNounSelection(qaazee, undefined), gender: "masc", }, }, - { - inflected: true, - selection: makeNounSelection(plaar, undefined), - }, - ], - }, - { - input: "پلارو", - output: [ { inflected: true, selection: { - ...makeNounSelection(plaar, undefined), - number: "plural", + ...makeNounSelection(qaazee, undefined), + gender: "masc", }, }, ], @@ -920,36 +979,22 @@ const tests: { ], }, { - input: "مورو", - output: [ - { - inflected: true, - selection: { - ...makeNounSelection(mor, undefined), - number: "plural", - }, - }, - ], - }, - { - input: "قاضي", + input: "لور", output: [ { inflected: false, - selection: { - ...makeNounSelection(qaazee, undefined), - gender: "masc", - }, + selection: makeNounSelection(loor, undefined), }, { inflected: true, - selection: { - ...makeNounSelection(qaazee, undefined), - gender: "masc", - }, + selection: makeNounSelection(loor, undefined), }, ], }, + { + input: "مورو", + output: [], + }, { input: "ماما", output: [ @@ -1095,18 +1140,6 @@ const tests: { }, ], }, - { - input: "پلارانې", - output: [], - }, - { - input: "پلارګان", - output: [], - }, - { - input: "پلارګانو", - output: [], - }, { input: "پلارانو", output: [ @@ -1120,71 +1153,60 @@ const tests: { ], }, { - input: "دعاګانې", + input: "کارغان", output: [ { inflected: false, selection: { - ...makeNounSelection(duaa, undefined), + ...makeNounSelection(kaarghu, undefined), number: "plural", }, }, ], }, { - input: "دعاګانو", + input: "کارغانو", output: [ { inflected: true, selection: { - ...makeNounSelection(duaa, undefined), + ...makeNounSelection(kaarghu, undefined), number: "plural", }, }, ], }, - // TODO: FIX THIS!! - // { - // input: "ماماګان", - // output: [ - // { - // inflected: false, - // selection: { - // ...makeNounSelection(maamaa, undefined), - // number: "plural", - // }, - // }, - // ], - // }, - // { - // input: "ماماګانو", - // output: [ - // { - // inflected: true, - // selection: { - // ...makeNounSelection(maamaa, undefined), - // number: "plural", - // }, - // }, - // ], - // }, + ], + }, + { + category: "plurals with -aane", + cases: [ { - input: "ډاکټران", + input: "ډاکټرانې", output: [ { inflected: false, selection: { ...makeNounSelection(daktar, undefined), number: "plural", + gender: "fem", }, }, ], }, { - input: "ډاکټرانې", + input: "ډاکټرانو", output: [ { - inflected: false, + inflected: true, + selection: { + ...makeNounSelection(daktar, undefined), + number: "plural", + gender: "masc", + }, + }, + { + inflected: true, selection: { ...makeNounSelection(daktar, undefined), number: "plural", @@ -1193,172 +1215,207 @@ const tests: { }, ], }, + ], + }, + { + category: "plurals with -gaan", + cases: [ { - input: "ډاکټرانو", + input: "ماماګان", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(maamaa, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "ماماګانو", output: [ { inflected: true, selection: { - ...makeNounSelection(daktar, undefined), + ...makeNounSelection(maamaa, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "الوګان", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(aloo, undefined), number: "plural", - gender: "masc", }, }, + ], + }, + { + input: "الوګانو", + output: [ { inflected: true, selection: { - ...makeNounSelection(daktar, undefined), + ...makeNounSelection(aloo, undefined), number: "plural", - gender: "fem", }, }, ], }, + { + input: "پیسوګان", + output: [], + }, ], }, { - category: "plurals with -we", + category: "plurals with -gaane / -we", cases: [ { - input: "دعاوې", + input: "دعاګانې", output: [ { inflected: false, selection: { ...makeNounSelection(duaa, undefined), - gender: "fem", number: "plural", }, }, ], }, { - input: "دعاوو", + input: "دعاګانو", output: [ { inflected: true, selection: { ...makeNounSelection(duaa, undefined), - gender: "fem", number: "plural", }, }, ], }, - ], - }, - { - category: "irregular plurals", - cases: [ { - input: "میندې", + input: "دعا ګانې", output: [ { inflected: false, selection: { - ...makeNounSelection(mor, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, { - input: "میندو", + input: "دعا ګانو", output: [ { inflected: true, selection: { - ...makeNounSelection(mor, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, { - input: "زامن", + input: "دعاوې", output: [ { inflected: false, selection: { - ...makeNounSelection(zooy, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, { - input: "زامنو", + input: "دعاوو", output: [ { inflected: true, selection: { - ...makeNounSelection(zooy, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, - ], - }, - { - category: "arabic plurals", - cases: [ { - input: "الفاظ", + input: "دعا وې", output: [ { inflected: false, selection: { - ...makeNounSelection(lafz, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, { - input: "الفاظو", + input: "دعا وو", output: [ { inflected: true, selection: { - ...makeNounSelection(lafz, undefined), + ...makeNounSelection(duaa, undefined), number: "plural", }, }, ], }, { - input: "نبي", + input: "دوستي ګانې", output: [ { inflected: false, - selection: makeNounSelection(nabee, undefined), + selection: { + ...makeNounSelection(dostee, undefined), + number: "plural", + }, }, + ], + }, + { + input: "دوستي ګانو", + output: [ { inflected: true, - selection: makeNounSelection(nabee, undefined), + selection: { + ...makeNounSelection(dostee, undefined), + number: "plural", + }, }, ], }, { - input: "انبیا", + input: "دوستیګانې", output: [ { inflected: false, selection: { - ...makeNounSelection(nabee, undefined), + ...makeNounSelection(dostee, undefined), number: "plural", }, }, ], }, { - input: "انبیاوو", + input: "دوستیګانو", output: [ { inflected: true, selection: { - ...makeNounSelection(nabee, undefined), + ...makeNounSelection(dostee, undefined), number: "plural", }, }, @@ -1366,133 +1423,204 @@ const tests: { }, ], }, -]; - -describe("parsing nouns", () => { - tests.forEach(({ category, cases }) => { - test(category, () => { - cases.forEach(({ input, output }) => { - const tokens = tokenizer(input); - const res = parseNoun(tokens, lookup, undefined, []).map( - ({ body }) => body - ); - expect(res).toEqual(output); - }); - }); - }); -}); - -const adjsTests: { - category: string; - cases: { - input: string; - output: { inflected: boolean; selection: T.NounSelection }[]; - }[]; -}[] = [ { - category: "agreement with regular nouns", + category: "irregular familial plurals", cases: [ { - input: "زاړه سړي", + input: "میندې", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(mor, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "میندو", output: [ { inflected: true, selection: { - ...makeNounSelection(sarey, undefined), - adjectives: [makeAdjectiveSelection(zor)], + ...makeNounSelection(mor, undefined), + number: "plural", }, }, + ], + }, + // also should be able to search for all variations of Pashto plural + { + input: "میېندې", + output: [ { inflected: false, selection: { - ...makeNounSelection(sarey, undefined), - adjectives: [makeAdjectiveSelection(zor)], + ...makeNounSelection(mor, undefined), number: "plural", }, }, ], }, { - input: "غټو ستړو ښځو", + input: "میېندو", output: [ { inflected: true, selection: { - ...makeNounSelection(xudza, undefined), - adjectives: [ - makeAdjectiveSelection(ghut), - makeAdjectiveSelection(sturey), - ], + ...makeNounSelection(mor, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "مورو", + output: [], + }, + { + input: "لوڼو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(loor, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "لورو", + output: [], + }, + { + input: "زامن", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(zooy, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "زامنو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(zooy, undefined), number: "plural", }, }, ], }, { - input: "غټو ستړې ښځو", + input: "زویو", output: [], }, + { + input: "پلرونه", + output: [ + { + inflected: false, + selection: { + ...makeNounSelection(plaar, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "پلرونو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(plaar, undefined), + number: "plural", + }, + }, + ], + }, ], }, { - category: "agreement with plural nouns", + category: "arabic plurals", cases: [ { - input: "سړې اوبه", + input: "الفاظ", output: [ { inflected: false, selection: { - ...makeNounSelection(oobu, undefined), - gender: "fem", + ...makeNounSelection(lafz, undefined), number: "plural", - adjectives: [makeAdjectiveSelection(sor)], }, }, ], }, { - input: "زاړه غنم", + input: "الفاظو", output: [ { - inflected: false, + inflected: true, selection: { - ...makeNounSelection(ghanum, undefined), + ...makeNounSelection(lafz, undefined), number: "plural", - adjectives: [makeAdjectiveSelection(zor)], }, }, ], }, { - input: "زوړ غنم", - output: [], + input: "نبي", + output: [ + { + inflected: false, + selection: makeNounSelection(nabee, undefined), + }, + { + inflected: true, + selection: makeNounSelection(nabee, undefined), + }, + ], }, { - input: "زاړه کورونه", + input: "انبیا", output: [ { inflected: false, selection: { - ...makeNounSelection(kor, undefined), + ...makeNounSelection(nabee, undefined), number: "plural", - adjectives: [makeAdjectiveSelection(zor)], }, }, ], }, { - input: "غټو زړو کورونو", + input: "انبیاوو", output: [ { inflected: true, selection: { - ...makeNounSelection(kor, undefined), + ...makeNounSelection(nabee, undefined), + number: "plural", + }, + }, + ], + }, + { + input: "انبیا وو", + output: [ + { + inflected: true, + selection: { + ...makeNounSelection(nabee, undefined), number: "plural", - adjectives: [ - makeAdjectiveSelection(ghut), - makeAdjectiveSelection(zor), - ], }, }, ], @@ -1501,16 +1629,150 @@ const adjsTests: { }, ]; -describe("parsing nouns with adjectives", () => { - adjsTests.forEach(({ category, cases }) => { +describe("parsing nouns", () => { + tests.forEach(({ category, cases }) => { test(category, () => { cases.forEach(({ input, output }) => { const tokens = tokenizer(input); - const res = parseNoun(tokens, lookup, undefined, []) - .filter(isCompleteResult) - .map(({ body }) => body); + const res = parseNoun(tokens, testDictionary, undefined, []).flatMap( + // only take the ones that used all the tokens + ({ body, tokens }) => (tokens.length === 0 ? [body] : []) + ); expect(res).toEqual(output); }); }); }); }); + +// const adjsTests: { +// category: string; +// cases: { +// input: string; +// output: { inflected: boolean; selection: T.NounSelection }[]; +// }[]; +// }[] = [ +// { +// category: "agreement with regular nouns", +// cases: [ +// { +// input: "زاړه سړي", +// output: [ +// { +// inflected: true, +// selection: { +// ...makeNounSelection(sarey, undefined), +// adjectives: [makeAdjectiveSelection(zor)], +// }, +// }, +// { +// inflected: false, +// selection: { +// ...makeNounSelection(sarey, undefined), +// adjectives: [makeAdjectiveSelection(zor)], +// number: "plural", +// }, +// }, +// ], +// }, +// { +// input: "غټو ستړو ښځو", +// output: [ +// { +// inflected: true, +// selection: { +// ...makeNounSelection(xudza, undefined), +// adjectives: [ +// makeAdjectiveSelection(ghut), +// makeAdjectiveSelection(sturey), +// ], +// number: "plural", +// }, +// }, +// ], +// }, +// { +// input: "غټو ستړې ښځو", +// output: [], +// }, +// ], +// }, +// { +// category: "agreement with plural nouns", +// cases: [ +// { +// input: "سړې اوبه", +// output: [ +// { +// inflected: false, +// selection: { +// ...makeNounSelection(oobu, undefined), +// gender: "fem", +// number: "plural", +// adjectives: [makeAdjectiveSelection(sor)], +// }, +// }, +// ], +// }, +// { +// input: "زاړه غنم", +// output: [ +// { +// inflected: false, +// selection: { +// ...makeNounSelection(ghanum, undefined), +// number: "plural", +// adjectives: [makeAdjectiveSelection(zor)], +// }, +// }, +// ], +// }, +// { +// input: "زوړ غنم", +// output: [], +// }, +// { +// input: "زاړه کورونه", +// output: [ +// { +// inflected: false, +// selection: { +// ...makeNounSelection(kor, undefined), +// number: "plural", +// adjectives: [makeAdjectiveSelection(zor)], +// }, +// }, +// ], +// }, +// { +// input: "غټو زړو کورونو", +// output: [ +// { +// inflected: true, +// selection: { +// ...makeNounSelection(kor, undefined), +// number: "plural", +// adjectives: [ +// makeAdjectiveSelection(ghut), +// makeAdjectiveSelection(zor), +// ], +// }, +// }, +// ], +// }, +// ], +// }, +// ]; + +// describe("parsing nouns with adjectives", () => { +// adjsTests.forEach(({ category, cases }) => { +// test(category, () => { +// cases.forEach(({ input, output }) => { +// const tokens = tokenizer(input); +// const res = parseNoun(tokens, lookup, undefined, []) +// .filter(isCompleteResult) +// .map(({ body }) => body); +// expect(res).toEqual(output); +// }); +// }); +// }); +// }); diff --git a/src/lib/src/parsing/parse-noun-new.ts b/src/lib/src/parsing/parse-noun-new.ts new file mode 100644 index 0000000..f04a657 --- /dev/null +++ b/src/lib/src/parsing/parse-noun-new.ts @@ -0,0 +1,103 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { makeNounSelection } from "../phrase-building/make-selections"; +import { parseAdjective } from "./parse-adjective-new"; +import { parseNounWord } from "./parse-noun-word"; +import { bindParseResult } from "./utils"; + +type NounResult = { inflected: boolean; selection: T.NounSelection }; + +// ISSUES - fem nouns like ښځه کتابچه not working +// زاړه مېلمانه adjective agreement problem + +export function parseNoun( + tokens: Readonly, + dictionary: DictionaryAPI, + possesor: T.PossesorSelection | undefined, + adjectives: { + inflection: (0 | 1 | 2)[]; + gender: T.Gender[]; + given: string; + selection: T.AdjectiveSelection; + }[] +): T.ParseResult[] { + if (tokens.length === 0) { + return []; + } + // TODO: add recognition of او between adjectives + const withAdj = bindParseResult( + parseAdjective(tokens, dictionary), + (tkns, adj) => parseNoun(tkns, dictionary, possesor, [...adjectives, adj]) + ); + const nounWord = parseNounWord(tokens, dictionary); + // fit together with nouns + const nouns = bindParseResult(nounWord, (tkns, nr) => { + const { error: adjErrors } = adjsMatch( + adjectives, + nr.gender, + nr.inflected ? 1 : 0, + nr.plural + ); + const s = makeNounSelection(nr.entry, undefined); + const body: NounResult = { + inflected: nr.inflected, + selection: { + ...s, + gender: nr.gender, + number: nr.plural ? "plural" : "singular", + adjectives: adjectives.map((a) => a.selection), + possesor, + }, + }; + return [ + { + body, + tokens: tkns, + errors: adjErrors.map((x) => ({ message: x })), + }, + ]; + }); + return [...nouns, ...withAdj]; +} + +function adjsMatch( + adjectives: Parameters[3], + gender: T.Gender, + inf: 0 | 1 | 2, + plural: boolean | undefined +): { ok: boolean; error: string[] } { + const inflection = (plural && inf < 2 ? inf + 1 : inf) as 0 | 1 | 2; + const unmatching = adjectives.filter( + (adj) => + !adj.gender.includes(gender) || + !adj.inflection.some((i) => i === inflection) + ); + if (unmatching.length) { + return { + ok: false, + error: unmatching.map((x) => { + const adjText = + x.given === x.selection.entry.p + ? x.given + : `${x.given} (${x.selection.entry.p})`; + const inflectionIssue = !x.inflection.some((x) => x === inflection) + ? ` should be ${showInflection(inflection)}` + : ``; + return `Adjective agreement error: ${adjText} should be ${inflectionIssue} ${gender}.`; + }), + }; + } else { + return { + ok: true, + error: [], + }; + } +} + +function showInflection(inf: 0 | 1 | 2): string { + return inf === 0 + ? "plain" + : inf === 1 + ? "first inflection" + : "second inflection"; +} diff --git a/src/lib/src/parsing/parse-noun-word.ts b/src/lib/src/parsing/parse-noun-word.ts new file mode 100644 index 0000000..cfc1480 --- /dev/null +++ b/src/lib/src/parsing/parse-noun-word.ts @@ -0,0 +1,117 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { fFlatMapParseResult } from "../fp-ps"; +import { getInflectionPattern } from "../inflection-pattern"; +import { makeNounSelection } from "../phrase-building/make-selections"; +import { isNounEntry, isPluralNounEntry } from "../type-predicates"; +import { parseInflectableWord } from "./parse-inflectable-word"; +import { parseFemNoun } from "./parse-fem-noun"; +import { parsePluralEndingNoun } from "./parse-plural-ending-noun"; +import { parseIrregularPlural } from "./parse-irregular-plural"; + +export function parseNounWord( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const withoutPluralEndings = fFlatMapParseResult( + inflectableBaseParseToNounWordResults, + [ + ...parseInflectableWord(tokens, dictionary, isNounEntry), + ...parseFemNoun(tokens, dictionary), + ] + ); + return [ + ...withoutPluralEndings, + ...parsePluralEndingNoun(tokens, dictionary), + ...parseIrregularPlural(tokens, dictionary), + ]; +} + +function inflectableBaseParseToNounWordResults( + wr: T.InflectableBaseParse +): T.ParsedNounWord[] { + function gendersWorkWithSelection( + genders: T.Gender[], + selection: T.NounSelection + ): T.Gender[] { + return genders.filter((g) => { + if (selection.genderCanChange) { + return true; + } + return selection.gender === g; + }); + } + const possibleGenders = gendersWorkWithSelection( + wr.gender, + makeNounSelection(wr.entry, undefined) + ); + return possibleGenders.flatMap((gender) => + wr.inflection.flatMap((inflection) => + convertInflection(inflection, wr.entry, gender).flatMap( + ({ inflected, number }) => ({ + inflected, + plural: number === "plural", + gender, + given: wr.given, + entry: wr.entry, + }) + ) + ) + ); +} + +function convertInflection( + inflection: 0 | 1 | 2, + entry: T.NounEntry, + gender: T.Gender +): { + inflected: boolean; + number: T.NounNumber; +}[] { + const plural = isPluralNounEntry(entry); + const pattern = getInflectionPattern(entry); + const inf = (plural && inflection < 2 ? inflection + 1 : inflection) as + | 0 + | 1 + | 2; + if (inf === 0) { + return [ + { + inflected: false, + number: "singular", + }, + ]; + } else if (inf === 1) { + return [ + ...(!plural && + !(pattern === 4 && entry.p.endsWith("ه") && gender === "masc") + ? [ + { + inflected: true, + number: "singular" as T.NounNumber, + }, + ] + : []), + ...(pattern > 1 || + (pattern > 0 && gender === "fem") || + (isNounEntry(entry) && isPluralNounEntry(entry)) || + plural + ? [ + { + inflected: false, + number: "plural" as T.NounNumber, + }, + ] + : []), + ]; + } + return [ + { + inflected: true, + number: "plural", + }, + ]; +} diff --git a/src/lib/src/parsing/parse-plural-ending-noun.ts b/src/lib/src/parsing/parse-plural-ending-noun.ts new file mode 100644 index 0000000..2dab141 --- /dev/null +++ b/src/lib/src/parsing/parse-plural-ending-noun.ts @@ -0,0 +1,620 @@ +import * as T from "../../../types"; +import { DictionaryAPI } from "../dictionary/dictionary"; +import { + endsInAaOrOo, + endsInConsonant, + endsWith, + hasShwaEnding, +} from "../p-text-helpers"; +import * as tp from "../type-predicates"; +import { returnParseResults } from "./utils"; + +export function parsePluralEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + // TODO: should maybe differentiate animate and inanimate aan endings ? + return [ + // parseSpecialPlural, + parseOonaEndingNoun, + parseAanEndingNoun, + parseAaneEndingNoun, + parseGaanEndingNoun, + parseGaaneEndingNoun, + parseWeEndingNoun, + parseIYaanEndingNoun, + parseIYaaneEndingNoun, + ].flatMap((f) => f(tokens, dictionary)); +} + +// function parseSpecialPlural( +// tokens: Readonly, +// dictionary: DictionaryAPI +// ): T.ParseResult>[] { +// if (tokens.length === 0) { +// return []; +// } +// const [first, ...rest] = tokens; +// if (first.s.endsWith("یانې")) { +// const withoutIYaane = first.s.slice(0, -4); +// const eeEnding = dictionary +// .queryP(withoutIYaane + "ي") +// .filter(tp.isFemNounEntry); +// const pattern3UnisexAnim = dictionary +// .queryP(withoutIYaane + "ی") +// .filter( +// (e) => tp.isUnisexNounEntry(e) && tp.isPattern3Entry(e) +// ) as T.MascNounEntry[]; +// const pattern3Fem = dictionary +// .queryP(withoutIYaane + "ۍ") +// .filter((e) => tp.isFemNounEntry(e) && tp.isPattern3Entry(e)); +// return returnParseResults( +// rest, +// [...eeEnding, ...pattern3UnisexAnim, ...pattern3Fem].map< +// T.ParsedNounWord +// >((entry) => ({ +// inflected: false, +// gender: "masc", +// given: first.s, +// plural: true, +// entry, +// })) +// ); +// } +// if (first.s.endsWith("یانو")) { +// const withoutIYaano = first.s.slice(0, -4); +// const eeEnding = dictionary +// .queryP(withoutIYaano + "ي") +// .filter((e) => tp.isFemNounEntry(e) && tp.isSingularEntry(e)); +// const pattern3Anim = dictionary +// .queryP(withoutIYaano + "ۍ") +// .filter((e) => tp.isFemNounEntry(e) && tp.isPattern3Entry(e)); +// return returnParseResults( +// rest, +// [...eeEnding, ...pattern3Anim].map>( +// (entry) => ({ +// inflected: true, +// gender: "masc", +// given: first.s, +// plural: true, +// entry, +// }) +// ) +// ); +// } +// return []; +// } + +function parseOonaEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (!first.s.endsWith("ونه") && !first.s.endsWith("ونو")) { + return []; + } + const withoutOona = first.s.slice(0, -3); + const consonantEnding = dictionary + .queryP(withoutOona) + .filter( + (e) => + tp.isMascNounEntry(e) && + endsInConsonant(e) && + !e.ppp && + tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const shwaEnding = dictionary + .queryP(withoutOona + "ه") + .filter( + (e) => + tp.isMascNounEntry(e) && + hasShwaEnding(e) && + !e.ppp && + tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const body = [...consonantEnding, ...shwaEnding].map< + T.ParsedNounWord + >((entry) => ({ + inflected: first.s.endsWith("ونو"), + gender: "masc", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); +} + +function parseAanEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ان")) { + const withoutAan = first.s.slice(0, -2); + const consonantEnding = dictionary + .queryP(withoutAan) + .filter( + (e) => + tp.isMascNounEntry(e) && endsInConsonant(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const shwaEnding = dictionary + .queryP(withoutAan + "ه") + .filter( + (e) => + tp.isMascNounEntry(e) && hasShwaEnding(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const body = [...consonantEnding, ...shwaEnding].map< + T.ParsedNounWord + >((entry) => ({ + inflected: false, + gender: "masc", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (first.s.endsWith("انو")) { + const withoutAano = first.s.slice(0, -3); + const consonantEnding = dictionary + .queryP(withoutAano) + .filter( + (e) => + tp.isMascNounEntry(e) && endsInConsonant(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const shwaEnding = dictionary + .queryP(withoutAano + "ه") + .filter( + (e) => + tp.isMascNounEntry(e) && hasShwaEnding(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const body = [...consonantEnding, ...shwaEnding].flatMap< + T.ParsedNounWord + >((entry) => [ + { + inflected: true, + gender: "masc", + given: first.s, + plural: true, + entry, + }, + ...(tp.isUnisexAnimNounEntry(entry) + ? [ + { + inflected: true, + gender: "fem", + given: first.s, + plural: true, + entry, + } satisfies T.ParsedNounWord, + ] + : []), + ]); + return returnParseResults(rest, body); + } + return []; +} + +function parseAaneEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("انې")) { + const withoutAane = first.s.slice(0, -3); + const unisexAy = dictionary + .queryP(withoutAane) + .filter(tp.isUnisexAnimNounEntry); + const body = unisexAy.map>( + (entry) => ({ + inflected: false, + gender: "fem", + given: first.s, + plural: true, + entry, + }) + ); + return returnParseResults(rest, body); + } + return []; +} + +function parseGaanEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("ګان")) { + const body = dictionary + .queryP(first.s.slice(0, -3)) + .filter( + (e) => tp.isMascNounEntry(e) && endsInAaOrOo(e) && tp.isSingularEntry(e) + ) + .map>((entry) => ({ + inflected: false, + gender: "masc", + given: first.s, + plural: true, + entry: entry as T.MascNounEntry, + })); + return returnParseResults(rest, body); + } + if (first.s.endsWith("ګانو")) { + const body = dictionary + .queryP(first.s.slice(0, -4)) + .filter( + (e) => tp.isMascNounEntry(e) && endsInAaOrOo(e) && tp.isSingularEntry(e) + ) + .map>((entry) => ({ + inflected: true, + gender: "masc", + given: first.s, + plural: true, + entry: entry as T.MascNounEntry, + })); + return returnParseResults(rest, body); + } + if (tokens.length >= 2) { + const [first, next, ...rest] = tokens; + if (next.s === "ګان") { + const body = dictionary + .queryP(first.s) + .filter( + (e) => + tp.isMascNounEntry(e) && endsInAaOrOo(e) && tp.isSingularEntry(e) + ) + .map>((entry) => ({ + inflected: false, + gender: "masc", + given: first.s + " " + next.s, + plural: true, + entry: entry as T.MascNounEntry, + })); + return returnParseResults(rest, body); + } + if (next.s === "ګانو") { + const body = dictionary + .queryP(first.s) + .filter( + (e) => + tp.isMascNounEntry(e) && endsInAaOrOo(e) && tp.isSingularEntry(e) + ) + .map>((entry) => ({ + inflected: true, + gender: "masc", + given: first.s + " " + next.s, + plural: true, + entry: entry as T.MascNounEntry, + })); + return returnParseResults(rest, body); + } + } + return []; +} + +function parseGaaneEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const canTakeGaane = (e: T.DictionaryEntry): e is T.FemNounEntry => + tp.isFemNounEntry(e) && + tp.isSingularEntry(e) && + endsWith( + [ + { p: "و", f: "o" }, + { p: "ا", f: "aa" }, + { p: "ې", f: "e" }, + { p: "ي", f: "ee" }, + ], + e + ); + if (first.s.endsWith("یګانې")) { + const body = dictionary + .queryP(first.s.slice(0, -5) + "ي") + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: false, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (first.s.endsWith("ګانې")) { + const body = dictionary + .queryP(first.s.slice(0, -4)) + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: false, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (first.s.endsWith("یګانو")) { + const body = dictionary + .queryP(first.s.slice(0, -5) + "ي") + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: true, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (first.s.endsWith("ګانو")) { + const body = dictionary + .queryP(first.s.slice(0, -4)) + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: true, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (tokens.length >= 2) { + const [first, next, ...rest] = tokens; + if (next.s === "ګانې") { + const body = dictionary + .queryP(first.s) + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: false, + gender: "fem", + given: first.s + " " + next.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (next.s === "ګانو") { + const body = dictionary + .queryP(first.s) + .filter(canTakeGaane) + .map>((entry) => ({ + inflected: true, + gender: "fem", + given: first.s + " " + next.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + } + return []; +} + +function parseWeEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + const canTakeWe = (e: T.DictionaryEntry): e is T.FemNounEntry => + tp.isFemNounEntry(e) && + tp.isSingularEntry(e) && + endsWith( + [ + { p: "و", f: "o" }, + { p: "ا", f: "aa" }, + { p: "ې", f: "e" }, + ], + e + ); + if (first.s.endsWith("وې")) { + const body = dictionary + .queryP(first.s.slice(0, -2)) + .filter(canTakeWe) + .map>((entry) => ({ + inflected: false, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } else if (first.s.endsWith("وو")) { + const body = dictionary + .queryP(first.s.slice(0, -2)) + .filter(canTakeWe) + .map>((entry) => ({ + inflected: true, + gender: "fem", + given: first.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (tokens.length >= 2) { + const [first, next, ...rest] = tokens; + if (next.s === "وې") { + const body = dictionary + .queryP(first.s) + .filter(canTakeWe) + .map>((entry) => ({ + inflected: false, + gender: "fem", + given: first.s + " " + next.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + if (next.s === "وو") { + const body = dictionary + .queryP(first.s) + .filter(canTakeWe) + .map>((entry) => ({ + inflected: true, + gender: "fem", + given: first.s + " " + next.s, + plural: true, + entry, + })); + return returnParseResults(rest, body); + } + } + return []; +} + +function parseIYaanEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("یان")) { + const withoutIYaan = first.s.slice(0, -3); + const eeEnding = dictionary + .queryP(withoutIYaan + "ي") + .filter( + (e) => tp.isMascNounEntry(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const pattern3Anim = dictionary + .queryP(withoutIYaan + "ی") + .filter( + (e) => tp.isMascNounEntry(e) && tp.isPattern3Entry(e) + ) as T.MascNounEntry[]; + return returnParseResults( + rest, + [...eeEnding, ...pattern3Anim].map>( + (entry) => ({ + inflected: false, + gender: "masc", + given: first.s, + plural: true, + entry: entry as T.MascNounEntry, + }) + ) + ); + } + if (first.s.endsWith("یانو")) { + const withoutIYaano = first.s.slice(0, -4); + const eeEnding = dictionary + .queryP(withoutIYaano + "ي") + .filter( + (e) => tp.isMascNounEntry(e) && tp.isSingularEntry(e) + ) as T.MascNounEntry[]; + const pattern3Anim = dictionary + .queryP(withoutIYaano + "ی") + .filter( + (e) => tp.isMascNounEntry(e) && tp.isPattern3Entry(e) + ) as T.MascNounEntry[]; + return returnParseResults( + rest, + [...eeEnding, ...pattern3Anim].flatMap>( + (entry) => [ + { + inflected: true, + gender: "masc", + given: first.s, + plural: true, + entry: entry as T.MascNounEntry, + }, + ...(tp.isUnisexNounEntry(entry) + ? [ + { + inflected: true, + gender: "fem", + given: first.s, + plural: true, + entry: entry as T.UnisexNounEntry, + } satisfies T.ParsedNounWord, + ] + : []), + ] + ) + ); + } + return []; +} + +function parseIYaaneEndingNoun( + tokens: Readonly, + dictionary: DictionaryAPI +): T.ParseResult>[] { + if (tokens.length === 0) { + return []; + } + const [first, ...rest] = tokens; + if (first.s.endsWith("یانې")) { + const withoutIYaane = first.s.slice(0, -4); + const eeEnding = dictionary + .queryP(withoutIYaane + "ي") + .filter(tp.isFemNounEntry); + const pattern3UnisexAnim = dictionary + .queryP(withoutIYaane + "ی") + .filter( + (e) => tp.isUnisexNounEntry(e) && tp.isPattern3Entry(e) + ) as T.MascNounEntry[]; + const pattern3Fem = dictionary + .queryP(withoutIYaane + "ۍ") + .filter((e) => tp.isFemNounEntry(e) && tp.isPattern3Entry(e)); + return returnParseResults( + rest, + [...eeEnding, ...pattern3UnisexAnim, ...pattern3Fem].map< + T.ParsedNounWord + >((entry) => ({ + inflected: false, + gender: "masc", + given: first.s, + plural: true, + entry, + })) + ); + } + if (first.s.endsWith("یانو")) { + const withoutIYaano = first.s.slice(0, -4); + const eeEnding = dictionary + .queryP(withoutIYaano + "ي") + .filter((e) => tp.isFemNounEntry(e) && tp.isSingularEntry(e)); + const pattern3Anim = dictionary + .queryP(withoutIYaano + "ۍ") + .filter((e) => tp.isFemNounEntry(e) && tp.isPattern3Entry(e)); + return returnParseResults( + rest, + [...eeEnding, ...pattern3Anim].map>( + (entry) => ({ + inflected: true, + gender: "masc", + given: first.s, + plural: true, + entry, + }) + ) + ); + } + return []; +} diff --git a/src/lib/src/pashto-inflector.test.ts b/src/lib/src/pashto-inflector.test.ts index 56221f9..0e55a30 100644 --- a/src/lib/src/pashto-inflector.test.ts +++ b/src/lib/src/pashto-inflector.test.ts @@ -1772,7 +1772,6 @@ const nouns: { }, }, // Feminine animate ending in a consonant - // TODO: ALLOW FOR MULTIPLE PLURAL POSSIBILITIES میندې, میېنې etc. { in: { ts: 1527812928, @@ -1780,17 +1779,32 @@ const nouns: { f: "mor", g: "", e: "mother, mom", - c: "n. f. anim.", - ppp: "میندې", - ppf: "maynde", + c: "n. f. anim. fam.", + ppp: "میندې, میېندې", + ppf: "maynde, myende", i: 11113, }, out: { vocative: { - fem: [[{ p: "مورې", f: "móre" }], [{ p: "میندو", f: "mayndo" }]], + fem: [ + [{ p: "مورې", f: "móre" }], + [ + { p: "میندو", f: "mayndo" }, + { p: "میېندو", f: "myendo" }, + ], + ], }, plural: { - fem: [[{ p: "میندې", f: "maynde" }], [{ p: "میندو", f: "mayndo" }]], + fem: [ + [ + { p: "میندې", f: "maynde" }, + { p: "میېندې", f: "myende" }, + ], + [ + { p: "میندو", f: "mayndo" }, + { p: "میېندو", f: "myendo" }, + ], + ], }, }, }, @@ -2061,7 +2075,6 @@ const nouns: { }, }, }, - // TODO: Plaar plaroona paaraan - wrooNa // Word with no inflections { in: { @@ -2116,6 +2129,79 @@ const nouns: { }, }, }, + // masc familial word + { + in: { + i: 3205, + ts: 1527815177, + p: "پلار", + f: "plaar", + g: "plaar", + e: "father", + r: 4, + a: 1, + c: "n. m. anim. fam.", + ppp: "پلرونه", + ppf: "plaróona", + }, + out: { + plural: { + masc: [ + [{ p: "پلرونه", f: "plaróona" }], + [{ p: "پلرونو", f: "plaróono" }], + ], + }, + vocative: { + masc: [[{ p: "پلاره", f: "pláara" }], [{ p: "پلرونو", f: "plaróono" }]], + }, + }, + }, + // Determiner + { + in: { + i: 13415, + ts: 1527813602, + p: "کوم", + f: "koom", + g: "koom", + e: "which, that, any, some, (a) certain", + r: 4, + a: 1, + c: "det.", + }, + out: { + inflections: { + masc: [ + [{ p: "کوم", f: "koom" }], + [{ p: "کوم", f: "koom" }], + [{ p: "کومو", f: "kóomo" }], + ], + fem: [ + [{ p: "کومه", f: "kóoma" }], + [{ p: "کومې", f: "kóome" }], + [{ p: "کومو", f: "kóomo" }], + ], + }, + vocative: { + masc: [[{ p: "کومه", f: "kóoma" }], [{ p: "کومو", f: "kóomo" }]], + fem: [[{ p: "کومې", f: "kóome" }], [{ p: "کومو", f: "kóomo" }]], + }, + }, + }, + { + in: { + i: 17677, + ts: 1586519006879, + p: "هیڅ", + f: "heets, hits", + g: "heets,hits", + e: "negative determiner, used for nothing, never, no, none etc. (used with negative phrases)", + r: 4, + c: "det. / adv.", + noInf: true, + }, + out: false, + }, ]; const others: T.DictionaryEntry[] = [ @@ -2148,7 +2234,8 @@ adjectives.forEach((word) => { nouns.forEach((word) => { test(`${word.in.p} should inflect properly`, () => { - expect(inflectWord(word.in)).toEqual(word.out); + const res = inflectWord(word.in); + expect(res).toEqual(word.out); }); }); diff --git a/src/lib/src/type-predicates.ts b/src/lib/src/type-predicates.ts index 8705a3f..8c0e60d 100644 --- a/src/lib/src/type-predicates.ts +++ b/src/lib/src/type-predicates.ts @@ -48,6 +48,13 @@ export function isAdverbEntry( return !!e.c?.includes("adv."); } +export function isDeterminerEntry( + e: T.Entry | T.DictionaryEntry +): e is T.DeterminerEntry { + if ("entry" in e) return false; + return !!e.c?.includes("det."); +} + export function isLocativeAdverbEntry( e: T.Entry | T.DictionaryEntry ): e is T.LocativeAdverbEntry { @@ -70,7 +77,12 @@ export function isInflectableEntry( if (isDeterminer(e)) { return true; } - return isNounEntry(e) || isAdjectiveEntry(e) || isNumberEntry(e); + return ( + isNounEntry(e) || + isAdjectiveEntry(e) || + isNumberEntry(e) || + isDeterminerEntry(e) + ); } export function isDeterminer( @@ -103,7 +115,9 @@ export function isVerbEntry( return "entry" in e && isVerbDictionaryEntry(e.entry); } -export function isMascNounEntry(e: T.InflectableEntry): e is T.MascNounEntry { +export function isMascNounEntry( + e: T.InflectableEntry | T.DictionaryEntry +): e is T.MascNounEntry { return !!e.c && e.c.includes("n. m."); } @@ -112,7 +126,7 @@ export function isFemNounEntry(e: T.DictionaryEntry): e is T.FemNounEntry { } export function isUnisexNounEntry( - e: T.InflectableEntry + e: T.InflectableEntry | T.DictionaryEntry ): e is T.UnisexNounEntry { return isNounEntry(e) && e.c.includes("unisex"); } @@ -122,7 +136,7 @@ export function isAnimNounEntry(e: T.InflectableEntry): e is T.AnimNounEntry { } export function isUnisexAnimNounEntry( - e: T.InflectableEntry + e: T.InflectableEntry | T.DictionaryEntry ): e is T.UnisexAnimNounEntry { return isUnisexNounEntry(e) && isAnimNounEntry(e); } @@ -137,13 +151,7 @@ export function isPattern( p: T.InflectionPattern | "all" ): (entry: T.InflectableEntry) => boolean { if (p === 0) { - return (e: T.InflectableEntry) => - !isPattern1Entry(e) && - !isPattern2Entry(e) && - !isPattern3Entry(e) && - !isPattern4Entry(e) && - !isPattern5Entry(e) && - !isPattern6FemEntry(e); + return isNonInflectingEntry; } if (p === 1) { return isPattern1Entry; @@ -166,6 +174,21 @@ export function isPattern( return () => true; } +export function isNonInflectingEntry( + e: T +): e is T.NonInflecting { + if (e.noInf) return true; + return ( + !isPattern1Entry(e) && + !isPattern2Entry(e) && + !isPattern3Entry(e) && + !isPattern4Entry(e) && + !isPattern5Entry(e) && + !isPattern6FemEntry(e) && + (!isNounEntry(e) || !isPluralNounEntry(e)) + ); +} + /** * shows if a noun/adjective has the basic (consonant / ه) inflection pattern * @@ -177,6 +200,10 @@ export function isPattern1Entry( ): e is T.Pattern1Entry { if (e.noInf) return false; if (e.infap || e.infbp) return false; + // family words like خور زوی etc with special plural don't follow pattern #1 + if (e.c.includes("fam.")) { + return false; + } if (isFemNounEntry(e)) { return ( (endsWith( @@ -189,7 +216,7 @@ export function isPattern1Entry( e ) && !e.p.endsWith("اع")) || - (endsWith({ p: pashtoConsonants }, e) && !(e.ppp && e.ppf)) + endsWith({ p: pashtoConsonants }, e) ); } return endsInConsonant(e) || hasShwaEnding(e); @@ -267,7 +294,7 @@ export function isPattern5Entry( } export function isPattern6FemEntry( - e: T.InflectableEntry + e: T.InflectableEntry | T.DictionaryEntry ): e is T.Pattern6FemEntry { if (!isFemNounEntry(e)) return false; if (e.c.includes("anim.")) return false; diff --git a/src/types.ts b/src/types.ts index 0fab7c3..8897874 100644 --- a/src/types.ts +++ b/src/types.ts @@ -477,7 +477,8 @@ export type InflectionSet = ArrayFixed, 3>; // Plural and Second Inflection export type PluralInflectionSet = ArrayFixed, 2>; -export type Gender = "masc" | "fem"; +export const genders = ["masc", "fem"] as const; +export type Gender = (typeof genders)[number]; export type UnisexSet = Record; export type GenderedSet = @@ -634,7 +635,8 @@ export type InflectableEntry = | NounEntry | AdjectiveEntry | NumberEntry - | AdverbEntry; + | AdverbEntry + | DeterminerEntry; export type NounEntry = DictionaryEntry & { c: string } & { __brand: "a noun entry"; }; @@ -653,6 +655,9 @@ export type UnisexAnimNounEntry = UnisexNounEntry & { export type AdverbEntry = DictionaryEntry & { c: string } & { __brand: "an adverb entry"; }; +export type DeterminerEntry = DictionaryEntry & { c: string } & { + __brand: "a determiner entry"; +}; export type LocativeAdverbEntry = AdverbEntry & { __brand2: "a locative adverb entry"; }; @@ -1233,6 +1238,21 @@ export type EquativeBlock = { type: "equative"; equative: EquativeRendered }; export type NegativeBlock = { type: "negative"; imperative: boolean }; +export type InflectableBaseParse = { + inflection: (0 | 1 | 2)[]; + gender: Gender[]; + given: string; + entry: E; +}; + +export type ParsedNounWord = { + inflected: boolean; + plural: boolean; + gender: Gender; + given: string; + entry: N; +}; + export type Block = { key: number; block: diff --git a/tsconfig.node.json b/tsconfig.node.json index 0d3d714..c6f14df 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -18,5 +18,5 @@ "noUnusedParameters": true, "noFallthroughCasesInSwitch": true }, - "include": ["vite.config.ts"] + "include": ["vite.config.ts", "get-mini-dict.ts"] } diff --git a/vocab/mini-dict-tss.ts b/vocab/mini-dict-tss.ts new file mode 100644 index 0000000..c91fe1d --- /dev/null +++ b/vocab/mini-dict-tss.ts @@ -0,0 +1,50 @@ +import * as T from "../src/types"; + +export const entries: T.DictionaryEntry["ts"][] = [ + // adjectives + 1527812798, // خفه + 1527812625, // غټ + 1527815306, // ستړی + 1527819320, // نری + 1527815451, // زوړ + 1527815265, // شین + 1527813293, // سور + + // masc nouns + 1527815251, // سړی + 1527812828, // کور + 1527812802, // خر + 1527813593, // غر + 1527812928, // مور + 1527815177, // پلار + 1527817330, // غنم + 1527815206, // قاضي + 1527815394, // واده + 1527812878, // ماما + 1527815450, // زوی + 1527823093, // نبي + 1527822456, // لفظ + 1708911813165, // کارغه + 1527820648, // الو + + // unisex nouns + 1527816747, // ډاکټر + 1527814159, // ملګری + 1527816249, // لمسی + 1527812908, // مېلمه + 1575924767041, // شپون + 1527815333, // نتور + + // fem nouns + 1527811877, // دوستي + 1586551382412, // وریژې + 1527812797, // ښځه + 1527814203, // کرسۍ + 1527815129, // اوبه + 1527814150, // لار + 1527823526, // قاضۍ + 1527815163, // پیشو + 1527812582, // دعا + 1591803598624, // هتکړۍ + 1527812861, // لور - loor +]; diff --git a/yarn.lock b/yarn.lock index 4266553..1cf7f10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2700,6 +2700,14 @@ json-buffer@3.0.1: resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== +json-edit-react@^1.15.7: + version "1.15.7" + resolved "https://registry.npmjs.org/json-edit-react/-/json-edit-react-1.15.7.tgz" + integrity sha512-PMw7FSTVrY23m5tdwDFxqjVL4OHyR/zSkPIu1BhKVJofW+l0I93moevs7CWTD+3ZWA/m8OtKpxYV3CQ30OlNJA== + dependencies: + object-property-assigner "^1.3.0" + object-property-extractor "^1.0.11" + json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" @@ -2949,6 +2957,16 @@ object-assign@^4.0.1, object-assign@^4.1.1: resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== +object-property-assigner@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/object-property-assigner/-/object-property-assigner-1.3.0.tgz" + integrity sha512-19A0RsC9rP9klCKHDPL/MeERxeopV9wyMNfP+eD2uKOafzLjF+OUEN4FoP6RAlCFHmerBPJ4ohNv/WrgaNpeIA== + +object-property-extractor@^1.0.11: + version "1.0.11" + resolved "https://registry.npmjs.org/object-property-extractor/-/object-property-extractor-1.0.11.tgz" + integrity sha512-VnDQcyN0FTXZ0hMZS/CTb2QkIssZ9XKB8zlf5rnFh1HjFQX1P73EHawavSztBOiPDGqAPNXebv4agjhF9eACAw== + once@^1.3.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" @@ -3265,7 +3283,7 @@ react-transition-group@^4.4.1: loose-envify "^1.4.0" prop-types "^15.6.2" -react@^18.3.1, react@>=0.14.0, react@>=15.0.0, react@>=16.3.0, react@>=16.3.2, react@>=16.6.0, react@>=16.8.0: +react@^18.3.1, react@>=0.14.0, react@>=15.0.0, react@>=16.0.0, react@>=16.3.0, react@>=16.3.2, react@>=16.6.0, react@>=16.8.0: version "18.3.1" resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz" integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==