@natlibfi/marc-record-merge 6.0.0-beta.1 → 6.0.0-beta.5

package/dist/reducers/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/reducers/index.js"],"names":[],"mappings":";;;;;;AA4BA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AACA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Merge MARC records\n*\n* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of marc-record-merge-js\n\n* marc-record-merge-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* marc-record-merge-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 Lesser 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\nexport * from './copy';\nexport * from './select';\n\n"],"file":"index.js"}
+{"version":3,"file":"index.js","names":["copy","select","strictEquality","subsetEquality"],"sources":["../../src/reducers/index.js"],"sourcesContent":["import copy from './copy';\nimport select, {strictEquality, subsetEquality} from './select';\n\nexport default {copy, select, strictEquality, subsetEquality};\n"],"mappings":";;;;;;;AAAA;;AACA;;;;;;;;eAEe;EAACA,IAAI,EAAJA,aAAD;EAAOC,MAAM,EAANA,eAAP;EAAeC,cAAc,EAAdA,sBAAf;EAA+BC,cAAc,EAAdA;AAA/B,C"}

package/dist/reducers/select.js

@@ -3,57 +3,40 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 exports.strictEquality = strictEquality;
 exports.subsetEquality = subsetEquality;
-exports.default = void 0;
 
 var _normalizeDiacritics = require("normalize-diacritics");
 
-/**
-*
-* @licstart  The following is the entire license notice for the JavaScript code in this file.
-*
-* Merge MARC records
-*
-* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)
-*
-* This file is part of marc-record-merge-js
-
-* marc-record-merge-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.
-*
-* marc-record-merge-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 Lesser 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.
-*
-*/
+var _debug = _interopRequireDefault(require("debug"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function strictEquality(subfieldA, subfieldB) {
   return subfieldA.code === subfieldB.code && subfieldA.value === subfieldB.value;
 }
 
 function subsetEquality(subfieldA, subfieldB) {
   return subfieldA.code === subfieldB.code && (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);
-}
+} // EqualityFunction can be either strictEquality or subsetEquality
+
 
 var _default = ({
-  pattern,
+  tagPattern,
   equalityFunction = strictEquality
 }) => (base, source) => {
-  const baseFields = base.get(pattern);
-  const sourceFields = source.get(pattern);
+  const debug = (0, _debug.default)('@natlibfi/marc-record-merge:select');
+  const baseFields = base.get(tagPattern);
+  const sourceFields = source.get(tagPattern);
+  const fieldTag = sourceFields.map(field => field.tag);
+  debug(`Comparing field ${fieldTag}`);
   checkFieldType(baseFields);
   checkFieldType(sourceFields);
 
   if (baseFields.length > 1 || sourceFields.length > 1) {
+    debug(`Multiple fields in base or source`);
+    debug(`No changes to base`);
     return base;
   }
 
@@ -61,6 +44,8 @@ var _default = ({
   const [sourceField] = sourceFields;
 
   if (baseField.tag === sourceField.tag === false) {
+    debug(`Base tag ${baseField.tag} is not equal to source tag ${sourceField.tag}`);
+    debug(`No changes to base`);
     return base;
   }
 
@@ -79,15 +64,22 @@ var _default = ({
   }) => ({
     code,
     value: normalizeSubfieldValue(value)
-  }));
+  })); // Returns the base subfields for which a matching source subfield is found
+
   const equalSubfieldsBase = baseSubsNormalized.filter(baseSubfield => sourceSubsNormalized.some(sourceSubfield => equalityFunction(baseSubfield, sourceSubfield)));
+  debug(`equalSubfieldsBase: ${JSON.stringify(equalSubfieldsBase, undefined, 2)}`); // Returns the source subfields for which a matching base subfield is found
+
   const equalSubfieldsSource = sourceSubsNormalized.filter(sourceSubfield => baseSubsNormalized.some(baseSubfield => equalityFunction(sourceSubfield, baseSubfield)));
+  debug(`equalSubfieldsSource: ${JSON.stringify(equalSubfieldsSource, undefined, 2)}`);
 
   if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length < baseSubs.length) {
+    debug(`Base and source subfields are not equal`);
+    debug(`No changes to base`);
     return base;
   }
 
   if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length === equalSubfieldsSource.length) {
+    debug(`Checking subfield equality`);
     const totalSubfieldLengthBase = baseSubsNormalized.map(({
       value
     }) => value.length).reduce((acc, value) => acc + value);
@@ -104,12 +96,14 @@ var _default = ({
     return replaceBasefieldWithSourcefield(base);
   }
 
+  debug(`No changes to base`);
   return base;
 
   function replaceBasefieldWithSourcefield(base) {
     const index = base.fields.findIndex(field => field === baseField);
     base.fields.splice(index, 1, sourceField); // eslint-disable-line functional/immutable-data
 
+    debug(`Source field is longer, replacing base with source`);
     return base;
   }
 
@@ -127,7 +121,7 @@ var _default = ({
 
   function normalizeSubfieldValue(value) {
     // Regexp options: g: global search, u: unicode
-    const punctuation = /[.,\-/#!$%^&*;:{}=_`~()[\]]/gu;
+    const punctuation = /[.,\-/#!?$%^&*;:{}=_`~()[\]]/gu;
     return (0, _normalizeDiacritics.normalizeSync)(value).toLowerCase().replace(punctuation, '', 'u').replace(/\s+/gu, ' ').trim();
   }
 };

package/dist/reducers/select.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/reducers/select.js"],"names":["strictEquality","subfieldA","subfieldB","code","value","subsetEquality","indexOf","pattern","equalityFunction","base","source","baseFields","get","sourceFields","checkFieldType","length","baseField","sourceField","tag","baseSubs","subfields","sourceSubs","baseSubsNormalized","map","normalizeSubfieldValue","sourceSubsNormalized","equalSubfieldsBase","filter","baseSubfield","some","sourceSubfield","equalSubfieldsSource","totalSubfieldLengthBase","reduce","acc","totalSubfieldLengthSource","replaceBasefieldWithSourcefield","index","fields","findIndex","field","splice","checkedFields","Error","punctuation","toLowerCase","replace","trim"],"mappings":"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","sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Merge MARC records\n*\n* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of marc-record-merge-js\n\n* marc-record-merge-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* marc-record-merge-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 Lesser 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*/\nimport {normalizeSync} from 'normalize-diacritics';\n\nexport function strictEquality(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code &&\n  subfieldA.value === subfieldB.value;\n}\n\nexport function subsetEquality(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code &&\n  (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);\n}\n\nexport default ({pattern, equalityFunction = strictEquality}) => (base, source) => {\n  const baseFields = base.get(pattern);\n  const sourceFields = source.get(pattern);\n\n  checkFieldType(baseFields);\n  checkFieldType(sourceFields);\n\n  if (baseFields.length > 1 || sourceFields.length > 1) {\n    return base;\n  }\n  const [baseField] = baseFields;\n  const [sourceField] = sourceFields;\n\n  if (baseField.tag === sourceField.tag === false) {\n    return base;\n  }\n  const baseSubs = baseField.subfields;\n  const sourceSubs = sourceField.subfields;\n\n  const baseSubsNormalized = baseSubs\n    .map(({code, value}) => ({code, value: normalizeSubfieldValue(value)}));\n\n  const sourceSubsNormalized = sourceSubs\n    .map(({code, value}) => ({code, value: normalizeSubfieldValue(value)}));\n\n  const equalSubfieldsBase = baseSubsNormalized\n    .filter(baseSubfield => sourceSubsNormalized\n      .some(sourceSubfield => equalityFunction(baseSubfield, sourceSubfield)));\n\n  const equalSubfieldsSource = sourceSubsNormalized\n    .filter(sourceSubfield => baseSubsNormalized\n      .some(baseSubfield => equalityFunction(sourceSubfield, baseSubfield)));\n\n  if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length < baseSubs.length) {\n    return base;\n  }\n\n  if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length === equalSubfieldsSource.length) {\n    const totalSubfieldLengthBase = baseSubsNormalized\n      .map(({value}) => value.length)\n      .reduce((acc, value) => acc + value);\n    const totalSubfieldLengthSource = sourceSubsNormalized\n      .map(({value}) => value.length)\n      .reduce((acc, value) => acc + value);\n\n    if (totalSubfieldLengthSource > totalSubfieldLengthBase) {\n      return replaceBasefieldWithSourcefield(base);\n    }\n  }\n\n  if (sourceSubs.length > baseSubs.length && equalSubfieldsBase.length === baseSubs.length) {\n    return replaceBasefieldWithSourcefield(base);\n  }\n\n  return base;\n\n  function replaceBasefieldWithSourcefield(base) {\n    const index = base.fields.findIndex(field => field === baseField);\n    base.fields.splice(index, 1, sourceField); // eslint-disable-line functional/immutable-data\n    return base;\n  }\n\n  function checkFieldType(fields) {\n    const checkedFields = fields.map(field => {\n      if ('value' in field) { // eslint-disable-line functional/no-conditional-statement\n        throw new Error('Invalid control field, expected data field');\n      }\n      return field;\n    });\n    return checkedFields;\n  }\n\n  function normalizeSubfieldValue(value) {\n    // Regexp options: g: global search, u: unicode\n    const punctuation = /[.,\\-/#!$%^&*;:{}=_`~()[\\]]/gu;\n    return normalizeSync(value).toLowerCase().replace(punctuation, '', 'u').replace(/\\s+/gu, ' ').trim();\n  }\n};\n"],"file":"select.js"}
+{"version":3,"file":"select.js","names":["strictEquality","subfieldA","subfieldB","code","value","subsetEquality","indexOf","tagPattern","equalityFunction","base","source","debug","createDebugLogger","baseFields","get","sourceFields","fieldTag","map","field","tag","checkFieldType","length","baseField","sourceField","baseSubs","subfields","sourceSubs","baseSubsNormalized","normalizeSubfieldValue","sourceSubsNormalized","equalSubfieldsBase","filter","baseSubfield","some","sourceSubfield","JSON","stringify","undefined","equalSubfieldsSource","totalSubfieldLengthBase","reduce","acc","totalSubfieldLengthSource","replaceBasefieldWithSourcefield","index","fields","findIndex","splice","checkedFields","Error","punctuation","normalizeSync","toLowerCase","replace","trim"],"sources":["../../src/reducers/select.js"],"sourcesContent":["import {normalizeSync} from 'normalize-diacritics';\nimport createDebugLogger from 'debug';\n\nexport function strictEquality(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code &&\n  subfieldA.value === subfieldB.value;\n}\n\nexport function subsetEquality(subfieldA, subfieldB) {\n  return subfieldA.code === subfieldB.code &&\n  (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);\n}\n// EqualityFunction can be either strictEquality or subsetEquality\nexport default ({tagPattern, equalityFunction = strictEquality}) => (base, source) => {\n  const debug = createDebugLogger('@natlibfi/marc-record-merge:select');\n  const baseFields = base.get(tagPattern);\n  const sourceFields = source.get(tagPattern);\n  const fieldTag = sourceFields.map(field => field.tag);\n  debug(`Comparing field ${fieldTag}`);\n\n  checkFieldType(baseFields);\n  checkFieldType(sourceFields);\n\n  if (baseFields.length > 1 || sourceFields.length > 1) {\n    debug(`Multiple fields in base or source`);\n    debug(`No changes to base`);\n    return base;\n  }\n  const [baseField] = baseFields;\n  const [sourceField] = sourceFields;\n\n  if (baseField.tag === sourceField.tag === false) {\n    debug(`Base tag ${baseField.tag} is not equal to source tag ${sourceField.tag}`);\n    debug(`No changes to base`);\n    return base;\n  }\n  const baseSubs = baseField.subfields;\n  const sourceSubs = sourceField.subfields;\n\n  const baseSubsNormalized = baseSubs\n    .map(({code, value}) => ({code, value: normalizeSubfieldValue(value)}));\n\n  const sourceSubsNormalized = sourceSubs\n    .map(({code, value}) => ({code, value: normalizeSubfieldValue(value)}));\n\n  // Returns the base subfields for which a matching source subfield is found\n  const equalSubfieldsBase = baseSubsNormalized\n    .filter(baseSubfield => sourceSubsNormalized\n      .some(sourceSubfield => equalityFunction(baseSubfield, sourceSubfield)));\n  debug(`equalSubfieldsBase: ${JSON.stringify(equalSubfieldsBase, undefined, 2)}`);\n\n  // Returns the source subfields for which a matching base subfield is found\n  const equalSubfieldsSource = sourceSubsNormalized\n    .filter(sourceSubfield => baseSubsNormalized\n      .some(baseSubfield => equalityFunction(sourceSubfield, baseSubfield)));\n  debug(`equalSubfieldsSource: ${JSON.stringify(equalSubfieldsSource, undefined, 2)}`);\n\n  if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length < baseSubs.length) {\n    debug(`Base and source subfields are not equal`);\n    debug(`No changes to base`);\n    return base;\n  }\n\n  if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length === equalSubfieldsSource.length) {\n    debug(`Checking subfield equality`);\n    const totalSubfieldLengthBase = baseSubsNormalized\n      .map(({value}) => value.length)\n      .reduce((acc, value) => acc + value);\n    const totalSubfieldLengthSource = sourceSubsNormalized\n      .map(({value}) => value.length)\n      .reduce((acc, value) => acc + value);\n\n    if (totalSubfieldLengthSource > totalSubfieldLengthBase) {\n      return replaceBasefieldWithSourcefield(base);\n    }\n  }\n\n  if (sourceSubs.length > baseSubs.length && equalSubfieldsBase.length === baseSubs.length) {\n    return replaceBasefieldWithSourcefield(base);\n  }\n\n  debug(`No changes to base`);\n  return base;\n\n  function replaceBasefieldWithSourcefield(base) {\n    const index = base.fields.findIndex(field => field === baseField);\n    base.fields.splice(index, 1, sourceField); // eslint-disable-line functional/immutable-data\n    debug(`Source field is longer, replacing base with source`);\n    return base;\n  }\n\n  function checkFieldType(fields) {\n    const checkedFields = fields.map(field => {\n      if ('value' in field) { // eslint-disable-line functional/no-conditional-statement\n        throw new Error('Invalid control field, expected data field');\n      }\n      return field;\n    });\n    return checkedFields;\n  }\n\n  function normalizeSubfieldValue(value) {\n    // Regexp options: g: global search, u: unicode\n    const punctuation = /[.,\\-/#!?$%^&*;:{}=_`~()[\\]]/gu;\n    return normalizeSync(value).toLowerCase().replace(punctuation, '', 'u').replace(/\\s+/gu, ' ').trim();\n  }\n};\n"],"mappings":"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"}

package/dist/reducers/select.spec.js

@@ -1,102 +1,68 @@
 "use strict";
 
-var _chai = _interopRequireDefault(require("chai"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
+var _chai = require("chai");
 
 var _marcRecord = require("@natlibfi/marc-record");
 
 var _select = _interopRequireWildcard(require("./select"));
 
-var _fixura = _interopRequireWildcard(require("@natlibfi/fixura"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+var _fixura = require("@natlibfi/fixura");
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
 
 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.
-*
-* Merge MARC records
-*
-* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)
-*
-* This file is part of marc-record-merge-js
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-* marc-record-merge-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.
-*
-* marc-record-merge-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 Lesser 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.
-*
-*/
 _marcRecord.MarcRecord.setValidationOptions({
   subfieldValues: false
 });
 
-describe('reducers/select', () => {
-  const {
-    expect
-  } = _chai.default;
-
-  const fixturesPath = _path.default.join(__dirname, '..', '..', 'test-fixtures', 'reducers', 'select');
-
-  _fs.default.readdirSync(fixturesPath).forEach(subDir => {
-    const {
-      getFixture
-    } = (0, _fixura.default)({
-      root: [fixturesPath, subDir],
-      reader: _fixura.READERS.JSON,
-      failWhenNotFound: false
-    });
-    it(subDir, () => {
-      const baseTest = new _marcRecord.MarcRecord(getFixture('base.json'));
-      const sourceTest = new _marcRecord.MarcRecord(getFixture('source.json'));
-      const patternTest = new RegExp(getFixture({
-        components: ['pattern.txt'],
-        reader: _fixura.READERS.TEXT
-      }), 'u');
-      const expectedRecord = getFixture('merged.json');
-      const expectedError = getFixture({
-        components: ['expected-error.txt'],
-        reader: _fixura.READERS.TEXT
-      });
-      const equalityFunction = getEqualityFunction();
-
-      if (expectedError) {
-        expect(() => _select.default.to.throw(Error, 'control field'));
-        return;
-      }
-
-      const mergedRecord = (0, _select.default)({
-        pattern: patternTest,
-        equalityFunction
-      })(baseTest, sourceTest);
-      expect(mergedRecord.toObject()).to.eql(expectedRecord);
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'select'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: _fixura.READERS.JSON,
+    failWhenNotFound: false
+  }
+});
 
-      function getEqualityFunction() {
-        const functionName = getFixture({
-          components: ['equalityFunction.txt'],
-          reader: _fixura.READERS.TEXT
-        });
-        return functionName === 'subsetEquality' ? _select.subsetEquality : undefined;
-      }
-    });
+function callback({
+  getFixture,
+  disabled = false,
+  tagPatternRegExp = false,
+  expectedError = false,
+  useSubsetEquality = false
+}) {
+  if (disabled) {
+    console.log('TEST DISABLED!'); // eslint-disable-line no-console
+
+    return;
+  }
+
+  const base = new _marcRecord.MarcRecord(getFixture('base.json'), {
+    subfieldValues: false
   });
-});
+  const source = new _marcRecord.MarcRecord(getFixture('source.json'), {
+    subfieldValues: false
+  });
+  const tagPattern = new RegExp(tagPatternRegExp, 'u');
+  const expectedRecord = getFixture('merged.json');
+  const equalityFunction = useSubsetEquality ? _select.subsetEquality : undefined; // Bypass expected error in testing
+
+  if (expectedError) {
+    (0, _chai.expect)(() => _select.default.to.throw(Error, 'control field'));
+    return;
+  }
+
+  const mergedRecord = (0, _select.default)({
+    tagPattern,
+    equalityFunction
+  })(base, source);
+  (0, _chai.expect)(mergedRecord.toObject()).to.eql(expectedRecord);
+}
 //# sourceMappingURL=select.spec.js.map

package/dist/reducers/select.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/reducers/select.spec.js"],"names":["MarcRecord","setValidationOptions","subfieldValues","describe","expect","chai","fixturesPath","path","join","__dirname","fs","readdirSync","forEach","subDir","getFixture","root","reader","READERS","JSON","failWhenNotFound","it","baseTest","sourceTest","patternTest","RegExp","components","TEXT","expectedRecord","expectedError","equalityFunction","getEqualityFunction","createReducer","to","throw","Error","mergedRecord","pattern","toObject","eql","functionName","subsetEquality","undefined"],"mappings":";;AA2BA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;AAhCA;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkCAA,uBAAWC,oBAAX,CAAgC;AAACC,EAAAA,cAAc,EAAE;AAAjB,CAAhC;;AAEAC,QAAQ,CAAC,iBAAD,EAAoB,MAAM;AAChC,QAAM;AAACC,IAAAA;AAAD,MAAWC,aAAjB;;AACA,QAAMC,YAAY,GAAGC,cAAKC,IAAL,CAAUC,SAAV,EAAqB,IAArB,EAA2B,IAA3B,EAAiC,eAAjC,EAAkD,UAAlD,EAA8D,QAA9D,CAArB;;AAEAC,cAAGC,WAAH,CAAeL,YAAf,EAA6BM,OAA7B,CAAqCC,MAAM,IAAI;AAC7C,UAAM;AAACC,MAAAA;AAAD,QAAe,qBAAgB;AAACC,MAAAA,IAAI,EAAE,CAACT,YAAD,EAAeO,MAAf,CAAP;AAA+BG,MAAAA,MAAM,EAAEC,gBAAQC,IAA/C;AAAqDC,MAAAA,gBAAgB,EAAE;AAAvE,KAAhB,CAArB;AACAC,IAAAA,EAAE,CAACP,MAAD,EAAS,MAAM;AACf,YAAMQ,QAAQ,GAAG,IAAIrB,sBAAJ,CAAec,UAAU,CAAC,WAAD,CAAzB,CAAjB;AACA,YAAMQ,UAAU,GAAG,IAAItB,sBAAJ,CAAec,UAAU,CAAC,aAAD,CAAzB,CAAnB;AACA,YAAMS,WAAW,GAAG,IAAIC,MAAJ,CAAWV,UAAU,CAAC;AAACW,QAAAA,UAAU,EAAE,CAAC,aAAD,CAAb;AAA8BT,QAAAA,MAAM,EAAEC,gBAAQS;AAA9C,OAAD,CAArB,EAA4E,GAA5E,CAApB;AACA,YAAMC,cAAc,GAAGb,UAAU,CAAC,aAAD,CAAjC;AACA,YAAMc,aAAa,GAAGd,UAAU,CAAC;AAACW,QAAAA,UAAU,EAAE,CAAC,oBAAD,CAAb;AAAqCT,QAAAA,MAAM,EAAEC,gBAAQS;AAArD,OAAD,CAAhC;AACA,YAAMG,gBAAgB,GAAGC,mBAAmB,EAA5C;;AAEA,UAAIF,aAAJ,EAAmB;AACjBxB,QAAAA,MAAM,CAAC,MAAM2B,gBAAcC,EAAd,CAAiBC,KAAjB,CAAuBC,KAAvB,EAA8B,eAA9B,CAAP,CAAN;AACA;AACD;;AACD,YAAMC,YAAY,GAAG,qBAAc;AAACC,QAAAA,OAAO,EAAEb,WAAV;AAAuBM,QAAAA;AAAvB,OAAd,EAAwDR,QAAxD,EAAkEC,UAAlE,CAArB;AACAlB,MAAAA,MAAM,CAAC+B,YAAY,CAACE,QAAb,EAAD,CAAN,CAAgCL,EAAhC,CAAmCM,GAAnC,CAAuCX,cAAvC;;AAEA,eAASG,mBAAT,GAA+B;AAC7B,cAAMS,YAAY,GAAGzB,UAAU,CAAC;AAACW,UAAAA,UAAU,EAAE,CAAC,sBAAD,CAAb;AAAuCT,UAAAA,MAAM,EAAEC,gBAAQS;AAAvD,SAAD,CAA/B;AACA,eAAOa,YAAY,KAAK,gBAAjB,GAAoCC,sBAApC,GAAqDC,SAA5D;AACD;AACF,KAnBC,CAAF;AAoBD,GAtBD;AAuBD,CA3BO,CAAR","sourcesContent":["/**\n*\n* @licstart  The following is the entire license notice for the JavaScript code in this file.\n*\n* Merge MARC records\n*\n* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of marc-record-merge-js\n\n* marc-record-merge-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* marc-record-merge-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 Lesser 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*/\nimport chai from 'chai';\nimport fs from 'fs';\nimport path from 'path';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createReducer, {subsetEquality} from './select';\nimport fixturesFactory, {READERS} from '@natlibfi/fixura';\n\nMarcRecord.setValidationOptions({subfieldValues: false});\n\ndescribe('reducers/select', () => {\n  const {expect} = chai;\n  const fixturesPath = path.join(__dirname, '..', '..', 'test-fixtures', 'reducers', 'select');\n\n  fs.readdirSync(fixturesPath).forEach(subDir => {\n    const {getFixture} = fixturesFactory({root: [fixturesPath, subDir], reader: READERS.JSON, failWhenNotFound: false});\n    it(subDir, () => {\n      const baseTest = new MarcRecord(getFixture('base.json'));\n      const sourceTest = new MarcRecord(getFixture('source.json'));\n      const patternTest = new RegExp(getFixture({components: ['pattern.txt'], reader: READERS.TEXT}), 'u');\n      const expectedRecord = getFixture('merged.json');\n      const expectedError = getFixture({components: ['expected-error.txt'], reader: READERS.TEXT});\n      const equalityFunction = getEqualityFunction();\n\n      if (expectedError) {\n        expect(() => createReducer.to.throw(Error, 'control field'));\n        return;\n      }\n      const mergedRecord = createReducer({pattern: patternTest, equalityFunction})(baseTest, sourceTest);\n      expect(mergedRecord.toObject()).to.eql(expectedRecord);\n\n      function getEqualityFunction() {\n        const functionName = getFixture({components: ['equalityFunction.txt'], reader: READERS.TEXT});\n        return functionName === 'subsetEquality' ? subsetEquality : undefined;\n      }\n    });\n  });\n});\n"],"file":"select.spec.js"}
+{"version":3,"file":"select.spec.js","names":["MarcRecord","setValidationOptions","subfieldValues","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","failWhenNotFound","getFixture","disabled","tagPatternRegExp","expectedError","useSubsetEquality","console","log","base","source","tagPattern","RegExp","expectedRecord","equalityFunction","subsetEquality","undefined","expect","createReducer","to","throw","Error","mergedRecord","toObject","eql"],"sources":["../../src/reducers/select.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createReducer, {subsetEquality} from './select';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n\nMarcRecord.setValidationOptions({subfieldValues: false});\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'select'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON,\n    failWhenNotFound: false\n  }\n});\n\nfunction callback({\n  getFixture,\n  disabled = false,\n  tagPatternRegExp = false,\n  expectedError = false,\n  useSubsetEquality = false\n}) {\n  if (disabled) {\n    console.log('TEST DISABLED!'); // eslint-disable-line no-console\n    return;\n  }\n  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});\n  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});\n  const tagPattern = new RegExp(tagPatternRegExp, 'u');\n  const expectedRecord = getFixture('merged.json');\n  const equalityFunction = useSubsetEquality ? subsetEquality : undefined;\n\n  // Bypass expected error in testing\n  if (expectedError) {\n    expect(() => createReducer.to.throw(Error, 'control field'));\n    return;\n  }\n\n  const mergedRecord = createReducer({tagPattern, equalityFunction})(base, source);\n  expect(mergedRecord.toObject()).to.eql(expectedRecord);\n}\n"],"mappings":";;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;;;AAEAA,sBAAA,CAAWC,oBAAX,CAAgC;EAACC,cAAc,EAAE;AAAjB,CAAhC;;AAEA,IAAAC,gBAAA,EAAc;EACZC,QADY;EAEZC,IAAI,EAAE,CAACC,SAAD,EAAY,IAAZ,EAAkB,IAAlB,EAAwB,eAAxB,EAAyC,UAAzC,EAAqD,QAArD,CAFM;EAGZC,eAAe,EAAE,IAHL;EAIZC,OAAO,EAAE,KAJG;EAKZC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAA,CAAQC,IADV;IAENC,gBAAgB,EAAE;EAFZ;AALI,CAAd;;AAWA,SAAST,QAAT,CAAkB;EAChBU,UADgB;EAEhBC,QAAQ,GAAG,KAFK;EAGhBC,gBAAgB,GAAG,KAHH;EAIhBC,aAAa,GAAG,KAJA;EAKhBC,iBAAiB,GAAG;AALJ,CAAlB,EAMG;EACD,IAAIH,QAAJ,EAAc;IACZI,OAAO,CAACC,GAAR,CAAY,gBAAZ,EADY,CACmB;;IAC/B;EACD;;EACD,MAAMC,IAAI,GAAG,IAAIrB,sBAAJ,CAAec,UAAU,CAAC,WAAD,CAAzB,EAAwC;IAACZ,cAAc,EAAE;EAAjB,CAAxC,CAAb;EACA,MAAMoB,MAAM,GAAG,IAAItB,sBAAJ,CAAec,UAAU,CAAC,aAAD,CAAzB,EAA0C;IAACZ,cAAc,EAAE;EAAjB,CAA1C,CAAf;EACA,MAAMqB,UAAU,GAAG,IAAIC,MAAJ,CAAWR,gBAAX,EAA6B,GAA7B,CAAnB;EACA,MAAMS,cAAc,GAAGX,UAAU,CAAC,aAAD,CAAjC;EACA,MAAMY,gBAAgB,GAAGR,iBAAiB,GAAGS,sBAAH,GAAoBC,SAA9D,CATC,CAWD;;EACA,IAAIX,aAAJ,EAAmB;IACjB,IAAAY,YAAA,EAAO,MAAMC,eAAA,CAAcC,EAAd,CAAiBC,KAAjB,CAAuBC,KAAvB,EAA8B,eAA9B,CAAb;IACA;EACD;;EAED,MAAMC,YAAY,GAAG,IAAAJ,eAAA,EAAc;IAACP,UAAD;IAAaG;EAAb,CAAd,EAA8CL,IAA9C,EAAoDC,MAApD,CAArB;EACA,IAAAO,YAAA,EAAOK,YAAY,CAACC,QAAb,EAAP,EAAgCJ,EAAhC,CAAmCK,GAAnC,CAAuCX,cAAvC;AACD"}

package/package.json

@@ -13,46 +13,50 @@
 		"type": "git",
 		"url": "git@github.com:natlibfi/marc-record-merge-js.git"
 	},
-	"license": "LGPL-3.0+",
-	"version": "6.0.0-beta.1",
+	"license": "MIT",
+	"version": "6.0.0-beta.5",
 	"main": "./dist/index.js",
 	"engines": {
-		"node": ">=12"
+		"node": ">=14"
 	},
+	"type": "commonjs",
 	"scripts": {
+		"prepare": "npm run build",
 		"prepublishOnly": "npm run build:transpile",
-		"check-deps": "npm-check;exit 0",
 		"lint": "eslint ./src",
 		"lint:dev": "eslint ./src --fix",
-		"test:base": "cross-env NODE_ENV=test nyc mocha --require @babel/register",
-		"test": "npm run lint && npm run test:base -- src/**/*.spec.js",
-		"test:dev": "npm run lint:dev && npm run test:base -- src/**/*.spec.js && npm run coverage",
-		"coverage": "nyc check-coverage --per-file",
+		"test:base": "cross-env NODE_ENV=test mocha --require @babel/register --reporter-option maxDiffSize=15000 src/reducers/*.spec.js",
+		"test": "npm run lint && npm run test:base",
+		"test:dev": "npm run lint:dev && npm run coverage",
+		"coverage": "npm run coverage:unit && npm run coverage:report",
+		"coverage:unit": "nyc --silent npm run test:base",
+		"coverage:report": "nyc report",
 		"build:transpile": "babel src --copy-files --source-maps --delete-dir-on-start --out-dir=dist",
-		"build": "npm run build:transpile && npm run check-deps",
-		"watch:test": "cross-env DEBUG=1 NODE_ENV=test nodemon -w src -w test-fixtures --exec 'npm run test:dev'"
+		"build": "npm run build:transpile",
+		"dev:test": "cross-env NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'",
+		"dev:test:debug": "cross-env DEBUG=@natlibfi/* NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'"
 	},
 	"dependencies": {
-		"@natlibfi/fixura": "^2.0.0",
-		"@natlibfi/marc-record": "^6.0.0",
-		"debug": "^4.1.1",
-		"normalize-diacritics": "^2.11.1"
+		"@natlibfi/fixugen": "1.1.0",
+		"@natlibfi/fixura": "^2.2.1",
+		"@natlibfi/marc-record": "^7.1.0-alpha.2",
+		"debug": "^4.3.4",
+		"normalize-diacritics": "2.14.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.10.1",
-		"@babel/core": "^7.10.2",
-		"@babel/preset-env": "^7.10.2",
-		"@babel/register": "^7.10.1",
-		"@natlibfi/eslint-config-melinda-backend": "^1.0.3",
-		"babel-eslint": "^10.0.3",
-		"babel-plugin-istanbul": "^6.0.0",
+		"@babel/cli": "^7.17.10",
+		"@babel/core": "^7.18.0",
+		"@babel/eslint-parser": "^7.17.0",
+		"@babel/preset-env": "^7.18.0",
+		"@babel/register": "^7.17.7",
+		"@natlibfi/eslint-config-melinda-backend": "^2.0.0",
+		"babel-plugin-istanbul": "^6.1.1",
 		"babel-plugin-rewire": "^1.2.0",
-		"chai": "^4.2.0",
-		"cross-env": "^7.0.2",
-		"eslint": "^7.1.0",
-		"mocha": "^7.2.0",
-		"nodemon": "^2.0.4",
-		"npm-check": "^5.9.0",
+		"chai": "^4.3.4",
+		"cross-env": "^7.0.3",
+		"eslint": "^8.16.0",
+		"mocha": "^10.0.0",
+		"nodemon": "^2.0.16",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {
@@ -65,9 +69,7 @@
 			[
 				"@babel/preset-env",
 				{
-					"targets": {
-						"node": "12"
-					}
+					"targets": "maintained node versions"
 				}
 			]
 		],
@@ -86,8 +88,7 @@
 			"*/**/*.spec.js"
 		],
 		"reporter": [
-			"lcov",
-			"html"
+			"text"
 		],
 		"require": [
 			"@babel/register"

package/src/index.js

@@ -1,36 +1,4 @@
-/**
-*
-* @licstart  The following is the entire license notice for the JavaScript code in this file.
-*
-* Merge MARC records
-*
-* Copyright (C) 2015-2019 University Of Helsinki (The National Library Of Finland)
-*
-* This file is part of marc-record-merge-js
-
-* marc-record-merge-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.
-*
-* marc-record-merge-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 Lesser 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.
-*
-*/
-
-import * as Reducers from './reducers';
-import {MarcRecord} from '@natlibfi/marc-record';
+import Reducers from './reducers';
 
 export {Reducers};
-export default ({base, source, reducers}) => {
-  const sourceRecord = MarcRecord.clone(source);
-  return reducers.reduce((baseRecord, reducer) => reducer(baseRecord, sourceRecord), MarcRecord.clone(base));
-};
+export default ({base, source, reducers}) => reducers.reduce((base, reducer) => reducer(base, source), base);