@natlibfi/marc-record-merge 6.0.0-beta.6 → 6.0.0-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -36,6 +36,14 @@ If base has field with that tag 011 source field is ignored
36
36
 
37
37
  When base and source fields are compared, indicator differences are ignored
38
38
 
39
+ ### compareWithoutTag (Defaults false)
40
+ ```
41
+ {tagPattern: /^(100|700)$/u, compareWithoutTag: false}
42
+ {tagPattern: /^(100|700)$/u, compareWithoutTag: false, swapTag: [{"from": "^100$", "to": "700"}]}
43
+ ```
44
+
45
+ When base and source fields are compared, tag differences are ignored
46
+
39
47
  ### subfieldsMustBeIdentical (Defaults true)
40
48
  ```
41
49
  {tagPattern: /010/u, subfieldsMustBeIdentical: true}
@@ -58,6 +66,14 @@ If source subfields are subset of base subfields this option says if it is copie
58
66
 
59
67
  When base and source fields are compared, excluded subfields are ignored
60
68
 
69
+ ### swapTag (Defaults [ ])
70
+ ```
71
+ {tagPattern: /^100$/u, swapTag: [{"from": "^100$", "to": "700"}]}
72
+ {tagPattern: /^(100|700)$/u, compareWithoutTag: false, swapTag: [{"from": "^100$", "to": "700"}]}
73
+ ```
74
+
75
+ When fields are copied, tags are swapped. From is Regexp filter and to is string value.
76
+
61
77
  ### swapSubfieldCode (Defaults [ ])
62
78
  ```
63
79
  {tagPattern: /010/u, swapSubfieldCode: [{"from": "a", "to": "b"}]}
@@ -17,6 +17,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
17
17
  var _default = ({
18
18
  tagPattern,
19
19
  compareTagsOnly = false,
20
+ compareWithoutTag = false,
20
21
  compareWithoutIndicators = false,
21
22
  subfieldsMustBeIdentical = true,
22
23
  excludeSubfields = [],
@@ -53,18 +54,20 @@ var _default = ({
53
54
  }
54
55
 
55
56
  debug(`Base fields: `, baseFields);
56
- debug(`Source fields: `, sourceFields);
57
+ debug(`Source fields: `, sourceFields); // Logic steps
58
+
57
59
  const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
58
60
  const compareResultFields = compareFields(sourceFields, baseCompareFields);
59
61
  const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);
60
62
  const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);
61
63
  const swappedSubfields = checkSwapSubfieldCodes(droppedUnwantedFields);
62
64
  const swappedTags = checkSwapTag(swappedSubfields);
65
+ const uniqueFields = [...new Set(swappedTags.map(field => JSON.stringify(field)))].map(field => JSON.parse(field));
63
66
  debug('Fields to be copied');
64
- debug(JSON.stringify(swappedTags)); // Add fields to base;
67
+ debug(JSON.stringify(uniqueFields)); // Add fields to base;
65
68
 
66
- swappedTags.forEach(field => baseRecord.insertField(field));
67
- return baseRecord.toObject(); //return copyFields(baseFields, sourceFields);
69
+ uniqueFields.forEach(field => baseRecord.insertField(field));
70
+ return baseRecord.toObject();
68
71
 
69
72
  function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
70
73
  const [sourceField, ...rest] = sourceFields;
@@ -137,7 +140,8 @@ var _default = ({
137
140
 
138
141
  return foundSubs.length === sourceSubfields.length;
139
142
  }
140
- }
143
+ } // compare objects have only fields that matter in comparing
144
+
141
145
 
142
146
  function createCompareField(field) {
143
147
  if (compareTagsOnly) {
@@ -154,9 +158,11 @@ var _default = ({
154
158
  }
155
159
 
156
160
  const [filteredField] = checkDropSubfields([field]);
161
+ const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(field.tag));
162
+ const replacementTag = foundRule ? foundRule.to : undefined;
157
163
  const params = [{
158
164
  name: 'tag',
159
- value: field.tag
165
+ value: compareWithoutTag ? replacementTag : field.tag
160
166
  }, {
161
167
  name: 'ind1',
162
168
  value: compareWithoutIndicators ? undefined : field.ind1
@@ -272,92 +278,7 @@ var _default = ({
272
278
 
273
279
  return fields;
274
280
  }
275
- }; // function copyFields() { //eslint-disable-line no-unused-vars
276
- // const sourceTags = sourceFields.map(field => field.tag);
277
- // sourceTags.forEach(tag => debug(`Comparing field ${tag}`));
278
- // /*
279
- // if (combine.length > 0) {
280
- // debug(`*** NOW Copy options: ${tagPattern}, ${compareTagsOnly}, ${compareWithoutIndicators}, ${subfieldsMustBeIdentical}, [${combine}], [${excludeSubfields}], [${dropSubfields}]`);
281
- // combine.forEach(row => debug(` ### combine ${row} <- `));
282
- // return [];
283
- // }
284
- // */
285
- // // If compareTagsOnly = true, only this part is run
286
- // // The field is copied from source only if it is missing completely from base
287
- // if (compareTagsOnly && baseFields.length === 0) {
288
- // sourceTags.forEach(tag => debug(`Missing field ${tag} copied from source to base`));
289
- // sourceFields.forEach(f => base.insertField(f));
290
- // return true;
291
- // }
292
- // // If compareTagsOnly = false (default)
293
- // // Source and base are also compared for identicalness
294
- // // Non-identical fields are copied from source to base as duplicates
295
- // if (!compareTagsOnly) {
296
- // const filterMissing = function (sourceField) {
297
- // if ('value' in sourceField) {
298
- // debug(`Checking control field ${sourceField.tag} for identicalness`);
299
- // return baseFields.some(isIdenticalControlField) === false;
300
- // }
301
- // if ('subfields' in sourceField) {
302
- // debug(`Checking data field ${sourceField.tag} for identicalness`);
303
- // return baseFields.some(isIdenticalDataField) === false;
304
- // }
305
- // function normalizeControlField(field) {
306
- // return field.value.toLowerCase().replace(/\s+/u, '');
307
- // }
308
- // function isIdenticalControlField(baseField) {
309
- // const normalizedBaseField = normalizeControlField(baseField);
310
- // const normalizedSourceField = normalizeControlField(sourceField);
311
- // return normalizedSourceField === normalizedBaseField;
312
- // }
313
- // function isIdenticalDataField(baseField) {
314
- // // If excluded subfields have been defined for this field, they must be ignored first
315
- // // (i.e. source and base fields are considered identical if all non-excluded subfields are identical)
316
- // if (excludeSubfields.length > 0 &&
317
- // sourceField.tag === baseField.tag &&
318
- // sourceField.ind1 === baseField.ind1 &&
319
- // sourceField.ind2 === baseField.ind2) {
320
- // excludeSubfields.forEach(sub => debug(`Subfield ${sub} excluded from identicalness comparison`));
321
- // // Compare only those subfields that are not excluded
322
- // const baseSubsToCompare = baseField.subfields.filter(subfield => excludeSubfields.indexOf(subfield.code) === -1);
323
- // return baseSubsToCompare.every(isIdenticalSubfield);
324
- // }
325
- // // If there are no excluded subfields (default case)
326
- // if (sourceField.tag === baseField.tag &&
327
- // sourceField.ind1 === baseField.ind1 &&
328
- // sourceField.ind2 === baseField.ind2 &&
329
- // sourceField.subfields.length === baseField.subfields.length) {
330
- // return baseField.subfields.every(isIdenticalSubfield);
331
- // }
332
- // function normalizeSubfield(subfield) {
333
- // return subfield.value.toLowerCase().replace(/\s+/u, '');
334
- // }
335
- // function isIdenticalSubfield(baseSub) {
336
- // const normBaseSub = normalizeSubfield(baseSub);
337
- // return sourceField.subfields.some(sourceSub => {
338
- // const normSourceSub = normalizeSubfield(sourceSub);
339
- // return normSourceSub === normBaseSub;
340
- // });
341
- // }
342
- // }
343
- // };
344
- // // Search for fields missing from base
345
- // const missingFields = sourceFields.filter(filterMissing);
346
- // missingFields.forEach(f => base.insertField(f));
347
- // if (missingFields.length > 0) {
348
- // const missingTags = missingFields.map(field => field.tag);
349
- // missingTags.forEach(tag => debug(`Field ${tag} copied from source to base`));
350
- // return base;
351
- // }
352
- // if (missingFields.length === 0) {
353
- // debug(`No missing fields found`);
354
- // return base;
355
- // }
356
- // }
357
- // debug(`No missing fields found`);
358
- // return base;
359
- // }
360
-
281
+ };
361
282
 
362
283
  exports.default = _default;
363
284
  //# sourceMappingURL=copy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy.js","names":["tagPattern","compareTagsOnly","compareWithoutIndicators","subfieldsMustBeIdentical","excludeSubfields","dropSubfields","copyUnless","baseValidators","subfieldValues","sourceValidators","swapTag","swapSubfieldCode","doNotCopyIfFieldPresent","base","source","baseRecord","MarcRecord","sourceRecord","debug","createDebugLogger","debugOptions","debugCompare","JSON","stringify","baseFields","get","sourceFields","doNotCopy","length","toObject","baseCompareFields","map","baseField","createCompareField","compareResultFields","compareFields","droppedUnwantedSubfield","checkDropSubfields","droppedUnwantedFields","checkCopyUnlessFields","swappedSubfields","checkSwapSubfieldCodes","swappedTags","checkSwapTag","forEach","field","insertField","uniqFields","sourceField","rest","undefined","sourceCompareField","unique","checkCompareFields","baseCompareField","value","ind1","ind2","allFound","checkSubfields","subfields","sourceSubfields","baseSubfields","foundSubs","filter","sSub","some","bSub","code","tag","filteredField","params","name","createCompareSubfields","param","Object","fromEntries","nonExcludedSubfields","sub","normalizedSubfields","normalizeSubfieldValue","toLowerCase","replace","fields","swapTagsFunc","foundRule","rule","RegExp","from","test","to","swapSubfieldCodesFunc","dropSubfieldsFunc","condition"],"sources":["../../src/reducers/copy.js"],"sourcesContent":["/* eslint-disable max-statements */\n/* eslint-disable no-unused-vars */\n\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createDebugLogger from 'debug';\n\nexport default ({\n tagPattern,\n compareTagsOnly = false,\n compareWithoutIndicators = false,\n subfieldsMustBeIdentical = true,\n excludeSubfields = [],\n dropSubfields = [],\n copyUnless = [],\n baseValidators = {subfieldValues: false},\n sourceValidators = {subfieldValues: false},\n swapTag = [],\n swapSubfieldCode = [],\n doNotCopyIfFieldPresent = false\n}) => (base, source) => {\n const baseRecord = new MarcRecord(base, baseValidators);\n const sourceRecord = new MarcRecord(source, sourceValidators);\n\n const debug = createDebugLogger('@natlibfi/marc-record-merge');\n const debugOptions = createDebugLogger('@natlibfi/marc-record-merge:compare-options');\n const debugCompare = createDebugLogger('@natlibfi/marc-record-merge:compare');\n debugOptions(`Tag Pattern: ${tagPattern}`);\n debugOptions(`Compare tags only: ${compareTagsOnly}`);\n debugOptions(`Compare without indicators ${compareWithoutIndicators}`);\n debugOptions(`Copy if identical: ${subfieldsMustBeIdentical}`);\n debugOptions(`Exclude subfields: [${excludeSubfields}]`);\n debugOptions(`Drop subfields [${dropSubfields}]`);\n debugOptions(`Copy unless contains subfields: ${JSON.stringify(copyUnless)}`);\n\n const baseFields = baseRecord.get(tagPattern);\n const sourceFields = sourceRecord.get(tagPattern);\n const doNotCopy = doNotCopyIfFieldPresent ? baseRecord.get(doNotCopyIfFieldPresent).length > 0 : false;\n\n if (doNotCopy) {\n return baseRecord.toObject();\n }\n\n debug(`Base fields: `, baseFields);\n debug(`Source fields: `, sourceFields);\n\n const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));\n const compareResultFields = compareFields(sourceFields, baseCompareFields);\n const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);\n const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);\n const swappedSubfields = checkSwapSubfieldCodes(droppedUnwantedFields);\n const swappedTags = checkSwapTag(swappedSubfields);\n debug('Fields to be copied');\n debug(JSON.stringify(swappedTags));\n\n // Add fields to base;\n swappedTags.forEach(field => baseRecord.insertField(field));\n return baseRecord.toObject();\n //return copyFields(baseFields, sourceFields);\n\n function compareFields(sourceFields, baseCompareFields, uniqFields = []) {\n const [sourceField, ...rest] = sourceFields;\n if (sourceField === undefined) {\n return uniqFields;\n }\n\n if (baseCompareFields.length === 0) {\n return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);\n }\n\n // Source and base are also compared for identicalness\n // Non-identical fields are copied from source to base as duplicates\n const sourceCompareField = createCompareField(sourceField);\n const unique = checkCompareFields(baseCompareFields, sourceCompareField);\n\n debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);\n\n if (unique) {\n return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);\n }\n\n return compareFields(rest, baseCompareFields, uniqFields);\n\n function checkCompareFields(baseCompareFields, sourceCompareField) {\n let unique = true; // eslint-disable-line functional/no-let\n\n baseCompareFields.forEach(baseCompareField => {\n debugCompare(`Comparing ${JSON.stringify(sourceCompareField)} to ${JSON.stringify(baseCompareField)}}`);\n\n if (sourceCompareField.value !== baseCompareField.value) {\n debugCompare(`Value is different ${sourceCompareField.value} !== ${baseCompareField.value}`);\n return;\n }\n\n if (sourceCompareField.ind1 !== baseCompareField.ind1) {\n debugCompare(`Ind1 is different ${sourceCompareField.ind1} !== ${baseCompareField.ind1}`);\n return;\n }\n\n if (sourceCompareField.ind2 !== baseCompareField.ind2) {\n debugCompare(`Ind2 is different ${sourceCompareField.ind2} !== ${baseCompareField.ind2}`);\n return;\n }\n\n if ('subfields' in sourceCompareField) {\n const allFound = checkSubfields(sourceCompareField.subfields, baseCompareField.subfields);\n debugCompare(`Subfields are different ${!allFound}`);\n if (!allFound) {\n return;\n }\n\n unique = false;\n return;\n }\n\n unique = false;\n return;\n });\n\n return unique;\n }\n\n function checkSubfields(sourceSubfields, baseSubfields) {\n const foundSubs = sourceSubfields.filter(sSub => baseSubfields.some(bSub => sSub.code === bSub.code && sSub.value === bSub.value));\n\n if (subfieldsMustBeIdentical) {\n return foundSubs.length === sourceSubfields.length && foundSubs.length === baseSubfields.length;\n }\n\n return foundSubs.length === sourceSubfields.length;\n }\n }\n\n function createCompareField(field) {\n if (compareTagsOnly) {\n return {tag: field.tag};\n }\n\n if ('value' in field) {\n return {tag: field.tag, value: field.value};\n }\n\n const [filteredField] = checkDropSubfields([field]);\n\n const params = [\n {name: 'tag', value: field.tag},\n {name: 'ind1', value: compareWithoutIndicators ? undefined : field.ind1},\n {name: 'ind2', value: compareWithoutIndicators ? undefined : field.ind2},\n {name: 'subfields', value: createCompareSubfields(filteredField.subfields)}\n ].map(param => [param.name, param.value]);\n\n return Object.fromEntries(params);\n\n function createCompareSubfields(subfields) {\n const nonExcludedSubfields = subfields.filter(sub => !excludeSubfields.some(code => code === sub.code));\n const normalizedSubfields = nonExcludedSubfields.map(sub => ({code: sub.code, value: normalizeSubfieldValue(sub.value)}));\n\n return normalizedSubfields;\n\n function normalizeSubfieldValue(value) {\n return value.toLowerCase().replace(/\\s+/ug, '');\n }\n }\n }\n\n function checkSwapTag(fields) {\n if (swapTag.length > 0) {\n return fields.map(field => ({...field, tag: swapTagsFunc(field.tag)}));\n }\n\n return fields;\n\n function swapTagsFunc(tag) {\n const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(tag));\n\n if (foundRule === undefined) {\n return tag;\n }\n\n return foundRule.to;\n }\n }\n\n function checkSwapSubfieldCodes(fields) {\n if (swapSubfieldCode.length > 0) {\n return fields.map(field => ({...field, subfields: swapSubfieldCodesFunc(field.subfields)}));\n }\n\n return fields;\n\n function swapSubfieldCodesFunc(subfields) {\n return subfields.map(sub => {\n const [foundRule] = swapSubfieldCode.filter(rule => rule.from === sub.code);\n\n if (foundRule === undefined) {\n return sub;\n }\n\n return {code: foundRule.to, value: sub.value};\n });\n }\n }\n\n function checkDropSubfields(fields) {\n if (dropSubfields.length > 0) {\n return fields.map(field => ({...field, subfields: dropSubfieldsFunc(field.subfields)}))\n .filter(field => field.subfields.length > 0);\n }\n\n return fields;\n\n function dropSubfieldsFunc(subfields) {\n return subfields.filter(sub => { // eslint-disable-line\n return !dropSubfields.some(({code, value = false, condition = false}) => {\n if (code !== sub.code) {\n return false;\n }\n\n if (!condition && value) {\n return value === sub.value;\n }\n\n if (condition === 'unless' && value) {\n return !new RegExp(value, 'u').test(sub.value);\n }\n\n return true;\n });\n });\n }\n }\n\n function checkCopyUnlessFields(fields) {\n if (copyUnless.length > 0) {\n return fields.filter(({subfields}) => copyUnless.some(filter => !subfields.some(sub => sub.code === filter.code && new RegExp(filter.value, 'u').test(sub.value))));\n }\n\n return fields;\n }\n};\n\n// function copyFields() { //eslint-disable-line no-unused-vars\n// const sourceTags = sourceFields.map(field => field.tag);\n// sourceTags.forEach(tag => debug(`Comparing field ${tag}`));\n\n// /*\n// if (combine.length > 0) {\n// debug(`*** NOW Copy options: ${tagPattern}, ${compareTagsOnly}, ${compareWithoutIndicators}, ${subfieldsMustBeIdentical}, [${combine}], [${excludeSubfields}], [${dropSubfields}]`);\n// combine.forEach(row => debug(` ### combine ${row} <- `));\n// return [];\n// }\n// */\n\n// // If compareTagsOnly = true, only this part is run\n// // The field is copied from source only if it is missing completely from base\n// if (compareTagsOnly && baseFields.length === 0) {\n// sourceTags.forEach(tag => debug(`Missing field ${tag} copied from source to base`));\n// sourceFields.forEach(f => base.insertField(f));\n// return true;\n// }\n\n// // If compareTagsOnly = false (default)\n// // Source and base are also compared for identicalness\n// // Non-identical fields are copied from source to base as duplicates\n// if (!compareTagsOnly) {\n// const filterMissing = function (sourceField) {\n// if ('value' in sourceField) {\n// debug(`Checking control field ${sourceField.tag} for identicalness`);\n// return baseFields.some(isIdenticalControlField) === false;\n// }\n// if ('subfields' in sourceField) {\n// debug(`Checking data field ${sourceField.tag} for identicalness`);\n// return baseFields.some(isIdenticalDataField) === false;\n// }\n\n// function normalizeControlField(field) {\n// return field.value.toLowerCase().replace(/\\s+/u, '');\n// }\n\n// function isIdenticalControlField(baseField) {\n// const normalizedBaseField = normalizeControlField(baseField);\n// const normalizedSourceField = normalizeControlField(sourceField);\n// return normalizedSourceField === normalizedBaseField;\n// }\n\n// function isIdenticalDataField(baseField) {\n// // If excluded subfields have been defined for this field, they must be ignored first\n// // (i.e. source and base fields are considered identical if all non-excluded subfields are identical)\n// if (excludeSubfields.length > 0 &&\n// sourceField.tag === baseField.tag &&\n// sourceField.ind1 === baseField.ind1 &&\n// sourceField.ind2 === baseField.ind2) {\n// excludeSubfields.forEach(sub => debug(`Subfield ${sub} excluded from identicalness comparison`));\n// // Compare only those subfields that are not excluded\n// const baseSubsToCompare = baseField.subfields.filter(subfield => excludeSubfields.indexOf(subfield.code) === -1);\n// return baseSubsToCompare.every(isIdenticalSubfield);\n// }\n// // If there are no excluded subfields (default case)\n// if (sourceField.tag === baseField.tag &&\n// sourceField.ind1 === baseField.ind1 &&\n// sourceField.ind2 === baseField.ind2 &&\n// sourceField.subfields.length === baseField.subfields.length) {\n// return baseField.subfields.every(isIdenticalSubfield);\n// }\n// function normalizeSubfield(subfield) {\n// return subfield.value.toLowerCase().replace(/\\s+/u, '');\n// }\n// function isIdenticalSubfield(baseSub) {\n// const normBaseSub = normalizeSubfield(baseSub);\n// return sourceField.subfields.some(sourceSub => {\n// const normSourceSub = normalizeSubfield(sourceSub);\n// return normSourceSub === normBaseSub;\n// });\n// }\n// }\n// };\n// // Search for fields missing from base\n// const missingFields = sourceFields.filter(filterMissing);\n// missingFields.forEach(f => base.insertField(f));\n// if (missingFields.length > 0) {\n// const missingTags = missingFields.map(field => field.tag);\n// missingTags.forEach(tag => debug(`Field ${tag} copied from source to base`));\n// return base;\n// }\n// if (missingFields.length === 0) {\n// debug(`No missing fields found`);\n// return base;\n// }\n// }\n// debug(`No missing fields found`);\n// return base;\n// }\n"],"mappings":"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Ad,IAA0BtC,KAA9B,EAAqC;YACnC,OAAO,CAAC,IAAIgC,MAAJ,CAAWhC,KAAX,EAAkB,GAAlB,EAAuBkC,IAAvB,CAA4BX,GAAG,CAACvB,KAAhC,CAAR;UACD;;UAED,OAAO,IAAP;QACD,CAdO,CAAR;MAeD,CAhBM,CAAP;IAiBD;EACF;;EAED,SAAShB,qBAAT,CAA+B4C,MAA/B,EAAuC;IACrC,IAAI7E,UAAU,CAACsB,MAAX,GAAoB,CAAxB,EAA2B;MACzB,OAAOuD,MAAM,CAACnB,MAAP,CAAc,CAAC;QAACJ;MAAD,CAAD,KAAiBtD,UAAU,CAAC4D,IAAX,CAAgBF,MAAM,IAAI,CAACJ,SAAS,CAACM,IAAV,CAAeY,GAAG,IAAIA,GAAG,CAACV,IAAJ,KAAaJ,MAAM,CAACI,IAApB,IAA4B,IAAImB,MAAJ,CAAWvB,MAAM,CAACT,KAAlB,EAAyB,GAAzB,EAA8BkC,IAA9B,CAAmCX,GAAG,CAACvB,KAAvC,CAAlD,CAA3B,CAA/B,CAAP;IACD;;IAED,OAAO4B,MAAP;EACD;AACF,C,EAED;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
1
+ {"version":3,"file":"copy.js","names":["tagPattern","compareTagsOnly","compareWithoutTag","compareWithoutIndicators","subfieldsMustBeIdentical","excludeSubfields","dropSubfields","copyUnless","baseValidators","subfieldValues","sourceValidators","swapTag","swapSubfieldCode","doNotCopyIfFieldPresent","base","source","baseRecord","MarcRecord","sourceRecord","debug","createDebugLogger","debugOptions","debugCompare","JSON","stringify","baseFields","get","sourceFields","doNotCopy","length","toObject","baseCompareFields","map","baseField","createCompareField","compareResultFields","compareFields","droppedUnwantedSubfield","checkDropSubfields","droppedUnwantedFields","checkCopyUnlessFields","swappedSubfields","checkSwapSubfieldCodes","swappedTags","checkSwapTag","uniqueFields","Set","field","parse","forEach","insertField","uniqFields","sourceField","rest","undefined","sourceCompareField","unique","checkCompareFields","baseCompareField","value","ind1","ind2","allFound","checkSubfields","subfields","sourceSubfields","baseSubfields","foundSubs","filter","sSub","some","bSub","code","tag","filteredField","foundRule","rule","RegExp","from","test","replacementTag","to","params","name","createCompareSubfields","param","Object","fromEntries","nonExcludedSubfields","sub","normalizedSubfields","normalizeSubfieldValue","toLowerCase","replace","fields","swapTagsFunc","swapSubfieldCodesFunc","dropSubfieldsFunc","condition"],"sources":["../../src/reducers/copy.js"],"sourcesContent":["/* eslint-disable max-statements */\n/* eslint-disable no-unused-vars */\n\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createDebugLogger from 'debug';\n\nexport default ({\n tagPattern,\n compareTagsOnly = false,\n compareWithoutTag = false,\n compareWithoutIndicators = false,\n subfieldsMustBeIdentical = true,\n excludeSubfields = [],\n dropSubfields = [],\n copyUnless = [],\n baseValidators = {subfieldValues: false},\n sourceValidators = {subfieldValues: false},\n swapTag = [],\n swapSubfieldCode = [],\n doNotCopyIfFieldPresent = false\n}) => (base, source) => {\n const baseRecord = new MarcRecord(base, baseValidators);\n const sourceRecord = new MarcRecord(source, sourceValidators);\n\n const debug = createDebugLogger('@natlibfi/marc-record-merge');\n const debugOptions = createDebugLogger('@natlibfi/marc-record-merge:compare-options');\n const debugCompare = createDebugLogger('@natlibfi/marc-record-merge:compare');\n debugOptions(`Tag Pattern: ${tagPattern}`);\n debugOptions(`Compare tags only: ${compareTagsOnly}`);\n debugOptions(`Compare without indicators ${compareWithoutIndicators}`);\n debugOptions(`Copy if identical: ${subfieldsMustBeIdentical}`);\n debugOptions(`Exclude subfields: [${excludeSubfields}]`);\n debugOptions(`Drop subfields [${dropSubfields}]`);\n debugOptions(`Copy unless contains subfields: ${JSON.stringify(copyUnless)}`);\n\n const baseFields = baseRecord.get(tagPattern);\n const sourceFields = sourceRecord.get(tagPattern);\n const doNotCopy = doNotCopyIfFieldPresent ? baseRecord.get(doNotCopyIfFieldPresent).length > 0 : false;\n\n if (doNotCopy) {\n return baseRecord.toObject();\n }\n\n debug(`Base fields: `, baseFields);\n debug(`Source fields: `, sourceFields);\n\n // Logic steps\n const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));\n const compareResultFields = compareFields(sourceFields, baseCompareFields);\n const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);\n const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);\n const swappedSubfields = checkSwapSubfieldCodes(droppedUnwantedFields);\n const swappedTags = checkSwapTag(swappedSubfields);\n const uniqueFields = [...new Set(swappedTags.map(field => JSON.stringify(field)))].map(field => JSON.parse(field));\n debug('Fields to be copied');\n debug(JSON.stringify(uniqueFields));\n\n // Add fields to base;\n uniqueFields.forEach(field => baseRecord.insertField(field));\n return baseRecord.toObject();\n\n function compareFields(sourceFields, baseCompareFields, uniqFields = []) {\n const [sourceField, ...rest] = sourceFields;\n if (sourceField === undefined) {\n return uniqFields;\n }\n\n if (baseCompareFields.length === 0) {\n return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);\n }\n\n // Source and base are also compared for identicalness\n // Non-identical fields are copied from source to base as duplicates\n const sourceCompareField = createCompareField(sourceField);\n const unique = checkCompareFields(baseCompareFields, sourceCompareField);\n\n debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);\n\n if (unique) {\n return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);\n }\n\n return compareFields(rest, baseCompareFields, uniqFields);\n\n function checkCompareFields(baseCompareFields, sourceCompareField) {\n let unique = true; // eslint-disable-line functional/no-let\n\n baseCompareFields.forEach(baseCompareField => {\n debugCompare(`Comparing ${JSON.stringify(sourceCompareField)} to ${JSON.stringify(baseCompareField)}}`);\n\n if (sourceCompareField.value !== baseCompareField.value) {\n debugCompare(`Value is different ${sourceCompareField.value} !== ${baseCompareField.value}`);\n return;\n }\n\n if (sourceCompareField.ind1 !== baseCompareField.ind1) {\n debugCompare(`Ind1 is different ${sourceCompareField.ind1} !== ${baseCompareField.ind1}`);\n return;\n }\n\n if (sourceCompareField.ind2 !== baseCompareField.ind2) {\n debugCompare(`Ind2 is different ${sourceCompareField.ind2} !== ${baseCompareField.ind2}`);\n return;\n }\n\n if ('subfields' in sourceCompareField) {\n const allFound = checkSubfields(sourceCompareField.subfields, baseCompareField.subfields);\n debugCompare(`Subfields are different ${!allFound}`);\n if (!allFound) {\n return;\n }\n\n unique = false;\n return;\n }\n\n unique = false;\n return;\n });\n\n return unique;\n }\n\n function checkSubfields(sourceSubfields, baseSubfields) {\n const foundSubs = sourceSubfields.filter(sSub => baseSubfields.some(bSub => sSub.code === bSub.code && sSub.value === bSub.value));\n\n if (subfieldsMustBeIdentical) {\n return foundSubs.length === sourceSubfields.length && foundSubs.length === baseSubfields.length;\n }\n\n return foundSubs.length === sourceSubfields.length;\n }\n }\n\n // compare objects have only fields that matter in comparing\n function createCompareField(field) {\n if (compareTagsOnly) {\n return {tag: field.tag};\n }\n\n if ('value' in field) {\n return {tag: field.tag, value: field.value};\n }\n\n const [filteredField] = checkDropSubfields([field]);\n const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(field.tag));\n const replacementTag = foundRule ? foundRule.to : undefined;\n\n const params = [\n {name: 'tag', value: compareWithoutTag ? replacementTag : field.tag},\n {name: 'ind1', value: compareWithoutIndicators ? undefined : field.ind1},\n {name: 'ind2', value: compareWithoutIndicators ? undefined : field.ind2},\n {name: 'subfields', value: createCompareSubfields(filteredField.subfields)}\n ].map(param => [param.name, param.value]);\n\n return Object.fromEntries(params);\n\n function createCompareSubfields(subfields) {\n const nonExcludedSubfields = subfields.filter(sub => !excludeSubfields.some(code => code === sub.code));\n const normalizedSubfields = nonExcludedSubfields.map(sub => ({code: sub.code, value: normalizeSubfieldValue(sub.value)}));\n\n return normalizedSubfields;\n\n function normalizeSubfieldValue(value) {\n return value.toLowerCase().replace(/\\s+/ug, '');\n }\n }\n }\n\n function checkSwapTag(fields) {\n if (swapTag.length > 0) {\n return fields.map(field => ({...field, tag: swapTagsFunc(field.tag)}));\n }\n\n return fields;\n\n function swapTagsFunc(tag) {\n const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(tag));\n\n if (foundRule === undefined) {\n return tag;\n }\n\n return foundRule.to;\n }\n }\n\n function checkSwapSubfieldCodes(fields) {\n if (swapSubfieldCode.length > 0) {\n return fields.map(field => ({...field, subfields: swapSubfieldCodesFunc(field.subfields)}));\n }\n\n return fields;\n\n function swapSubfieldCodesFunc(subfields) {\n return subfields.map(sub => {\n const [foundRule] = swapSubfieldCode.filter(rule => rule.from === sub.code);\n\n if (foundRule === undefined) {\n return sub;\n }\n\n return {code: foundRule.to, value: sub.value};\n });\n }\n }\n\n function checkDropSubfields(fields) {\n if (dropSubfields.length > 0) {\n return fields.map(field => ({...field, subfields: dropSubfieldsFunc(field.subfields)}))\n .filter(field => field.subfields.length > 0);\n }\n\n return fields;\n\n function dropSubfieldsFunc(subfields) {\n return subfields.filter(sub => { // eslint-disable-line\n return !dropSubfields.some(({code, value = false, condition = false}) => {\n if (code !== sub.code) {\n return false;\n }\n\n if (!condition && value) {\n return value === sub.value;\n }\n\n if (condition === 'unless' && value) {\n return !new RegExp(value, 'u').test(sub.value);\n }\n\n return true;\n });\n });\n }\n }\n\n function checkCopyUnlessFields(fields) {\n if (copyUnless.length > 0) {\n return fields.filter(({subfields}) => copyUnless.some(filter => !subfields.some(sub => sub.code === filter.code && new RegExp(filter.value, 'u').test(sub.value))));\n }\n\n return fields;\n }\n};\n"],"mappings":";;;;;;;AAGA;;AACA;;;;AAJA;;AACA;eAKe,CAAC;EACdA,UADc;EAEdC,eAAe,GAAG,KAFJ;EAGdC,iBAAiB,GAAG,KAHN;EAIdC,wBAAwB,GAAG,KAJb;EAKdC,wBAAwB,GAAG,IALb;EAMdC,gBAAgB,GAAG,EANL;EAOdC,aAAa,GAAG,EAPF;EAQdC,UAAU,GAAG,EARC;EASdC,cAAc,GAAG;IAACC,cAAc,EAAE;EAAjB,CATH;EAUdC,gBAAgB,GAAG;IAACD,cAAc,EAAE;EAAjB,CAVL;EAWdE,OAAO,GAAG,EAXI;EAYdC,gBAAgB,GAAG,EAZL;EAadC,uBAAuB,GAAG;AAbZ,CAAD,KAcT,CAACC,IAAD,EAAOC,MAAP,KAAkB;EACtB,MAAMC,UAAU,GAAG,IAAIC,sBAAJ,CAAeH,IAAf,EAAqBN,cAArB,CAAnB;EACA,MAAMU,YAAY,GAAG,IAAID,sBAAJ,CAAeF,MAAf,EAAuBL,gBAAvB,CAArB;EAEA,MAAMS,KAAK,GAAG,IAAAC,cAAA,EAAkB,6BAAlB,CAAd;EACA,MAAMC,YAAY,GAAG,IAAAD,cAAA,EAAkB,6CAAlB,CAArB;EACA,MAAME,YAAY,GAAG,IAAAF,cAAA,EAAkB,qCAAlB,CAArB;EACAC,YAAY,CAAE,gBAAerB,UAAW,EAA5B,CAAZ;EACAqB,YAAY,CAAE,sBAAqBpB,eAAgB,EAAvC,CAAZ;EACAoB,YAAY,CAAE,8BAA6BlB,wBAAyB,EAAxD,CAAZ;EACAkB,YAAY,CAAE,sBAAqBjB,wBAAyB,EAAhD,CAAZ;EACAiB,YAAY,CAAE,uBAAsBhB,gBAAiB,GAAzC,CAAZ;EACAgB,YAAY,CAAE,mBAAkBf,aAAc,GAAlC,CAAZ;EACAe,YAAY,CAAE,mCAAkCE,IAAI,CAACC,SAAL,CAAejB,UAAf,CAA2B,EAA/D,CAAZ;EAEA,MAAMkB,UAAU,GAAGT,UAAU,CAACU,GAAX,CAAe1B,UAAf,CAAnB;EACA,MAAM2B,YAAY,GAAGT,YAAY,CAACQ,GAAb,CAAiB1B,UAAjB,CAArB;EACA,MAAM4B,SAAS,GAAGf,uBAAuB,GAAGG,UAAU,CAACU,GAAX,CAAeb,uBAAf,EAAwCgB,MAAxC,GAAiD,CAApD,GAAwD,KAAjG;;EAEA,IAAID,SAAJ,EAAe;IACb,OAAOZ,UAAU,CAACc,QAAX,EAAP;EACD;;EAEDX,KAAK,CAAE,eAAF,EAAkBM,UAAlB,CAAL;EACAN,KAAK,CAAE,iBAAF,EAAoBQ,YAApB,CAAL,CAxBsB,CA0BtB;;EACA,MAAMI,iBAAiB,GAAGN,UAAU,CAACO,GAAX,CAAeC,SAAS,IAAIC,kBAAkB,CAACD,SAAD,CAA9C,CAA1B;EACA,MAAME,mBAAmB,GAAGC,aAAa,CAACT,YAAD,EAAeI,iBAAf,CAAzC;EACA,MAAMM,uBAAuB,GAAGC,kBAAkB,CAACH,mBAAD,CAAlD;EACA,MAAMI,qBAAqB,GAAGC,qBAAqB,CAACH,uBAAD,CAAnD;EACA,MAAMI,gBAAgB,GAAGC,sBAAsB,CAACH,qBAAD,CAA/C;EACA,MAAMI,WAAW,GAAGC,YAAY,CAACH,gBAAD,CAAhC;EACA,MAAMI,YAAY,GAAG,CAAC,GAAG,IAAIC,GAAJ,CAAQH,WAAW,CAACX,GAAZ,CAAgBe,KAAK,IAAIxB,IAAI,CAACC,SAAL,CAAeuB,KAAf,CAAzB,CAAR,CAAJ,EAA8Df,GAA9D,CAAkEe,KAAK,IAAIxB,IAAI,CAACyB,KAAL,CAAWD,KAAX,CAA3E,CAArB;EACA5B,KAAK,CAAC,qBAAD,CAAL;EACAA,KAAK,CAACI,IAAI,CAACC,SAAL,CAAeqB,YAAf,CAAD,CAAL,CAnCsB,CAqCtB;;EACAA,YAAY,CAACI,OAAb,CAAqBF,KAAK,IAAI/B,UAAU,CAACkC,WAAX,CAAuBH,KAAvB,CAA9B;EACA,OAAO/B,UAAU,CAACc,QAAX,EAAP;;EAEA,SAASM,aAAT,CAAuBT,YAAvB,EAAqCI,iBAArC,EAAwDoB,UAAU,GAAG,EAArE,EAAyE;IACvE,MAAM,CAACC,WAAD,EAAc,GAAGC,IAAjB,IAAyB1B,YAA/B;;IACA,IAAIyB,WAAW,KAAKE,SAApB,EAA+B;MAC7B,OAAOH,UAAP;IACD;;IAED,IAAIpB,iBAAiB,CAACF,MAAlB,KAA6B,CAAjC,EAAoC;MAClC,OAAOO,aAAa,CAACiB,IAAD,EAAOtB,iBAAP,EAA0B,CAAC,GAAGoB,UAAJ,EAAgBC,WAAhB,CAA1B,CAApB;IACD,CARsE,CAUvE;IACA;;;IACA,MAAMG,kBAAkB,GAAGrB,kBAAkB,CAACkB,WAAD,CAA7C;IACA,MAAMI,MAAM,GAAGC,kBAAkB,CAAC1B,iBAAD,EAAoBwB,kBAApB,CAAjC;IAEAjC,YAAY,CAAE,GAAEC,IAAI,CAACC,SAAL,CAAe4B,WAAf,CAA4B,IAAGI,MAAM,GAAG,WAAH,GAAiB,YAAa,EAAvE,CAAZ;;IAEA,IAAIA,MAAJ,EAAY;MACV,OAAOpB,aAAa,CAACiB,IAAD,EAAOtB,iBAAP,EAA0B,CAAC,GAAGoB,UAAJ,EAAgBC,WAAhB,CAA1B,CAApB;IACD;;IAED,OAAOhB,aAAa,CAACiB,IAAD,EAAOtB,iBAAP,EAA0BoB,UAA1B,CAApB;;IAEA,SAASM,kBAAT,CAA4B1B,iBAA5B,EAA+CwB,kBAA/C,EAAmE;MACjE,IAAIC,MAAM,GAAG,IAAb,CADiE,CAC9C;;MAEnBzB,iBAAiB,CAACkB,OAAlB,CAA0BS,gBAAgB,IAAI;QAC5CpC,YAAY,CAAE,aAAYC,IAAI,CAACC,SAAL,CAAe+B,kBAAf,CAAmC,OAAMhC,IAAI,CAACC,SAAL,CAAekC,gBAAf,CAAiC,GAAxF,CAAZ;;QAEA,IAAIH,kBAAkB,CAACI,KAAnB,KAA6BD,gBAAgB,CAACC,KAAlD,EAAyD;UACvDrC,YAAY,CAAE,sBAAqBiC,kBAAkB,CAACI,KAAM,QAAOD,gBAAgB,CAACC,KAAM,EAA9E,CAAZ;UACA;QACD;;QAED,IAAIJ,kBAAkB,CAACK,IAAnB,KAA4BF,gBAAgB,CAACE,IAAjD,EAAuD;UACrDtC,YAAY,CAAE,qBAAoBiC,kBAAkB,CAACK,IAAK,QAAOF,gBAAgB,CAACE,IAAK,EAA3E,CAAZ;UACA;QACD;;QAED,IAAIL,kBAAkB,CAACM,IAAnB,KAA4BH,gBAAgB,CAACG,IAAjD,EAAuD;UACrDvC,YAAY,CAAE,qBAAoBiC,kBAAkB,CAACM,IAAK,QAAOH,gBAAgB,CAACG,IAAK,EAA3E,CAAZ;UACA;QACD;;QAED,IAAI,eAAeN,kBAAnB,EAAuC;UACrC,MAAMO,QAAQ,GAAGC,cAAc,CAACR,kBAAkB,CAACS,SAApB,EAA+BN,gBAAgB,CAACM,SAAhD,CAA/B;UACA1C,YAAY,CAAE,2BAA0B,CAACwC,QAAS,EAAtC,CAAZ;;UACA,IAAI,CAACA,QAAL,EAAe;YACb;UACD;;UAEDN,MAAM,GAAG,KAAT;UACA;QACD;;QAEDA,MAAM,GAAG,KAAT;QACA;MACD,CA/BD;MAiCA,OAAOA,MAAP;IACD;;IAED,SAASO,cAAT,CAAwBE,eAAxB,EAAyCC,aAAzC,EAAwD;MACtD,MAAMC,SAAS,GAAGF,eAAe,CAACG,MAAhB,CAAuBC,IAAI,IAAIH,aAAa,CAACI,IAAd,CAAmBC,IAAI,IAAIF,IAAI,CAACG,IAAL,KAAcD,IAAI,CAACC,IAAnB,IAA2BH,IAAI,CAACV,KAAL,KAAeY,IAAI,CAACZ,KAA1E,CAA/B,CAAlB;;MAEA,IAAIvD,wBAAJ,EAA8B;QAC5B,OAAO+D,SAAS,CAACtC,MAAV,KAAqBoC,eAAe,CAACpC,MAArC,IAA+CsC,SAAS,CAACtC,MAAV,KAAqBqC,aAAa,CAACrC,MAAzF;MACD;;MAED,OAAOsC,SAAS,CAACtC,MAAV,KAAqBoC,eAAe,CAACpC,MAA5C;IACD;EACF,CAhHqB,CAkHtB;;;EACA,SAASK,kBAAT,CAA4Ba,KAA5B,EAAmC;IACjC,IAAI9C,eAAJ,EAAqB;MACnB,OAAO;QAACwE,GAAG,EAAE1B,KAAK,CAAC0B;MAAZ,CAAP;IACD;;IAED,IAAI,WAAW1B,KAAf,EAAsB;MACpB,OAAO;QAAC0B,GAAG,EAAE1B,KAAK,CAAC0B,GAAZ;QAAiBd,KAAK,EAAEZ,KAAK,CAACY;MAA9B,CAAP;IACD;;IAED,MAAM,CAACe,aAAD,IAAkBpC,kBAAkB,CAAC,CAACS,KAAD,CAAD,CAA1C;IACA,MAAM,CAAC4B,SAAD,IAAchE,OAAO,CAACyD,MAAR,CAAeQ,IAAI,IAAI,IAAIC,MAAJ,CAAWD,IAAI,CAACE,IAAhB,EAAsB,GAAtB,EAA2BC,IAA3B,CAAgChC,KAAK,CAAC0B,GAAtC,CAAvB,CAApB;IACA,MAAMO,cAAc,GAAGL,SAAS,GAAGA,SAAS,CAACM,EAAb,GAAkB3B,SAAlD;IAEA,MAAM4B,MAAM,GAAG,CACb;MAACC,IAAI,EAAE,KAAP;MAAcxB,KAAK,EAAEzD,iBAAiB,GAAG8E,cAAH,GAAoBjC,KAAK,CAAC0B;IAAhE,CADa,EAEb;MAACU,IAAI,EAAE,MAAP;MAAexB,KAAK,EAAExD,wBAAwB,GAAGmD,SAAH,GAAeP,KAAK,CAACa;IAAnE,CAFa,EAGb;MAACuB,IAAI,EAAE,MAAP;MAAexB,KAAK,EAAExD,wBAAwB,GAAGmD,SAAH,GAAeP,KAAK,CAACc;IAAnE,CAHa,EAIb;MAACsB,IAAI,EAAE,WAAP;MAAoBxB,KAAK,EAAEyB,sBAAsB,CAACV,aAAa,CAACV,SAAf;IAAjD,CAJa,EAKbhC,GALa,CAKTqD,KAAK,IAAI,CAACA,KAAK,CAACF,IAAP,EAAaE,KAAK,CAAC1B,KAAnB,CALA,CAAf;IAOA,OAAO2B,MAAM,CAACC,WAAP,CAAmBL,MAAnB,CAAP;;IAEA,SAASE,sBAAT,CAAgCpB,SAAhC,EAA2C;MACzC,MAAMwB,oBAAoB,GAAGxB,SAAS,CAACI,MAAV,CAAiBqB,GAAG,IAAI,CAACpF,gBAAgB,CAACiE,IAAjB,CAAsBE,IAAI,IAAIA,IAAI,KAAKiB,GAAG,CAACjB,IAA3C,CAAzB,CAA7B;MACA,MAAMkB,mBAAmB,GAAGF,oBAAoB,CAACxD,GAArB,CAAyByD,GAAG,KAAK;QAACjB,IAAI,EAAEiB,GAAG,CAACjB,IAAX;QAAiBb,KAAK,EAAEgC,sBAAsB,CAACF,GAAG,CAAC9B,KAAL;MAA9C,CAAL,CAA5B,CAA5B;MAEA,OAAO+B,mBAAP;;MAEA,SAASC,sBAAT,CAAgChC,KAAhC,EAAuC;QACrC,OAAOA,KAAK,CAACiC,WAAN,GAAoBC,OAApB,CAA4B,OAA5B,EAAqC,EAArC,CAAP;MACD;IACF;EACF;;EAED,SAASjD,YAAT,CAAsBkD,MAAtB,EAA8B;IAC5B,IAAInF,OAAO,CAACkB,MAAR,GAAiB,CAArB,EAAwB;MACtB,OAAOiE,MAAM,CAAC9D,GAAP,CAAWe,KAAK,KAAK,EAAC,GAAGA,KAAJ;QAAW0B,GAAG,EAAEsB,YAAY,CAAChD,KAAK,CAAC0B,GAAP;MAA5B,CAAL,CAAhB,CAAP;IACD;;IAED,OAAOqB,MAAP;;IAEA,SAASC,YAAT,CAAsBtB,GAAtB,EAA2B;MACzB,MAAM,CAACE,SAAD,IAAchE,OAAO,CAACyD,MAAR,CAAeQ,IAAI,IAAI,IAAIC,MAAJ,CAAWD,IAAI,CAACE,IAAhB,EAAsB,GAAtB,EAA2BC,IAA3B,CAAgCN,GAAhC,CAAvB,CAApB;;MAEA,IAAIE,SAAS,KAAKrB,SAAlB,EAA6B;QAC3B,OAAOmB,GAAP;MACD;;MAED,OAAOE,SAAS,CAACM,EAAjB;IACD;EACF;;EAED,SAASvC,sBAAT,CAAgCoD,MAAhC,EAAwC;IACtC,IAAIlF,gBAAgB,CAACiB,MAAjB,GAA0B,CAA9B,EAAiC;MAC/B,OAAOiE,MAAM,CAAC9D,GAAP,CAAWe,KAAK,KAAK,EAAC,GAAGA,KAAJ;QAAWiB,SAAS,EAAEgC,qBAAqB,CAACjD,KAAK,CAACiB,SAAP;MAA3C,CAAL,CAAhB,CAAP;IACD;;IAED,OAAO8B,MAAP;;IAEA,SAASE,qBAAT,CAA+BhC,SAA/B,EAA0C;MACxC,OAAOA,SAAS,CAAChC,GAAV,CAAcyD,GAAG,IAAI;QAC1B,MAAM,CAACd,SAAD,IAAc/D,gBAAgB,CAACwD,MAAjB,CAAwBQ,IAAI,IAAIA,IAAI,CAACE,IAAL,KAAcW,GAAG,CAACjB,IAAlD,CAApB;;QAEA,IAAIG,SAAS,KAAKrB,SAAlB,EAA6B;UAC3B,OAAOmC,GAAP;QACD;;QAED,OAAO;UAACjB,IAAI,EAAEG,SAAS,CAACM,EAAjB;UAAqBtB,KAAK,EAAE8B,GAAG,CAAC9B;QAAhC,CAAP;MACD,CARM,CAAP;IASD;EACF;;EAED,SAASrB,kBAAT,CAA4BwD,MAA5B,EAAoC;IAClC,IAAIxF,aAAa,CAACuB,MAAd,GAAuB,CAA3B,EAA8B;MAC5B,OAAOiE,MAAM,CAAC9D,GAAP,CAAWe,KAAK,KAAK,EAAC,GAAGA,KAAJ;QAAWiB,SAAS,EAAEiC,iBAAiB,CAAClD,KAAK,CAACiB,SAAP;MAAvC,CAAL,CAAhB,EACJI,MADI,CACGrB,KAAK,IAAIA,KAAK,CAACiB,SAAN,CAAgBnC,MAAhB,GAAyB,CADrC,CAAP;IAED;;IAED,OAAOiE,MAAP;;IAEA,SAASG,iBAAT,CAA2BjC,SAA3B,EAAsC;MACpC,OAAOA,SAAS,CAACI,MAAV,CAAiBqB,GAAG,IAAI;QAAE;QAC/B,OAAO,CAACnF,aAAa,CAACgE,IAAd,CAAmB,CAAC;UAACE,IAAD;UAAOb,KAAK,GAAG,KAAf;UAAsBuC,SAAS,GAAG;QAAlC,CAAD,KAA8C;UACvE,IAAI1B,IAAI,KAAKiB,GAAG,CAACjB,IAAjB,EAAuB;YACrB,OAAO,KAAP;UACD;;UAED,IAAI,CAAC0B,SAAD,IAAcvC,KAAlB,EAAyB;YACvB,OAAOA,KAAK,KAAK8B,GAAG,CAAC9B,KAArB;UACD;;UAED,IAAIuC,SAAS,KAAK,QAAd,IAA0BvC,KAA9B,EAAqC;YACnC,OAAO,CAAC,IAAIkB,MAAJ,CAAWlB,KAAX,EAAkB,GAAlB,EAAuBoB,IAAvB,CAA4BU,GAAG,CAAC9B,KAAhC,CAAR;UACD;;UAED,OAAO,IAAP;QACD,CAdO,CAAR;MAeD,CAhBM,CAAP;IAiBD;EACF;;EAED,SAASnB,qBAAT,CAA+BsD,MAA/B,EAAuC;IACrC,IAAIvF,UAAU,CAACsB,MAAX,GAAoB,CAAxB,EAA2B;MACzB,OAAOiE,MAAM,CAAC1B,MAAP,CAAc,CAAC;QAACJ;MAAD,CAAD,KAAiBzD,UAAU,CAAC+D,IAAX,CAAgBF,MAAM,IAAI,CAACJ,SAAS,CAACM,IAAV,CAAemB,GAAG,IAAIA,GAAG,CAACjB,IAAJ,KAAaJ,MAAM,CAACI,IAApB,IAA4B,IAAIK,MAAJ,CAAWT,MAAM,CAACT,KAAlB,EAAyB,GAAzB,EAA8BoB,IAA9B,CAAmCU,GAAG,CAAC9B,KAAvC,CAAlD,CAA3B,CAA/B,CAAP;IACD;;IAED,OAAOmC,MAAP;EACD;AACF,C"}
@@ -4,8 +4,6 @@ var _chai = require("chai");
4
4
 
5
5
  var _fixura = require("@natlibfi/fixura");
6
6
 
7
- var _marcRecord = require("@natlibfi/marc-record");
8
-
9
7
  var _copy = _interopRequireDefault(require("./copy"));
10
8
 
11
9
  var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
@@ -29,6 +27,7 @@ function callback({
29
27
  getFixture,
30
28
  tagPatternRegExp,
31
29
  compareTagsOnly = false,
30
+ compareWithoutTag = false,
32
31
  compareWithoutIndicators = false,
33
32
  subfieldsMustBeIdentical = false,
34
33
  copyUnless = undefined,
@@ -38,17 +37,14 @@ function callback({
38
37
  swapTag = [],
39
38
  doNotCopyIfFieldPresent = false
40
39
  }) {
41
- const base = new _marcRecord.MarcRecord(getFixture('base.json'), {
42
- subfieldValues: false
43
- });
44
- const source = new _marcRecord.MarcRecord(getFixture('source.json'), {
45
- subfieldValues: false
46
- });
40
+ const base = getFixture('base.json');
41
+ const source = getFixture('source.json');
47
42
  const tagPattern = new RegExp(tagPatternRegExp, 'u');
48
43
  const expectedRecord = getFixture('merged.json');
49
- const mergedRecord = (0, _copy.default)({
44
+ const merged = (0, _copy.default)({
50
45
  tagPattern,
51
46
  compareTagsOnly,
47
+ compareWithoutTag,
52
48
  compareWithoutIndicators,
53
49
  copyUnless,
54
50
  subfieldsMustBeIdentical,
@@ -62,6 +58,8 @@ function callback({
62
58
  //debug(`*** expectedRecord: `, expectedRecord); //<--
63
59
  //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
64
60
 
65
- (0, _chai.expect)(mergedRecord).to.eql(expectedRecord);
61
+ (0, _chai.expect)(merged.constructor.name).not.to.eql('MarcRecord');
62
+ (0, _chai.expect)(merged.constructor.name).to.eql('Object');
63
+ (0, _chai.expect)(merged).to.eql(expectedRecord);
66
64
  }
67
65
  //# sourceMappingURL=copy.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy.spec.js","names":["generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","failWhenNotFound","getFixture","tagPatternRegExp","compareTagsOnly","compareWithoutIndicators","subfieldsMustBeIdentical","copyUnless","undefined","excludeSubfields","dropSubfields","swapSubfieldCode","swapTag","doNotCopyIfFieldPresent","base","MarcRecord","subfieldValues","source","tagPattern","RegExp","expectedRecord","mergedRecord","createReducer","expect","to","eql"],"sources":["../../src/reducers/copy.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {READERS} from '@natlibfi/fixura';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport createReducer from './copy';\nimport generateTests from '@natlibfi/fixugen';\n\n//import createDebugLogger from 'debug'; // <---\n//const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---\n\ngenerateTests({\n callback,\n path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'copy'],\n useMetadataFile: true,\n recurse: true,\n fixura: {\n reader: READERS.JSON,\n failWhenNotFound: false\n }\n});\n\nfunction callback({\n getFixture,\n tagPatternRegExp,\n compareTagsOnly = false,\n compareWithoutIndicators = false,\n subfieldsMustBeIdentical = false,\n copyUnless = undefined,\n excludeSubfields = undefined,\n dropSubfields = undefined,\n swapSubfieldCode = [],\n swapTag = [],\n doNotCopyIfFieldPresent = false\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\n const mergedRecord = createReducer({\n tagPattern, compareTagsOnly, compareWithoutIndicators,\n copyUnless, subfieldsMustBeIdentical, excludeSubfields,\n dropSubfields, swapSubfieldCode, swapTag,\n doNotCopyIfFieldPresent\n })(base, source);\n //debug(`*** mergedRecord: `, mergedRecord); //<--\n //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--\n //debug(`*** expectedRecord: `, expectedRecord); //<--\n //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--\n expect(mergedRecord).to.eql(expectedRecord);\n}\n"],"mappings":";;AAAA;;AACA;;AACA;;AACA;;AACA;;;;AAEA;AACA;AAEA,IAAAA,gBAAA,EAAc;EACZC,QADY;EAEZC,IAAI,EAAE,CAACC,SAAD,EAAY,IAAZ,EAAkB,IAAlB,EAAwB,eAAxB,EAAyC,UAAzC,EAAqD,MAArD,CAFM;EAGZC,eAAe,EAAE,IAHL;EAIZC,OAAO,EAAE,IAJG;EAKZC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAA,CAAQC,IADV;IAENC,gBAAgB,EAAE;EAFZ;AALI,CAAd;;AAWA,SAAST,QAAT,CAAkB;EAChBU,UADgB;EAEhBC,gBAFgB;EAGhBC,eAAe,GAAG,KAHF;EAIhBC,wBAAwB,GAAG,KAJX;EAKhBC,wBAAwB,GAAG,KALX;EAMhBC,UAAU,GAAGC,SANG;EAOhBC,gBAAgB,GAAGD,SAPH;EAQhBE,aAAa,GAAGF,SARA;EAShBG,gBAAgB,GAAG,EATH;EAUhBC,OAAO,GAAG,EAVM;EAWhBC,uBAAuB,GAAG;AAXV,CAAlB,EAYG;EACD,MAAMC,IAAI,GAAG,IAAIC,sBAAJ,CAAeb,UAAU,CAAC,WAAD,CAAzB,EAAwC;IAACc,cAAc,EAAE;EAAjB,CAAxC,CAAb;EACA,MAAMC,MAAM,GAAG,IAAIF,sBAAJ,CAAeb,UAAU,CAAC,aAAD,CAAzB,EAA0C;IAACc,cAAc,EAAE;EAAjB,CAA1C,CAAf;EACA,MAAME,UAAU,GAAG,IAAIC,MAAJ,CAAWhB,gBAAX,EAA6B,GAA7B,CAAnB;EACA,MAAMiB,cAAc,GAAGlB,UAAU,CAAC,aAAD,CAAjC;EAEA,MAAMmB,YAAY,GAAG,IAAAC,aAAA,EAAc;IACjCJ,UADiC;IACrBd,eADqB;IACJC,wBADI;IAEjCE,UAFiC;IAErBD,wBAFqB;IAEKG,gBAFL;IAGjCC,aAHiC;IAGlBC,gBAHkB;IAGAC,OAHA;IAIjCC;EAJiC,CAAd,EAKlBC,IALkB,EAKZG,MALY,CAArB,CANC,CAYD;EACA;EACA;EACA;;EACA,IAAAM,YAAA,EAAOF,YAAP,EAAqBG,EAArB,CAAwBC,GAAxB,CAA4BL,cAA5B;AACD"}
1
+ {"version":3,"file":"copy.spec.js","names":["generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","failWhenNotFound","getFixture","tagPatternRegExp","compareTagsOnly","compareWithoutTag","compareWithoutIndicators","subfieldsMustBeIdentical","copyUnless","undefined","excludeSubfields","dropSubfields","swapSubfieldCode","swapTag","doNotCopyIfFieldPresent","base","source","tagPattern","RegExp","expectedRecord","merged","createReducer","expect","constructor","name","not","to","eql"],"sources":["../../src/reducers/copy.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {READERS} from '@natlibfi/fixura';\nimport createReducer from './copy';\nimport generateTests from '@natlibfi/fixugen';\n\n//import createDebugLogger from 'debug'; // <---\n//const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---\n\ngenerateTests({\n callback,\n path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'copy'],\n useMetadataFile: true,\n recurse: true,\n fixura: {\n reader: READERS.JSON,\n failWhenNotFound: false\n }\n});\n\nfunction callback({\n getFixture,\n tagPatternRegExp,\n compareTagsOnly = false,\n compareWithoutTag = false,\n compareWithoutIndicators = false,\n subfieldsMustBeIdentical = false,\n copyUnless = undefined,\n excludeSubfields = undefined,\n dropSubfields = undefined,\n swapSubfieldCode = [],\n swapTag = [],\n doNotCopyIfFieldPresent = false\n}) {\n const base = getFixture('base.json');\n const source = getFixture('source.json');\n const tagPattern = new RegExp(tagPatternRegExp, 'u');\n const expectedRecord = getFixture('merged.json');\n\n const merged = createReducer({\n tagPattern, compareTagsOnly, compareWithoutTag, compareWithoutIndicators,\n copyUnless, subfieldsMustBeIdentical, excludeSubfields,\n dropSubfields, swapSubfieldCode, swapTag,\n doNotCopyIfFieldPresent\n })(base, source);\n //debug(`*** mergedRecord: `, mergedRecord); //<--\n //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--\n //debug(`*** expectedRecord: `, expectedRecord); //<--\n //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--\n expect(merged.constructor.name).not.to.eql('MarcRecord');\n expect(merged.constructor.name).to.eql('Object');\n expect(merged).to.eql(expectedRecord);\n}\n"],"mappings":";;AAAA;;AACA;;AACA;;AACA;;;;AAEA;AACA;AAEA,IAAAA,gBAAA,EAAc;EACZC,QADY;EAEZC,IAAI,EAAE,CAACC,SAAD,EAAY,IAAZ,EAAkB,IAAlB,EAAwB,eAAxB,EAAyC,UAAzC,EAAqD,MAArD,CAFM;EAGZC,eAAe,EAAE,IAHL;EAIZC,OAAO,EAAE,IAJG;EAKZC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAA,CAAQC,IADV;IAENC,gBAAgB,EAAE;EAFZ;AALI,CAAd;;AAWA,SAAST,QAAT,CAAkB;EAChBU,UADgB;EAEhBC,gBAFgB;EAGhBC,eAAe,GAAG,KAHF;EAIhBC,iBAAiB,GAAG,KAJJ;EAKhBC,wBAAwB,GAAG,KALX;EAMhBC,wBAAwB,GAAG,KANX;EAOhBC,UAAU,GAAGC,SAPG;EAQhBC,gBAAgB,GAAGD,SARH;EAShBE,aAAa,GAAGF,SATA;EAUhBG,gBAAgB,GAAG,EAVH;EAWhBC,OAAO,GAAG,EAXM;EAYhBC,uBAAuB,GAAG;AAZV,CAAlB,EAaG;EACD,MAAMC,IAAI,GAAGb,UAAU,CAAC,WAAD,CAAvB;EACA,MAAMc,MAAM,GAAGd,UAAU,CAAC,aAAD,CAAzB;EACA,MAAMe,UAAU,GAAG,IAAIC,MAAJ,CAAWf,gBAAX,EAA6B,GAA7B,CAAnB;EACA,MAAMgB,cAAc,GAAGjB,UAAU,CAAC,aAAD,CAAjC;EAEA,MAAMkB,MAAM,GAAG,IAAAC,aAAA,EAAc;IAC3BJ,UAD2B;IACfb,eADe;IACEC,iBADF;IACqBC,wBADrB;IAE3BE,UAF2B;IAEfD,wBAFe;IAEWG,gBAFX;IAG3BC,aAH2B;IAGZC,gBAHY;IAGMC,OAHN;IAI3BC;EAJ2B,CAAd,EAKZC,IALY,EAKNC,MALM,CAAf,CANC,CAYD;EACA;EACA;EACA;;EACA,IAAAM,YAAA,EAAOF,MAAM,CAACG,WAAP,CAAmBC,IAA1B,EAAgCC,GAAhC,CAAoCC,EAApC,CAAuCC,GAAvC,CAA2C,YAA3C;EACA,IAAAL,YAAA,EAAOF,MAAM,CAACG,WAAP,CAAmBC,IAA1B,EAAgCE,EAAhC,CAAmCC,GAAnC,CAAuC,QAAvC;EACA,IAAAL,YAAA,EAAOF,MAAP,EAAeM,EAAf,CAAkBC,GAAlB,CAAsBR,cAAtB;AACD"}
@@ -42,14 +42,12 @@ function callback({
42
42
  console.log('TEST DISABLED!'); // eslint-disable-line no-console
43
43
 
44
44
  return;
45
- }
45
+ } // const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
46
+ // const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
47
+
46
48
 
47
- const base = new _marcRecord.MarcRecord(getFixture('base.json'), {
48
- subfieldValues: false
49
- });
50
- const source = new _marcRecord.MarcRecord(getFixture('source.json'), {
51
- subfieldValues: false
52
- });
49
+ const base = getFixture('base.json');
50
+ const source = getFixture('source.json');
53
51
  const tagPattern = new RegExp(tagPatternRegExp, 'u');
54
52
  const expectedRecord = getFixture('merged.json');
55
53
  const equalityFunction = useSubsetEquality ? _select.subsetEquality : undefined; // Bypass expected error in testing
@@ -63,6 +61,6 @@ function callback({
63
61
  tagPattern,
64
62
  equalityFunction
65
63
  })(base, source);
66
- (0, _chai.expect)(mergedRecord.toObject()).to.eql(expectedRecord);
64
+ (0, _chai.expect)(mergedRecord).to.eql(expectedRecord);
67
65
  }
68
66
  //# sourceMappingURL=select.spec.js.map
@@ -1 +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","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"}
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"}
package/package.json CHANGED
@@ -14,7 +14,7 @@
14
14
  "url": "git@github.com:natlibfi/marc-record-merge-js.git"
15
15
  },
16
16
  "license": "MIT",
17
- "version": "6.0.0-beta.6",
17
+ "version": "6.0.0-beta.9",
18
18
  "main": "./dist/index.js",
19
19
  "engines": {
20
20
  "node": ">=14"
@@ -45,16 +45,16 @@
45
45
  },
46
46
  "devDependencies": {
47
47
  "@babel/cli": "^7.17.10",
48
- "@babel/core": "^7.18.0",
49
- "@babel/eslint-parser": "^7.17.0",
50
- "@babel/preset-env": "^7.18.0",
48
+ "@babel/core": "^7.18.5",
49
+ "@babel/eslint-parser": "^7.18.2",
50
+ "@babel/preset-env": "^7.18.2",
51
51
  "@babel/register": "^7.17.7",
52
52
  "@natlibfi/eslint-config-melinda-backend": "^2.0.0",
53
53
  "babel-plugin-istanbul": "^6.1.1",
54
54
  "babel-plugin-rewire": "^1.2.0",
55
- "chai": "^4.3.4",
55
+ "chai": "^4.3.6",
56
56
  "cross-env": "^7.0.3",
57
- "eslint": "^8.16.0",
57
+ "eslint": "^8.17.0",
58
58
  "mocha": "^10.0.0",
59
59
  "nodemon": "^2.0.16",
60
60
  "nyc": "^15.1.0"
@@ -7,6 +7,7 @@ import createDebugLogger from 'debug';
7
7
  export default ({
8
8
  tagPattern,
9
9
  compareTagsOnly = false,
10
+ compareWithoutTag = false,
10
11
  compareWithoutIndicators = false,
11
12
  subfieldsMustBeIdentical = true,
12
13
  excludeSubfields = [],
@@ -43,19 +44,20 @@ export default ({
43
44
  debug(`Base fields: `, baseFields);
44
45
  debug(`Source fields: `, sourceFields);
45
46
 
47
+ // Logic steps
46
48
  const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
47
49
  const compareResultFields = compareFields(sourceFields, baseCompareFields);
48
50
  const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);
49
51
  const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);
50
52
  const swappedSubfields = checkSwapSubfieldCodes(droppedUnwantedFields);
51
53
  const swappedTags = checkSwapTag(swappedSubfields);
54
+ const uniqueFields = [...new Set(swappedTags.map(field => JSON.stringify(field)))].map(field => JSON.parse(field));
52
55
  debug('Fields to be copied');
53
- debug(JSON.stringify(swappedTags));
56
+ debug(JSON.stringify(uniqueFields));
54
57
 
55
58
  // Add fields to base;
56
- swappedTags.forEach(field => baseRecord.insertField(field));
59
+ uniqueFields.forEach(field => baseRecord.insertField(field));
57
60
  return baseRecord.toObject();
58
- //return copyFields(baseFields, sourceFields);
59
61
 
60
62
  function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
61
63
  const [sourceField, ...rest] = sourceFields;
@@ -130,6 +132,7 @@ export default ({
130
132
  }
131
133
  }
132
134
 
135
+ // compare objects have only fields that matter in comparing
133
136
  function createCompareField(field) {
134
137
  if (compareTagsOnly) {
135
138
  return {tag: field.tag};
@@ -140,9 +143,11 @@ export default ({
140
143
  }
141
144
 
142
145
  const [filteredField] = checkDropSubfields([field]);
146
+ const [foundRule] = swapTag.filter(rule => new RegExp(rule.from, 'u').test(field.tag));
147
+ const replacementTag = foundRule ? foundRule.to : undefined;
143
148
 
144
149
  const params = [
145
- {name: 'tag', value: field.tag},
150
+ {name: 'tag', value: compareWithoutTag ? replacementTag : field.tag},
146
151
  {name: 'ind1', value: compareWithoutIndicators ? undefined : field.ind1},
147
152
  {name: 'ind2', value: compareWithoutIndicators ? undefined : field.ind2},
148
153
  {name: 'subfields', value: createCompareSubfields(filteredField.subfields)}
@@ -237,95 +242,3 @@ export default ({
237
242
  return fields;
238
243
  }
239
244
  };
240
-
241
- // function copyFields() { //eslint-disable-line no-unused-vars
242
- // const sourceTags = sourceFields.map(field => field.tag);
243
- // sourceTags.forEach(tag => debug(`Comparing field ${tag}`));
244
-
245
- // /*
246
- // if (combine.length > 0) {
247
- // debug(`*** NOW Copy options: ${tagPattern}, ${compareTagsOnly}, ${compareWithoutIndicators}, ${subfieldsMustBeIdentical}, [${combine}], [${excludeSubfields}], [${dropSubfields}]`);
248
- // combine.forEach(row => debug(` ### combine ${row} <- `));
249
- // return [];
250
- // }
251
- // */
252
-
253
- // // If compareTagsOnly = true, only this part is run
254
- // // The field is copied from source only if it is missing completely from base
255
- // if (compareTagsOnly && baseFields.length === 0) {
256
- // sourceTags.forEach(tag => debug(`Missing field ${tag} copied from source to base`));
257
- // sourceFields.forEach(f => base.insertField(f));
258
- // return true;
259
- // }
260
-
261
- // // If compareTagsOnly = false (default)
262
- // // Source and base are also compared for identicalness
263
- // // Non-identical fields are copied from source to base as duplicates
264
- // if (!compareTagsOnly) {
265
- // const filterMissing = function (sourceField) {
266
- // if ('value' in sourceField) {
267
- // debug(`Checking control field ${sourceField.tag} for identicalness`);
268
- // return baseFields.some(isIdenticalControlField) === false;
269
- // }
270
- // if ('subfields' in sourceField) {
271
- // debug(`Checking data field ${sourceField.tag} for identicalness`);
272
- // return baseFields.some(isIdenticalDataField) === false;
273
- // }
274
-
275
- // function normalizeControlField(field) {
276
- // return field.value.toLowerCase().replace(/\s+/u, '');
277
- // }
278
-
279
- // function isIdenticalControlField(baseField) {
280
- // const normalizedBaseField = normalizeControlField(baseField);
281
- // const normalizedSourceField = normalizeControlField(sourceField);
282
- // return normalizedSourceField === normalizedBaseField;
283
- // }
284
-
285
- // function isIdenticalDataField(baseField) {
286
- // // If excluded subfields have been defined for this field, they must be ignored first
287
- // // (i.e. source and base fields are considered identical if all non-excluded subfields are identical)
288
- // if (excludeSubfields.length > 0 &&
289
- // sourceField.tag === baseField.tag &&
290
- // sourceField.ind1 === baseField.ind1 &&
291
- // sourceField.ind2 === baseField.ind2) {
292
- // excludeSubfields.forEach(sub => debug(`Subfield ${sub} excluded from identicalness comparison`));
293
- // // Compare only those subfields that are not excluded
294
- // const baseSubsToCompare = baseField.subfields.filter(subfield => excludeSubfields.indexOf(subfield.code) === -1);
295
- // return baseSubsToCompare.every(isIdenticalSubfield);
296
- // }
297
- // // If there are no excluded subfields (default case)
298
- // if (sourceField.tag === baseField.tag &&
299
- // sourceField.ind1 === baseField.ind1 &&
300
- // sourceField.ind2 === baseField.ind2 &&
301
- // sourceField.subfields.length === baseField.subfields.length) {
302
- // return baseField.subfields.every(isIdenticalSubfield);
303
- // }
304
- // function normalizeSubfield(subfield) {
305
- // return subfield.value.toLowerCase().replace(/\s+/u, '');
306
- // }
307
- // function isIdenticalSubfield(baseSub) {
308
- // const normBaseSub = normalizeSubfield(baseSub);
309
- // return sourceField.subfields.some(sourceSub => {
310
- // const normSourceSub = normalizeSubfield(sourceSub);
311
- // return normSourceSub === normBaseSub;
312
- // });
313
- // }
314
- // }
315
- // };
316
- // // Search for fields missing from base
317
- // const missingFields = sourceFields.filter(filterMissing);
318
- // missingFields.forEach(f => base.insertField(f));
319
- // if (missingFields.length > 0) {
320
- // const missingTags = missingFields.map(field => field.tag);
321
- // missingTags.forEach(tag => debug(`Field ${tag} copied from source to base`));
322
- // return base;
323
- // }
324
- // if (missingFields.length === 0) {
325
- // debug(`No missing fields found`);
326
- // return base;
327
- // }
328
- // }
329
- // debug(`No missing fields found`);
330
- // return base;
331
- // }
@@ -1,6 +1,5 @@
1
1
  import {expect} from 'chai';
2
2
  import {READERS} from '@natlibfi/fixura';
3
- import {MarcRecord} from '@natlibfi/marc-record';
4
3
  import createReducer from './copy';
5
4
  import generateTests from '@natlibfi/fixugen';
6
5
 
@@ -22,6 +21,7 @@ function callback({
22
21
  getFixture,
23
22
  tagPatternRegExp,
24
23
  compareTagsOnly = false,
24
+ compareWithoutTag = false,
25
25
  compareWithoutIndicators = false,
26
26
  subfieldsMustBeIdentical = false,
27
27
  copyUnless = undefined,
@@ -31,13 +31,13 @@ function callback({
31
31
  swapTag = [],
32
32
  doNotCopyIfFieldPresent = false
33
33
  }) {
34
- const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
35
- const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
34
+ const base = getFixture('base.json');
35
+ const source = getFixture('source.json');
36
36
  const tagPattern = new RegExp(tagPatternRegExp, 'u');
37
37
  const expectedRecord = getFixture('merged.json');
38
38
 
39
- const mergedRecord = createReducer({
40
- tagPattern, compareTagsOnly, compareWithoutIndicators,
39
+ const merged = createReducer({
40
+ tagPattern, compareTagsOnly, compareWithoutTag, compareWithoutIndicators,
41
41
  copyUnless, subfieldsMustBeIdentical, excludeSubfields,
42
42
  dropSubfields, swapSubfieldCode, swapTag,
43
43
  doNotCopyIfFieldPresent
@@ -46,5 +46,7 @@ function callback({
46
46
  //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--
47
47
  //debug(`*** expectedRecord: `, expectedRecord); //<--
48
48
  //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
49
- expect(mergedRecord).to.eql(expectedRecord);
49
+ expect(merged.constructor.name).not.to.eql('MarcRecord');
50
+ expect(merged.constructor.name).to.eql('Object');
51
+ expect(merged).to.eql(expectedRecord);
50
52
  }
@@ -28,8 +28,12 @@ function callback({
28
28
  console.log('TEST DISABLED!'); // eslint-disable-line no-console
29
29
  return;
30
30
  }
31
- const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
32
- const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
31
+ // const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
32
+ // const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
33
+
34
+ const base = getFixture('base.json');
35
+ const source = getFixture('source.json');
36
+
33
37
  const tagPattern = new RegExp(tagPatternRegExp, 'u');
34
38
  const expectedRecord = getFixture('merged.json');
35
39
  const equalityFunction = useSubsetEquality ? subsetEquality : undefined;
@@ -41,5 +45,5 @@ function callback({
41
45
  }
42
46
 
43
47
  const mergedRecord = createReducer({tagPattern, equalityFunction})(base, source);
44
- expect(mergedRecord.toObject()).to.eql(expectedRecord);
48
+ expect(mergedRecord).to.eql(expectedRecord);
45
49
  }
@@ -0,0 +1,17 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ }
16
+ ]
17
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "700",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,7 @@
1
+ {
2
+ "description": "compare fields 100 and 700, compareWithoutTag, if copied: swapTag 700: copy source 700 just once",
3
+ "tagPatternRegExp": "^(?<tags>100|700)$",
4
+ "compareWithoutTag": true,
5
+ "swapTag": [{"from": "^100$", "to": "700"}],
6
+ "only": false
7
+ }
@@ -0,0 +1,31 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {
14
+ "code": "a",
15
+ "value": "test"
16
+ }
17
+ ]
18
+ },
19
+ {
20
+ "tag": "700",
21
+ "ind1": " ",
22
+ "ind2": " ",
23
+ "subfields": [
24
+ {
25
+ "code": "a",
26
+ "value": "test"
27
+ }
28
+ ]
29
+ }
30
+ ]
31
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "700",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "700",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,7 @@
1
+ {
2
+ "description": "compare fields 100 and 700, compareWithoutTag, if copied: swapTag 700: base has 700 allready",
3
+ "tagPatternRegExp": "^(?<tags>100|700)$",
4
+ "compareWithoutTag": true,
5
+ "swapTag": [{"from": "^100$", "to": "700"}],
6
+ "only": false
7
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "100",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "700",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,28 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {"code": "a", "value": "original"}
14
+ ]
15
+ },
16
+ {
17
+ "tag": "700",
18
+ "ind1": " ",
19
+ "ind2": " ",
20
+ "subfields": [
21
+ {
22
+ "code": "a",
23
+ "value": "test"
24
+ }
25
+ ]
26
+ }
27
+ ]
28
+ }
@@ -0,0 +1,7 @@
1
+ {
2
+ "description": "compare fields 100 and 700, compareWithoutTag, if copied: swapTag 700: base has 700 allready",
3
+ "tagPatternRegExp": "^(?<tags>100|700)$",
4
+ "compareWithoutTag": true,
5
+ "swapTag": [{"from": "^100$", "to": "700"}],
6
+ "only": false
7
+ }
@@ -0,0 +1,20 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "100",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {
14
+ "code": "a",
15
+ "value": "test"
16
+ }
17
+ ]
18
+ }
19
+ ]
20
+ }