Merge pull request #38 from MaddyGuthridge/maddy-unify-data-structures

Unify item and group data structures

.github/workflows/node.js.yml

@@ -14,59 +14,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20.x
+    - name: Use Node.js 22.x
       uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: 'npm'
     - run: npm ci
-    # Set up SSH access, as the test suite needs to be able to access git
-    # repos to validate functionality.
-    - name: Decrypt secrets
-      env:
-        PASSWORD: ${{ secrets.SSH_ENCRYPTION_KEY }}
-      run: |
-        gpg --batch --passphrase $PASSWORD --output .github/workflows/secrets/id_ed25519 --decrypt .github/workflows/secrets/id_ed25519.enc
-    - name: Setup SSH agent
-      env:
-        SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-      run: |
-        mkdir -p ~/.ssh
-        ssh-keyscan github.com >> ~/.ssh/known_hosts
-
-        ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-        chmod 0600 .github/workflows/secrets/id_ed25519
-        ssh-add .github/workflows/secrets/id_ed25519
-    - name: Set up git config
-      run: |
-        git config --global user.name "MadGutsBot"
-        git config --global user.email "[email protected]"
     - name: Set up .env
       run: cp .env.example .env
     - name: Run test suite
-      env:
-        SSH_AUTH_SOCK: /tmp/ssh_agent.sock
       run: npm test
     - name: Show server output
       if: always()
       run: cat server.log
-    - name: Cleanup SSH Agent
-      if: always()
-      env:
-        SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-      run: |
-        ssh-add -D
-        rm -Rf ~/.ssh
-        rm .github/workflows/secrets/id_ed25519
 
   lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20.x
+    - name: Use Node.js 22.x
       uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: 'npm'
     - run: npm ci
     - name: Run linting
@@ -76,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20.x
+    - name: Use Node.js 22.x
       uses: actions/setup-node@v4
       with:
-        node-version: 20.x
+        node-version: 22.x
         cache: 'npm'
     - run: npm ci
     - name: Run type-checking

.nvmrc

@@ -0,0 +1 @@
+v22.12.0

eslint.config.mjs

@@ -66,6 +66,9 @@ export default ts.config(
       '@typescript-eslint/no-empty-function': 'off',
       // Use `type` instead of `interface`
       "@typescript-eslint/consistent-type-definitions": ["error", 'type'],
+      // This error is already picked up by TypeScript, and it's annoying to need to silence it
+      // twice when it is incorrect
+      "@typescript-eslint/no-unsafe-call": "off"
     },
   },
   {