@natlibfi/marc-record-validators-melinda 10.1.0 → 10.2.0

package/dist/ending-whitespace.js

@@ -17,7 +17,7 @@ function _default() {
   function validate(record) {
     const nonValidFields = record.fields.filter(({
       subfields
-    }) => subfields.filter(valueEndsWithWhitespace).length > 0);
+    }) => subfields !== undefined && subfields.filter(valueEndsWithWhitespace).length > 0);
     const valid = nonValidFields.length === 0;
     const messages = nonValidFields.flatMap(({
       tag,
@@ -37,6 +37,9 @@ function _default() {
     record.fields.forEach(({
       subfields
     }) => {
+      if (subfields === undefined) {
+        return;
+      }
       subfields.forEach(subfield => {
         if (valueEndsWithWhitespace(subfield)) {
           subfield.value = subfield.value.trimEnd();

package/dist/ending-whitespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"ending-whitespace.js","names":["description","validate","fix","record","nonValidFields","fields","filter","subfields","valueEndsWithWhitespace","length","valid","messages","flatMap","tag","map","sf","code","forEach","subfield","value","trimEnd","test"],"sources":["../src/ending-whitespace.js"],"sourcesContent":["/**\n * Provides interface to validate and fix record fields, which include subfields that end with whitespace character\n * @returns {Object} Object containing interfaces required by marc-record-validators-melinda package\n */\nexport default function () {\n  return {\n    description: 'Handles subfields that ends with whitespace character',\n    validate,\n    fix\n  };\n\n  function validate(record) {\n    const nonValidFields = record.fields.filter(({subfields}) => subfields.filter(valueEndsWithWhitespace).length > 0);\n\n    const valid = nonValidFields.length === 0;\n    const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} ends with whitespace`));\n\n    return valid ? {valid, messages: []} : {valid, messages};\n  }\n\n  /* eslint-disable functional/immutable-data,functional/no-conditional-statement */\n  function fix(record) {\n    record.fields.forEach(({subfields}) => {\n      subfields.forEach(subfield => {\n        if (valueEndsWithWhitespace(subfield)) {\n          subfield.value = subfield.value.trimEnd();\n        }\n      });\n    });\n  }\n  /* eslint-enable functional/immutable-data,functional/no-conditional-statement */\n\n  function valueEndsWithWhitespace({value}) {\n    return (/\\s$/u).test(value);\n  }\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACe,oBAAY;EACzB,OAAO;IACLA,WAAW,EAAE,uDAAuD;IACpEC,QAAQ;IACRC;EACF,CAAC;EAED,SAASD,QAAQ,CAACE,MAAM,EAAE;IACxB,MAAMC,cAAc,GAAGD,MAAM,CAACE,MAAM,CAACC,MAAM,CAAC,CAAC;MAACC;IAAS,CAAC,KAAKA,SAAS,CAACD,MAAM,CAACE,uBAAuB,CAAC,CAACC,MAAM,GAAG,CAAC,CAAC;IAElH,MAAMC,KAAK,GAAGN,cAAc,CAACK,MAAM,KAAK,CAAC;IACzC,MAAME,QAAQ,GAAGP,cAAc,CAACQ,OAAO,CAAC,CAAC;MAACC,GAAG;MAAEN;IAAS,CAAC,KAAKA,SAAS,CAACO,GAAG,CAACC,EAAE,IAAK,SAAQF,GAAI,cAAaE,EAAE,CAACC,IAAK,uBAAsB,CAAC,CAAC;IAE5I,OAAON,KAAK,GAAG;MAACA,KAAK;MAAEC,QAAQ,EAAE;IAAE,CAAC,GAAG;MAACD,KAAK;MAAEC;IAAQ,CAAC;EAC1D;;EAEA;EACA,SAAST,GAAG,CAACC,MAAM,EAAE;IACnBA,MAAM,CAACE,MAAM,CAACY,OAAO,CAAC,CAAC;MAACV;IAAS,CAAC,KAAK;MACrCA,SAAS,CAACU,OAAO,CAACC,QAAQ,IAAI;QAC5B,IAAIV,uBAAuB,CAACU,QAAQ,CAAC,EAAE;UACrCA,QAAQ,CAACC,KAAK,GAAGD,QAAQ,CAACC,KAAK,CAACC,OAAO,EAAE;QAC3C;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ;EACA;;EAEA,SAASZ,uBAAuB,CAAC;IAACW;EAAK,CAAC,EAAE;IACxC,OAAQ,MAAM,CAAEE,IAAI,CAACF,KAAK,CAAC;EAC7B;AACF"}
+{"version":3,"file":"ending-whitespace.js","names":["description","validate","fix","record","nonValidFields","fields","filter","subfields","undefined","valueEndsWithWhitespace","length","valid","messages","flatMap","tag","map","sf","code","forEach","subfield","value","trimEnd","test"],"sources":["../src/ending-whitespace.js"],"sourcesContent":["/**\n * Provides interface to validate and fix record fields, which include subfields that end with whitespace character\n * @returns {Object} Object containing interfaces required by marc-record-validators-melinda package\n */\nexport default function () {\n  return {\n    description: 'Handles subfields that ends with whitespace character',\n    validate,\n    fix\n  };\n\n  function validate(record) {\n    const nonValidFields = record.fields.filter(({subfields}) => subfields !== undefined && subfields.filter(valueEndsWithWhitespace).length > 0);\n\n    const valid = nonValidFields.length === 0;\n    const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} ends with whitespace`));\n\n    return valid ? {valid, messages: []} : {valid, messages};\n  }\n\n  /* eslint-disable functional/immutable-data,functional/no-conditional-statement */\n  function fix(record) {\n    record.fields.forEach(({subfields}) => {\n      if (subfields === undefined) {\n        return;\n      }\n\n      subfields.forEach(subfield => {\n        if (valueEndsWithWhitespace(subfield)) {\n          subfield.value = subfield.value.trimEnd();\n        }\n      });\n    });\n  }\n  /* eslint-enable functional/immutable-data,functional/no-conditional-statement */\n\n  function valueEndsWithWhitespace({value}) {\n    return (/\\s$/u).test(value);\n  }\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACe,oBAAY;EACzB,OAAO;IACLA,WAAW,EAAE,uDAAuD;IACpEC,QAAQ;IACRC;EACF,CAAC;EAED,SAASD,QAAQ,CAACE,MAAM,EAAE;IACxB,MAAMC,cAAc,GAAGD,MAAM,CAACE,MAAM,CAACC,MAAM,CAAC,CAAC;MAACC;IAAS,CAAC,KAAKA,SAAS,KAAKC,SAAS,IAAID,SAAS,CAACD,MAAM,CAACG,uBAAuB,CAAC,CAACC,MAAM,GAAG,CAAC,CAAC;IAE7I,MAAMC,KAAK,GAAGP,cAAc,CAACM,MAAM,KAAK,CAAC;IACzC,MAAME,QAAQ,GAAGR,cAAc,CAACS,OAAO,CAAC,CAAC;MAACC,GAAG;MAAEP;IAAS,CAAC,KAAKA,SAAS,CAACQ,GAAG,CAACC,EAAE,IAAK,SAAQF,GAAI,cAAaE,EAAE,CAACC,IAAK,uBAAsB,CAAC,CAAC;IAE5I,OAAON,KAAK,GAAG;MAACA,KAAK;MAAEC,QAAQ,EAAE;IAAE,CAAC,GAAG;MAACD,KAAK;MAAEC;IAAQ,CAAC;EAC1D;;EAEA;EACA,SAASV,GAAG,CAACC,MAAM,EAAE;IACnBA,MAAM,CAACE,MAAM,CAACa,OAAO,CAAC,CAAC;MAACX;IAAS,CAAC,KAAK;MACrC,IAAIA,SAAS,KAAKC,SAAS,EAAE;QAC3B;MACF;MAEAD,SAAS,CAACW,OAAO,CAACC,QAAQ,IAAI;QAC5B,IAAIV,uBAAuB,CAACU,QAAQ,CAAC,EAAE;UACrCA,QAAQ,CAACC,KAAK,GAAGD,QAAQ,CAACC,KAAK,CAACC,OAAO,EAAE;QAC3C;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ;EACA;;EAEA,SAASZ,uBAAuB,CAAC;IAACW;EAAK,CAAC,EAAE;IACxC,OAAQ,MAAM,CAAEE,IAAI,CAACF,KAAK,CAAC;EAC7B;AACF"}

package/dist/ending-whitespace.spec.js

@@ -5,7 +5,6 @@ var _marcRecord = require("@natlibfi/marc-record");
 var _endingWhitespace = _interopRequireDefault(require("./ending-whitespace"));
 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,
@@ -19,7 +18,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     before: () => testValidatorFactory()
   }
 });
-const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda/ending-whitespace:test');
 async function testValidatorFactory() {
   const validator = await (0, _endingWhitespace.default)();
   (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
@@ -28,13 +26,8 @@ async function testValidatorFactory() {
 }
 async function callback({
   getFixture,
-  enabled = true,
   fix = false
 }) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
   const validator = await (0, _endingWhitespace.default)();
   const record = new _marcRecord.MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/dist/ending-whitespace.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ending-whitespace.spec.js","names":["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/ending-whitespace.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './ending-whitespace';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'ending-whitespace'],\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/ending-whitespace: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\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;AACA;AACA;AACA;AACA;AACA;AAAsC;AAEtC,IAAAA,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,mBAAmB,CAAC;EAC7DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAE,MAAMC,oBAAoB;EACpC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,iEAAiE,CAAC;AAElG,eAAeF,oBAAoB,GAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;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,QAAQ,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,GAAE;EAC1C,MAAMe,MAAM,GAAG,IAAIC,sBAAU,CAACJ,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMK,cAAc,GAAGL,UAAU,CAAC,qBAAqB,CAAC;EAExD,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"}
+{"version":3,"file":"ending-whitespace.spec.js","names":["generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","fix","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/ending-whitespace.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './ending-whitespace';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'ending-whitespace'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\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, fix = false}) {\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\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;AACA;AACA;AACA;AACA;AAA8C;AAE9C,IAAAA,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,mBAAmB,CAAC;EAC7DC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAE,MAAMC,oBAAoB;EACpC;AACF,CAAC,CAAC;AAEF,eAAeA,oBAAoB,GAAG;EACpC,MAAMC,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;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,eAAevB,QAAQ,CAAC;EAACyB,UAAU;EAAEC,GAAG,GAAG;AAAK,CAAC,EAAE;EACjD,MAAMd,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;EAC1C,MAAMc,MAAM,GAAG,IAAIC,sBAAU,CAACH,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMI,cAAc,GAAGJ,UAAU,CAAC,qBAAqB,CAAC;EAExD,IAAI,CAACC,GAAG,EAAE;IACR,MAAMI,MAAM,GAAG,MAAMlB,SAAS,CAACY,QAAQ,CAACG,MAAM,CAAC;IAC/C,IAAAb,YAAM,EAACgB,MAAM,CAAC,CAACf,EAAE,CAACgB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMjB,SAAS,CAACc,GAAG,CAACC,MAAM,CAAC;EAC3B,IAAAb,YAAM,EAACa,MAAM,CAAC,CAACZ,EAAE,CAACgB,GAAG,CAACF,cAAc,CAAC;AACvC"}

package/dist/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "EndingPunctuation", {
     return _endingPunctuation.default;
   }
 });
+Object.defineProperty(exports, "EndingWhitespace", {
+  enumerable: true,
+  get: function () {
+    return _endingWhitespace.default;
+  }
+});
 Object.defineProperty(exports, "FieldExclusion", {
   enumerable: true,
   get: function () {
@@ -75,6 +81,12 @@ Object.defineProperty(exports, "ItemLanguage", {
     return _itemLanguage.default;
   }
 });
+Object.defineProperty(exports, "NonBreakingSpace", {
+  enumerable: true,
+  get: function () {
+    return _nonBreakingSpace.default;
+  }
+});
 Object.defineProperty(exports, "NormalizeUTF8Diacritics", {
   enumerable: true,
   get: function () {
@@ -134,6 +146,7 @@ var _doubleCommas = _interopRequireDefault(require("./double-commas"));
 var _duplicatesInd = _interopRequireDefault(require("./duplicates-ind1"));
 var _emptyFields = _interopRequireDefault(require("./empty-fields"));
 var _endingPunctuation = _interopRequireDefault(require("./ending-punctuation"));
+var _endingWhitespace = _interopRequireDefault(require("./ending-whitespace"));
 var _fieldsPresent = _interopRequireDefault(require("./fields-present"));
 var _fieldStructure = _interopRequireDefault(require("./field-structure"));
 var _fixedFields = _interopRequireDefault(require("./fixed-fields"));
@@ -141,6 +154,7 @@ var _fieldExclusion = _interopRequireDefault(require("./field-exclusion"));
 var _identicalFields = _interopRequireDefault(require("./identical-fields"));
 var _isbnIssn = _interopRequireDefault(require("./isbn-issn"));
 var _itemLanguage = _interopRequireDefault(require("./item-language"));
+var _nonBreakingSpace = _interopRequireDefault(require("./non-breaking-space"));
 var _normalizeUtf8Diacritics = _interopRequireDefault(require("./normalize-utf8-diacritics"));
 var _punctuation = _interopRequireDefault(require("./punctuation/"));
 var _resolveOrphanedSubfield6s = _interopRequireDefault(require("./resolveOrphanedSubfield6s"));

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.js"],"sourcesContent":["import AccessRights from './access-rights';\nimport DoubleCommas from './double-commas';\nimport DuplicatesInd1 from './duplicates-ind1';\nimport EmptyFields from './empty-fields';\nimport EndingPunctuation from './ending-punctuation';\nimport FieldsPresent from './fields-present';\nimport FieldStructure from './field-structure';\nimport FixedFields from './fixed-fields';\nimport FieldExclusion from './field-exclusion';\nimport IdenticalFields from './identical-fields';\nimport IsbnIssn from './isbn-issn';\nimport ItemLanguage from './item-language';\nimport NormalizeUTF8Diacritics from './normalize-utf8-diacritics';\nimport Punctuation from './punctuation/';\nimport ResolveOrphanedSubfield6s from './resolveOrphanedSubfield6s'; // Do this before reindexing!\nimport ReindexSubfield6OccurenceNumbers from './reindexSubfield6OccurenceNumbers';\nimport ResolvableExtReferences from './resolvable-ext-references-melinda';\n\nimport SortTags from './sort-tags';\nimport SubfieldExclusion from './subfield-exclusion';\nimport UnicodeDecomposition from './unicode-decomposition';\nimport Urn from './urn';\n\nexport {\n  AccessRights,\n  DoubleCommas,\n  DuplicatesInd1,\n  EmptyFields,\n  EndingPunctuation,\n  FieldExclusion,\n  FieldsPresent,\n  FieldStructure,\n  FixedFields,\n  IdenticalFields,\n  IsbnIssn,\n  ItemLanguage,\n  NormalizeUTF8Diacritics,\n  Punctuation,\n  ResolveOrphanedSubfield6s,\n  ReindexSubfield6OccurenceNumbers,\n  ResolvableExtReferences,\n  SortTags,\n  SubfieldExclusion,\n  UnicodeDecomposition,\n  Urn\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAwB"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.js"],"sourcesContent":["import AccessRights from './access-rights';\nimport DoubleCommas from './double-commas';\nimport DuplicatesInd1 from './duplicates-ind1';\nimport EmptyFields from './empty-fields';\nimport EndingPunctuation from './ending-punctuation';\nimport EndingWhitespace from './ending-whitespace';\nimport FieldsPresent from './fields-present';\nimport FieldStructure from './field-structure';\nimport FixedFields from './fixed-fields';\nimport FieldExclusion from './field-exclusion';\nimport IdenticalFields from './identical-fields';\nimport IsbnIssn from './isbn-issn';\nimport ItemLanguage from './item-language';\nimport NonBreakingSpace from './non-breaking-space';\nimport NormalizeUTF8Diacritics from './normalize-utf8-diacritics';\nimport Punctuation from './punctuation/';\nimport ResolveOrphanedSubfield6s from './resolveOrphanedSubfield6s'; // Do this before reindexing!\nimport ReindexSubfield6OccurenceNumbers from './reindexSubfield6OccurenceNumbers';\nimport ResolvableExtReferences from './resolvable-ext-references-melinda';\n\nimport SortTags from './sort-tags';\nimport SubfieldExclusion from './subfield-exclusion';\nimport UnicodeDecomposition from './unicode-decomposition';\nimport Urn from './urn';\n\nexport {\n  AccessRights,\n  DoubleCommas,\n  DuplicatesInd1,\n  EmptyFields,\n  EndingPunctuation,\n  EndingWhitespace,\n  FieldExclusion,\n  FieldsPresent,\n  FieldStructure,\n  FixedFields,\n  IdenticalFields,\n  IsbnIssn,\n  ItemLanguage,\n  NonBreakingSpace,\n  NormalizeUTF8Diacritics,\n  Punctuation,\n  ResolveOrphanedSubfield6s,\n  ReindexSubfield6OccurenceNumbers,\n  ResolvableExtReferences,\n  SortTags,\n  SubfieldExclusion,\n  UnicodeDecomposition,\n  Urn\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AAAwB"}

package/dist/non-breaking-space.js

@@ -15,9 +15,7 @@ function _default() {
     fix
   };
   function validate(record) {
-    const nonValidFields = record.fields.filter(({
-      subfields
-    }) => subfields.filter(valueContainsNonBreakingSpace).length > 0);
+    const nonValidFields = record.fields.filter(field => collectNonValidFields(field));
     const valid = nonValidFields.length === 0;
     const messages = nonValidFields.flatMap(({
       tag,
@@ -30,14 +28,22 @@ function _default() {
       valid,
       messages
     };
+    function collectNonValidFields(field) {
+      if (field.value) {
+        return /\u00A0/u.test(field.value);
+      }
+      return field.subfields.filter(valueContainsNonBreakingSpace).length > 0;
+    }
   }
 
   /* eslint-disable functional/immutable-data,functional/no-conditional-statement */
   function fix(record) {
-    record.fields.forEach(({
-      subfields
-    }) => {
-      subfields.forEach(subfield => {
+    record.fields.forEach(field => {
+      if (field.value) {
+        field.value = field.value.replaceAll(/\u00A0/gu, ' ');
+        return;
+      }
+      field.subfields.forEach(subfield => {
         if (valueContainsNonBreakingSpace(subfield)) {
           subfield.value = subfield.value.replaceAll(/\u00A0/gu, ' ');
         }

package/dist/non-breaking-space.js.map

@@ -1 +1 @@
-{"version":3,"file":"non-breaking-space.js","names":["description","validate","fix","record","nonValidFields","fields","filter","subfields","valueContainsNonBreakingSpace","length","valid","messages","flatMap","tag","map","sf","code","forEach","subfield","value","replaceAll","test"],"sources":["../src/non-breaking-space.js"],"sourcesContent":["/**\n * Provides interface to validate and fix record fields, which include subfields that contain no-breaking space character\n * @returns {Object} Object containing interfaces required by marc-record-validators-melinda package\n */\nexport default function () {\n  return {\n    description: 'Handles subfields that contains non-breaking space character',\n    validate,\n    fix\n  };\n\n  function validate(record) {\n    const nonValidFields = record.fields.filter(({subfields}) => subfields.filter(valueContainsNonBreakingSpace).length > 0);\n\n    const valid = nonValidFields.length === 0;\n    const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} contains non-breaking space character(s)`));\n\n    return valid ? {valid, messages: []} : {valid, messages};\n  }\n\n  /* eslint-disable functional/immutable-data,functional/no-conditional-statement */\n  function fix(record) {\n    record.fields.forEach(({subfields}) => {\n      subfields.forEach(subfield => {\n        if (valueContainsNonBreakingSpace(subfield)) {\n          subfield.value = subfield.value.replaceAll(/\\u00A0/gu, ' ');\n        }\n      });\n    });\n  }\n  /* eslint-enable functional/immutable-data,functional/no-conditional-statement */\n\n  function valueContainsNonBreakingSpace({value}) {\n    return (/\\u00A0/u).test(value);\n  }\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACe,oBAAY;EACzB,OAAO;IACLA,WAAW,EAAE,8DAA8D;IAC3EC,QAAQ;IACRC;EACF,CAAC;EAED,SAASD,QAAQ,CAACE,MAAM,EAAE;IACxB,MAAMC,cAAc,GAAGD,MAAM,CAACE,MAAM,CAACC,MAAM,CAAC,CAAC;MAACC;IAAS,CAAC,KAAKA,SAAS,CAACD,MAAM,CAACE,6BAA6B,CAAC,CAACC,MAAM,GAAG,CAAC,CAAC;IAExH,MAAMC,KAAK,GAAGN,cAAc,CAACK,MAAM,KAAK,CAAC;IACzC,MAAME,QAAQ,GAAGP,cAAc,CAACQ,OAAO,CAAC,CAAC;MAACC,GAAG;MAAEN;IAAS,CAAC,KAAKA,SAAS,CAACO,GAAG,CAACC,EAAE,IAAK,SAAQF,GAAI,cAAaE,EAAE,CAACC,IAAK,2CAA0C,CAAC,CAAC;IAEhK,OAAON,KAAK,GAAG;MAACA,KAAK;MAAEC,QAAQ,EAAE;IAAE,CAAC,GAAG;MAACD,KAAK;MAAEC;IAAQ,CAAC;EAC1D;;EAEA;EACA,SAAST,GAAG,CAACC,MAAM,EAAE;IACnBA,MAAM,CAACE,MAAM,CAACY,OAAO,CAAC,CAAC;MAACV;IAAS,CAAC,KAAK;MACrCA,SAAS,CAACU,OAAO,CAACC,QAAQ,IAAI;QAC5B,IAAIV,6BAA6B,CAACU,QAAQ,CAAC,EAAE;UAC3CA,QAAQ,CAACC,KAAK,GAAGD,QAAQ,CAACC,KAAK,CAACC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC;QAC7D;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ;EACA;;EAEA,SAASZ,6BAA6B,CAAC;IAACW;EAAK,CAAC,EAAE;IAC9C,OAAQ,SAAS,CAAEE,IAAI,CAACF,KAAK,CAAC;EAChC;AACF"}
+{"version":3,"file":"non-breaking-space.js","names":["description","validate","fix","record","nonValidFields","fields","filter","field","collectNonValidFields","valid","length","messages","flatMap","tag","subfields","map","sf","code","value","test","valueContainsNonBreakingSpace","forEach","replaceAll","subfield"],"sources":["../src/non-breaking-space.js"],"sourcesContent":["/**\n * Provides interface to validate and fix record fields, which include subfields that contain no-breaking space character\n * @returns {Object} Object containing interfaces required by marc-record-validators-melinda package\n */\nexport default function () {\n  return {\n    description: 'Handles subfields that contains non-breaking space character',\n    validate,\n    fix\n  };\n\n  function validate(record) {\n    const nonValidFields = record.fields.filter((field) => collectNonValidFields(field));\n\n    const valid = nonValidFields.length === 0;\n    const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} contains non-breaking space character(s)`));\n\n    return valid ? {valid, messages: []} : {valid, messages};\n\n    function collectNonValidFields(field) {\n      if (field.value) {\n        return (/\\u00A0/u).test(field.value);\n      }\n\n      return field.subfields.filter(valueContainsNonBreakingSpace).length > 0;\n    }\n  }\n\n  /* eslint-disable functional/immutable-data,functional/no-conditional-statement */\n  function fix(record) {\n    record.fields.forEach((field) => {\n      if (field.value) {\n        field.value = field.value.replaceAll(/\\u00A0/gu, ' ');\n        return;\n      }\n\n      field.subfields.forEach(subfield => {\n        if (valueContainsNonBreakingSpace(subfield)) {\n          subfield.value = subfield.value.replaceAll(/\\u00A0/gu, ' ');\n        }\n      });\n    });\n  }\n  /* eslint-enable functional/immutable-data,functional/no-conditional-statement */\n\n  function valueContainsNonBreakingSpace({value}) {\n    return (/\\u00A0/u).test(value);\n  }\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACe,oBAAY;EACzB,OAAO;IACLA,WAAW,EAAE,8DAA8D;IAC3EC,QAAQ;IACRC;EACF,CAAC;EAED,SAASD,QAAQ,CAACE,MAAM,EAAE;IACxB,MAAMC,cAAc,GAAGD,MAAM,CAACE,MAAM,CAACC,MAAM,CAAEC,KAAK,IAAKC,qBAAqB,CAACD,KAAK,CAAC,CAAC;IAEpF,MAAME,KAAK,GAAGL,cAAc,CAACM,MAAM,KAAK,CAAC;IACzC,MAAMC,QAAQ,GAAGP,cAAc,CAACQ,OAAO,CAAC,CAAC;MAACC,GAAG;MAAEC;IAAS,CAAC,KAAKA,SAAS,CAACC,GAAG,CAACC,EAAE,IAAK,SAAQH,GAAI,cAAaG,EAAE,CAACC,IAAK,2CAA0C,CAAC,CAAC;IAEhK,OAAOR,KAAK,GAAG;MAACA,KAAK;MAAEE,QAAQ,EAAE;IAAE,CAAC,GAAG;MAACF,KAAK;MAAEE;IAAQ,CAAC;IAExD,SAASH,qBAAqB,CAACD,KAAK,EAAE;MACpC,IAAIA,KAAK,CAACW,KAAK,EAAE;QACf,OAAQ,SAAS,CAAEC,IAAI,CAACZ,KAAK,CAACW,KAAK,CAAC;MACtC;MAEA,OAAOX,KAAK,CAACO,SAAS,CAACR,MAAM,CAACc,6BAA6B,CAAC,CAACV,MAAM,GAAG,CAAC;IACzE;EACF;;EAEA;EACA,SAASR,GAAG,CAACC,MAAM,EAAE;IACnBA,MAAM,CAACE,MAAM,CAACgB,OAAO,CAAEd,KAAK,IAAK;MAC/B,IAAIA,KAAK,CAACW,KAAK,EAAE;QACfX,KAAK,CAACW,KAAK,GAAGX,KAAK,CAACW,KAAK,CAACI,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC;QACrD;MACF;MAEAf,KAAK,CAACO,SAAS,CAACO,OAAO,CAACE,QAAQ,IAAI;QAClC,IAAIH,6BAA6B,CAACG,QAAQ,CAAC,EAAE;UAC3CA,QAAQ,CAACL,KAAK,GAAGK,QAAQ,CAACL,KAAK,CAACI,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC;QAC7D;MACF,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ;EACA;;EAEA,SAASF,6BAA6B,CAAC;IAACF;EAAK,CAAC,EAAE;IAC9C,OAAQ,SAAS,CAAEC,IAAI,CAACD,KAAK,CAAC;EAChC;AACF"}

package/dist/non-breaking-space.spec.js

@@ -5,7 +5,6 @@ var _marcRecord = require("@natlibfi/marc-record");
 var _nonBreakingSpace = _interopRequireDefault(require("./non-breaking-space"));
 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,
@@ -19,7 +18,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     before: () => testValidatorFactory()
   }
 });
-const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda/non-breaking-space:test');
 async function testValidatorFactory() {
   const validator = await (0, _nonBreakingSpace.default)();
   (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
@@ -28,13 +26,8 @@ async function testValidatorFactory() {
 }
 async function callback({
   getFixture,
-  enabled = true,
   fix = false
 }) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
   const validator = await (0, _nonBreakingSpace.default)();
   const record = new _marcRecord.MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/dist/non-breaking-space.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"non-breaking-space.spec.js","names":["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/non-breaking-space.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './non-breaking-space';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'non-breaking-space'],\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/non-breaking-space: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\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;AACA;AACA;AACA;AACA;AACA;AAAsC;AAEtC,IAAAA,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,EAAE,MAAMC,oBAAoB;EACpC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,kEAAkE,CAAC;AAEnG,eAAeF,oBAAoB,GAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;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,QAAQ,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,GAAE;EAC1C,MAAMe,MAAM,GAAG,IAAIC,sBAAU,CAACJ,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMK,cAAc,GAAGL,UAAU,CAAC,qBAAqB,CAAC;EAExD,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"}
+{"version":3,"file":"non-breaking-space.spec.js","names":["generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","fix","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/non-breaking-space.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './non-breaking-space';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'non-breaking-space'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\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, fix = false}) {\n  const validator = await validatorFactory();\n  const record = new MarcRecord(getFixture('record.json'));\n  const expectedResult = getFixture('expectedResult.json');\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;AACA;AACA;AACA;AACA;AAA8C;AAE9C,IAAAA,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,EAAE,MAAMC,oBAAoB;EACpC;AACF,CAAC,CAAC;AAEF,eAAeA,oBAAoB,GAAG;EACpC,MAAMC,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;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,eAAevB,QAAQ,CAAC;EAACyB,UAAU;EAAEC,GAAG,GAAG;AAAK,CAAC,EAAE;EACjD,MAAMd,SAAS,GAAG,MAAM,IAAAC,yBAAgB,GAAE;EAC1C,MAAMc,MAAM,GAAG,IAAIC,sBAAU,CAACH,UAAU,CAAC,aAAa,CAAC,CAAC;EACxD,MAAMI,cAAc,GAAGJ,UAAU,CAAC,qBAAqB,CAAC;EAExD,IAAI,CAACC,GAAG,EAAE;IACR,MAAMI,MAAM,GAAG,MAAMlB,SAAS,CAACY,QAAQ,CAACG,MAAM,CAAC;IAC/C,IAAAb,YAAM,EAACgB,MAAM,CAAC,CAACf,EAAE,CAACgB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMjB,SAAS,CAACc,GAAG,CAACC,MAAM,CAAC;EAC3B,IAAAb,YAAM,EAACa,MAAM,CAAC,CAACZ,EAAE,CAACgB,GAAG,CAACF,cAAc,CAAC;AACvC"}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "10.1.0",
+  "version": "10.2.0",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"

package/src/ending-whitespace.js

@@ -10,7 +10,7 @@ export default function () {
   };
 
   function validate(record) {
-    const nonValidFields = record.fields.filter(({subfields}) => subfields.filter(valueEndsWithWhitespace).length > 0);
+    const nonValidFields = record.fields.filter(({subfields}) => subfields !== undefined && subfields.filter(valueEndsWithWhitespace).length > 0);
 
     const valid = nonValidFields.length === 0;
     const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} ends with whitespace`));
@@ -21,6 +21,10 @@ export default function () {
   /* eslint-disable functional/immutable-data,functional/no-conditional-statement */
   function fix(record) {
     record.fields.forEach(({subfields}) => {
+      if (subfields === undefined) {
+        return;
+      }
+
       subfields.forEach(subfield => {
         if (valueEndsWithWhitespace(subfield)) {
           subfield.value = subfield.value.trimEnd();

package/src/ending-whitespace.spec.js

@@ -3,7 +3,6 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './ending-whitespace';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -17,7 +16,6 @@ generateTests({
     before: () => testValidatorFactory()
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/ending-whitespace:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -30,12 +28,7 @@ async function testValidatorFactory() {
   expect(validator.validate).to.be.a('function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/src/index.js

@@ -3,6 +3,7 @@ import DoubleCommas from './double-commas';
 import DuplicatesInd1 from './duplicates-ind1';
 import EmptyFields from './empty-fields';
 import EndingPunctuation from './ending-punctuation';
+import EndingWhitespace from './ending-whitespace';
 import FieldsPresent from './fields-present';
 import FieldStructure from './field-structure';
 import FixedFields from './fixed-fields';
@@ -10,6 +11,7 @@ import FieldExclusion from './field-exclusion';
 import IdenticalFields from './identical-fields';
 import IsbnIssn from './isbn-issn';
 import ItemLanguage from './item-language';
+import NonBreakingSpace from './non-breaking-space';
 import NormalizeUTF8Diacritics from './normalize-utf8-diacritics';
 import Punctuation from './punctuation/';
 import ResolveOrphanedSubfield6s from './resolveOrphanedSubfield6s'; // Do this before reindexing!
@@ -27,6 +29,7 @@ export {
   DuplicatesInd1,
   EmptyFields,
   EndingPunctuation,
+  EndingWhitespace,
   FieldExclusion,
   FieldsPresent,
   FieldStructure,
@@ -34,6 +37,7 @@ export {
   IdenticalFields,
   IsbnIssn,
   ItemLanguage,
+  NonBreakingSpace,
   NormalizeUTF8Diacritics,
   Punctuation,
   ResolveOrphanedSubfield6s,

package/src/non-breaking-space.js

@@ -10,18 +10,31 @@ export default function () {
   };
 
   function validate(record) {
-    const nonValidFields = record.fields.filter(({subfields}) => subfields.filter(valueContainsNonBreakingSpace).length > 0);
+    const nonValidFields = record.fields.filter((field) => collectNonValidFields(field));
 
     const valid = nonValidFields.length === 0;
     const messages = nonValidFields.flatMap(({tag, subfields}) => subfields.map(sf => `Field ${tag} subfield $${sf.code} contains non-breaking space character(s)`));
 
     return valid ? {valid, messages: []} : {valid, messages};
+
+    function collectNonValidFields(field) {
+      if (field.value) {
+        return (/\u00A0/u).test(field.value);
+      }
+
+      return field.subfields.filter(valueContainsNonBreakingSpace).length > 0;
+    }
   }
 
   /* eslint-disable functional/immutable-data,functional/no-conditional-statement */
   function fix(record) {
-    record.fields.forEach(({subfields}) => {
-      subfields.forEach(subfield => {
+    record.fields.forEach((field) => {
+      if (field.value) {
+        field.value = field.value.replaceAll(/\u00A0/gu, ' ');
+        return;
+      }
+
+      field.subfields.forEach(subfield => {
         if (valueContainsNonBreakingSpace(subfield)) {
           subfield.value = subfield.value.replaceAll(/\u00A0/gu, ' ');
         }

package/src/non-breaking-space.spec.js

@@ -3,7 +3,6 @@ import {MarcRecord} from '@natlibfi/marc-record';
 import validatorFactory from './non-breaking-space';
 import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import createDebugLogger from 'debug';
 
 generateTests({
   callback,
@@ -17,7 +16,6 @@ generateTests({
     before: () => testValidatorFactory()
   }
 });
-const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/non-breaking-space:test');
 
 async function testValidatorFactory() {
   const validator = await validatorFactory();
@@ -30,12 +28,7 @@ async function testValidatorFactory() {
   expect(validator.validate).to.be.a('function');
 }
 
-async function callback({getFixture, enabled = true, fix = false}) {
-  if (enabled === false) {
-    debug('TEST SKIPPED!');
-    return;
-  }
-
+async function callback({getFixture, fix = false}) {
   const validator = await validatorFactory();
   const record = new MarcRecord(getFixture('record.json'));
   const expectedResult = getFixture('expectedResult.json');

package/test-fixtures/ending-whitespace/01/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Finds the record valid when there are no subfields that end with whitespace",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": false
 }

package/test-fixtures/ending-whitespace/02/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Finds the record not valid when there is a subfield that ends with whitespace",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": false
 }

package/test-fixtures/ending-whitespace/03/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Fixes the record subfield that ends with whitespace",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": true
 }

package/test-fixtures/ending-whitespace/04/expectedResult.json

@@ -0,0 +1,10 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    {
+      "tag": "008",
+      "value": "Foo "
+    }
+  ],
+  "leader": ""
+}

package/test-fixtures/ending-whitespace/04/metadata.json

@@ -0,0 +1,6 @@
+{
+  "description": "Does not handle control fields",
+  "skip": false,
+  "only": false,
+  "fix": true
+}

package/test-fixtures/ending-whitespace/04/record.json

@@ -0,0 +1,8 @@
+{
+  "fields": [
+    {
+      "tag": "008",
+      "value": "Foo "
+    }
+  ]
+}

package/test-fixtures/non-breaking-space/01/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Finds the record valid when there are no subfields that contain a non-breaking space character",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": false
 }

package/test-fixtures/non-breaking-space/02/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Finds the record not valid when there is a subfield that contains a non-breaking space character",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": false
 }

package/test-fixtures/non-breaking-space/03/metadata.json

@@ -1,5 +1,6 @@
 {
   "description": "Fixes the record subfield that contains non-breaking space characters by replacing characters with space",
-  "enabled": true,
+  "skip": false,
+  "only": false,
   "fix": true
 }

package/test-fixtures/non-breaking-space/04/expectedResult.json

@@ -0,0 +1,21 @@
+{
+  "_validationOptions": {},
+  "fields": [
+    {
+      "tag": "008",
+      "value": "Foo Foo "
+    },
+    {
+      "tag": "500",
+      "ind1": " ",
+      "ind2": " ",
+      "subfields": [
+        {
+          "code": "a",
+          "value": "Foo Foo "
+        }
+      ]
+    }
+  ],
+  "leader": ""
+}

package/test-fixtures/non-breaking-space/04/metadata.json

@@ -0,0 +1,6 @@
+{
+  "description": "Fixes the record controlfield and subfield that contains non-breaking space characters by replacing characters with space",
+  "skip": false,
+  "only": false,
+  "fix": true
+}

package/test-fixtures/non-breaking-space/04/record.json

@@ -0,0 +1,19 @@
+{
+  "fields": [
+    {
+      "tag": "008",
+      "value": "Foo\u00A0Foo\u00A0"
+    },
+    {
+      "tag": "500",
+      "ind1": " ",
+      "ind2": " ",
+      "subfields": [
+        {
+          "code": "a",
+          "value": "Foo\u00A0Foo\u00A0"
+        }
+      ]
+    }
+  ]
+}