@natlibfi/marc-record-merge 6.0.0-beta.8 → 7.0.0-alpha.1

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

@@ -1 +1 @@
-{"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","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\n  const base = getFixture('base.json');\n  const source = getFixture('source.json');\n\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).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,CAJA,CAKD;EACA;;;EAEA,MAAMC,IAAI,GAAGP,UAAU,CAAC,WAAD,CAAvB;EACA,MAAMQ,MAAM,GAAGR,UAAU,CAAC,aAAD,CAAzB;EAEA,MAAMS,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,CAbC,CAeD;;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,YAAP,EAAqBH,EAArB,CAAwBI,GAAxB,CAA4BV,cAA5B;AACD"}
+{"version":3,"file":"select.spec.js","names":["_chai","require","_marcRecord","_select","_interopRequireWildcard","_fixura","_fixugen","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","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","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\n  const base = getFixture('base.json');\n  const source = getFixture('source.json');\n\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).to.eql(expectedRecord);\n}\n"],"mappings":"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"}

package/dist/reducers/select2.spec.js

@@ -0,0 +1,58 @@
+"use strict";
+
+var _chai = require("chai");
+var _marcRecord = require("@natlibfi/marc-record");
+var _select = _interopRequireWildcard(require("./select"));
+var _fixura = require("@natlibfi/fixura");
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+_marcRecord.MarcRecord.setValidationOptions({
+  subfieldValues: false
+});
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'select'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: _fixura.READERS.JSON,
+    failWhenNotFound: false
+  }
+});
+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(getFixture('base.json'), {subfieldValues: false});
+  //  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
+
+  const base = getFixture('base.json');
+  const source = getFixture('source.json');
+  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).to.eql(expectedRecord);
+}
+//# sourceMappingURL=select2.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select2.spec.js","names":["_chai","require","_marcRecord","_select","_interopRequireWildcard","_fixura","_fixugen","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","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","eql"],"sources":["../../src/reducers/select2.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\n  const base = getFixture('base.json');\n  const source = getFixture('source.json');\n\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).to.eql(expectedRecord);\n}\n"],"mappings":"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"}

package/package.json

@@ -14,10 +14,10 @@
 		"url": "git@github.com:natlibfi/marc-record-merge-js.git"
 	},
 	"license": "MIT",
-	"version": "6.0.0-beta.8",
+	"version": "7.0.0-alpha.1",
 	"main": "./dist/index.js",
 	"engines": {
-		"node": ">=14"
+		"node": ">=18"
 	},
 	"type": "commonjs",
 	"scripts": {
@@ -25,8 +25,8 @@
 		"prepublishOnly": "npm run build:transpile",
 		"lint": "eslint ./src",
 		"lint:dev": "eslint ./src --fix",
-		"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:base": "cross-env NODE_ENV=test mocha --require @babel/register --reporter-option maxDiffSize=15000",
+		"test": "npm run lint && npm run test:base -- --recursive src",
 		"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",
@@ -37,26 +37,26 @@
 		"dev:test:debug": "cross-env DEBUG=@natlibfi/* NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'"
 	},
 	"dependencies": {
-		"@natlibfi/fixugen": "1.1.0",
-		"@natlibfi/fixura": "^2.2.1",
-		"@natlibfi/marc-record": "^7.1.0-alpha.2",
+		"@natlibfi/marc-record": "^7.2.2",
 		"debug": "^4.3.4",
-		"normalize-diacritics": "2.14.0"
+		"normalize-diacritics": "^2.13.2"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.17.10",
-		"@babel/core": "^7.18.5",
-		"@babel/eslint-parser": "^7.18.2",
-		"@babel/preset-env": "^7.18.2",
-		"@babel/register": "^7.17.7",
-		"@natlibfi/eslint-config-melinda-backend": "^2.0.0",
+		"@babel/cli": "^7.21.0",
+		"@babel/core": "^7.21.4",
+		"@babel/eslint-parser": "^7.21.3",
+		"@babel/preset-env": "^7.21.4",
+		"@babel/register": "^7.21.0",
+		"@natlibfi/eslint-config-melinda-backend": "^3.0.0",
 		"babel-plugin-istanbul": "^6.1.1",
 		"babel-plugin-rewire": "^1.2.0",
-		"chai": "^4.3.6",
+		"chai": "^4.3.7",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.17.0",
-		"mocha": "^10.0.0",
-		"nodemon": "^2.0.16",
+		"eslint": "^8.38.0",
+		"mocha": "^10.2.0",
+		"@natlibfi/fixugen": "2.0.0",
+		"@natlibfi/fixura": "^3.0.0",
+		"nodemon": "^2.0.22",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {

package/src/index.js

@@ -1,4 +1,54 @@
 import Reducers from './reducers';
+import createDebugLogger from 'debug';
+
+const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge:index');
+const debugData = debug.extend('data');
 
 export {Reducers};
-export default ({base, source, reducers}) => reducers.reduce((base, reducer) => reducer(base, source), base);
+// export default ({base, source, reducers}) => reducers.reduce((base, reducer) => reducer(base, source), base);
+
+// NV: Modified the reducer loop so, that not only base, but also is carried back.
+// However, we try to be backward-compatible: normally after the reducers, only base is returned.
+
+export default ({base, source, reducers}) => {
+
+  const combo = {base, source};
+  const resultCombo = reducers.reduce((combo, reducer) => {
+    const returnCombo = singleRound(reducer, combo.base, combo.source);
+    //debugData(`returnCombo after current reducer: ${JSON.stringify(returnCombo)}`);
+    return returnCombo;
+  }, combo);
+
+  debugData(`ResultCombo after reducers: ${JSON.stringify(resultCombo)}`);
+
+  // Hack to make my melinda-marc-record-merge-reducers single tests that expect both
+  // base and source to return them both:
+  if (reducers.length === 1 && resultCombo.base && resultCombo.source) {
+    debug('Single reducer, returning resultCombo');
+    debugData(JSON.stringify(resultCombo));
+
+    return resultCombo;
+  }
+  // All other tests return just base... Backward (compability) it is!
+  debug('Multiple reducers, returning just base');
+  debugData(JSON.stringify(resultCombo.base));
+  return resultCombo.base;
+
+  function singleRound(reducer, base, source) {
+    //debug(`SINGLE ROUND INPUT (base, source)`);
+    //debugData(base);
+    //debugData(base);
+    const reducerResult = reducer(base, source);
+    //debug(`reducerResult:`);
+    //debugData(reducerResult);
+    if (reducerResult.base !== undefined && reducerResult.source !== undefined) {
+      debug('NEW STYLE REDUCER RESULT v2');
+      const combo = reducerResult;
+      //debugData(combo);
+      return combo;
+    }
+    debug('OLD SCHOOL REDUCER RESULT v2');
+    //debugData({base: reducerResult, source});
+    return {base: reducerResult, source};
+  }
+};

package/src/index.spec.js

@@ -0,0 +1,45 @@
+import merger, {Reducers} from './index';
+import {inspect} from 'util';
+import createDebugLogger from 'debug';
+import {expect} from 'chai';
+import {MarcRecord} from '@natlibfi/marc-record';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+
+generateTests({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'index'],
+  recurse: false,
+  useMetadataFile: true,
+  fixura: {
+    failWhenNotFound: false,
+    reader: READERS.JSON
+  }
+});
+
+function callback({getFixture, reducerConfigs = []}) {
+  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
+  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
+  const expectedRecord = getFixture('merged.json');
+
+  const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:index:test');
+  const debugData = debug.extend('data');
+
+  const testReducerConfigs = reducerConfigs;
+  const reducers = [...testReducerConfigs.map(conf => Reducers.copy(conf))];
+
+  debugData(`Reducers: ${inspect(reducers, {colors: true, maxArrayLength: 10, depth: 8})})}`);
+
+  const result = merger({base, source, reducers});
+
+  debug(`Merge result is: ${result.constructor.name}`);
+  debugData(`${JSON.stringify(result)}`);
+
+  // Use either result.base or a plain result as resultRecord
+  // It can also be a MarcRecord or a plain object
+  const resultRecord = result.base || result;
+  const resultRecordToRecord = new MarcRecord(resultRecord, {subfieldValues: false});
+  expect(resultRecordToRecord.toObject()).to.eql(expectedRecord);
+
+
+}

package/src/reducers/copy.js

@@ -7,7 +7,10 @@ import createDebugLogger from 'debug';
 export default ({
   tagPattern,
   compareTagsOnly = false,
+  compareWithoutTag = false,
   compareWithoutIndicators = false,
+  compareWithoutIndicator1 = false,
+  compareWithoutIndicator2 = false,
   subfieldsMustBeIdentical = true,
   excludeSubfields = [],
   dropSubfields = [],
@@ -18,15 +21,37 @@ export default ({
   swapSubfieldCode = [],
   doNotCopyIfFieldPresent = false
 }) => (base, source) => {
-  const baseRecord = new MarcRecord(base, baseValidators);
-  const sourceRecord = new MarcRecord(source, sourceValidators);
 
-  const debug = createDebugLogger('@natlibfi/marc-record-merge');
+  const debug = createDebugLogger('@natlibfi/marc-record-merge:copy');
+  const debugData = debug.extend('data');
   const debugOptions = createDebugLogger('@natlibfi/marc-record-merge:compare-options');
   const debugCompare = createDebugLogger('@natlibfi/marc-record-merge:compare');
+
+  debugData(`base: ${JSON.stringify(base)}`);
+  debugData(`source: ${JSON.stringify(source)}`);
+
+  const {baseRecord, sourceRecord} = getRecordsFromParameters(base, source, baseValidators, sourceValidators);
+
+  function getRecordsFromParameters(base, source, baseValidators, sourceValidators) {
+    // records if we got an object ({base, source}) as a parameter
+    if (source === undefined && base.base !== undefined && base.source !== undefined) {
+      const baseRecord = new MarcRecord(base.base, baseValidators);
+      const sourceRecord = new MarcRecord(base.source, sourceValidators);
+      return {baseRecord, sourceRecord};
+    }
+    // records if we got an non-object (base, source) as a parameter
+    const baseRecord = new MarcRecord(base, baseValidators);
+    const sourceRecord = new MarcRecord(source, sourceValidators);
+    return {baseRecord, sourceRecord};
+  }
+
+  const ignoreInd1 = compareWithoutIndicators || compareWithoutIndicator1;
+  const ignoreInd2 = compareWithoutIndicators || compareWithoutIndicator2;
+
   debugOptions(`Tag Pattern: ${tagPattern}`);
   debugOptions(`Compare tags only: ${compareTagsOnly}`);
-  debugOptions(`Compare without indicators ${compareWithoutIndicators}`);
+  debugOptions(`Omit indicator 1 from comparison: ${ignoreInd1}`);
+  debugOptions(`Omit indicator 2 from comparison: ${ignoreInd2}`);
   debugOptions(`Copy if identical: ${subfieldsMustBeIdentical}`);
   debugOptions(`Exclude subfields: [${excludeSubfields}]`);
   debugOptions(`Drop subfields [${dropSubfields}]`);
@@ -39,23 +64,26 @@ export default ({
   if (doNotCopy) {
     return baseRecord.toObject();
   }
-
+  debug(`FFS: ${compareWithoutIndicator1}, ${compareWithoutIndicators}, ${ignoreInd1}`);
   debug(`Base fields: `, baseFields);
   debug(`Source fields: `, sourceFields);
 
+  // Logic steps
   const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
   const compareResultFields = compareFields(sourceFields, baseCompareFields);
   const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);
   const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);
   const swappedSubfields = checkSwapSubfieldCodes(droppedUnwantedFields);
   const swappedTags = checkSwapTag(swappedSubfields);
+  const uniqueFields = [...new Set(swappedTags.map(field => JSON.stringify(field)))].map(field => JSON.parse(field));
   debug('Fields to be copied');
-  debug(JSON.stringify(swappedTags));
+  debug(JSON.stringify(uniqueFields));
 
   // Add fields to base;
-  swappedTags.forEach(field => baseRecord.insertField(field));
+  uniqueFields.forEach(field => baseRecord.insertField(field));
+  debugData(`baseRecord before return: ${JSON.stringify(baseRecord)}`);
+  //return baseRecord;
   return baseRecord.toObject();
-  //return copyFields(baseFields, sourceFields);
 
   function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
     const [sourceField, ...rest] = sourceFields;
@@ -130,6 +158,7 @@ export default ({
     }
   }
 
+  // compare objects have only fields that matter in comparison
   function createCompareField(field) {
     if (compareTagsOnly) {
       return {tag: field.tag};
@@ -140,11 +169,13 @@ export default ({
     }
 
     const [filteredField] = checkDropSubfields([field]);
+    const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(field.tag));
+    const replacementTag = foundRule ? foundRule.to : undefined;
 
     const params = [
-      {name: 'tag', value: field.tag},
-      {name: 'ind1', value: compareWithoutIndicators ? undefined : field.ind1},
-      {name: 'ind2', value: compareWithoutIndicators ? undefined : field.ind2},
+      {name: 'tag', value: compareWithoutTag ? replacementTag : field.tag},
+      {name: 'ind1', value: ignoreInd1 ? undefined : field.ind1},
+      {name: 'ind2', value: ignoreInd2 ? undefined : field.ind2},
       {name: 'subfields', value: createCompareSubfields(filteredField.subfields)}
     ].map(param => [param.name, param.value]);
 
@@ -237,95 +268,3 @@ export default ({
     return fields;
   }
 };
-
-// function copyFields() { //eslint-disable-line no-unused-vars
-//   const sourceTags = sourceFields.map(field => field.tag);
-//   sourceTags.forEach(tag => debug(`Comparing field ${tag}`));
-
-//   /*
-//   if (combine.length > 0) {
-//     debug(`*** NOW Copy options: ${tagPattern}, ${compareTagsOnly}, ${compareWithoutIndicators}, ${subfieldsMustBeIdentical}, [${combine}], [${excludeSubfields}], [${dropSubfields}]`);
-//     combine.forEach(row => debug(` ### combine ${row} <- `));
-//     return [];
-//   }
-//   */
-
-//   // If compareTagsOnly = true, only this part is run
-//   // The field is copied from source only if it is missing completely from base
-//   if (compareTagsOnly && baseFields.length === 0) {
-//     sourceTags.forEach(tag => debug(`Missing field ${tag} copied from source to base`));
-//     sourceFields.forEach(f => base.insertField(f));
-//     return true;
-//   }
-
-//   // If compareTagsOnly = false (default)
-//   // Source and base are also compared for identicalness
-//   // Non-identical fields are copied from source to base as duplicates
-//   if (!compareTagsOnly) {
-//     const filterMissing = function (sourceField) {
-//       if ('value' in sourceField) {
-//         debug(`Checking control field ${sourceField.tag} for identicalness`);
-//         return baseFields.some(isIdenticalControlField) === false;
-//       }
-//       if ('subfields' in sourceField) {
-//         debug(`Checking data field ${sourceField.tag} for identicalness`);
-//         return baseFields.some(isIdenticalDataField) === false;
-//       }
-
-//       function normalizeControlField(field) {
-//         return field.value.toLowerCase().replace(/\s+/u, '');
-//       }
-
-//       function isIdenticalControlField(baseField) {
-//         const normalizedBaseField = normalizeControlField(baseField);
-//         const normalizedSourceField = normalizeControlField(sourceField);
-//         return normalizedSourceField === normalizedBaseField;
-//       }
-
-//       function isIdenticalDataField(baseField) {
-//         // If excluded subfields have been defined for this field, they must be ignored first
-//         // (i.e. source and base fields are considered identical if all non-excluded subfields are identical)
-//         if (excludeSubfields.length > 0 &&
-//           sourceField.tag === baseField.tag &&
-//           sourceField.ind1 === baseField.ind1 &&
-//           sourceField.ind2 === baseField.ind2) {
-//           excludeSubfields.forEach(sub => debug(`Subfield ${sub} excluded from identicalness comparison`));
-//           // Compare only those subfields that are not excluded
-//           const baseSubsToCompare = baseField.subfields.filter(subfield => excludeSubfields.indexOf(subfield.code) === -1);
-//           return baseSubsToCompare.every(isIdenticalSubfield);
-//         }
-//         // If there are no excluded subfields (default case)
-//         if (sourceField.tag === baseField.tag &&
-//           sourceField.ind1 === baseField.ind1 &&
-//           sourceField.ind2 === baseField.ind2 &&
-//           sourceField.subfields.length === baseField.subfields.length) {
-//           return baseField.subfields.every(isIdenticalSubfield);
-//         }
-//         function normalizeSubfield(subfield) {
-//           return subfield.value.toLowerCase().replace(/\s+/u, '');
-//         }
-//         function isIdenticalSubfield(baseSub) {
-//           const normBaseSub = normalizeSubfield(baseSub);
-//           return sourceField.subfields.some(sourceSub => {
-//             const normSourceSub = normalizeSubfield(sourceSub);
-//             return normSourceSub === normBaseSub;
-//           });
-//         }
-//       }
-//     };
-//     // Search for fields missing from base
-//     const missingFields = sourceFields.filter(filterMissing);
-//     missingFields.forEach(f => base.insertField(f));
-//     if (missingFields.length > 0) {
-//       const missingTags = missingFields.map(field => field.tag);
-//       missingTags.forEach(tag => debug(`Field ${tag} copied from source to base`));
-//       return base;
-//     }
-//     if (missingFields.length === 0) {
-//       debug(`No missing fields found`);
-//       return base;
-//     }
-//   }
-//   debug(`No missing fields found`);
-//   return base;
-// }

package/src/reducers/copy.spec.js

@@ -1,6 +1,5 @@
 import {expect} from 'chai';
 import {READERS} from '@natlibfi/fixura';
-//import {MarcRecord} from '@natlibfi/marc-record';
 import createReducer from './copy';
 import generateTests from '@natlibfi/fixugen';
 
@@ -22,7 +21,10 @@ function callback({
   getFixture,
   tagPatternRegExp,
   compareTagsOnly = false,
+  compareWithoutTag = false,
   compareWithoutIndicators = false,
+  compareWithoutIndicator1 = false,
+  compareWithoutIndicator2 = false,
   subfieldsMustBeIdentical = false,
   copyUnless = undefined,
   excludeSubfields = undefined,
@@ -31,17 +33,13 @@ function callback({
   swapTag = [],
   doNotCopyIfFieldPresent = false
 }) {
-
   const base = getFixture('base.json');
   const source = getFixture('source.json');
-
-  //  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
-  //  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
   const tagPattern = new RegExp(tagPatternRegExp, 'u');
   const expectedRecord = getFixture('merged.json');
 
   const merged = createReducer({
-    tagPattern, compareTagsOnly, compareWithoutIndicators,
+    tagPattern, compareTagsOnly, compareWithoutTag, compareWithoutIndicators, compareWithoutIndicator1, compareWithoutIndicator2,
     copyUnless, subfieldsMustBeIdentical, excludeSubfields,
     dropSubfields, swapSubfieldCode, swapTag,
     doNotCopyIfFieldPresent

package/src/reducers/copy2.spec.js

@@ -0,0 +1,55 @@
+import {expect} from 'chai';
+import {READERS} from '@natlibfi/fixura';
+import createReducer from './copy';
+import generateTests from '@natlibfi/fixugen';
+
+//import createDebugLogger from 'debug'; // <---
+//const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
+
+generateTests({
+  callback,
+  path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'copy'],
+  useMetadataFile: true,
+  recurse: true,
+  fixura: {
+    reader: READERS.JSON,
+    failWhenNotFound: false
+  }
+});
+
+
+function callback({
+  getFixture,
+  tagPatternRegExp,
+  compareTagsOnly = false,
+  compareWithoutTag = false,
+  compareWithoutIndicators = false,
+  compareWithoutIndicator1 = false,
+  compareWithoutIndicator2 = false,
+  subfieldsMustBeIdentical = false,
+  copyUnless = undefined,
+  excludeSubfields = undefined,
+  dropSubfields = undefined,
+  swapSubfieldCode = [],
+  swapTag = [],
+  doNotCopyIfFieldPresent = false
+}) {
+  const base = getFixture('base.json');
+  const source = getFixture('source.json');
+  const tagPattern = new RegExp(tagPatternRegExp, 'u');
+  const expectedRecord = getFixture('merged.json');
+
+  const merged = createReducer({
+    tagPattern, compareTagsOnly, compareWithoutTag, compareWithoutIndicators, compareWithoutIndicator1, compareWithoutIndicator2,
+    copyUnless, subfieldsMustBeIdentical, excludeSubfields,
+    dropSubfields, swapSubfieldCode, swapTag,
+    doNotCopyIfFieldPresent
+  })({base, source});
+  //debug(`***     mergedRecord: `, mergedRecord); //<--
+  //debug(`***     mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--
+  //debug(`***     expectedRecord: `, expectedRecord); //<--
+  //debug(`***     expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
+  expect(merged.constructor.name).not.to.eql('MarcRecord');
+  expect(merged.constructor.name).to.eql('Object');
+  expect(merged).to.eql(expectedRecord);
+}

package/src/reducers/select.js

@@ -12,10 +12,31 @@ export function subsetEquality(subfieldA, subfieldB) {
     (subfieldA.value.indexOf(subfieldB.value) !== -1 || subfieldB.value.indexOf(subfieldA.value) !== -1);
 }
 // EqualityFunction can be either strictEquality or subsetEquality
-export default ({tagPattern, equalityFunction = strictEquality}) => (base, source) => {
+
+export default ({
+  tagPattern,
+  equalityFunction = strictEquality,
+  baseValidators = {subfieldValues: false},
+  sourceValidators = {subfieldValues: false}
+// eslint-disable-next-line max-statements
+}) => (base, source) => {
   const debug = createDebugLogger('@natlibfi/marc-record-merge:select');
-  const baseRecord = new MarcRecord(base, {subfieldValues: false});
-  const sourceRecord = new MarcRecord(source, {subfieldValues: false});
+
+  const {baseRecord, sourceRecord} = getRecordsFromParameters(base, source, baseValidators, sourceValidators);
+
+  function getRecordsFromParameters(base, source, baseValidators, sourceValidators) {
+    // records if we got an object ({base, source}) as a parameter
+    if (source === undefined && base.base !== undefined && base.source !== undefined) {
+      const baseRecord = new MarcRecord(base.base, baseValidators);
+      const sourceRecord = new MarcRecord(base.source, sourceValidators);
+      return {baseRecord, sourceRecord};
+    }
+    // records if we got an non-object (base, source) as a parameter
+    const baseRecord = new MarcRecord(base, baseValidators);
+    const sourceRecord = new MarcRecord(source, sourceValidators);
+    return {baseRecord, sourceRecord};
+  }
+
   const baseFields = baseRecord.get(tagPattern);
   const sourceFields = sourceRecord.get(tagPattern);
   const fieldTag = sourceFields.map(field => field.tag);
@@ -27,7 +48,7 @@ export default ({tagPattern, equalityFunction = strictEquality}) => (base, sourc
   if (baseFields.length > 1 || sourceFields.length > 1) {
     debug(`Multiple fields in base or source`);
     debug(`No changes to base`);
-    return base;
+    return baseRecord.toObject();
   }
   const [baseField] = baseFields;
   const [sourceField] = sourceFields;
@@ -35,7 +56,7 @@ export default ({tagPattern, equalityFunction = strictEquality}) => (base, sourc
   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;
+    return baseRecord.toObject();
   }
   const baseSubs = baseField.subfields;
   const sourceSubs = sourceField.subfields;
@@ -61,7 +82,7 @@ export default ({tagPattern, equalityFunction = strictEquality}) => (base, sourc
   if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length < baseSubs.length) {
     debug(`Base and source subfields are not equal`);
     debug(`No changes to base`);
-    return base;
+    return baseRecord.toObject();
   }
 
   if (baseSubs.length === sourceSubs.length && equalSubfieldsBase.length === equalSubfieldsSource.length) {
@@ -74,16 +95,16 @@ export default ({tagPattern, equalityFunction = strictEquality}) => (base, sourc
       .reduce((acc, value) => acc + value);
 
     if (totalSubfieldLengthSource > totalSubfieldLengthBase) {
-      return replaceBasefieldWithSourcefield(base);
+      return replaceBasefieldWithSourcefield(baseRecord.toObject());
     }
   }
 
   if (sourceSubs.length > baseSubs.length && equalSubfieldsBase.length === baseSubs.length) {
-    return replaceBasefieldWithSourcefield(base);
+    return replaceBasefieldWithSourcefield(baseRecord.toObject());
   }
 
   debug(`No changes to base`);
-  return base;
+  return baseRecord.toObject();
 
   function replaceBasefieldWithSourcefield(base) {
     const index = base.fields.findIndex(field => field === baseField);
@@ -94,7 +115,7 @@ export default ({tagPattern, equalityFunction = strictEquality}) => (base, sourc
 
   function checkFieldType(fields) {
     const checkedFields = fields.map(field => {
-      if ('value' in field) { // eslint-disable-line functional/no-conditional-statement
+      if ('value' in field) { // eslint-disable-line functional/no-conditional-statements
         throw new Error('Invalid control field, expected data field');
       }
       return field;