This commit is contained in:
lingdocs 2022-06-13 22:22:50 -04:00
parent 68484962dc
commit 9110f22ea8
2 changed files with 4 additions and 1 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@lingdocs/pashto-inflector", "name": "@lingdocs/pashto-inflector",
"version": "2.9.4", "version": "2.9.5",
"author": "lingdocs.com", "author": "lingdocs.com",
"description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations", "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
"homepage": "https://verbs.lingdocs.com", "homepage": "https://verbs.lingdocs.com",

View File

@ -263,6 +263,7 @@ function arrangeVerbWNegative(head: T.PsString | undefined, restRaw: T.PsString[
export function compileEP(EP: T.EPRendered): { ps: T.SingleOrLengthOpts<T.PsString[]>, e?: string[] }; export function compileEP(EP: T.EPRendered): { ps: T.SingleOrLengthOpts<T.PsString[]>, e?: string[] };
export function compileEP(EP: T.EPRendered, combineLengths: true, blankOut?: BlankoutOptions): { ps: T.PsString[], e?: string[] }; export function compileEP(EP: T.EPRendered, combineLengths: true, blankOut?: BlankoutOptions): { ps: T.PsString[], e?: string[] };
export function compileEP(EP: T.EPRendered, combineLengths?: boolean, blankOut?: BlankoutOptions): { ps: T.SingleOrLengthOpts<T.PsString[]>, e?: string[] } { export function compileEP(EP: T.EPRendered, combineLengths?: boolean, blankOut?: BlankoutOptions): { ps: T.SingleOrLengthOpts<T.PsString[]>, e?: string[] } {
console.log("blankout options passed", blankOut);
const psResult = compileEPPs(EP.blocks, EP.kids, EP.omitSubject, blankOut); const psResult = compileEPPs(EP.blocks, EP.kids, EP.omitSubject, blankOut);
return { return {
ps: combineLengths ? flattenLengths(psResult) : psResult, ps: combineLengths ? flattenLengths(psResult) : psResult,
@ -287,6 +288,7 @@ function compileEPPs(blocks: T.Block[], kids: T.Kid[], omitSubject: boolean, bla
} }
function combineIntoText(pieces: (T.Block | T.Kid)[], subjectPerson: T.Person, blankOut?: BlankoutOptions): T.PsString[] { function combineIntoText(pieces: (T.Block | T.Kid)[], subjectPerson: T.Person, blankOut?: BlankoutOptions): T.PsString[] {
console.log("in text combining blankout", blankOut);
const first = pieces[0]; const first = pieces[0];
const rest = pieces.slice(1); const rest = pieces.slice(1);
const firstPs = (blankOut?.equative && first.type === "equative") const firstPs = (blankOut?.equative && first.type === "equative")
@ -295,6 +297,7 @@ function combineIntoText(pieces: (T.Block | T.Kid)[], subjectPerson: T.Person, b
// TODO: properly handle blanking out whole kids section // TODO: properly handle blanking out whole kids section
? [kidsBlank] ? [kidsBlank]
: getPsFromPiece(first, subjectPerson); : getPsFromPiece(first, subjectPerson);
console.log({ first, firstPs });
if (!rest.length) { if (!rest.length) {
return firstPs; return firstPs;
} }