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

package/{tests/mongo-get-one.test.js → test/mongo-get-one.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} 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:get-one:test');
 
 generateTests({
@@ -41,14 +41,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-one'],
     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({
   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;

package/{tests/mongo-get-stream.test.js → test/mongo-get-stream.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, 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:get-stream:test');
 
 generateTests({
@@ -40,15 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-stream'],
     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,
@@ -58,14 +57,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'));
       return;
@@ -80,7 +79,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);
@@ -90,7 +88,10 @@ async function callback({
       }
       //const {correlationId} = params;
 
-      const opResult = mongoOperator.getStream(params);
+      // getStream is now async (it pre-checks file existence and
+      // throws 404 for a missing file instead of returning a stream that
+      // emits an unhandled 'error' event)
+      const opResult = await mongoOperator.getStream(params);
       const opResultString = await streamToString(opResult);
 
       if (contentStream) {

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

@@ -3,10 +3,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:push-ids:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-ids'],
     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-push-messages.test.js → test/mongo-push-messages.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:push-messages:test');
 
 generateTests({
@@ -40,14 +40,14 @@ generateTests({
 
 async function initMongofixtures() {
   mongoFixtures = await mongoFixturesFactory({
-    recurse: false,
     rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-messages'],
     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-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,16 +58,26 @@ 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)
+      let gridFSFiles = undefined;
+      try {
+        gridFSFiles = getFixture('gridFSFiles.json');
+      } catch {
+        // no GridFS files for this fixture
+      }
+      if (gridFSFiles) {
+        await mongoFixtures.populateFiles(gridFSFiles);
+      }
       return;
     }
     return;
@@ -81,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);
@@ -93,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;