@natlibfi/melinda-rest-api-commons 4.2.5-alpha.1 → 5.0.0-alpha.1

package/dist/fix.js

@@ -0,0 +1,142 @@
+import createDebugLogger from "debug";
+import { MarcRecord } from "@natlibfi/marc-record";
+import { createLogger } from "@natlibfi/melinda-backend-commons";
+import { FieldExclusion, SubfieldExclusion } from "@natlibfi/marc-record-validators-melinda";
+import { handleTempUrns } from "./fix-handle-tempurns.js";
+import { stripF884s } from "./fix-strip-f884s.js";
+export * from "./fix-constants.js";
+const logger = createLogger();
+const debug = createDebugLogger("@natlibfi/melinda-rest-api-commons:fixRecord");
+const debugData = debug.extend("data");
+export function fixRecord(record, settings = {}) {
+  logger.verbose(`We will apply formatting to the record according to settings: ${JSON.stringify(settings)}`);
+  const newRecord = MarcRecord.clone(record, { subfieldValues: false });
+  debugData(`settings: ${JSON.stringify(settings)}`);
+  const generateMissingSIDsOptions = settings.generateMissingSIDs || void 0;
+  const newRecord1 = generateMissingSIDs(newRecord, generateMissingSIDsOptions);
+  const replacePrefixesOptions = settings.replacePrefixes || [];
+  const newRecord2 = replaceAllPrefixes(newRecord1, replacePrefixesOptions);
+  const newRecord3 = handleTempUrns(newRecord2, settings.handleTempUrns);
+  const newRecord4 = stripF884s(newRecord3, settings.stripF884s);
+  const newRecord5 = stripF984s(newRecord4, settings.stripF984s || false);
+  const newRecord6 = stripMelindaTempSubfields(newRecord5, settings.stripMelindaTempSubfields || false);
+  debugData(newRecord6);
+  return newRecord6.toObject();
+}
+function replaceAllPrefixes(record, replacePrefixesOptions) {
+  if (replacePrefixesOptions.length < 1) {
+    debug(`NOT running replacePrefixes, no options`);
+    return record;
+  }
+  debug(`Running replacePrefixes fixer`);
+  debugData(`replacePrefixesOptions: ${JSON.stringify(replacePrefixesOptions)}`);
+  replacePrefixesOptions.forEach((options) => {
+    replacePrefix(record, options);
+  });
+  return record;
+}
+function replacePrefix(record, options) {
+  const { oldPrefix, newPrefix, prefixReplaceCodes } = options;
+  debug(`Replacing ${oldPrefix} with ${newPrefix} in subfields ${prefixReplaceCodes}`);
+  const pattern = `(${oldPrefix})`;
+  const replacement = `(${newPrefix})`;
+  record.getDatafields().forEach((field) => {
+    field.subfields.filter(({ code }) => prefixReplaceCodes.includes(code)).forEach((subfield) => {
+      subfield.value = subfield.value.replace(pattern, replacement);
+    });
+  });
+  return record;
+}
+function generateMissingSIDs(record, options) {
+  const f035Filters = options && options.f035Filters ? options.f035Filters : [];
+  const fSIDFilters = options && options.fSIDFilters ? options.fSIDFilters : [];
+  if (f035Filters.length !== fSIDFilters.length || f035Filters.length < 1 || fSIDFilters.length < 1) {
+    debug(`NOT running generateMissingsSIDs, no options`);
+    return record;
+  }
+  debug(`Running generateMissingSIDs fixer`);
+  debugData(`generateMissingSIDs options: ${JSON.stringify(options)}`);
+  const f035s = f035ToSidInfo(record.get(/^035$/u));
+  const fSIDs = sidsToSidInfo(record.get(/^SID$/u));
+  const sidsToBeAdded = genNewSids(fSIDs.length === 0 ? f035s : f035s.filter((f035SidInfo) => !fSIDs.some((fSIDInfo) => f035SidInfo.SID === fSIDInfo.SID && f035SidInfo.value === fSIDInfo.value)));
+  debugData(`Adding (${sidsToBeAdded.length}) SIDs: ${JSON.stringify(sidsToBeAdded)}`);
+  sidsToBeAdded.forEach((sidField) => record.insertField(sidField));
+  return record;
+  function genNewSids(sidsToBeAdded2) {
+    return sidsToBeAdded2.map((sidInfo) => ({ tag: "SID", ind1: " ", ind2: " ", subfields: [{ code: "c", value: sidInfo.value }, { code: "b", value: sidInfo.SID }] }));
+  }
+  function sidsToSidInfo(SIDs) {
+    return SIDs.flatMap(({ subfields }) => {
+      const [SID] = subfields.filter((sub) => sub.code === "b" && fSIDFilters.includes(sub.value)).map((sub) => sub.value);
+      const [value] = subfields.filter((sub) => sub.code === "c" && sub.value !== void 0).map((sub) => sub.value);
+      if (SID && value) {
+        return {
+          SID,
+          value
+        };
+      }
+      return void 0;
+    }).filter((value) => value !== void 0);
+  }
+  function f035ToSidInfo(f035s2) {
+    return f035s2.flatMap(({ subfields }) => {
+      const [wantedSub] = subfields.filter((sub) => sub.code === "a" && f035Filters.some((regexp) => regexp.test(sub.value)));
+      if (wantedSub) {
+        return {
+          SID: fSIDFilters[f035Filters.findIndex((regexp) => regexp.test(wantedSub.value))],
+          value: wantedSub.value.slice(wantedSub.value.indexOf(")") + 1)
+        };
+      }
+      return void 0;
+    }).filter((value) => value !== void 0);
+  }
+}
+function stripF984s(record, stripF984sSettings) {
+  const F984A_PATTERN = /^(?:ALWAYS|NEVER)-PREFER-IN-MERGE$/u;
+  const config = [
+    {
+      tag: /^984$/u,
+      subfields: [
+        {
+          code: /a/u,
+          value: F984A_PATTERN
+        }
+      ]
+    }
+  ];
+  debug(`Running removeF984AFields`);
+  debugData(`removeF984AFieldsSettings: ${JSON.stringify(stripF984sSettings)}`);
+  if (!stripF984sSettings || !F984A_PATTERN || record.get("984").length < 1) {
+    debug(`No settings or pattern for removeF984AFields or f984 in record`);
+    return record;
+  }
+  debug(`Removing f984 fields with subfield $a consisting values ${F984A_PATTERN.toString()}`);
+  const validator = FieldExclusion(config);
+  validator.fix(record);
+  return record;
+}
+function stripMelindaTempSubfields(record, stripMelindaTempSubfieldsSettings) {
+  if (!stripMelindaTempSubfieldsSettings) {
+    debug(`No settings for stripMelindaTempSubfields`);
+    return record;
+  }
+  const tagPattern = /856/u;
+  const subfieldCodePattern = /9/u;
+  const subfieldValuePattern = /^MELINDA<TEMP>$/u;
+  const config = [
+    {
+      tag: tagPattern,
+      subfields: [
+        {
+          code: subfieldCodePattern,
+          value: subfieldValuePattern
+        }
+      ]
+    }
+  ];
+  debug(`Running stripMelindaTempSubfields`);
+  const validator = SubfieldExclusion(config);
+  validator.fix(record);
+  return record;
+}
+//# sourceMappingURL=fix.js.map

package/dist/fix.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/helpers/fix.js"],
+  "sourcesContent": ["import createDebugLogger from 'debug';\nimport {MarcRecord} from '@natlibfi/marc-record';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nimport {FieldExclusion, SubfieldExclusion} from '@natlibfi/marc-record-validators-melinda';\n\nimport {handleTempUrns} from './fix-handle-tempurns.js';\nimport {stripF884s} from './fix-strip-f884s.js';\n\nexport * from './fix-constants.js';\n\nconst logger = createLogger();\nconst debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:fixRecord');\nconst debugData = debug.extend('data');\n\nexport function fixRecord(record, settings = {}) {\n\n  logger.verbose(`We will apply formatting to the record according to settings: ${JSON.stringify(settings)}`);\n  const newRecord = MarcRecord.clone(record, {subfieldValues: false});\n  debugData(`settings: ${JSON.stringify(settings)}`);\n\n  // We should handle these in some prettier way ...\n\n  // Fix 1, generate SIDs\n  const generateMissingSIDsOptions = settings.generateMissingSIDs || undefined;\n  const newRecord1 = generateMissingSIDs(newRecord, generateMissingSIDsOptions);\n\n  // Fix 2, replace identifier prefixes\n  const replacePrefixesOptions = settings.replacePrefixes || [];\n  const newRecord2 = replaceAllPrefixes(newRecord1, replacePrefixesOptions);\n\n  // Fix 3, handle temporary URNs from legal deposit record import\n  const newRecord3 = handleTempUrns(newRecord2, settings.handleTempUrns);\n\n  // Fix 4, strip extra field 884s\n  const newRecord4 = stripF884s(newRecord3, settings.stripF884s);\n\n  // Fix 5, strip extra field 984s\n  const newRecord5 = stripF984s(newRecord4, settings.stripF984s || false);\n\n  // Fix 6, strip $9 MELINDA<TEMP> subfields\n  const newRecord6 = stripMelindaTempSubfields(newRecord5, settings.stripMelindaTempSubfields || false);\n\n  debugData(newRecord6);\n\n  return newRecord6.toObject();\n\n}\n\n\nfunction replaceAllPrefixes(record, replacePrefixesOptions) {\n  if (replacePrefixesOptions.length < 1) {\n    debug(`NOT running replacePrefixes, no options`);\n    return record;\n  }\n\n  debug(`Running replacePrefixes fixer`);\n  debugData(`replacePrefixesOptions: ${JSON.stringify(replacePrefixesOptions)}`);\n\n  replacePrefixesOptions.forEach(options => {\n    replacePrefix(record, options);\n  });\n  return record;\n}\n\n\n// Replace prefix in all specified subfields\nfunction replacePrefix(record, options) {\n  const {oldPrefix, newPrefix, prefixReplaceCodes} = options;\n  debug(`Replacing ${oldPrefix} with ${newPrefix} in subfields ${prefixReplaceCodes}`);\n  const pattern = `(${oldPrefix})`;\n  const replacement = `(${newPrefix})`;\n  record.getDatafields()\n    .forEach(field => {\n      field.subfields\n        .filter(({code}) => prefixReplaceCodes.includes(code))\n        .forEach(subfield => {\n          subfield.value = subfield.value.replace(pattern, replacement);\n        });\n    });\n  return record;\n}\n\n\nfunction generateMissingSIDs(record, options) {\n\n  const f035Filters = options && options.f035Filters ? options.f035Filters : [];\n  const fSIDFilters = options && options.fSIDFilters ? options.fSIDFilters : [];\n\n  if (f035Filters.length !== fSIDFilters.length || f035Filters.length < 1 || fSIDFilters.length < 1) {\n    debug(`NOT running generateMissingsSIDs, no options`);\n    return record;\n  }\n\n  debug(`Running generateMissingSIDs fixer`);\n  debugData(`generateMissingSIDs options: ${JSON.stringify(options)}`);\n\n  const f035s = f035ToSidInfo(record.get(/^035$/u));\n  const fSIDs = sidsToSidInfo(record.get(/^SID$/u));\n\n  const sidsToBeAdded = genNewSids(fSIDs.length === 0\n    ? f035s\n    // test that SIDs are not there yet\n    : f035s.filter(f035SidInfo => !fSIDs.some(fSIDInfo => f035SidInfo.SID === fSIDInfo.SID && f035SidInfo.value === fSIDInfo.value)));\n\n  debugData(`Adding (${sidsToBeAdded.length}) SIDs: ${JSON.stringify(sidsToBeAdded)}`);\n\n  // Add new SIDs\n  sidsToBeAdded.forEach(sidField => record.insertField(sidField));\n  return record;\n\n  function genNewSids(sidsToBeAdded) {\n    return sidsToBeAdded.map(sidInfo => ({tag: 'SID', ind1: ' ', ind2: ' ', subfields: [{code: 'c', value: sidInfo.value}, {code: 'b', value: sidInfo.SID}]}));\n  }\n\n  function sidsToSidInfo(SIDs) {\n    return SIDs.flatMap(({subfields}) => {\n      const [SID] = subfields.filter(sub => sub.code === 'b' && fSIDFilters.includes(sub.value)).map(sub => sub.value);\n      const [value] = subfields.filter(sub => sub.code === 'c' && sub.value !== undefined).map(sub => sub.value);\n\n      if (SID && value) {\n        return {\n          SID,\n          value\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n\n  function f035ToSidInfo(f035s) {\n    return f035s.flatMap(({subfields}) => {\n      const [wantedSub] = subfields.filter(sub => sub.code === 'a' && f035Filters.some(regexp => regexp.test(sub.value)));\n\n      if (wantedSub) {\n        return {\n          SID: fSIDFilters[f035Filters.findIndex(regexp => regexp.test(wantedSub.value))],\n          value: wantedSub.value.slice(wantedSub.value.indexOf(')') + 1)\n        };\n      }\n\n      return undefined;\n    }).filter(value => value !== undefined);\n  }\n}\n\n\nfunction stripF984s(record, stripF984sSettings) {\n  const F984A_PATTERN = /^(?:ALWAYS|NEVER)-PREFER-IN-MERGE$/u;\n  const config = [\n    {\n      tag: /^984$/u,\n      subfields: [\n        {\n          code: /a/u,\n          value: F984A_PATTERN\n        }\n      ]\n    }\n  ];\n\n  debug(`Running removeF984AFields`);\n  debugData(`removeF984AFieldsSettings: ${JSON.stringify(stripF984sSettings)}`);\n\n  if (!stripF984sSettings || !F984A_PATTERN || record.get('984').length < 1) {\n    debug(`No settings or pattern for removeF984AFields or f984 in record`);\n    return record;\n  }\n\n  debug(`Removing f984 fields with subfield $a consisting values ${F984A_PATTERN.toString()}`);\n  // eslint-disable-next-line new-cap\n  const validator = FieldExclusion(config);\n  validator.fix(record);\n  return record;\n\n}\n\nfunction stripMelindaTempSubfields(record, stripMelindaTempSubfieldsSettings) {\n  if (!stripMelindaTempSubfieldsSettings) {\n    debug(`No settings for stripMelindaTempSubfields`);\n    return record;\n  }\n  // NOTE: we remove $9 MELINDA<TEMP> subfields only from f856\n  const tagPattern = /856/u;\n  const subfieldCodePattern = /9/u;\n  const subfieldValuePattern = /^MELINDA<TEMP>$/u;\n  const config = [\n    {\n      tag: tagPattern,\n      subfields: [\n        {\n          code: subfieldCodePattern,\n          value: subfieldValuePattern\n        }\n      ]\n    }\n  ];\n\n  debug(`Running stripMelindaTempSubfields`);\n\n  // eslint-disable-next-line new-cap\n  const validator = SubfieldExclusion(config);\n  validator.fix(record);\n  return record;\n}\n"],
+  "mappings": "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",
+  "names": ["sidsToBeAdded", "f035s"]
+}

package/dist/validation.js

@@ -0,0 +1,19 @@
+import validateFactory from "@natlibfi/marc-record-validate";
+import {
+  FieldStructure as fieldStructure
+} from "@natlibfi/marc-record-validators-melinda";
+import { createLogger } from "@natlibfi/melinda-backend-commons";
+export default async () => {
+  const logger = createLogger();
+  logger.verbose("Running inbuilt record validations");
+  const validate = validateFactory([await fieldStructure([{ tag: /^003$/u, valuePattern: /^FI-MELINDA$/u }])]);
+  return async (unvalidRecord) => {
+    const { record, valid, report } = await validate(unvalidRecord, { fix: false, validateFixes: false }, { subfieldValues: false });
+    return {
+      record,
+      failed: valid === false,
+      messages: report
+    };
+  };
+};
+//# sourceMappingURL=validation.js.map

package/dist/validation.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../src/helpers/validation.js"],
+  "sourcesContent": ["import validateFactory from '@natlibfi/marc-record-validate';\nimport {\n  FieldStructure as fieldStructure\n} from '@natlibfi/marc-record-validators-melinda';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\n\nexport default async () => {\n  const logger = createLogger();\n\n  logger.verbose('Running inbuilt record validations');\n  const validate = validateFactory([await fieldStructure([{tag: /^003$/u, valuePattern: /^FI-MELINDA$/u}])]);\n\n  return async unvalidRecord => {\n    const {record, valid, report} = await validate(unvalidRecord, {fix: false, validateFixes: false}, {subfieldValues: false});\n\n    return {\n      record,\n      failed: valid === false,\n      messages: report\n    };\n  };\n};\n"],
+  "mappings": "AAAA,OAAO,qBAAqB;AAC5B;AAAA,EACE,kBAAkB;AAAA,OACb;AACP,SAAQ,oBAAmB;AAE3B,eAAe,YAAY;AACzB,QAAM,SAAS,aAAa;AAE5B,SAAO,QAAQ,oCAAoC;AACnD,QAAM,WAAW,gBAAgB,CAAC,MAAM,eAAe,CAAC,EAAC,KAAK,UAAU,cAAc,gBAAe,CAAC,CAAC,CAAC,CAAC;AAEzG,SAAO,OAAM,kBAAiB;AAC5B,UAAM,EAAC,QAAQ,OAAO,OAAM,IAAI,MAAM,SAAS,eAAe,EAAC,KAAK,OAAO,eAAe,MAAK,GAAG,EAAC,gBAAgB,MAAK,CAAC;AAEzH,WAAO;AAAA,MACL;AAAA,MACA,QAAQ,UAAU;AAAA,MAClB,UAAU;AAAA,IACZ;AAAA,EACF;AACF;",
+  "names": []
+}

package/eslint.config.js

@@ -0,0 +1,53 @@
+// Eslint configuration object for src
+const configSrc = {
+  files: [
+    "src/*",
+    "tests/*"
+  ],
+  linterOptions: {
+    reportUnusedDisableDirectives: true,
+  },
+  rules: {
+    "no-console": "warn",
+    "eqeqeq": ["error", "always"],
+    "no-const-assign": "error",
+    "max-depth": ["warn", 4],
+    "max-lines": ["warn", 500],
+    "max-lines-per-function": ["warn", {"max": 100}],
+    "no-else-return": ["error", {allowElseIf: false}],
+    "no-plusplus": [
+      "error",
+      {
+        "allowForLoopAfterthoughts": true
+      }
+    ],
+    "array-callback-return": [
+      "error",
+      {
+        "checkForEach": false
+      }
+    ],
+    "no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "next"
+      }
+    ],
+    "no-warning-comments": "off"
+  }
+};
+
+// Eslint configuration object for globally ignoring .js files
+// - ignore all files that start with a dot
+// - ignore all files inside directories named 'dist'
+const configIgnores = {
+  ignores: [
+    "**/.*",
+    "**/dist/"
+  ]
+};
+
+export default [
+  configSrc,
+  configIgnores
+];

package/package.json

@@ -14,124 +14,51 @@
     "url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
   },
   "license": "MIT",
-  "version": "4.2.5-alpha.1",
+  "version": "5.0.0-alpha.1",
   "main": "./dist/index.js",
+  "type": "module",
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "prepare": "npm run build",
-    "build": "babel src --source-maps --copy-files --delete-dir-on-start --out-dir=dist",
+    "build": "esbuild src/**/*.js --sourcemap --platform=node --main-fields=main --outdir=dist --allow-overwrite --analyze",
     "lint": "eslint ./src",
-    "lint:dev": "eslint ./src --fix",
+    "lint:dev": "eslint --fix ./src",
     "test": "npm run lint && npm run test:base",
-    "test:base": "cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude tests/amqp.health.spec.js --exclude tests/amqp.tests.spec.js",
-    "test:dev": "npm run lint:dev && cross-env NODE_ENV=test nyc mocha --package ./package.json --exclude tests/amqp.health.spec.js --exclude tests/amqp.tests.spec.js",
-    "test:local": "cross-env NODE_ENV=test nyc mocha --package ./package.json -- tests/amqp.*.spec.js",
-    "test:healthcheck": "cross-env NODE_ENV=test nyc mocha --require @babel/register -- tests/amqp.health.spec.js",
-    "dev": "nodemon",
-    "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test nodemon"
+    "test:base": "node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './tests/**/*.test.js'",
+    "test:local": "cross-env NODE_ENV=test node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './tests/amqp.*.localtest.js'",
+    "test:healthcheck": "cross-env NODE_ENV=test node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './tests/amqp.healthtest.js'",
+    "watch:test": "cross-env DEBUG=@natlibfi/* NODE_ENV=test node --watch --test --experimental-test-coverage --test-reporter=spec './src/*.test.js' './src/**/*.test.js'",
+    "dev": "npm run watch:test",
+    "dev:debug": "cross-env LOG_LEVEL=debug DEBUG=@natlibfi/* NODE_ENV=test npm run watch:test"
   },
   "dependencies": {
-    "@natlibfi/marc-record": "^9.1.5",
-    "@natlibfi/marc-record-serializers": "^10.1.6",
-    "@natlibfi/marc-record-validate": "^8.0.14",
+    "@natlibfi/marc-record": "^10.0.0-alpha.1",
+    "@natlibfi/marc-record-serializers": "^11.0.0-alpha.2",
+    "@natlibfi/marc-record-validate": "^9.0.0-alpha.1",
     "@natlibfi/marc-record-validators-melinda": "^11.6.2",
-    "@natlibfi/melinda-backend-commons": "^2.3.8",
-    "@natlibfi/melinda-commons": "^13.0.20",
+    "@natlibfi/melinda-backend-commons": "^3.0.0-alpha.3",
+    "@natlibfi/melinda-commons": "^14.0.0-alpha.3",
     "amqplib": "^0.10.8",
     "debug": "^4.4.0",
     "http-status": "^2.1.0",
     "moment": "^2.30.1",
     "mongo-sanitize": "^1.1.0",
-    "mongodb": "^6.16.0"
+    "mongodb": "^6.18.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.27.1",
-    "@babel/core": "^7.27.1",
-    "@babel/plugin-transform-runtime": "^7.27.1",
-    "@babel/preset-env": "^7.27.1",
-    "@babel/register": "^7.27.1",
-    "@natlibfi/eslint-config-melinda-backend": "^3.0.5",
-    "@natlibfi/fixugen": "^2.0.14",
-    "@natlibfi/fixura": "^3.0.13",
-    "@natlibfi/fixura-mongo": "^2.0.24",
-    "babel-plugin-istanbul": "^7.0.0",
-    "babel-plugin-rewire": "^1.2.0",
-    "chai": "^4.5.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.57.1",
-    "mocha": "^11.2.2",
-    "nodemon": "^3.1.10",
-    "nyc": "^17.1.0"
+    "@natlibfi/fixugen": "^3.0.0-alpha.5",
+    "@natlibfi/fixura": "^4.0.0-alpha.12",
+    "@natlibfi/fixura-mongo": "^3.0.0-alpha.5",
+    "cross-env": "^10.0.0",
+    "esbuild": "^0.25.9",
+    "eslint": "^9.33.0"
   },
   "overrides": {
     "nanoid": "^3.3.8"
-  },
-  "eslintConfig": {
-    "extends": "@natlibfi/melinda-backend"
-  },
-  "babel": {
-    "presets": [
-      [
-        "@babel/preset-env",
-        {
-          "targets": "maintained node versions"
-        }
-      ]
-    ],
-    "plugins": [
-      [
-        "@babel/transform-runtime"
-      ]
-    ],
-    "env": {
-      "test": {
-        "plugins": [
-          "istanbul",
-          "rewire"
-        ]
-      }
-    }
-  },
-  "mocha": {
-    "spec": [
-      "tests/*.spec.js",
-      "tests/**/*.spec.js"
-    ],
-    "require": [
-      "@babel/register"
-    ],
-    "inline-diffs": true,
-    "maxDiffSize": 25000,
-    "bail": true,
-    "exit": true,
-    "timeout": 10000
-  },
-  "nodemonConfig": {
-    "exec": "npm run test:dev",
-    "watch": [
-      "tests/*",
-      "src/*",
-      "test-fixtures/*"
-    ]
-  },
-  "nyc": {
-    "exclude": [
-      "tests/*.spec.js",
-      "tests/**/*.spec.js"
-    ],
-    "reporter": [
-      "text"
-    ],
-    "sourceMap": false,
-    "instrument": false,
-    "lines": 80,
-    "statements": 80,
-    "functions": 80,
-    "branches": 80
   }
 }

package/tests/{amqp.health.spec.js → amqp.healthtest.js}

@@ -1,6 +1,6 @@
-//import {expect} from 'chai';
+//import assert from 'node:assert';
 import createDebugLogger from 'debug';
-import {amqpFactory} from '../src/index';
+import {amqpFactory} from '../src/index.js';
 
 
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:amqp:test');

package/tests/{amqp.tests.spec.js → amqp.tests.localtest.js}

@@ -1,10 +1,10 @@
-import {expect} from 'chai';
-import {READERS} from '@natlibfi/fixura';
+import assert from 'node:assert';
 import createDebugLogger from 'debug';
+import {promisify} from 'util';
+import {READERS} from '@natlibfi/fixura';
 import generateTests from '@natlibfi/fixugen';
-import {amqpFactory} from '../src/index';
 import {Error as ApiError} from '@natlibfi/melinda-commons';
-import {promisify} from 'util';
+import {amqpFactory} from '../src/index.js';
 
 const setTimeoutPromise = promisify(setTimeout);
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons:amqp:test');
@@ -23,14 +23,14 @@ let amqpOperator;
 
 generateTests({
   callback,
-  path: [__dirname, '..', 'test-fixtures', 'amqp'],
+  path: [import.meta.dirname, '..', 'test-fixtures', 'amqp'],
   recurse: false,
   useMetadataFile: true,
   fixura: {
     failWhenNotFound: true,
     reader: READERS.JSON
   },
-  mocha: {
+  hooks: {
     before: async () => {
       debug(`Connecting to ${amqpUrl}, with healthCheck running`);
       amqpOperator = await amqpFactory(amqpUrl, true);
@@ -76,13 +76,13 @@ async function callback({
 
     const messageCount = await amqpOperator.checkQueue({queue, style: 'messages'});
     debug(`MessageCount: ${messageCount}`);
-    expect(messageCount).to.eql(expectedMessageCount);
+    assert.equal(messageCount, expectedMessageCount);
 
     if (checkNextMessage) {
       const {headers, records} = await queueCheckNextMessage();
       const nextMessage = {headers, records};
       const expectedNextMessage = getFixture('expectedMessage.json');
-      expect(nextMessage).to.eql(expectedNextMessage);
+      assert.equal(nextMessage, expectedNextMessage);
       return;
     }
 
@@ -90,25 +90,25 @@ async function callback({
     if (!expectToFail) {
       throw error;
     }
-    expect(expectToFail, 'This is expected to fail').to.equal(true);
+    assert.equal(expectToFail, true, 'This is expected to fail');
     testErrors(error);
   }
 
   function testErrors(error) {
-
+    const isApiError = error instanceof ApiError;
     if (expectApiError) {
-      expect(error).to.be.instanceOf(ApiError);
+      assert.equal(isApiError, true);
       debug(`We expected and got an ApiError`);
-      expect(error.status).to.equal(expectedErrorStatus);
+      assert.equal(error.status, expectedErrorStatus);
 
       if (expectedErrorMessage) {
-        expect(error.payload).to.eql(expectedErrorMessage);
+        assert.equal(error.payload, expectedErrorMessage);
         return;
       }
 
       return;
     }
-    expect(error).not.to.be.instanceOf(ApiError);
+    assert.equal(isApiError, false);
     debug(`We expected and got an non-ApiError`);
     debug(`Error is a ${error.constructor.name}`);
   }
@@ -141,11 +141,11 @@ async function callback({
         return;
       }
 
-      expect(result).to.have.property('headers');
-      expect(result).to.have.property('records');
-      expect(result).to.have.property('messages');
-      expect(result.records.length).to.eql(1);
-      expect(result.messages.length).to.eql(1);
+      assert.equal(Object.hasOwn(result, 'headers'), true);
+      assert.equal(Object.hasOwn(result, 'records'), true);
+      assert.equal(Object.hasOwn(result, 'messages'), true);
+      assert.equal(result.records.length, 1);
+      assert.equal(result.messages.length, 1);
 
       return;
     }
@@ -159,15 +159,15 @@ async function callback({
         return;
       }
 
-      expect(fields).to.have.property('deliveryTag');
-      expect(fields).to.have.property('exchange');
-      expect(fields).to.have.property('messageCount');
-      expect(fields).to.have.property('redelivered');
-      expect(fields).to.have.property('routingKey');
-      expect(typeof fields.deliveryTag).to.be.eql('number');
-      expect(typeof fields.messageCount).to.be.eql('number');
-      expect(typeof fields.redelivered).to.be.eql('boolean');
-      expect(typeof fields.routingKey).to.be.eql('string');
+      assert.equal(Object.hasOwn(result, 'deliveryTag'), true);
+      assert.equal(Object.hasOwn(result, 'exchange'), true);
+      assert.equal(Object.hasOwn(result, 'messageCount'), true);
+      assert.equal(Object.hasOwn(result, 'redelivered'), true);
+      assert.equal(Object.hasOwn(result, 'routingKey'), true);
+      assert.equal(typeof fields.deliveryTag, 'number');
+      assert.equal(typeof fields.messageCount, 'number');
+      assert.equal(typeof fields.redelivered, 'boolean');
+      assert.equal(typeof fields.routingKey, 'string');
 
       return;
     }
@@ -180,13 +180,13 @@ async function callback({
         return;
       }
 
-      expect(result).to.have.property('headers');
-      expect(result).to.have.property('records');
-      expect(result).to.have.property('messages');
-      expect(result.records.length).to.eql(3);
-      expect(result.messages.length).to.eql(3);
+      assert.equal(Object.hasOwn(result, 'headers'), true);
+      assert.equal(Object.hasOwn(result, 'records'), true);
+      assert.equal(Object.hasOwn(result, 'messages'), true);
+      assert.equal(result.records.length, 3);
+      assert.equal(result.messages.length, 3);
       const expectedResult = getFixture('expectedResult.json');
-      expect(result.records).to.eql(expectedResult);
+      assert.deepStrictEqual(result.records, expectedResult);
 
       return;
     }
@@ -199,22 +199,22 @@ async function callback({
         return;
       }
 
-      expect(result).to.have.property('headers');
-      expect(result).to.have.property('messages');
-      expect(result.messages.length).to.eql(3);
+      assert.equal(Object.hasOwn(result, 'headers'), true);
+      assert.equal(Object.hasOwn(result, 'messages'), true);
+      assert.equal(result.messages.length, 3);
 
       const [{fields}] = result.messages;
 
-      expect(fields).to.have.property('deliveryTag');
-      expect(fields).to.have.property('exchange');
-      expect(fields).to.have.property('messageCount');
-      expect(fields).to.have.property('redelivered');
-      expect(fields).to.have.property('routingKey');
+      assert.equal(Object.hasOwn(result, 'deliveryTag'), true);
+      assert.equal(Object.hasOwn(result, 'exchange'), true);
+      assert.equal(Object.hasOwn(result, 'messageCount'), true);
+      assert.equal(Object.hasOwn(result, 'redelivered'), true);
+      assert.equal(Object.hasOwn(result, 'routingKey'), true);
 
-      expect(typeof fields.deliveryTag).to.be.eql('number');
-      expect(typeof fields.messageCount).to.be.eql('number');
-      expect(typeof fields.redelivered).to.be.eql('boolean');
-      expect(typeof fields.routingKey).to.be.eql('string');
+      assert.equal(typeof fields.deliveryTag, 'number');
+      assert.equal(typeof fields.messageCount, 'number');
+      assert.equal(typeof fields.redelivered, 'boolean');
+      assert.equal(typeof fields.routingKey, 'string');
 
       return;
     }