Merge remote-tracking branch 'origin/master' into feature/docker-and-…

…package-upgrades-new
openactive · Mar 7, 2024 · 37b3278 · 37b3278
2 parents 4c5603c + 712cd6a
commit 37b3278
Show file tree

Hide file tree

Showing 104 changed files with 35,594 additions and 9,178 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -98,6 +98,19 @@
               "NODE_APP_INSTANCE": "dev"
             },
         },
+        {
+            "name": "test-interface-criteria - unit tests",
+            "type": "node",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/packages/test-interface-criteria/",
+            "runtimeArgs": [
+              "--inspect-brk",
+              "node_modules/.bin/jest",
+              "--runInBand"
+              ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
+        },
         {
             "name": "validate-feeds",
             "type": "node",

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -61,3 +61,7 @@ For new features that affect test coverage, use a `coverage/*` branch in this re
 2. Ensure that documentation reflects the new changes.
 3. Check that CI tests pass before merging a Pull Request.
 4. Ensure that your Pull Request has at least one approval before merging.
+
+## Writing a new test
+
+See the [Integration Tests CONTRIBUTING.md](./packages/openactive-integration-tests/CONTRIBUTING.md) for guidance on writing a new test.
diff --git a/config/default.json b/config/default.json
@@ -134,7 +134,8 @@
           }
         }
       }
-    }
+    },
+    "useShapeExpressions": false
   },
   "sellers": {
     "primary": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,6 +42,7 @@
     "update-test-suite": "npm run clean-install && git fetch --all && git reset --hard origin/master && git clean -f -d && npm install"
   },
   "dependencies": {
+    "@openactive/dataset-utils": "^1.0.1",
     "config": "^3.3.6",
     "inquirer": "^8.0.0",
     "node-cleanup": "^2.1.2"

diff --git a/packages/openactive-broker-microservice/.eslintrc.json b/packages/openactive-broker-microservice/.eslintrc.json
@@ -1,5 +1,6 @@
 {
-  "extends": "airbnb-base",
+  "extends": ["airbnb-base"],
+  "plugins": ["jsdoc"],
   "env": {
     "node": true,
     "jasmine": true
@@ -35,7 +36,10 @@
       }
     ],
     "no-use-before-define": ["error", { "functions": false, "classes": false }],
-    "no-underscore-dangle": "off"
+    "no-underscore-dangle": "off",
+    // Ensure that all function args are typed
+    "jsdoc/require-param": "error",
+    "jsdoc/require-param-type": "error"
   },
   "parserOptions": {
     "ecmaVersion": 2020

diff --git a/packages/openactive-broker-microservice/.nvmrc b/packages/openactive-broker-microservice/.nvmrc
@@ -0,0 +1 @@
+v18.17.1
diff --git a/packages/openactive-broker-microservice/.vscode/settings.json b/packages/openactive-broker-microservice/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,8 @@ @@
               }
             }
           }
-        }
+        },
+        "useShapeExpressions": false
       },
       "sellers": {
         "primary": {
@@ Expand Down @@