@opentermsarchive/engine 10.1.1 → 10.1.3

package/config/default.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "10.1.1",
+  "version": "10.1.3",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {
@@ -25,6 +25,8 @@
   "files": [
     "bin",
     "config",
+    "!config/development.json",
+    "!config/local.json",
     "scripts",
     "src",
     ".eslintrc.yaml"

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

@@ -41,11 +41,21 @@ function loadConfiguration() {
   const organizationIdOrSlug = config.has('@opentermsarchive/engine.dataset.datagouv.organizationIdOrSlug') && config.get('@opentermsarchive/engine.dataset.datagouv.organizationIdOrSlug');
 
   if (!datasetId && !organizationIdOrSlug) {
-    throw new Error('Either datasetId or organizationIdOrSlug is required in config at @opentermsarchive/engine.dataset.datagouv');
+    throw new Error('Either "datasetId" or "organizationIdOrSlug" is required in config at @opentermsarchive/engine.dataset.datagouv');
   }
 
   const datasetTitle = config.get('@opentermsarchive/engine.dataset.title');
+
+  if (!datasetTitle) {
+    throw new Error('"title" is required in config at @opentermsarchive/engine.dataset');
+  }
+
   const frequency = config.has('@opentermsarchive/engine.dataset.datagouv.frequency') && config.get('@opentermsarchive/engine.dataset.datagouv.frequency');
+
+  if (!frequency) {
+    throw new Error('"frequency" is required in config at @opentermsarchive/engine.dataset.datagouv');
+  }
+
   const useDemo = config.has('@opentermsarchive/engine.dataset.datagouv.useDemo') && config.get('@opentermsarchive/engine.dataset.datagouv.useDemo');
   const apiBaseUrl = useDemo ? DEMO_API_BASE_URL : PRODUCTION_API_BASE_URL;
 

package/scripts/dataset/publish/index.js

@@ -1,5 +1,3 @@
-import config from 'config';
-
 import logger from '../logger/index.js';
 
 import publishDataGouv from './datagouv/index.js';
@@ -16,7 +14,7 @@ export default async function publishRelease({ archivePath, releaseDate, stats }
     platforms.push({ name: 'GitLab', publish: () => publishGitLab({ archivePath, releaseDate, stats }) });
   }
 
-  if (process.env.OTA_ENGINE_DATAGOUV_API_KEY && (config.has('@opentermsarchive/engine.dataset.datagouv.datasetId') || config.has('@opentermsarchive/engine.dataset.datagouv.organizationIdOrSlug'))) {
+  if (process.env.OTA_ENGINE_DATAGOUV_API_KEY) {
     platforms.push({ name: 'data.gouv.fr', publish: () => publishDataGouv({ archivePath, releaseDate, stats }) });
   }
 

package/config/development.json

@@ -1,60 +0,0 @@
-{
-  "@opentermsarchive/engine": {
-    "collectionPath": "../collections/pga-declarations",
-    "recorder": {
-      "versions": {
-        "storage": {
-          "git": {
-            "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/vlopses-ie-snapshots/commit/%SNAPSHOT_ID",
-            "repository": "git@github.com:OpenTermsArchive/vlopses-ie-versions.git",
-            "path": "./data/versions"
-          }
-        }
-      },
-      "snapshots": {
-        "storage": {
-          "git": {
-            "repository": "git@github.com:OpenTermsArchive/vlopses-ie-snapshots.git",
-            "path": "./data/snapshots"
-          }
-        }
-      }
-    },
-    "fetcher": {
-      "language": "en"
-    },
-    "notifier": {
-      "sendInBlue": {
-        "updatesListId": 0,
-        "updateTemplateId": 0
-      }
-    },
-    "logger": {
-      "sendMailOnError": {
-        "to": "admin@opentermsarchive.org",
-        "from": "noreply@opentermsarchive.org",
-        "sendWarnings": false
-      }
-    },
-    "reporter": {
-      "type": "github",
-      "repositories": {
-        "declarations": "OpenTermsArchive/vlopses-ie-declarations",
-        "versions": "OpenTermsArchive/vlopses-ie-versions",
-        "snapshots": "OpenTermsArchive/vlopses-ie-snapshots"
-      }
-    },
-    "collection-api": {
-      "host": "127.0.0.1",
-      "port": 3003,
-      "basePath": "/collection-api"
-    },
-    "dataset": {
-      "datagouv": {
-        "organizationIdOrSlug": "otatest",
-        "frequency": "weekly",
-        "useDemo": true
-      }
-    }
-  }
-}