@natlibfi/melinda-rest-api-commons 6.0.1 → 6.2.0-alpha.0

package/dist/utils.js

@@ -1,102 +1,133 @@
-import httpStatus from "http-status";
-import { createLogger } from "@natlibfi/melinda-backend-commons";
-import { Error as ApiError } from "@natlibfi/melinda-commons";
+import httpStatus from 'http-status';
+import { createLogger, 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") {
-    logger.error(err);
-    return;
-  }
-  logger.error(err.stack === void 0 ? err : err.stack);
+    if (err instanceof ApiError) {
+        logger.error(JSON.stringify(err));
+        return;
+    }
+    if (err === 'SIGINT') {
+        logger.error(err);
+        return;
+    }
+    const maybeError = err;
+    logger.error(maybeError.stack === undefined ? err : maybeError.stack);
+}
+export function assertString(value, name) {
+    if (typeof value !== 'string') {
+        throw new ApiError(httpStatus.BAD_REQUEST, `${name} must be a string`);
+    }
+}
+export function assertNumber(value, name) {
+    if (typeof value !== 'number') {
+        throw new ApiError(httpStatus.BAD_REQUEST, `${name} must be a number`);
+    }
+}
+export function assertImportJobStateFilter(value, name) {
+    if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+        throw new ApiError(httpStatus.BAD_REQUEST, `${name} must be an object`);
+    }
+    const validKeys = Object.values(OPERATIONS).map(operation => `importJobState.${operation}`);
+    for (const [key, state] of Object.entries(value)) {
+        if (!validKeys.includes(key)) {
+            throw new ApiError(httpStatus.BAD_REQUEST, `${name} key ${key} must be one of ${validKeys.join(', ')}`);
+        }
+        if (typeof state !== 'string') {
+            throw new ApiError(httpStatus.BAD_REQUEST, `${name}.${key} must be a string`);
+        }
+    }
 }
 export function createImportJobState(operation, state, queryImportJobState = false) {
-  if (!(state in IMPORT_JOB_STATE)) {
-    throw new Error("Invalid IMPORT_JOB_STATE");
-  }
-  if (!(operation in OPERATIONS)) {
-    throw new Error("Invalid operation");
-  }
-  if (queryImportJobState) {
-    const importJobStateWithOperation = `importJobState.${operation}`;
-    const importJobStateForQuery = { [importJobStateWithOperation]: state };
-    return importJobStateForQuery;
-  }
-  return { [operation]: state };
+    if (!(state in IMPORT_JOB_STATE)) {
+        throw new Error('Invalid IMPORT_JOB_STATE');
+    }
+    if (!(operation in OPERATIONS)) {
+        throw new Error('Invalid operation');
+    }
+    if (queryImportJobState) {
+        const importJobStateWithOperation = `importJobState.${operation}`;
+        const importJobStateForQuery = { [importJobStateWithOperation]: state };
+        return importJobStateForQuery;
+    }
+    return { [operation]: state };
 }
-export function createRecordResponseItem({ responsePayload, responseStatus, recordMetadata, id }) {
-  const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);
-  const recordResponseItem = {
-    databaseId: id || "000000000",
-    recordMetadata: responsePayload.recordMetadata || recordMetadata || void 0,
-    ...recordResponseStatusAndMessage
-  };
-  return recordResponseItem;
+export function createRecordResponseItem(params) {
+    const { responsePayload, responseStatus, recordMetadata, id } = params;
+    if (responsePayload === undefined || responsePayload === null) {
+        throw new Error('responsePayload must be an object or a string!');
+    }
+    const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);
+    const recordResponseItem = {
+        databaseId: id || '000000000',
+        recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,
+        ...recordResponseStatusAndMessage
+    };
+    return recordResponseItem;
 }
 function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {
-  logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
-  const message = getMessageFromResponsePayload(responsePayload);
-  const ids = responsePayload.ids || [];
-  logger.debug(`Response message: ${message}`);
-  if (["UPDATED", "CREATED", "INVALID", "ERROR", "SKIPPED", "FIXED"].includes(responseStatus)) {
-    return { recordStatus: responseStatus, 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 ([httpStatus.CONFLICT, "CONFLICT"].includes(responseStatus)) {
-    if (/^Duplicates in database/u.test(message)) {
-      return { recordStatus: "DUPLICATE", detailedRecordStatus: "DUPLICATE", message, ids };
-    }
-    if (/^MatchValidation for all/u.test(message)) {
-      return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
-    }
-    if (ids.length > 1 || ids[0] !== id) {
-      return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
-    }
-    return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message };
-  }
-  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 };
-  }
-  if ([httpStatus.NOT_FOUND, "NOT_FOUND"].includes(responseStatus)) {
-    return { recordStatus: "ERROR", detailedRecordStatus: "NOT_FOUND", message };
-  }
-  if ([httpStatus.FORBIDDEN, "FORBIDDEN"].includes(responseStatus)) {
-    return { recordStatus: "ERROR", detailedRecordStatus: "FORBIDDEN", message };
-  }
-  logger.debug(`Unknown responseStatus: ${responseStatus}`);
-  const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;
-  return { recordStatus: "ERROR", detailedRecordStatus: responseStatus, message: newMessage };
+    logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
+    const message = getMessageFromResponsePayload(responsePayload);
+    const ids = responsePayload.ids || [];
+    logger.debug(`Response message: ${message}`);
+    if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED', 'FIXED'].includes(responseStatus)) {
+        return { recordStatus: responseStatus, 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 ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {
+        if ((/^Duplicates in database/u).test(message)) {
+            return { recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids };
+        }
+        if ((/^MatchValidation for all/u).test(message)) {
+            return { recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids };
+        }
+        if (ids.length > 1 || (ids.length > 0 && ids[0] !== id)) {
+            return { recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids };
+        }
+        return { recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message };
+    }
+    if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {
+        if (ids.length > 1 || (ids.length > 0 && ids[0] !== id)) {
+            return { recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids };
+        }
+        return { recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message };
+    }
+    if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {
+        return { recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message };
+    }
+    if ([httpStatus.FORBIDDEN, 'FORBIDDEN'].includes(responseStatus)) {
+        return { recordStatus: 'ERROR', detailedRecordStatus: 'FORBIDDEN', message };
+    }
+    logger.debug(`Unknown responseStatus: ${responseStatus}`);
+    const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;
+    return { recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message: newMessage };
 }
 function getMessageFromResponsePayload(responsePayload) {
-  if (responsePayload.message) {
-    return responsePayload.message;
-  }
-  if (typeof responsePayload === "string" || responsePayload instanceof String) {
-    return responsePayload;
-  }
-  return "";
+    if (responsePayload.message) {
+        return responsePayload.message;
+    }
+    if (typeof responsePayload === 'string' || responsePayload instanceof String) {
+        return responsePayload;
+    }
+    return '';
 }
 export async function addRecordResponseItem({ recordResponseItem, correlationId, mongoOperator }) {
-  await mongoOperator.pushMessages({ correlationId, messages: [recordResponseItem], messageField: "records" });
-  return true;
+    if (!recordResponseItem || typeof recordResponseItem !== 'object' || Array.isArray(recordResponseItem)) {
+        throw new Error('RecordResponseItem is not an object!');
+    }
+    await mongoOperator.pushMessages({ correlationId, messages: [recordResponseItem], messageField: 'records' });
+    return true;
 }
 export async function addRecordResponseItems({ recordResponseItems, correlationId, mongoOperator }) {
-  if (!Array.isArray(recordResponseItems)) {
-    throw new Error("RecordResponseItems is not an array!");
-  }
-  await mongoOperator.pushMessages({ correlationId, messages: recordResponseItems, messageField: "records" });
-  return true;
+    if (!Array.isArray(recordResponseItems)) {
+        throw new Error('RecordResponseItems is not an array!');
+    }
+    await mongoOperator.pushMessages({ correlationId, messages: recordResponseItems, messageField: 'records' });
+    return true;
 }
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1,7 +1 @@
-{
-  "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\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": []
-}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/eslint.config.ts

@@ -0,0 +1,66 @@
+// @ts-check
+import {defineConfig} from 'eslint/config';
+import tseslint from 'typescript-eslint';
+
+// House rules (see melinda-commons-js) for src/ and test/. The
+// typescript-eslint no-unused-vars variant is used because the base rule
+// does not understand TS syntax (interface method params etc.).
+const houseRules = {
+  "array-callback-return": [
+    "error",
+    {
+      "checkForEach": false
+    }
+  ],
+  "eqeqeq": ["error", "always"],
+  "max-depth": ["warn", 4],
+  "max-lines": ["warn", 500],
+  "max-lines-per-function": ["warn", {"max": 100}],
+  "no-console": "warn",
+  "no-const-assign": "error",
+  "no-else-return": ["error", {allowElseIf: false}],
+  "no-plusplus": [
+    "error",
+    {
+      "allowForLoopAfterthoughts": true
+    }
+  ],
+  "no-unused-vars": "off",
+  "@typescript-eslint/no-unused-vars": [
+    "error",
+    {
+      "argsIgnorePattern": "next"
+    }
+  ],
+  "no-var": "error",
+  "no-warning-comments": "off"
+};
+
+export default defineConfig(
+  [
+    ...tseslint.configs.recommended,
+    ...tseslint.configs.stylistic,
+    {
+      files: [
+        "src/**/*.ts",
+        "test/**/*.ts"
+      ],
+      ignores: ['node_modules/**', "**/.*", "**/dist/"],
+      linterOptions: {
+        reportUnusedInlineConfigs: "error",
+        reportUnusedDisableDirectives: true
+      },
+      rules: houseRules
+    },
+    {
+      // Fixture-driven test scaffolding: any-typed fixture values and no-op
+      // stubs are intentional in tests (tsc -p tsconfig.test.json still
+      // typechecks the directory).
+      files: ["test/**/*.ts"],
+      rules: {
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-empty-function": "off"
+      }
+    }
+  ]
+);

package/package.json

@@ -13,7 +13,7 @@
     "url": "https://github.com/NatLibFi/melinda-rest-api-commons"
   },
   "license": "MIT",
-  "version": "6.0.1",
+  "version": "6.2.0-alpha.0",
   "main": "./dist/index.js",
   "type": "module",
   "engines": {
@@ -24,40 +24,38 @@
   },
   "scripts": {
     "prepare": "npm run build",
-    "build": "esbuild ./src/*.js ./src/**/*.js --sourcemap --platform=node --main-fields=main --outdir=dist --allow-overwrite --analyze",
-    "lint": "eslint ./src",
-    "lint:dev": "eslint --fix ./src",
-    "test": "npm run lint && npm run test:base",
-    "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 './tests/**/*.test.js'",
+    "build": "tsc",
+    "lint": "eslint ./src ./test",
+    "lint:dev": "eslint --fix ./src ./test",
+    "typecheck": "tsc -p tsconfig.test.json",
+    "test": "npm run lint && npm run typecheck && npm run test:base",
+    "test:base": "node --test --test-force-exit --experimental-test-coverage --test-coverage-lines=88 --test-coverage-branches=88 --test-coverage-functions=90 --test-coverage-include=src/** --test-reporter=spec 'test/**/*.test.ts'",
+    "test:local": "cross-env NODE_ENV=test node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './test/amqp.*.localtest.ts'",
+    "test:healthcheck": "cross-env NODE_ENV=test node --test --test-force-exit --experimental-test-coverage --test-reporter=spec './test/amqp.healthtest.ts'",
+    "watch:test": "cross-env DEBUG=@natlibfi/* NODE_ENV=test node --watch --test --experimental-test-coverage --test-reporter=spec './test/**/*.test.ts'",
     "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": "^10.0.2",
+    "@natlibfi/marc-record": "^11.0.3",
     "@natlibfi/marc-record-serializers": "^11.0.4",
     "@natlibfi/marc-record-validate": "^9.0.2",
-    "@natlibfi/marc-record-validators-melinda": "^13.0.4",
-    "@natlibfi/melinda-backend-commons": "^3.0.6",
-    "@natlibfi/melinda-commons": "^15.0.2",
-    "amqplib": "^0.10.9",
+    "@natlibfi/marc-record-validators-melinda": "^13.0.6",
+    "@natlibfi/melinda-commons": "^16.0.0",
+    "amqplib": "^2.2.0",
     "debug": "^4.4.3",
     "http-status": "^2.1.0",
-    "moment": "^2.30.1",
-    "mongo-sanitize": "^1.1.0",
-    "mongodb": "^6.21.0"
+    "mongodb": "^7.7.0"
   },
   "devDependencies": {
-    "@natlibfi/fixugen": "^3.0.1",
-    "@natlibfi/fixura": "^4.0.1",
-    "@natlibfi/fixura-mongo": "^3.0.3",
+    "@natlibfi/fixugen": "^4.0.0",
+    "@natlibfi/fixura": "^5.0.0",
+    "@natlibfi/fixura-mongo": "^4.0.2",
+    "@types/node": "^25.9.9",
     "cross-env": "^10.1.0",
-    "esbuild": "^0.28.1",
-    "eslint": "^10.9.1"
-  },
-  "overrides": {
-    "nanoid": "^3.3.8"
+    "eslint": "^10.12.0",
+    "jiti": "^2.7.0",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.72.0"
   }
 }