@natlibfi/marc-record-validators-melinda 10.2.3 → 10.3.0

package/dist/urn.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"urn.spec.js","names":["describe","f337","tag","ind1","ind2","subfields","code","value","f337nonElectronic","ldf856","ldf856partial","f856URN","f856URNnotResource","f856URL","f020","f020second","it","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","test","isLegalDeposit","valid","recfields","result","MarcRecord","fields","eql","fix","resfields","record","nonld","ld","skip"],"sources":["../src/urn.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from '../src/urn';\n\ndescribe('urn', async () => {\n  // Fields\n  const f337 = {\n    tag: '337',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [\n      {code: 'b', value: 'c'},\n      {code: '2', value: 'rdamedia'}\n    ]\n  };\n\n  const f337nonElectronic = {\n    tag: '337',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [\n      {code: 'b', value: 'n'},\n      {code: '2', value: 'rdamedia'}\n    ]\n  };\n\n  const ldf856 = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: 'z', value: 'Käytettävissä vapaakappalekirjastoissa'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const ldf856partial = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const f856URN = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'}]\n  };\n\n  const f856URNnotResource = {\n    tag: '856',\n    ind1: '4',\n    ind2: '1',\n    subfields: [{code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'}]\n  };\n\n\n  const f856URL = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'http://foo.bar/'}]\n  };\n\n  const f020 = {\n    tag: '020',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [{code: 'a', value: '978-951-9155-47-0'}]\n  };\n\n  const f020second = {\n    tag: '020',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [{code: 'a', value: '9789519155470'}]\n  };\n\n\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  // Tests\n  const test = async isLegalDeposit => {\n    const validator = await validatorFactory(isLegalDeposit);\n    return {\n      validate: async (valid, ...recfields) => {\n        const result = await validator.validate(new MarcRecord({fields: recfields}));\n        expect(result).to.eql({valid});\n      },\n\n      fix: async (recfields, resfields) => {\n        const record = new MarcRecord({fields: recfields});\n        await validator.fix(record);\n        expect(record.fields).to.eql(resfields);\n      }\n    };\n  };\n\n  /// Non-legal and legal deposit\n  const nonld = await test(false);\n  const ld = await test(true);\n\n  describe('#validate', () => {\n    // Validate non-electoronic\n    it('Finds the record valid; non-electronic record', async () => {\n      await nonld.validate(true, f337nonElectronic);\n    });\n\n    // Validate non-legal deposit\n    it('Finds the record valid; 856 with urn, and is non-legal deposit', async () => {\n      await nonld.validate(true, f337, f856URN);\n    });\n\n\n    // we should recognize that 856 with second indicator 1 is not describing the resource itself\n    it.skip('Finds the record invalid; 856 ind2: 1 with urn, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f856URNnotResource);\n    });\n\n    // should we require urn if we're not handling a legal deposit\n    it('Finds the record invalid; 856 without urn, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f856URL);\n    });\n\n\n    // should we require urn if we're not handling a legal deposit\n    it('Finds the record invalid; Missing 856, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f020);\n    });\n\n    // Validate legal deposit\n    it('Finds the record invalid; 856 with urn, and is legal deposit', async () => {\n      await ld.validate(false, f020, f337, f856URN);\n    });\n\n    it('Finds the record invalid; 856 without urn, and is legal deposit', async () => {\n      await ld.validate(false, f020, f337, f856URL);\n    });\n\n    it('Finds the record invalid; Missing 856, and is legal deposit', async () => {\n      await ld.validate(false, f337, f020);\n    });\n\n    it('Finds the record valid; 856 with URN and legal deposit subfields, and is legal deposit', async () => {\n      await ld.validate(true, f337, f020, ldf856);\n    });\n\n    it('Finds the record valid; 856 with URN and legal deposit subfields and other f856s, and is legal deposit', async () => {\n      await ld.validate(true, f337, f020, ldf856partial, ldf856, f856URL);\n    });\n\n    it('Finds the record invalid; 856 with URN and partial legal deposit subfields, and is legal deposit', async () => {\n      await ld.validate(false, f337, f020, ldf856partial);\n    });\n\n\n  });\n\n  describe('#fix', () => {\n    // Fix non-legal deposit\n    it('856 with urn, and is non-legal deposit; Nothing to add', async () => {\n      await nonld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('856 without urn, and is non-legal deposit; Adds 856 with urn', async () => {\n      await nonld.fix([f020, f856URL], [f020, f856URL, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit; Adds 856 with urn', async () => {\n      await nonld.fix([f020], [f020, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from second 020', async () => {\n      await nonld.fix([f020second, f020], [f020second, f020, f856URN]);\n    });\n\n    // should we actually add non resovable urns?\n    // we should think about how to choose the isbn to use in case of several ISBNs\n    it.skip('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from first 020', async () => {\n      await nonld.fix([f020, f020second], [f020, f020second, f856URN]);\n    });\n\n\n    // Fix legal deposit\n    it('856 with urn and legal deposit fields, and is legal deposit; Nothing to add', async () => {\n      await ld.fix([f020, f856URL, ldf856], [f020, f856URL, ldf856]);\n    });\n\n    it('856 without urn, and is legal deposit; Adds 856 with urn and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL], [f020, f856URL, ldf856]);\n    });\n\n    // we should test generating the URN in case of no ISBN\n\n    // we should test creating Melinda-temp field\n\n    // We shouldn't lock the open URN for legal deposit use\n    it('Missing 856, and is legal deposit; Adds 856 with urn and legal deposit fields', async () => {\n      await ld.fix([f020], [f020, ldf856]);\n    });\n\n    // We should actually do this instead of locking the original non-legal deposit URN for legal deposit use\n    it.skip('856 with urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN, ldf856]);\n    });\n\n    // We should actually add a new urn in case of a non-resource URN\n    it.skip('856 with non-resource-urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL, f856URNnotResource], [f020, f856URL, f856URNnotResource, ldf856]);\n    });\n\n\n  });\n});\n"],"mappings":"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"}
+{"version":3,"file":"urn.spec.js","names":["_chai","require","_marcRecord","_urn","_interopRequireDefault","obj","__esModule","default","describe","f337","tag","ind1","ind2","subfields","code","value","f337nonElectronic","ldf856","ldf856partial","f856URN","f856URNnotResource","f856URL","f020","f020second","it","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","test","isLegalDeposit","valid","recfields","result","MarcRecord","fields","eql","fix","resfields","record","nonld","ld","skip"],"sources":["../src/urn.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from '../src/urn';\n\ndescribe('urn', async () => {\n  // Fields\n  const f337 = {\n    tag: '337',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [\n      {code: 'b', value: 'c'},\n      {code: '2', value: 'rdamedia'}\n    ]\n  };\n\n  const f337nonElectronic = {\n    tag: '337',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [\n      {code: 'b', value: 'n'},\n      {code: '2', value: 'rdamedia'}\n    ]\n  };\n\n  const ldf856 = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: 'z', value: 'Käytettävissä vapaakappalekirjastoissa'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const ldf856partial = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const f856URN = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'}]\n  };\n\n  const f856URNnotResource = {\n    tag: '856',\n    ind1: '4',\n    ind2: '1',\n    subfields: [{code: 'u', value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'}]\n  };\n\n\n  const f856URL = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'http://foo.bar/'}]\n  };\n\n  const f020 = {\n    tag: '020',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [{code: 'a', value: '978-951-9155-47-0'}]\n  };\n\n  const f020second = {\n    tag: '020',\n    ind1: ' ',\n    ind2: ' ',\n    subfields: [{code: 'a', value: '9789519155470'}]\n  };\n\n\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  // Tests\n  const test = async isLegalDeposit => {\n    const validator = await validatorFactory(isLegalDeposit);\n    return {\n      validate: async (valid, ...recfields) => {\n        const result = await validator.validate(new MarcRecord({fields: recfields}));\n        expect(result).to.eql({valid});\n      },\n\n      fix: async (recfields, resfields) => {\n        const record = new MarcRecord({fields: recfields});\n        await validator.fix(record);\n        expect(record.fields).to.eql(resfields);\n      }\n    };\n  };\n\n  /// Non-legal and legal deposit\n  const nonld = await test(false);\n  const ld = await test(true);\n\n  describe('#validate', () => {\n    // Validate non-electoronic\n    it('Finds the record valid; non-electronic record', async () => {\n      await nonld.validate(true, f337nonElectronic);\n    });\n\n    // Validate non-legal deposit\n    it('Finds the record valid; 856 with urn, and is non-legal deposit', async () => {\n      await nonld.validate(true, f337, f856URN);\n    });\n\n\n    // we should recognize that 856 with second indicator 1 is not describing the resource itself\n    it.skip('Finds the record invalid; 856 ind2: 1 with urn, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f856URNnotResource);\n    });\n\n    // should we require urn if we're not handling a legal deposit\n    it('Finds the record invalid; 856 without urn, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f856URL);\n    });\n\n\n    // should we require urn if we're not handling a legal deposit\n    it('Finds the record invalid; Missing 856, and is non-legal deposit', async () => {\n      await nonld.validate(false, f337, f020);\n    });\n\n    // Validate legal deposit\n    it('Finds the record invalid; 856 with urn, and is legal deposit', async () => {\n      await ld.validate(false, f020, f337, f856URN);\n    });\n\n    it('Finds the record invalid; 856 without urn, and is legal deposit', async () => {\n      await ld.validate(false, f020, f337, f856URL);\n    });\n\n    it('Finds the record invalid; Missing 856, and is legal deposit', async () => {\n      await ld.validate(false, f337, f020);\n    });\n\n    it('Finds the record valid; 856 with URN and legal deposit subfields, and is legal deposit', async () => {\n      await ld.validate(true, f337, f020, ldf856);\n    });\n\n    it('Finds the record valid; 856 with URN and legal deposit subfields and other f856s, and is legal deposit', async () => {\n      await ld.validate(true, f337, f020, ldf856partial, ldf856, f856URL);\n    });\n\n    it('Finds the record invalid; 856 with URN and partial legal deposit subfields, and is legal deposit', async () => {\n      await ld.validate(false, f337, f020, ldf856partial);\n    });\n\n\n  });\n\n  describe('#fix', () => {\n    // Fix non-legal deposit\n    it('856 with urn, and is non-legal deposit; Nothing to add', async () => {\n      await nonld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('856 without urn, and is non-legal deposit; Adds 856 with urn', async () => {\n      await nonld.fix([f020, f856URL], [f020, f856URL, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit; Adds 856 with urn', async () => {\n      await nonld.fix([f020], [f020, f856URN]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from second 020', async () => {\n      await nonld.fix([f020second, f020], [f020second, f020, f856URN]);\n    });\n\n    // should we actually add non resovable urns?\n    // we should think about how to choose the isbn to use in case of several ISBNs\n    it.skip('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from first 020', async () => {\n      await nonld.fix([f020, f020second], [f020, f020second, f856URN]);\n    });\n\n\n    // Fix legal deposit\n    it('856 with urn and legal deposit fields, and is legal deposit; Nothing to add', async () => {\n      await ld.fix([f020, f856URL, ldf856], [f020, f856URL, ldf856]);\n    });\n\n    it('856 without urn, and is legal deposit; Adds 856 with urn and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL], [f020, f856URL, ldf856]);\n    });\n\n    // we should test generating the URN in case of no ISBN\n\n    // we should test creating Melinda-temp field\n\n    // We shouldn't lock the open URN for legal deposit use\n    it('Missing 856, and is legal deposit; Adds 856 with urn and legal deposit fields', async () => {\n      await ld.fix([f020], [f020, ldf856]);\n    });\n\n    // We should actually do this instead of locking the original non-legal deposit URN for legal deposit use\n    it.skip('856 with urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN, ldf856]);\n    });\n\n    // We should actually add a new urn in case of a non-resource URN\n    it.skip('856 with non-resource-urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL, f856URNnotResource], [f020, f856URL, f856URNnotResource, ldf856]);\n    });\n\n\n  });\n});\n"],"mappings":"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"}

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","some","field","mediaTypeIsC","subfields","sub","code","value","sourceIsRdamedia","nvdebug","message","func","undefined","fieldHasSubfield","subfieldCode","subfieldValue","sf","subfieldToString","fieldToString","f","tag","ind1","ind2","formatSubfields","map","join","fieldsToString","fields"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.some(field => {\n    const mediaTypeIsC = field.subfields.some(sub => sub.code === 'b' && sub.value === 'c');\n    const sourceIsRdamedia = field.subfields.some(sub => sub.code === '2' && sub.value === 'rdamedia');\n    return mediaTypeIsC && sourceIsRdamedia;\n  });\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statement\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  return `‡${sf.code} ${sf.value}`;\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${f.ind1}${f.ind2}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\n"],"mappings":";;;;;;;;;;;AAAO,SAASA,oBAAoB,CAACC,MAAM,EAAE;EAC3C,MAAMC,KAAK,GAAGD,MAAM,CAACE,GAAG,CAAC,KAAK,CAAC;EAE/B,OAAOD,KAAK,CAACE,IAAI,CAACC,KAAK,IAAI;IACzB,MAAMC,YAAY,GAAGD,KAAK,CAACE,SAAS,CAACH,IAAI,CAACI,GAAG,IAAIA,GAAG,CAACC,IAAI,KAAK,GAAG,IAAID,GAAG,CAACE,KAAK,KAAK,GAAG,CAAC;IACvF,MAAMC,gBAAgB,GAAGN,KAAK,CAACE,SAAS,CAACH,IAAI,CAACI,GAAG,IAAIA,GAAG,CAACC,IAAI,KAAK,GAAG,IAAID,GAAG,CAACE,KAAK,KAAK,UAAU,CAAC;IAClG,OAAOJ,YAAY,IAAIK,gBAAgB;EACzC,CAAC,CAAC;AACJ;AAEO,SAASC,OAAO,CAACC,OAAO,EAAEC,IAAI,GAAGC,SAAS,EAAE;EACjD,IAAID,IAAI,EAAE;IAAE;IACVA,IAAI,CAACD,OAAO,CAAC;EACf;EACA;AACF;;AAEO,SAASG,gBAAgB,CAACX,KAAK,EAAEY,YAAY,EAAEC,aAAa,GAAG,IAAI,EAAE;EAC1E,IAAI,CAACb,KAAK,CAACE,SAAS,EAAE;IACpB,OAAO,KAAK;EACd;EACA,IAAIW,aAAa,KAAK,IAAI,EAAE;IAC1B,OAAOb,KAAK,CAACE,SAAS,CAACH,IAAI,CAACe,EAAE,IAAIA,EAAE,CAACV,IAAI,KAAKQ,YAAY,CAAC;EAC7D;EACA,OAAOZ,KAAK,CAACE,SAAS,CAACH,IAAI,CAACe,EAAE,IAAIA,EAAE,CAACV,IAAI,KAAKQ,YAAY,IAAIC,aAAa,KAAKC,EAAE,CAACT,KAAK,CAAC;AAC3F;AAEO,SAASU,gBAAgB,CAACD,EAAE,EAAE;EACnC,OAAQ,IAAGA,EAAE,CAACV,IAAK,IAAGU,EAAE,CAACT,KAAM,EAAC;AAClC;AAEO,SAASW,aAAa,CAACC,CAAC,EAAE;EAC/B,IAAI,WAAW,IAAIA,CAAC,EAAE;IACpB,OAAQ,GAAEA,CAAC,CAACC,GAAI,IAAGD,CAAC,CAACE,IAAK,GAAEF,CAAC,CAACG,IAAK,GAAEC,eAAe,CAACJ,CAAC,CAAE,EAAC;EAC3D;EACA,OAAQ,GAAEA,CAAC,CAACC,GAAI,OAAMD,CAAC,CAACZ,KAAM,EAAC;EAE/B,SAASgB,eAAe,CAACrB,KAAK,EAAE;IAC9B,OAAOA,KAAK,CAACE,SAAS,CAACoB,GAAG,CAACR,EAAE,IAAK,IAAGC,gBAAgB,CAACD,EAAE,CAAE,EAAC,CAAC,CAACS,IAAI,CAAC,EAAE,CAAC;EACvE;AACF;AAEO,SAASC,cAAc,CAACC,MAAM,EAAE;EACrC,OAAOA,MAAM,CAACH,GAAG,CAACL,CAAC,IAAID,aAAa,CAACC,CAAC,CAAC,CAAC,CAACM,IAAI,CAAC,mBAAmB,CAAC;AACpE"}
+{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","some","field","mediaTypeIsC","subfields","sub","code","value","sourceIsRdamedia","nvdebug","message","func","undefined","fieldHasSubfield","subfieldCode","subfieldValue","sf","subfieldToString","fieldToString","f","tag","ind1","ind2","formatSubfields","map","join","fieldsToString","fields"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.some(field => {\n    const mediaTypeIsC = field.subfields.some(sub => sub.code === 'b' && sub.value === 'c');\n    const sourceIsRdamedia = field.subfields.some(sub => sub.code === '2' && sub.value === 'rdamedia');\n    return mediaTypeIsC && sourceIsRdamedia;\n  });\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statement\n    func(message);\n  }\n  //console.info(message); // eslint-disable-line no-console\n}\n\nexport function fieldHasSubfield(field, subfieldCode, subfieldValue = null) {\n  if (!field.subfields) {\n    return false;\n  }\n  if (subfieldValue === null) {\n    return field.subfields.some(sf => sf.code === subfieldCode);\n  }\n  return field.subfields.some(sf => sf.code === subfieldCode && subfieldValue === sf.value);\n}\n\nexport function subfieldToString(sf) {\n  return `‡${sf.code} ${sf.value}`;\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${f.ind1}${f.ind2}${formatSubfields(f)}`;\n  }\n  return `${f.tag}    ${f.value}`;\n\n  function formatSubfields(field) {\n    return field.subfields.map(sf => ` ${subfieldToString(sf)}`).join('');\n  }\n}\n\nexport function fieldsToString(fields) {\n  return fields.map(f => fieldToString(f)).join('\\t__SEPARATOR__\\t');\n}\n\n"],"mappings":";;;;;;;;;;;AAAO,SAASA,oBAAoBA,CAACC,MAAM,EAAE;EAC3C,MAAMC,KAAK,GAAGD,MAAM,CAACE,GAAG,CAAC,KAAK,CAAC;EAE/B,OAAOD,KAAK,CAACE,IAAI,CAACC,KAAK,IAAI;IACzB,MAAMC,YAAY,GAAGD,KAAK,CAACE,SAAS,CAACH,IAAI,CAACI,GAAG,IAAIA,GAAG,CAACC,IAAI,KAAK,GAAG,IAAID,GAAG,CAACE,KAAK,KAAK,GAAG,CAAC;IACvF,MAAMC,gBAAgB,GAAGN,KAAK,CAACE,SAAS,CAACH,IAAI,CAACI,GAAG,IAAIA,GAAG,CAACC,IAAI,KAAK,GAAG,IAAID,GAAG,CAACE,KAAK,KAAK,UAAU,CAAC;IAClG,OAAOJ,YAAY,IAAIK,gBAAgB;EACzC,CAAC,CAAC;AACJ;AAEO,SAASC,OAAOA,CAACC,OAAO,EAAEC,IAAI,GAAGC,SAAS,EAAE;EACjD,IAAID,IAAI,EAAE;IAAE;IACVA,IAAI,CAACD,OAAO,CAAC;EACf;EACA;AACF;;AAEO,SAASG,gBAAgBA,CAACX,KAAK,EAAEY,YAAY,EAAEC,aAAa,GAAG,IAAI,EAAE;EAC1E,IAAI,CAACb,KAAK,CAACE,SAAS,EAAE;IACpB,OAAO,KAAK;EACd;EACA,IAAIW,aAAa,KAAK,IAAI,EAAE;IAC1B,OAAOb,KAAK,CAACE,SAAS,CAACH,IAAI,CAACe,EAAE,IAAIA,EAAE,CAACV,IAAI,KAAKQ,YAAY,CAAC;EAC7D;EACA,OAAOZ,KAAK,CAACE,SAAS,CAACH,IAAI,CAACe,EAAE,IAAIA,EAAE,CAACV,IAAI,KAAKQ,YAAY,IAAIC,aAAa,KAAKC,EAAE,CAACT,KAAK,CAAC;AAC3F;AAEO,SAASU,gBAAgBA,CAACD,EAAE,EAAE;EACnC,OAAQ,IAAGA,EAAE,CAACV,IAAK,IAAGU,EAAE,CAACT,KAAM,EAAC;AAClC;AAEO,SAASW,aAAaA,CAACC,CAAC,EAAE;EAC/B,IAAI,WAAW,IAAIA,CAAC,EAAE;IACpB,OAAQ,GAAEA,CAAC,CAACC,GAAI,IAAGD,CAAC,CAACE,IAAK,GAAEF,CAAC,CAACG,IAAK,GAAEC,eAAe,CAACJ,CAAC,CAAE,EAAC;EAC3D;EACA,OAAQ,GAAEA,CAAC,CAACC,GAAI,OAAMD,CAAC,CAACZ,KAAM,EAAC;EAE/B,SAASgB,eAAeA,CAACrB,KAAK,EAAE;IAC9B,OAAOA,KAAK,CAACE,SAAS,CAACoB,GAAG,CAACR,EAAE,IAAK,IAAGC,gBAAgB,CAACD,EAAE,CAAE,EAAC,CAAC,CAACS,IAAI,CAAC,EAAE,CAAC;EACvE;AACF;AAEO,SAASC,cAAcA,CAACC,MAAM,EAAE;EACrC,OAAOA,MAAM,CAACH,GAAG,CAACL,CAAC,IAAID,aAAa,CAACC,CAAC,CAAC,CAAC,CAACM,IAAI,CAAC,mBAAmB,CAAC;AACpE"}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "10.2.3",
+  "version": "10.3.0",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "@natlibfi/marc-record-validate": "^7.0.3",
     "cld3-asm": "^3.1.1",
     "debug": "^4.3.4",
-    "isbn3": "^1.1.30",
+    "isbn3": "^1.1.34",
     "langs": "^2.0.0",
     "node-fetch": "^2.6.8",
     "xml2js": ">=0.4.23 <1.0.0",

package/src/punctuation2.js

@@ -0,0 +1,398 @@
+/*
+* punctuation.js -- try and fix a marc field punctuation
+*
+* Author(s): Nicholas Volk <nicholas.volk@helsinki.fi>
+*
+* NOTE #1: https://www.kiwi.fi/display/kumea/Loppupisteohje is implemented via another validator/fixer.(ending-punctuation)
+* NOTE #2: Validator/fixer punctuation does similar stuff, but focuses on X00 fields.
+*/
+import {validateSingleField} from './ending-punctuation';
+// import createDebugLogger from 'debug';
+import {fieldToString, nvdebug} from './utils';
+import clone from 'clone';
+
+// const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2');
+
+export default function () {
+  return {
+    description: 'Add punctuation to data fields',
+    validate, fix
+  };
+
+  function fix(record) {
+    nvdebug('Add punctuation to data fields: fixer');
+    const res = {message: [], fix: [], valid: true};
+    record.fields.forEach(f => fieldFixPunctuation(f));
+    return res;
+  }
+
+  function validate(record) {
+    nvdebug('Add punctuation to data fields: validate');
+
+    const fieldsNeedingModification = record.fields.filter(f => fieldNeedsPunctuation(f));
+
+
+    const values = fieldsNeedingModification.map(f => fieldToString(f));
+    const newValues = fieldsNeedingModification.map(f => fieldGetFixedString(f));
+
+    const messages = values.map((val, i) => `'${val}' => '${newValues[i]}'`);
+
+    const res = {message: messages};
+
+    res.valid = res.message.length < 1; // eslint-disable-line functional/immutable-data
+    return res;
+  }
+}
+
+
+function fieldGetFixedString(field) {
+  const cloneField = clone(field);
+  cloneField.subfields.forEach((sf, i) => {
+    // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!
+    // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)
+    subfieldFixPunctuation(cloneField.tag, sf, i + 1 < cloneField.subfields.length ? cloneField.subfields[i + 1] : null);
+  });
+  return fieldToString(cloneField);
+}
+
+function fieldNeedsPunctuation(field) {
+  if (!field.subfields) {
+    return false;
+  }
+
+  const originalFieldAsString = fieldToString(field);
+  const modifiedFieldAsString = fieldGetFixedString(field);
+
+  return modifiedFieldAsString !== originalFieldAsString;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+// <= Above code is written for the validator logic <=                             //
+// => Everything below was originally transferred from reducers' punctuation.js => //
+/////////////////////////////////////////////////////////////////////////////////////
+
+
+//const stripCrap = / *[-;:,+]+$/u;
+const commaNeedsPuncAfter = /(?:[a-z0-9A-Z]|å|ä|ö|Å|Ä|Ö|\))$/u;
+const defaultNeedsPuncAfter = /(?:[a-z0-9A-Z]|å|ä|ö|Å|Ä|Ö)$/u;
+const defaultNeedsPuncAfter2 = /(?:[\]a-zA-Z0-9)]|ä|å|ö|Å|Ä|Ö)$/u;
+const blocksPuncRHS = /^(?:\()/u;
+const allowsPuncRHS = /^(?:[A-Za-z0-9]|å|ä|ö|Å|Ä|Ö)/u;
+
+const dotIsProbablyPunc = /(?:[a-z0-9)]|å|ä|ö)\.$/u;
+const puncIsProbablyPunc = /(?:[a-z0-9)]|å|ä|ö) ?[.,:;]$/u;
+// NB! 65X: Finnish terms don't use punctuation, but international ones do. Neither one is currently (2021-11-08) coded here.
+
+// Will unfortunately trigger "Sukunimi, Th." type:
+const removeColons = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / *[;:]$/u};
+const removeX00Comma = {'code': 'abcqde', 'followedBy': 'abcqde#01459', 'context': /.,$/u, 'remove': /,$/u};
+const cleanRHS = {'code': 'abcd', 'followedBy': 'bcde', 'context': /(?:(?:[a-z0-9]|å|ä|ö)\.|,)$/u, 'contextRHS': blocksPuncRHS, 'remove': /[.,]$/u};
+const cleanX00dCommaOrDot = {'code': 'd', 'followedBy': 'et#01459', 'context': /[0-9]-[,.]$/u, 'remove': /[,.]$/u};
+const cleanX00aDot = {'code': 'abcde', 'followedBy': 'cdegj', 'context': dotIsProbablyPunc, 'remove': /\.$/u};
+const cleanCorruption = {'code': 'abcdefghijklmnopqrstuvwxyz', 'remove': / \.$/u};
+// These $e dot removals are tricky: before removing the comma, we should know that it ain't an abbreviation such as "esitt."...
+const cleanX00eDot = {'code': 'e', 'followedBy': 'egj#059', 'context': /(?:[ai]ja|jä)[.,]$/u, 'remove': /\.$/u};
+
+const X00RemoveDotAfterBracket = {'code': 'cq', 'context': /\)\.$/u, 'remove': /\.$/u};
+// 390, 800, 810, 830...
+const cleanPuncBeforeLanguage = {'code': 'atvxyz', 'followedBy': 'l', 'context': puncIsProbablyPunc, 'remove': / *[.,:;]$/u};
+
+
+const addX00aComma = {'add': ',', 'code': 'abcqdej', 'followedBy': 'cdeg', 'context': commaNeedsPuncAfter, 'contextRHS': allowsPuncRHS};
+const addX00aComma2 = {'add': ',', 'code': 'abcdej', 'followedBy': 'cdeg', 'context': /(?:[A-Z]|Å|Ä|Ö)\.$/u, 'contextRHS': allowsPuncRHS};
+const addX00aDot = {'add': '.', 'code': 'abcde', 'followedBy': '#tu0159', 'context': defaultNeedsPuncAfter};
+
+const addX10bDot = {'name': 'Add X10 pre-$b dot', 'add': '.', 'code': 'ab', 'followedBy': 'b', 'context': defaultNeedsPuncAfter};
+const addX10eComma = {'add': ',', 'code': 'abe', 'followedBy': 'e', 'context': defaultNeedsPuncAfter};
+const addX10Dot = {'name': 'Add X10 final dot', 'add': '.', 'code': 'abe', 'followedBy': '#0159', 'context': defaultNeedsPuncAfter};
+const addLanguageComma = {'name': 'Add comma before 810$l', 'add': ',', 'code': 'tv', 'followedBy': 'l', 'context': defaultNeedsPuncAfter2};
+const addColonToRelationshipInformation = {'name': 'Add \':\' to 7X0 $i relationship info', 'add': ':', 'code': 'i', 'context': /[a-z)åäö]$/u};
+
+// 490:
+const addSemicolonBeforeVolumeDesignation = {'name': 'Add " ;" before $v', 'add': ' ;', 'code': 'atxy', 'followedBy': 'v', 'context': /[^;]$/u};
+
+const NONE = 0;
+const ADD = 2;
+const REMOVE = 1;
+const REMOVE_AND_ADD = 3;
+
+// Crappy punctuation consists of various crap that is somewhat common.
+// We strip crap for merge decisions. We are not trying to actively remove crap here.
+
+const removeX00Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, cleanX00dCommaOrDot, cleanRHS, X00RemoveDotAfterBracket, removeColons, cleanPuncBeforeLanguage];
+const removeX10Whatever = [removeX00Comma, cleanX00aDot, cleanX00eDot, cleanCorruption, removeColons, cleanPuncBeforeLanguage];
+
+const cleanCrappyPunctuationRules = {
+  '100': removeX00Whatever,
+  '110': removeX10Whatever,
+  '600': removeX00Whatever,
+  '610': removeX10Whatever,
+  '700': removeX00Whatever,
+  '710': removeX10Whatever,
+  '800': removeX00Whatever,
+  '810': removeX10Whatever,
+  '245': [{'code': 'ab', 'followedBy': '!c', 'remove': / \/$/u}],
+  '300': [
+    {'code': 'a', 'followedBy': '!b', 'remove': / *:$/u},
+    {'code': 'a', 'followedBy': 'b', 'remove': /:$/u, 'context': /[^ ]:$/u},
+    {'code': 'ab', 'followedBy': '!c', 'remove': / *;$/u},
+    {'code': 'ab', 'followedBy': 'c', 'remove': /;$/u, 'context': /[^ ];$/u},
+    {'code': 'abc', 'followedBy': '!e', 'remove': / *\+$/u},
+    {'code': 'abc', 'followedBy': '!e', 'remove': / *\+$/u, 'context': /[^ ]\+$/u}
+
+  ],
+  '490': [{'code': 'a', 'followedBy': 'xy', 'remove': / ;$/u}],
+  '773': [{'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz', 'remove': /\. -$/u}]
+
+};
+
+const cleanLegalX00Comma = {'code': 'abcde', 'followedBy': 'cdegj', 'context': /.,$/u, 'remove': /,$/u};
+// Accept upper case letters in X00$b, since they are probably Roman numerals.
+const cleanLegalX00bDot = {'code': 'b', 'followedBy': 't#01459', context: /^[IVXLCDM]+\.$/u, 'remove': /\.$/u};
+const cleanLegalX00Dot = {'code': 'abcdetvl', 'followedBy': 'tu#01459', 'context': /(?:[a-z0-9)]|å|ä|ö)\.$/u, 'remove': /\.$/u};
+const cleanLanguageComma = {'name': 'language comma', 'code': 'tv', 'followedBy': 'l', 'context': /.,$/u, 'remove': /,$/u};
+
+
+const legalX00punc = [cleanLegalX00Comma, cleanLegalX00bDot, cleanLegalX00Dot, cleanLanguageComma];
+
+const cleanLegalX10Comma = {'name': 'X10comma', 'code': 'abe', 'followedBy': 'e', 'context': /.,$/u, 'remove': /,$/u};
+const cleanLegalX10Dot = {'name': 'X10dot', 'code': 'ab', 'followedBy': 'b#059', 'context': /.\.$/u, 'remove': /\.$/u};
+
+const legalX10punc = [cleanLegalX10Comma, cleanLegalX10Dot, cleanX00eDot, cleanLanguageComma];
+
+const cleanValidPunctuationRules = {
+  '100': legalX00punc,
+  '110': legalX10punc,
+  '600': legalX00punc,
+  '610': legalX10punc,
+  '700': legalX00punc,
+  '710': legalX10punc,
+  '800': legalX00punc,
+  '810': legalX10punc,
+  '245': [
+    {'name': 'A:B', 'code': 'a', 'followedBy': 'b', 'remove': / [:;=]$/u},
+    {'name': 'AB:K', 'code': 'ab', 'followedBy': 'k', 'remove': / :$/u},
+    {'name': 'ABK:F', 'code': 'abk', 'followedBy': 'f', 'remove': /,$/u},
+    {'name': 'ABFNP:C', 'code': 'abfnp', 'followedBy': 'c', 'remove': / \/$/u},
+    {'name': 'ABN:N', 'code': 'abn', 'followedBy': 'n', 'remove': /\.$/u},
+    {'name': 'ABNP:#', 'code': 'abnp', 'followedBy': '#', 'remove': /\.$/u},
+    {'name': 'N:P', 'code': 'n', 'followedBy': 'p', 'remove': /,$/u}
+
+  ],
+  '260': [
+    {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},
+    {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},
+    {'code': 'c', 'followedBy': '#', 'remove': /\.$/u},
+    {'code': 'd', 'followedBy': 'e', 'remove': / :$/u},
+    {'code': 'e', 'followedBy': 'f', 'remove': /,$/u},
+    {'code': 'f', 'followedBy': '#', 'remove': /\.$/u} // Probably ')' but shouldit be removed?
+  ],
+  '264': [
+    {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},
+    {'code': 'b', 'followedBy': 'c', 'remove': /,$/u},
+    {'code': 'c', 'followedBy': '#', 'remove': /\.$/u}
+  ],
+  '300': [
+    // NB! Remove crap as well, thus the '*' in / *:$/
+    {'code': 'a', 'followedBy': 'b', 'remove': / :$/u},
+    {'code': 'ab', 'followedBy': 'c', 'remove': / ;$/u},
+    {'code': 'abc', 'followedBy': 'e', 'remove': / \+$/u}
+  ],
+  '490': [
+    {'code': 'axy', 'followedBy': 'xy', 'remove': /,$/u},
+    {'code': 'axy', 'followedBy': 'v', 'remove': / *;$/u}
+  ],
+  '534': [{'code': 'p', 'followedBy': 'c', 'remove': /:$/u}]
+
+};
+
+// addColonToRelationshipInformation only applies to 700/710 but as others don't have $i, it's fine
+const addX00 = [addX00aComma, addX00aComma2, addX00aDot, addLanguageComma, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation];
+const addX10 = [addX10bDot, addX10eComma, addX10Dot, addLanguageComma, addSemicolonBeforeVolumeDesignation, addColonToRelationshipInformation];
+const addPairedPunctuationRules = {
+  '100': addX00,
+  '110': addX10,
+  '245': [
+    // Blah! Also "$a = $b" and "$a ; $b" can be valid... But ' :' is better than nothing, I guess...
+    {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter},
+    {'code': 'abk', 'followedBy': 'f', 'add': ',', 'context': defaultNeedsPuncAfter},
+    {'code': 'abfnp', 'followedBy': 'c', 'add': ' /', 'context': defaultNeedsPuncAfter}
+  ],
+  '260': [
+    {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},
+    {'code': 'b', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},
+    {'code': 'abc', 'followedBy': 'a', 'add': ' ;', 'context': defaultNeedsPuncAfter2},
+    {'code': 'e', 'followedBy': 'f', 'add': ' :', 'context': defaultNeedsPuncAfter2},
+    {'code': 'f', 'followedBy': 'g', 'add': ',', 'context': defaultNeedsPuncAfter2}
+  ],
+  '264': [
+    {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},
+    {'code': 'b', 'followedBy': 'c', 'add': ',', 'context': defaultNeedsPuncAfter2},
+    // NB! The $c rule messes dotless exception "264 #4 $c p1983" up
+    // We'll need to add a hacky postprocessor for this? Add 'hasInd1': '0123' etc?
+    {'code': 'c', 'followedBy': '#', 'add': '.', 'context': defaultNeedsPuncAfter2}
+  ],
+  '300': [
+    {'code': 'a', 'followedBy': 'b', 'add': ' :', 'context': defaultNeedsPuncAfter2},
+    {'code': 'ab', 'followedBy': 'c', 'add': ' ;', 'context': defaultNeedsPuncAfter2},
+    {'code': 'abc', 'followedBy': 'e', 'add': ' +', 'context': defaultNeedsPuncAfter2}
+  ],
+  '490': [
+    {'code': 'axy', 'followedBy': 'xy', 'add': ',', 'context': defaultNeedsPuncAfter},
+    addSemicolonBeforeVolumeDesignation
+    //{'code': 'axy', 'followedBy': 'v', 'add': ' ;', 'context': defaultNeedsPuncAfter}
+  ],
+  '506': [{'code': 'a', 'followedBy': '#', 'add': '.', 'context': defaultNeedsPuncAfter2}],
+  '534': [{'code': 'p', 'followedBy': 'c', 'add': ':', 'context': defaultNeedsPuncAfter2}],
+  '600': addX00,
+  '610': addX10,
+  '700': addX00,
+  '710': addX10,
+  '800': addX00,
+  '810': addX10,
+  '830': [
+    {'code': 'axy', 'followedBy': 'xy', 'add': ',', 'context': defaultNeedsPuncAfter},
+    addSemicolonBeforeVolumeDesignation
+    //{'code': 'axy', 'followedBy': 'v', 'add': ' ;', 'context': defaultNeedsPuncAfter}
+  ]
+
+};
+
+function ruleAppliesToSubfieldCode(targetSubfieldCodes, currSubfieldCode) {
+  const negation = targetSubfieldCodes.includes('!');
+  if (negation) {
+    return !targetSubfieldCodes.includes(currSubfieldCode);
+  }
+  return targetSubfieldCodes.includes(currSubfieldCode);
+}
+
+
+function ruleAppliesToCurrentSubfield(rule, subfield) {
+  if (!ruleAppliesToSubfieldCode(rule.code, subfield.code)) {
+    return false;
+  }
+  if ('context' in rule && !subfield.value.match(rule.context)) { // njsscan-ignore: regex_injection_dos
+    return false;
+  }
+  return true;
+}
+
+function ruleAppliesToNextSubfield(rule, nextSubfield) {
+  if (!('followedBy' in rule)) { // Return true, if we are not interested in the next subfield
+    return true;
+  }
+  // The '#' existence check applies only to the RHS field. LHS always exists.
+  if (nextSubfield === null) {
+    const negation = rule.followedBy.includes('!');
+    if (negation) {
+      return !rule.followedBy.includes('#');
+    }
+    return rule.followedBy.includes('#');
+  }
+
+  if (!ruleAppliesToSubfieldCode(rule.followedBy, nextSubfield.code)) {
+    return false;
+  }
+  if ('contextRHS' in rule && !nextSubfield.value.match(rule.contextRHS)) { // njsscan-ignore: regex_injection_dos
+    return false;
+  }
+  return true;
+}
+
+function checkRule(rule, subfield1, subfield2) {
+  //const name = rule.name || 'UNNAMED';
+  if (!ruleAppliesToCurrentSubfield(rule, subfield1)) {
+    //nvdebug(`${name}: FAIL ON LHS FIELD: '$${subfield1.code} ${subfield1.value}', SF=${rule.code}`, debug);
+    return false;
+  }
+
+  // NB! This is not a perfect solution. We might have $e$0$e where $e$0 punctuation should actually be based on $e$e rules
+  if (!ruleAppliesToNextSubfield(rule, subfield2)) {
+    //const msg = subfield2 ? `${name}: FAIL ON RHS FIELD '${subfield2.code}' not in [${rule.followedBy}]` : `${name}: FAIL ON RHS FIELD`;
+    //nvdebug(msg, debug);
+    return false;
+  }
+
+  //nvdebug(`${name}: ACCEPT ${rule.code}/${subfield1.code}, SF2=${rule.followedBy}/${subfield2 ? subfield2.code : '#'}`, debug);
+  return true;
+}
+
+function applyPunctuationRules(tag, subfield1, subfield2, ruleArray = null, operation = NONE) {
+
+  /*
+  if (ruleArray === null || operation === NONE) {
+    debug(`applyPunctuation(): No rules to apply!`);
+    return;
+  }
+*/
+  if (!(`${tag}` in ruleArray) || ruleArray === null || operation === NONE) {
+
+    /*
+    if (!['020', '650'].includes(tag) || !isControlSubfieldCode(subfield1.code)) { // eslint-disable-line functional/no-conditional-statement
+      nvdebug(`No punctuation rules found for ${tag} (looking for: ‡${subfield1.code})`, debug);
+
+    }
+    */
+    return;
+  }
+
+  //nvdebug(`OP=${operation} ${tag}: '${subfield1.code}: ${subfield1.value}' ??? '${subfield2 ? subfield2.code : '#'}'`, debug);
+  const activeRules = ruleArray[tag].filter(rule => checkRule(rule, subfield1, subfield2));
+
+  activeRules.forEach(rule => {
+    const originalValue = subfield1.value;
+    if (rule.remove && [REMOVE, REMOVE_AND_ADD].includes(operation) && subfield1.value.match(rule.remove)) { // eslint-disable-line functional/no-conditional-statement
+      //nvdebug(`    PUNC REMOVAL TO BE PERFORMED FOR $${subfield1.code} '${subfield1.value}'`, debug);
+      subfield1.value = subfield1.value.replace(rule.remove, ''); // eslint-disable-line functional/immutable-data
+      //nvdebug(`    PUNC REMOVAL PERFORMED FOR '${subfield1.value}'`, debug);
+    }
+    if (rule.add && [ADD, REMOVE_AND_ADD].includes(operation)) { // eslint-disable-line functional/no-conditional-statement
+      subfield1.value += rule.add; // eslint-disable-line functional/immutable-data
+      //nvdebug(`    ADDED '${rule.add}' TO '${subfield1.value}'`, debug);
+    }
+    if (subfield1.value !== originalValue) { // eslint-disable-line functional/no-conditional-statement
+      //nvdebug(` PROCESS PUNC: '‡${subfield1.code} ${originalValue}' => '‡${subfield1.code} ${subfield1.value}'`, debug); // eslint-disable-line functional/immutable-data
+    }
+  });
+}
+
+function subfieldFixPunctuation(tag, subfield1, subfield2) {
+  applyPunctuationRules(tag, subfield1, subfield2, cleanCrappyPunctuationRules, REMOVE);
+  applyPunctuationRules(tag, subfield1, subfield2, addPairedPunctuationRules, ADD);
+}
+
+
+export function fieldStripPunctuation(field) {
+  if (!field.subfields) {
+    return field;
+  }
+
+  field.subfields.forEach((sf, i) => {
+    nvdebug(`FSP1: '${sf.value}'`);
+    applyPunctuationRules(field.tag, sf, i + 1 < field.subfields.length ? field.subfields[i + 1] : null, cleanValidPunctuationRules, REMOVE);
+    nvdebug(`FSP2: '${sf.value}'`);
+    applyPunctuationRules(field.tag, sf, i + 1 < field.subfields.length ? field.subfields[i + 1] : null, cleanCrappyPunctuationRules, REMOVE);
+    nvdebug(`FSP3: '${sf.value}'`);
+  });
+  return field;
+}
+
+export function fieldFixPunctuation(field) {
+  if (!field.subfields) {
+    return field;
+  }
+  nvdebug(`################### fieldFixPunctuation() TEST ${fieldToString(field)}`);
+
+  field.subfields.forEach((sf, i) => {
+    // NB! instead of next subfield, we should actually get next *non-control-subfield*!!!
+    // (In plain English: We should skip $0 - $9 at least, maybe $w as well...)
+    subfieldFixPunctuation(field.tag, sf, i + 1 < field.subfields.length ? field.subfields[i + 1] : null);
+  });
+
+  // Use shared code for final punctuation (sadly this does not fix intermediate punc):
+  if (field.useExternalEndPunctuation) { // eslint-disable-line functional/no-conditional-statement
+    // addFinalPunctuation(field); // local version. use shared code instead.
+    validateSingleField(field, false, true); // NB! Don't use field.tag as second argument! It's a string, not an int. 3rd arg must be true (=fix)
+  }
+  return field;
+}

package/src/punctuation2.spec.js

@@ -0,0 +1,52 @@
+import {expect} from 'chai';
+import {MarcRecord} from '@natlibfi/marc-record';
+import validatorFactory from './punctuation2';
+import {READERS} from '@natlibfi/fixura';
+import generateTests from '@natlibfi/fixugen';
+import createDebugLogger from 'debug';
+
+generateTests({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'punctuation2'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: READERS.JSON
+  },
+  mocha: {
+    before: () => testValidatorFactory()
+  }
+});
+const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2:test');
+
+async function testValidatorFactory() {
+  const validator = await validatorFactory();
+
+  expect(validator)
+    .to.be.an('object')
+    .that.has.any.keys('description', 'validate');
+
+  expect(validator.description).to.be.a('string');
+  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 validatorFactory();
+  const record = new MarcRecord(getFixture('record.json'));
+  const expectedResult = getFixture('expectedResult.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    expect(result).to.eql(expectedResult);
+    return;
+  }
+
+  await validator.fix(record);
+  expect(record).to.eql(expectedResult);
+}