@opentermsarchive/engine 7.2.4 → 9.0.0

package/bin/env.js

@@ -1,8 +1,10 @@
-import 'dotenv/config';
-
 import path from 'path';
 import { fileURLToPath } from 'url';
 
+import dotenv from 'dotenv';
+
+dotenv.config({ quiet: true });
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 process.env.SUPPRESS_NO_CONFIG_WARNING = 'y'; // Caller don't get "no config files" warnings if it does define configuration files

package/bin/ota-dataset.js

@@ -3,7 +3,7 @@ import './env.js';
 
 import { program } from 'commander';
 import config from 'config';
-import cron from 'croner';
+import { Cron } from 'croner';
 import cronstrue from 'cronstrue';
 
 import { release } from '../scripts/dataset/index.js';
@@ -34,5 +34,5 @@ if (!schedule) {
   logger.info('The scheduler is running…');
   logger.info(`Dataset will be published ${humanReadableSchedule.toLowerCase()} in the timezone of this machine`);
 
-  cron(config.get('@opentermsarchive/engine.dataset.publishingSchedule'), () => release(options));
+  new Cron(config.get('@opentermsarchive/engine.dataset.publishingSchedule'), () => release(options)); // eslint-disable-line no-new
 }

package/config/default.json

@@ -57,7 +57,7 @@
     },
     "dataset": {
       "title": "sandbox",
-      "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox",
+      "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox-declarations",
       "publishingSchedule": "30 8 * * MON"
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "7.2.4",
+  "version": "9.0.0",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {
@@ -30,7 +30,6 @@
     ".eslintrc.yaml"
   ],
   "scripts": {
-    "changelog": "node scripts/changelog/index.js",
     "commit-messages:lint": "commitlint --from=main --to=HEAD",
     "dataset:generate": "node bin/ota.js dataset",
     "dataset:release": "node bin/ota.js dataset --publish --remove-local-copy",
@@ -41,88 +40,80 @@
     "lint": "eslint src test scripts bin",
     "lint:fix": "npm run lint -- --fix",
     "metadata:validate": "node bin/ota.js validate metadata",
-    "start": "node -r dotenv/config --max-http-header-size=32768 bin/ota.js track",
+    "start": "DOTENV_CONFIG_QUIET=true node -r dotenv/config --max-http-header-size=32768 bin/ota.js track",
     "start:api": "node bin/ota.js serve",
     "start:scheduler": "npm start -- --schedule",
     "test": "cross-env NODE_ENV=test mocha --recursive \"./src/**/*.test.js\" \"./scripts/**/*.test.js\" --exit",
-    "test:only": "cross-env NODE_ENV=test mocha --recursive",
     "posttest": "npm run lint",
-    "test:debug": "npm run test -- --inspect-brk --exit"
+    "test:debug": "npm run test -- --inspect-brk --exit",
+    "test:only": "cross-env NODE_ENV=test mocha --recursive"
   },
   "dependencies": {
-    "@accordproject/markdown-cicero": "^0.15.2",
-    "@accordproject/markdown-pdf": "^0.15.2",
-    "@opentermsarchive/turndown": "^7.1.3",
-    "@stylistic/eslint-plugin-js": "^1.4.1",
+    "@accordproject/concerto-cto": "^3.24.0",
+    "@accordproject/concerto-util": "^3.24.0",
+    "@accordproject/markdown-cicero": "^0.16.26",
+    "@accordproject/markdown-pdf": "^0.16.25",
     "abort-controller": "^3.0.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "archiver": "^5.3.0",
-    "async": "^3.2.2",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "chai-exclude": "^2.1.0",
-    "commander": "^9.4.1",
+    "archiver": "^7.0.1",
+    "async": "^3.2.6",
+    "chai": "^6.0.1",
+    "chai-as-promised": "^8.0.2",
+    "commander": "^14.0.1",
     "config": "^4.1.1",
-    "croner": "^8.0.2",
-    "cronstrue": "^2.50.0",
-    "cross-env": "^7.0.3",
-    "datauri": "^4.1.0",
-    "dotenv": "^10.0.0",
+    "croner": "^9.1.0",
+    "cronstrue": "^3.3.0",
+    "cross-env": "^10.0.0",
+    "dotenv": "^17.2.2",
     "eslint": "^8.53.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-chai-friendly": "^0.7.2",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint-plugin-chai-friendly": "^1.1.0",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsdoc": "^58.1.1",
     "eslint-plugin-json-format": "^2.0.1",
-    "eslint-plugin-no-only-tests": "^3.1.0",
-    "express": "^4.19.2",
-    "express-async-errors": "^3.1.1",
+    "eslint-plugin-no-only-tests": "^3.3.0",
+    "express": "^5.1.0",
     "fetch-charset-detection": "^1.0.1",
-    "fs-extra": "^10.0.0",
-    "helmet": "^6.0.1",
-    "http-proxy-agent": "^5.0.0",
-    "https": "^1.0.0",
-    "https-proxy-agent": "^5.0.0",
-    "iconv-lite": "^0.6.3",
+    "form-data": "^4.0.4",
+    "helmet": "^8.1.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
+    "iconv-lite": "^0.7.0",
     "joplin-turndown-plugin-gfm": "^1.0.12",
     "js-yaml": "^4.1.0",
-    "jsdom": "^18.1.0",
+    "jsdom": "^27.0.0",
     "json-source-map": "^0.6.1",
-    "lodash": "^4.17.21",
-    "mime": "^2.5.2",
-    "mocha": "^9.1.3",
-    "mongodb": "^4.9.0",
-    "morgan": "^1.10.0",
-    "node-fetch": "^3.1.0",
-    "octokit": "2.0.2",
-    "pdfjs-dist": "^2.9.359",
-    "puppeteer": "^22.8.1",
+    "mime": "^4.1.0",
+    "mocha": "^11.7.2",
+    "mongodb": "^6.19.0",
+    "morgan": "^1.10.1",
+    "node-fetch": "^3.3.2",
+    "octokit": "^5.0.3",
+    "puppeteer": "^24.22.0",
     "puppeteer-extra": "^3.3.6",
     "puppeteer-extra-plugin-stealth": "^2.11.2",
-    "sib-api-v3-sdk": "^8.2.1",
-    "simple-git": "^3.27.0",
+    "sib-api-v3-sdk": "^8.5.0",
+    "simple-git": "^3.28.0",
     "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.0",
-    "winston": "^3.9.0",
+    "swagger-ui-express": "^5.0.1",
+    "turndown": "^7.2.1",
+    "winston": "^3.17.0",
     "winston-mail": "^2.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.0.3",
-    "dir-compare": "^4.0.0",
-    "keep-a-changelog": "^2.5.3",
-    "nock": "^13.2.1",
+    "@commitlint/cli": "^19.8.1",
+    "dir-compare": "^5.0.0",
+    "nock": "^14.0.10",
     "node-stream-zip": "^1.15.0",
-    "prettier": "^2.2.1",
-    "semver": "^7.6.0",
-    "sinon": "^12.0.1",
-    "sinon-chai": "^3.7.0",
-    "supertest": "^6.3.3"
+    "sinon": "^21.0.0",
+    "sinon-chai": "^4.0.1",
+    "supertest": "^7.1.4"
   },
   "peerDependencies": {
-    "@opentermsarchive/terms-types": "^2.0.0"
+    "@opentermsarchive/terms-types": "^2.1.0"
   },
   "engines": {
-    "node": ">=16.0.0 < 23.0.0"
+    "node": ">=20.0.0 < 23.0.0"
   }
 }

package/scripts/dataset/export/index.test.js

@@ -2,7 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import config from 'config';
 import dircompare from 'dir-compare';
 import mime from 'mime';
@@ -15,8 +15,6 @@ import generateArchive from './index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const { expect } = chai;
-
 const FIRST_SERVICE_PROVIDER_ID = 'ServiceA';
 const SECOND_SERVICE_PROVIDER_ID = 'ServiceB';
 
@@ -113,7 +111,7 @@ describe('Export', () => {
   });
 });
 
-chai.use(chai => {
+use(chai => {
   const { Assertion } = chai;
 
   Assertion.addMethod('sameContentAs', function (expectedContentPath) {

package/scripts/dataset/publish/github/index.js

@@ -3,7 +3,7 @@ import path from 'path';
 import url from 'url';
 
 import config from 'config';
-import { Octokit } from 'octokit';
+import { Octokit } from 'octokit'; // eslint-disable-line import/no-unresolved
 
 import * as readme from '../../assets/README.template.js';
 

package/scripts/dataset/publish/gitlab/index.js

@@ -10,7 +10,7 @@ import GitLab from '../../../../src/reporter/gitlab/index.js';
 import * as readme from '../../assets/README.template.js';
 import logger from '../../logger/index.js';
 
-dotenv.config();
+dotenv.config({ quiet: true });
 
 export default async function publish({
   archivePath,

package/scripts/metadata/index.mocha.js

@@ -4,7 +4,7 @@ import path from 'path';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import config from 'config';
-import Croner from 'croner';
+import { Cron } from 'croner';
 import yaml from 'js-yaml';
 
 import specsRouter from '../../src/collection-api/routes/docs.js';
@@ -15,7 +15,7 @@ describe('Metadata file validation', () => {
     'iso3166-2': code => /^[A-Z]{2}(-[A-Z0-9]{1,3})?$/.test(code),
     'cron-expression': cronExpression => {
       try {
-        Croner(cronExpression); // eslint-disable-line new-cap
+        new Cron(cronExpression); // eslint-disable-line no-new
 
         return true;
       } catch {

package/scripts/reporter/duplicate/index.js

@@ -1,6 +1,8 @@
-import 'dotenv/config';
 import config from 'config';
-import { Octokit } from 'octokit';
+import dotenv from 'dotenv';
+import { Octokit } from 'octokit'; // eslint-disable-line import/no-unresolved
+
+dotenv.config({ quiet: true });
 
 async function removeDuplicateIssues() {
   const repository = config.get('@opentermsarchive/engine.reporter.githubIssues.repositories.declarations');

package/src/archivist/extract/index.test.js

@@ -2,7 +2,7 @@ import fsApi from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import mime from 'mime';
 
 import SourceDocument from '../services/sourceDocument.js';
@@ -13,7 +13,6 @@ import extract from './index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const fs = fsApi.promises;
-const { expect } = chai;
 
 const virtualLocation = 'https://example.com/main';
 const rawHTML = `

package/src/archivist/extract/markdown.js

@@ -1,12 +1,17 @@
 import ciceroMark from '@accordproject/markdown-cicero';
 import mardownPdf from '@accordproject/markdown-pdf';
-import TurndownService from '@opentermsarchive/turndown';
 import turndownPluginGithubFlavouredMarkdown from 'joplin-turndown-plugin-gfm';
+import TurndownService from 'turndown';
 
 const turndownService = new TurndownService();
 
 turndownService.use(turndownPluginGithubFlavouredMarkdown.gfm);
 
+turndownService.addRule('fix-anchors-containing-block-elements', {
+  ...turndownService.options.rules.inlineLink,
+  replacement: (content, node) => turndownService.options.rules.inlineLink.replacement(content.trim(), node),
+});
+
 const { PdfTransformer } = mardownPdf;
 const { CiceroMarkTransformer } = ciceroMark;
 const ciceroMarkTransformer = new CiceroMarkTransformer();

package/src/archivist/fetcher/fullDomFetcher.test.js

@@ -1,14 +1,13 @@
 import http from 'http';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import fetch, { launchHeadlessBrowser, stopHeadlessBrowser } from './fullDomFetcher.js';
 
-const { expect } = chai;
 const SERVER_PORT = 8977;
 
-chai.use(chaiAsPromised);
+use(chaiAsPromised);
 
 const dynamicHTML = '<!DOCTYPE html><html><head><title>Dynamic Page</title><script>setTimeout(() => { document.body.innerHTML += "<div class=\'dynamic\'>Loaded</div>"; }, 100);</script></head><body></body></html>';
 const delayedContentHTML = '<!DOCTYPE html><html><head><title>Delayed Content</title><script>setTimeout(() => { document.querySelector(".content").textContent = "Final content"; }, 100);</script></head><body><div class="content"></div></body></html>';

package/src/archivist/fetcher/index.test.js

@@ -3,7 +3,7 @@ import http from 'http';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import iconv from 'iconv-lite';
 
@@ -11,10 +11,9 @@ import fetch, { launchHeadlessBrowser, stopHeadlessBrowser, FetchDocumentError,
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const { expect } = chai;
 const SERVER_PORT = 8976;
 
-chai.use(chaiAsPromised);
+use(chaiAsPromised);
 
 const termsHTML = '<!DOCTYPE html><html><head><meta charset="UTF-8"><title>First provider TOS</title></head><body><h1>Terms of service</h1><p>Dapibus quis diam sagittis</p></body></html>';
 const termsWithOtherCharsetHTML = '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1251"><title>TOS на първия доставчик</title></head><body><h1>Условия за ползване</h1><p>Dapibus quis diam sagittis</p></body></html>';

package/src/archivist/index.test.js

@@ -2,7 +2,7 @@ import fsApi from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import config from 'config';
 import nock from 'nock';
 import sinon from 'sinon';
@@ -16,8 +16,7 @@ import Archivist, { EVENTS } from './index.js';
 
 const fs = fsApi.promises;
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 

package/src/archivist/recorder/index.test.js

@@ -1,4 +1,4 @@
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 
 import Snapshot from './snapshot.js';
@@ -6,8 +6,6 @@ import Version from './version.js';
 
 import Recorder from './index.js';
 
-const { expect } = chai;
-
 const MIME_TYPE = 'text/html';
 const FETCH_DATE = new Date('2000-01-01T12:00:00.000Z');
 const FETCH_DATE_LATER = new Date('2000-01-02T12:00:00.000Z');

package/src/archivist/recorder/repositories/git/dataMapper.js

@@ -5,8 +5,6 @@ import mime from 'mime';
 import Snapshot from '../../snapshot.js';
 import Version from '../../version.js';
 
-mime.define({ 'text/markdown': ['md'] }, true); // ensure extension for markdown files is `.md` and not `.markdown`
-
 export const COMMIT_MESSAGE_PREFIXES = {
   startTracking: 'First record of',
   extractOnly: 'Apply technical or declaration upgrade on',

package/src/archivist/recorder/repositories/git/index.js

@@ -15,8 +15,6 @@ import Git from './git.js';
 
 const fs = fsApi.promises;
 
-mime.define({ 'text/markdown': ['md'] }, true); // ensure extension for markdown files is `.md` and not `.markdown`
-
 export default class GitRepository extends RepositoryInterface {
   constructor({ path, author, publish, snapshotIdentiferTemplate }) {
     super();

package/src/archivist/recorder/repositories/git/index.test.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 import mime from 'mime';
 
@@ -14,8 +14,6 @@ import Git from './git.js';
 
 import GitRepository from './index.js';
 
-const { expect } = chai;
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const RECORDER_PATH = path.resolve(__dirname, '../../../../..', config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));

package/src/archivist/recorder/repositories/mongo/index.js

@@ -79,7 +79,11 @@ export default class MongoRepository extends RepositoryInterface {
   }
 
   async findById(recordId) {
-    const mongoDocument = await this.collection.findOne({ _id: new ObjectId(recordId) });
+    if (!ObjectId.isValid(recordId)) {
+      return null;
+    }
+
+    const mongoDocument = await this.collection.findOne({ _id: ObjectId.createFromHexString(recordId) });
 
     return this.#toDomain(mongoDocument);
   }
@@ -108,7 +112,7 @@ export default class MongoRepository extends RepositoryInterface {
   }
 
   async loadRecordContent(record) {
-    const { content } = await this.collection.findOne({ _id: new ObjectId(record.id) }, { projection: { content: 1 } });
+    const { content } = await this.collection.findOne({ _id: ObjectId.createFromHexString(record.id) }, { projection: { content: 1 } });
 
     record.content = content instanceof Binary ? content.buffer : content;
   }

package/src/archivist/recorder/repositories/mongo/index.test.js

@@ -2,17 +2,16 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 import mime from 'mime';
-import { MongoClient } from 'mongodb';
+import { MongoClient, ObjectId } from 'mongodb';
 
 import Snapshot from '../../snapshot.js';
 import Version from '../../version.js';
 
 import MongoRepository from './index.js';
 
-const { expect } = chai;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const { connectionURI } = config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo');
@@ -54,6 +53,10 @@ describe('MongoRepository', () => {
       collection = db.collection(config.get('@opentermsarchive/engine.recorder.versions.storage.mongo.collection'));
     });
 
+    after(async () => {
+      await client.close();
+    });
+
     describe('#save', () => {
       let record;
       let mongoDocument;
@@ -444,7 +447,9 @@ describe('MongoRepository', () => {
 
       context('when requested record does not exist', () => {
         it('returns null', async () => {
-          expect(await subject.findById('inexistantID')).to.equal(null);
+          const nonExistentId = new ObjectId().toString();
+
+          expect(await subject.findById(nonExistentId)).to.equal(null);
         });
       });
     });
@@ -840,6 +845,10 @@ describe('MongoRepository', () => {
       collection = db.collection(config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo.collection'));
     });
 
+    after(async () => {
+      await client.close();
+    });
+
     describe('#save', () => {
       let record;
       let mongoDocument;
@@ -1119,7 +1128,9 @@ describe('MongoRepository', () => {
 
       context('when requested record does not exist', () => {
         it('returns null', async () => {
-          expect(await subject.findById('inexistantID')).to.equal(null);
+          const nonExistentId = new ObjectId().toString();
+
+          expect(await subject.findById(nonExistentId)).to.equal(null);
         });
       });
     });

package/src/archivist/recorder/snapshot.test.js

@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Snapshot from './snapshot.js';
 
-const { expect } = chai;
-
 describe('Snapshot', () => {
   let subject;
 

package/src/archivist/recorder/version.test.js

@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Version from './version.js';
 
-const { expect } = chai;
-
 describe('Version', () => {
   let subject;
 

package/src/archivist/services/index.test.js

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 
@@ -14,8 +14,7 @@ import Terms from './terms.js';
 
 import { getDeclaredServicesIds, loadServiceDeclaration, loadServiceFilters, getServiceFilters, createSourceDocuments, createServiceFromDeclaration, load, loadWithHistory } from './index.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 describe('Services', () => {
   describe('#getDeclaredServicesIds', () => {

package/src/archivist/services/service.test.js

@@ -1,10 +1,8 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Service from './service.js';
 import Terms from './terms.js';
 
-const { expect } = chai;
-
 describe('Service', () => {
   let subject;
   const TERMS_OF_SERVICE_TYPE = 'Terms of Service';

package/src/archivist/services/sourceDocument.test.js

@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import SourceDocument from './sourceDocument.js';
 
-const { expect } = chai;
-
 describe('SourceDocument', () => {
   const URL = 'https://www.service.example/terms';
 

package/src/archivist/services/terms.test.js

@@ -1,10 +1,8 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import SourceDocument from './sourceDocument.js';
 import Terms from './terms.js';
 
-const { expect } = chai;
-
 describe('Terms', () => {
   const service = { name: 'Service' };
   const termsType = 'Terms of Service';

package/src/collection-api/logger.js

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import winston from 'winston';
 import 'winston-mail';
 
-dotenv.config();
+dotenv.config({ quiet: true });
 
 const { combine, timestamp, printf, colorize } = winston.format;
 

package/src/collection-api/routes/metadata.js

@@ -155,10 +155,10 @@ const { version: PACKAGE_VERSION } = require('../../../package.json');
  *               roles:
  *                 type: array
  *                 description: Roles of the entity within the governance, see [collection governance](https://docs.opentermsarchive.org/collections/reference/governance/)
- *                 example: [host, administrator]
+ *                 example: [host, sysadmin]
  *                 items:
  *                   type: string
- *                   enum: [host, administrator, curator, maintainer, sponsor]
+ *                   enum: [host, sysadmin, curator, maintainer, contributor, analyst, diffuser, sponsor]
  *         i18n:
  *           type: object
  *           description: Internationalization of any of the Metadata properties (except i18n itself) for different language codes

package/src/collection-api/routes/metadata.test.js

@@ -30,38 +30,28 @@ const EXPECTED_RESPONSE = {
   jurisdictions: [
     'EU',
   ],
+  trackingPeriods: [
+    {
+      startDate: '2025-07-17',
+      schedule: '30 */12 * * *',
+      serverLocation: 'Strasbourg, FR',
+    },
+  ],
   governance: {
-    hosts: [
-      { name: 'Localhost' },
-    ],
-    administrators: [
-      {
-        name: 'Open Terms Archive',
-        url: 'https://opentermsarchive.org/',
-        logo: 'https://opentermsarchive.org/images/logo/logo-open-terms-archive-black.png',
-      },
-    ],
-    curators: [
-      {
-        name: 'Open Terms Archive',
-        url: 'https://opentermsarchive.org/',
-        logo: 'https://opentermsarchive.org/images/logo/logo-open-terms-archive-black.png',
-      },
-    ],
-    maintainers: [
-      {
-        name: 'Open Terms Archive',
-        url: 'https://opentermsarchive.org/',
-        logo: 'https://opentermsarchive.org/images/logo/logo-open-terms-archive-black.png',
-      },
-    ],
-    sponsors: [
-      {
-        name: 'Open Terms Archive',
-        url: 'https://opentermsarchive.org/',
-        logo: 'https://opentermsarchive.org/images/logo/logo-open-terms-archive-black.png',
-      },
-    ],
+    'Open Terms Archive': {
+      url: 'https://opentermsarchive.org',
+      logo: 'https://opentermsarchive.org/images/logo/logo-open-terms-archive-black.png',
+      roles: [
+        'host',
+        'sysadmin',
+        'curator',
+        'maintainer',
+        'contributor',
+        'analyst',
+        'diffuser',
+        'sponsor',
+      ],
+    },
   },
 };
 

package/src/collection-api/routes/versions.test.js

@@ -1,4 +1,4 @@
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 import supertest from 'supertest';
 
@@ -9,7 +9,6 @@ import app from '../server.js';
 
 const basePath = config.get('@opentermsarchive/engine.collection-api.basePath');
 
-const { expect } = chai;
 const request = supertest(app);
 
 describe('Versions API', () => {

package/src/collection-api/server.js

@@ -1,7 +1,6 @@
 import config from 'config';
 import express from 'express';
 
-import 'express-async-errors';
 import logger from './logger.js';
 import errorsMiddleware from './middlewares/errors.js';
 import loggerMiddleware from './middlewares/logger.js';

package/src/index.js

@@ -1,7 +1,7 @@
 import { createRequire } from 'module';
 
 import config from 'config';
-import cron from 'croner';
+import { Cron } from 'croner';
 import cronstrue from 'cronstrue';
 
 import { getCollection } from './archivist/collection/index.js';
@@ -83,7 +83,7 @@ export default async function track({ services, types, extractOnly, schedule })
   logger.info('The scheduler is running…');
   logger.info(`Terms will be tracked ${humanReadableSchedule.toLowerCase()} in the timezone of this machine`);
 
-  cron(
+  new Cron( // eslint-disable-line no-new
     trackingSchedule,
     { protect: job => logger.warn(`Tracking scheduled at ${new Date().toISOString()} were blocked by an unfinished tracking started at ${job.currentRun().toISOString()}`) },
     () => archivist.track({ services, types }),

package/src/reporter/github/index.js

@@ -1,6 +1,6 @@
 import { createRequire } from 'module';
 
-import { Octokit } from 'octokit';
+import { Octokit } from 'octokit'; // eslint-disable-line import/no-unresolved
 
 import logger from '../../logger/index.js';
 import { LABELS, MANAGED_BY_OTA_MARKER, DEPRECATED_MANAGED_BY_OTA_MARKER } from '../labels.js';

package/src/reporter/labels.test.js

@@ -1,11 +1,9 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import GitHub from './github/index.js';
 import GitLab from './gitlab/index.js';
 import { MANAGED_BY_OTA_MARKER, LABELS } from './labels.js';
 
-const { expect } = chai;
-
 const MAX_LABEL_DESCRIPTION_LENGTH = Math.min(
   GitHub.MAX_LABEL_DESCRIPTION_LENGTH,
   GitLab.MAX_LABEL_DESCRIPTION_LENGTH,