@natlibfi/marc-record-validators-melinda 11.2.1 → 11.2.2-alpha.2

package/dist/urn.js

@@ -7,7 +7,7 @@ exports.default = _default;
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 var _utils = require("./utils");
 var _debug = _interopRequireDefault(require("debug"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const URN_GENERATOR_URL = 'https://generator.urn.fi/cgi-bin/urn_generator.cgi?type=nbn';
 function _default(isLegalDeposit = false, useMelindaTemp = true) {
   const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda:urn');

package/dist/urn.js.map

@@ -1 +1 @@
-{"version":3,"file":"urn.js","names":["_nodeFetch","_interopRequireDefault","require","_utils","_debug","obj","__esModule","default","URN_GENERATOR_URL","_default","isLegalDeposit","useMelindaTemp","debug","createDebugLogger","debugData","extend","hasURN","f","tag","subfields","some","code","value","test","description","validate","fix","record","f856sUrn","fields","filter","JSON","stringify","ldSubfields","createLDSubfields","length","generated","createURNSubfield","tempSubField","insertField","ind1","ind2","forEach","sf","hasOld856LdPhrase","find","ldsf","push","rec","isbn","reduce","acc","a","undefined","createURN","response","fetch","body","text","fieldHasLDSubfields","field","every","validateLD","f856sUrnWithLdSubfields","isElectronicMaterial","valid"],"sources":["../src/urn.js"],"sourcesContent":["import fetch from 'node-fetch';\nimport {isElectronicMaterial} from './utils';\nimport createDebugLogger from 'debug';\n\nconst URN_GENERATOR_URL = 'https://generator.urn.fi/cgi-bin/urn_generator.cgi?type=nbn';\n\nexport default function (isLegalDeposit = false, useMelindaTemp = true) {\n  const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:urn');\n  const debugData = debug.extend('data');\n\n  // We should check that the f856 with URN has second indicator '0' (Resource), ' ' (No information provided) or '8' (No display constant generated)\n  // - if second indicator is '1' (Version of resource) or '2' (Related resource) the URN in f856 is not correct for the resource described in the record\n\n  // This checks only the existence of URNs from the Finnish urn.fi -resolver\n\n  const hasURN = f => f.tag === '856' && f.subfields.some(({code, value}) => code === 'u' && (/urn.fi/u).test(value));\n\n  return {\n    description: 'Adds URN for record, to 856-field (if not existing). If isLegalDeposit is active, adds legal deposit subfields to the f856s with URN.',\n    validate,\n    fix\n  };\n\n  async function fix(record) {\n    const f856sUrn = record.fields.filter(hasURN);\n    debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);\n\n    const ldSubfields = isLegalDeposit ? createLDSubfields() : [];\n    debugData(`IsLegalDeposit: ${isLegalDeposit}, LegalDepositSubfields: ${JSON.stringify(ldSubfields)}`);\n\n    // We add the URN even if we're not getting the legalDeposit - where does this URN resolve?\n    // We probably should not do these additions\n\n    if (f856sUrn.length === 0) { // eslint-disable-line functional/no-conditional-statements\n      const {code, value, generated} = await createURNSubfield(record);\n\n      if (generated && useMelindaTemp) {\n        const tempSubField = {code: '9', value: 'MELINDA<TEMP>'};\n\n        record.insertField({\n          tag: '856',\n          ind1: '4',\n          ind2: '0',\n          subfields: [{code, value}, ...ldSubfields, tempSubField]\n        });\n\n        return true;\n      }\n\n      record.insertField({\n        tag: '856',\n        ind1: '4',\n        ind2: '0',\n        subfields: [{code, value}, ...ldSubfields]\n      });\n\n      return true;\n    } else if (isLegalDeposit) { // eslint-disable-line functional/no-conditional-statements\n\n      // We add here legal deposit information to all URN-f856s - we probably should not do this\n      // We should add extra f856 URN / URNs for legal deposits that already have a open (non-legal-deposit) URN\n      // How do we decide which URN to use as a template if there are several URNs\n      // We should check for existence of a legal deposit URN anyways\n\n      f856sUrn.forEach(f => {\n        // Change phrase from old to new if field with old phrase is found\n        if (f.subfields.some(sf => hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements\n          f.subfields // eslint-disable-line functional/immutable-data\n            .find(sf => hasOld856LdPhrase(sf))\n            .value = 'Käytettävissä vapaakappaletyöasemilla';\n        }\n\n        // Create subfields if necessary\n        ldSubfields.forEach(ldsf => {\n          if (!f.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value && !hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements\n            f.subfields.push(ldsf); // eslint-disable-line functional/immutable-data\n          }\n        });\n      });\n    }\n\n    return true;\n\n    // We should check existence of URN in f024 i1: '7' $2 urn/URN for this too\n\n    async function createURNSubfield(rec) {\n      // isbn is picked from the last 020 $a in the record\n      // what should we do in case of several 020 $a:s\n      const isbn = rec.fields.reduce((acc, f) => {\n        if (f.tag === '020') {\n          const a = f.subfields.find(sf => sf.code === 'a');\n          return a ? a.value : undefined;\n        }\n\n        return acc;\n      }, undefined);\n\n      debugData(`isbns: ${isbn}`);\n\n      const {generated, value} = await createURN(isbn);\n      return {code: 'u', value, generated};\n\n      async function createURN(isbn = false) {\n        if (isbn) {\n          return {generated: false, value: `https://urn.fi/URN:ISBN:${isbn}`};\n        }\n\n        const response = await fetch(URN_GENERATOR_URL);\n        const body = await response.text();\n\n        // If we generated URN we could also add it to the 024\n        // generated 024 should also have $9 MELINDA<TEMP>\n        return {generated: true, value: `https://urn.fi/${body}`};\n      }\n    }\n\n    function hasOld856LdPhrase({code, value}) {\n      if (code === 'z' && value === 'Käytettävissä vapaakappalekirjastoissa') {\n        return true;\n      }\n\n      return false;\n    }\n\n  }\n\n  // Later when the new subfields that have f506/f540 -type contents, we should add also them here\n  function createLDSubfields() {\n    return [\n      {\n        code: 'z',\n        value: 'Käytettävissä vapaakappaletyöasemilla'\n      },\n      {\n        code: '5',\n        value: 'FI-Vapaa'\n      }\n    ];\n  }\n\n  function fieldHasLDSubfields(field, ldSubfields) {\n    if (ldSubfields.every(ldsf => field.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value))) {\n      return true;\n    }\n  }\n\n  function validateLD(f856sUrn) {\n    debug(`Validating the existence of legal deposit subfields`);\n    const ldSubfields = createLDSubfields();\n    const f856sUrnWithLdSubfields = f856sUrn.filter(field => fieldHasLDSubfields(field, ldSubfields));\n    if (f856sUrnWithLdSubfields.length > 0) {\n      debug(`Record has ${f856sUrnWithLdSubfields.length} URN fields with all necessary legal deposit subfields`);\n      debugData(`f856sUrnWithLdSubfields: ${JSON.stringify(f856sUrnWithLdSubfields)}`);\n      return true;\n    }\n    return false;\n  }\n\n  function validate(record) {\n    // if not electronic skip this validator\n    if (!isElectronicMaterial(record)) {\n      debug(`Record is not electronic - no need to validate legal deposit URNs`);\n      return {valid: true};\n    }\n\n    const f856sUrn = record.fields.filter(hasURN);\n\n    if (f856sUrn.length > 0) {\n      debug(`Record has ${f856sUrn.length} URN fields`);\n      debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);\n\n      if (!isLegalDeposit || validateLD(f856sUrn)) {\n        debug(`Record is valid`);\n        return {valid: true};\n      }\n    }\n    debug(`No (valid) URN fields - Record is not valid`);\n    return {valid: false};\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"urn.js","names":["_nodeFetch","_interopRequireDefault","require","_utils","_debug","e","__esModule","default","URN_GENERATOR_URL","_default","isLegalDeposit","useMelindaTemp","debug","createDebugLogger","debugData","extend","hasURN","f","tag","subfields","some","code","value","test","description","validate","fix","record","f856sUrn","fields","filter","JSON","stringify","ldSubfields","createLDSubfields","length","generated","createURNSubfield","tempSubField","insertField","ind1","ind2","forEach","sf","hasOld856LdPhrase","find","ldsf","push","rec","isbn","reduce","acc","a","undefined","createURN","response","fetch","body","text","fieldHasLDSubfields","field","every","validateLD","f856sUrnWithLdSubfields","isElectronicMaterial","valid"],"sources":["../src/urn.js"],"sourcesContent":["import fetch from 'node-fetch';\nimport {isElectronicMaterial} from './utils';\nimport createDebugLogger from 'debug';\n\nconst URN_GENERATOR_URL = 'https://generator.urn.fi/cgi-bin/urn_generator.cgi?type=nbn';\n\nexport default function (isLegalDeposit = false, useMelindaTemp = true) {\n  const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:urn');\n  const debugData = debug.extend('data');\n\n  // We should check that the f856 with URN has second indicator '0' (Resource), ' ' (No information provided) or '8' (No display constant generated)\n  // - if second indicator is '1' (Version of resource) or '2' (Related resource) the URN in f856 is not correct for the resource described in the record\n\n  // This checks only the existence of URNs from the Finnish urn.fi -resolver\n\n  const hasURN = f => f.tag === '856' && f.subfields.some(({code, value}) => code === 'u' && (/urn.fi/u).test(value));\n\n  return {\n    description: 'Adds URN for record, to 856-field (if not existing). If isLegalDeposit is active, adds legal deposit subfields to the f856s with URN.',\n    validate,\n    fix\n  };\n\n  async function fix(record) {\n    const f856sUrn = record.fields.filter(hasURN);\n    debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);\n\n    const ldSubfields = isLegalDeposit ? createLDSubfields() : [];\n    debugData(`IsLegalDeposit: ${isLegalDeposit}, LegalDepositSubfields: ${JSON.stringify(ldSubfields)}`);\n\n    // We add the URN even if we're not getting the legalDeposit - where does this URN resolve?\n    // We probably should not do these additions\n\n    if (f856sUrn.length === 0) { // eslint-disable-line functional/no-conditional-statements\n      const {code, value, generated} = await createURNSubfield(record);\n\n      if (generated && useMelindaTemp) {\n        const tempSubField = {code: '9', value: 'MELINDA<TEMP>'};\n\n        record.insertField({\n          tag: '856',\n          ind1: '4',\n          ind2: '0',\n          subfields: [{code, value}, ...ldSubfields, tempSubField]\n        });\n\n        return true;\n      }\n\n      record.insertField({\n        tag: '856',\n        ind1: '4',\n        ind2: '0',\n        subfields: [{code, value}, ...ldSubfields]\n      });\n\n      return true;\n    } else if (isLegalDeposit) { // eslint-disable-line functional/no-conditional-statements\n\n      // We add here legal deposit information to all URN-f856s - we probably should not do this\n      // We should add extra f856 URN / URNs for legal deposits that already have a open (non-legal-deposit) URN\n      // How do we decide which URN to use as a template if there are several URNs\n      // We should check for existence of a legal deposit URN anyways\n\n      f856sUrn.forEach(f => {\n        // Change phrase from old to new if field with old phrase is found\n        if (f.subfields.some(sf => hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements\n          f.subfields // eslint-disable-line functional/immutable-data\n            .find(sf => hasOld856LdPhrase(sf))\n            .value = 'Käytettävissä vapaakappaletyöasemilla';\n        }\n\n        // Create subfields if necessary\n        ldSubfields.forEach(ldsf => {\n          if (!f.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value && !hasOld856LdPhrase(sf))) { // eslint-disable-line functional/no-conditional-statements\n            f.subfields.push(ldsf); // eslint-disable-line functional/immutable-data\n          }\n        });\n      });\n    }\n\n    return true;\n\n    // We should check existence of URN in f024 i1: '7' $2 urn/URN for this too\n\n    async function createURNSubfield(rec) {\n      // isbn is picked from the last 020 $a in the record\n      // what should we do in case of several 020 $a:s\n      const isbn = rec.fields.reduce((acc, f) => {\n        if (f.tag === '020') {\n          const a = f.subfields.find(sf => sf.code === 'a');\n          return a ? a.value : undefined;\n        }\n\n        return acc;\n      }, undefined);\n\n      debugData(`isbns: ${isbn}`);\n\n      const {generated, value} = await createURN(isbn);\n      return {code: 'u', value, generated};\n\n      async function createURN(isbn = false) {\n        if (isbn) {\n          return {generated: false, value: `https://urn.fi/URN:ISBN:${isbn}`};\n        }\n\n        const response = await fetch(URN_GENERATOR_URL);\n        const body = await response.text();\n\n        // If we generated URN we could also add it to the 024\n        // generated 024 should also have $9 MELINDA<TEMP>\n        return {generated: true, value: `https://urn.fi/${body}`};\n      }\n    }\n\n    function hasOld856LdPhrase({code, value}) {\n      if (code === 'z' && value === 'Käytettävissä vapaakappalekirjastoissa') {\n        return true;\n      }\n\n      return false;\n    }\n\n  }\n\n  // Later when the new subfields that have f506/f540 -type contents, we should add also them here\n  function createLDSubfields() {\n    return [\n      {\n        code: 'z',\n        value: 'Käytettävissä vapaakappaletyöasemilla'\n      },\n      {\n        code: '5',\n        value: 'FI-Vapaa'\n      }\n    ];\n  }\n\n  function fieldHasLDSubfields(field, ldSubfields) {\n    if (ldSubfields.every(ldsf => field.subfields.some(sf => sf.code === ldsf.code && sf.value === ldsf.value))) {\n      return true;\n    }\n  }\n\n  function validateLD(f856sUrn) {\n    debug(`Validating the existence of legal deposit subfields`);\n    const ldSubfields = createLDSubfields();\n    const f856sUrnWithLdSubfields = f856sUrn.filter(field => fieldHasLDSubfields(field, ldSubfields));\n    if (f856sUrnWithLdSubfields.length > 0) {\n      debug(`Record has ${f856sUrnWithLdSubfields.length} URN fields with all necessary legal deposit subfields`);\n      debugData(`f856sUrnWithLdSubfields: ${JSON.stringify(f856sUrnWithLdSubfields)}`);\n      return true;\n    }\n    return false;\n  }\n\n  function validate(record) {\n    // if not electronic skip this validator\n    if (!isElectronicMaterial(record)) {\n      debug(`Record is not electronic - no need to validate legal deposit URNs`);\n      return {valid: true};\n    }\n\n    const f856sUrn = record.fields.filter(hasURN);\n\n    if (f856sUrn.length > 0) {\n      debug(`Record has ${f856sUrn.length} URN fields`);\n      debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);\n\n      if (!isLegalDeposit || validateLD(f856sUrn)) {\n        debug(`Record is valid`);\n        return {valid: true};\n      }\n    }\n    debug(`No (valid) URN fields - Record is not valid`);\n    return {valid: false};\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/urn.spec.js

@@ -3,7 +3,7 @@
 var _chai = require("chai");
 var _marcRecord = require("@natlibfi/marc-record");
 var _urn = _interopRequireDefault(require("../src/urn"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 describe('urn', async () => {
   // Fields
   const f337 = {

package/dist/urn.spec.js.map

@@ -1 +1 @@
-{"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","ldf856old","ldf856Https","ldf856partial","f856URN","f856URNHttps","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ä vapaakappaletyöasemilla'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const ldf856old = {\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 ldf856Https = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'https://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: 'z', value: 'Käytettävissä vapaakappaletyöasemilla'},\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 f856URNHttps = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'https://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    // 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 invalid; old phrase is used in $z', async () => {\n      await ld.validate(false, f337, f020, ldf856old);\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 (https)', async () => {\n      await nonld.fix([f020, f856URL], [f020, f856URL, f856URNHttps]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit; Adds 856 with urn (https)', async () => {\n      await nonld.fix([f020], [f020, f856URNHttps]);\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 (https)', async () => {\n      await nonld.fix([f020second, f020], [f020second, f020, f856URNHttps]);\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 (https)', async () => {\n      await nonld.fix([f020, f020second], [f020, f020second, f856URNHttps]);\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 with urn and legal deposit fields, and is legal deposit but phrase is old; change phrase to new', async () => {\n      await ld.fix([f020, f856URL, ldf856old], [f020, f856URL, ldf856]);\n    });\n\n    it('856 without urn, and is legal deposit; Adds 856 with urn (https) and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL], [f020, f856URL, ldf856Https]);\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 (https) and legal deposit fields', async () => {\n      await ld.fix([f020], [f020, ldf856Https]);\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, ldf856Https]);\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, ldf856Https]);\n    });\n\n\n  });\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"urn.spec.js","names":["_chai","require","_marcRecord","_urn","_interopRequireDefault","e","__esModule","default","describe","f337","tag","ind1","ind2","subfields","code","value","f337nonElectronic","ldf856","ldf856old","ldf856Https","ldf856partial","f856URN","f856URNHttps","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ä vapaakappaletyöasemilla'},\n      {code: '5', value: 'FI-Vapaa'}\n    ]\n  };\n\n  const ldf856old = {\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 ldf856Https = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [\n      {code: 'u', value: 'https://urn.fi/URN:ISBN:978-951-9155-47-0'},\n      {code: 'z', value: 'Käytettävissä vapaakappaletyöasemilla'},\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 f856URNHttps = {\n    tag: '856',\n    ind1: '4',\n    ind2: '0',\n    subfields: [{code: 'u', value: 'https://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    // 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 invalid; old phrase is used in $z', async () => {\n      await ld.validate(false, f337, f020, ldf856old);\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 (https)', async () => {\n      await nonld.fix([f020, f856URL], [f020, f856URL, f856URNHttps]);\n    });\n\n    // should we actually add non-resolvable urns?\n    it('Missing 856, and is non-legal deposit; Adds 856 with urn (https)', async () => {\n      await nonld.fix([f020], [f020, f856URNHttps]);\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 (https)', async () => {\n      await nonld.fix([f020second, f020], [f020second, f020, f856URNHttps]);\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 (https)', async () => {\n      await nonld.fix([f020, f020second], [f020, f020second, f856URNHttps]);\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 with urn and legal deposit fields, and is legal deposit but phrase is old; change phrase to new', async () => {\n      await ld.fix([f020, f856URL, ldf856old], [f020, f856URL, ldf856]);\n    });\n\n    it('856 without urn, and is legal deposit; Adds 856 with urn (https) and legal deposit fields', async () => {\n      await ld.fix([f020, f856URL], [f020, f856URL, ldf856Https]);\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 (https) and legal deposit fields', async () => {\n      await ld.fix([f020], [f020, ldf856Https]);\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, ldf856Https]);\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, ldf856Https]);\n    });\n\n\n  });\n});\n"],"mappings":"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","ignoreList":[]}

package/dist/utils.js

@@ -11,6 +11,7 @@ exports.isControlSubfieldCode = isControlSubfieldCode;
 exports.isElectronicMaterial = isElectronicMaterial;
 exports.nvdebug = nvdebug;
 exports.nvdebugFieldArray = nvdebugFieldArray;
+exports.recordRemoveValuelessSubfields = recordRemoveValuelessSubfields;
 exports.recordToString = recordToString;
 exports.subfieldToString = subfieldToString;
 exports.uniqArray = uniqArray;
@@ -51,6 +52,22 @@ function recordToString(record) {
   const fields = record.fields.map(f => fieldToString(f));
   return `${ldr}\n${fields.join('\n')}`;
 }
+function recordRemoveValuelessSubfields(record) {
+  record.fields = record.fields.map(field => {
+    // eslint-disable-line functional/immutable-data
+    if (!field.subfields) {
+      // Keep control fields
+      return field;
+    }
+    // Remove empty subfields from datafields:
+    field.subfields = field.subfields.filter(sf => sf.value); // eslint-disable-line functional/immutable-data
+
+    if (field.subfields && field.subfields.length === 0) {
+      return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.
+    }
+    return field; //if field has subfields return it
+  }).filter(field => field); // Filter those falses out
+}
 function fieldToString(f) {
   if ('subfields' in f) {
     return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","length","some","f","fieldHasSubfield","nvdebug","message","func","undefined","field","subfieldCode","subfieldValue","subfields","sf","code","value","subfieldToString","normalizeIndicatorValue","val","recordToString","ldr","leader","fields","map","fieldToString","join","tag","ind1","ind2","formatSubfields","fieldsToString","nvdebugFieldArray","prefix","forEach","isControlSubfieldCode","includes","getCatalogingLanguage","defaultCatalogingLanguage","field040","b","filter","uniqArray","arr","i","indexOf"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.length > 0 && f337s.some(f => fieldHasSubfield(f, 'b', 'c') && fieldHasSubfield(f, '2', 'rdamedia'));\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statements\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  if (!sf.value) {\n    return `‡${sf.code}`;\n  }\n  return `‡${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function recordToString(record) {\n  const ldr = `LDR   ${record.leader}`;\n  const fields = record.fields.map(f => fieldToString(f));\n  return `${ldr}\\n${fields.join('\\n')}`;\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(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\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record, defaultCatalogingLanguage = undefined) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return defaultCatalogingLanguage;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return defaultCatalogingLanguage;\n  }\n  return b.value;\n}\n\n\nexport function uniqArray(arr) {\n  return arr.filter((val, i) => arr.indexOf(val) === i);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"utils.js","names":["isElectronicMaterial","record","f337s","get","length","some","f","fieldHasSubfield","nvdebug","message","func","undefined","field","subfieldCode","subfieldValue","subfields","sf","code","value","subfieldToString","normalizeIndicatorValue","val","recordToString","ldr","leader","fields","map","fieldToString","join","recordRemoveValuelessSubfields","filter","tag","ind1","ind2","formatSubfields","fieldsToString","nvdebugFieldArray","prefix","forEach","isControlSubfieldCode","includes","getCatalogingLanguage","defaultCatalogingLanguage","field040","b","uniqArray","arr","i","indexOf"],"sources":["../src/utils.js"],"sourcesContent":["export function isElectronicMaterial(record) {\n  const f337s = record.get('337');\n\n  return f337s.length > 0 && f337s.some(f => fieldHasSubfield(f, 'b', 'c') && fieldHasSubfield(f, '2', 'rdamedia'));\n}\n\nexport function nvdebug(message, func = undefined) {\n  if (func) { // eslint-disable-line functional/no-conditional-statements\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  if (!sf.value) {\n    return `‡${sf.code}`;\n  }\n  return `‡${sf.code} ${sf.value}`;\n}\n\nfunction normalizeIndicatorValue(val) {\n  if (val === ' ') {\n    return '#';\n  }\n  return val;\n}\n\nexport function recordToString(record) {\n  const ldr = `LDR   ${record.leader}`;\n  const fields = record.fields.map(f => fieldToString(f));\n  return `${ldr}\\n${fields.join('\\n')}`;\n}\n\nexport function recordRemoveValuelessSubfields(record) {\n  record.fields = record.fields.map(field => { // eslint-disable-line functional/immutable-data\n    if (!field.subfields) { // Keep control fields\n      return field;\n    }\n    // Remove empty subfields from datafields:\n    field.subfields = field.subfields.filter(sf => sf.value); // eslint-disable-line functional/immutable-data\n\n    if (field.subfields && field.subfields.length === 0) {\n      return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.\n    }\n\n    return field; //if field has subfields return it\n  }).filter(field => field); // Filter those falses out\n}\n\nexport function fieldToString(f) {\n  if ('subfields' in f) {\n    return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(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\nexport function nvdebugFieldArray(fields, prefix = '  ', func = undefined) {\n  fields.forEach(field => nvdebug(`${prefix}${fieldToString(field)}`, func));\n}\n\nexport function isControlSubfieldCode(subfieldCode) {\n  if (['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'w'].includes(subfieldCode)) {\n    return true;\n  }\n  return false;\n}\n\nexport function getCatalogingLanguage(record, defaultCatalogingLanguage = undefined) {\n  const [field040] = record.get(/^040$/u);\n  if (!field040) {\n    return defaultCatalogingLanguage;\n  }\n  const [b] = field040.subfields.filter(sf => sf.code === 'b');\n  if (!b) {\n    return defaultCatalogingLanguage;\n  }\n  return b.value;\n}\n\n\nexport function uniqArray(arr) {\n  return arr.filter((val, i) => arr.indexOf(val) === i);\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/cyrillux-usemarcon-replacement.js

@@ -20,16 +20,17 @@ import {default as fixPunctuation} from './punctuation2';
 import {default as fixQualifyingInformation} from './normalize-qualifying-information';
 import {sortAdjacentSubfields} from './sortSubfields';
 
-
 // import createDebugLogger from 'debug';
-import {nvdebug, recordToString} from './utils';
+import {fieldHasSubfield, nvdebug, recordRemoveValuelessSubfields, recordToString} from './utils';
 
 // const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/punctuation2');
 
 const description = 'Replacement for Cyrillux usemarcon rules';
 
 // Extended original list with 541, 561, 562, 583, 584
-const dropTags = ['001', '003', '010', '012', '014', '015', '016', '019', '025', '029', '032', '035', '036', '037', '038', '042', '049', '051', '061', '068', '071', '074', '079', '090', '091', '092', '094', '095', '096', '097', '099', '249', '261', '262', '350', '400', '411', '541', '561', '562', '574', '575', '577', '578', '583', '584', '589', '590', '591', '592', '593', '594', '595', '596', '597', '598', '599', '653', '698', '741', '742', '744', '761', '790', '841', '842', '843', '844', '845', '850', '852', '853', '854', '855', '858', '859', '863', '864', '865', '866', '867', '868', '876', '877', '878', '882', '886', '887', '888', '890', '899'];
+// 017, 044... et al are LL additions from 2019 (via USEMARCON-RDA)
+const dropTags = ['001', '003', '010', '012', '014', '015', '016', '017', '019', '025', '029', '032', '035', '036', '037', '038', '042', '044', '049', '051', '061', '068', '071', '074', '079', '090', '091', '092', '094', '095', '096', '097', '099', '249', '261', '262', '350', '400', '411', '541', '561', '562', '574', '575', '577', '578', '583', '584', '589', '590', '591', '592', '593', '594', '595', '596', '597', '598', '599', '653', '698', '741', '742', '744', '751', '761', '790', '841', '842', '843', '844', '845', '850', '852', '853', '854', '855', '858', '859', '863', '864', '865', '866', '867', '868', '876', '877', '878', '882', '886', '887', '888', '890', '899'];
+
 
 export default function () {
   return {
@@ -43,59 +44,109 @@ export default function () {
     return res;
   }
 
-  function realFix(record) {
-    // Fix leader: standard fixes + update LDR/17 to '4'
-    fixLeader(record);
+  function realFixNonAleph(record) {
+    if (isAlephRecord(record)) {
+      return;
+    }
+    // Update LDR/17 to '4'
     record.leader = `${record.leader.substring(0, 17)}4${record.leader.substring(18, 24)}`; // eslint-disable-line functional/immutable-data
 
     // Remove unwanted fields:
     record.fields = record.fields.filter(f => !dropTags.includes(f.tag)); // eslint-disable-line functional/immutable-data
 
-    record.fields.forEach(f => fieldSpecificStuff(f));
+    // Remove 084 fields that don't have $2 ykl (based on USEMARCON-RDA/bw_rda_kyril.rul code by LL 2019)
+    record.fields = record.fields.filter(f => f.tag !== '084' || f.subfields.some(sf => sf.code === '2' && sf.value === 'ykl')); // eslint-disable-line functional/immutable-data
+
+    fieldSpecificStuff(record.fields);
+
+    function fieldSpecificStuff(fields) {
+      const [field, ...rest] = fields;
+
+      if (field === undefined) {
+        return;
+      }
 
-    function fieldSpecificStuff(field) {
       removeOwnershipSubfield5(field);
       removeFromOldCatalog(field); // Remove LoC phrase "[from old catalog]" from srings
       translateFieldToFinnish(field);
+
+      return fieldSpecificStuff(rest);
+    }
+
+    fixField040(record); // All $b values are changed to 'mul'. As a side effect 33X$b=>$a mappings are in Finnish! Ok in this domain!
+
+    fieldSpecificStuff2(record.fields);
+
+    function fieldSpecificStuff2(fields) {
+      const [field, ...rest] = fields;
+
+      if (field === undefined) {
+        return;
+      }
+
+      removeSubfieldH(field); // NB! Do this only after 33X creation, as 245$h might be useful there!
+
+      field100eKirjoittaja(field);
+
+      function field100eKirjoittaja(f) { // LL 2019 USEMARCON-RDA rule
+        if (f.tag === '100' && !fieldHasSubfield(f, 'e') && record.isBK()) {
+          f.subfields = [{code: 'e', value: 'kirjoittaja.'}, ...f.subfields]; // eslint-disable-line functional/immutable-data
+          sortAdjacentSubfields(f);
+          // Punctuation will be done later on...
+          return;
+        }
+      }
+
+      field260To264s(field, record);
+
+      // NB! 300 (before or after 33X creation?)
+      field410To490And810(field, record);
+      field440To490And830(field, record);
+      // handle505(field); // not applying them usemarcon-cyrillux rules for field 505 as I can't understand their motivation.
+      return fieldSpecificStuff2(rest);
     }
 
+  }
+
+  function realFixAll1(record) {
+    fixLeader(record); // Fix defaults, esp. LDR/18=i
+
     fixCountryCodes().fix(record); // 008/15-17
     fixLanguageCodes().fix(record); // 008/35-37 AND 041 (note that all relevant subfield codes are fixed, not just $a)
 
-    fixQualifyingInformation().fix(record); // 015, 020, 024 and 028
+    recordRemoveValuelessSubfields(record);
 
     // Field 028: use $b$a, not $a$b:
     const f028 = record.fields.filter(f => f.tag === '028');
     f028.forEach(f => sortAdjacentSubfields(f));
 
-    fixField040(record); // All $b values are changed to 'mul'. As a side effect 33X$b=>$a mappings are in Finnish! Ok in this domain!
     add041().fix(record);
 
     fixRelatorTerms().fix(record);
 
+  }
+
+  function realFixAll2(record) {
+    fixQualifyingInformation().fix(record); // 015, 020, 024 and 028
+
+    // Cyrillux specific code might change 040$b and thus affect these rules:
     fix33X().fix(record); // 33X$a => 33X$a$b$2
     add336().fix(record);
     add337().fix(record);
     add338().fix(record);
 
-    record.fields.forEach(f => fieldSpecificStuff2(f));
-
-    function fieldSpecificStuff2(field) {
-      removeSubfieldH(field); // only after 33X creation, as 245$h might be useful
-
-      field260To264s(field, record);
+    // The fixer below implements Cyrillux rules such as 245I1 | 245I1  | If (Exists(@100) Or Exists(@110) Or Exists(@111) Or Exists(@130)) Then '1' Else '0' and plenty of other good stuff:
+    fixIndicators().fix(record);
 
-      // NB! 300 (before or after 33X creation?)
-      field410To490And810(field, record);
-      field440To490And830(field, record);
-      // handle505(field); // not applying them usemarcon-cyrillux rules for field 505 as I can't understand their motivation.
+    fixPunctuation().fix(record);
+  }
 
-    }
+  function realFix(record) {
+    realFixAll1(record);
 
-    // The fixer below implement Cyrillux rules such as 245I1 | 245I1  | If (Exists(@100) Or Exists(@110) Or Exists(@111) Or Exists(@130)) Then '1' Else '0' and plenty of other good stuff:
-    fixIndicators().fix(record);
+    realFixNonAleph(record);
 
-    fixPunctuation().fix(record);
+    realFixAll2(record);
 
     const res = {message: [], fix: [], valid: true};
     return res;
@@ -146,6 +197,9 @@ function fixField040(record) {
 }
 
 export function removeFromOldCatalog(field) {
+  if (!field.tag.match(/^(?:240|65[0135]|[1678](?:00|10|11|30))$/u)) {
+    return;
+  }
   // See https://catalog.loc.gov/vwebv/ui/en_US/htdocs/help/faqs.html for motivation
   field.subfields?.forEach(sf => removeFromOldCatalogFromSubfield(sf));
 
@@ -221,6 +275,10 @@ function field440To490And830(field, record) { // might be generic... if so, move
   record.insertField(field830);
 }
 
+function isAlephRecord(record) {
+  // Records that are already in Aleph are not processed as aggressively as genuinely new ones:
+  return record.fields.some(field => ['CAT', 'LKR', 'LOW', 'SID'].includes(field.tag));
+}
 
 function field260To264s(field, record) { // might be generic... if so, move to utils...
   // As per my quick reading of usemarcon-cyrillux
@@ -382,6 +440,11 @@ function finnishTranslationsAndMappings(value) {
     replace('black and white', 'mustavalkoinen').
     replace(/\bbilaga\b/gui, 'liite').
     replace(/\bbilagor\b/gui, 'liitettä').
+    // https://github.com/NatLibFi/USEMARCON-BOOKWHERE-RDA/blob/master/bw_rda_kyril.rul#L365
+    replace(/(\b1\]?) с\./gui, '$1 sivu'). // eslint-disable-line prefer-named-capture-group
+    replace(/(\d\]?) с\./gui, '$1 sivua'). // eslint-disable-line prefer-named-capture-group
+    replace(/(\d) см/gui, '$1 cm'). // eslint-disable-line prefer-named-capture-group
+
     replace(/\bcharts\b/gui, 'kaavioita').
     replace('chiefly color illustrations', 'pääosin värikuvitettu').
     replace('chiefly', 'pääosin').

package/src/fixRelatorTerms.js

@@ -108,7 +108,10 @@ const finnishAbbreviations = {
   'san.': 'sanoittaja',
   'sov.': 'sovittaja',
   'säv.': 'säveltäjä',
-  'toim.': 'toimittaja'
+  'toim.': 'toimittaja',
+  // Quick and dirty implementation of https://github.com/NatLibFi/USEMARCON-BOOKWHERE-RDA/blob/master/bw_rda_kyril.rul#L651
+  'сост.': 'toimittaja',
+  'ред.': 'toimittaja'
 };
 
 function subfieldHandleRelatorTermAbbreviation(subfield, language) {
@@ -127,7 +130,7 @@ function subfieldHandleRelatorTermAbbreviation(subfield, language) {
   const lcValue = value.toLowerCase(); // Check Å, Ä, Ö...
 
   // NB: Policy: if no language or multi-language: apply all rules! (Not much overlap I hope...)
-  if (language === 'fin') {
+  if (language === 'fin' || language === 'mul') {
     nvdebug(`Relator try Finnish for '${lcValue}}'...`, debugDev);
     if (lcValue in finnishAbbreviations) {
       const hit = `${finnishAbbreviations[lcValue]}${punc}`;

package/src/index.js

@@ -1,16 +1,25 @@
 import AccessRights from './access-rights';
+import AddMissingField041 from './addMissingField041';
+import AddMissingField336 from './addMissingField336';
+import AddMissingField337 from './addMissingField337';
+import AddMissingField338 from './addMissingField338';
+import CyrilluxUsemarconReplacement from './cyrillux-usemarcon-replacement';
 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 Field008CharacterGroups from './field-008-18-34-character-groups';
 import Field505Separators from './field-505-separators';
 import Field521Fix from './field-521-fix';
 import FieldExclusion from './field-exclusion';
 import FieldStructure from './field-structure';
 import FieldsPresent from './fields-present';
-import FixedFields from './fixed-fields';
+import Fix33X from './fix-33X';
+import FixCountryCodes from './fix-country-codes';
+import FixLanguageCodes from './fix-language-codes';
 import FixRelatorTerms from './fixRelatorTerms';
+import FixedFields from './fixed-fields';
 import IdenticalFields from './identical-fields';
 import IndicatorFixes from './indicator-fixes';
 import IsbnIssn from './isbn-issn';
@@ -25,11 +34,11 @@ import NormalizeQualifyingInformation from './normalize-qualifying-information';
 import NormalizeUTF8Diacritics from './normalize-utf8-diacritics';
 import Punctuation from './punctuation/';
 import Punctuation2 from './punctuation2';
-import ResolveOrphanedSubfield6s from './resolveOrphanedSubfield6s'; // Do this before reindexing! (thus not in alphabetical order)
 import ReindexSubfield6OccurenceNumbers from './reindexSubfield6OccurenceNumbers';
 import RemoveDuplicateDataFields from './removeDuplicateDataFields';
 import RemoveInferiorDataFields from './removeInferiorDataFields';
 import ResolvableExtReferences from './resolvable-ext-references-melinda';
+import ResolveOrphanedSubfield6s from './resolveOrphanedSubfield6s';
 import SanitizeVocabularySourceCodes from './sanitize-vocabulary-source-codes';
 import SortFields from './sortFields';
 import SortRelatorTerms from './sortRelatorTerms';
@@ -46,16 +55,25 @@ import Urn from './urn';
 
 export {
   AccessRights,
+  AddMissingField041,
+  AddMissingField336,
+  AddMissingField337,
+  AddMissingField338,
+  CyrilluxUsemarconReplacement,
   DoubleCommas,
   DuplicatesInd1,
   EmptyFields,
   EndingPunctuation,
   EndingWhitespace,
+  Field008CharacterGroups,
   Field505Separators,
   Field521Fix,
   FieldExclusion,
   FieldsPresent,
   FieldStructure,
+  Fix33X,
+  FixCountryCodes,
+  FixLanguageCodes,
   FixRelatorTerms,
   FixedFields,
   IdenticalFields,
@@ -72,7 +90,7 @@ export {
   NormalizeUTF8Diacritics,
   Punctuation,
   Punctuation2,
-  ResolveOrphanedSubfield6s,
+  ResolveOrphanedSubfield6s, // Do this before reindexing! (thus I'm not sticking with alphabetical order here)
   ReindexSubfield6OccurenceNumbers,
   RemoveDuplicateDataFields,
   RemoveInferiorDataFields,

package/src/indicator-fixes.js

@@ -144,6 +144,24 @@ function normalizeNonFilingIndicator2(field, languages = []) {
   field.ind2 = determineNonFilingIndicatorValue(field, languages); // eslint-disable-line functional/immutable-data
 }
 
+const fiktiivisenAineistonLisaluokatFI = ['Eläimet', 'Erotiikka', 'Erä', 'Fantasia', 'Historia', 'Huumori', 'Jännitys', 'Kauhu', 'Novellit', 'Romantiikka', 'Scifi', 'Sota', 'Urheilu', 'Uskonto'];
+
+function containsFiktiivisenAineistonLisaluokka(field) {
+  // Should we check Swedish versions as well?
+  return field.subfields.some(sf => sf.code === 'a' && fiktiivisenAineistonLisaluokatFI.includes(sf.value));
+}
+
+function normalize084Indicator1(field) {
+  if (field.tag !== '084') {
+    return;
+  }
+
+  // https://marc21.kansalliskirjasto.fi/bib/05X-08X.htm#084 and https://finto.fi/ykl/fi/page/fiktioluokka
+  if (field.ind1 !== '9' && containsFiktiivisenAineistonLisaluokka(field) && field.subfields.some(sf => sf.code === '2' && sf.value === 'ykl')) {
+    field.ind1 = '9'; // eslint-disable-line functional/immutable-data
+    return;
+  }
+}
 
 function normalize245Indicator1(field, record) {
   if (field.tag !== '245') {
@@ -222,6 +240,7 @@ export function recordNormalizeIndicators(record) {
 }
 
 function fieldNormalizeIndicators(field, record, languages) {
+  normalize084Indicator1(field);
   normalize245Indicator1(field, record);
   normalizeNonFilingIndicator1(field, languages);
   normalizeNonFilingIndicator2(field, languages);

package/src/sanitize-vocabulary-source-codes.js

@@ -88,6 +88,10 @@ function fieldHasUnfixableVocabularySourceCode(field) {
 }
 
 function subfieldHasUnfixableVocabularySourceCode(subfield) {
+  if (subfield.code !== '2') {
+    return false;
+  }
+
   // As we can't fix this here, apply this yso-rule only when validating!
   if (subfield.value.indexOf('yso/') === 0) {
     return !['yso/eng', 'yso/fin', 'yso/sme', 'yso/swe'].includes(subfield.value);

package/src/utils.js

@@ -41,6 +41,22 @@ export function recordToString(record) {
   return `${ldr}\n${fields.join('\n')}`;
 }
 
+export function recordRemoveValuelessSubfields(record) {
+  record.fields = record.fields.map(field => { // eslint-disable-line functional/immutable-data
+    if (!field.subfields) { // Keep control fields
+      return field;
+    }
+    // Remove empty subfields from datafields:
+    field.subfields = field.subfields.filter(sf => sf.value); // eslint-disable-line functional/immutable-data
+
+    if (field.subfields && field.subfields.length === 0) {
+      return false; // Return false instead of a field if field has no subfields left. These will soon be filtered out.
+    }
+
+    return field; //if field has subfields return it
+  }).filter(field => field); // Filter those falses out
+}
+
 export function fieldToString(f) {
   if ('subfields' in f) {
     return `${f.tag} ${normalizeIndicatorValue(f.ind1)}${normalizeIndicatorValue(f.ind2)}${formatSubfields(f)}`;

package/test-fixtures/cyrillux-usemarcon-replacement/f11/expectedResult.json

@@ -30,6 +30,9 @@
       { "code": "a", "value": "määrittelemätön" },
       { "code": "b", "value": "zu"},
       { "code": "2", "value": "rdacarrier" }
+    ]},
+    { "tag": "FOO", "ind1": " ", "ind2": " ", "subfields": [
+      { "code": "a", "value": "whatever" }
     ]}
   ]
 }