@natlibfi/melinda-record-matching 5.1.4 → 5.1.5-alpha.1

package/src/candidate-search/index.js

@@ -4,6 +4,7 @@ import {MarcRecord} from '@natlibfi/marc-record';
 
 import generateQueryList from './query-list/index.js';
 import chooseQueries from './choose-queries.js';
+import {preferenceSortRecords} from '../matching-utils.js';
 
 export {searchTypes} from './query-list/index.js';
 
@@ -96,6 +97,8 @@ export default async ({record, searchSpec, url, maxCandidates, maxRecordsPerRequ
       }
       debug(`Query ${queryOffset} ${query} done.`);
       debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);
+
+      records.sort(preferenceSortRecords);
       return {records, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};
     }
 

package/src/candidate-search/query-list/bib.js

@@ -435,7 +435,8 @@ export function bibStandardIdentifiers(record) {
 
   // DEVELOP: should we query also f015 and f028?
 
-  const fields = record.get(/^(?<def>020|022|024)$/u);
+  // const fields = record.get(/^(?<def>020|022|024)$/u);
+  const fields = record.get(/^(?<def>015|020|022|024|028)$/u);
   const identifiers = [].concat(...fields.map(toIdentifiers));
   const uniqueIdentifiers = [...new Set(identifiers)];
 
@@ -454,10 +455,10 @@ export function bibStandardIdentifiers(record) {
     const issnIsbnReqExp = (/^[A-Za-z0-9-]+$/u);
     const otherIdReqExp = (/^[A-Za-z0-9-:]+$/u);
 
-    if (tag === '022') {
+    if (tag === '015') { // TODO: test (does this use the right index etc.)
       return subfields
-        .filter(sub => ['a', 'z', 'y'].includes(sub.code) && testStringOrNumber(sub.value) && issnIsbnReqExp.test(String(sub.value)))
-        .map(({value}) => String(value));
+        .filter(sf => sf.code === 'a' && sf.value.match(/^[A-Z0-9\-]+$/ui))
+        .map(sf => sf.value)
     }
 
     if (tag === '020') {
@@ -466,6 +467,25 @@ export function bibStandardIdentifiers(record) {
         .map(({value}) => String(value));
     }
 
+    if (tag === '022') {
+      return subfields
+        .filter(sub => ['a', 'z', 'y'].includes(sub.code) && testStringOrNumber(sub.value) && issnIsbnReqExp.test(String(sub.value)))
+        .map(({value}) => String(value));
+    }
+
+    if (tag === '028') { // TODO: test
+      const a = subfields.find(sf => sf.code === 'a');
+      if (a) {
+        const b = subfields.find(sf => sf.code === 'b');
+        // TODO: normalize?
+        if (b) {
+          return [a.value, `${b.value} ${a.value}`];
+        }
+        return [a.value];
+      }
+    }
+
+    // Default seems to be 024:
     return subfields
       .filter(sub => ['a', 'z'].includes(sub.code) && testStringOrNumber(sub.value) && otherIdReqExp.test(String(sub.value)))
       .map(({value}) => String(value));

package/src/match-detection/features/bib/title.js

@@ -40,7 +40,10 @@ export default ({threshold = 0.9} = {}) => ({
         // - note: combined with decomposing unicode diacritics this normalizes both 'saa' and 'sää' as 'saa'
         // - we could precompose the Finnish letters back to avoid this
         // - see validator normalize-utf8-diacritics for details
-        .replace(/[^\p{Letter}\p{Number}&]/gu, '')
+        .replace(/[^\p{Letter}\p{Number}& ]/gu, '') // 2026-07-01: keep ' '. We need it for splitToBaseAndNumber()
+        .replace(/\s+/ug, ' ')
+        .replace(/ $/u, '')
+        .replace(/^ /u, '')
         .toLowerCase();
     }
 
@@ -52,11 +55,12 @@ export default ({threshold = 0.9} = {}) => ({
 
       const [aa, ab, an, ap] = a;
       const [ba, bb, bn, bp] = b;
+      debugData(`COMPARE:\n['${aa}', '${ab}', '${an}', '${ap}'] VS\n['${ba}', '${bb}', '${bn}', '${bp}']`);
 
       const aFull = toFullTitle(a);
       const bFull = toFullTitle(b);
 
-      debug(`COMPARE:\n  '${aFull}' vs  \n  '${bFull}'`);
+      // debugData(`JOINED COMPARE:\n  '${aFull}' vs  \n  '${bFull}'`);
 
       if (isEmpty(aa) || isEmpty(ba)) {
         return -1.0;
@@ -66,6 +70,11 @@ export default ({threshold = 0.9} = {}) => ({
         return TITLE_MAX;
       }
 
+      // MELKEHITYS-3496-ish: move part of $a to $n:
+      const [altAa, altAn, altBa, altBn] = reconstructTitleAndNumber(aa, an, ba, bn);
+      if (altAa) {
+        return compare2([altAa, ab, altAn, ap], [altBa, bb, altBn, bp]);
+      }
 
       if (ab && ab !== '' && ab === bb) { // Remove $b from equation (MELKEHITYS-3494)
         debug(`Ignore \$b ${ab}`);
@@ -79,7 +88,7 @@ export default ({threshold = 0.9} = {}) => ({
         debug(`Ignore \$p ${ap}`);
         return compare2([aa, ab, an, ''], [ba, bb, bn, '']);
       }
-      // There seems to be wobble between $b and $p
+      // There seems to be wobble between $b and $p:
       if (!isEmpty(ab) && ab === bp) {
         return compare2([aa, '', an, ap], [ba, bb, bn, '']);
       }
@@ -103,7 +112,7 @@ export default ({threshold = 0.9} = {}) => ({
         return -1.0;
       }
 
-      const [distance, maxLength, correctness] = doLevenshtein(aFull, bFull);
+      const [distance, maxLength, correctness] = doLevenshtein(aFull.replace(/ /ug, ''), bFull.replace(/ /ug, ''));
 
       debug(`'${aFull}' vs '${bFull}': Max length = ${maxLength}, distance = ${distance}, correctness = ${correctness}`);
 
@@ -122,16 +131,16 @@ export default ({threshold = 0.9} = {}) => ({
           return compare2([aa, '', an, ap], [ba, bb.substring(ab.length), bn, bp]);
         }
       }
-  
+
       // Try the same without $p:
       if (localXor(ap, bp)) {
         const result = compare2([aa, ab, an, ''], [ba, bb, bn, '']);
         return result > 0.0 ? result * 0.8 : result;
       }
-    
+
       if (aa === ba && an === bn) {
-        // No $n: Don't score $a vs $ab. Return 0, and let other match detectors decide
         const candScore = TITLE_MAX/2;
+        // $b is missing from one:
         if (ap === bp && localXor(ab, bb)) {
           debug(`Handle omitted \$b using x ${candScore}`);
           return candScore;
@@ -142,6 +151,17 @@ export default ({threshold = 0.9} = {}) => ({
         }
       }
 
+      if (an === bn && ap === bp ) {
+        // $b-less $a is other record's $b, see MELKEHITYS-3485 for motivation (though we skip 246 and 490 here):
+        const candScore = TITLE_MAX/2;
+        if (aa === bb && !ab) {
+          return candScore;
+        }
+        if (ba === ab && !bb) {
+          return candScore;
+        }
+      }
+
       return -0.5; // Not likely
     }
 
@@ -174,6 +194,41 @@ export default ({threshold = 0.9} = {}) => ({
       return str1.length > str2.length ? str1.length : str2.length;
     }
 
+    function reconstructTitleAndNumber(a1, n1, a2, n2) {
+      if (!n1 && n2) {
+        const [altA1, altN1] = splitToBaseAndNumber(a1);
+        if (altN1) {
+          debugData(`A: Reconstruct:\n $a '${a1}' =>\n $a '${altA1}' +\n $n '${altN1}`);
+          return [altA1, altN1, a2, n2];
+        }
+      }
+      if (n1 && !n2) {
+        const [altA2, altN2] = splitToBaseAndNumber(a2);
+        if (altN2) {
+          debugData(`B: Reconstruct $a '${a2}' as $a '${altA2}' and $n '${altN2}`);
+          return [a1, n1, altA2, altN2];
+        }
+
+      }
+      return [null, null, null, null]; // Fail
+    }
+
+
+    function splitToBaseAndNumber(val) {
+      const words = val.split(' ');
+      const len = words.length;
+      if (len < 2 || !words[len-1].match(/^[1-9][0-9]*$/)) {
+        return [val, null];
+      }
+      if (len > 2 && words[len-2].match(/^(del|osa|vol|volume)$/u)) { // NB! "vol." has lost it's '.' during normalization!
+        const number = `${words[len-2]} ${words[len-1]}`;
+        return [words.slice(0, len-2).join(' '), number];
+      }
+
+      const number = words.pop();
+      return [words.join(' '), number];
+    }
+
   }
 });
 

package/src/matching-utils.js

@@ -129,3 +129,53 @@ export function stringBefore(string, substring) {
   }
   return string.substring(0, pos);
 }
+
+// We sort records here (put FIKKA and low-cased records first, ref MELINDA-3492)
+// NB! this only sorts the records the current set. If the best stuff would come in a later set and this set contains good enough record, we'll never reach the best...
+// Still this would alleviate the issue when maxMatches === 1...
+export function preferenceSortRecords(x, y) {
+  debug(`sortRecords: RECORD COMPARISON\n${JSON.stringify(x)} vs\n${JSON.stringify(y)}`);
+  // Prefer the record with a FIKKA LOW tag:
+  const xFikka = hasLow(x.record, 'FIKKA');
+  const yFikka = hasLow(y.record, 'FIKKA');
+
+  if (xFikka && !yFikka) {
+    debug('sortRecords: prefer FIKKA');
+    return -1;
+  }
+  if (yFikka && !xFikka) {
+    return 1;
+  }
+
+  // Prefer downcased:
+  const xAllCaps = hasAllCapsTitle(x.record);
+  const yAllCaps = hasAllCapsTitle(y.record);
+
+  if (!xAllCaps && yAllCaps) {
+    debug('sortRecords: prefer non-all caps');
+    return -1; // x is better
+  }
+  if (!yAllCaps && xAllCaps) {
+    return 1; // y is better
+  }
+  // Default:
+  return 0;
+
+  function hasLow(record, lowTag) {
+    return record.fields?.some(f => f.tag === 'LOW' && f.subfields?.some(sf => sf.code === 'a' && sf.value === lowTag));
+  }
+
+  function hasAllCapsTitle(record) {
+    const f245 = record.fields?.find(f => f.tag === '245');
+    if (!f245) {
+      debugData(`WARNING: No f245 found for ALL CAPS check`);
+      return false;
+    }
+
+    const title = f245.subfields.filter(sf => ['a', 'b', 'c'].includes(sf.code)).map(sf => sf.value).join(' ');
+    if (title.match(/[A-Z]/u) && !title.match(/[a-z]/u)) {
+      return true;
+    }
+    return false;
+  }
+}

package/{src → test}/candidate-search/index.test.js

@@ -4,11 +4,13 @@ import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen-http-client';
 import {MarcRecord} from '@natlibfi/marc-record';
 import {Error as MatchingError} from '@natlibfi/melinda-commons';
-import createSearchInterface, {CandidateSearchError} from './index.js';
+import createSearchInterface, {CandidateSearchError} from '../../src/candidate-search/index.js';
 import createDebugLogger from 'debug';
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:test');
 
+// NOTE: it seems that "only" does not work when using generateTests from @natlibfi/fixugen-http-client'
+
 describe('candidate-search', () => {
   generateTests({
     callback,

package/{src → test}/candidate-search/query-list/auth.test.js

@@ -4,7 +4,7 @@ import createDebugLogger from 'debug';
 import generateTests from '@natlibfi/fixugen';
 import {READERS} from '@natlibfi/fixura';
 import {MarcRecord} from '@natlibfi/marc-record';
-import * as generators from './auth.js';
+import * as generators from '../../../src/candidate-search/query-list/auth.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:query-list:auth-test');
 const debugData = debug.extend('data');

package/{src → test}/candidate-search/query-list/bib.test.js

@@ -4,7 +4,7 @@ import createDebugLogger from 'debug';
 import generateTests from '@natlibfi/fixugen';
 import {READERS} from '@natlibfi/fixura';
 import {MarcRecord} from '@natlibfi/marc-record';
-import * as generators from './bib.js';
+import * as generators from '../../../src/candidate-search/query-list/bib.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:query:bibHostComponents:test');
 const debugData = debug.extend('data');

package/{src → test}/index.test.js

@@ -4,12 +4,14 @@ import createDebugLogger from 'debug';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen-http-client';
 import {MarcRecord} from '@natlibfi/marc-record';
-import createMatchInterface, {matchDetection} from './index.js';
+import createMatchInterface, {matchDetection} from '../src/index.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:index:test');
 const debugData = debug.extend('data');
 
-describe('INDEX', () => {
+// NOTE: it seems that "only" does not work when using generateTests from @natlibfi/fixugen-http-client'
+
+describe('INDEX-FOO', () => {
   generateTests({
     callback,
     path: [import.meta.dirname, '..', 'test-fixtures', 'index'],
@@ -21,12 +23,15 @@ describe('INDEX', () => {
 
   async function callback({getFixture, options, expectedMatchStatus, expectedStopReason, expectedFailures, expectedCandidateCount}) {
 
+    debug(`Running tests from indezx.test.js`);
+
     const record = new MarcRecord(getFixture('inputRecord.json'), {subfieldValues: false});
     const expectedMatches = getFixture('expectedMatches.json');
     const expectedNonMatches = getFixture('expectedNonMatches.json') || [];
 
-
-    const match = createMatchInterface(formatOptions());
+    debugData(`Options: ${JSON.stringify(options)}`);
+    debugData(`Formatted options: ${JSON.stringify(formatOptions(options))}`);
+    const match = await createMatchInterface(formatOptions(options));
     const {matches, matchStatus, nonMatches, conversionFailures, candidateCount} = await match({record});
     debugData(`Matches: ${matches.length}, Status: ${matchStatus.status}/${matchStatus.stopReason}, NonMatches: ${nonMatches ? nonMatches.length : 'not returned'}, ConversionFailures: ${conversionFailures ? conversionFailures.length : 'not returned'}`);
 
@@ -44,7 +49,7 @@ describe('INDEX', () => {
       assert.deepStrictEqual(conversionFailures, expectedFailures);
     }
 
-    function formatOptions() {
+    function formatOptions(options) {
       const contextFeatures = matchDetection.features[options.detection.strategy.type];
 
       return {

package/{src → test}/match-detection/features/auth/index.test.js

@@ -5,7 +5,7 @@ import createDebugLogger from 'debug';
 import generateTests from '@natlibfi/fixugen';
 import {READERS} from '@natlibfi/fixura';
 import {MarcRecord} from '@natlibfi/marc-record';
-import * as features from './index.js';
+import * as features from '../../../../src/match-detection/features/auth/index.js';
 
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:match-detection:features/auth:test');

package/{src → test}/match-detection/features/bib/index.test.js

@@ -5,7 +5,7 @@ import createDebugLogger from 'debug';
 import generateTests from '@natlibfi/fixugen';
 import {READERS} from '@natlibfi/fixura';
 import {MarcRecord} from '@natlibfi/marc-record';
-import * as features from './index.js';
+import * as features from '../../../../src/match-detection/features/bib/index.js';
 
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:match-detection:features/bib:test');

package/{src → test}/match-detection/index.test.js

@@ -6,8 +6,8 @@ import generateTests from '@natlibfi/fixugen';
 import {READERS} from '@natlibfi/fixura';
 import {MarcRecord} from '@natlibfi/marc-record';
 
-import createDetectionInterface from './index.js';
-import * as features from './features/index.js';
+import createDetectionInterface from '../../src/match-detection/index.js';
+import * as features from '../../src/match-detection/features/index.js';
 
 const debug = createDebugLogger('@natlibfi/melinda-record-matching:match-detection:test');
 const debugData = debug.extend('data');

package/dist/candidate-search/index.test.js

@@ -1,89 +0,0 @@
-import assert from "node:assert";
-import { describe } from "node:test";
-import { READERS } from "@natlibfi/fixura";
-import generateTests from "@natlibfi/fixugen-http-client";
-import { MarcRecord } from "@natlibfi/marc-record";
-import { Error as MatchingError } from "@natlibfi/melinda-commons";
-import createSearchInterface, { CandidateSearchError } from "./index.js";
-import createDebugLogger from "debug";
-const debug = createDebugLogger("@natlibfi/melinda-record-matching:candidate-search:test");
-describe("candidate-search", () => {
-  generateTests({
-    callback,
-    path: [import.meta.dirname, "..", "..", "test-fixtures", "candidate-search", "index"],
-    recurse: false,
-    fixura: {
-      reader: READERS.JSON
-    }
-  });
-  async function callback({ getFixture, factoryOptions, searchOptions, expectedFactoryError = false, expectedSearchError = false }) {
-    const url = "http://foo.bar";
-    if (expectedFactoryError) {
-      debug(`We're expecting an error`);
-      if (expectedFactoryError.isCandidateSearchError) {
-        try {
-          const result = await createSearchInterface({ ...formatFactoryOptions(), url });
-          debug(result);
-        } catch (err) {
-          assert.equal(err instanceof CandidateSearchError, true);
-          assert.match(err.message, new RegExp(expectedFactoryError.message));
-        } finally {
-          return;
-        }
-      }
-      try {
-        const result = await createSearchInterface({ ...formatFactoryOptions(), url });
-        debug(result);
-      } catch (err) {
-        assert.equal(err instanceof Error, true);
-        assert.match(err.message, new RegExp(expectedFactoryError.message));
-      } finally {
-        return;
-      }
-    }
-    const { search } = await createSearchInterface({ ...formatFactoryOptions(), url });
-    await iterate({ searchOptions, expectedSearchError });
-    function formatFactoryOptions() {
-      debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);
-      return {
-        ...factoryOptions,
-        maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,
-        maxServerResults: factoryOptions.maxServerResults || void 0,
-        record: new MarcRecord(factoryOptions.record, { subfieldValues: false })
-      };
-    }
-    async function iterate({ searchOptions: searchOptions2, expectedSearchError: expectedSearchError2, expectedErrorStatus, count = 1 }) {
-      const expectedResults = getFixture(`expectedResults${count}.json`);
-      if (expectedSearchError2) {
-        try {
-          await search(searchOptions2);
-          throw new Error("Expected an error");
-        } catch (err) {
-          debug(`Got an error: ${err}`);
-          assert(err instanceof Error);
-          const errorMessage = err instanceof MatchingError ? err.payload.message : err.message;
-          const errorStatus = err instanceof MatchingError ? err.status : void 0;
-          debug(`errorMessage: ${errorMessage}, errorStatus: ${errorStatus}`);
-          assert.match(errorMessage, new RegExp(expectedSearchError2, "u"));
-          if (expectedErrorStatus) {
-            assert.equal(errorStatus, expectedErrorStatus);
-            return;
-          }
-          return;
-        }
-      }
-      if (!expectedSearchError2) {
-        const results = await search(searchOptions2);
-        assert.deepStrictEqual(formatResults(results), expectedResults);
-      }
-      function formatResults(results) {
-        debug(results);
-        return {
-          ...results,
-          records: results.records.map(({ record, id }) => ({ id, record: record.toObject() }))
-        };
-      }
-    }
-  }
-});
-//# sourceMappingURL=index.test.js.map

package/dist/candidate-search/index.test.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/candidate-search/index.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {describe} from 'node:test';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen-http-client';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {Error as MatchingError} from '@natlibfi/melinda-commons';\nimport createSearchInterface, {CandidateSearchError} from './index.js';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:test');\n\ndescribe('candidate-search', () => {\n  generateTests({\n    callback,\n    path: [import.meta.dirname, '..', '..', 'test-fixtures', 'candidate-search', 'index'],\n    recurse: false,\n    fixura: {\n      reader: READERS.JSON\n    }\n  });\n\n  async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError = false, expectedSearchError = false}) {\n    const url = 'http://foo.bar';\n\n    if (expectedFactoryError) {\n      debug(`We're expecting an error`);\n      if (expectedFactoryError.isCandidateSearchError) {\n        try {\n          const result = await createSearchInterface({...formatFactoryOptions(), url});\n          debug(result);\n        } catch (err) {\n          assert.equal(err instanceof CandidateSearchError, true);\n          assert.match(err.message, new RegExp(expectedFactoryError.message));\n        } finally {\n          return;\n        }\n      }\n\n      try {\n        const result = await createSearchInterface({...formatFactoryOptions(), url});\n        debug(result);\n      } catch (err) {\n        assert.equal(err instanceof Error, true);\n        assert.match(err.message, new RegExp(expectedFactoryError.message));\n      } finally {\n        return;\n      }\n    }\n\n    const {search} = await createSearchInterface({...formatFactoryOptions(), url});\n    await iterate({searchOptions, expectedSearchError});\n\n    function formatFactoryOptions() {\n      debug(`Using factoryOptions: ${JSON.stringify(factoryOptions)}`);\n      return {\n        ...factoryOptions,\n        maxRecordsPerRequest: factoryOptions.maxRecordsPerRequest || 1,\n        maxServerResults: factoryOptions.maxServerResults || undefined,\n        record: new MarcRecord(factoryOptions.record, {subfieldValues: false})\n      };\n    }\n\n    async function iterate({searchOptions, expectedSearchError, expectedErrorStatus, count = 1}) {\n      const expectedResults = getFixture(`expectedResults${count}.json`);\n\n      if (expectedSearchError) {\n        try {\n          await search(searchOptions);\n          throw new Error('Expected an error');\n        } catch (err) {\n          debug(`Got an error: ${err}`);\n          assert(err instanceof Error);\n          const errorMessage = err instanceof MatchingError ? err.payload.message : err.message;\n          const errorStatus = err instanceof MatchingError ? err.status : undefined;\n          debug(`errorMessage: ${errorMessage}, errorStatus: ${errorStatus}`);\n          assert.match(errorMessage, new RegExp(expectedSearchError, 'u'));\n\n          if (expectedErrorStatus) {\n            assert.equal(errorStatus, expectedErrorStatus);\n            return;\n          }\n          return;\n        }\n      }\n\n      if (!expectedSearchError) {\n        const results = await search(searchOptions);\n        assert.deepStrictEqual(formatResults(results), expectedResults);\n      }\n\n      function formatResults(results) {\n        debug(results);\n        return {\n          ...results,\n          records: results.records.map(({record, id}) => ({id, record: record.toObject()}))\n        };\n      }\n    }\n  }\n});\n"],
-  "mappings": "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",
-  "names": ["searchOptions", "expectedSearchError"]
-}

package/dist/candidate-search/query-list/auth.test.js

@@ -1,31 +0,0 @@
-import assert from "node:assert";
-import { describe } from "node:test";
-import createDebugLogger from "debug";
-import generateTests from "@natlibfi/fixugen";
-import { READERS } from "@natlibfi/fixura";
-import { MarcRecord } from "@natlibfi/marc-record";
-import * as generators from "./auth.js";
-const debug = createDebugLogger("@natlibfi/melinda-record-matching:candidate-search:query-list:auth-test");
-const debugData = debug.extend("data");
-describe("candidate-search/query-list/auth/", () => {
-  generateTests({
-    path: [import.meta.dirname, "..", "..", "..", "test-fixtures", "candidate-search", "query-list", "auth"],
-    useMetadataFile: true,
-    fixura: {
-      reader: READERS.JSON
-    },
-    callback: ({ type, inputRecord, expectedQuery, expectedQueryListType }) => {
-      const generate = generators[type];
-      const record = new MarcRecord(inputRecord, { subfieldValues: false });
-      const result = generate(record);
-      debugData(`Result: ${JSON.stringify(result)}`);
-      if (result.queryListType) {
-        assert.deepStrictEqual(result.queryList, expectedQuery);
-        assert.equal(result.queryListType, expectedQueryListType);
-        return;
-      }
-      assert.deepStrictEqual(result, expectedQuery);
-    }
-  });
-});
-//# sourceMappingURL=auth.test.js.map

package/dist/candidate-search/query-list/auth.test.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/candidate-search/query-list/auth.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {describe} from 'node:test';\nimport createDebugLogger from 'debug';\nimport generateTests from '@natlibfi/fixugen';\nimport {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport * as generators from './auth.js';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:query-list:auth-test');\nconst debugData = debug.extend('data');\n\ndescribe('candidate-search/query-list/auth/', () => {\n  generateTests({\n    path: [import.meta.dirname, '..', '..', '..', 'test-fixtures', 'candidate-search', 'query-list', 'auth'],\n    useMetadataFile: true,\n    fixura: {\n      reader: READERS.JSON\n    },\n    callback: ({type, inputRecord, expectedQuery, expectedQueryListType}) => {\n      const generate = generators[type];\n      const record = new MarcRecord(inputRecord, {subfieldValues: false});\n\n      const result = generate(record);\n      debugData(`Result: ${JSON.stringify(result)}`);\n\n      if (result.queryListType) {\n        assert.deepStrictEqual(result.queryList, expectedQuery);\n        assert.equal(result.queryListType, expectedQueryListType);\n        return;\n      }\n      assert.deepStrictEqual(result, expectedQuery);\n    }\n  });\n});\n"],
-  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,gBAAe;AACvB,OAAO,uBAAuB;AAC9B,OAAO,mBAAmB;AAC1B,SAAQ,eAAc;AACtB,SAAQ,kBAAiB;AACzB,YAAY,gBAAgB;AAE5B,MAAM,QAAQ,kBAAkB,yEAAyE;AACzG,MAAM,YAAY,MAAM,OAAO,MAAM;AAErC,SAAS,qCAAqC,MAAM;AAClD,gBAAc;AAAA,IACZ,MAAM,CAAC,YAAY,SAAS,MAAM,MAAM,MAAM,iBAAiB,oBAAoB,cAAc,MAAM;AAAA,IACvG,iBAAiB;AAAA,IACjB,QAAQ;AAAA,MACN,QAAQ,QAAQ;AAAA,IAClB;AAAA,IACA,UAAU,CAAC,EAAC,MAAM,aAAa,eAAe,sBAAqB,MAAM;AACvE,YAAM,WAAW,WAAW,IAAI;AAChC,YAAM,SAAS,IAAI,WAAW,aAAa,EAAC,gBAAgB,MAAK,CAAC;AAElE,YAAM,SAAS,SAAS,MAAM;AAC9B,gBAAU,WAAW,KAAK,UAAU,MAAM,CAAC,EAAE;AAE7C,UAAI,OAAO,eAAe;AACxB,eAAO,gBAAgB,OAAO,WAAW,aAAa;AACtD,eAAO,MAAM,OAAO,eAAe,qBAAqB;AACxD;AAAA,MACF;AACA,aAAO,gBAAgB,QAAQ,aAAa;AAAA,IAC9C;AAAA,EACF,CAAC;AACH,CAAC;",
-  "names": []
-}

package/dist/candidate-search/query-list/bib.test.js

@@ -1,31 +0,0 @@
-import assert from "node:assert";
-import { describe } from "node:test";
-import createDebugLogger from "debug";
-import generateTests from "@natlibfi/fixugen";
-import { READERS } from "@natlibfi/fixura";
-import { MarcRecord } from "@natlibfi/marc-record";
-import * as generators from "./bib.js";
-const debug = createDebugLogger("@natlibfi/melinda-record-matching:candidate-search:query:bibHostComponents:test");
-const debugData = debug.extend("data");
-describe("candidate-search/query-list/bib/", () => {
-  generateTests({
-    path: [import.meta.dirname, "..", "..", "..", "test-fixtures", "candidate-search", "query-list", "bib"],
-    useMetadataFile: true,
-    fixura: {
-      reader: READERS.JSON
-    },
-    callback: ({ type, inputRecord, expectedQuery, expectedQueryListType }) => {
-      const generate = generators[type];
-      const record = new MarcRecord(inputRecord, { subfieldValues: false });
-      const result = generate(record);
-      debugData(`Result: ${JSON.stringify(result)}`);
-      if (result.queryListType) {
-        assert.deepStrictEqual(result.queryList, expectedQuery);
-        assert.equal(result.queryListType, expectedQueryListType);
-        return;
-      }
-      assert.deepStrictEqual(result, expectedQuery);
-    }
-  });
-});
-//# sourceMappingURL=bib.test.js.map

package/dist/candidate-search/query-list/bib.test.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/candidate-search/query-list/bib.test.js"],
-  "sourcesContent": ["import assert from 'node:assert';\nimport {describe} from 'node:test';\nimport createDebugLogger from 'debug';\nimport generateTests from '@natlibfi/fixugen';\nimport {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport * as generators from './bib.js';\n\nconst debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:query:bibHostComponents:test');\nconst debugData = debug.extend('data');\n\ndescribe('candidate-search/query-list/bib/', () => {\n  generateTests({\n    path: [import.meta.dirname, '..', '..', '..', 'test-fixtures', 'candidate-search', 'query-list', 'bib'],\n    useMetadataFile: true,\n    fixura: {\n      reader: READERS.JSON\n    },\n    callback: ({type, inputRecord, expectedQuery, expectedQueryListType}) => {\n      const generate = generators[type];\n      const record = new MarcRecord(inputRecord, {subfieldValues: false});\n\n      const result = generate(record);\n      debugData(`Result: ${JSON.stringify(result)}`);\n\n      if (result.queryListType) {\n        assert.deepStrictEqual(result.queryList, expectedQuery);\n        assert.equal(result.queryListType, expectedQueryListType);\n        return;\n      }\n      assert.deepStrictEqual(result, expectedQuery);\n    }\n  });\n});\n"],
-  "mappings": "AAAA,OAAO,YAAY;AACnB,SAAQ,gBAAe;AACvB,OAAO,uBAAuB;AAC9B,OAAO,mBAAmB;AAC1B,SAAQ,eAAc;AACtB,SAAQ,kBAAiB;AACzB,YAAY,gBAAgB;AAE5B,MAAM,QAAQ,kBAAkB,iFAAiF;AACjH,MAAM,YAAY,MAAM,OAAO,MAAM;AAErC,SAAS,oCAAoC,MAAM;AACjD,gBAAc;AAAA,IACZ,MAAM,CAAC,YAAY,SAAS,MAAM,MAAM,MAAM,iBAAiB,oBAAoB,cAAc,KAAK;AAAA,IACtG,iBAAiB;AAAA,IACjB,QAAQ;AAAA,MACN,QAAQ,QAAQ;AAAA,IAClB;AAAA,IACA,UAAU,CAAC,EAAC,MAAM,aAAa,eAAe,sBAAqB,MAAM;AACvE,YAAM,WAAW,WAAW,IAAI;AAChC,YAAM,SAAS,IAAI,WAAW,aAAa,EAAC,gBAAgB,MAAK,CAAC;AAElE,YAAM,SAAS,SAAS,MAAM;AAC9B,gBAAU,WAAW,KAAK,UAAU,MAAM,CAAC,EAAE;AAE7C,UAAI,OAAO,eAAe;AACxB,eAAO,gBAAgB,OAAO,WAAW,aAAa;AACtD,eAAO,MAAM,OAAO,eAAe,qBAAqB;AACxD;AAAA,MACF;AACA,aAAO,gBAAgB,QAAQ,aAAa;AAAA,IAC9C;AAAA,EACF,CAAC;AACH,CAAC;",
-  "names": []
-}

package/dist/index.test.js

@@ -1,69 +0,0 @@
-import assert from "node:assert";
-import { describe } from "node:test";
-import createDebugLogger from "debug";
-import { READERS } from "@natlibfi/fixura";
-import generateTests from "@natlibfi/fixugen-http-client";
-import { MarcRecord } from "@natlibfi/marc-record";
-import createMatchInterface, { matchDetection } from "./index.js";
-const debug = createDebugLogger("@natlibfi/melinda-record-matching:index:test");
-const debugData = debug.extend("data");
-describe("INDEX", () => {
-  generateTests({
-    callback,
-    path: [import.meta.dirname, "..", "test-fixtures", "index"],
-    recurse: false,
-    fixura: {
-      reader: READERS.JSON
-    }
-  });
-  async function callback({ getFixture, options, expectedMatchStatus, expectedStopReason, expectedFailures, expectedCandidateCount }) {
-    const record = new MarcRecord(getFixture("inputRecord.json"), { subfieldValues: false });
-    const expectedMatches = getFixture("expectedMatches.json");
-    const expectedNonMatches = getFixture("expectedNonMatches.json") || [];
-    const match = createMatchInterface(formatOptions());
-    const { matches, matchStatus, nonMatches, conversionFailures, candidateCount } = await match({ record });
-    debugData(`Matches: ${matches.length}, Status: ${matchStatus.status}/${matchStatus.stopReason}, NonMatches: ${nonMatches ? nonMatches.length : "not returned"}, ConversionFailures: ${conversionFailures ? conversionFailures.length : "not returned"}`);
-    assert.equal(matchStatus.status, expectedMatchStatus);
-    assert.equal(matchStatus.stopReason, expectedStopReason);
-    assert.equal(candidateCount, expectedCandidateCount);
-    const formattedMatchResult = formatRecordResults(matches);
-    assert.deepStrictEqual(formattedMatchResult, expectedMatches);
-    const formattedNonMatchResult = formatRecordResults(nonMatches);
-    assert.deepStrictEqual(formattedNonMatchResult, expectedNonMatches);
-    if (expectedFailures) {
-      assert.deepStrictEqual(conversionFailures, expectedFailures);
-    }
-    function formatOptions() {
-      const contextFeatures = matchDetection.features[options.detection.strategy.type];
-      return {
-        ...options,
-        search: {
-          ...options.search
-        },
-        detection: {
-          ...options.detect,
-          strategy: options.detection.strategy.features.map((v) => contextFeatures[v]())
-        }
-      };
-    }
-    function formatRecordResults(matches2) {
-      if (matches2) {
-        debugData(JSON.stringify(matches2));
-        return matches2.map((match2) => ({
-          ...match2,
-          candidate: formatCandidate(match2.candidate)
-        }));
-      }
-      return [];
-    }
-    function formatCandidate({ id, record: record2 }) {
-      const newId = id;
-      const newRecord = record2;
-      return {
-        id: newId,
-        record: newRecord.toObject()
-      };
-    }
-  }
-});
-//# sourceMappingURL=index.test.js.map