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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/.github/workflows/melinda-node-tests.yml +9 -6
  2. package/dist/amqp.js +60 -151
  3. package/dist/amqp.js.map +7 -1
  4. package/dist/constants.js +40 -51
  5. package/dist/constants.js.map +7 -1
  6. package/dist/helpers/conversion.js +39 -57
  7. package/dist/helpers/conversion.js.map +7 -1
  8. package/dist/helpers/fix-constants.js +40 -47
  9. package/dist/helpers/fix-constants.js.map +7 -1
  10. package/dist/helpers/fix-handle-tempurns.js +23 -73
  11. package/dist/helpers/fix-handle-tempurns.js.map +7 -1
  12. package/dist/helpers/fix-strip-f884s.js +44 -94
  13. package/dist/helpers/fix-strip-f884s.js.map +7 -1
  14. package/dist/helpers/fix-utils.js +7 -22
  15. package/dist/helpers/fix-utils.js.map +7 -1
  16. package/dist/helpers/fix.js +62 -122
  17. package/dist/helpers/fix.js.map +7 -1
  18. package/dist/helpers/validation.js +12 -30
  19. package/dist/helpers/validation.js.map +7 -1
  20. package/dist/index.js +10 -109
  21. package/dist/index.js.map +7 -1
  22. package/dist/mongo.js +173 -509
  23. package/dist/mongo.js.map +7 -1
  24. package/dist/mongoLog.js +92 -317
  25. package/dist/mongoLog.js.map +7 -1
  26. package/dist/utils.js +46 -155
  27. package/dist/utils.js.map +7 -1
  28. package/eslint.config.js +53 -0
  29. package/package.json +23 -96
  30. package/tests/{amqp.health.spec.js → amqp.healthtest.js} +2 -2
  31. package/tests/{amqp.tests.spec.js → amqp.tests.localtest.js} +46 -46
  32. package/tests/helpers/{conversion.spec.js → conversion.test.js} +38 -25
  33. package/tests/helpers/{fix.spec.js → fix.test.js} +6 -6
  34. package/tests/helpers/{validation.spec.js → validation.test.js} +12 -9
  35. package/tests/{mongo-add-blob-size.spec.js → mongo-add-blob-size.test.js} +6 -6
  36. package/tests/{mongo-check-and-check-state.spec.js → mongo-check-and-check-state.test.js} +7 -7
  37. package/tests/{mongo-check-and-set-import-job-state.spec.js → mongo-check-and-set-import-job-state.test.js} +7 -7
  38. package/tests/{mongo-check-timeout.spec.js → mongo-check-timeout.test.js} +7 -7
  39. package/tests/{mongo-create-bulk.spec.js → mongo-create-bulk.test.js} +5 -5
  40. package/tests/{mongo-create-prio.spec.js → mongo-create-prio.test.js} +6 -6
  41. package/tests/{mongo-get-one.spec.js → mongo-get-one.test.js} +7 -7
  42. package/tests/{mongo-get-stream.spec.js → mongo-get-stream.test.js} +7 -7
  43. package/tests/{mongo-push-ids.spec.js → mongo-push-ids.test.js} +5 -5
  44. package/tests/{mongo-push-messages.spec.js → mongo-push-messages.test.js} +6 -6
  45. package/tests/{mongo-query-by-id.spec.js → mongo-query-by-id.test.js} +7 -7
  46. package/tests/{mongo-query.spec.js → mongo-query.test.js} +7 -7
  47. package/tests/{mongo-read-content.spec.js → mongo-read-content.test.js} +8 -8
  48. package/tests/{mongo-remove.spec.js → mongo-remove.test.js} +6 -6
  49. package/tests/{mongo-set-blob-size.spec.js → mongo-set-blob-size.test.js} +6 -6
  50. package/tests/{mongo-set-import-job-state.spec.js → mongo-set-import-job-state.test.js} +6 -6
  51. package/tests/{mongo-set-operation.spec.js → mongo-set-operation.test.js} +6 -6
  52. package/tests/{mongo-set-operations.spec.js → mongo-set-operations.test.js} +6 -6
  53. package/tests/{mongo-set-state.spec.js → mongo-set-state.test.js} +7 -7
  54. package/tests/{mongoLog.spec.js → mongoLog.test.js} +10 -11
  55. package/tests/testUtils.js +9 -8
@@ -1,10 +1,10 @@
1
- import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:get-on
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'get-one'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-one'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'get-one'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-one'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -81,7 +81,7 @@ async function callback({
81
81
  const opResult = await mongoOperator.getOne(params);
82
82
  debug(`getOne result: ${JSON.stringify(opResult)} (it should be: ${JSON.stringify(expectedOpResult)})}`);
83
83
 
84
- expect(opResult).to.eql(expectedOpResult);
84
+ assert.deepStrictEqual(opResult, expectedOpResult);
85
85
 
86
86
  } catch (error) {
87
87
  handleError({error, expectedToThrow, expectedErrorMessage, expectedErrorStatus});
@@ -1,24 +1,24 @@
1
- import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, streamToString} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, streamToString} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:get-stream:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'get-stream'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-stream'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'get-stream'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'get-stream'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -96,7 +96,7 @@ async function callback({
96
96
  if (contentStream) {
97
97
  const contentStreamString = await getFixture({components: ['contentStream'], reader: READERS.TEXT});
98
98
  //debug(contentStreamString);
99
- expect(opResultString).to.eql(contentStreamString);
99
+ assert.equal(opResultString, contentStreamString);
100
100
  return;
101
101
  }
102
102
 
@@ -2,8 +2,8 @@ import {READERS} from '@natlibfi/fixura';
2
2
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
3
3
  import generateTests from '@natlibfi/fixugen';
4
4
  import createDebugLogger from 'debug';
5
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
6
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
5
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
6
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
7
7
 
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -11,14 +11,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:push-i
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'push-ids'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-ids'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'push-ids'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-ids'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -1,24 +1,24 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:push-messages:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'push-messages'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-messages'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'push-messages'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'push-messages'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -1,10 +1,10 @@
1
- import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToDbEntry, formatQueueItem} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToDbEntry, formatQueueItem} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:query-
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'query-by-id'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query-by-id'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'query-by-id'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query-by-id'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -91,7 +91,7 @@ async function callback({
91
91
  debug(`queryById result: ${JSON.stringify(opResult)} (it should be: ${JSON.stringify(expectedOpResult)})}`);
92
92
  // eslint-disable-next-line functional/no-conditional-statements
93
93
  if (expectedOpResult !== undefined) {
94
- expect(formatQueueItem(opResult)).to.eql(formatQueueItem(expectedOpResult));
94
+ assert.deepStrictEqual(formatQueueItem(opResult), formatQueueItem(expectedOpResult));
95
95
  }
96
96
  const compareResultIndex = resultIndex ? resultIndex : 0;
97
97
  await compareToDbEntry({mongoFixtures, expectedResult, resultIndex: compareResultIndex, expectModificationTime, formatDates: true});
@@ -1,24 +1,24 @@
1
- import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'query'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'query'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'query'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -85,7 +85,7 @@ async function callback({
85
85
  debug(`query result: ${JSON.stringify(opResult)} (it should be: ${JSON.stringify(expectedOpResult)})}`);
86
86
  // eslint-disable-next-line functional/no-conditional-statements
87
87
  if (expectedOpResult !== undefined) {
88
- expect(opResult).to.eql(expectedOpResult);
88
+ assert.deepStrictEqual(opResult, expectedOpResult);
89
89
  }
90
90
  } catch (error) {
91
91
  handleError({error, expectedToThrow, expectedErrorMessage, expectedErrorStatus});
@@ -1,10 +1,10 @@
1
- import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, streamToString} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, streamToString} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:read-c
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'read-content'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'read-content'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'read-content'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'read-content'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -95,13 +95,13 @@ async function callback({
95
95
 
96
96
  // eslint-disable-next-line functional/no-conditional-statements
97
97
  if (createBulkParams && createBulkParams.contentType) {
98
- expect(opResult.contentType).to.eql(createBulkParams.contentType);
98
+ assert.equal(opResult.contentType, createBulkParams.contentType);
99
99
  }
100
100
 
101
101
  if (contentStream) {
102
102
  const contentStreamString = await getFixture({components: ['contentStream'], reader: READERS.TEXT});
103
103
  //debug(contentStreamString);
104
- expect(opResultString).to.eql(contentStreamString);
104
+ assert.equal(opResultString, contentStreamString);
105
105
  return;
106
106
  }
107
107
 
@@ -1,10 +1,10 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:remove
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'remove'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'remove'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'remove'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'remove'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -1,24 +1,24 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-blob-size:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'set-blob-size'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-blob-size'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'set-blob-size'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-blob-size'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -1,10 +1,10 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-im
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'set-import-job-state'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-import-job-state'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'set-import-job-state'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-import-job-state'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -1,24 +1,24 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operation:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'set-operation'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operation'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'set-operation'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operation'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -1,24 +1,24 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
4
  import generateTests from '@natlibfi/fixugen';
5
5
  import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
  let mongoFixtures; // eslint-disable-line functional/no-let
10
10
  const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-operations:test');
11
11
 
12
12
  generateTests({
13
13
  callback,
14
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'set-operations'],
14
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operations'],
15
15
  recurse: false,
16
16
  useMetadataFile: true,
17
17
  fixura: {
18
18
  failWhenNotFound: true,
19
19
  reader: READERS.JSON
20
20
  },
21
- mocha: {
21
+ hooks: {
22
22
  before: async () => {
23
23
  //debug(`<< Before`);
24
24
  await initMongofixtures();
@@ -41,7 +41,7 @@ generateTests({
41
41
  async function initMongofixtures() {
42
42
  mongoFixtures = await mongoFixturesFactory({
43
43
  recurse: false,
44
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'set-operations'],
44
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-operations'],
45
45
  gridFS: {bucketName: 'foobar'},
46
46
  useObjectId: true
47
47
  });
@@ -1,10 +1,10 @@
1
- //import {expect} from 'chai';
1
+ //import assert from 'node:assert';
2
+ import createDebugLogger from 'debug';
2
3
  import {READERS} from '@natlibfi/fixura';
3
4
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
4
5
  import generateTests from '@natlibfi/fixugen';
5
- import createDebugLogger from 'debug';
6
- //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils';
7
- import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils';
6
+ //import {handleError, compareToFirstDbEntry, compareToDbEntry, formatQueueItem, streamToString} from './testUtils.js';
7
+ import {getMongoOperator, handleError, compareToFirstDbEntry} from './testUtils.js';
8
8
 
9
9
 
10
10
  let mongoFixtures; // eslint-disable-line functional/no-let
@@ -12,14 +12,14 @@ const debug = createDebugLogger('@natlibfi/melinda-rest-api-commons/mongo:set-st
12
12
 
13
13
  generateTests({
14
14
  callback,
15
- path: [__dirname, '..', 'test-fixtures', 'mongo', 'set-state'],
15
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-state'],
16
16
  recurse: false,
17
17
  useMetadataFile: true,
18
18
  fixura: {
19
19
  failWhenNotFound: true,
20
20
  reader: READERS.JSON
21
21
  },
22
- mocha: {
22
+ hooks: {
23
23
  before: async () => {
24
24
  //debug(`<< Before`);
25
25
  await initMongofixtures();
@@ -42,7 +42,7 @@ generateTests({
42
42
  async function initMongofixtures() {
43
43
  mongoFixtures = await mongoFixturesFactory({
44
44
  recurse: false,
45
- rootPath: [__dirname, '..', 'test-fixtures', 'mongo', 'set-state'],
45
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongo', 'set-state'],
46
46
  gridFS: {bucketName: 'foobar'},
47
47
  useObjectId: true
48
48
  });
@@ -1,22 +1,21 @@
1
- // import {expect} from 'chai';
1
+ import assert from 'node:assert';
2
2
  import {READERS} from '@natlibfi/fixura';
3
3
  import generateTests from '@natlibfi/fixugen';
4
4
  import mongoFixturesFactory from '@natlibfi/fixura-mongo';
5
- import {expect} from 'chai';
6
- import createMongoLogOperator from '../src/mongoLog';
5
+ import createMongoLogOperator from '../src/mongoLog.js';
7
6
 
8
7
  let mongoFixtures; // eslint-disable-line functional/no-let
9
8
 
10
9
  generateTests({
11
10
  callback,
12
- path: [__dirname, '..', 'test-fixtures', 'mongoLog'],
11
+ path: [import.meta.dirname, '..', 'test-fixtures', 'mongoLog'],
13
12
  recurse: false,
14
13
  useMetadataFile: true,
15
14
  fixura: {
16
15
  failWhenNotFound: true,
17
16
  reader: READERS.JSON
18
17
  },
19
- mocha: {
18
+ hooks: {
20
19
  before: async () => {
21
20
  await initMongofixtures();
22
21
  },
@@ -30,7 +29,7 @@ generateTests({
30
29
 
31
30
  async function initMongofixtures() {
32
31
  mongoFixtures = await mongoFixturesFactory({
33
- rootPath: [__dirname, '..', 'test-fixtures', 'mongoLog'],
32
+ rootPath: [import.meta.dirname, '..', 'test-fixtures', 'mongoLog'],
34
33
  gridFS: {bucketName: 'blobs'},
35
34
  useObjectId: true,
36
35
  format: {
@@ -51,34 +50,34 @@ async function callback({
51
50
  const expectedResult = await getFixture('expectedResult.json');
52
51
  // console.log(typeof mongoUri); // eslint-disable-line
53
52
 
54
- if (preFillDb) { // eslint-disable-line functional/no-conditional-statements
53
+ if (preFillDb) {
55
54
  await mongoFixtures.populate(getFixture('dbContents.json'));
56
55
  }
57
56
 
58
57
  if (functionName === 'addLogItem') {
59
58
  await mongoLogOperator.addLogItem(params);
60
59
  const dump = await mongoFixtures.dump();
61
- return expect(dump.logs[0]['0']).to.eql(expectedResult);
60
+ return assert.deepStrictEqual(dump.logs[0]['0'], expectedResult);
62
61
  }
63
62
 
64
63
  if (functionName === 'getListOfCatalogers') {
65
64
  const result = await mongoLogOperator.getListOfCatalogers();
66
65
  // console.log(result); // eslint-disable-line
67
66
 
68
- return expect(result).to.eql(expectedResult);
67
+ return assert.deepEqual(result, expectedResult);
69
68
  }
70
69
 
71
70
  if (functionName === 'getExpandedListOfLogs') {
72
71
  const result = await mongoLogOperator.getExpandedListOfLogs(params);
73
72
  // console.log(result); // eslint-disable-line
74
73
 
75
- return expect(result).to.eql(expectedResult);
74
+ return assert.deepEqual(result, expectedResult);
76
75
  }
77
76
 
78
77
  if (functionName === 'getListOfLogs') {
79
78
  const result = await mongoLogOperator.getListOfLogs(params);
80
79
  // console.log(result); // eslint-disable-line
81
- return expect(result).to.eql(expectedResult);
80
+ return assert.deepEqual(result, expectedResult);
82
81
  }
83
82
  throw new Error(`Unknown functionName: ${functionName}`);
84
83
  }