Merge remote-tracking branch 'origin/develop'

Author: bryanjnelson

.dockerignore

@@ -11,10 +11,16 @@ README*
 
 # Yarn / NPM
 !.yarnrc.yml
-!.yarn/releases
+!.yarn/keep
+!.yarn/patches
 !.yarn/plugins
 node_modules
 
+# edgedb generated
+src/core/edgedb/generated-client
+src/core/edgedb/schema.ts
+src/**/*.edgeql.ts
+
 # Local
 dist
 coverage

.editorconfig

@@ -10,3 +10,13 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+# Webstorm needs consistent indentation for syntax highlighting
+# with the textmate bundle hack.
+[*.esdl]
+trim_trailing_whitespace = false
+
+# These are auto created and contain a hash of the content.
+# Removing whitespace counts as a hash change so avoid.
+[dbschema/migrations/*.edgeql]
+trim_trailing_whitespace = false

.eslintignore

@@ -1,2 +1,5 @@
 .yarn
 dist
+src/core/edgedb/generated-client
+src/core/edgedb/schema.ts
+src/**/*.edgeql.ts

.eslintrc.cjs

@@ -102,6 +102,17 @@ const namingConvention = [
     filter: '__typename',
     format: null,
   },
+  // allow exceptions for edgedb query builder
+  {
+    selector: 'objectLiteralProperty',
+    filter: 'filter_single',
+    format: null,
+  },
+  {
+    selector: 'objectLiteralProperty',
+    filter: 'order_by',
+    format: null,
+  },
   // Allow object literal keys to be anything if they are in quotes
   // Used mainly by cypher query builder
   {
@@ -173,6 +184,13 @@ const config = {
         '@typescript-eslint/method-signature-style': 'off',
       },
     },
+    {
+      files: './src/core/edgedb/generator/*.ts',
+      rules: {
+        // Scripts can use the console for logging
+        'no-console': 'off',
+      },
+    },
   ],
 };
 

.gitattributes

@@ -1,12 +1,3 @@
-# Hide yarn from GitHub's language detection & suppress in diffs
-/.yarn/** linguist-generated
-yarn.lock linguist-generated
-
 # Represent TS generated files as generated
 *.generated.tsx linguist-generated
 *.generated.ts linguist-generated
-
-# Represent postman files as generated
-*.postman_collection.json linguist-generated
-*.postman_environment.json linguist-generated
-*.postman_globals.json linguist-generated

.github/actions/edgedb-setup/action.yml

@@ -0,0 +1,14 @@
+name: Setup EdgeDB
+description: 'Setup EdgeDB server, migrate schema, generate TS files'
+runs:
+  using: composite
+  steps:
+    - name: Setup EdgeDB
+      uses: edgedb/setup-edgedb@v1
+
+    - run: edgedb migrate --dev-mode
+      shell: bash
+
+    - name: Generate EdgeDB TS files
+      shell: bash
+      run: yarn edgedb:gen

.github/actions/setup/action.yml

@@ -3,9 +3,9 @@ description: 'Setup Node.js and install dependencies with Yarn'
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 20
 
     - name: Yarn cache
       uses: actions/cache@v3
@@ -18,7 +18,7 @@ runs:
 
     - name: Install dependencies
       shell: bash
-      run: yarn install
+      run: corepack enable && yarn install
       env:
         YARN_ENABLE_GLOBAL_CACHE: 'false' # Use local cache folder to keep downloaded archives
         YARN_NM_MODE: 'hardlinks-local' # Hardlinks-(local|global) reduces io / node_modules size

.github/workflows/api-schema.yml

@@ -15,13 +15,16 @@ jobs:
       matrix:
         ref: [base, head]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.ref == 'base' && github.event.pull_request[matrix.ref].ref || '' }}
 
       - name: Node Setup & Yarn Install
         uses: ./.github/actions/setup
 
+      - name: EdgeDB Setup
+        uses: ./.github/actions/edgedb-setup
+
       - name: Generate GraphQL Schema
         run: yarn start -- --gen-schema
 
@@ -36,7 +39,7 @@ jobs:
     needs: [generate]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
         with:
@@ -56,7 +59,7 @@ jobs:
 
       - name: Enforce compatibility
         run: |
-          yarn dlx graphql-schema-diff \
+          corepack enable && yarn dlx graphql-schema-diff \
             --use-colors --fail-on-breaking-changes \
             ./base/schema.graphql ./head/schema.graphql
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'breaking change') }}

.github/workflows/edgedb.yml

@@ -0,0 +1,20 @@
+name: EdgeDB
+on:
+  pull_request:
+
+jobs:
+  Clean:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Node Setup & Yarn Install
+        uses: ./.github/actions/setup
+
+      - uses: edgedb/setup-edgedb@v1
+
+      - name: Schema Migrations In Sync
+        run: edgedb migration status
+
+      - name: Validate seed scripts are error free
+        run: yarn edgedb:seed
+        shell: bash

.github/workflows/lint.yml

@@ -11,10 +11,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Node Setup & Yarn Install
         uses: ./.github/actions/setup
 
+      - name: EdgeDB Setup
+        uses: ./.github/actions/edgedb-setup
+
       - name: Check for no duplicate dependencies
         run: yarn dedupe --check