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

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.
Files changed (49) hide show
  1. package/README.md +10 -10
  2. package/dist/reducers/copy.js +42 -32
  3. package/dist/reducers/copy.js.map +1 -1
  4. package/dist/reducers/copy.spec.js +3 -3
  5. package/dist/reducers/copy.spec.js.map +1 -1
  6. package/package.json +9 -11
  7. package/src/reducers/copy.js +42 -33
  8. package/src/reducers/copy.spec.js +3 -3
  9. package/test-fixtures/reducers/copy/basic copy/01/metadata.json +1 -2
  10. package/test-fixtures/reducers/copy/basic copy/02/metadata.json +1 -2
  11. package/test-fixtures/reducers/copy/basic copy/03/metadata.json +1 -2
  12. package/test-fixtures/reducers/copy/basic copy/04/metadata.json +1 -2
  13. package/test-fixtures/reducers/copy/basic copy/05/metadata.json +1 -2
  14. package/test-fixtures/reducers/copy/basic copy/06/metadata.json +1 -2
  15. package/test-fixtures/reducers/copy/basic copy/07/base.json +39 -0
  16. package/test-fixtures/reducers/copy/basic copy/07/merged.json +39 -0
  17. package/test-fixtures/reducers/copy/basic copy/07/metadata.json +5 -0
  18. package/test-fixtures/reducers/copy/basic copy/07/source.json +24 -0
  19. package/test-fixtures/reducers/copy/basic copy/08/base.json +28 -0
  20. package/test-fixtures/reducers/copy/basic copy/08/merged.json +28 -0
  21. package/test-fixtures/reducers/copy/basic copy/08/metadata.json +4 -0
  22. package/test-fixtures/reducers/copy/basic copy/08/source.json +24 -0
  23. package/test-fixtures/reducers/copy/compareTagsOnly/01/metadata.json +1 -2
  24. package/test-fixtures/reducers/copy/compareTagsOnly/02/metadata.json +1 -2
  25. package/test-fixtures/reducers/copy/compareWithoutIndicators/01/metadata.json +1 -2
  26. package/test-fixtures/reducers/copy/compareWithoutIndicators/02/metadata.json +1 -2
  27. package/test-fixtures/reducers/copy/copyUnless/01/metadata.json +1 -2
  28. package/test-fixtures/reducers/copy/dropSubfields/01/metadata.json +1 -2
  29. package/test-fixtures/reducers/copy/dropSubfields/02/merged.json +1 -1
  30. package/test-fixtures/reducers/copy/dropSubfields/02/metadata.json +2 -3
  31. package/test-fixtures/reducers/copy/dropSubfields/02/source.json +2 -2
  32. package/test-fixtures/reducers/copy/dropSubfields/03/merged.json +1 -1
  33. package/test-fixtures/reducers/copy/dropSubfields/03/metadata.json +2 -3
  34. package/test-fixtures/reducers/copy/dropSubfields/03/source.json +2 -2
  35. package/test-fixtures/reducers/copy/dropSubfields/04/metadata.json +1 -2
  36. package/test-fixtures/reducers/copy/dropSubfields/04/source.json +2 -2
  37. package/test-fixtures/reducers/copy/excludeSubfields/01/metadata.json +2 -3
  38. package/test-fixtures/reducers/copy/excludeSubfields/02/base.json +39 -0
  39. package/test-fixtures/reducers/copy/excludeSubfields/02/merged.json +58 -0
  40. package/test-fixtures/reducers/copy/excludeSubfields/02/metadata.json +5 -0
  41. package/test-fixtures/reducers/copy/excludeSubfields/02/source.json +43 -0
  42. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/01/metadata.json +1 -2
  43. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/02/metadata.json +1 -2
  44. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/03/metadata.json +1 -2
  45. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/04/metadata.json +1 -2
  46. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/05/metadata.json +1 -2
  47. package/test-fixtures/reducers/copy/subfieldsMustBeIdentical/06/metadata.json +1 -2
  48. package/test-fixtures/reducers/metadata.json +1 -2
  49. package/.drone.yml +0 -92
package/README.md CHANGED
@@ -35,14 +35,14 @@ When base and source fields are compared, indicator differences are ignored
35
35
  ```
36
36
 
37
37
  If source subfields are subset of base subfields this option says if it is copied
38
- | subfieldsMustBeIdentical | base | source | copy |
39
- |--------------------------|-------------|-------------|-------|
40
- | true or false | a$foo | a$foo | false |
41
- | true or false | a$foo | b$bar | true |
42
- | true | a$foo | a$foo,b$bar | true |
43
- | false | a$foo | a$foo,b$bar | true |
44
- | true | a$foo,b$bar | a$foo | true |
45
- | false | a$foo,b$bar | a$foo | false |
38
+ | subfieldsMustBeIdentical | base | source | copy |
39
+ |--------------------------|---------------|---------------|-------|
40
+ | true or false | $a foo | $a foo | false |
41
+ | true or false | $a foo | $b bar | true |
42
+ | true | $a foo | $a foo,$b bar | true |
43
+ | false | $a foo | $a foo,$b bar | true |
44
+ | true | $a foo,$b bar | $a foo | true |
45
+ | false | $a foo,$b bar | $a foo | false |
46
46
 
47
47
  ### excludeSubfields (Defaults [ ])
48
48
  ```
@@ -64,9 +64,9 @@ Drops subfields 9's that have "FENNI<KEEP>" from all fields tagged 010
64
64
 
65
65
 
66
66
  ```
67
- {tagPattern: /010/u, dropSubfields: [{"code": "9", "condition": "unless", "value": "^FENNI<(?<option>KEEP|PASS)>$"}]}
67
+ {tagPattern: /010/u, dropSubfields: [{"code": "9", "condition": "unless", "value": "^FENNI<(?<option>KEEP|DROP)>$"}]}
68
68
  ```
69
- Drops all subfield 9's unless they have "FENNI<KEEP>" or "FENNI<PASS>" from all fields tagged 010
69
+ Drops all subfield 9's unless they have "FENNI<KEEP>" or "FENNI<DROP>" from all fields tagged 010
70
70
 
71
71
 
72
72
  When comparing or copying field dropped fields are ignored
package/dist/reducers/copy.js CHANGED
@@ -11,6 +11,8 @@ var _debug = _interopRequireDefault(require("debug"));
11
11
 
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
+ /* eslint-disable max-statements */
15
+
14
16
  /* eslint-disable no-unused-vars */
15
17
  var _default = ({
16
18
  tagPattern,
@@ -43,7 +45,8 @@ var _default = ({
43
45
  const sourceFields = sourceRecord.get(tagPattern);
44
46
  debug(`Base fields: `, baseFields);
45
47
  debug(`Source fields: `, sourceFields);
46
- const compareResultFields = compareFields(sourceFields, baseFields);
48
+ const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
49
+ const compareResultFields = compareFields(sourceFields, baseCompareFields);
47
50
  const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);
48
51
  const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);
49
52
  debug('Fields to be copied');
@@ -52,59 +55,66 @@ var _default = ({
52
55
  droppedUnwantedFields.forEach(field => baseRecord.insertField(field));
53
56
  return baseRecord.toObject(); //return copyFields(baseFields, sourceFields);
54
57
 
55
- function compareFields(sourceFields, baseFields, uniqFields = []) {
58
+ function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
56
59
  const [sourceField, ...rest] = sourceFields;
57
60
 
58
61
  if (sourceField === undefined) {
59
62
  return uniqFields;
60
63
  }
61
64
 
62
- if (baseFields.length === 0) {
63
- return compareFields(rest, baseFields, [...uniqFields, sourceField]);
65
+ if (baseCompareFields.length === 0) {
66
+ return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
64
67
  } // Source and base are also compared for identicalness
65
68
  // Non-identical fields are copied from source to base as duplicates
66
69
 
67
70
 
68
- const sourceComapareField = createCompareField(sourceField);
69
- const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
70
- const unique = checkCompareFields(baseCompareFields, sourceComapareField);
71
+ const sourceCompareField = createCompareField(sourceField);
72
+ const unique = checkCompareFields(baseCompareFields, sourceCompareField);
71
73
  debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);
72
74
 
73
75
  if (unique) {
74
- return compareFields(rest, baseFields, [...uniqFields, sourceField]);
76
+ return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
75
77
  }
76
78
 
77
- return compareFields(rest, baseFields, uniqFields);
79
+ return compareFields(rest, baseCompareFields, uniqFields);
78
80
 
79
- function checkCompareFields(baseCompareFields, sourceComapareField) {
80
- const [baseCompareField, ...rest] = baseCompareFields;
81
+ function checkCompareFields(baseCompareFields, sourceCompareField) {
82
+ let unique = true; // eslint-disable-line functional/no-let
81
83
 
82
- if (baseCompareField === undefined) {
83
- return true;
84
- }
84
+ baseCompareFields.forEach(baseCompareField => {
85
+ debugCompare(`Comparing ${JSON.stringify(sourceCompareField)} to ${JSON.stringify(baseCompareField)}}`);
85
86
 
86
- if (sourceComapareField.value !== baseCompareField.value) {
87
- debugCompare(`Value is different ${sourceComapareField.value} !== ${baseCompareField.value}`);
88
- return true;
89
- }
87
+ if (sourceCompareField.value !== baseCompareField.value) {
88
+ debugCompare(`Value is different ${sourceCompareField.value} !== ${baseCompareField.value}`);
89
+ return;
90
+ }
90
91
 
91
- if (sourceComapareField.ind1 !== baseCompareField.ind1) {
92
- debugCompare(`Ind1 is different ${sourceComapareField.ind1} !== ${baseCompareField.ind1}`);
93
- return true;
94
- }
92
+ if (sourceCompareField.ind1 !== baseCompareField.ind1) {
93
+ debugCompare(`Ind1 is different ${sourceCompareField.ind1} !== ${baseCompareField.ind1}`);
94
+ return;
95
+ }
95
96
 
96
- if (sourceComapareField.ind2 !== baseCompareField.ind2) {
97
- debugCompare(`Ind2 is different ${sourceComapareField.ind2} !== ${baseCompareField.ind2}`);
98
- return true;
99
- }
97
+ if (sourceCompareField.ind2 !== baseCompareField.ind2) {
98
+ debugCompare(`Ind2 is different ${sourceCompareField.ind2} !== ${baseCompareField.ind2}`);
99
+ return;
100
+ }
100
101
 
101
- if ('subfields' in sourceComapareField) {
102
- const allFound = checkSubfields(sourceComapareField.subfields, baseCompareField.subfields);
103
- debugCompare(`Subfields are different ${!allFound}`);
104
- return allFound ? false : checkCompareFields(rest, sourceComapareField);
105
- }
102
+ if ('subfields' in sourceCompareField) {
103
+ const allFound = checkSubfields(sourceCompareField.subfields, baseCompareField.subfields);
104
+ debugCompare(`Subfields are different ${!allFound}`);
105
+
106
+ if (!allFound) {
107
+ return;
108
+ }
106
109
 
107
- return false;
110
+ unique = false;
111
+ return;
112
+ }
113
+
114
+ unique = false;
115
+ return;
116
+ });
117
+ return unique;
108
118
  }
109
119
 
110
120
  function checkSubfields(sourceSubfields, baseSubfields) {
package/dist/reducers/copy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"copy.js","names":["tagPattern","compareTagsOnly","compareWithoutIndicators","subfieldsMustBeIdentical","excludeSubfields","dropSubfields","copyUnless","baseValidators","subfieldValues","sourceValidators","base","source","baseRecord","MarcRecord","sourceRecord","debug","createDebugLogger","debugOptions","debugCompare","JSON","stringify","baseFields","get","sourceFields","compareResultFields","compareFields","droppedUnwantedSubfield","checkDropSubfields","droppedUnwantedFields","checkCopyUnlessFields","forEach","field","insertField","toObject","uniqFields","sourceField","rest","undefined","length","sourceComapareField","createCompareField","baseCompareFields","map","baseField","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","dropSubfieldsFunc","condition","RegExp","test"],"sources":["../../src/reducers/copy.js"],"sourcesContent":["/* 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}) => (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\n debug(`Base fields: `, baseFields);\n debug(`Source fields: `, sourceFields);\n\n const compareResultFields = compareFields(sourceFields, baseFields);\n const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);\n const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);\n debug('Fields to be copied');\n debug(JSON.stringify(droppedUnwantedFields));\n\n // Add fields to base;\n droppedUnwantedFields.forEach(field => baseRecord.insertField(field));\n return baseRecord.toObject();\n //return copyFields(baseFields, sourceFields);\n\n function compareFields(sourceFields, baseFields, uniqFields = []) {\n const [sourceField, ...rest] = sourceFields;\n if (sourceField === undefined) {\n return uniqFields;\n }\n\n if (baseFields.length === 0) {\n return compareFields(rest, baseFields, [...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 sourceComapareField = createCompareField(sourceField);\n const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));\n\n const unique = checkCompareFields(baseCompareFields, sourceComapareField);\n\n debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);\n\n if (unique) {\n return compareFields(rest, baseFields, [...uniqFields, sourceField]);\n }\n\n return compareFields(rest, baseFields, uniqFields);\n\n function checkCompareFields(baseCompareFields, sourceComapareField) {\n const [baseCompareField, ...rest] = baseCompareFields;\n if (baseCompareField === undefined) {\n return true;\n }\n\n if (sourceComapareField.value !== baseCompareField.value) {\n debugCompare(`Value is different ${sourceComapareField.value} !== ${baseCompareField.value}`);\n return true;\n }\n\n if (sourceComapareField.ind1 !== baseCompareField.ind1) {\n debugCompare(`Ind1 is different ${sourceComapareField.ind1} !== ${baseCompareField.ind1}`);\n return true;\n }\n\n if (sourceComapareField.ind2 !== baseCompareField.ind2) {\n debugCompare(`Ind2 is different ${sourceComapareField.ind2} !== ${baseCompareField.ind2}`);\n return true;\n }\n\n if ('subfields' in sourceComapareField) {\n const allFound = checkSubfields(sourceComapareField.subfields, baseCompareField.subfields);\n debugCompare(`Subfields are different ${!allFound}`);\n return allFound ? false : checkCompareFields(rest, sourceComapareField);\n }\n\n return false;\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 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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,IAAV,CAAeY,GAAG,IAAIA,GAAG,CAACV,IAAJ,KAAaJ,MAAM,CAACI,IAApB,IAA4B,IAAIkB,MAAJ,CAAWtB,MAAM,CAACT,KAAlB,EAAyB,GAAzB,EAA8BgC,IAA9B,CAAmCT,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","compareWithoutIndicators","subfieldsMustBeIdentical","excludeSubfields","dropSubfields","copyUnless","baseValidators","subfieldValues","sourceValidators","base","source","baseRecord","MarcRecord","sourceRecord","debug","createDebugLogger","debugOptions","debugCompare","JSON","stringify","baseFields","get","sourceFields","baseCompareFields","map","baseField","createCompareField","compareResultFields","compareFields","droppedUnwantedSubfield","checkDropSubfields","droppedUnwantedFields","checkCopyUnlessFields","forEach","field","insertField","toObject","uniqFields","sourceField","rest","undefined","length","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","dropSubfieldsFunc","condition","RegExp","test"],"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}) => (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\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 debug('Fields to be copied');\n debug(JSON.stringify(droppedUnwantedFields));\n\n // Add fields to base;\n droppedUnwantedFields.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 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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AAM,CAACnB,MAAP,CAAc,CAAC;QAACJ;MAAD,CAAD,KAAiB9C,UAAU,CAACoD,IAAX,CAAgBF,MAAM,IAAI,CAACJ,SAAS,CAACM,IAAV,CAAeY,GAAG,IAAIA,GAAG,CAACV,IAAJ,KAAaJ,MAAM,CAACI,IAApB,IAA4B,IAAIkB,MAAJ,CAAWtB,MAAM,CAACT,KAAlB,EAAyB,GAAzB,EAA8BgC,IAA9B,CAAmCT,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"}
package/dist/reducers/copy.spec.js CHANGED
@@ -12,8 +12,8 @@ var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
12
12
 
13
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
14
 
15
- // import createDebugLogger from 'debug'; // <---
16
- // const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
15
+ //import createDebugLogger from 'debug'; // <---
16
+ //const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
17
17
  (0, _fixugen.default)({
18
18
  callback,
19
19
  path: [__dirname, '..', '..', 'test-fixtures', 'reducers', 'copy'],
@@ -59,7 +59,7 @@ function callback({
59
59
  excludeSubfields,
60
60
  dropSubfields
61
61
  })(base, source); //debug(`*** mergedRecord: `, mergedRecord); //<--
62
- //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord.toObject())); //<--
62
+ //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--
63
63
  //debug(`*** expectedRecord: `, expectedRecord); //<--
64
64
  //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
65
65
 
package/dist/reducers/copy.spec.js.map CHANGED
@@ -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","disabled","console","log","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 disabled = false\n}) {\n if (disabled) {\n console.log('TEST DISABLED!'); // eslint-disable-line no-console\n return;\n }\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({tagPattern, compareTagsOnly, compareWithoutIndicators, copyUnless, subfieldsMustBeIdentical, excludeSubfields, dropSubfields})(base, source);\n //debug(`*** mergedRecord: `, mergedRecord); //<--\n //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord.toObject())); //<--\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,QAAQ,GAAG;AATK,CAAlB,EAUG;EACD,IAAIA,QAAJ,EAAc;IACZC,OAAO,CAACC,GAAR,CAAY,gBAAZ,EADY,CACmB;;IAC/B;EACD;;EAED,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;IAACJ,UAAD;IAAad,eAAb;IAA8BC,wBAA9B;IAAwDE,UAAxD;IAAoED,wBAApE;IAA8FG,gBAA9F;IAAgHC;EAAhH,CAAd,EAA8II,IAA9I,EAAoJG,MAApJ,CAArB,CAXC,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","compareWithoutIndicators","subfieldsMustBeIdentical","copyUnless","undefined","excludeSubfields","dropSubfields","disabled","console","log","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 disabled = false\n}) {\n if (disabled) {\n console.log('TEST DISABLED!'); // eslint-disable-line no-console\n return;\n }\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({tagPattern, compareTagsOnly, compareWithoutIndicators, copyUnless, subfieldsMustBeIdentical, excludeSubfields, dropSubfields})(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,QAAQ,GAAG;AATK,CAAlB,EAUG;EACD,IAAIA,QAAJ,EAAc;IACZC,OAAO,CAACC,GAAR,CAAY,gBAAZ,EADY,CACmB;;IAC/B;EACD;;EAED,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;IAACJ,UAAD;IAAad,eAAb;IAA8BC,wBAA9B;IAAwDE,UAAxD;IAAoED,wBAApE;IAA8FG,gBAA9F;IAAgHC;EAAhH,CAAd,EAA8II,IAA9I,EAAoJG,MAApJ,CAArB,CAXC,CAYD;EACA;EACA;EACA;;EACA,IAAAM,YAAA,EAAOF,YAAP,EAAqBG,EAArB,CAAwBC,GAAxB,CAA4BL,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.4",
17
+ "version": "6.0.0-beta.5",
18
18
  "main": "./dist/index.js",
19
19
  "engines": {
20
20
  "node": ">=14"
@@ -30,17 +30,18 @@
30
30
  "test:dev": "npm run lint:dev && npm run coverage",
31
31
  "coverage": "npm run coverage:unit && npm run coverage:report",
32
32
  "coverage:unit": "nyc --silent npm run test:base",
33
- "coverage:report": "nyc report --reporter=text",
33
+ "coverage:report": "nyc report",
34
34
  "build:transpile": "babel src --copy-files --source-maps --delete-dir-on-start --out-dir=dist",
35
35
  "build": "npm run build:transpile",
36
- "dev:test": "cross-env DEBUG=@natlibfi/* NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'"
36
+ "dev:test": "cross-env NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'",
37
+ "dev:test:debug": "cross-env DEBUG=@natlibfi/* NODE_ENV=test nodemon -w src -w test-fixtures --exec 'clear && npm run test:dev'"
37
38
  },
38
39
  "dependencies": {
39
- "@natlibfi/fixugen": "^1.0.2",
40
+ "@natlibfi/fixugen": "1.1.0",
40
41
  "@natlibfi/fixura": "^2.2.1",
41
- "@natlibfi/marc-record": "^7.1.0-alpha.1",
42
+ "@natlibfi/marc-record": "^7.1.0-alpha.2",
42
43
  "debug": "^4.3.4",
43
- "normalize-diacritics": "^2.13.2"
44
+ "normalize-diacritics": "2.14.0"
44
45
  },
45
46
  "devDependencies": {
46
47
  "@babel/cli": "^7.17.10",
@@ -68,9 +69,7 @@
68
69
  [
69
70
  "@babel/preset-env",
70
71
  {
71
- "targets": {
72
- "node": "14"
73
- }
72
+ "targets": "maintained node versions"
74
73
  }
75
74
  ]
76
75
  ],
@@ -89,8 +88,7 @@
89
88
  "*/**/*.spec.js"
90
89
  ],
91
90
  "reporter": [
92
- "lcov",
93
- "html"
91
+ "text"
94
92
  ],
95
93
  "require": [
96
94
  "@babel/register"
package/src/reducers/copy.js CHANGED
@@ -1,3 +1,4 @@
1
+ /* eslint-disable max-statements */
1
2
  /* eslint-disable no-unused-vars */
2
3
 
3
4
  import {MarcRecord} from '@natlibfi/marc-record';
@@ -34,7 +35,8 @@ export default ({
34
35
  debug(`Base fields: `, baseFields);
35
36
  debug(`Source fields: `, sourceFields);
36
37
 
37
- const compareResultFields = compareFields(sourceFields, baseFields);
38
+ const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
39
+ const compareResultFields = compareFields(sourceFields, baseCompareFields);
38
40
  const droppedUnwantedSubfield = checkDropSubfields(compareResultFields);
39
41
  const droppedUnwantedFields = checkCopyUnlessFields(droppedUnwantedSubfield);
40
42
  debug('Fields to be copied');
@@ -45,59 +47,66 @@ export default ({
45
47
  return baseRecord.toObject();
46
48
  //return copyFields(baseFields, sourceFields);
47
49
 
48
- function compareFields(sourceFields, baseFields, uniqFields = []) {
50
+ function compareFields(sourceFields, baseCompareFields, uniqFields = []) {
49
51
  const [sourceField, ...rest] = sourceFields;
50
52
  if (sourceField === undefined) {
51
53
  return uniqFields;
52
54
  }
53
55
 
54
- if (baseFields.length === 0) {
55
- return compareFields(rest, baseFields, [...uniqFields, sourceField]);
56
+ if (baseCompareFields.length === 0) {
57
+ return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
56
58
  }
57
59
 
58
60
  // Source and base are also compared for identicalness
59
61
  // Non-identical fields are copied from source to base as duplicates
60
- const sourceComapareField = createCompareField(sourceField);
61
- const baseCompareFields = baseFields.map(baseField => createCompareField(baseField));
62
-
63
- const unique = checkCompareFields(baseCompareFields, sourceComapareField);
62
+ const sourceCompareField = createCompareField(sourceField);
63
+ const unique = checkCompareFields(baseCompareFields, sourceCompareField);
64
64
 
65
65
  debugCompare(`${JSON.stringify(sourceField)} ${unique ? 'is UNIQUE' : 'not UNIQUE'}`);
66
66
 
67
67
  if (unique) {
68
- return compareFields(rest, baseFields, [...uniqFields, sourceField]);
68
+ return compareFields(rest, baseCompareFields, [...uniqFields, sourceField]);
69
69
  }
70
70
 
71
- return compareFields(rest, baseFields, uniqFields);
71
+ return compareFields(rest, baseCompareFields, uniqFields);
72
72
 
73
- function checkCompareFields(baseCompareFields, sourceComapareField) {
74
- const [baseCompareField, ...rest] = baseCompareFields;
75
- if (baseCompareField === undefined) {
76
- return true;
77
- }
73
+ function checkCompareFields(baseCompareFields, sourceCompareField) {
74
+ let unique = true; // eslint-disable-line functional/no-let
78
75
 
79
- if (sourceComapareField.value !== baseCompareField.value) {
80
- debugCompare(`Value is different ${sourceComapareField.value} !== ${baseCompareField.value}`);
81
- return true;
82
- }
76
+ baseCompareFields.forEach(baseCompareField => {
77
+ debugCompare(`Comparing ${JSON.stringify(sourceCompareField)} to ${JSON.stringify(baseCompareField)}}`);
83
78
 
84
- if (sourceComapareField.ind1 !== baseCompareField.ind1) {
85
- debugCompare(`Ind1 is different ${sourceComapareField.ind1} !== ${baseCompareField.ind1}`);
86
- return true;
87
- }
79
+ if (sourceCompareField.value !== baseCompareField.value) {
80
+ debugCompare(`Value is different ${sourceCompareField.value} !== ${baseCompareField.value}`);
81
+ return;
82
+ }
88
83
 
89
- if (sourceComapareField.ind2 !== baseCompareField.ind2) {
90
- debugCompare(`Ind2 is different ${sourceComapareField.ind2} !== ${baseCompareField.ind2}`);
91
- return true;
92
- }
84
+ if (sourceCompareField.ind1 !== baseCompareField.ind1) {
85
+ debugCompare(`Ind1 is different ${sourceCompareField.ind1} !== ${baseCompareField.ind1}`);
86
+ return;
87
+ }
93
88
 
94
- if ('subfields' in sourceComapareField) {
95
- const allFound = checkSubfields(sourceComapareField.subfields, baseCompareField.subfields);
96
- debugCompare(`Subfields are different ${!allFound}`);
97
- return allFound ? false : checkCompareFields(rest, sourceComapareField);
98
- }
89
+ if (sourceCompareField.ind2 !== baseCompareField.ind2) {
90
+ debugCompare(`Ind2 is different ${sourceCompareField.ind2} !== ${baseCompareField.ind2}`);
91
+ return;
92
+ }
93
+
94
+ if ('subfields' in sourceCompareField) {
95
+ const allFound = checkSubfields(sourceCompareField.subfields, baseCompareField.subfields);
96
+ debugCompare(`Subfields are different ${!allFound}`);
97
+ if (!allFound) {
98
+ return;
99
+ }
100
+
101
+ unique = false;
102
+ return;
103
+ }
104
+
105
+ unique = false;
106
+ return;
107
+ });
99
108
 
100
- return false;
109
+ return unique;
101
110
  }
102
111
 
103
112
  function checkSubfields(sourceSubfields, baseSubfields) {
package/src/reducers/copy.spec.js CHANGED
@@ -4,8 +4,8 @@ import {MarcRecord} from '@natlibfi/marc-record';
4
4
  import createReducer from './copy';
5
5
  import generateTests from '@natlibfi/fixugen';
6
6
 
7
- // import createDebugLogger from 'debug'; // <---
8
- // const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
7
+ //import createDebugLogger from 'debug'; // <---
8
+ //const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
9
9
 
10
10
  generateTests({
11
11
  callback,
@@ -41,7 +41,7 @@ function callback({
41
41
 
42
42
  const mergedRecord = createReducer({tagPattern, compareTagsOnly, compareWithoutIndicators, copyUnless, subfieldsMustBeIdentical, excludeSubfields, dropSubfields})(base, source);
43
43
  //debug(`*** mergedRecord: `, mergedRecord); //<--
44
- //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord.toObject())); //<--
44
+ //debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--
45
45
  //debug(`*** expectedRecord: `, expectedRecord); //<--
46
46
  //debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
47
47
  expect(mergedRecord).to.eql(expectedRecord);
package/test-fixtures/reducers/copy/basic copy/01/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "If base does not contain the field at all, it is copied from source to base",
3
- "tagPatternRegExp": "^010$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^010$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/02/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "Identical control fields are not copied",
3
- "tagPatternRegExp": "^001$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^001$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/03/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "Add missing control field to base",
3
- "tagPatternRegExp": "^001$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^001$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/04/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "Identical data fields in base and source, not copied",
3
- "tagPatternRegExp": "^010$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^010$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/05/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "Different data fields are copied from source to base (multiple fields)",
3
- "tagPatternRegExp": "^010$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^010$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/06/metadata.json CHANGED
@@ -1,5 +1,4 @@
1
1
  {
2
2
  "description": "Different data fields are copied from source to base (Ind2 diff)",
3
- "tagPatternRegExp": "^010$",
4
- "disabled": false
3
+ "tagPatternRegExp": "^010$"
5
4
  }
package/test-fixtures/reducers/copy/basic copy/07/base.json ADDED
@@ -0,0 +1,39 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "010",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {
14
+ "code": "a",
15
+ "value": "##2002021346"
16
+ },
17
+ {
18
+ "code": "b",
19
+ "value": "##2002021356"
20
+ }
21
+ ]
22
+ },
23
+ {
24
+ "tag": "010",
25
+ "ind1": " ",
26
+ "ind2": "1",
27
+ "subfields": [
28
+ {
29
+ "code": "a",
30
+ "value": "##2002021346"
31
+ },
32
+ {
33
+ "code": "b",
34
+ "value": "##2002021356"
35
+ }
36
+ ]
37
+ }
38
+ ]
39
+ }
package/test-fixtures/reducers/copy/basic copy/07/merged.json ADDED
@@ -0,0 +1,39 @@
1
+ {
2
+ "leader": "01331cam a22003494i 4500",
3
+ "fields": [
4
+ {
5
+ "tag": "001",
6
+ "value": "007346734"
7
+ },
8
+ {
9
+ "tag": "010",
10
+ "ind1": " ",
11
+ "ind2": " ",
12
+ "subfields": [
13
+ {
14
+ "code": "a",
15
+ "value": "##2002021346"
16
+ },
17
+ {
18
+ "code": "b",
19
+ "value": "##2002021356"
20
+ }
21
+ ]
22
+ },
23
+ {
24
+ "tag": "010",
25
+ "ind1": " ",
26
+ "ind2": "1",
27
+ "subfields": [
28
+ {
29
+ "code": "a",
30
+ "value": "##2002021346"
31
+ },
32
+ {
33
+ "code": "b",
34
+ "value": "##2002021356"
35
+ }
36
+ ]
37
+ }
38
+ ]
39
+ }
package/test-fixtures/reducers/copy/basic copy/07/metadata.json ADDED
@@ -0,0 +1,5 @@
1
+ {
2
+ "description": "Different data fields are copied from source to base (Ind2 diff, multiple fields in base)",
3
+ "tagPatternRegExp": "^010$",
4
+ "only": false
5
+ }