@natlibfi/melinda-record-matching 4.3.2-alpha.2 → 4.3.2-alpha.4

package/dist/candidate-search/choose-queries.js

@@ -0,0 +1,150 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CandidateSearchError = void 0;
+exports.default = _default;
+var _debug = _interopRequireDefault(require("debug"));
+var _sruClient = _interopRequireWildcard(require("@natlibfi/sru-client"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+*
+* @licstart  The following is the entire license notice for the JavaScript code in this file.
+*
+* Melinda record matching modules for Javascript
+*
+* Copyright (C) 2023 University Of Helsinki (The National Library Of Finland)
+*
+* This file is part of melinda-record-matching-js
+*
+* melinda-record-matching-js program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* melinda-record-matching-js is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* @licend  The above is the entire license notice
+* for the JavaScript code in this file.
+*
+*/
+
+class CandidateSearchError extends Error {}
+exports.CandidateSearchError = CandidateSearchError;
+async function _default({
+  url,
+  queryList,
+  queryListType,
+  maxCandidates = 50
+}) {
+  const debug = (0, _debug.default)('@natlibfi/melinda-record-matching:candidate-search:choose-queries');
+  const debugData = debug.extend('data');
+  const debugDev = debug.extend('dev');
+  debugData(`Url: ${url}`);
+  debugData(`QueryList: ${queryList}`);
+  debugData(`queryListType: ${queryListType}`);
+  const client = (0, _sruClient.default)({
+    url,
+    maxRecordsPerRequest: 0,
+    version: '2.0',
+    retrieveAll: false
+  });
+  debugDev(`QueryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);
+  try {
+    const {
+      queriesWithTotals
+    } = await getQueryTotals({
+      queryList,
+      queryOffset: 0,
+      queriesWithTotals: []
+    });
+    debugDev(`QueryResult: ${JSON.stringify(queriesWithTotals)}`);
+    const filteredQueryResult = filterQueryResult({
+      queriesWithTotals,
+      maxCandidates
+    });
+    debugDev(`filteredQueryResult: ${JSON.stringify(filteredQueryResult)}`);
+    return filteredQueryResult;
+  } catch (err) {
+    throw new CandidateSearchError(err);
+  }
+  async function getQueryTotals({
+    queryList,
+    queryOffset = 0,
+    queriesWithTotals = []
+  }) {
+    const query = queryList[queryOffset];
+    debug(`Running query ${JSON.stringify(query)} (${queryOffset}) for total`);
+    if (query) {
+      const {
+        total
+      } = await retrieveTotal();
+      const newQueriesWithTotals = [...queriesWithTotals, {
+        query,
+        total
+      }];
+      debug(`Query ${queryOffset} ${query} done.`);
+      debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);
+      return getQueryTotals({
+        queryList,
+        queryOffset: queryOffset + 1,
+        queriesWithTotals: newQueriesWithTotals
+      });
+    }
+    debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);
+    return {
+      queriesWithTotals
+    };
+    function retrieveTotal() {
+      return new Promise((resolve, reject) => {
+        // eslint-disable-next-line functional/no-let
+        let totalRecords = 0;
+        debug(`Searching total amount of candidates for query: ${query}`);
+        client.searchRetrieve(query).on('error', err => {
+          // eslint-disable-next-line functional/no-conditional-statements
+          if (err instanceof _sruClient.SruSearchError) {
+            debug(`SRU SruSearchError for query: ${query}: ${err}`);
+            reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));
+          }
+          debug(`SRU error for query: ${query}: ${err}`);
+          reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));
+        }).on('total', total => {
+          debug(`Got total: ${total}`);
+          totalRecords += total;
+        }).on('end', () => {
+          try {
+            resolve({
+              total: totalRecords
+            });
+          } catch (err) {
+            debug(`Error caught on END`);
+            reject(err);
+          }
+        }).on('record', () => {
+          debugDev(`RECORD: We should no get records here`);
+        });
+      });
+    }
+  }
+  function filterQueryResult({
+    queriesWithTotals,
+    maxCandidates
+  }) {
+    debug(`Filtering queries (${queriesWithTotals.length}), maxCandidates: ${maxCandidates}`);
+    debugData(`${JSON.stringify(queriesWithTotals)}`);
+    // Drop queries where total result is 0 or greater than given maxCandidates
+    const filteredQueryResult = queriesWithTotals.filter(queryWithTotal => queryWithTotal.total !== 0 && queryWithTotal.total < maxCandidates);
+    debugData(`${JSON.stringify(filteredQueryResult)}`);
+    return filteredQueryResult;
+  }
+}
+//# sourceMappingURL=choose-queries.js.map

package/dist/candidate-search/choose-queries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"choose-queries.js","names":["_debug","_interopRequireDefault","require","_sruClient","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","CandidateSearchError","Error","exports","_default","url","queryList","queryListType","maxCandidates","debug","createDebugLogger","debugData","extend","debugDev","client","createClient","maxRecordsPerRequest","version","retrieveAll","JSON","stringify","queriesWithTotals","getQueryTotals","queryOffset","filteredQueryResult","filterQueryResult","err","query","total","retrieveTotal","newQueriesWithTotals","length","Promise","resolve","reject","totalRecords","searchRetrieve","on","SruSearchError","filter","queryWithTotal"],"sources":["../../src/candidate-search/choose-queries.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2023 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport createDebugLogger from 'debug';\nimport createClient, {SruSearchError} from '@natlibfi/sru-client';\n\nexport class CandidateSearchError extends Error {}\n\nexport default async function ({url, queryList, queryListType, maxCandidates = 50}) {\n\n  const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search:choose-queries');\n  const debugData = debug.extend('data');\n  const debugDev = debug.extend('dev');\n\n  debugData(`Url: ${url}`);\n  debugData(`QueryList: ${queryList}`);\n  debugData(`queryListType: ${queryListType}`);\n\n  const client = createClient({\n    url,\n    maxRecordsPerRequest: 0,\n    version: '2.0',\n    retrieveAll: false\n  });\n\n  debugDev(`QueryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);\n  try {\n    const {queriesWithTotals} = await getQueryTotals({queryList, queryOffset: 0, queriesWithTotals: []});\n    debugDev(`QueryResult: ${JSON.stringify(queriesWithTotals)}`);\n    const filteredQueryResult = filterQueryResult({queriesWithTotals, maxCandidates});\n    debugDev(`filteredQueryResult: ${JSON.stringify(filteredQueryResult)}`);\n    return filteredQueryResult;\n  } catch (err) {\n    throw new CandidateSearchError(err);\n  }\n\n  async function getQueryTotals({queryList, queryOffset = 0, queriesWithTotals = []}) {\n\n    const query = queryList[queryOffset];\n    debug(`Running query ${JSON.stringify(query)} (${queryOffset}) for total`);\n\n    if (query) {\n      const {total} = await retrieveTotal();\n\n      const newQueriesWithTotals = [...queriesWithTotals, {query, total}];\n      debug(`Query ${queryOffset} ${query} done.`);\n      debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n      return getQueryTotals({queryList, queryOffset: queryOffset + 1, queriesWithTotals: newQueriesWithTotals});\n    }\n\n    debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);\n    return {queriesWithTotals};\n\n    function retrieveTotal() {\n      return new Promise((resolve, reject) => {\n        // eslint-disable-next-line functional/no-let\n        let totalRecords = 0;\n\n        debug(`Searching total amount of candidates for query: ${query}`);\n\n        client.searchRetrieve(query)\n          .on('error', err => {\n            // eslint-disable-next-line functional/no-conditional-statements\n            if (err instanceof SruSearchError) {\n              debug(`SRU SruSearchError for query: ${query}: ${err}`);\n              reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));\n            }\n            debug(`SRU error for query: ${query}: ${err}`);\n            reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));\n          })\n          .on('total', total => {\n            debug(`Got total: ${total}`);\n            totalRecords += total;\n          })\n          .on('end', () => {\n            try {\n              resolve({total: totalRecords});\n            } catch (err) {\n              debug(`Error caught on END`);\n              reject(err);\n            }\n          })\n          .on('record', () => {\n            debugDev(`RECORD: We should no get records here`);\n          });\n      });\n    }\n  }\n  function filterQueryResult({queriesWithTotals, maxCandidates}) {\n    debug(`Filtering queries (${queriesWithTotals.length}), maxCandidates: ${maxCandidates}`);\n    debugData(`${JSON.stringify(queriesWithTotals)}`);\n    // Drop queries where total result is 0 or greater than given maxCandidates\n    const filteredQueryResult = queriesWithTotals.filter((queryWithTotal) => queryWithTotal.total !== 0 && queryWithTotal.total < maxCandidates);\n    debugData(`${JSON.stringify(filteredQueryResult)}`);\n    return filteredQueryResult;\n  }\n\n}\n"],"mappings":"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"}

package/dist/candidate-search/index.js

@@ -16,6 +16,7 @@ var _marcRecord = require("@natlibfi/marc-record");
 var _marcRecordSerializers = require("@natlibfi/marc-record-serializers");
 var _queryList = _interopRequireWildcard(require("./query-list"));
 var _melindaCommons = require("@natlibfi/melinda-commons");
+var _chooseQueries = _interopRequireDefault(require("./choose-queries"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -51,7 +52,7 @@ class CandidateSearchError extends Error {}
 
 // serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000
 exports.CandidateSearchError = CandidateSearchError;
-var _default = ({
+var _default = async ({
   record,
   searchSpec,
   url,
@@ -76,6 +77,16 @@ var _default = ({
   const queryListResult = (0, _queryList.default)(record, searchSpec);
   const queryList = queryListResult[0]?.queryList ? queryListResult[0].queryList : queryListResult;
   const queryListType = queryListResult[0]?.queryListType ? queryListResult[0].queryListType : undefined;
+
+  // if generateQueryList errored we should throw 422
+  if (queryList.length === 0) {
+    debug(`Empty list`);
+    throw new CandidateSearchError(`Generated query list contains no queries`);
+  }
+  if (queryListType && queryListType !== 'alternates') {
+    debug(`Unknown queryListType`);
+    throw new CandidateSearchError(`Generated query list has invalid type`);
+  }
   const client = (0, _sruClient.default)({
     url,
     maxRecordsPerRequest: adjustedMaxRecordsPerRequest,
@@ -83,30 +94,29 @@ var _default = ({
     retrieveAll: false
   });
   debug(`Searching matches for ${inputRecordId}`);
-  const chosenQueryList = choseQueries(queryList, queryListType);
-
-  // eslint-disable-next-line require-await
-  function choseQueries(queryList, queryListType) {
+  const chosenQueryList = await filterQueryList({
+    queryList,
+    queryListType
+  });
+  debug(`Chosen queries: ${JSON.stringify(chosenQueryList)}`);
+  async function filterQueryList({
+    queryList,
+    queryListType,
+    maxCandidates
+  }) {
     debug(`Generated queryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);
-
-    // if generateQueryList errored we should throw 422
-    if (queryList.length === 0) {
-      throw new CandidateSearchError(`Generated query list contains no queries`);
-    }
-    if (queryListType && queryListType !== 'alternates') {
-      throw new CandidateSearchError(`Generated query list has invalid type`);
-    }
     if (queryListType === 'alternates' && queryList.length > 1) {
-      //const [query] = queryList;
-      //const totalResult = await retrieveTotal(query);
-      // const totalsForQueries = queryList.map(query => retrieveTotal(query));
-      //debug(`${JSON.stringify(totalResult)}`);
-      return queryList;
-      //return [];
+      const queryListResult = await (0, _chooseQueries.default)({
+        url,
+        queryList,
+        queryListType,
+        maxCandidates
+      });
+      debug(`queryListResult: ${JSON.stringify(queryListResult)}`);
+      return queryListResult.map(elem => elem.query);
     }
     return queryList;
   }
-
   // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)
   // state.query : current query (undefined if there was no queries left)
   // state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)
@@ -115,8 +125,12 @@ var _default = ({
   // state.queryCounter : sequence for current query
   // state.maxedQueries : queries that resulted in more than serverMaxResults hits
 
+  return {
+    search
+  };
+
   // eslint-disable-next-line max-statements
-  return async ({
+  async function search({
     queryOffset = 0,
     resultSetOffset = 1,
     totalRecords = 0,
@@ -124,13 +138,7 @@ var _default = ({
     queryCandidateCounter = 0,
     queryCounter = 0,
     maxedQueries = []
-  }) => {
-    /*
-    if (queryListType === 'alternates') {
-      debug('Alternates - stop here');
-      return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};
-    }
-    */
+  }) {
     const query = chosenQueryList[queryOffset];
     debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);
     if (query) {
@@ -259,31 +267,7 @@ var _default = ({
         });
       });
     }
-  };
-
-  /*
-  async function retrieveTotal(query) {
-    debug(`Searching for candidateTotals with query: ${query}`);
-    totalClient.searchRetrieve(query)
-      .on('error', err => {
-        // eslint-disable-next-line functional/no-conditional-statements
-        if (err instanceof SruSearchError) {
-          debug(`SRU SruSearchError for query: ${query}: ${err}`);
-          throw new CandidateSearchError(`SRU SruSearchError for getting total for query: ${query}: ${err}`);
-        }
-        debug(`SRU error for query: ${query}: ${err}`);
-        throw new CandidateSearchError(`SRU error for getting total for query: ${query}: ${err}`);
-      })
-      .on('total', total => {
-        debug(`Got total: ${total}`);
-        return {query, total};
-      })
-      .on('end', end => {
-        debug(`End ${JSON.stringify(end)}`);
-      });
   }
-  */
-
   function checkMaxedQuery(query, total, serverMaxResult) {
     if (total >= serverMaxResult) {
       debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["_debug","_interopRequireDefault","require","_sruClient","_interopRequireWildcard","_marcRecord","_marcRecordSerializers","_queryList","_melindaCommons","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","CandidateSearchError","Error","exports","_default","record","searchSpec","url","maxCandidates","maxRecordsPerRequest","serverMaxResult","MarcRecord","setValidationOptions","subfieldValues","debug","createDebugLogger","debugData","extend","JSON","stringify","adjustedMaxRecordsPerRequest","inputRecordId","getRecordId","queryListResult","generateQueryList","queryList","queryListType","undefined","client","createClient","version","retrieveAll","chosenQueryList","choseQueries","length","queryOffset","resultSetOffset","totalRecords","searchCounter","queryCandidateCounter","queryCounter","maxedQueries","query","records","failures","nextOffset","total","retrieveRecords","newTotalRecords","newQueryCounter","newSearchCounter","newQueryCandidateCounter","maxedQuery","checkMaxedQuery","newMaxedQueries","concat","queriesLeft","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","SruSearchError","recordPromises","allSettled","filtered","filter","status","map","value","reason","payload","recordXML","push","handleRecord","recordMarc","MARCXML","from","recordId","id","idFromXML","getRecordIdFromXML","message","MatchingError","data","field"],"sources":["../../src/candidate-search/index.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020-2023 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport createDebugLogger from 'debug';\nimport createClient, {SruSearchError} from '@natlibfi/sru-client';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {MARCXML} from '@natlibfi/marc-record-serializers';\nimport generateQueryList from './query-list';\nimport {Error as MatchingError} from '@natlibfi/melinda-commons';\n\nexport {searchTypes} from './query-list';\n\nexport class CandidateSearchError extends Error {}\n\n// serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000\n\nexport default ({record, searchSpec, url, maxCandidates, maxRecordsPerRequest = 50, serverMaxResult = 20000}) => {\n  MarcRecord.setValidationOptions({subfieldValues: false});\n\n  const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search');\n  const debugData = debug.extend('data');\n\n  debugData(`SearchSpec: ${JSON.stringify(searchSpec)}`);\n  debugData(`Url: ${url}`);\n  debugData(`MaxRecordsPerRequest ${maxRecordsPerRequest}`);\n  debugData(`ServerMaxResult: ${serverMaxResult}`);\n  debugData(`MaxCandidates: ${maxCandidates}`);\n\n  // Do not retrieve more candidates than defined in maxCandidates\n  const adjustedMaxRecordsPerRequest = maxRecordsPerRequest >= maxCandidates ? maxCandidates : maxRecordsPerRequest;\n\n  const inputRecordId = getRecordId(record);\n  const queryListResult = generateQueryList(record, searchSpec);\n  const queryList = queryListResult[0]?.queryList ? queryListResult[0].queryList : queryListResult;\n  const queryListType = queryListResult[0]?.queryListType ? queryListResult[0].queryListType : undefined;\n\n  const client = createClient({\n    url,\n    maxRecordsPerRequest: adjustedMaxRecordsPerRequest,\n    version: '2.0',\n    retrieveAll: false\n  });\n\n  debug(`Searching matches for ${inputRecordId}`);\n  const chosenQueryList = choseQueries(queryList, queryListType);\n\n  // eslint-disable-next-line require-await\n  function choseQueries(queryList, queryListType) {\n    debug(`Generated queryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);\n\n    // if generateQueryList errored we should throw 422\n    if (queryList.length === 0) {\n      throw new CandidateSearchError(`Generated query list contains no queries`);\n    }\n\n    if (queryListType && queryListType !== 'alternates') {\n      throw new CandidateSearchError(`Generated query list has invalid type`);\n    }\n\n    if (queryListType === 'alternates' && queryList.length > 1) {\n      //const [query] = queryList;\n      //const totalResult = await retrieveTotal(query);\n      // const totalsForQueries = queryList.map(query => retrieveTotal(query));\n      //debug(`${JSON.stringify(totalResult)}`);\n      return queryList;\n      //return [];\n    }\n    return queryList;\n  }\n\n\n  // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)\n  // state.query : current query (undefined if there was no queries left)\n  // state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)\n  // state.queryCandidateCounter: amount of candidates (records+failures) retrieved from SRU for matching for current query, including the current record+failure set (undefined if there were no queries left)\n  // state.queriesLeft : amount of queries left\n  // state.queryCounter : sequence for current query\n  // state.maxedQueries : queries that resulted in more than serverMaxResults hits\n\n\n  // eslint-disable-next-line max-statements\n  return async ({queryOffset = 0, resultSetOffset = 1, totalRecords = 0, searchCounter = 0, queryCandidateCounter = 0, queryCounter = 0, maxedQueries = []}) => {\n\n    /*\n    if (queryListType === 'alternates') {\n      debug('Alternates - stop here');\n      return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};\n    }\n    */\n    const query = chosenQueryList[queryOffset];\n    debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);\n\n    if (query) {\n      const {records, failures, nextOffset, total} = await retrieveRecords();\n\n      // If resultSetOffset === 1 this is the first search for the current query\n      debugData(`ResultSetOffset: ${resultSetOffset}`);\n      const newTotalRecords = resultSetOffset === 1 ? total : totalRecords;\n      const newQueryCounter = resultSetOffset === 1 ? queryCounter + 1 : queryCounter;\n      const newSearchCounter = resultSetOffset === 1 ? 1 : searchCounter + 1;\n      const newQueryCandidateCounter = resultSetOffset === 1 ? records.length + failures.length : queryCandidateCounter + records.length + failures.length;\n\n      const maxedQuery = resultSetOffset === 1 ? checkMaxedQuery(query, total, serverMaxResult) : undefined;\n      const newMaxedQueries = maxedQuery ? maxedQueries.concat(maxedQuery) : maxedQueries;\n\n      if (typeof nextOffset === 'number') {\n        debug(`Next search will be for query ${queryOffset} ${query}, starting from record ${nextOffset}`);\n        return {records, failures, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n      }\n      debug(`Query ${queryOffset} ${query} done.`);\n      debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n      return {records, failures, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n    }\n\n    debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);\n    return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};\n\n    function retrieveRecords() {\n      return new Promise((resolve, reject) => {\n        const promises = [];\n        // eslint-disable-next-line functional/no-let\n        let totalRecords = 0;\n\n        debug(`Searching for candidates with query: ${query} (Offset ${resultSetOffset})`);\n\n        client.searchRetrieve(query, {startRecord: resultSetOffset})\n          .on('error', err => {\n            // eslint-disable-next-line functional/no-conditional-statements\n            if (err instanceof SruSearchError) {\n              debug(`SRU SruSearchError for query: ${query}: ${err}`);\n              reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));\n            }\n            debug(`SRU error for query: ${query}: ${err}`);\n            reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));\n          })\n          .on('total', total => {\n            debug(`Got total: ${total}`);\n            totalRecords += total;\n          })\n          .on('end', async nextOffset => {\n            try {\n              const recordPromises = await Promise.allSettled(promises);\n              debugData(`All recordPromises: ${JSON.stringify(recordPromises)}`);\n              const filtered = recordPromises.filter(r => r.status === 'fulfilled').map(r => r.value);\n              const failures = recordPromises.filter(r => r.status === 'rejected').map(r => ({status: r.reason.status, payload: r.reason.payload}));\n\n              debug(`Found ${recordPromises.length} records`);\n              debug(`Found ${filtered.length} convertable candidates`);\n              debug(`Found ${failures.length} NON-convertable candidates`);\n              debugData(`Converted: ${JSON.stringify(filtered)}.`);\n              debugData(`Not converted: ${JSON.stringify(failures)}.`);\n\n\n              resolve({nextOffset, records: filtered, failures, total: totalRecords});\n            } catch (err) {\n              debug(`Error caught on END`);\n              reject(err);\n            }\n          })\n          .on('record', recordXML => {\n            promises.push(handleRecord()); // eslint-disable-line functional/immutable-data\n\n            async function handleRecord() {\n              try {\n                const recordMarc = await MARCXML.from(recordXML, {subfieldValues: false});\n                const recordId = getRecordId(recordMarc);\n\n                return {record: recordMarc, id: recordId};\n              } catch (err) {\n                // What should this do?\n                const idFromXML = getRecordIdFromXML(recordXML);\n                debugData(`Failed converting record: ${err.message}, id: ${idFromXML}, data: ${recordXML}`);\n                //return {message: `Failed converting record: ${err.message}`, id: idFromXML, data: recordXML};\n                throw new MatchingError(422, {message: `Failed converting record: ${err.message}`, id: idFromXML || '000000000', data: recordXML});\n              }\n            }\n          });\n      });\n    }\n  };\n\n  /*\n  async function retrieveTotal(query) {\n    debug(`Searching for candidateTotals with query: ${query}`);\n    totalClient.searchRetrieve(query)\n      .on('error', err => {\n        // eslint-disable-next-line functional/no-conditional-statements\n        if (err instanceof SruSearchError) {\n          debug(`SRU SruSearchError for query: ${query}: ${err}`);\n          throw new CandidateSearchError(`SRU SruSearchError for getting total for query: ${query}: ${err}`);\n        }\n        debug(`SRU error for query: ${query}: ${err}`);\n        throw new CandidateSearchError(`SRU error for getting total for query: ${query}: ${err}`);\n      })\n      .on('total', total => {\n        debug(`Got total: ${total}`);\n        return {query, total};\n      })\n      .on('end', end => {\n        debug(`End ${JSON.stringify(end)}`);\n      });\n  }\n*/\n\n\n  function checkMaxedQuery(query, total, serverMaxResult) {\n    if (total >= serverMaxResult) {\n      debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);\n      return query;\n    }\n  }\n\n  function getRecordId(record) {\n    const [field] = record.get(/^001$/u);\n    return field ? field.value : '';\n  }\n\n  function getRecordIdFromXML(recordXML) {\n    //<controlfield tag=\\\"001\\\">015376846</controlfield\n    debug(`Cannot yet find possible database record id from recordXML (length ${recordXML.length})`);\n    return undefined;\n  }\n\n};\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["_debug","_interopRequireDefault","require","_sruClient","_interopRequireWildcard","_marcRecord","_marcRecordSerializers","_queryList","_melindaCommons","_chooseQueries","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","CandidateSearchError","Error","exports","_default","record","searchSpec","url","maxCandidates","maxRecordsPerRequest","serverMaxResult","MarcRecord","setValidationOptions","subfieldValues","debug","createDebugLogger","debugData","extend","JSON","stringify","adjustedMaxRecordsPerRequest","inputRecordId","getRecordId","queryListResult","generateQueryList","queryList","queryListType","undefined","length","client","createClient","version","retrieveAll","chosenQueryList","filterQueryList","chooseQueries","map","elem","query","search","queryOffset","resultSetOffset","totalRecords","searchCounter","queryCandidateCounter","queryCounter","maxedQueries","records","failures","nextOffset","total","retrieveRecords","newTotalRecords","newQueryCounter","newSearchCounter","newQueryCandidateCounter","maxedQuery","checkMaxedQuery","newMaxedQueries","concat","queriesLeft","Promise","resolve","reject","promises","searchRetrieve","startRecord","on","err","SruSearchError","recordPromises","allSettled","filtered","filter","status","value","reason","payload","recordXML","push","handleRecord","recordMarc","MARCXML","from","recordId","id","idFromXML","getRecordIdFromXML","message","MatchingError","data","field"],"sources":["../../src/candidate-search/index.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020-2023 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport createDebugLogger from 'debug';\nimport createClient, {SruSearchError} from '@natlibfi/sru-client';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {MARCXML} from '@natlibfi/marc-record-serializers';\nimport generateQueryList from './query-list';\nimport {Error as MatchingError} from '@natlibfi/melinda-commons';\nimport chooseQueries from './choose-queries';\n\nexport {searchTypes} from './query-list';\n\nexport class CandidateSearchError extends Error {}\n\n// serverMaxResults : maximum size of total search result available from the server, defaults to Aleph's 20000\n\nexport default async ({record, searchSpec, url, maxCandidates, maxRecordsPerRequest = 50, serverMaxResult = 20000}) => {\n  MarcRecord.setValidationOptions({subfieldValues: false});\n\n  const debug = createDebugLogger('@natlibfi/melinda-record-matching:candidate-search');\n  const debugData = debug.extend('data');\n\n  debugData(`SearchSpec: ${JSON.stringify(searchSpec)}`);\n  debugData(`Url: ${url}`);\n  debugData(`MaxRecordsPerRequest ${maxRecordsPerRequest}`);\n  debugData(`ServerMaxResult: ${serverMaxResult}`);\n  debugData(`MaxCandidates: ${maxCandidates}`);\n\n  // Do not retrieve more candidates than defined in maxCandidates\n  const adjustedMaxRecordsPerRequest = maxRecordsPerRequest >= maxCandidates ? maxCandidates : maxRecordsPerRequest;\n\n  const inputRecordId = getRecordId(record);\n  const queryListResult = generateQueryList(record, searchSpec);\n  const queryList = queryListResult[0]?.queryList ? queryListResult[0].queryList : queryListResult;\n  const queryListType = queryListResult[0]?.queryListType ? queryListResult[0].queryListType : undefined;\n\n  // if generateQueryList errored we should throw 422\n  if (queryList.length === 0) {\n    debug(`Empty list`);\n    throw new CandidateSearchError(`Generated query list contains no queries`);\n  }\n  if (queryListType && queryListType !== 'alternates') {\n    debug(`Unknown queryListType`);\n    throw new CandidateSearchError(`Generated query list has invalid type`);\n  }\n\n  const client = createClient({\n    url,\n    maxRecordsPerRequest: adjustedMaxRecordsPerRequest,\n    version: '2.0',\n    retrieveAll: false\n  });\n\n  debug(`Searching matches for ${inputRecordId}`);\n  const chosenQueryList = await filterQueryList({queryList, queryListType});\n  debug(`Chosen queries: ${JSON.stringify(chosenQueryList)}`);\n\n  async function filterQueryList({queryList, queryListType, maxCandidates}) {\n    debug(`Generated queryList (type: ${queryListType}) ${JSON.stringify(queryList)}`);\n\n    if (queryListType === 'alternates' && queryList.length > 1) {\n      const queryListResult = await chooseQueries({url, queryList, queryListType, maxCandidates});\n      debug(`queryListResult: ${JSON.stringify(queryListResult)}`);\n      return queryListResult.map(elem => elem.query);\n    }\n    return queryList;\n  }\n  // state.totalRecords : amount of candidate records available to the current query (undefined, if there was no queries left)\n  // state.query : current query (undefined if there was no queries left)\n  // state.searchCounter : sequence for current search for current query (undefined, if there we no queries left)\n  // state.queryCandidateCounter: amount of candidates (records+failures) retrieved from SRU for matching for current query, including the current record+failure set (undefined if there were no queries left)\n  // state.queriesLeft : amount of queries left\n  // state.queryCounter : sequence for current query\n  // state.maxedQueries : queries that resulted in more than serverMaxResults hits\n\n  return {search};\n\n  // eslint-disable-next-line max-statements\n  async function search({queryOffset = 0, resultSetOffset = 1, totalRecords = 0, searchCounter = 0, queryCandidateCounter = 0, queryCounter = 0, maxedQueries = []}) {\n\n    const query = chosenQueryList[queryOffset];\n    debug(`Running query ${JSON.stringify(query)} (${queryOffset})`);\n\n    if (query) {\n      const {records, failures, nextOffset, total} = await retrieveRecords();\n\n      // If resultSetOffset === 1 this is the first search for the current query\n      debugData(`ResultSetOffset: ${resultSetOffset}`);\n      const newTotalRecords = resultSetOffset === 1 ? total : totalRecords;\n      const newQueryCounter = resultSetOffset === 1 ? queryCounter + 1 : queryCounter;\n      const newSearchCounter = resultSetOffset === 1 ? 1 : searchCounter + 1;\n      const newQueryCandidateCounter = resultSetOffset === 1 ? records.length + failures.length : queryCandidateCounter + records.length + failures.length;\n\n      const maxedQuery = resultSetOffset === 1 ? checkMaxedQuery(query, total, serverMaxResult) : undefined;\n      const newMaxedQueries = maxedQuery ? maxedQueries.concat(maxedQuery) : maxedQueries;\n\n      if (typeof nextOffset === 'number') {\n        debug(`Next search will be for query ${queryOffset} ${query}, starting from record ${nextOffset}`);\n        return {records, failures, queryOffset, resultSetOffset: nextOffset, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n      }\n      debug(`Query ${queryOffset} ${query} done.`);\n      debug(`There are (${queryList.length - (queryOffset + 1)} queries left)`);\n      return {records, failures, queryOffset: queryOffset + 1, queriesLeft: queryList.length - (queryOffset + 1), totalRecords: newTotalRecords, query, searchCounter: newSearchCounter, queryCandidateCounter: newQueryCandidateCounter, queryCounter: newQueryCounter, maxedQueries: newMaxedQueries};\n    }\n\n    debug(`All ${queryList.length} queries done, there's no query for ${queryOffset}`);\n    return {records: [], failures: [], queriesLeft: 0, queryCounter, maxedQueries};\n\n    function retrieveRecords() {\n      return new Promise((resolve, reject) => {\n        const promises = [];\n        // eslint-disable-next-line functional/no-let\n        let totalRecords = 0;\n\n        debug(`Searching for candidates with query: ${query} (Offset ${resultSetOffset})`);\n\n        client.searchRetrieve(query, {startRecord: resultSetOffset})\n          .on('error', err => {\n            // eslint-disable-next-line functional/no-conditional-statements\n            if (err instanceof SruSearchError) {\n              debug(`SRU SruSearchError for query: ${query}: ${err}`);\n              reject(new CandidateSearchError(`SRU SruSearchError for query: ${query}: ${err}`));\n            }\n            debug(`SRU error for query: ${query}: ${err}`);\n            reject(new CandidateSearchError(`SRU error for query: ${query}: ${err}`));\n          })\n          .on('total', total => {\n            debug(`Got total: ${total}`);\n            totalRecords += total;\n          })\n          .on('end', async nextOffset => {\n            try {\n              const recordPromises = await Promise.allSettled(promises);\n              debugData(`All recordPromises: ${JSON.stringify(recordPromises)}`);\n              const filtered = recordPromises.filter(r => r.status === 'fulfilled').map(r => r.value);\n              const failures = recordPromises.filter(r => r.status === 'rejected').map(r => ({status: r.reason.status, payload: r.reason.payload}));\n\n              debug(`Found ${recordPromises.length} records`);\n              debug(`Found ${filtered.length} convertable candidates`);\n              debug(`Found ${failures.length} NON-convertable candidates`);\n              debugData(`Converted: ${JSON.stringify(filtered)}.`);\n              debugData(`Not converted: ${JSON.stringify(failures)}.`);\n\n\n              resolve({nextOffset, records: filtered, failures, total: totalRecords});\n            } catch (err) {\n              debug(`Error caught on END`);\n              reject(err);\n            }\n          })\n          .on('record', recordXML => {\n            promises.push(handleRecord()); // eslint-disable-line functional/immutable-data\n\n            async function handleRecord() {\n              try {\n                const recordMarc = await MARCXML.from(recordXML, {subfieldValues: false});\n                const recordId = getRecordId(recordMarc);\n\n                return {record: recordMarc, id: recordId};\n              } catch (err) {\n                // What should this do?\n                const idFromXML = getRecordIdFromXML(recordXML);\n                debugData(`Failed converting record: ${err.message}, id: ${idFromXML}, data: ${recordXML}`);\n                //return {message: `Failed converting record: ${err.message}`, id: idFromXML, data: recordXML};\n                throw new MatchingError(422, {message: `Failed converting record: ${err.message}`, id: idFromXML || '000000000', data: recordXML});\n              }\n            }\n          });\n      });\n    }\n  }\n\n  function checkMaxedQuery(query, total, serverMaxResult) {\n    if (total >= serverMaxResult) {\n      debug(`WARNING: Query ${query} resulted in ${total} hits which meets the serverMaxResult (${serverMaxResult}) `);\n      return query;\n    }\n  }\n\n  function getRecordId(record) {\n    const [field] = record.get(/^001$/u);\n    return field ? field.value : '';\n  }\n\n  function getRecordIdFromXML(recordXML) {\n    //<controlfield tag=\\\"001\\\">015376846</controlfield\n    debug(`Cannot yet find possible database record id from recordXML (length ${recordXML.length})`);\n    return undefined;\n  }\n};\n"],"mappings":"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"}

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

@@ -48,6 +48,8 @@ describe('candidate-search', () => {
       reader: _fixura.READERS.JSON
     }
   });
+
+  // eslint-disable-next-line max-statements
   async function callback({
     getFixture,
     factoryOptions,
@@ -61,23 +63,38 @@ describe('candidate-search', () => {
       return;
     }
     if (expectedFactoryError) {
+      debug(`We're expecting an error`);
       if (expectedFactoryError.isCandidateSearchError) {
-        (0, _chai.expect)(() => (0, _.default)({
+        try {
+          const result = (0, _.default)({
+            ...formatFactoryOptions(),
+            url
+          });
+          debug(result);
+        } catch (err) {
+          (0, _chai.expect)(err).to.equal(new _.CandidateSearchError(expectedFactoryError));
+        }
+        return;
+      }
+      try {
+        const result = (0, _.default)({
           ...formatFactoryOptions(),
           url
-        })).to.throw(_.CandidateSearchError, new RegExp(expectedFactoryError, 'u'));
-        return;
+        });
+        debug(result);
+      } catch (err) {
+        (0, _chai.expect)(err).to.equal(new Error(expectedFactoryError));
       }
-      (0, _chai.expect)(() => (0, _.default)({
-        ...formatFactoryOptions(),
-        url
-      })).to.throw(new RegExp(expectedFactoryError, 'u'));
       return;
     }
-    const search = (0, _.default)({
+    const {
+      search
+    } = await (0, _.default)({
       ...formatFactoryOptions(),
       url
     });
+    // eslint-disable-next-line no-console
+    console.log(search);
     await iterate({
       searchOptions,
       expectedSearchError

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

@@ -1 +1 @@
-{"version":3,"file":"index.spec.js","names":["_chai","require","_fixura","_fixugenHttpClient","_interopRequireDefault","_marcRecord","_melindaCommons","_","_interopRequireWildcard","_debug","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","debug","createDebugLogger","describe","generateTests","callback","path","__dirname","recurse","fixura","reader","READERS","JSON","getFixture","factoryOptions","searchOptions","expectedFactoryError","expectedSearchError","enabled","url","isCandidateSearchError","expect","createSearchInterface","formatFactoryOptions","to","throw","CandidateSearchError","RegExp","search","iterate","stringify","maxRecordsPerRequest","maxServerResults","undefined","record","MarcRecord","subfieldValues","expectedErrorStatus","count","expectedResults","Error","err","be","an","errorMessage","MatchingError","payload","message","errorStatus","status","match","results","formatResults","eql","records","map","id","toObject"],"sources":["../../src/candidate-search/index.spec.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {expect} from 'chai';\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 '.';\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: [__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, enabled = true}) {\n    const url = 'http://foo.bar';\n\n    if (!enabled) {\n      return;\n    }\n\n    if (expectedFactoryError) {\n      if (expectedFactoryError.isCandidateSearchError) {\n        expect(() => createSearchInterface({...formatFactoryOptions(), url})).to.throw(CandidateSearchError, new RegExp(expectedFactoryError, 'u'));\n        return;\n      }\n\n      expect(() => createSearchInterface({...formatFactoryOptions(), url})).to.throw(new RegExp(expectedFactoryError, 'u'));\n      return;\n    }\n\n    const search = 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) { // eslint-disable-line functional/no-conditional-statements\n        try {\n          await search(searchOptions);\n          throw new Error('Expected an error');\n        } catch (err) {\n          debug(`Got an error: ${err}`);\n          expect(err).to.be.an('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          expect(errorMessage).to.match(new RegExp(expectedSearchError, 'u'));\n\n          if (expectedErrorStatus) {\n            expect(errorStatus).to.be(expectedErrorStatus);\n            return;\n          }\n          return;\n        }\n      }\n\n      // eslint-disable-next-line functional/no-conditional-statements\n      if (!expectedSearchError) {\n        const results = await search(searchOptions);\n        expect(formatResults(results)).to.eql(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});\n"],"mappings":"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"}
+{"version":3,"file":"index.spec.js","names":["_chai","require","_fixura","_fixugenHttpClient","_interopRequireDefault","_marcRecord","_melindaCommons","_","_interopRequireWildcard","_debug","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","debug","createDebugLogger","describe","generateTests","callback","path","__dirname","recurse","fixura","reader","READERS","JSON","getFixture","factoryOptions","searchOptions","expectedFactoryError","expectedSearchError","enabled","url","isCandidateSearchError","result","createSearchInterface","formatFactoryOptions","err","expect","to","equal","CandidateSearchError","Error","search","console","log","iterate","stringify","maxRecordsPerRequest","maxServerResults","undefined","record","MarcRecord","subfieldValues","expectedErrorStatus","count","expectedResults","be","an","errorMessage","MatchingError","payload","message","errorStatus","status","match","RegExp","results","formatResults","eql","records","map","id","toObject"],"sources":["../../src/candidate-search/index.spec.js"],"sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Melinda record matching modules for Javascript\n*\n* Copyright (C) 2020-2022 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of melinda-record-matching-js\n*\n* melinda-record-matching-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Lesser General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* melinda-record-matching-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n* GNU Lesser General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program.  If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend  The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {expect} from 'chai';\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 '.';\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: [__dirname, '..', '..', 'test-fixtures', 'candidate-search', 'index'],\n    recurse: false,\n    fixura: {\n      reader: READERS.JSON\n    }\n  });\n\n  // eslint-disable-next-line max-statements\n  async function callback({getFixture, factoryOptions, searchOptions, expectedFactoryError = false, expectedSearchError = false, enabled = true}) {\n    const url = 'http://foo.bar';\n\n    if (!enabled) {\n      return;\n    }\n\n    if (expectedFactoryError) {\n      debug(`We're expecting an error`);\n      if (expectedFactoryError.isCandidateSearchError) {\n        try {\n          const result = createSearchInterface({...formatFactoryOptions(), url});\n          debug(result);\n        } catch (err) {\n          expect(err).to.equal(new CandidateSearchError(expectedFactoryError));\n        }\n        return;\n      }\n\n      try {\n        const result = createSearchInterface({...formatFactoryOptions(), url});\n        debug(result);\n      } catch (err) {\n        expect(err).to.equal(new Error(expectedFactoryError));\n      }\n      return;\n    }\n\n    const {search} = await createSearchInterface({...formatFactoryOptions(), url});\n    // eslint-disable-next-line no-console\n    console.log(search);\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) { // eslint-disable-line functional/no-conditional-statements\n        try {\n          await search(searchOptions);\n          throw new Error('Expected an error');\n        } catch (err) {\n          debug(`Got an error: ${err}`);\n          expect(err).to.be.an('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          expect(errorMessage).to.match(new RegExp(expectedSearchError, 'u'));\n\n          if (expectedErrorStatus) {\n            expect(errorStatus).to.be(expectedErrorStatus);\n            return;\n          }\n          return;\n        }\n      }\n\n      // eslint-disable-next-line functional/no-conditional-statements\n      if (!expectedSearchError) {\n        const results = await search(searchOptions);\n        expect(formatResults(results)).to.eql(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});\n"],"mappings":"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"}

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

@@ -204,15 +204,16 @@ function bibTitleAuthorYearAlternates(record) {
   debug('bibTitleAuthorYearAlternates');
   // We use onlyTitleLength that is longer than our formatted length to
   // get an author or an publisher always
-
+  const origQueryList = bibTitleAuthorPublisher({
+    record,
+    onlyTitleLength: 100,
+    addYear: true,
+    alternates: true,
+    alternateQueries: []
+  });
+  debug(`${JSON.stringify(origQueryList)}`);
   return {
-    queryList: bibTitleAuthorPublisher({
-      record,
-      onlyTitleLength: 100,
-      addYear: true,
-      alternates: true,
-      alternateQueries: []
-    }),
+    queryList: Array.from(origQueryList).reverse(),
     queryListType: 'alternates'
   };
 }