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

package/.github/CODEOWNERS

@@ -1,9 +1,2 @@
-# With this line @NatLibFi/melinda-js-lead owns any files in the /.github/
-# directory at the root of the repository and any of its
-# subdirectories.
-/.github/ @NatLibFi/melinda-js-lead
-
-# With this line @NatLibFi/melinda-js-lead owns any files in the /src/
-# directory at the root of the repository and any of its
-# subdirectories.
-/src/ @NatLibFi/melinda-js-lead
+# With this line @NatLibFi/melinda-js-lead owns any files in this repository
+* @NatLibFi/melinda-js-lead

package/.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
       interval: "daily"
       time: "06:30"
       timezone: "Europe/Helsinki"
-
+    target-branch: "dependencies"
 
   # Minor updates to npm production dependencies daily
   - package-ecosystem: "npm"
@@ -20,10 +20,9 @@ updates:
       time: "06:45"
       timezone: "Europe/Helsinki"
     versioning-strategy: lockfile-only
-    labels:
-      - "npm minor dependencies"
     allow:
       - dependency-type: "production"
+    target-branch: "dependencies"
 
   # Major updates to npm dependencies weekly @tuesday
   # Not possible yet https://github.com/dependabot/dependabot-core/issues/1778

package/.github/workflows/melinda-node-tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x, 19.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -52,7 +52,7 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
       - run: npm publish

package/README.md

@@ -36,6 +36,14 @@ If base has field with that tag 011 source field is ignored
 
 When base and source fields are compared, indicator differences are ignored
 
+### compareWithoutTag (Defaults false)
+```
+{tagPattern: /^(100|700)$/u, compareWithoutTag: false}
+{tagPattern: /^(100|700)$/u, compareWithoutTag: false, swapTag: [{"from": "^100$", "to": "700"}]}
+```
+
+When base and source fields are compared, tag differences are ignored
+
 ### subfieldsMustBeIdentical (Defaults true)
 ```
 {tagPattern: /010/u, subfieldsMustBeIdentical: true}
@@ -58,6 +66,14 @@ If source subfields are subset of base subfields this option says if it is copie
 
 When base and source fields are compared, excluded subfields are ignored
 
+### swapTag (Defaults [ ])
+```
+{tagPattern: /^100$/u, swapTag: [{"from": "^100$", "to": "700"}]}
+{tagPattern: /^(100|700)$/u, compareWithoutTag: false, swapTag: [{"from": "^100$", "to": "700"}]}
+```
+
+When fields are copied, tags are swapped. From is Regexp filter and to is string value.
+
 ### swapSubfieldCode (Defaults [ ])
 ```
 {tagPattern: /010/u, swapSubfieldCode: [{"from": "a", "to": "b"}]}

package/dist/index.js

@@ -10,16 +10,61 @@ Object.defineProperty(exports, "Reducers", {
   }
 });
 exports.default = void 0;
-
 var _reducers = _interopRequireDefault(require("./reducers"));
-
+var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+const debug = (0, _debug.default)('@natlibfi/melinda-marc-record-merge:index');
+const debugData = debug.extend('data');
+// 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.
 var _default = ({
   base,
   source,
   reducers
-}) => reducers.reduce((base, reducer) => reducer(base, source), base);
+}) => {
+  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
+    };
+  }
+};
 exports.default = _default;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["base","source","reducers","reduce","reducer"],"sources":["../src/index.js"],"sourcesContent":["import Reducers from './reducers';\n\nexport {Reducers};\nexport default ({base, source, reducers}) => reducers.reduce((base, reducer) => reducer(base, source), base);\n"],"mappings":";;;;;;;;;;;;;AAAA;;;;eAGe,CAAC;EAACA,IAAD;EAAOC,MAAP;EAAeC;AAAf,CAAD,KAA8BA,QAAQ,CAACC,MAAT,CAAgB,CAACH,IAAD,EAAOI,OAAP,KAAmBA,OAAO,CAACJ,IAAD,EAAOC,MAAP,CAA1C,EAA0DD,IAA1D,C"}
+{"version":3,"file":"index.js","names":["_reducers","_interopRequireDefault","require","_debug","obj","__esModule","default","debug","createDebugLogger","debugData","extend","_default","base","source","reducers","combo","resultCombo","reduce","reducer","returnCombo","singleRound","JSON","stringify","length","reducerResult","undefined","exports"],"sources":["../src/index.js"],"sourcesContent":["import Reducers from './reducers';\nimport createDebugLogger from 'debug';\n\nconst debug = createDebugLogger('@natlibfi/melinda-marc-record-merge:index');\nconst debugData = debug.extend('data');\n\nexport {Reducers};\n// export default ({base, source, reducers}) => reducers.reduce((base, reducer) => reducer(base, source), base);\n\n// NV: Modified the reducer loop so, that not only base, but also is carried back.\n// However, we try to be backward-compatible: normally after the reducers, only base is returned.\n\nexport default ({base, source, reducers}) => {\n\n  const combo = {base, source};\n  const resultCombo = reducers.reduce((combo, reducer) => {\n    const returnCombo = singleRound(reducer, combo.base, combo.source);\n    //debugData(`returnCombo after current reducer: ${JSON.stringify(returnCombo)}`);\n    return returnCombo;\n  }, combo);\n\n  debugData(`ResultCombo after reducers: ${JSON.stringify(resultCombo)}`);\n\n  // Hack to make my melinda-marc-record-merge-reducers single tests that expect both\n  // base and source to return them both:\n  if (reducers.length === 1 && resultCombo.base && resultCombo.source) {\n    debug('Single reducer, returning resultCombo');\n    debugData(JSON.stringify(resultCombo));\n\n    return resultCombo;\n  }\n  // All other tests return just base... Backward (compability) it is!\n  debug('Multiple reducers, returning just base');\n  debugData(JSON.stringify(resultCombo.base));\n  return resultCombo.base;\n\n  function singleRound(reducer, base, source) {\n    //debug(`SINGLE ROUND INPUT (base, source)`);\n    //debugData(base);\n    //debugData(base);\n    const reducerResult = reducer(base, source);\n    //debug(`reducerResult:`);\n    //debugData(reducerResult);\n    if (reducerResult.base !== undefined && reducerResult.source !== undefined) {\n      debug('NEW STYLE REDUCER RESULT v2');\n      const combo = reducerResult;\n      //debugData(combo);\n      return combo;\n    }\n    debug('OLD SCHOOL REDUCER RESULT v2');\n    //debugData({base: reducerResult, source});\n    return {base: reducerResult, source};\n  }\n};\n"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAsC,SAAAD,uBAAAG,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEtC,MAAMG,KAAK,GAAG,IAAAC,cAAiB,EAAC,2CAA2C,CAAC;AAC5E,MAAMC,SAAS,GAAGF,KAAK,CAACG,MAAM,CAAC,MAAM,CAAC;AAGtC;AAEA;AACA;AAAA,IAAAC,QAAA,GAEeA,CAAC;EAACC,IAAI;EAAEC,MAAM;EAAEC;AAAQ,CAAC,KAAK;EAE3C,MAAMC,KAAK,GAAG;IAACH,IAAI;IAAEC;EAAM,CAAC;EAC5B,MAAMG,WAAW,GAAGF,QAAQ,CAACG,MAAM,CAAC,CAACF,KAAK,EAAEG,OAAO,KAAK;IACtD,MAAMC,WAAW,GAAGC,WAAW,CAACF,OAAO,EAAEH,KAAK,CAACH,IAAI,EAAEG,KAAK,CAACF,MAAM,CAAC;IAClE;IACA,OAAOM,WAAW;EACpB,CAAC,EAAEJ,KAAK,CAAC;EAETN,SAAS,CAAE,+BAA8BY,IAAI,CAACC,SAAS,CAACN,WAAW,CAAE,EAAC,CAAC;;EAEvE;EACA;EACA,IAAIF,QAAQ,CAACS,MAAM,KAAK,CAAC,IAAIP,WAAW,CAACJ,IAAI,IAAII,WAAW,CAACH,MAAM,EAAE;IACnEN,KAAK,CAAC,uCAAuC,CAAC;IAC9CE,SAAS,CAACY,IAAI,CAACC,SAAS,CAACN,WAAW,CAAC,CAAC;IAEtC,OAAOA,WAAW;EACpB;EACA;EACAT,KAAK,CAAC,wCAAwC,CAAC;EAC/CE,SAAS,CAACY,IAAI,CAACC,SAAS,CAACN,WAAW,CAACJ,IAAI,CAAC,CAAC;EAC3C,OAAOI,WAAW,CAACJ,IAAI;EAEvB,SAASQ,WAAWA,CAACF,OAAO,EAAEN,IAAI,EAAEC,MAAM,EAAE;IAC1C;IACA;IACA;IACA,MAAMW,aAAa,GAAGN,OAAO,CAACN,IAAI,EAAEC,MAAM,CAAC;IAC3C;IACA;IACA,IAAIW,aAAa,CAACZ,IAAI,KAAKa,SAAS,IAAID,aAAa,CAACX,MAAM,KAAKY,SAAS,EAAE;MAC1ElB,KAAK,CAAC,6BAA6B,CAAC;MACpC,MAAMQ,KAAK,GAAGS,aAAa;MAC3B;MACA,OAAOT,KAAK;IACd;IACAR,KAAK,CAAC,8BAA8B,CAAC;IACrC;IACA,OAAO;MAACK,IAAI,EAAEY,aAAa;MAAEX;IAAM,CAAC;EACtC;AACF,CAAC;AAAAa,OAAA,CAAApB,OAAA,GAAAK,QAAA"}

package/dist/index.spec.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _index = _interopRequireWildcard(require("./index"));
+var _util = require("util");
+var _debug = _interopRequireDefault(require("debug"));
+var _chai = require("chai");
+var _marcRecord = require("@natlibfi/marc-record");
+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; }
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'index'],
+  recurse: false,
+  useMetadataFile: true,
+  fixura: {
+    failWhenNotFound: false,
+    reader: _fixura.READERS.JSON
+  }
+});
+function callback({
+  getFixture,
+  reducerConfigs = []
+}) {
+  const base = new _marcRecord.MarcRecord(getFixture('base.json'), {
+    subfieldValues: false
+  });
+  const source = new _marcRecord.MarcRecord(getFixture('source.json'), {
+    subfieldValues: false
+  });
+  const expectedRecord = getFixture('merged.json');
+  const debug = (0, _debug.default)('@natlibfi/melinda-marc-record-merge-reducers:index:test');
+  const debugData = debug.extend('data');
+  const testReducerConfigs = reducerConfigs;
+  const reducers = [...testReducerConfigs.map(conf => _index.Reducers.copy(conf))];
+  debugData(`Reducers: ${(0, _util.inspect)(reducers, {
+    colors: true,
+    maxArrayLength: 10,
+    depth: 8
+  })})}`);
+  const result = (0, _index.default)({
+    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.MarcRecord(resultRecord, {
+    subfieldValues: false
+  });
+  (0, _chai.expect)(resultRecordToRecord.toObject()).to.eql(expectedRecord);
+}
+//# sourceMappingURL=index.spec.js.map

package/dist/index.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.spec.js","names":["_index","_interopRequireWildcard","require","_util","_debug","_interopRequireDefault","_chai","_marcRecord","_fixura","_fixugen","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generateTests","callback","path","__dirname","recurse","useMetadataFile","fixura","failWhenNotFound","reader","READERS","JSON","getFixture","reducerConfigs","base","MarcRecord","subfieldValues","source","expectedRecord","debug","createDebugLogger","debugData","extend","testReducerConfigs","reducers","map","conf","Reducers","copy","inspect","colors","maxArrayLength","depth","result","merger","constructor","name","stringify","resultRecord","resultRecordToRecord","expect","toObject","to","eql"],"sources":["../src/index.spec.js"],"sourcesContent":["import merger, {Reducers} from './index';\nimport {inspect} from 'util';\nimport createDebugLogger from 'debug';\nimport {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'index'],\n  recurse: false,\n  useMetadataFile: true,\n  fixura: {\n    failWhenNotFound: false,\n    reader: READERS.JSON\n  }\n});\n\nfunction callback({getFixture, reducerConfigs = []}) {\n  const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});\n  const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});\n  const expectedRecord = getFixture('merged.json');\n\n  const debug = createDebugLogger('@natlibfi/melinda-marc-record-merge-reducers:index:test');\n  const debugData = debug.extend('data');\n\n  const testReducerConfigs = reducerConfigs;\n  const reducers = [...testReducerConfigs.map(conf => Reducers.copy(conf))];\n\n  debugData(`Reducers: ${inspect(reducers, {colors: true, maxArrayLength: 10, depth: 8})})}`);\n\n  const result = merger({base, source, reducers});\n\n  debug(`Merge result is: ${result.constructor.name}`);\n  debugData(`${JSON.stringify(result)}`);\n\n  // Use either result.base or a plain result as resultRecord\n  // It can also be a MarcRecord or a plain object\n  const resultRecord = result.base || result;\n  const resultRecordToRecord = new MarcRecord(resultRecord, {subfieldValues: false});\n  expect(resultRecordToRecord.toObject()).to.eql(expectedRecord);\n\n\n}\n"],"mappings":"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"}

package/dist/reducers/copy.js

@@ -4,20 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _marcRecord = require("@natlibfi/marc-record");
-
 var _debug = _interopRequireDefault(require("debug"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable max-statements */
-
 /* eslint-disable no-unused-vars */
 var _default = ({
   tagPattern,
   compareTagsOnly = false,
+  compareWithoutTag = false,
   compareWithoutIndicators = false,
+  compareWithoutIndicator1 = false,
+  compareWithoutIndicator2 = false,
   subfieldsMustBeIdentical = true,
   excludeSubfields = [],
   dropSubfields = [],
@@ -32,14 +30,40 @@ var _default = ({
   swapSubfieldCode = [],
   doNotCopyIfFieldPresent = false
 }) => (base, source) => {
-  const baseRecord = new _marcRecord.MarcRecord(base, baseValidators);
-  const sourceRecord = new _marcRecord.MarcRecord(source, sourceValidators);
-  const debug = (0, _debug.default)('@natlibfi/marc-record-merge');
+  const debug = (0, _debug.default)('@natlibfi/marc-record-merge:copy');
+  const debugData = debug.extend('data');
   const debugOptions = (0, _debug.default)('@natlibfi/marc-record-merge:compare-options');
   const debugCompare = (0, _debug.default)('@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.MarcRecord(base.base, baseValidators);
+      const sourceRecord = new _marcRecord.MarcRecord(base.source, sourceValidators);
+      return {
+        baseRecord,
+        sourceRecord
+      };
+    }
+    // records if we got an non-object (base, source) as a parameter
+    const baseRecord = new _marcRecord.MarcRecord(base, baseValidators);
+    const sourceRecord = new _marcRecord.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}]`);
@@ -47,128 +71,117 @@ var _default = ({
   const baseFields = baseRecord.get(tagPattern);
   const sourceFields = sourceRecord.get(tagPattern);
   const doNotCopy = doNotCopyIfFieldPresent ? baseRecord.get(doNotCopyIfFieldPresent).length > 0 : false;
-
   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)); // Add fields to base;
-
-  swappedTags.forEach(field => baseRecord.insertField(field));
-  return baseRecord.toObject(); //return copyFields(baseFields, sourceFields);
+  debug(JSON.stringify(uniqueFields));
 
+  // Add fields to base;
+  uniqueFields.forEach(field => baseRecord.insertField(field));
+  debugData(`baseRecord before return: ${JSON.stringify(baseRecord)}`);
+  //return baseRecord;
+  return baseRecord.toObject();
   function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
     const [sourceField, ...rest] = sourceFields;
-
     if (sourceField === undefined) {
       return uniqFields;
     }
-
     if (baseCompareFields.length === 0) {
       return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
-    } // Source and base are also compared for identicalness
-    // Non-identical fields are copied from source to base as duplicates
-
+    }
 
+    // Source and base are also compared for identicalness
+    // Non-identical fields are copied from source to base as duplicates
     const sourceCompareField = createCompareField(sourceField);
     const unique = checkCompareFields(baseCompareFields, sourceCompareField);
     debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);
-
     if (unique) {
       return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
     }
-
     return compareFields(rest, baseCompareFields, uniqFields);
-
     function checkCompareFields(baseCompareFields, sourceCompareField) {
       let unique = true; // eslint-disable-line functional/no-let
 
       baseCompareFields.forEach(baseCompareField => {
         debugCompare(`Comparing ${JSON.stringify(sourceCompareField)} to ${JSON.stringify(baseCompareField)}}`);
-
         if (sourceCompareField.value !== baseCompareField.value) {
           debugCompare(`Value is different ${sourceCompareField.value} !== ${baseCompareField.value}`);
           return;
         }
-
         if (sourceCompareField.ind1 !== baseCompareField.ind1) {
           debugCompare(`Ind1 is different ${sourceCompareField.ind1} !== ${baseCompareField.ind1}`);
           return;
         }
-
         if (sourceCompareField.ind2 !== baseCompareField.ind2) {
           debugCompare(`Ind2 is different ${sourceCompareField.ind2} !== ${baseCompareField.ind2}`);
           return;
         }
-
         if ('subfields' in sourceCompareField) {
           const allFound = checkSubfields(sourceCompareField.subfields, baseCompareField.subfields);
           debugCompare(`Subfields are different ${!allFound}`);
-
           if (!allFound) {
             return;
           }
-
           unique = false;
           return;
         }
-
         unique = false;
         return;
       });
       return unique;
     }
-
     function checkSubfields(sourceSubfields, baseSubfields) {
       const foundSubs = sourceSubfields.filter(sSub => baseSubfields.some(bSub => sSub.code === bSub.code && sSub.value === bSub.value));
-
       if (subfieldsMustBeIdentical) {
         return foundSubs.length === sourceSubfields.length && foundSubs.length === baseSubfields.length;
       }
-
       return foundSubs.length === sourceSubfields.length;
     }
   }
 
+  // compare objects have only fields that matter in comparison
   function createCompareField(field) {
     if (compareTagsOnly) {
       return {
         tag: field.tag
       };
     }
-
     if ('value' in field) {
       return {
         tag: field.tag,
         value: field.value
       };
     }
-
     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
+      value: compareWithoutTag ? replacementTag : field.tag
     }, {
       name: 'ind1',
-      value: compareWithoutIndicators ? undefined : field.ind1
+      value: ignoreInd1 ? undefined : field.ind1
     }, {
       name: 'ind2',
-      value: compareWithoutIndicators ? undefined : field.ind2
+      value: ignoreInd2 ? undefined : field.ind2
     }, {
       name: 'subfields',
       value: createCompareSubfields(filteredField.subfields)
     }].map(param => [param.name, param.value]);
     return Object.fromEntries(params);
-
     function createCompareSubfields(subfields) {
       const nonExcludedSubfields = subfields.filter(sub => !excludeSubfields.some(code => code === sub.code));
       const normalizedSubfields = nonExcludedSubfields.map(sub => ({
@@ -176,50 +189,41 @@ var _default = ({
         value: normalizeSubfieldValue(sub.value)
       }));
       return normalizedSubfields;
-
       function normalizeSubfieldValue(value) {
         return value.toLowerCase().replace(/\s+/ug, '');
       }
     }
   }
-
   function checkSwapTag(fields) {
     if (swapTag.length > 0) {
-      return fields.map(field => ({ ...field,
+      return fields.map(field => ({
+        ...field,
         tag: swapTagsFunc(field.tag)
       }));
     }
-
     return fields;
-
     function swapTagsFunc(tag) {
       const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(tag));
-
       if (foundRule === undefined) {
         return tag;
       }
-
       return foundRule.to;
     }
   }
-
   function checkSwapSubfieldCodes(fields) {
     if (swapSubfieldCode.length > 0) {
-      return fields.map(field => ({ ...field,
+      return fields.map(field => ({
+        ...field,
         subfields: swapSubfieldCodesFunc(field.subfields)
       }));
     }
-
     return fields;
-
     function swapSubfieldCodesFunc(subfields) {
       return subfields.map(sub => {
         const [foundRule] = swapSubfieldCode.filter(rule => rule.from === sub.code);
-
         if (foundRule === undefined) {
           return sub;
         }
-
         return {
           code: foundRule.to,
           value: sub.value
@@ -227,16 +231,14 @@ var _default = ({
       });
     }
   }
-
   function checkDropSubfields(fields) {
     if (dropSubfields.length > 0) {
-      return fields.map(field => ({ ...field,
+      return fields.map(field => ({
+        ...field,
         subfields: dropSubfieldsFunc(field.subfields)
       })).filter(field => field.subfields.length > 0);
     }
-
     return fields;
-
     function dropSubfieldsFunc(subfields) {
       return subfields.filter(sub => {
         // eslint-disable-line
@@ -248,116 +250,25 @@ var _default = ({
           if (code !== sub.code) {
             return false;
           }
-
           if (!condition && value) {
             return value === sub.value;
           }
-
           if (condition === 'unless' && value) {
             return !new RegExp(value, 'u').test(sub.value);
           }
-
           return true;
         });
       });
     }
   }
-
   function checkCopyUnlessFields(fields) {
     if (copyUnless.length > 0) {
       return fields.filter(({
         subfields
       }) => copyUnless.some(filter => !subfields.some(sub => sub.code === filter.code && new RegExp(filter.value, 'u').test(sub.value))));
     }
-
     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;
-// }
-
-
+};
 exports.default = _default;
 //# sourceMappingURL=copy.js.map