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

package/dist/utils.js

@@ -1,211 +1,102 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addRecordResponseItem = addRecordResponseItem;
-exports.addRecordResponseItems = addRecordResponseItems;
-exports.createImportJobState = createImportJobState;
-exports.createRecordResponseItem = createRecordResponseItem;
-exports.logError = logError;
-var _melindaBackendCommons = require("@natlibfi/melinda-backend-commons");
-var _melindaCommons = require("@natlibfi/melinda-commons");
-var _constants = require("./constants");
-var _httpStatus = _interopRequireDefault(require("http-status"));
-const logger = (0, _melindaBackendCommons.createLogger)();
-function logError(err) {
-  if (err instanceof _melindaCommons.Error) {
+import httpStatus from "http-status";
+import { createLogger } from "@natlibfi/melinda-backend-commons";
+import { Error as ApiError } from "@natlibfi/melinda-commons";
+import { IMPORT_JOB_STATE, OPERATIONS } from "./constants.js";
+const logger = createLogger();
+export function logError(err) {
+  if (err instanceof ApiError) {
     logger.error(JSON.stringify(err));
     return;
   }
-  if (err === 'SIGINT') {
+  if (err === "SIGINT") {
     logger.error(err);
     return;
   }
-  logger.error(err.stack === undefined ? err : err.stack);
+  logger.error(err.stack === void 0 ? err : err.stack);
 }
-function createImportJobState(operation, state, queryImportJobState = false) {
-  if (!(state in _constants.IMPORT_JOB_STATE)) {
-    throw new Error('Invalid IMPORT_JOB_STATE');
+export function createImportJobState(operation, state, queryImportJobState = false) {
+  if (!(state in IMPORT_JOB_STATE)) {
+    throw new Error("Invalid IMPORT_JOB_STATE");
   }
-  if (!(operation in _constants.OPERATIONS)) {
-    throw new Error('Invalid operation');
+  if (!(operation in OPERATIONS)) {
+    throw new Error("Invalid operation");
   }
   if (queryImportJobState) {
     const importJobStateWithOperation = `importJobState.${operation}`;
-    const importJobStateForQuery = {
-      [importJobStateWithOperation]: state
-    };
+    const importJobStateForQuery = { [importJobStateWithOperation]: state };
     return importJobStateForQuery;
   }
-  return {
-    [operation]: state
-  };
+  return { [operation]: state };
 }
-function createRecordResponseItem({
-  responsePayload,
-  responseStatus,
-  recordMetadata,
-  id
-}) {
+export function createRecordResponseItem({ responsePayload, responseStatus, recordMetadata, id }) {
   const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);
   const recordResponseItem = {
-    databaseId: id || '000000000',
-    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,
+    databaseId: id || "000000000",
+    recordMetadata: responsePayload.recordMetadata || recordMetadata || void 0,
     ...recordResponseStatusAndMessage
   };
   return recordResponseItem;
 }
-
-// eslint-disable-next-line max-statements
 function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {
   logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
-  //const responseStatusName = httpStatus[`${responseStatus}_NAME`];
-  //logger.debug(`Response status name: ${responseStatusName}`);
-
   const message = getMessageFromResponsePayload(responsePayload);
   const ids = responsePayload.ids || [];
   logger.debug(`Response message: ${message}`);
-
-  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus
-  // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js
-
-  // Non-http statuses
-  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED', 'FIXED'].includes(responseStatus)) {
-    return {
-      recordStatus: responseStatus,
-      detailedRecordStatus: responseStatus,
-      message
-    };
+  if (["UPDATED", "CREATED", "INVALID", "ERROR", "SKIPPED", "FIXED"].includes(responseStatus)) {
+    return { recordStatus: responseStatus, detailedRecordStatus: responseStatus, message };
   }
-
-  // More detailed SKIPPED statuses
-  if (['SKIPPED_CHANGE', 'SKIPPED_UPDATE'].includes(responseStatus)) {
-    return {
-      recordStatus: 'SKIPPED',
-      detailedRecordStatus: responseStatus,
-      message
-    };
+  if (["SKIPPED_CHANGE", "SKIPPED_UPDATE"].includes(responseStatus)) {
+    return { recordStatus: "SKIPPED", detailedRecordStatus: responseStatus, message };
   }
-  if (['UNKNOWN'].includes(responseStatus)) {
-    return {
-      recordStatus: 'ERROR',
-      detailedRecordStatus: responseStatus,
-      message,
-      ids
-    };
+  if (["UNKNOWN"].includes(responseStatus)) {
+    return { recordStatus: "ERROR", detailedRecordStatus: responseStatus, message, ids };
   }
-
-  // Duplicates and other CONFLICT statuses
-  if ([_httpStatus.default.CONFLICT, 'CONFLICT'].includes(responseStatus)) {
+  if ([httpStatus.CONFLICT, "CONFLICT"].includes(responseStatus)) {
     if (/^Duplicates in database/u.test(message)) {
-      return {
-        recordStatus: 'DUPLICATE',
-        detailedRecordStatus: 'DUPLICATE',
-        message,
-        ids
-      };
+      return { recordStatus: "DUPLICATE", detailedRecordStatus: "DUPLICATE", message, ids };
     }
     if (/^MatchValidation for all/u.test(message)) {
-      return {
-        recordStatus: 'ERROR',
-        detailedRecordStatus: 'CONFLICT',
-        message,
-        ids
-      };
+      return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
     }
-
-    // Use ids only if there are more than one id or the id in payload does not match databaseId
     if (ids.length > 1 || ids[0] !== id) {
-      return {
-        recordStatus: 'ERROR',
-        detailedRecordStatus: 'CONFLICT',
-        message,
-        ids
-      };
+      return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
     }
-    return {
-      recordStatus: 'ERROR',
-      detailedRecordStatus: 'CONFLICT',
-      message
-    };
+    return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message };
   }
-  if ([_httpStatus.default.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {
+  if ([httpStatus.UNPROCESSABLE_ENTITY, "UNPROCESSABLE_ENTITY"].includes(responseStatus)) {
     if (ids.length > 1 || ids[0] !== id) {
-      return {
-        recordStatus: 'INVALID',
-        detailedRecordStatus: 'UNPROCESSABLE_ENTITY',
-        message,
-        ids
-      };
+      return { recordStatus: "INVALID", detailedRecordStatus: "UNPROCESSABLE_ENTITY", message, ids };
     }
-    return {
-      recordStatus: 'INVALID',
-      detailedRecordStatus: 'UNPROCESSABLE_ENTITY',
-      message
-    };
+    return { recordStatus: "INVALID", detailedRecordStatus: "UNPROCESSABLE_ENTITY", message };
   }
-  if ([_httpStatus.default.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {
-    return {
-      recordStatus: 'ERROR',
-      detailedRecordStatus: 'NOT_FOUND',
-      message
-    };
+  if ([httpStatus.NOT_FOUND, "NOT_FOUND"].includes(responseStatus)) {
+    return { recordStatus: "ERROR", detailedRecordStatus: "NOT_FOUND", message };
   }
-  if ([_httpStatus.default.FORBIDDEN, 'FORBIDDEN'].includes(responseStatus)) {
-    return {
-      recordStatus: 'ERROR',
-      detailedRecordStatus: 'FORBIDDEN',
-      message
-    };
+  if ([httpStatus.FORBIDDEN, "FORBIDDEN"].includes(responseStatus)) {
+    return { recordStatus: "ERROR", detailedRecordStatus: "FORBIDDEN", message };
   }
-
-  // Otherwise
   logger.debug(`Unknown responseStatus: ${responseStatus}`);
   const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;
-  return {
-    recordStatus: 'ERROR',
-    detailedRecordStatus: responseStatus,
-    message: newMessage
-  };
+  return { recordStatus: "ERROR", detailedRecordStatus: responseStatus, message: newMessage };
 }
 function getMessageFromResponsePayload(responsePayload) {
   if (responsePayload.message) {
     return responsePayload.message;
   }
-  if (typeof responsePayload === 'string' || responsePayload instanceof String) {
+  if (typeof responsePayload === "string" || responsePayload instanceof String) {
     return responsePayload;
   }
-  return '';
+  return "";
 }
-async function addRecordResponseItem({
-  recordResponseItem,
-  correlationId,
-  mongoOperator
-}) {
-  await mongoOperator.pushMessages({
-    correlationId,
-    messages: [recordResponseItem],
-    messageField: 'records'
-  });
+export async function addRecordResponseItem({ recordResponseItem, correlationId, mongoOperator }) {
+  await mongoOperator.pushMessages({ correlationId, messages: [recordResponseItem], messageField: "records" });
   return true;
 }
-
-// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts
-async function addRecordResponseItems({
-  recordResponseItems,
-  correlationId,
-  mongoOperator
-}) {
+export async function addRecordResponseItems({ recordResponseItems, correlationId, mongoOperator }) {
   if (!Array.isArray(recordResponseItems)) {
-    throw new Error('RecordResponseItems is not an array!');
+    throw new Error("RecordResponseItems is not an array!");
   }
-  await mongoOperator.pushMessages({
-    correlationId,
-    messages: recordResponseItems,
-    messageField: 'records'
-  });
+  await mongoOperator.pushMessages({ correlationId, messages: recordResponseItems, messageField: "records" });
   return true;
 }
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"utils.js","names":["_melindaBackendCommons","require","_melindaCommons","_constants","_httpStatus","_interopRequireDefault","logger","createLogger","logError","err","ApiError","error","JSON","stringify","stack","undefined","createImportJobState","operation","state","queryImportJobState","IMPORT_JOB_STATE","Error","OPERATIONS","importJobStateWithOperation","importJobStateForQuery","createRecordResponseItem","responsePayload","responseStatus","recordMetadata","id","recordResponseStatusAndMessage","getRecordResponseStatusAndMessage","recordResponseItem","databaseId","debug","message","getMessageFromResponsePayload","ids","includes","recordStatus","detailedRecordStatus","httpStatus","CONFLICT","test","length","UNPROCESSABLE_ENTITY","NOT_FOUND","FORBIDDEN","newMessage","String","addRecordResponseItem","correlationId","mongoOperator","pushMessages","messages","messageField","addRecordResponseItems","recordResponseItems","Array","isArray"],"sources":["../src/utils.js"],"sourcesContent":["import {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants';\nimport httpStatus from 'http-status';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n  if (err instanceof ApiError) {\n    logger.error(JSON.stringify(err));\n    return;\n  }\n\n  if (err === 'SIGINT') {\n    logger.error(err);\n    return;\n  }\n\n  logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n  if (!(state in IMPORT_JOB_STATE)) {\n    throw new Error('Invalid IMPORT_JOB_STATE');\n  }\n\n  if (!(operation in OPERATIONS)) {\n    throw new Error('Invalid operation');\n  }\n\n  if (queryImportJobState) {\n    const importJobStateWithOperation = `importJobState.${operation}`;\n    const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n    return importJobStateForQuery;\n  }\n\n  return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);\n  const recordResponseItem = {\n    databaseId: id || '000000000',\n    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n    ...recordResponseStatusAndMessage\n  };\n  return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {\n\n  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n  //const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n  //logger.debug(`Response status name: ${responseStatusName}`);\n\n  const message = getMessageFromResponsePayload(responsePayload);\n  const ids = responsePayload.ids || [];\n\n  logger.debug(`Response message: ${message}`);\n\n  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus\n  // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED', 'FIXED'].includes(responseStatus)) {\n    return {recordStatus: responseStatus, detailedRecordStatus: responseStatus, message};\n  }\n\n  // More detailed SKIPPED statuses\n  if (['SKIPPED_CHANGE', 'SKIPPED_UPDATE'].includes(responseStatus)) {\n    return {recordStatus: 'SKIPPED', detailedRecordStatus: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message, ids};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      return {recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n\n    // Use ids only if there are more than one id or the id in payload does not match databaseId\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids};\n    }\n    return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message};\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message};\n  }\n\n  if ([httpStatus.FORBIDDEN, 'FORBIDDEN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'FORBIDDEN', message};\n  }\n\n  // Otherwise\n  logger.debug(`Unknown responseStatus: ${responseStatus}`);\n  const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;\n  return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message: newMessage};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n  if (responsePayload.message) {\n    return responsePayload.message;\n  }\n  if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n    return responsePayload;\n  }\n  return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n  await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n  return true;\n}\n\n// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts\nexport async function addRecordResponseItems({recordResponseItems, correlationId, mongoOperator}) {\n  if (!Array.isArray(recordResponseItems)) {\n    throw new Error('RecordResponseItems is not an array!');\n  }\n  await mongoOperator.pushMessages({correlationId, messages: recordResponseItems, messageField: 'records'});\n  return true;\n}\n\n"],"mappings":"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","ignoreList":[]}
+{
+  "version": 3,
+  "sources": ["../src/utils.js"],
+  "sourcesContent": ["import httpStatus from 'http-status';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants.js';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n  if (err instanceof ApiError) {\n    logger.error(JSON.stringify(err));\n    return;\n  }\n\n  if (err === 'SIGINT') {\n    logger.error(err);\n    return;\n  }\n\n  logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n  if (!(state in IMPORT_JOB_STATE)) {\n    throw new Error('Invalid IMPORT_JOB_STATE');\n  }\n\n  if (!(operation in OPERATIONS)) {\n    throw new Error('Invalid operation');\n  }\n\n  if (queryImportJobState) {\n    const importJobStateWithOperation = `importJobState.${operation}`;\n    const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n    return importJobStateForQuery;\n  }\n\n  return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);\n  const recordResponseItem = {\n    databaseId: id || '000000000',\n    recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n    ...recordResponseStatusAndMessage\n  };\n  return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {\n\n  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n  //const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n  //logger.debug(`Response status name: ${responseStatusName}`);\n\n  const message = getMessageFromResponsePayload(responsePayload);\n  const ids = responsePayload.ids || [];\n\n  logger.debug(`Response message: ${message}`);\n\n  // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus\n  // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js\n\n  // Non-http statuses\n  if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED', 'FIXED'].includes(responseStatus)) {\n    return {recordStatus: responseStatus, detailedRecordStatus: responseStatus, message};\n  }\n\n  // More detailed SKIPPED statuses\n  if (['SKIPPED_CHANGE', 'SKIPPED_UPDATE'].includes(responseStatus)) {\n    return {recordStatus: 'SKIPPED', detailedRecordStatus: responseStatus, message};\n  }\n\n  if (['UNKNOWN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message, ids};\n  }\n\n  // Duplicates and other CONFLICT statuses\n  if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n    if ((/^Duplicates in database/u).test(message)) {\n      return {recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids};\n    }\n    if ((/^MatchValidation for all/u).test(message)) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n\n    // Use ids only if there are more than one id or the id in payload does not match databaseId\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n    }\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message};\n  }\n\n  if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n    if (ids.length > 1 || ids[0] !== id) {\n      return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids};\n    }\n    return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message};\n  }\n\n  if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message};\n  }\n\n  if ([httpStatus.FORBIDDEN, 'FORBIDDEN'].includes(responseStatus)) {\n    return {recordStatus: 'ERROR', detailedRecordStatus: 'FORBIDDEN', message};\n  }\n\n  // Otherwise\n  logger.debug(`Unknown responseStatus: ${responseStatus}`);\n  const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;\n  return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message: newMessage};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n  if (responsePayload.message) {\n    return responsePayload.message;\n  }\n  if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n    return responsePayload;\n  }\n  return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n  await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n  return true;\n}\n\n// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts\nexport async function addRecordResponseItems({recordResponseItems, correlationId, mongoOperator}) {\n  if (!Array.isArray(recordResponseItems)) {\n    throw new Error('RecordResponseItems is not an array!');\n  }\n  await mongoOperator.pushMessages({correlationId, messages: recordResponseItems, messageField: 'records'});\n  return true;\n}\n\n"],
+  "mappings": "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",
+  "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",
+  "version": "5.0.0-alpha.2",
   "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 ./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');