@natlibfi/marc-record-merge 6.0.0-beta.6 → 6.0.0-beta.7
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.
|
@@ -4,14 +4,13 @@ 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"));
|
|
12
10
|
|
|
13
11
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
12
|
|
|
13
|
+
//import {MarcRecord} from '@natlibfi/marc-record';
|
|
15
14
|
//import createDebugLogger from 'debug'; // <---
|
|
16
15
|
//const debug = createDebugLogger('@natlibfi/marc-record-merge/copy.spec.js'); // <---
|
|
17
16
|
(0, _fixugen.default)({
|
|
@@ -38,15 +37,13 @@ function callback({
|
|
|
38
37
|
swapTag = [],
|
|
39
38
|
doNotCopyIfFieldPresent = false
|
|
40
39
|
}) {
|
|
41
|
-
const base =
|
|
42
|
-
|
|
43
|
-
});
|
|
44
|
-
|
|
45
|
-
subfieldValues: false
|
|
46
|
-
});
|
|
40
|
+
const base = getFixture('base.json');
|
|
41
|
+
const source = getFixture('source.json'); // const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
|
|
42
|
+
// const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
|
|
43
|
+
|
|
47
44
|
const tagPattern = new RegExp(tagPatternRegExp, 'u');
|
|
48
45
|
const expectedRecord = getFixture('merged.json');
|
|
49
|
-
const
|
|
46
|
+
const merged = (0, _copy.default)({
|
|
50
47
|
tagPattern,
|
|
51
48
|
compareTagsOnly,
|
|
52
49
|
compareWithoutIndicators,
|
|
@@ -62,6 +59,8 @@ function callback({
|
|
|
62
59
|
//debug(`*** expectedRecord: `, expectedRecord); //<--
|
|
63
60
|
//debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
|
|
64
61
|
|
|
65
|
-
(0, _chai.expect)(
|
|
62
|
+
(0, _chai.expect)(merged.constructor.name).not.to.eql('MarcRecord');
|
|
63
|
+
(0, _chai.expect)(merged.constructor.name).to.eql('Object');
|
|
64
|
+
(0, _chai.expect)(merged).to.eql(expectedRecord);
|
|
66
65
|
}
|
|
67
66
|
//# 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","
|
|
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","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';\n//import {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\n const base = getFixture('base.json');\n const source = getFixture('source.json');\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 merged = 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(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;;AAEA;;AACA;;;;AAFA;AAIA;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;EAED,MAAMC,IAAI,GAAGZ,UAAU,CAAC,WAAD,CAAvB;EACA,MAAMa,MAAM,GAAGb,UAAU,CAAC,aAAD,CAAzB,CAHC,CAKD;EACA;;EACA,MAAMc,UAAU,GAAG,IAAIC,MAAJ,CAAWd,gBAAX,EAA6B,GAA7B,CAAnB;EACA,MAAMe,cAAc,GAAGhB,UAAU,CAAC,aAAD,CAAjC;EAEA,MAAMiB,MAAM,GAAG,IAAAC,aAAA,EAAc;IAC3BJ,UAD2B;IACfZ,eADe;IACEC,wBADF;IAE3BE,UAF2B;IAEfD,wBAFe;IAEWG,gBAFX;IAG3BC,aAH2B;IAGZC,gBAHY;IAGMC,OAHN;IAI3BC;EAJ2B,CAAd,EAKZC,IALY,EAKNC,MALM,CAAf,CAVC,CAgBD;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 =
|
|
48
|
-
|
|
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
|
|
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","
|
|
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {expect} from 'chai';
|
|
2
2
|
import {READERS} from '@natlibfi/fixura';
|
|
3
|
-
import {MarcRecord} from '@natlibfi/marc-record';
|
|
3
|
+
//import {MarcRecord} from '@natlibfi/marc-record';
|
|
4
4
|
import createReducer from './copy';
|
|
5
5
|
import generateTests from '@natlibfi/fixugen';
|
|
6
6
|
|
|
@@ -31,12 +31,16 @@ function callback({
|
|
|
31
31
|
swapTag = [],
|
|
32
32
|
doNotCopyIfFieldPresent = false
|
|
33
33
|
}) {
|
|
34
|
-
|
|
35
|
-
const
|
|
34
|
+
|
|
35
|
+
const base = getFixture('base.json');
|
|
36
|
+
const source = getFixture('source.json');
|
|
37
|
+
|
|
38
|
+
// const base = new MarcRecord(getFixture('base.json'), {subfieldValues: false});
|
|
39
|
+
// const source = new MarcRecord(getFixture('source.json'), {subfieldValues: false});
|
|
36
40
|
const tagPattern = new RegExp(tagPatternRegExp, 'u');
|
|
37
41
|
const expectedRecord = getFixture('merged.json');
|
|
38
42
|
|
|
39
|
-
const
|
|
43
|
+
const merged = createReducer({
|
|
40
44
|
tagPattern, compareTagsOnly, compareWithoutIndicators,
|
|
41
45
|
copyUnless, subfieldsMustBeIdentical, excludeSubfields,
|
|
42
46
|
dropSubfields, swapSubfieldCode, swapTag,
|
|
@@ -46,5 +50,7 @@ function callback({
|
|
|
46
50
|
//debug(`*** mergedRecord,Strfy: `, JSON.stringify(mergedRecord)); //<--
|
|
47
51
|
//debug(`*** expectedRecord: `, expectedRecord); //<--
|
|
48
52
|
//debug(`*** expectedRecord,Strfy: `, JSON.stringify(expectedRecord)); //<--
|
|
49
|
-
expect(
|
|
53
|
+
expect(merged.constructor.name).not.to.eql('MarcRecord');
|
|
54
|
+
expect(merged.constructor.name).to.eql('Object');
|
|
55
|
+
expect(merged).to.eql(expectedRecord);
|
|
50
56
|
}
|
|
@@ -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
|
|
48
|
+
expect(mergedRecord).to.eql(expectedRecord);
|
|
45
49
|
}
|