proskomma-core 0.9.7 → 0.9.12

package/test/code/main/cp_vp.cjs

@@ -0,0 +1,158 @@
+const test = require('tape');
+
+const { pkWithDoc } = require('../../lib/load.js');
+
+const testGroup = 'Pub Numbers';
+
+const pk = pkWithDoc('../test_data/usfm/cp_vp.usfm', {
+  lang: 'fra',
+  abbr: 'hello',
+})[0];
+const pk2 = pkWithDoc('../test_data/usx/cp_vp.usx', {
+  lang: 'fra',
+  abbr: 'hello',
+})[0];
+
+const pk3 = pkWithDoc('../test_data/usx/esg3.usx', {
+  lang: 'fra',
+  abbr: 'nfc18',
+})[0];
+
+test(
+  `USFM (${testGroup})`,
+  async function (t) {
+    try {
+      const expectedScopes = [
+        ['s', 'chapter/3'],
+        ['s', 'pubChapter/B'],
+        ['s', 'verse/14'],
+        ['s', 'verses/14'],
+        ['s', 'pubVerse/1b'],
+        ['e', 'pubVerse/1b'],
+        ['e', 'verses/14'],
+        ['e', 'verse/14'],
+        ['s', 'verse/15'],
+        ['s', 'verses/15'],
+        ['s', 'pubVerse/2b'],
+        ['e', 'pubVerse/2b'],
+        ['e', 'verses/15'],
+        ['e', 'verse/15'],
+        ['e', 'pubChapter/B'],
+        ['s', 'pubChapter/3bis'],
+        ['s', 'pubVerse/1'],
+        ['e', 'pubVerse/1'],
+        ['e', 'pubChapter/3bis'],
+        ['e', 'chapter/3'],
+      ];
+      t.plan(1 + (expectedScopes.length * 2));
+      const query =
+        '{ documents { mainSequence { blocks { items { type subType payload } } } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const scopes = result.data.documents[0].mainSequence.blocks[0].items.filter(i => i.type === 'scope');
+      let count = 0;
+
+      for (const [sOrE, expectedLabel] of expectedScopes) {
+        t.equal(scopes[count].subType, sOrE === 's' ? 'start' : 'end');
+        t.equal(scopes[count].payload, expectedLabel);
+        count++;
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `USX (${testGroup})`,
+  async function (t) {
+    try {
+      const expectedScopes = [
+        ['s', 'chapter/1'],
+        ['s', 'pubChapter/A'],
+        ['s', 'altChapter/(A)'],
+        ['s', 'verse/1'],
+        ['s', 'verse/2'],
+        ['s', 'verses/1-2'],
+        ['s', 'pubVerse/1-2'],
+        ['s', 'altVerse/1, 2'],
+        ['e', 'altVerse/1, 2'],
+        ['e', 'pubVerse/1-2'],
+        ['e', 'verses/1-2'],
+        ['e', 'verse/2'],
+        ['e', 'verse/1'],
+        ['s', 'verse/3'],
+        ['s', 'verses/3'],
+        ['s', 'altVerse/(3)'],
+        ['e', 'altVerse/(3)'],
+        ['e', 'verses/3'],
+        ['e', 'verse/3'],
+        ['e', 'altChapter/(A)'],
+        ['e', 'pubChapter/A'],
+        ['e', 'chapter/1'],
+      ];
+      t.plan(1 + (2 * expectedScopes.length));
+      const query =
+        '{ documents { mainSequence { blocks { items { type subType payload } } } } }';
+      const result = await pk2.gqlQuery(query);
+      // console.log(JSON.stringify(result.data, null, 2))
+      t.equal(result.errors, undefined);
+      const scopes = result.data.documents[0].mainSequence.blocks[0].items.filter(i => i.type === 'scope');
+      let count = 0;
+
+      for (const [sOrE, expectedLabel] of expectedScopes) {
+        t.equal(scopes[count].subType, sOrE === 's' ? 'start' : 'end');
+        t.equal(scopes[count].payload, expectedLabel);
+        count++;
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `ESG USX (${testGroup})`,
+  async function (t) {
+    try {
+      const expectedScopes = [
+        ['s', 'chapter/3'],
+        ['s', 'verse/1'],
+        ['s', 'verses/1'],
+        ['s', 'pubVerse/1'],
+        ['e', 'pubVerse/1'],
+        ['e', 'verses/1'],
+        ['e', 'verse/1'],
+        ['s', 'verse/2'],
+        ['s', 'verses/2'],
+        ['s', 'pubVerse/2'],
+        ['e', 'pubVerse/2'],
+        ['e', 'verses/2'],
+        ['e', 'verse/2'],
+        ['s', 'pubChapter/B'],
+        ['s', 'verse/14'],
+        ['s', 'verses/14'],
+        ['s', 'pubVerse/1'],
+        ['e', 'pubVerse/1'],
+        ['e', 'verses/14'],
+        ['e', 'verse/14'],
+        ['e', 'pubChapter/B'],
+      ];
+      t.plan(1 + (2 * expectedScopes.length));
+      const query =
+        '{ documents { mainSequence { blocks { items { type subType payload } } } } }';
+      const result = await pk3.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const scopes = result.data.documents[0].mainSequence.blocks.map(b => b.items.filter(i => i.type === 'scope')).reduce((a, b) => a.concat(b));
+      let count = 0;
+
+      for (const [sOrE, expectedLabel] of expectedScopes) {
+        t.equal(scopes[count].subType, sOrE === 's' ? 'start' : 'end');
+        t.equal(scopes[count].payload, expectedLabel);
+        count++;
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);

package/test/code/main/custom.cjs

@@ -0,0 +1,124 @@
+/* eslint-disable require-await */
+const test = require('tape');
+
+const { Proskomma } = require('../../../src/index.cjs');
+const {
+  pkWithDoc,
+  customPkWithDoc,
+} = require('../../lib/load.js');
+
+const testGroup = 'Custom Tags';
+
+const pk = pkWithDoc('../test_data/usfm/custom.usfm', {
+  lang: 'fra',
+  abbr: 'hello',
+})[0];
+
+const customProskomma = class extends Proskomma {
+  constructor() {
+    super();
+    this.filters = {};
+    this.customTags = {
+      heading: ['zh'],
+      paragraph: ['zp'],
+      char: ['zc'],
+      word: ['zw'],
+      intro: ['zhi', 'zip'],
+      introHeading: ['zhi'],
+    };
+  }
+};
+
+const customPk = customPkWithDoc(customProskomma, '../test_data/usfm/custom.usfm', {
+  lang: 'fra',
+  abbr: 'hello',
+}, {})[0];
+
+const query = `{ documents { sequences { id type blocks { scopeLabels bs { payload } bg { subType, payload } items {type subType payload} } } } }`;
+
+test(
+  `Unknown Tags (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(7);
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const sequences = result.data.documents[0].sequences;
+      t.equal(sequences.length, 3);
+      const mainSequence = sequences.filter(s => s.type === 'main')[0];
+      t.equal(mainSequence.blocks.length, 1);
+      t.equal(mainSequence.blocks[0].items.filter(i => i.payload === 'Custom').length, 1);
+      t.equal(mainSequence.blocks[0].items.filter(i => i.subType === 'unknown' && i.payload.startsWith('|')).length, 1);
+      const introSequence = sequences.filter(s => s.type === 'introduction')[0];
+      t.equal(introSequence.blocks.length, 1);
+      t.equal(introSequence.blocks[0].items.filter(i => i.payload === 'Custom').length, 1);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Declared Tags (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(15);
+      const result = await customPk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const sequences = result.data.documents[0].sequences;
+      const mainSequence = sequences.filter(s => s.type === 'main')[0];
+      t.equal(mainSequence.blocks.length, 2);
+      t.equal(mainSequence.blocks[0].items.filter(i => i.payload === 'Custom').length, 0);
+      t.equal(mainSequence.blocks[1].items.filter(i => i.payload === 'Custom').length, 0);
+      t.equal(mainSequence.blocks[1].items.filter(i => i.subType === 'unknown').length, 0);
+      t.equal(mainSequence.blocks[0].bs.payload, 'blockTag/p');
+      t.equal(mainSequence.blocks[1].bs.payload, 'blockTag/zp');
+
+      for (const label of ['span/zc', 'spanWithAtts/zw', 'attribute/spanWithAtts/zw/x-foo/0/baa']) {
+        t.ok(mainSequence.blocks[1].scopeLabels.includes(label));
+      }
+
+      const introSequence = sequences.filter(s => s.type === 'introduction')[0];
+      t.equal(introSequence.blocks.length, 2);
+      t.equal(introSequence.blocks[0].bs.payload, 'blockTag/ip');
+      t.equal(introSequence.blocks[1].bs.payload, 'blockTag/zip');
+      t.equal(sequences.filter(s => s.type === 'heading' && s.blocks[0].bs.payload === 'blockTag/zh').length, 1);
+      t.equal(sequences.filter(s => s.type === 'heading' && s.blocks[0].bs.payload === 'blockTag/zhi').length, 1);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  'Specify Selector Spec (${testGroup})',
+  async function (t) {
+    try {
+      t.plan(2);
+      t.doesNotThrow(() => new Proskomma([
+        {
+          name: 'lang',
+          type: 'string',
+          regex: '[a-z]{3}',
+        },
+        {
+          name: 'abbr',
+          type: 'string',
+        },
+      ]));
+      t.throws(() => new Proskomma([
+        {
+          name: 'lang',
+          type: 'stringz',
+          regex: '[a-z]{3}',
+        },
+        {
+          name: 'abbr',
+          type: 'string',
+        },
+      ]), /stringz/);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);

package/test/code/main/cv.cjs

@@ -0,0 +1,249 @@
+const test = require('tape');
+
+const { pkWithDoc } = require('../../lib/load.js');
+
+const testGroup = 'CV';
+
+const pk = pkWithDoc('../test_data/usx/web_rut.usx', {
+  lang: 'eng',
+  abbr: 'web',
+})[0];
+
+const pk2 = pkWithDoc('../test_data/usfm/web_psa51.usfm', {
+  lang: 'eng',
+  abbr: 'web',
+})[0];
+
+const chapterQuery = `cv (chapter:"3") { scopeLabels, items { type subType payload } tokens { subType payload } text }`;
+const chapterVersesChapterQuery = `cv (chapterVerses:"3") { scopeLabels, items { type subType payload } tokens { subType payload } text }`;
+const verseQuery = `cv (chapter:"3" verses:["6"]) { scopeLabels, items { type subType payload } tokens { subType payload } text }`;
+const versesQuery = `cv (chapter:"3" verses:["6", "7"]) { scopeLabels, items { type subType payload } tokens { subType payload } text }`;
+const chapterVersesQuery = `cv (chapterVerses:"3:18-4:1" includeContext:true ) { scopeLabels items { type subType payload position } tokens { subType payload position } text }`;
+const repeatChapterVersesQuery = `cv (chapterVerses:"3:16-3:18" includeContext:true ) { scopeLabels items { type subType payload position } tokens { subType payload position } text }`;
+const singleChapterVersesQuery = `cv (chapterVerses:"3:16-18" includeContext:true ) { scopeLabels items { type subType payload position } tokens { subType payload position } text }`;
+const singleVerseChapterVersesQuery = `cv (chapterVerses:"3:16" includeContext:true ) { scopeLabels items { type subType payload position } tokens { subType payload position } text }`;
+const multiParaSingleVerseChapterVersesQuery = `cv (chapterVerses:"51:1") { text }`;
+
+test(
+  `Chapter (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(10);
+      const query = `{ documents { ${chapterQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.equal(cv[0].items[0].payload, 'blockTag/p');
+      t.equal(cv[0].items[1].payload, 'chapter/3');
+      t.equal([...cv[0].items].reverse()[0].payload, 'blockTag/p');
+      t.equal([...cv[0].items].reverse()[1].payload, 'chapter/3');
+      t.equal(cv[0].tokens[0].payload, 'Naomi');
+      t.equal([...cv[0].tokens].reverse()[2].payload, 'today');
+      t.ok(cv[0].text.startsWith('Naomi her mother-in-law'));
+      t.ok(cv[0].text.endsWith('settled this today.”'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Verse (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(13);
+      const query = `{ documents { ${verseQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/6'));
+      t.equal(cv[0].items[0].payload, 'blockTag/p');
+      t.equal(cv[0].items[1].payload, 'verse/6');
+      t.equal(cv[0].items[2].payload, 'verses/6');
+      t.equal([...cv[0].items].reverse()[0].payload, 'blockTag/p');
+      t.equal([...cv[0].items].reverse()[1].payload, 'verse/6');
+      t.equal([...cv[0].items].reverse()[2].payload, 'verses/6');
+      const wordTokens = cv[0].tokens.filter(t => t.subType === 'wordLike');
+      t.equal(wordTokens[0].payload, 'She');
+      t.equal([...wordTokens].reverse()[0].payload, 'her');
+      t.ok(cv[0].text.startsWith('She went down'));
+      t.ok(cv[0].text.endsWith('told her. '));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Multi-Para Verse (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(4);
+      const query = `{ documents { ${multiParaSingleVerseChapterVersesQuery} } }`;
+      const result = await pk2.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.ok(cv[0].text.startsWith('Have mercy'));
+      t.ok(cv[0].text.endsWith('transgressions.'));
+      t.ok(cv[0].text.includes('kindness. According'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Verses (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(14);
+      const query = `{ documents { ${versesQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/6'));
+      t.ok(cv[1].scopeLabels.includes('verse/7'));
+      t.equal(cv[0].items[0].payload, 'blockTag/p');
+      t.equal(cv[0].items[1].payload, 'verse/6');
+      t.equal(cv[0].items[2].payload, 'verses/6');
+      t.equal([...cv[1].items].reverse()[0].payload, 'blockTag/p');
+      t.equal([...cv[1].items].reverse()[1].payload, 'verse/7');
+      t.equal([...cv[1].items].reverse()[2].payload, 'verses/7');
+      let wordTokens = cv[0].tokens.filter(t => t.subType === 'wordLike');
+      wordTokens = wordTokens.concat(cv[1].tokens.filter(t => t.subType === 'wordLike'));
+      t.equal(wordTokens[0].payload, 'She');
+      t.equal([...wordTokens].reverse()[0].payload, 'down');
+      t.ok(cv[0].text.startsWith('She went down'));
+      t.ok(cv[1].text.endsWith('and lay down. '));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `ChapterVerses (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(12);
+      const query = `{ documents { ${chapterVersesQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.equal(cv.length, 2);
+      t.equal(cv[0].tokens[0].payload, 'Then');
+      t.equal([...cv[0].tokens].reverse()[0].payload, '”');
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/18'));
+      t.ok(cv[0].scopeLabels.includes('verses/18'));
+      t.ok(cv[1].scopeLabels.includes('chapter/4'));
+      t.ok(cv[1].scopeLabels.includes('verse/1'));
+      t.ok(cv[1].scopeLabels.includes('verses/1'));
+      t.ok(cv[0].text.startsWith('Then she said'));
+      t.ok(cv[1].text.endsWith('and sat down. '));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Repeat-chapter chapterVerses (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(12);
+      const query = `{ documents { ${repeatChapterVersesQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.equal(cv.length, 3);
+      const wordLikes = cv[0].tokens.filter(t => t.subType === 'wordLike');
+      t.equal(wordLikes[0].payload, 'When');
+      t.equal([...wordLikes].reverse()[0].payload, 'her');
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/16'));
+      t.ok(cv[0].scopeLabels.includes('verses/16'));
+      t.ok(cv[2].scopeLabels.includes('chapter/3'));
+      t.ok(cv[2].scopeLabels.includes('verse/18'));
+      t.ok(cv[2].scopeLabels.includes('verses/18'));
+      t.ok(cv[0].text.startsWith('When she came'));
+      t.ok(cv[2].text.endsWith('settled this today.”'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Single-chapter chapterVerses (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(12);
+      const query = `{ documents { ${singleChapterVersesQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.equal(cv.length, 3);
+      const wordLikes = cv[0].tokens.filter(t => t.subType === 'wordLike');
+      t.equal(wordLikes[0].payload, 'When');
+      t.equal([...wordLikes].reverse()[0].payload, 'her');
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/16'));
+      t.ok(cv[0].scopeLabels.includes('verses/16'));
+      t.ok(cv[2].scopeLabels.includes('chapter/3'));
+      t.ok(cv[2].scopeLabels.includes('verse/18'));
+      t.ok(cv[2].scopeLabels.includes('verses/18'));
+      t.ok(cv[0].text.startsWith('When she came'));
+      t.ok(cv[2].text.endsWith('settled this today.”'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Single-verse chapterVerses (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(9);
+      const query = `{ documents { ${singleVerseChapterVersesQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.equal(cv.length, 1);
+      const wordLikes = cv[0].tokens.filter(t => t.subType === 'wordLike');
+      t.equal(wordLikes[0].payload, 'When');
+      t.equal([...wordLikes].reverse()[0].payload, 'her');
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/16'));
+      t.ok(cv[0].scopeLabels.includes('verses/16'));
+      t.ok(cv[0].text.startsWith('When she came'));
+      t.ok(cv[0].text.endsWith('done for her. '));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `ChapterVersesVerse (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(6);
+      const query = `{ documents { ${chapterVersesChapterQuery} } }`;
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      const cv = result.data.documents[0].cv;
+      t.equal(cv.length, 18);
+      t.ok(cv[0].scopeLabels.includes('chapter/3'));
+      t.ok(cv[0].scopeLabels.includes('verse/1'));
+      t.ok(cv[17].scopeLabels.includes('chapter/3'));
+      t.ok(cv[17].scopeLabels.includes('verse/18'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);

package/test/code/main/cvMatching.cjs

@@ -0,0 +1,155 @@
+const test = require('tape');
+const xre = require('xregexp');
+
+const { pkWithDoc } = require('../../lib/load.js');
+
+const testGroup = 'cvMatching';
+
+const pk = pkWithDoc('../test_data/usx/web_rut.usx', {
+  lang: 'eng',
+  abbr: 'web',
+})[0];
+
+const pk2 = pkWithDoc('../test_data/usfm/web_psa51.usfm', {
+  lang: 'eng',
+  abbr: 'web',
+})[0];
+
+test(
+  `Error on no filters (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors.length, 1);
+      t.ok(xre.test(result.errors[0].message, /Must specify at least one/));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `Error on conflicting filters (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching(withChars:"foo", withMatchingChars:"baa") { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors.length, 1);
+      t.ok(xre.test(result.errors[0].message, /Must not specify both/));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `either of 2 exact (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching(withChars:["Ruth", "Boaz"]) { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 28);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `both of 2 exact (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching(withChars:["Ruth", "Boaz"], allChars:true) { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 3);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `either of 2 matching (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching(withMatchingChars:["Ruth", "Moab"]) { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 17);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `both of 2 matching (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(2);
+      const query = '{ documents { cvMatching(withMatchingChars:["Ruth", "Moab"], allChars:true) { scopeLabels text } } }';
+      const result = await pk.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 6);
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `one scope (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(3);
+      const query = '{ documents { cvMatching(withScopes:"attribute/spanWithAtts/w/strong/0/H517") { scopeLabels text } } }';
+      const result = await pk2.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 1);
+      t.ok(result.data.documents[0].cvMatching[0].text.includes('Purify'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `either of 2 scopes (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(4);
+      const query = '{ documents { cvMatching(withScopes:["attribute/spanWithAtts/w/strong/0/H517", "attribute/spanWithAtts/w/strong/0/H2398"]) { scopeLabels text } } }';
+      const result = await pk2.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 2);
+      t.ok(result.data.documents[0].cvMatching[0].text.includes('Purify'));
+      t.ok(result.data.documents[0].cvMatching[1].text.includes('Hide'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);
+
+test(
+  `both of 2 scopes (${testGroup})`,
+  async function (t) {
+    try {
+      t.plan(3);
+      const query = '{ documents { cvMatching(withScopes:["attribute/spanWithAtts/w/strong/0/H3526", "attribute/spanWithAtts/w/strong/0/H2398"] allScopes:true) { scopeLabels text } } }';
+      const result = await pk2.gqlQuery(query);
+      t.equal(result.errors, undefined);
+      t.equal(result.data.documents[0].cvMatching.length, 1);
+      t.ok(result.data.documents[0].cvMatching[0].text.includes('Hide'));
+    } catch (err) {
+      console.log(err);
+    }
+  },
+);