@natlibfi/marc-record-validators-melinda 3.2.0 → 3.3.14-alpha.2

package/dist/sort-tags.js

@@ -1,28 +1,54 @@
-/**
- *
- * @licstart  The following is the entire license notice for the JavaScript code in this file.
- *
- * MARC record validators used in Melinda
- *
- * Copyright (C) 2014-2018 University Of Helsinki (The National Library Of Finland)
- *
- * This file is part of marc-record-validators-melinda
- *
- * marc-record-validators-melinda program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * marc-record-validators-melinda is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- *
- *//* eslint-disable require-await */'use strict';Object.defineProperty(exports,'__esModule',{value:true});var _lodash=require('lodash');function _asyncToGenerator(fn){return function(){var gen=fn.apply(this,arguments);return new Promise(function(resolve,reject){function step(key,arg){try{var info=gen[key](arg);var value=info.value}catch(error){reject(error);return}if(info.done){resolve(value)}else{return Promise.resolve(value).then(function(value){step('next',value)},function(err){step('throw',err)})}}return step('next')})}}exports.default=(()=>{var _ref=_asyncToGenerator(function*(tagPattern){let validate=(()=>{var _ref3=_asyncToGenerator(function*(record,tagPattern){const compareArrays=(0,_lodash.isEqual)(record.fields,(yield sort(record.fields,tagPattern)));return compareArrays?{valid:true,messages:[]}:{valid:false,messages:['Fields are in incorrect order']}});return function validate(_x3,_x4){return _ref3.apply(this,arguments)}})();return{description:'Handles field ordering',validate,fix:(()=>{var _ref2=_asyncToGenerator(function*(record){return{fix:yield sort(record,tagPattern)}});return function fix(_x2){return _ref2.apply(this,arguments)}})()};function sort(record,tagPattern){if(tagPattern){return sortPatternFields(record,tagPattern)}return sortFields(record)}});return function(_x){return _ref.apply(this,arguments)}})();function sortPatternFields(record,tagPattern){const matchingTags=record.fields.map(field=>{return tagPattern.some(pattern=>pattern.test(field.tag))?field:null}).filter(tag=>tag);const sortedArray=sortFields(record.fields);const fixedArray=(0,_lodash.reject)(sortedArray,field=>tagPattern.some(pattern=>pattern.test(field.tag)));fixedArray.splice(index(sortedArray,tagPattern),0,...matchingTags);record.fields=fixedArray}function sortFields(fields){return(0,_lodash.orderBy)(fields,['tag'])}function index(fields,tagPattern){return fields.findIndex(field=>{return tagPattern.some(pattern=>pattern.test(field.tag))})}
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _marcRecord = require("@natlibfi/marc-record");
+function _default(tagPattern) {
+  return {
+    description: 'Handles field ordering',
+    validate,
+    fix: async record => ({
+      fix: await sort(record, tagPattern)
+    })
+  };
+  function validate(record, tagPattern) {
+    return _marcRecord.MarcRecord.isEqual(record.fields, sort(record.fields, tagPattern)) ? {
+      valid: true,
+      messages: []
+    } : {
+      valid: false,
+      messages: ['Fields are in incorrect order']
+    };
+  }
+  function sort(record, tagPattern) {
+    if (tagPattern) {
+      return sortPatternFields(record, tagPattern);
+    }
+    return sortFields(record);
+  }
+}
+function sortPatternFields(record, tagPattern) {
+  const matchingTags = record.fields.map(field => tagPattern.some(pattern => pattern.test(field.tag)) ? field : null).filter(tag => tag);
+  const sortedArray = sortFields(record.fields);
+  const fixedArray = sortedArray.filter(field => !tagPattern.some(pattern => pattern.test(field.tag)));
+  fixedArray.splice(index(sortedArray, tagPattern), 0, ...matchingTags); // eslint-disable-line functional/immutable-data
+  record.fields = fixedArray; // eslint-disable-line functional/immutable-data
+}
+
+function sortFields(fields) {
+  return [...fields].sort((a, b) => {
+    if (a.tag > b.tag) {
+      return 1;
+    }
+    if (b.tag > a.tag) {
+      return -1;
+    }
+    return 0;
+  });
+}
+function index(fields, tagPattern) {
+  return fields.findIndex(field => tagPattern.some(pattern => pattern.test(field.tag)));
+}
 //# sourceMappingURL=sort-tags.js.map

package/dist/sort-tags.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/sort-tags.js"],"names":["tagPattern","record","compareArrays","fields","sort","valid","messages","validate","description","fix","sortPatternFields","sortFields","matchingTags","map","field","some","pattern","test","tag","filter","sortedArray","fixedArray","splice","index","findIndex"],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BA,kCACA,a,yDACA,8B,2bAEe,UAAgBA,UAAhB,CAA4B,gDAU1C,UAAwBC,MAAxB,CAAgCD,UAAhC,CAA4C,CAC3C,KAAME,eAAgB,oBAAQD,OAAOE,MAAf,EAAuB,KAAMC,MAAKH,OAAOE,MAAZ,CAAoBH,UAApB,CAA7B,EAAtB,CACA,MAAOE,eAAgB,CAACG,MAAO,IAAR,CAAcC,SAAU,EAAxB,CAAhB,CAA8C,CAACD,MAAO,KAAR,CAAeC,SAAU,CAAC,+BAAD,CAAzB,CACrD,CAbyC,iBAU3BC,SAV2B,kDAC1C,MAAO,CACNC,YACE,wBAFI,CAGND,QAHM,CAINE,sCAAK,UAAMR,MAAN,QAAiB,CACrBQ,IAAK,KAAML,MAAKH,MAAL,CAAaD,UAAb,CADU,CAAjB,CAAL,kEAJM,CAAP,CAcA,QAASI,KAAT,CAAcH,MAAd,CAAsBD,UAAtB,CAAkC,CACjC,GAAIA,UAAJ,CAAgB,CACf,MAAOU,mBAAkBT,MAAlB,CAA0BD,UAA1B,CACP,CACD,MAAOW,YAAWV,MAAX,CACP,CACD,C,6DAED,QAASS,kBAAT,CAA2BT,MAA3B,CAAmCD,UAAnC,CAA+C,CAC9C,KAAMY,cAAeX,OAAOE,MAAP,CAAcU,GAAd,CAAkBC,OAAS,CAC/C,MAAOd,YAAWe,IAAX,CAAgBC,SAAWA,QAAQC,IAAR,CAAaH,MAAMI,GAAnB,CAA3B,EAAsDJ,KAAtD,CAA8D,IACrE,CAFoB,EAElBK,MAFkB,CAEXD,KAAOA,GAFI,CAArB,CAGA,KAAME,aAAcT,WAAWV,OAAOE,MAAlB,CAApB,CACA,KAAMkB,YAAa,mBAAOD,WAAP,CAAqBN,OAASd,WAAWe,IAAX,CAAgBC,SAAWA,QAAQC,IAAR,CAAaH,MAAMI,GAAnB,CAA3B,CAA9B,CAAnB,CACAG,WAAWC,MAAX,CAAkBC,MAAMH,WAAN,CAAmBpB,UAAnB,CAAlB,CAAkD,CAAlD,CAAqD,GAAGY,YAAxD,EACAX,OAAOE,MAAP,CAAgBkB,UAChB,CAED,QAASV,WAAT,CAAoBR,MAApB,CAA4B,CAC3B,MAAO,oBAAQA,MAAR,CAAgB,CAAC,KAAD,CAAhB,CACP,CAED,QAASoB,MAAT,CAAepB,MAAf,CAAuBH,UAAvB,CAAmC,CAClC,MAAOG,QAAOqB,SAAP,CAAiBV,OAAS,CAChC,MAAOd,YAAWe,IAAX,CAAgBC,SAAWA,QAAQC,IAAR,CAAaH,MAAMI,GAAnB,CAA3B,CACP,CAFM,CAGP","file":"sort-tags.js","sourcesContent":["/**\n *\n * @licstart  The following is the entire license notice for the JavaScript code in this file.\n *\n * MARC record validators used in Melinda\n *\n * Copyright (C) 2014-2018 University Of Helsinki (The National Library Of Finland)\n *\n * This file is part of marc-record-validators-melinda\n *\n * marc-record-validators-melinda program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * marc-record-validators-melinda is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program.  If not, see <http://www.gnu.org/licenses/>.\n *\n * @licend  The above is the entire license notice\n * for the JavaScript code in this file.\n *\n */\n\n/* eslint-disable require-await */\n'use strict';\nimport {orderBy, isEqual, reject} from 'lodash';\n\nexport default async function (tagPattern) {\n\treturn {\n\t\tdescription:\n\t\t\t\t'Handles field ordering',\n\t\tvalidate,\n\t\tfix: async record => ({\n\t\t\tfix: await sort(record, tagPattern)\n\t\t})\n\t};\n\n\tasync function validate(record, tagPattern) {\n\t\tconst compareArrays = isEqual(record.fields, await sort(record.fields, tagPattern));\n\t\treturn compareArrays ? {valid: true, messages: []} : {valid: false, messages: ['Fields are in incorrect order']};\n\t}\n\n\tfunction sort(record, tagPattern) {\n\t\tif (tagPattern) {\n\t\t\treturn sortPatternFields(record, tagPattern);\n\t\t}\n\t\treturn sortFields(record);\n\t}\n}\n\nfunction sortPatternFields(record, tagPattern) {\n\tconst matchingTags = record.fields.map(field => {\n\t\treturn tagPattern.some(pattern => pattern.test(field.tag)) ? field : null;\n\t}).filter(tag => tag);\n\tconst sortedArray = sortFields(record.fields);\n\tconst fixedArray = reject(sortedArray, (field => tagPattern.some(pattern => pattern.test(field.tag))));\n\tfixedArray.splice(index(sortedArray, tagPattern), 0, ...matchingTags);\n\trecord.fields = fixedArray;\n}\n\nfunction sortFields(fields) {\n\treturn orderBy(fields, ['tag']);\n}\n\nfunction index(fields, tagPattern) {\n\treturn fields.findIndex(field => {\n\t\treturn tagPattern.some(pattern => pattern.test(field.tag));\n\t});\n}\n"]}
+{"version":3,"file":"sort-tags.js","names":["_marcRecord","require","_default","tagPattern","description","validate","fix","record","sort","MarcRecord","isEqual","fields","valid","messages","sortPatternFields","sortFields","matchingTags","map","field","some","pattern","test","tag","filter","sortedArray","fixedArray","splice","index","a","b","findIndex"],"sources":["../src/sort-tags.js"],"sourcesContent":["import {MarcRecord} from '@natlibfi/marc-record';\n\nexport default function (tagPattern) {\n  return {\n    description:\n      'Handles field ordering',\n    validate,\n    fix: async record => ({\n      fix: await sort(record, tagPattern)\n    })\n  };\n\n  function validate(record, tagPattern) {\n    return MarcRecord.isEqual(record.fields, sort(record.fields, tagPattern)) ? {valid: true, messages: []} : {valid: false, messages: ['Fields are in incorrect order']};\n  }\n\n  function sort(record, tagPattern) {\n    if (tagPattern) {\n      return sortPatternFields(record, tagPattern);\n    }\n\n    return sortFields(record);\n  }\n}\n\nfunction sortPatternFields(record, tagPattern) {\n  const matchingTags = record.fields.map(field => tagPattern.some(pattern => pattern.test(field.tag)) ? field : null).filter(tag => tag);\n  const sortedArray = sortFields(record.fields);\n  const fixedArray = sortedArray.filter(field => !tagPattern.some(pattern => pattern.test(field.tag)));\n  fixedArray.splice(index(sortedArray, tagPattern), 0, ...matchingTags); // eslint-disable-line functional/immutable-data\n  record.fields = fixedArray; // eslint-disable-line functional/immutable-data\n}\n\nfunction sortFields(fields) {\n  return [...fields].sort((a, b) => {\n    if (a.tag > b.tag) {\n      return 1;\n    }\n    if (b.tag > a.tag) {\n      return -1;\n    }\n    return 0;\n  });\n}\n\nfunction index(fields, tagPattern) {\n  return fields.findIndex(field => tagPattern.some(pattern => pattern.test(field.tag)));\n}\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAEe,SAAAC,SAAUC,UAAU,EAAE;EACnC,OAAO;IACLC,WAAW,EACT,wBAAwB;IAC1BC,QAAQ;IACRC,GAAG,EAAE,MAAMC,MAAM,KAAK;MACpBD,GAAG,EAAE,MAAME,IAAI,CAACD,MAAM,EAAEJ,UAAU;IACpC,CAAC;EACH,CAAC;EAED,SAASE,QAAQA,CAACE,MAAM,EAAEJ,UAAU,EAAE;IACpC,OAAOM,sBAAU,CAACC,OAAO,CAACH,MAAM,CAACI,MAAM,EAAEH,IAAI,CAACD,MAAM,CAACI,MAAM,EAAER,UAAU,CAAC,CAAC,GAAG;MAACS,KAAK,EAAE,IAAI;MAAEC,QAAQ,EAAE;IAAE,CAAC,GAAG;MAACD,KAAK,EAAE,KAAK;MAAEC,QAAQ,EAAE,CAAC,+BAA+B;IAAC,CAAC;EACvK;EAEA,SAASL,IAAIA,CAACD,MAAM,EAAEJ,UAAU,EAAE;IAChC,IAAIA,UAAU,EAAE;MACd,OAAOW,iBAAiB,CAACP,MAAM,EAAEJ,UAAU,CAAC;IAC9C;IAEA,OAAOY,UAAU,CAACR,MAAM,CAAC;EAC3B;AACF;AAEA,SAASO,iBAAiBA,CAACP,MAAM,EAAEJ,UAAU,EAAE;EAC7C,MAAMa,YAAY,GAAGT,MAAM,CAACI,MAAM,CAACM,GAAG,CAACC,KAAK,IAAIf,UAAU,CAACgB,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,CAACH,KAAK,CAACI,GAAG,CAAC,CAAC,GAAGJ,KAAK,GAAG,IAAI,CAAC,CAACK,MAAM,CAACD,GAAG,IAAIA,GAAG,CAAC;EACtI,MAAME,WAAW,GAAGT,UAAU,CAACR,MAAM,CAACI,MAAM,CAAC;EAC7C,MAAMc,UAAU,GAAGD,WAAW,CAACD,MAAM,CAACL,KAAK,IAAI,CAACf,UAAU,CAACgB,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,CAACH,KAAK,CAACI,GAAG,CAAC,CAAC,CAAC;EACpGG,UAAU,CAACC,MAAM,CAACC,KAAK,CAACH,WAAW,EAAErB,UAAU,CAAC,EAAE,CAAC,EAAE,GAAGa,YAAY,CAAC,CAAC,CAAC;EACvET,MAAM,CAACI,MAAM,GAAGc,UAAU,CAAC,CAAC;AAC9B;;AAEA,SAASV,UAAUA,CAACJ,MAAM,EAAE;EAC1B,OAAO,CAAC,GAAGA,MAAM,CAAC,CAACH,IAAI,CAAC,CAACoB,CAAC,EAAEC,CAAC,KAAK;IAChC,IAAID,CAAC,CAACN,GAAG,GAAGO,CAAC,CAACP,GAAG,EAAE;MACjB,OAAO,CAAC;IACV;IACA,IAAIO,CAAC,CAACP,GAAG,GAAGM,CAAC,CAACN,GAAG,EAAE;MACjB,OAAO,CAAC,CAAC;IACX;IACA,OAAO,CAAC;EACV,CAAC,CAAC;AACJ;AAEA,SAASK,KAAKA,CAAChB,MAAM,EAAER,UAAU,EAAE;EACjC,OAAOQ,MAAM,CAACmB,SAAS,CAACZ,KAAK,IAAIf,UAAU,CAACgB,IAAI,CAACC,OAAO,IAAIA,OAAO,CAACC,IAAI,CAACH,KAAK,CAACI,GAAG,CAAC,CAAC,CAAC;AACvF"}

package/dist/sort-tags.spec.js

@@ -1,28 +1,207 @@
-/**
- *
- * @licstart  The following is the entire license notice for the JavaScript code in this file.
- *
- * MARC record validators used in Melinda
- *
- * Copyright (C) 2014-2018 University Of Helsinki (The National Library Of Finland)
- *
- * This file is part of marc-record-validators-melinda
- *
- * marc-record-validators-melinda program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * marc-record-validators-melinda is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- *
- */'use strict';var _chai=require('chai');var _marcRecord=require('@natlibfi/marc-record');var _sortTags=require('../src/sort-tags');var _sortTags2=_interopRequireDefault(_sortTags);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _asyncToGenerator(fn){return function(){var gen=fn.apply(this,arguments);return new Promise(function(resolve,reject){function step(key,arg){try{var info=gen[key](arg);var value=info.value}catch(error){reject(error);return}if(info.done){resolve(value)}else{return Promise.resolve(value).then(function(value){step('next',value)},function(err){step('throw',err)})}}return step('next')})}}describe('sort-tags',()=>{it('Creates a validator',_asyncToGenerator(function*(){const validator=yield(0,_sortTags2.default)();(0,_chai.expect)(validator).to.be.an('object').that.has.any.keys('description','validate');(0,_chai.expect)(validator.description).to.be.a('string');(0,_chai.expect)(validator.validate).to.be.a('function')}));describe('#validate',()=>{it('Finds the record valid',_asyncToGenerator(function*(){const validator=yield(0,_sortTags2.default)();const record=new _marcRecord.MarcRecord({fields:[{tag:'001',value:'100'},{tag:'008',value:'bar'},{tag:'100',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Foo Bar'}]},{tag:'245',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Fubar'}]}]});const result=yield validator.validate(record);(0,_chai.expect)(result).to.eql({valid:true,messages:[]})}));it('Finds the record invalid',_asyncToGenerator(function*(){const validator=yield(0,_sortTags2.default)();const record=new _marcRecord.MarcRecord({fields:[{tag:'008',value:'bar'},{tag:'001',value:'100'},{tag:'245',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Fubar'}]},{tag:'100',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Foo Bar'}]}]});const result=yield validator.validate(record);(0,_chai.expect)(result).to.eql({valid:false,messages:['Fields are in incorrect order']})}))});describe('#fix',()=>{it('Sorts with exclusion',_asyncToGenerator(function*(){const validator=yield(0,_sortTags2.default)([/^5..$/,/^7..$/]);const record=new _marcRecord.MarcRecord({fields:[{tag:'001',value:'100'},{tag:'530',value:'bar'},{tag:'30',value:'bar'},{tag:'c',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Fubar'}]},{tag:'520',ind1:' ',ind2:' ',subfields:[{code:'a',value:'asdassdaasdsadsasad'}]},{tag:'a',ind1:' ',ind2:' ',subfields:[{code:'a',value:'qweweqewqqweweqwq'}]},{tag:'700',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Bar Foo'}]},{tag:'711',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Foo'}]},{tag:'710',ind1:' ',ind2:' ',subfields:[{code:'w',value:'Bar'}]}]});yield validator.fix(record);(0,_chai.expect)(record.fields).to.eql([{tag:'001',value:'100'},{tag:'30',value:'bar'},{tag:'530',value:'bar'},{tag:'520',ind1:' ',ind2:' ',subfields:[{code:'a',value:'asdassdaasdsadsasad'}]},{tag:'700',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Bar Foo'}]},{tag:'711',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Foo'}]},{tag:'710',ind1:' ',ind2:' ',subfields:[{code:'w',value:'Bar'}]},{tag:'a',ind1:' ',ind2:' ',subfields:[{code:'a',value:'qweweqewqqweweqwq'}]},{tag:'c',ind1:' ',ind2:' ',subfields:[{code:'a',value:'Fubar'}]}])}))})});
+"use strict";
+
+var _chai = require("chai");
+var _marcRecord = require("@natlibfi/marc-record");
+var _sortTags = _interopRequireDefault(require("../src/sort-tags"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+describe('sort-tags', () => {
+  it('Creates a validator', async () => {
+    const validator = await (0, _sortTags.default)();
+    (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
+    (0, _chai.expect)(validator.description).to.be.a('string');
+    (0, _chai.expect)(validator.validate).to.be.a('function');
+  });
+  describe('#validate', () => {
+    it('Finds the record valid', async () => {
+      const validator = await (0, _sortTags.default)();
+      const record = new _marcRecord.MarcRecord({
+        fields: [{
+          tag: '001',
+          value: '100'
+        }, {
+          tag: '008',
+          value: 'bar'
+        }, {
+          tag: '100',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Foo Bar'
+          }]
+        }, {
+          tag: '245',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Fubar'
+          }]
+        }]
+      });
+      const result = await validator.validate(record);
+      (0, _chai.expect)(result).to.eql({
+        valid: true,
+        messages: []
+      });
+    });
+    it('Finds the record invalid', async () => {
+      const validator = await (0, _sortTags.default)();
+      const record = new _marcRecord.MarcRecord({
+        fields: [{
+          tag: '008',
+          value: 'bar'
+        }, {
+          tag: '001',
+          value: '100'
+        }, {
+          tag: '245',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Fubar'
+          }]
+        }, {
+          tag: '100',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Foo Bar'
+          }]
+        }]
+      });
+      const result = await validator.validate(record);
+      (0, _chai.expect)(result).to.eql({
+        valid: false,
+        messages: ['Fields are in incorrect order']
+      });
+    });
+  });
+  describe('#fix', () => {
+    it('Sorts with exclusion', async () => {
+      const validator = await (0, _sortTags.default)([/^5..$/u, /^7..$/u]);
+      const record = new _marcRecord.MarcRecord({
+        fields: [{
+          tag: '001',
+          value: '100'
+        }, {
+          tag: '530',
+          value: 'bar'
+        }, {
+          tag: '30',
+          value: 'bar'
+        }, {
+          tag: 'c',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Fubar'
+          }]
+        }, {
+          tag: '520',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'asdassdaasdsadsasad'
+          }]
+        }, {
+          tag: 'a',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'qweweqewqqweweqwq'
+          }]
+        }, {
+          tag: '700',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Bar Foo'
+          }]
+        }, {
+          tag: '711',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'a',
+            value: 'Foo'
+          }]
+        }, {
+          tag: '710',
+          ind1: ' ',
+          ind2: ' ',
+          subfields: [{
+            code: 'w',
+            value: 'Bar'
+          }]
+        }]
+      });
+      await validator.fix(record);
+      (0, _chai.expect)(record.fields).to.eql([{
+        tag: '001',
+        value: '100'
+      }, {
+        tag: '30',
+        value: 'bar'
+      }, {
+        tag: '530',
+        value: 'bar'
+      }, {
+        tag: '520',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'a',
+          value: 'asdassdaasdsadsasad'
+        }]
+      }, {
+        tag: '700',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'a',
+          value: 'Bar Foo'
+        }]
+      }, {
+        tag: '711',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'a',
+          value: 'Foo'
+        }]
+      }, {
+        tag: '710',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'w',
+          value: 'Bar'
+        }]
+      }, {
+        tag: 'a',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'a',
+          value: 'qweweqewqqweweqwq'
+        }]
+      }, {
+        tag: 'c',
+        ind1: ' ',
+        ind2: ' ',
+        subfields: [{
+          code: 'a',
+          value: 'Fubar'
+        }]
+      }]);
+    });
+  });
+});
 //# sourceMappingURL=sort-tags.spec.js.map

package/dist/sort-tags.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/sort-tags.spec.js"],"names":["describe","it","validator","to","be","an","that","has","any","keys","description","a","validate","record","MarcRecord","fields","tag","value","ind1","ind2","subfields","code","result","eql","valid","messages","fix"],"mappings":"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","file":"sort-tags.spec.js","sourcesContent":["/**\n *\n * @licstart  The following is the entire license notice for the JavaScript code in this file.\n *\n * MARC record validators used in Melinda\n *\n * Copyright (C) 2014-2018 University Of Helsinki (The National Library Of Finland)\n *\n * This file is part of marc-record-validators-melinda\n *\n * marc-record-validators-melinda program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the\n * License, or (at your option) any later version.\n *\n * marc-record-validators-melinda is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU Affero General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with this program.  If not, see <http://www.gnu.org/licenses/>.\n *\n * @licend  The above is the entire license notice\n * for the JavaScript code in this file.\n *\n */\n'use strict';\n\nimport {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from '../src/sort-tags';\n\ndescribe('sort-tags', () => {\n\tit('Creates a validator', async () => {\n\t\tconst validator = await validatorFactory();\n\n\t\texpect(validator)\n\t\t\t.to.be.an('object')\n\t\t\t.that.has.any.keys('description', 'validate');\n\n\t\texpect(validator.description).to.be.a('string');\n\t\texpect(validator.validate).to.be.a('function');\n\t});\n\n\tdescribe('#validate', () => {\n\t\tit('Finds the record valid', async () => {\n\t\t\tconst validator = await validatorFactory();\n\t\t\tconst record = new MarcRecord({\n\t\t\t\tfields: [\n\t\t\t\t\t{\n\t\t\t\t\t\ttag: '001',\n\t\t\t\t\t\tvalue: '100'\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\ttag: '008',\n\t\t\t\t\t\tvalue: 'bar'\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\ttag: '100',\n\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\tvalue: 'Foo Bar'\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t]\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\ttag: '245',\n\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\tvalue: 'Fubar'\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t]\n\t\t\t\t\t}\n\t\t\t\t]\n\t\t\t}\n\t\t\t);\n\t\t\tconst result = await validator.validate(record);\n\n\t\t\texpect(result).to.eql({valid: true, messages: []});\n\t\t});\n\t\tit('Finds the record invalid', async () => {\n\t\t\tconst validator = await validatorFactory();\n\t\t\tconst record = new MarcRecord(\n\t\t\t\t{\n\t\t\t\t\tfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '008',\n\t\t\t\t\t\t\tvalue: 'bar'\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '001',\n\t\t\t\t\t\t\tvalue: '100'\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '245',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'Fubar'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '100',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'Foo Bar'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t);\n\t\t\tconst result = await validator.validate(record);\n\t\t\texpect(result).to.eql({valid: false, messages: ['Fields are in incorrect order']});\n\t\t});\n\t});\n\n\tdescribe('#fix', () => {\n\t\tit('Sorts with exclusion', async () => {\n\t\t\tconst validator = await validatorFactory([/^5..$/, /^7..$/]);\n\t\t\tconst record = new MarcRecord(\n\t\t\t\t{\n\t\t\t\t\tfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '001',\n\t\t\t\t\t\t\tvalue: '100'\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '530',\n\t\t\t\t\t\t\tvalue: 'bar'\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '30',\n\t\t\t\t\t\t\tvalue: 'bar'\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: 'c',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'Fubar'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '520',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'asdassdaasdsadsasad'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: 'a',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'qweweqewqqweweqwq'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '700',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'Bar Foo'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '711',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\t\t\tvalue: 'Foo'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t},\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: '710',\n\t\t\t\t\t\t\tind1: ' ',\n\t\t\t\t\t\t\tind2: ' ',\n\t\t\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\t\tcode: 'w',\n\t\t\t\t\t\t\t\t\tvalue: 'Bar'\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t]\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t);\n\t\t\tawait validator.fix(record);\n\t\t\texpect(record.fields).to.eql([\n\t\t\t\t{\n\t\t\t\t\ttag: '001',\n\t\t\t\t\tvalue: '100'\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '30',\n\t\t\t\t\tvalue: 'bar'\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '530',\n\t\t\t\t\tvalue: 'bar'\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '520',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\tvalue: 'asdassdaasdsadsasad'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '700',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\tvalue: 'Bar Foo'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '711',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\tvalue: 'Foo'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: '710',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'w',\n\t\t\t\t\t\t\tvalue: 'Bar'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: 'a',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\tvalue: 'qweweqewqqweweqwq'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttag: 'c',\n\t\t\t\t\tind1: ' ',\n\t\t\t\t\tind2: ' ',\n\t\t\t\t\tsubfields: [\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\tcode: 'a',\n\t\t\t\t\t\t\tvalue: 'Fubar'\n\t\t\t\t\t\t}\n\t\t\t\t\t]\n\t\t\t\t}\n\t\t\t]);\n\t\t});\n\t});\n});\n"]}
+{"version":3,"file":"sort-tags.spec.js","names":["_chai","require","_marcRecord","_sortTags","_interopRequireDefault","obj","__esModule","default","describe","it","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","record","MarcRecord","fields","tag","value","ind1","ind2","subfields","code","result","eql","valid","messages","fix"],"sources":["../src/sort-tags.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from '../src/sort-tags';\n\ndescribe('sort-tags', () => {\n  it('Creates a validator', async () => {\n    const validator = await validatorFactory();\n\n    expect(validator)\n      .to.be.an('object')\n      .that.has.any.keys('description', 'validate');\n\n    expect(validator.description).to.be.a('string');\n    expect(validator.validate).to.be.a('function');\n  });\n\n  describe('#validate', () => {\n    it('Finds the record valid', async () => {\n      const validator = await validatorFactory();\n      const record = new MarcRecord({\n        fields: [\n          {\n            tag: '001',\n            value: '100'\n          },\n          {\n            tag: '008',\n            value: 'bar'\n          },\n          {\n            tag: '100',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Foo Bar'\n              }\n            ]\n          },\n          {\n            tag: '245',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Fubar'\n              }\n            ]\n          }\n        ]\n      });\n      const result = await validator.validate(record);\n\n      expect(result).to.eql({valid: true, messages: []});\n    });\n    it('Finds the record invalid', async () => {\n      const validator = await validatorFactory();\n      const record = new MarcRecord({\n        fields: [\n          {\n            tag: '008',\n            value: 'bar'\n          },\n          {\n            tag: '001',\n            value: '100'\n          },\n          {\n            tag: '245',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Fubar'\n              }\n            ]\n          },\n          {\n            tag: '100',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Foo Bar'\n              }\n            ]\n          }\n        ]\n      });\n      const result = await validator.validate(record);\n      expect(result).to.eql({valid: false, messages: ['Fields are in incorrect order']});\n    });\n  });\n\n  describe('#fix', () => {\n    it('Sorts with exclusion', async () => {\n      const validator = await validatorFactory([/^5..$/u, /^7..$/u]);\n      const record = new MarcRecord({\n        fields: [\n          {\n            tag: '001',\n            value: '100'\n          },\n          {\n            tag: '530',\n            value: 'bar'\n          },\n          {\n            tag: '30',\n            value: 'bar'\n          },\n          {\n            tag: 'c',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Fubar'\n              }\n            ]\n          },\n          {\n            tag: '520',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'asdassdaasdsadsasad'\n              }\n            ]\n          },\n          {\n            tag: 'a',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'qweweqewqqweweqwq'\n              }\n            ]\n          },\n          {\n            tag: '700',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Bar Foo'\n              }\n            ]\n          },\n          {\n            tag: '711',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'a',\n                value: 'Foo'\n              }\n            ]\n          },\n          {\n            tag: '710',\n            ind1: ' ',\n            ind2: ' ',\n            subfields: [\n              {\n                code: 'w',\n                value: 'Bar'\n              }\n            ]\n          }\n        ]\n      });\n      await validator.fix(record);\n      expect(record.fields).to.eql([\n        {\n          tag: '001',\n          value: '100'\n        },\n        {\n          tag: '30',\n          value: 'bar'\n        },\n        {\n          tag: '530',\n          value: 'bar'\n        },\n        {\n          tag: '520',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'a',\n              value: 'asdassdaasdsadsasad'\n            }\n          ]\n        },\n        {\n          tag: '700',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'a',\n              value: 'Bar Foo'\n            }\n          ]\n        },\n        {\n          tag: '711',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'a',\n              value: 'Foo'\n            }\n          ]\n        },\n        {\n          tag: '710',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'w',\n              value: 'Bar'\n            }\n          ]\n        },\n        {\n          tag: 'a',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'a',\n              value: 'qweweqewqqweweqwq'\n            }\n          ]\n        },\n        {\n          tag: 'c',\n          ind1: ' ',\n          ind2: ' ',\n          subfields: [\n            {\n              code: 'a',\n              value: 'Fubar'\n            }\n          ]\n        }\n      ]);\n    });\n  });\n});\n"],"mappings":"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"}

package/dist/sortRelatorTerms.js

@@ -0,0 +1,135 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+exports.sortAdjacentESubfields = sortAdjacentESubfields;
+var _clone = _interopRequireDefault(require("clone"));
+var _utils = require("./utils");
+var _punctuation = require("./punctuation2");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Validator/fixer for sorting $e relator term subfields
+//
+// Author(s): Nicholas Volk
+
+//import createDebugLogger from 'debug';
+
+//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortRelatorTerms');
+//const debugData = debug.extend('data');
+const WORST_WORK = 98;
+const relatorTermValues = {
+  // The higher, the better
+  // More abstract, the earlier it appears.
+  // Note that terms with same abstraction level might also have order preferences
+  // work/teos > expression/ekspressio > manifestation/manifestaatio
+  'säveltäjä': 100,
+  'kirjoittaja': 99,
+  // Viola wants composer/säveltäjä on top (highly unlikely to ever appear together, but...)
+  'taiteilija': 98,
+  'sanoittaja': 90,
+  // ekspressio
+  'sovittaja': 80,
+  'toimittaja': 80,
+  'kuvittaja': 75,
+  'editointi': 71,
+  'kääntäjä': 70,
+  'lukija': 61,
+  // manifestaatio
+  'esittäjä': 60,
+  'johtaja': 50,
+  'kustantaja': 41,
+  'julkaisija': 40
+};
+function scoreRelatorTerm(term) {
+  const normalizedTerm = normalizeValue(term);
+  if (normalizedTerm in relatorTermValues) {
+    return relatorTermValues[normalizedTerm];
+  }
+  return 0;
+}
+function _default() {
+  return {
+    description: 'Sort adjacent $e subfields in field [1678][01]0',
+    validate,
+    fix
+  };
+  function fix(record) {
+    const res = {
+      message: [],
+      fix: [],
+      valid: true
+    };
+    record.fields.forEach(field => {
+      sortAdjacentESubfields(field);
+    });
+    return res;
+  }
+  function validate(record) {
+    const res = {
+      message: []
+    };
+    record.fields.forEach(field => {
+      const clonedField = (0, _clone.default)(field);
+      sortAdjacentESubfields(clonedField);
+      const clonedFieldAsString = (0, _utils.fieldToString)(clonedField);
+      const fieldAsString = (0, _utils.fieldToString)(field);
+      if (fieldAsString !== clonedFieldAsString) {
+        // eslint-disable-line functional/no-conditional-statements
+        res.message.push(`${fieldAsString} => ${clonedFieldAsString}`); // eslint-disable-line functional/immutable-data
+      }
+    });
+
+    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data
+    return res;
+  }
+}
+function normalizeValue(value) {
+  // Removing last punc char is good enough for our purposes.
+  // We don't handle abbreviations here etc.
+  // Brackets should not happen either, should they?
+  return value.replace(/[.,]$/u, '');
+}
+function swapESubfields(field) {
+  if (!field.subfields) {
+    return;
+  }
+  const loopAgain = field.subfields.some((sf, index) => {
+    if (index === 0 || sf.code !== 'e') {
+      return false;
+    }
+    const currScore = scoreRelatorTerm(sf.value);
+    const prevSubfield = field.subfields[index - 1];
+    if (currScore === 0 || prevSubfield.code !== 'e') {
+      return false;
+    }
+    const prevScore = scoreRelatorTerm(prevSubfield.value);
+
+    // If this subfield maps to a Work, then subfields can be swapped, even if we don't have a score for the prev subfield!
+    if (prevScore === 0 && currScore < WORST_WORK) {
+      return false;
+    }
+    if (currScore > prevScore) {
+      // Swap:
+      const tmp = field.subfields[index - 1];
+      field.subfields[index - 1] = sf; // eslint-disable-line functional/immutable-data
+      field.subfields[index] = tmp; // eslint-disable-line functional/immutable-data
+      (0, _punctuation.fieldFixPunctuation)(field);
+      return true;
+    }
+    return false;
+  });
+  if (loopAgain) {
+    swapESubfields(field); // uh, evil recursion...
+    return;
+  }
+  return;
+}
+function sortAdjacentESubfields(field) {
+  if (!field.subfields) {
+    return field;
+  }
+  swapESubfields(field);
+  return field;
+}
+//# sourceMappingURL=sortRelatorTerms.js.map

package/dist/sortRelatorTerms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortRelatorTerms.js","names":["_clone","_interopRequireDefault","require","_utils","_punctuation","obj","__esModule","default","WORST_WORK","relatorTermValues","scoreRelatorTerm","term","normalizedTerm","normalizeValue","_default","description","validate","fix","record","res","message","valid","fields","forEach","field","sortAdjacentESubfields","clonedField","clone","clonedFieldAsString","fieldToString","fieldAsString","push","length","value","replace","swapESubfields","subfields","loopAgain","some","sf","index","code","currScore","prevSubfield","prevScore","tmp","fieldFixPunctuation"],"sources":["../src/sortRelatorTerms.js"],"sourcesContent":["// Validator/fixer for sorting $e relator term subfields\n//\n// Author(s): Nicholas Volk\n\nimport clone from 'clone';\n//import createDebugLogger from 'debug';\nimport {fieldToString} from './utils';\nimport {fieldFixPunctuation} from './punctuation2';\n//const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:sortRelatorTerms');\n//const debugData = debug.extend('data');\n\nconst WORST_WORK = 98;\n\nconst relatorTermValues = { // The higher, the better\n  // More abstract, the earlier it appears.\n  // Note that terms with same abstraction level might also have order preferences\n  // work/teos > expression/ekspressio > manifestation/manifestaatio\n  'säveltäjä': 100,\n  'kirjoittaja': 99, // Viola wants composer/säveltäjä on top (highly unlikely to ever appear together, but...)\n  'taiteilija': 98,\n  'sanoittaja': 90,\n  // ekspressio\n  'sovittaja': 80,\n  'toimittaja': 80,\n  'kuvittaja': 75,\n  'editointi': 71,\n  'kääntäjä': 70,\n  'lukija': 61,\n  // manifestaatio\n  'esittäjä': 60,\n  'johtaja': 50,\n  'kustantaja': 41,\n  'julkaisija': 40\n\n};\n\nfunction scoreRelatorTerm(term) {\n  const normalizedTerm = normalizeValue(term);\n  if (normalizedTerm in relatorTermValues) {\n    return relatorTermValues[normalizedTerm];\n  }\n  return 0;\n}\n\nexport default function () {\n\n  return {\n    description: 'Sort adjacent $e subfields in field [1678][01]0',\n    validate, fix\n  };\n\n  function fix(record) {\n    const res = {message: [], fix: [], valid: true};\n\n    record.fields.forEach(field => {\n      sortAdjacentESubfields(field);\n    });\n\n    return res;\n  }\n\n  function validate(record) {\n    const res = {message: []};\n\n    record.fields.forEach(field => {\n      const clonedField = clone(field);\n      sortAdjacentESubfields(clonedField);\n      const clonedFieldAsString = fieldToString(clonedField);\n      const fieldAsString = fieldToString(field);\n      if (fieldAsString !== clonedFieldAsString) { // eslint-disable-line functional/no-conditional-statements\n        res.message.push(`${fieldAsString} => ${clonedFieldAsString}`); // eslint-disable-line functional/immutable-data\n      }\n    });\n\n    res.valid = !(res.message.length >= 1); // eslint-disable-line functional/immutable-data\n    return res;\n  }\n}\n\n\nfunction normalizeValue(value) {\n  // Removing last punc char is good enough for our purposes.\n  // We don't handle abbreviations here etc.\n  // Brackets should not happen either, should they?\n  return value.replace(/[.,]$/u, '');\n}\n\n\nfunction swapESubfields(field) {\n  if (!field.subfields) {\n    return;\n  }\n\n  const loopAgain = field.subfields.some((sf, index) => {\n    if (index === 0 || sf.code !== 'e') {\n      return false;\n    }\n    const currScore = scoreRelatorTerm(sf.value);\n\n    const prevSubfield = field.subfields[index - 1];\n    if (currScore === 0 || prevSubfield.code !== 'e') {\n      return false;\n    }\n    const prevScore = scoreRelatorTerm(prevSubfield.value);\n\n\n    // If this subfield maps to a Work, then subfields can be swapped, even if we don't have a score for the prev subfield!\n    if (prevScore === 0 && currScore < WORST_WORK) {\n      return false;\n    }\n\n    if (currScore > prevScore) {\n      // Swap:\n      const tmp = field.subfields[index - 1];\n      field.subfields[index - 1] = sf; // eslint-disable-line functional/immutable-data\n      field.subfields[index] = tmp; // eslint-disable-line functional/immutable-data\n      fieldFixPunctuation(field);\n      return true;\n    }\n\n    return false;\n\n  });\n\n  if (loopAgain) {\n    swapESubfields(field); // uh, evil recursion...\n    return;\n  }\n\n  return;\n\n}\n\nexport function sortAdjacentESubfields(field) {\n  if (!field.subfields) {\n    return field;\n  }\n  swapESubfields(field);\n\n  return field;\n}\n\n"],"mappings":"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"}

package/dist/sortRelatorTerms.spec.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _chai = require("chai");
+var _marcRecord = require("@natlibfi/marc-record");
+var _sortRelatorTerms = _interopRequireDefault(require("./sortRelatorTerms"));
+var _fixura = require("@natlibfi/fixura");
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
+var _debug = _interopRequireDefault(require("debug"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'sort-relator-terms'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: _fixura.READERS.JSON
+  },
+  mocha: {
+    before: () => testValidatorFactory()
+  }
+});
+const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda/sortRelatorTerms:test');
+async function testValidatorFactory() {
+  const validator = await (0, _sortRelatorTerms.default)();
+  (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
+  (0, _chai.expect)(validator.description).to.be.a('string');
+  (0, _chai.expect)(validator.validate).to.be.a('function');
+}
+async function callback({
+  getFixture,
+  enabled = true,
+  fix = false
+}) {
+  if (enabled === false) {
+    debug('TEST SKIPPED!');
+    return;
+  }
+  const validator = await (0, _sortRelatorTerms.default)();
+  const record = new _marcRecord.MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    (0, _chai.expect)(result).to.eql(expectedResult);
+    return;
+  }
+  await validator.fix(record);
+  (0, _chai.expect)(record).to.eql(expectedResult);
+}
+//# sourceMappingURL=sortRelatorTerms.spec.js.map

package/dist/sortRelatorTerms.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortRelatorTerms.spec.js","names":["_chai","require","_marcRecord","_sortRelatorTerms","_interopRequireDefault","_fixura","_fixugen","_debug","obj","__esModule","default","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","debug","createDebugLogger","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","enabled","fix","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/sortRelatorTerms.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './sortRelatorTerms';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'sort-relator-terms'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/sortRelatorTerms:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  expect(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  expect(validator.description).to.be.a('string');\n  expect(validator.validate).to.be.a('function');\n}\n\nasync function callback({getFixture, enabled = true, fix = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    expect(result).to.eql(expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  expect(record).to.eql(expectedResult);\n}\n"],"mappings":";;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,MAAA,GAAAH,sBAAA,CAAAH,OAAA;AAAsC,SAAAG,uBAAAI,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAEtC,IAAAG,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,oBAAoB,CAAC;EAC9DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAEA,CAAA,KAAMC,oBAAoB,CAAC;EACrC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,gEAAgE,CAAC;AAEjG,eAAeF,oBAAoBA,CAAA,EAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,yBAAgB,EAAC,CAAC;EAE1C,IAAAC,YAAM,EAACF,SAAS,CAAC,CACdG,EAAE,CAACC,EAAE,CAACC,EAAE,CAAC,QAAQ,CAAC,CAClBC,IAAI,CAACC,GAAG,CAACC,GAAG,CAACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;EAE/C,IAAAP,YAAM,EAACF,SAAS,CAACU,WAAW,CAAC,CAACP,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,QAAQ,CAAC;EAC/C,IAAAT,YAAM,EAACF,SAAS,CAACY,QAAQ,CAAC,CAACT,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,UAAU,CAAC;AAChD;AAEA,eAAezB,QAAQA,CAAC;EAAC2B,UAAU;EAAEC,OAAO,GAAG,IAAI;EAAEC,GAAG,GAAG;AAAK,CAAC,EAAE;EACjE,IAAID,OAAO,KAAK,KAAK,EAAE;IACrBhB,KAAK,CAAC,eAAe,CAAC;IACtB;EACF;EAEA,MAAME,SAAS,GAAG,MAAM,IAAAC,yBAAgB,EAAC,CAAC;EAC1C,MAAMe,MAAM,GAAG,IAAIC,sBAAU,CAACJ,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMK,cAAc,GAAGL,UAAU,CAAC,qBAAqB,CAAC;EACxD;;EAEA,IAAI,CAACE,GAAG,EAAE;IACR,MAAMI,MAAM,GAAG,MAAMnB,SAAS,CAACY,QAAQ,CAACI,MAAM,CAAC;IAC/C,IAAAd,YAAM,EAACiB,MAAM,CAAC,CAAChB,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMlB,SAAS,CAACe,GAAG,CAACC,MAAM,CAAC;EAC3B,IAAAd,YAAM,EAACc,MAAM,CAAC,CAACb,EAAE,CAACiB,GAAG,CAACF,cAAc,CAAC;AACvC"}