Merge pull request #81 from NatLibFi/next

Simplify type of record rules

Author: nvolk

README.md

@@ -345,6 +345,6 @@ To serialize and unserialize MARC records, see [marc-record-serializers](https:/
 
 Copyright (c) 2014-2017 **Pasi Tuominen <[email protected]>**
 
-Copyright (c) 2018-2023 **University Of Helsinki (The National Library Of Finland)**
+Copyright (c) 2018-2024 **University Of Helsinki (The National Library Of Finland)**
 
 This project's source code is licensed under the terms of **MIT License** or any later version.

package-lock.json

@@ -25,7 +25,7 @@
 		"url": "[email protected]:natlibfi/marc-record-js.git"
 	},
 	"license": "MIT",
-	"version": "8.1.0",
+	"version": "8.1.1-alpha.1",
 	"main": "./dist/index.js",
 	"engines": {
 		"node": ">=14"
@@ -51,21 +51,21 @@
 		"jsonschema": "^1.4.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.23.0",
-		"@babel/core": "^7.23.7",
-		"@babel/node": "^7.22.19",
-		"@babel/plugin-transform-runtime": "^7.23.7",
-		"@babel/preset-env": "^7.23.8",
+		"@babel/cli": "^7.24.1",
+		"@babel/core": "^7.24.4",
+		"@babel/node": "^7.23.9",
+		"@babel/plugin-transform-runtime": "^7.24.3",
+		"@babel/preset-env": "^7.24.4",
 		"@babel/register": "^7.23.7",
-		"@natlibfi/eslint-config-melinda-backend": "^3.0.2",
+		"@natlibfi/eslint-config-melinda-backend": "^3.0.4",
 		"@natlibfi/fixugen": "^2.0.4",
 		"@natlibfi/fixura": "^3.0.4",
 		"babel-plugin-istanbul": "^6.1.1",
-		"chai": "^4.4.0",
+		"chai": "^4.4.1",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.56.0",
-		"mocha": "^10.2.0",
-		"nodemon": "^3.0.1",
+		"eslint": "^8.57.0",
+		"mocha": "^10.4.0",
+		"nodemon": "^3.1.0",
 		"nyc": "^15.1.0"
 	},
 	"eslintConfig": {

package.json

@@ -213,59 +213,27 @@ export class MarcRecord {
   }
 
   isCF() {
-    if (this.getTypeOfRecord() !== 'm') {
-      return false;
-    }
-    if (!this._bibliographicLevelIsBis()) {
-      return true;
-    }
-
-    return this._containsField006FormOfMaterialS();
+    return this.getTypeOfRecord() === 'm';
   }
 
   isCR() {
     return ['a', 't'].includes(this.getTypeOfRecord()) && this._bibliographicLevelIsBis();
   }
 
   isMP() {
-    if (!['e', 'f'].includes(this.getTypeOfRecord())) {
-      return false;
-    }
-    if (!this._bibliographicLevelIsBis()) {
-      return true;
-    }
-    return this._containsField006FormOfMaterialS();
+    return ['e', 'f'].includes(this.getTypeOfRecord());
   }
 
   isMU() {
-    if (!['c', 'd', 'i', 'j'].includes(this.getTypeOfRecord())) {
-      return false;
-    }
-    if (!this._bibliographicLevelIsBis()) {
-      return true;
-    }
-    return this._containsField006FormOfMaterialS();
+    return ['c', 'd', 'i', 'j'].includes(this.getTypeOfRecord());
   }
 
   isMX() {
-    if (this.getTypeOfRecord() !== 'p') {
-      return false;
-    }
-    if (!this._bibliographicLevelIsBis(this)) {
-      return true;
-    }
-    return this._containsField006FormOfMaterialS();
+    return this.getTypeOfRecord() === 'p';
   }
 
   isVM() {
-    if (!['g', 'k', 'o', 'r'].includes(this.getTypeOfRecord())) {
-      return false;
-    }
-
-    if (!this._bibliographicLevelIsBis()) {
-      return true;
-    }
-    return this._containsField006FormOfMaterialS();
+    return ['g', 'k', 'o', 'r'].includes(this.getTypeOfRecord());
   }
 
   getTypeOfMaterial() {
@@ -297,11 +265,6 @@ export class MarcRecord {
     return ['b', 'i', 's'].includes(this.getBibliograpicLevel());
   }
 
-  _containsField006FormOfMaterialS() {
-    const fields006 = this.get('006');
-    return fields006.some(field => field.value[0] === 's');
-  }
-
   equalsTo(record) {
     return MarcRecord.isEqual(this, record);
   }

src/index.js

@@ -1,8 +1,8 @@
 {
-  "description": "fail to determine the type of material (LDR/07+006/00 combo)",
+  "description": "fail to determine the type of material (Illegal LDR/06)",
   "skip": false,
   "input": {
-    "leader": "01234cki a22005894i 4500",
+    "leader": "01234cbi a22005894i 4500",
     "fields":
     [
       {"tag": "001", "value": "bar"},