@natlibfi/marc-record-validators-melinda 11.3.6 → 11.3.7-alpha.1

package/dist/urn.spec.js

@@ -2,282 +2,51 @@
 
 var _chai = require("chai");
 var _marcRecord = require("@natlibfi/marc-record");
-var _urn = _interopRequireDefault(require("../src/urn"));
+var _urn = _interopRequireDefault(require("./urn"));
+var _fixura = require("@natlibfi/fixura");
+var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
+var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-describe('urn', async () => {
-  // Fields
-  const f337 = {
-    tag: '337',
-    ind1: ' ',
-    ind2: ' ',
-    subfields: [{
-      code: 'b',
-      value: 'c'
-    }, {
-      code: '2',
-      value: 'rdamedia'
-    }]
-  };
-  const f337nonElectronic = {
-    tag: '337',
-    ind1: ' ',
-    ind2: ' ',
-    subfields: [{
-      code: 'b',
-      value: 'n'
-    }, {
-      code: '2',
-      value: 'rdamedia'
-    }]
-  };
-  const ldf856 = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }, {
-      code: 'z',
-      value: 'Käytettävissä vapaakappaletyöasemilla'
-    }, {
-      code: '5',
-      value: 'FI-Vapaa'
-    }]
-  };
-  const ldf856old = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }, {
-      code: 'z',
-      value: 'Käytettävissä vapaakappalekirjastoissa'
-    }, {
-      code: '5',
-      value: 'FI-Vapaa'
-    }]
-  };
-  const ldf856Https = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'https://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }, {
-      code: 'z',
-      value: 'Käytettävissä vapaakappaletyöasemilla'
-    }, {
-      code: '5',
-      value: 'FI-Vapaa'
-    }]
-  };
-  const ldf856partial = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }, {
-      code: '5',
-      value: 'FI-Vapaa'
-    }]
-  };
-  const f856URN = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }]
-  };
-  const f856URNHttps = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'https://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }]
-  };
-  const f856URNnotResource = {
-    tag: '856',
-    ind1: '4',
-    ind2: '1',
-    subfields: [{
-      code: 'u',
-      value: 'http://urn.fi/URN:ISBN:978-951-9155-47-0'
-    }]
-  };
-  const f856URL = {
-    tag: '856',
-    ind1: '4',
-    ind2: '0',
-    subfields: [{
-      code: 'u',
-      value: 'http://foo.bar/'
-    }]
-  };
-  const f020 = {
-    tag: '020',
-    ind1: ' ',
-    ind2: ' ',
-    subfields: [{
-      code: 'a',
-      value: '978-951-9155-47-0'
-    }]
-  };
-  const f020second = {
-    tag: '020',
-    ind1: ' ',
-    ind2: ' ',
-    subfields: [{
-      code: 'a',
-      value: '9789519155470'
-    }]
-  };
-  it('Creates a validator', async () => {
-    const validator = await (0, _urn.default)();
-    (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
-    (0, _chai.expect)(validator.description).to.be.a('string');
-    (0, _chai.expect)(validator.validate).to.be.a('function');
-  });
-
-  // Tests
-  const test = async isLegalDeposit => {
-    const validator = await (0, _urn.default)(isLegalDeposit);
-    return {
-      validate: async (valid, ...recfields) => {
-        const result = await validator.validate(new _marcRecord.MarcRecord({
-          fields: recfields
-        }));
-        (0, _chai.expect)(result).to.eql({
-          valid
-        });
-      },
-      fix: async (recfields, resfields) => {
-        const record = new _marcRecord.MarcRecord({
-          fields: recfields
-        });
-        await validator.fix(record);
-        (0, _chai.expect)(record.fields).to.eql(resfields);
-      }
-    };
-  };
-
-  /// Non-legal and legal deposit
-  const nonld = await test(false);
-  const ld = await test(true);
-  describe('#validate', () => {
-    // Validate non-electoronic
-    it('Finds the record valid; non-electronic record', async () => {
-      await nonld.validate(true, f337nonElectronic);
-    });
-
-    // Validate non-legal deposit
-    it('Finds the record valid; 856 with urn, and is non-legal deposit', async () => {
-      await nonld.validate(true, f337, f856URN);
-    });
-
-    // we should recognize that 856 with second indicator 1 is not describing the resource itself
-    it.skip('Finds the record invalid; 856 ind2: 1 with urn, and is non-legal deposit', async () => {
-      await nonld.validate(false, f337, f856URNnotResource);
-    });
-
-    // should we require urn if we're not handling a legal deposit
-    it('Finds the record invalid; 856 without urn, and is non-legal deposit', async () => {
-      await nonld.validate(false, f337, f856URL);
-    });
-
-    // should we require urn if we're not handling a legal deposit
-    it('Finds the record invalid; Missing 856, and is non-legal deposit', async () => {
-      await nonld.validate(false, f337, f020);
-    });
-
-    // Validate legal deposit
-    it('Finds the record invalid; 856 with urn, and is legal deposit', async () => {
-      await ld.validate(false, f020, f337, f856URN);
-    });
-    it('Finds the record invalid; 856 without urn, and is legal deposit', async () => {
-      await ld.validate(false, f020, f337, f856URL);
-    });
-    it('Finds the record invalid; Missing 856, and is legal deposit', async () => {
-      await ld.validate(false, f337, f020);
-    });
-    it('Finds the record valid; 856 with URN and legal deposit subfields, and is legal deposit', async () => {
-      await ld.validate(true, f337, f020, ldf856);
-    });
-    it('Finds the record invalid; old phrase is used in $z', async () => {
-      await ld.validate(false, f337, f020, ldf856old);
-    });
-    it('Finds the record valid; 856 with URN and legal deposit subfields and other f856s, and is legal deposit', async () => {
-      await ld.validate(true, f337, f020, ldf856partial, ldf856, f856URL);
-    });
-    it('Finds the record invalid; 856 with URN and partial legal deposit subfields, and is legal deposit', async () => {
-      await ld.validate(false, f337, f020, ldf856partial);
-    });
-  });
-  describe('#fix', () => {
-    // Fix non-legal deposit
-    it('856 with urn, and is non-legal deposit; Nothing to add', async () => {
-      await nonld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN]);
-    });
-
-    // should we actually add non-resolvable urns?
-    it('856 without urn, and is non-legal deposit; Adds 856 with urn (https)', async () => {
-      await nonld.fix([f020, f856URL], [f020, f856URL, f856URNHttps]);
-    });
-
-    // should we actually add non-resolvable urns?
-    it('Missing 856, and is non-legal deposit; Adds 856 with urn (https)', async () => {
-      await nonld.fix([f020], [f020, f856URNHttps]);
-    });
-
-    // should we actually add non-resolvable urns?
-    it('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from second 020 (https)', async () => {
-      await nonld.fix([f020second, f020], [f020second, f020, f856URNHttps]);
-    });
-
-    // should we actually add non resovable urns?
-    // we should think about how to choose the isbn to use in case of several ISBNs
-    it.skip('Missing 856, and is non-legal deposit, two 020 fields; Adds 856 with urn from first 020 (https)', async () => {
-      await nonld.fix([f020, f020second], [f020, f020second, f856URNHttps]);
-    });
-
-    // Fix legal deposit
-    it('856 with urn and legal deposit fields, and is legal deposit; Nothing to add', async () => {
-      await ld.fix([f020, f856URL, ldf856], [f020, f856URL, ldf856]);
-    });
-    it('856 with urn and legal deposit fields, and is legal deposit but phrase is old; change phrase to new', async () => {
-      await ld.fix([f020, f856URL, ldf856old], [f020, f856URL, ldf856]);
-    });
-    it('856 without urn, and is legal deposit; Adds 856 with urn (https) and legal deposit fields', async () => {
-      await ld.fix([f020, f856URL], [f020, f856URL, ldf856Https]);
-    });
-
-    // we should test generating the URN in case of no ISBN
-
-    // we should test creating Melinda-temp field
-
-    // We shouldn't lock the open URN for legal deposit use
-    it('Missing 856, and is legal deposit; Adds 856 with urn (https) and legal deposit fields', async () => {
-      await ld.fix([f020], [f020, ldf856Https]);
-    });
-
-    // We should actually do this instead of locking the original non-legal deposit URN for legal deposit use
-    it.skip('856 with urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {
-      await ld.fix([f020, f856URL, f856URN], [f020, f856URL, f856URN, ldf856Https]);
-    });
-
-    // We should actually add a new urn in case of a non-resource URN
-    it.skip('856 with non-resource-urn, and is legal deposit; Adds another f856 with URN and legal deposit fields', async () => {
-      await ld.fix([f020, f856URL, f856URNnotResource], [f020, f856URL, f856URNnotResource, ldf856Https]);
-    });
-  });
+(0, _fixugen.default)({
+  callback,
+  path: [__dirname, '..', 'test-fixtures', 'urn'],
+  useMetadataFile: true,
+  recurse: false,
+  fixura: {
+    reader: _fixura.READERS.JSON
+  },
+  mocha: {
+    before: () => testValidatorFactory()
+  }
 });
+const debug = (0, _debug.default)('@natlibfi/marc-record-validators-melinda/urn:test');
+async function testValidatorFactory() {
+  const validator = await (0, _urn.default)();
+  (0, _chai.expect)(validator).to.be.an('object').that.has.any.keys('description', 'validate');
+  (0, _chai.expect)(validator.description).to.be.a('string');
+  (0, _chai.expect)(validator.validate).to.be.a('function');
+}
+async function callback({
+  getFixture,
+  enabled = true,
+  fix = true,
+  isLegalDeposit = false
+}) {
+  if (enabled === false) {
+    debug('TEST SKIPPED!');
+    return;
+  }
+  const validator = await (0, _urn.default)(isLegalDeposit);
+  const record = new _marcRecord.MarcRecord(getFixture('input.json'));
+  const expectedResult = getFixture('result.json');
+  // console.log(expectedResult); // eslint-disable-line
+
+  if (!fix) {
+    const result = await validator.validate(record);
+    (0, _chai.expect)(result).to.eql(expectedResult);
+    return;
+  }
+  await validator.fix(record);
+  (0, _chai.expect)(record).to.eql(expectedResult);
+}
 //# sourceMappingURL=urn.spec.js.map

package/dist/urn.spec.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"file":"urn.spec.js","names":["_chai","require","_marcRecord","_urn","_interopRequireDefault","_fixura","_fixugen","_debug","e","__esModule","default","generateTests","callback","path","__dirname","useMetadataFile","recurse","fixura","reader","READERS","JSON","mocha","before","testValidatorFactory","debug","createDebugLogger","validator","validatorFactory","expect","to","be","an","that","has","any","keys","description","a","validate","getFixture","enabled","fix","isLegalDeposit","record","MarcRecord","expectedResult","result","eql"],"sources":["../src/urn.spec.js"],"sourcesContent":["import {expect} from 'chai';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport validatorFactory from './urn';\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport createDebugLogger from 'debug';\n\ngenerateTests({\n  callback,\n  path: [__dirname, '..', 'test-fixtures', 'urn'],\n  useMetadataFile: true,\n  recurse: false,\n  fixura: {\n    reader: READERS.JSON\n  },\n  mocha: {\n    before: () => testValidatorFactory()\n  }\n});\nconst debug = createDebugLogger('@natlibfi/marc-record-validators-melinda/urn:test');\n\nasync function testValidatorFactory() {\n  const validator = await validatorFactory();\n\n  expect(validator)\n    .to.be.an('object')\n    .that.has.any.keys('description', 'validate');\n\n  expect(validator.description).to.be.a('string');\n  expect(validator.validate).to.be.a('function');\n}\n\nasync function callback({getFixture, enabled = true, fix = true, isLegalDeposit = false}) {\n  if (enabled === false) {\n    debug('TEST SKIPPED!');\n    return;\n  }\n\n  const validator = await validatorFactory(isLegalDeposit);\n  const record = new MarcRecord(getFixture('input.json'));\n  const expectedResult = getFixture('result.json');\n  // console.log(expectedResult); // eslint-disable-line\n\n  if (!fix) {\n    const result = await validator.validate(record);\n    expect(result).to.eql(expectedResult);\n    return;\n  }\n\n  await validator.fix(record);\n  expect(record).to.eql(expectedResult);\n}\n"],"mappings":";;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AACA,IAAAK,QAAA,GAAAF,sBAAA,CAAAH,OAAA;AACA,IAAAM,MAAA,GAAAH,sBAAA,CAAAH,OAAA;AAAsC,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEtC,IAAAG,gBAAa,EAAC;EACZC,QAAQ;EACRC,IAAI,EAAE,CAACC,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC;EAC/CC,eAAe,EAAE,IAAI;EACrBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;IACNC,MAAM,EAAEC,eAAO,CAACC;EAClB,CAAC;EACDC,KAAK,EAAE;IACLC,MAAM,EAAEA,CAAA,KAAMC,oBAAoB,CAAC;EACrC;AACF,CAAC,CAAC;AACF,MAAMC,KAAK,GAAG,IAAAC,cAAiB,EAAC,mDAAmD,CAAC;AAEpF,eAAeF,oBAAoBA,CAAA,EAAG;EACpC,MAAMG,SAAS,GAAG,MAAM,IAAAC,YAAgB,EAAC,CAAC;EAE1C,IAAAC,YAAM,EAACF,SAAS,CAAC,CACdG,EAAE,CAACC,EAAE,CAACC,EAAE,CAAC,QAAQ,CAAC,CAClBC,IAAI,CAACC,GAAG,CAACC,GAAG,CAACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;EAE/C,IAAAP,YAAM,EAACF,SAAS,CAACU,WAAW,CAAC,CAACP,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,QAAQ,CAAC;EAC/C,IAAAT,YAAM,EAACF,SAAS,CAACY,QAAQ,CAAC,CAACT,EAAE,CAACC,EAAE,CAACO,CAAC,CAAC,UAAU,CAAC;AAChD;AAEA,eAAezB,QAAQA,CAAC;EAAC2B,UAAU;EAAEC,OAAO,GAAG,IAAI;EAAEC,GAAG,GAAG,IAAI;EAAEC,cAAc,GAAG;AAAK,CAAC,EAAE;EACxF,IAAIF,OAAO,KAAK,KAAK,EAAE;IACrBhB,KAAK,CAAC,eAAe,CAAC;IACtB;EACF;EAEA,MAAME,SAAS,GAAG,MAAM,IAAAC,YAAgB,EAACe,cAAc,CAAC;EACxD,MAAMC,MAAM,GAAG,IAAIC,sBAAU,CAACL,UAAU,CAAC,YAAY,CAAC,CAAC;EACvD,MAAMM,cAAc,GAAGN,UAAU,CAAC,aAAa,CAAC;EAChD;;EAEA,IAAI,CAACE,GAAG,EAAE;IACR,MAAMK,MAAM,GAAG,MAAMpB,SAAS,CAACY,QAAQ,CAACK,MAAM,CAAC;IAC/C,IAAAf,YAAM,EAACkB,MAAM,CAAC,CAACjB,EAAE,CAACkB,GAAG,CAACF,cAAc,CAAC;IACrC;EACF;EAEA,MAAMnB,SAAS,CAACe,GAAG,CAACE,MAAM,CAAC;EAC3B,IAAAf,YAAM,EAACe,MAAM,CAAC,CAACd,EAAE,CAACkB,GAAG,CAACF,cAAc,CAAC;AACvC","ignoreList":[]}

package/package.json

@@ -14,7 +14,7 @@
     "url": "git@github.com:natlibfi/marc-record-validators-melinda.git"
   },
   "license": "MIT",
-  "version": "11.3.6",
+  "version": "11.3.7-alpha.1",
   "main": "./dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -37,15 +37,15 @@
     "cover:report": "nyc report"
   },
   "dependencies": {
-    "@babel/register": "^7.24.6",
+    "@babel/register": "^7.25.7",
     "@natlibfi/issn-verify": "^1.0.4",
-    "@natlibfi/marc-record": "^9.0.1",
+    "@natlibfi/marc-record": "^9.0.2",
     "@natlibfi/marc-record-validate": "^8.0.10",
     "cld3-asm": "^3.1.1",
     "clone": "^2.1.2",
     "debug": "^4.3.7",
     "iso9_1995": "^0.0.2",
-    "isbn3": "^1.2.0",
+    "isbn3": "^1.2.2",
     "langs": "^2.0.0",
     "node-fetch": "^2.7.0",
     "sfs4900": "^0.0.1",
@@ -56,19 +56,19 @@
     "@natlibfi/marc-record-validate": "^8.0.10"
   },
   "devDependencies": {
-    "@babel/cli": "^7.25.6",
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/cli": "^7.25.7",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
     "@natlibfi/eslint-config-melinda-backend": "^3.0.5",
-    "@natlibfi/fixugen": "^2.0.9",
-    "@natlibfi/fixura": "^3.0.8",
+    "@natlibfi/fixugen": "^2.0.10",
+    "@natlibfi/fixura": "^3.0.10",
     "babel-plugin-istanbul": "^7.0.0",
     "babel-plugin-rewire": "^1.2.0",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
     "cross-env": "^7.0.3",
     "eslint": "^8.57.1",
-    "fetch-mock": "^11.1.4",
+    "fetch-mock": "^11.1.5",
     "mocha": "^10.7.3",
     "nyc": "^17.1.0"
   },

package/src/punctuation2.js

@@ -91,6 +91,8 @@ const defaultNeedsPuncAfter2 = /(?:[\]a-zA-Z0-9)]|ä|å|ö|Å|Ä|Ö)$/u;
 const doesNotEndInPunc = /[^!?.:;,]$/u; // non-punc for pre-240/700/XXX $, note that '.' comes if preceded by ')'
 const blocksPuncRHS = /^(?:\()/u;
 const allowsPuncRHS = /^(?:[A-Za-z0-9]|å|ä|ö|Å|Ä|Ö)/u;
+const aToZ = 'abcdefghijklmnopqrstuvwxyz';
+
 
 const dotIsProbablyPunc = /(?:[a-z0-9)]|å|ä|ö|(?:[A-Za-z0-9]|Å|Ä|Ö)(?:[A-Z]|Å|Ä|Ö))\.$/u;
 const puncIsProbablyPunc = /(?:[a-z0-9)]|å|ä|ö) ?[.,:;]$/u;
@@ -146,7 +148,11 @@ const removeX30Whatever = removeCrapFromAllEntryFields;
 
 const remove490And830Whatever = [{'code': 'axyzv', 'followedBy': 'axyzv', 'remove': /(?: *;| *=|,)$/u}];
 
-const linkingEntryWhatever = [{'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz', 'remove': /\. -$/u}];
+const linkingEntryRemoveWhatever = [
+  {'code': 'i', 'followedBy': 'at', 'remove': / ?:$/u}, // ':'
+  {'code': 'at', 'remove': /\.$/u},
+  {'code': 'abdghiklmnopqrstuwxyz', 'followedBy': 'abdghiklmnopqrstuwxyz', 'remove': /\. -$/u}
+];
 
 
 // '!' means negation, thus '!b' means any other subfield but 'b'.
@@ -193,9 +199,10 @@ const cleanCrappyPunctuationRules = {
   '710': removeX10Whatever,
   '711': removeX11Whatever,
   '730': removeX30Whatever,
-  '773': linkingEntryWhatever,
-  '774': linkingEntryWhatever,
-  '776': linkingEntryWhatever,
+  '773': linkingEntryRemoveWhatever,
+  '774': linkingEntryRemoveWhatever,
+  '776': linkingEntryRemoveWhatever,
+  '787': linkingEntryRemoveWhatever,
   '800': removeX00Whatever,
   '810': removeX10Whatever,
   '830': remove490And830Whatever,
@@ -316,6 +323,12 @@ const addSeriesTitle = [ // 490 and 830
   addSemicolonBeforeVolumeDesignation //  eg. 490$axyz-$v
 ];
 
+const addLinkingEntry = [ // NB! Music 773 uses different punctuation rules, that are not implement here (can they even be?)
+  {'code': 'i', 'followedBy': aToZ, 'add': ':', 'context': defaultNeedsPuncAfter2},
+  {'code': 'a', 'followedBy': 't', 'add': '.', 'context': defaultNeedsPuncAfter2},
+  {'code': 't', 'followedBy': 'dghoz', 'add': '.', 'context': defaultNeedsPuncAfter2}
+];
+
 const addPairedPunctuationRules = {
   '100': addX00,
   '110': addX10,
@@ -355,6 +368,8 @@ const addPairedPunctuationRules = {
   '710': addX10,
   '711': addX11,
   '730': addX30,
+  '773': addLinkingEntry,
+  '787': addLinkingEntry,
   '800': addX00,
   '810': addX10,
   '811': addX11,
@@ -485,23 +500,23 @@ function applyPunctuationRules(field, subfield1, subfield2, ruleArray = null, op
 
   //nvdebug(`OP=${operation} ${tag2}: '${subfield1.code}: ${subfield1.value}' ??? '${subfield2 ? subfield2.code : '#'}'`);
   const candRules = ruleArray[tag2];
-  candRules.forEach(rule => {
+  candRules.every(rule => { // uses "every", not "forEach", so that only one rule is applies to the given subfields
     //debugRule(rule);
-    //nvdebug(' WP1');
     if (!checkRule(rule, field, subfield1, subfield2)) {
-      return;
+      return true;
     }
-    //nvdebug(' WP2');
 
     //const originalValue = subfield1.value;
-    if (rule.remove && [REMOVE, REMOVE_AND_ADD].includes(operation) && subfield1.value.match(rule.remove)) { // eslint-disable-line functional/no-conditional-statements
+    if (rule.remove && [REMOVE, REMOVE_AND_ADD].includes(operation) && subfield1.value.match(rule.remove)) {
       //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}'`);
+      return false;
     }
-    if (rule.add && [ADD, REMOVE_AND_ADD].includes(operation)) { // eslint-disable-line functional/no-conditional-statements
+    if (rule.add && [ADD, REMOVE_AND_ADD].includes(operation)) {
       subfield1.value += rule.add; // eslint-disable-line functional/immutable-data
       //nvdebug(`    ADDED '${rule.add}' TO FORM '${subfield1.value}'`);
+      return false;
     }
 
     /*
@@ -509,6 +524,8 @@ function applyPunctuationRules(field, subfield1, subfield2, ruleArray = null, op
       nvdebug(` PROCESS PUNC: '‡${subfield1.code} ${originalValue}' => '‡${subfield1.code} ${subfield1.value}'`, debug); // eslint-disable-line functional/immutable-data
     }
     */
+
+    return true;
   });
 }
 

package/src/urn.js

@@ -8,12 +8,26 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
   const debug = createDebugLogger('@natlibfi/marc-record-validators-melinda:urn');
   const debugData = debug.extend('data');
 
+  //console.log(`IS LEGAL DEPOSIT? ${isLegalDeposit ? 'YES' : 'NO'}`); // eslint-disable-line no-console
+
   // We should check that the f856 with URN has second indicator '0' (Resource), ' ' (No information provided) or '8' (No display constant generated)
   // - 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
 
   // This checks only the existence of URNs from the Finnish urn.fi -resolver
 
-  const hasURN = f => f.tag === '856' && f.subfields.some(({code, value}) => code === 'u' && (/urn.fi/u).test(value));
+  function hasLegalDepositURN(field) {
+    if (field.tag !== '856' || ['1', '2', '3', '4'].includes(field.ind2)) {
+      return false;
+    }
+
+    // First attempt to fix MET-573. However, does useMelindaTemp come into play as well?
+    if (isLegalDeposit && !field.subfields.some(sf => sf.code === '5' && sf.value === 'FI-Vapaa')) {
+      return false;
+    }
+
+    return field.subfields.some(sf => sf.code === 'u' && (/^https?:\/\/urn\.fi/u).test(sf.value));
+  }
+
 
   return {
     description: 'Adds URN for record, to 856-field (if not existing). If isLegalDeposit is active, adds legal deposit subfields to the f856s with URN.',
@@ -22,7 +36,7 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
   };
 
   async function fix(record) {
-    const f856sUrn = record.fields.filter(hasURN);
+    const f856sUrn = record.fields.filter(hasLegalDepositURN);
     debugData(`f856sUrn: ${JSON.stringify(f856sUrn)}`);
 
     const ldSubfields = isLegalDeposit ? createLDSubfields() : [];
@@ -163,7 +177,7 @@ export default function (isLegalDeposit = false, useMelindaTemp = true) {
       return {valid: true};
     }
 
-    const f856sUrn = record.fields.filter(hasURN);
+    const f856sUrn = record.fields.filter(hasLegalDepositURN);
 
     if (f856sUrn.length > 0) {
       debug(`Record has ${f856sUrn.length} URN fields`);