lingdocs
/
pashto-dictionary
mirror of https://github.com/lingdocs/pashto-dictionary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

displaying plural results

This commit is contained in:
lingdocs 2021-09-14 21:13:15 -04:00
parent 4bafd0fcf5
commit 271df7f2fd
11 changed files with 72 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
functions/package-lock.json generated
View File

@ -200,9 +200,9 @@
}
},
"@lingdocs/pashto-inflector": {
"version": "0.9.2",
"resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.9.2.tgz",
"integrity": "sha512-9tmPPezEvPFR/tPkBuF/bj79dCAviFTGOmCVDbRCymXmv4gWWhH4lCueYOYhyWZ4vXcihMflVpRSmLtUDXmdjQ==",
"version": "1.0.2",
"resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-1.0.2.tgz",
"integrity": "sha512-voPdIePrMzLc9RNFjyo0RczOPDoOkIhQ/34CxwfnkOrt7k3EwahPikEWvRIN4+JoxKJI8oA+iFKAN9OoGmY3Yg==",
"requires": {
"classnames": "^2.2.6",
"pbf": "^3.2.1",
@ -1697,9 +1697,9 @@
}
},
"protocol-buffers-schema": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.2.tgz",
"integrity": "sha512-LPzSaBYp/TcbuSlpGwqT5jR9kvJ3Zp5ic2N5c2ybx6XB/lSfEHq2D7ja8AgoxHoMD91wXFALJoXsvshKPuXyew=="
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
"integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
},
"proxy-addr": {
"version": "2.0.6",

2
functions/package.json
View File

@ -14,7 +14,7 @@
"main": "lib/functions/src/index.js",
"dependencies": {
"@google-cloud/storage": "^5.8.1",
"@lingdocs/pashto-inflector": "^0.9.2",
"@lingdocs/pashto-inflector": "^1.0.2",
"@types/cors": "^2.8.10",
"@types/google-spreadsheet": "^3.0.2",
"cors": "^2.8.5",

2
website/package.json
View File

@ -6,7 +6,7 @@
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2",
"@lingdocs/pashto-inflector": "^0.9.2",
"@lingdocs/pashto-inflector": "^1.0.3",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",

12
website/src/components/ExtraEntryInfo.tsx
View File

@ -13,7 +13,7 @@ const InflectionsInfo = ({ entry, textOptions }: {
entry: Types.DictionaryEntry,
textOptions: Types.TextOptions,
}) => {
const inf = ((): Types.Inflections | false => {
const inf = ((): Types.InflectorOutput | false => {
try {
return inflectWord(entry);
} catch (e) {
@ -25,20 +25,20 @@ const InflectionsInfo = ({ entry, textOptions }: {
return null;
}
// unisex noun / adjective
if ("masc" in inf && "fem" in inf) {
if (inf.inflections && "masc" in inf.inflections && "fem" in inf.inflections) {
return (
<div className="entry-extra-info" data-testid="inflections-info">
<InlinePs opts={textOptions}>{inf.masc[1][0]}</InlinePs>
<InlinePs opts={textOptions}>{inf.inflections.masc[1][0]}</InlinePs>
{` `}
<InlinePs opts={textOptions}>{inf.fem[0][0]}</InlinePs>
<InlinePs opts={textOptions}>{inf.inflections.fem[0][0]}</InlinePs>
</div>
);
}
// masculine noun
if ("masc" in inf) {
if (inf.inflections && "masc" in inf.inflections) {
return (
<div className="entry-extra-info" data-testid="inflections-info">
<InlinePs opts={textOptions}>{inf.masc[1][0]}</InlinePs>
<InlinePs opts={textOptions}>{inf.inflections.masc[1][0]}</InlinePs>
</div>
);
}

20
website/src/lib/inflection-search-helpers.ts
View File

@ -51,23 +51,16 @@ function conflateUnisexPeople(arr: (string | T.Person)[]): (string | T.Person)[]
return newArr;
}
export function displayPositionResult(res: (T.Person | "plain" | "1st" | "2nd")[] | null): string {
export function displayPositionResult(res: (T.Person | "plain" | "1st" | "2nd" | "plural")[] | null): string {
const conflated = res
? conflateUnisexPeople(res)
: ["Doesn't change"];
return conflated.map((x) => {
if (x === "plain") {
return "Plain";
}
if (x === "1st") {
return "1st Inflection";
}
if (x === "2nd") {
return "2nd Inflection";
}
if (typeof x === "string") {
return x;
}
if (x === "plural") return "";
if (x === "plain") return "Plain";
if (x === "1st") return "1st Inflection";
if (x === "2nd") return "2nd Inflection";
if (typeof x === "string") return x;
return x === null ? "Same for all" : getEnglishPersonInfo(x);
}).join(" / ");
}
@ -109,6 +102,7 @@ export function displayFormResult(res: string[]): string {
.replace("MascPlur", "(with a masc. plur. object)")
.replace("FemSing", "(with a fem. sing. object)")
.replace("FemPlur", "(with a fem. plur. object)")
.replace("ArabicPlural", "Arabic Plural")
.replace("Fem", "Fem.")
.replace("Masc", "Masc.")
}

40
website/src/lib/search-pile.ts
View File

@ -11,17 +11,21 @@ import {
isVerbBlock,
isImperativeBlock,
isInflectionSet,
isPluralInflectionSet,
} from "@lingdocs/pashto-inflector";
import { personFromVerbBlockPos } from "@lingdocs/pashto-inflector";
const inflectionNames: InflectionName[] = ["plain", "1st", "2nd"];
const inflectionNames: { inflections: InflectionName[], plural: PluralInflectionName[] } = {
inflections: ["plain", "1st", "2nd"],
plural: ["plural", "2nd"],
};
type ObPile = { [key: string]: ObRec; }
type ObRec = T.VerbBlock | T.ImperativeBlock | T.InflectionSet | T.PsString | boolean | null | string | ObPile;
type SinglePsResult = T.PsString | null;
type BlockResult = { ps: T.PsString, pos: T.Person[] | InflectionName[] }[];
type InflectionSetResult = { ps: T.PsString, pos: InflectionName[] }[];
type InflectionSetResult = { ps: T.PsString, pos: (InflectionName | PluralInflectionName)[] }[];
type BlockResultRaw = { ps: T.PsString, pos: [number, number][] }[];
type RowResult = { ps: T.PsString, pos: (0 | 1)[] }[];
@ -46,6 +50,7 @@ export function searchPile(pile: ObPile, searchFun: (s: T.PsString) => boolean,
function searchObRecord(record: ObRec): null | BlockResult | SinglePsResult | InflectionSearchResult[] {
// hit a bottom part a tree, see if what we're looking for is there
if (Array.isArray(record)) {
// @ts-ignore
return searchBlock(record, searchFun);
}
if (typeof record !== "object") return null;
@ -65,7 +70,7 @@ export function searchPile(pile: ObPile, searchFun: (s: T.PsString) => boolean,
}
const result = searchObRecord(value);
// Result: Hit the bottom and nothing found
if (result === null) {
if (result === null || result === undefined) {
return res;
}
// Result: Hit a PsString with what we want at the bottom
@ -115,6 +120,20 @@ function searchBlock(block: T.VerbBlock | T.ImperativeBlock | T.InflectionSet, s
}
return null;
}
if (isInflectionSet(block)) {
const results = searchInflectionSet(block, searchFun, "inflections");
if (results.length) {
return results;
}
return null;
}
if (isPluralInflectionSet(block)) {
const results = searchInflectionSet(block, searchFun, "plural");
if (results.length) {
return results;
}
return null;
}
if (isImperativeBlock(block)) {
const results = searchVerbBlock(block, searchFun);
if (results.length) {
@ -125,13 +144,6 @@ function searchBlock(block: T.VerbBlock | T.ImperativeBlock | T.InflectionSet, s
}
return null;
}
if (isInflectionSet(block)) {
const results = searchInflectionSet(block, searchFun);
if (results.length) {
return results;
}
return null;
}
return null;
}
@ -173,18 +185,18 @@ export function searchVerbBlock(vb: T.VerbBlock | T.ImperativeBlock, searchFun:
}, []);
}
function searchInflectionSet(inf: T.InflectionSet, searchFun: (ps: T.PsString) => boolean): InflectionSetResult {
function searchInflectionSet(inf: T.InflectionSet | T.PluralInflectionSet, searchFun: (ps: T.PsString) => boolean, type: "inflections" | "plural"): InflectionSetResult {
return inf.reduce((all: InflectionSetResult, item, i): InflectionSetResult => {
const matching = item.filter(searchFun);
if (i === 0) {
return matching.map(ps => ({ ps, pos: [inflectionNames[i]] }))
return matching.map(ps => ({ ps, pos: [inflectionNames[type][i]] }))
}
matching.forEach(it => {
const index = all.findIndex(x => x.ps.f === it.f);
if (index !== -1) {
all[index].pos.push(inflectionNames[i])
all[index].pos.push(inflectionNames[type][i])
} else {
all.push({ ps: it, pos: [inflectionNames[i]] });
all.push({ ps: it, pos: [inflectionNames[type][i]] });
}
})
return all;

6
website/src/screens/EntryEditor.tsx
View File

@ -175,7 +175,7 @@ function EntryEditor({ isolatedEntry, dictionary, searchParams, textOptions, use
}
const complement = entry.l ? dictionary.findOneByTs(entry.l) : undefined;
const inflections = ((): T.Inflections | false => {
const inf = ((): T.InflectorOutput | false => {
try {
return inflectWord(entry);
} catch (e) {
@ -334,7 +334,9 @@ function EntryEditor({ isolatedEntry, dictionary, searchParams, textOptions, use
</ul>
</div>}
</form>
{inflections && <InflectionsTable inf={inflections} textOptions={textOptions} />}
{inf && inf.inflections && <InflectionsTable inf={inf.inflections} textOptions={textOptions} />}
{inf && "plural" in inf && <InflectionsTable inf={inf.plural as T.PluralInflections} textOptions={textOptions} />}
{inf && "arabicPlural" in inf && <InflectionsTable inf={inf.arabicPlural as T.PluralInflections} textOptions={textOptions} />}
{/* TODO: aay tail from state options */}
<ConjugationViewer
entry={entry}

15
website/src/screens/IsolatedEntry.tsx
View File

@ -87,7 +87,7 @@ function IsolatedEntry({ state, dictionary, isolateEntry }: {
? dictionary.findOneByTs(entry.l)
: undefined;
const relatedEntries = dictionary.findRelatedEntries(entry);
const inflections = ((): T.Inflections | false => {
const inf = ((): T.InflectorOutput | false => {
try {
return inflectWord(entry);
} catch (e) {
@ -95,6 +95,7 @@ function IsolatedEntry({ state, dictionary, isolateEntry }: {
return false;
}
})();
console.log(inf);
return <div className="width-limiter">
<Helmet>
<title>{entry.p} - LingDocs Pashto Dictionary</title>
@ -187,7 +188,17 @@ function IsolatedEntry({ state, dictionary, isolateEntry }: {
</div>
}
{editSubmitted && <p>Thank you for your help!</p>}
{inflections && <InflectionsTable inf={inflections} textOptions={textOptions} />}
{inf && <>
{inf.inflections && <InflectionsTable inf={inf.inflections} textOptions={textOptions} />}
{"plural" in inf && <div>
<h5>Plural</h5>
<InflectionsTable inf={inf.plural as T.PluralInflections} textOptions={textOptions} />
</div>}
{"arabicPlural" in inf && <div>
<h5>Arabic Plural</h5>
<InflectionsTable inf={inf.arabicPlural as T.PluralInflections} textOptions={textOptions} />
</div>}
</>}
{/* TODO: State options for tail type here */}
<ConjugationViewer
entry={entry}

4
website/src/screens/Wordlist.tsx
View File

@ -21,7 +21,7 @@ import {
import {
ButtonSelect,
InlinePs,
removeFVariants,
removeFVarients,
} from "@lingdocs/pashto-inflector";
import {
Modal,
@ -315,7 +315,7 @@ function Wordlist({ options, wordlist, isolateEntry, optionsDispatch }: {
return <div>
<div className="lead my-3">None to review</div>
<p>Next word up for review <strong>{dayjs().to(nextUp.dueDate)}</strong>: <InlinePs opts={textOptions}>
{removeFVariants(ps)}
{removeFVarients(ps)}
</InlinePs></p>
</div>;
})()

2
website/src/types.d.ts vendored
View File

@ -158,6 +158,8 @@ type WordlistWordDoc = WordlistWord & { _rev: string, _id: string };
type InflectionName = "plain" | "1st" | "2nd";
type PluralInflectionName = "plural" | "2nd";
type InflectionSearchResult = {
form: string[],
matches: {

8
website/yarn.lock
View File

@ -1483,10 +1483,10 @@
"@types/yargs" "^16.0.0"
chalk "^4.0.0"
"@lingdocs/pashto-inflector@^0.9.2":
version "0.9.2"
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.9.2.tgz#7ef3b3344c3eb3e3d1db77142ef83f0ac7e8e230"
integrity sha512-9tmPPezEvPFR/tPkBuF/bj79dCAviFTGOmCVDbRCymXmv4gWWhH4lCueYOYhyWZ4vXcihMflVpRSmLtUDXmdjQ==
"@lingdocs/pashto-inflector@^1.0.3":
version "1.0.3"
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-1.0.3.tgz#4ba205869f41a540d85d045eee23c484814f1fd8"
integrity sha512-bxz94hmCfVfJg2CthViFZ/14cQmhPHtS+uA/d11vViI6qad5Kl4U33jm1ZfS7AaXHasqmnsKyYW7Qn+y/E0yUA==
dependencies:
classnames "^2.2.6"
pbf "^3.2.1"