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

package/{tests/mongo-query-by-id.test.js → test/mongo-query-by-id.test.ts}

@@ -4,10 +4,10 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToDbEntry, formatQueueItem} from './testUtils.js';
+import {getMongoOperator, handleError, compareToDbEntry, formatQueueItem} from './testUtils.ts';
 
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:query-by-id:test');
 
 generateTests({
@@ -41,15 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query-by-id'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-// eslint-disable-next-line max-statements
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -61,14 +60,14 @@ async function callback({
   expectedOpResult = undefined,
   updateStateBeforeTest = undefined,
   resultIndex = undefined
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;
@@ -82,14 +81,12 @@ async function callback({
       debug(`queryById`);
       debug(JSON.stringify(params));
       //{correlationId, checkModTime = false}
-      // eslint-disable-next-line functional/no-conditional-statements
       if (updateStateBeforeTest && params.correlationId) {
         debug(`setState to reset modificationTime`);
         await mongoOperator.setState({correlationId: params.correlationId, state: updateStateBeforeTest});
       }
       const opResult = await mongoOperator.queryById(params);
       debug(`queryById result: ${JSON.stringify(opResult)} (it should be: ${JSON.stringify(expectedOpResult)})}`);
-      // eslint-disable-next-line functional/no-conditional-statements
       if (expectedOpResult !== undefined) {
         assert.deepStrictEqual(formatQueueItem(opResult), formatQueueItem(expectedOpResult));
       }

package/{tests/mongo-query.test.js → test/mongo-query.test.ts}

@@ -4,9 +4,9 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError} from './testUtils.js';
+import {getMongoOperator, handleError} from './testUtils.ts';
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -56,14 +56,14 @@ async function callback({
   expectedErrorMessage = '',
   expectedErrorStatus = '',
   expectedOpResult = undefined
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;
@@ -83,7 +83,6 @@ async function callback({
       debug(`${JSON.stringify(params.showParams)}`);
       const opResult = await mongoOperator.query(params.params, params.showParams);
       debug(`query result: ${JSON.stringify(opResult)} (it should be: ${JSON.stringify(expectedOpResult)})}`);
-      // eslint-disable-next-line functional/no-conditional-statements
       if (expectedOpResult !== undefined) {
         assert.deepStrictEqual(opResult, expectedOpResult);
       }

package/{tests/mongo-read-content.test.js → test/mongo-read-content.test.ts}

@@ -4,10 +4,10 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, streamToString} from './testUtils.js';
+import {getMongoOperator, handleError, streamToString} from './testUtils.ts';
 
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:read-content:test');
 
 generateTests({
@@ -41,15 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'read-content'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-// eslint-disable-next-line max-statements
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -59,14 +58,14 @@ async function callback({
   expectedErrorStatus = '',
   contentStream = false,
   createBulkParams = undefined
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   //const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       // optional gridFSFiles.json uploads GridFS files (filename -> content)
@@ -91,7 +90,6 @@ async function callback({
       debug(JSON.stringify(params));
       //correlationId
 
-      // eslint-disable-next-line functional/no-conditional-statements
       if (createBulkParams) {
         const stream = contentStream ? await getFixture({components: ['contentStream'], reader: READERS.STREAM}) : createBulkParams.stream;
         //debug(stream);
@@ -103,7 +101,6 @@ async function callback({
       const opResult = await mongoOperator.readContent(params);
       const opResultString = await streamToString(opResult.readStream);
 
-      // eslint-disable-next-line functional/no-conditional-statements
       if (createBulkParams && createBulkParams.contentType) {
         assert.equal(opResult.contentType, createBulkParams.contentType);
       }

package/{tests/mongo-remove.test.js → test/mongo-remove.test.ts}

@@ -4,10 +4,10 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:remove:test');
 
 generateTests({
@@ -41,15 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'remove'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-// eslint-disable-next-line max-statements
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -62,14 +61,14 @@ async function callback({
   createBulkParams = undefined,
   expectedFileCount = undefined,
   expectUndefined = undefined
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;
@@ -85,7 +84,6 @@ async function callback({
       debug(JSON.stringify(params));
       //params: {correlationId}
 
-      // eslint-disable-next-line functional/no-conditional-statements
       if (createBulkParams) {
         const stream = contentStream ? await getFixture({components: ['contentStream'], reader: READERS.STREAM}) : createBulkParams.stream;
         //debug(stream);

package/{tests/mongo-set-blob-size.test.js → test/mongo-set-blob-size.test.ts}

@@ -4,9 +4,9 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-blob-size:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-blob-size'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -56,14 +56,14 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;

package/{tests/mongo-set-import-job-state.test.js → test/mongo-set-import-job-state.test.ts}

@@ -4,10 +4,10 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-import-job-state:test');
 
 generateTests({
@@ -41,14 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-import-job-state'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -57,14 +57,14 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;

package/{tests/mongo-set-operation.test.js → test/mongo-set-operation.test.ts}

@@ -4,9 +4,9 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operation:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operation'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -56,14 +56,14 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;

package/{tests/mongo-set-operations.test.js → test/mongo-set-operations.test.ts}

@@ -4,9 +4,9 @@ import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 import createDebugLogger from 'debug';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operations:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operations'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -56,14 +56,14 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;

package/{tests/mongo-set-state.test.js → test/mongo-set-state.test.ts}

@@ -4,10 +4,10 @@ import {READERS} from '@natlibfi/fixura';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import generateTests from '@natlibfi/fixugen';
 //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
-import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
+import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.ts';
 
 
-let mongoFixtures; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
 const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-state:test');
 
 generateTests({
@@ -41,14 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-state'],
     gridFS: {bucketName: 'foobar'},
     useObjectId: true
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
@@ -57,14 +57,14 @@ async function callback({
   expectedToThrow = false,
   expectedErrorMessage = '',
   expectedErrorStatus = ''
-}) {
+  } = callbackParams;
 
   const mongoOperator = await getMongoOperator(mongoFixtures);
   const expectedResult = await getFixture('expectedResult.json');
 
   await doPreFillDb(preFillDb);
 
-  async function doPreFillDb(preFillDb) {
+  async function doPreFillDb(preFillDb: boolean) {
     if (preFillDb) {
       await mongoFixtures.populate(getFixture('dbContents.json'));
       return;

package/{tests/mongoLog-protect.test.js → test/mongoLog-protect.test.ts}

@@ -2,10 +2,11 @@ import assert from 'node:assert';
 import {test, before, after} from 'node:test';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
 import {Error as ApiError} from '@natlibfi/melinda-commons';
-import createMongoLogOperator from '../src/mongoLog.js';
+import createMongoLogOperator from '../src/mongoLog.ts';
+import type {MongoLogOperator} from '../src/mongoLog.ts';
 
-let mongoFixtures; // eslint-disable-line functional/no-let
-let mongoLogOperator; // eslint-disable-line functional/no-let
+let mongoFixtures: any;
+let mongoLogOperator: MongoLogOperator;
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
@@ -14,8 +15,8 @@ async function initMongofixtures() {
     useObjectId: true,
     format: {
       logs: {
-        creationTime: v => new Date(v),
-        modificationTime: v => new Date(v)
+        creationTime: v => new Date(String(v)),
+        modificationTime: v => new Date(String(v))
       }
     }
   });
@@ -51,7 +52,7 @@ test('protect is idempotent: protecting an already protected log keeps it protec
   await mongoLogOperator.protect(logItem.correlationId, logItem.blobSequence);
 
   const {logs} = await mongoFixtures.dump();
-  const own = logs.filter(doc => doc.correlationId === logItem.correlationId);
+  const own = logs.filter((doc: any) => doc.correlationId === logItem.correlationId);
   assert.equal(own.length, 1);
   assert.equal(own[0].protected, true);
 });
@@ -70,7 +71,7 @@ test('unprotect sets protected to false after protect', async () => {
   assert.equal(result.modifiedCount, 1);
 
   const {logs} = await mongoFixtures.dump();
-  const own = logs.filter(doc => doc.correlationId === logItem.correlationId);
+  const own = logs.filter((doc: any) => doc.correlationId === logItem.correlationId);
   assert.equal(own.length, 1);
   assert.equal(own[0].protected, false);
 });
@@ -85,9 +86,9 @@ test('unprotect without blobSequence unprotects all logs of the correlationId',
   assert.equal(result.modifiedCount, 2);
 
   const {logs} = await mongoFixtures.dump();
-  const own = logs.filter(doc => doc.correlationId === correlationId);
+  const own = logs.filter((doc: any) => doc.correlationId === correlationId);
   assert.equal(own.length, 2);
-  assert.ok(own.every(doc => doc.protected === false));
+  assert.ok(own.every((doc: any) => doc.protected === false));
 });
 
 test('getExpandedListOfLogs throws ApiError when logItemTypes is provided but is not an array', async () => {
@@ -96,7 +97,7 @@ test('getExpandedListOfLogs throws ApiError when logItemTypes is provided but is
     (error) => {
       assert.ok(error instanceof ApiError);
       assert.strictEqual(error.status, 400);
-      assert.ok(error.payload.includes('logItemTypes must be an array'));
+      assert.ok((error.payload as string).includes('logItemTypes must be an array'));
       return true;
     }
   );
@@ -108,7 +109,7 @@ test('getExpandedListOfLogs throws ApiError when logItemTypes contains an unknow
     (error) => {
       assert.ok(error instanceof ApiError);
       assert.strictEqual(error.status, 400);
-      assert.ok(error.payload.includes('Unknown logItemType'));
+      assert.ok((error.payload as string).includes('Unknown logItemType'));
       return true;
     }
   );
@@ -132,7 +133,7 @@ test('getExpandedListOfLogs uses Date instances for dateBefore and dateAfter as-
   });
   const own = result.filter(entry => entry.correlationId === logItem.correlationId);
   assert.equal(own.length, 1);
-  assert.equal(own[0].logCount, 1);
+  assert.equal(own[0]?.logCount, 1);
 });
 
 test('getListOfLogs throws ApiError 500 for an unknown logItemType', async () => {
@@ -141,7 +142,7 @@ test('getListOfLogs throws ApiError 500 for an unknown logItemType', async () =>
     (error) => {
       assert.ok(error instanceof ApiError);
       assert.strictEqual(error.status, 500);
-      assert.ok(error.payload.includes('Unknown logItemType'));
+      assert.ok((error.payload as string).includes('Unknown logItemType'));
       return true;
     }
   );
@@ -159,7 +160,7 @@ test('addLogItem with an unknown logItemType does not throw (warn path)', async
   await mongoLogOperator.addLogItem(logItem);
 
   const {logs} = await mongoFixtures.dump();
-  const own = logs.filter(doc => doc.correlationId === logItem.correlationId);
+  const own = logs.filter((doc: any) => doc.correlationId === logItem.correlationId);
   assert.equal(own.length, 1);
   assert.equal(own[0].logItemType, 'BOGUS_LOG');
 });
@@ -175,7 +176,7 @@ test('getExpandedListOfLogs with a valid logItemTypes array still works', async
   const result = await mongoLogOperator.getExpandedListOfLogs({logItemTypes: ['MERGE_LOG'], catalogers: ['IMP_TEST1'], dateBefore: new Date(Date.now() + 60 * 60 * 1000)});
   const own = result.filter(entry => entry.correlationId === logItem.correlationId);
   assert.equal(own.length, 1);
-  assert.equal(own[0].logItemType, 'MERGE_LOG');
-  assert.equal(own[0].cataloger, 'IMP_TEST1');
-  assert.equal(own[0].logCount, 1);
+  assert.equal(own[0]?.logItemType, 'MERGE_LOG');
+  assert.equal(own[0]?.cataloger, 'IMP_TEST1');
+  assert.equal(own[0]?.logCount, 1);
 });

package/{tests/mongoLog.test.js → test/mongoLog.test.ts}

@@ -3,9 +3,9 @@ import {READERS} from '@natlibfi/fixura';
 import {Error as ApiError} from '@natlibfi/melinda-commons';
 import generateTests from '@natlibfi/fixugen';
 import mongoFixturesFactory from '@natlibfi/fixura-mongo';
-import createMongoLogOperator from '../src/mongoLog.js';
+import createMongoLogOperator from '../src/mongoLog.ts';
 
-let mongoFixtures;
+let mongoFixtures: any;
 
 generateTests({
   callback,
@@ -40,21 +40,22 @@ async function initMongofixtures() {
     // production shape.
     format: {
       logs: {
-        creationTime: v => new Date(v),
-        modificationTime: v => new Date(v)
+        creationTime: v => new Date(String(v)),
+        modificationTime: v => new Date(String(v))
       }
     }
   });
 }
 
-async function callback({
+async function callback(callbackParams: Record<string, any>) {
+  const {
   getFixture,
   functionName,
   params,
   preFillDb = false,
   expectError = false,
   expectedErrorStatus = 500
-}) {
+  } = callbackParams;
   const mongoUri = await mongoFixtures.getUri();
   const mongoLogOperator = await createMongoLogOperator(mongoUri, '');
   const expectedResult = expectError ? undefined : await getFixture('expectedResult.json');
@@ -175,7 +176,7 @@ async function dumpRemaining() {
 // Convert BSON Dates in the result to ISO strings and drop _id, so the result
 // can be compared with the plain strings in expectedResult.json /
 // expectedRemaining.json (fixura-mongo dump also strips _id)
-function normalizeDates(docs) {
+function normalizeDates(docs: any[]): any[] {
   return docs.map(doc => {
     const fixed = {...doc};
     delete fixed._id;
@@ -188,4 +189,3 @@ function normalizeDates(docs) {
     return fixed;
   });
 }
-