Merge branch 'refs/heads/main' into deps/rs/rust-toolchains

# Conflicts: # libs/@local/harpc/net/src/session/server/transaction/test.rs
hashintel · Oct 22, 2024 · eb73c50 · eb73c50
2 parents bfb412f + 5a6596a
commit eb73c50
Show file tree

Hide file tree

Showing 66 changed files with 1,798 additions and 1,101 deletions.
diff --git a/.github/actions/warm-up-repo/action.yml b/.github/actions/warm-up-repo/action.yml
@@ -17,7 +17,7 @@ runs:
         # cache: yarn ## Currently disabled because of frequent timeouts
 
     - name: Install WASM tools
-      uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+      uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
       with:
         tool: [email protected]
 

diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -93,7 +93,7 @@ jobs:
 
       - name: Install Rust tools
         if: steps.benches.outputs.has-rust == 'true'
-        uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+        uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
         with:
           tool: [email protected],[email protected]
 
@@ -241,7 +241,7 @@ jobs:
 
       - name: Install Rust tools
         if: steps.benches.outputs.has-rust == 'true'
-        uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+        uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
         with:
           tool: [email protected],[email protected]
 
@@ -393,7 +393,7 @@ jobs:
           [[ ${{ needs.integration-benches.result }} =~ success|skipped ]]
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() && github.event_name == 'merge_group' }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -100,7 +100,7 @@ jobs:
           [[ ${{ needs.sourcemaps.result }} =~ success|skipped ]]
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() && github.event_name == 'merge_group' }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/.github/workflows/hash-backend-cd.yml b/.github/workflows/hash-backend-cd.yml
@@ -522,7 +522,7 @@ jobs:
     if: ${{ failure() }}
     steps:
       - name: Slack Notification
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         env:
           SLACK_LINK_NAMES: true
           SLACK_MESSAGE: "Error deploying the HASH backend <@U0143NL4GMP> <@U02NLJY0FGX>" # Notifies C & T

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -105,7 +105,7 @@ jobs:
 
       - name: Install Rust tools
         if: always() && steps.lints.outputs.has-rust == 'true'
-        uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+        uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
         with:
           tool: [email protected],[email protected],[email protected],[email protected]
 
@@ -342,7 +342,7 @@ jobs:
           [[ ${{ needs.global.result }} =~ success|skipped ]]
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() && github.event_name == 'merge_group' }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -145,7 +145,7 @@ jobs:
 
       - name: Install Rust tools
         if: always() && steps.tests.outputs.has-rust == 'true'
-        uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+        uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
         with:
           tool: [email protected],[email protected],[email protected],[email protected]
 
@@ -259,7 +259,7 @@ jobs:
 
       - name: Install Rust tools
         if: steps.tests.outputs.has-rust == 'true'
-        uses: taiki-e/install-action@a3df29458daa5c62abace1e6b358018bed57d5b4 # v2.44.43
+        uses: taiki-e/install-action@437c908c7e5ee18b63a261286cbe5147219f8a39 # v2.44.44
         with:
           tool: [email protected],[email protected],[email protected],[email protected]
 
@@ -436,7 +436,7 @@ jobs:
           [[ ${{ needs.publish.result }} =~ success|skipped ]]
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() && github.event_name == 'merge_group' }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/.github/workflows/tf-apply-hash.yml b/.github/workflows/tf-apply-hash.yml
@@ -63,7 +63,7 @@ jobs:
           env: ${{ matrix.env }}
 
       - name: Notify Slack on failure
-        uses: rtCamp/action-slack-notify@65e6fc1ce697e2df8149d9ae9909acc5ec5599ce
+        uses: rtCamp/action-slack-notify@3154c16259190ff5eb4675d8f012f8dc6ffbd77f
         if: ${{ failure() }}
         env:
           SLACK_LINK_NAMES: true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/hash-ai-worker-ts/package.json b/apps/hash-ai-worker-ts/package.json
@@ -103,7 +103,7 @@
     "@types/lodash.pickby": "4.6.9",
     "@types/md5": "2.3.5",
     "@types/mime-types": "2.1.4",
-    "@types/node": "20.16.12",
+    "@types/node": "20.16.13",
     "@types/papaparse": "5.3.15",
     "@types/sanitize-html": "2.13.0",
     "@vitest/coverage-istanbul": "2.1.2",

diff --git a/apps/hash-api/package.json b/apps/hash-api/package.json
@@ -24,11 +24,11 @@
   },
   "dependencies": {
     "@apps/hash-graph": "0.0.0-private",
-    "@aws-sdk/client-s3": "3.670.0",
-    "@aws-sdk/client-ses": "3.670.0",
-    "@aws-sdk/credential-provider-node": "3.670.0",
-    "@aws-sdk/s3-presigned-post": "3.670.0",
-    "@aws-sdk/s3-request-presigner": "3.670.0",
+    "@aws-sdk/client-s3": "3.675.0",
+    "@aws-sdk/client-ses": "3.675.0",
+    "@aws-sdk/credential-provider-node": "3.675.0",
+    "@aws-sdk/s3-presigned-post": "3.675.0",
+    "@aws-sdk/s3-request-presigner": "3.675.0",
     "@blockprotocol/core": "0.1.3",
     "@blockprotocol/type-system": "0.1.2-canary.0",
     "@graphql-tools/schema": "8.5.1",

diff --git a/apps/hash-frontend/package.json b/apps/hash-frontend/package.json
@@ -146,7 +146,7 @@
     "eslint": "8.57.0",
     "graphology-types": "0.24.7",
     "rimraf": "6.0.1",
-    "sass": "1.79.5",
+    "sass": "1.80.3",
     "typescript": "5.6.3",
     "webpack": "5.95.0"
   },

diff --git a/apps/hash-realtime/package.json b/apps/hash-realtime/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@local/eslint-config": "0.0.0-private",
     "@local/tsconfig": "0.0.0-private",
-    "@types/node": "20.16.12",
+    "@types/node": "20.16.13",
     "@types/set-interval-async": "1.0.3",
     "eslint": "8.57.0"
   }

diff --git a/apps/hash-search-loader/package.json b/apps/hash-search-loader/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@local/eslint-config": "0.0.0-private",
     "@local/tsconfig": "0.0.0-private",
-    "@types/node": "20.16.12",
+    "@types/node": "20.16.13",
     "eslint": "8.57.0"
   }
 }
diff --git a/apps/hashdotdev/package.json b/apps/hashdotdev/package.json
@@ -72,7 +72,7 @@
     "@types/gtag.js": "0.0.20",
     "@types/html-to-text": "9.0.4",
     "@types/md5": "2.3.5",
-    "@types/node": "20.16.12",
+    "@types/node": "20.16.13",
     "@types/prismjs": "1.26.4",
     "@types/react": "18.2.68",
     "@types/react-dom": "18.2.25",

diff --git a/apps/plugin-browser/package.json b/apps/plugin-browser/package.json
@@ -80,7 +80,7 @@
     "process": "0.11.10",
     "react-refresh": "0.14.0",
     "react-refresh-typescript": "2.0.9",
-    "sass": "1.79.5",
+    "sass": "1.80.3",
     "sass-loader": "13.3.3",
     "source-map-loader": "3.0.2",
     "style-loader": "3.3.4",
@@ -92,6 +92,6 @@
     "webpack": "5.95.0",
     "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.15.2",
-    "zip-webpack-plugin": "4.0.1"
+    "zip-webpack-plugin": "4.0.2"
   }
 }
diff --git a/libs/@blockprotocol/graph/package.json b/libs/@blockprotocol/graph/package.json
@@ -78,7 +78,7 @@
     "@local/eslint-config": "0.0.0-private",
     "@local/tsconfig": "0.0.0-private",
     "@types/lodash.isequal": "4.5.8",
-    "@types/node": "20.16.12",
+    "@types/node": "20.16.13",
     "@types/react": "18.2.68",
     "eslint": "8.57.0",
     "rimraf": "6.0.1"

diff --git a/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/mod.rs b/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/mod.rs
@@ -403,4 +403,106 @@ mod tests {
 
         assert_eq!(errors, actual_errors);
     }
+
+    #[test]
+    fn intersect_typed_any_of_single() {
+        check_schema_intersection(
+            [
+                json!({
+                    "anyOf": [
+                        {
+                            "type": "string",
+                            "minLength": 8,
+                            "description": "A string with a minimum length of 8 characters",
+                        },
+                        {
+                            "type": "number",
+                            "minimum": 0,
+                            "description": "A number greater than or equal to 0",
+                        },
+                    ]
+                }),
+                json!({
+                    "type": "string",
+                    "maxLength": 10,
+                }),
+            ],
+            [json!({
+                "anyOf": [
+                    {
+                        "type": "string",
+                        "minLength": 8,
+                        "maxLength": 10,
+                        "description": "A string with a minimum length of 8 characters",
+                    }
+                ]
+            })],
+        );
+    }
+
+    #[test]
+    fn intersect_typed_any_of_multi() {
+        check_schema_intersection(
+            [
+                json!({
+                    "type": "string",
+                    "maxLength": 10,
+                }),
+                json!({
+                    "anyOf": [
+                        {
+                            "type": "string",
+                            "minLength": 8,
+                        },
+                        {
+                            "type": "string",
+                            "maxLength": 25,
+                        },
+                    ]
+                }),
+            ],
+            [json!({
+                "anyOf": [
+                    {
+                        "type": "string",
+                        "minLength": 8,
+                        "maxLength": 10,
+                    },
+                    {
+                        "type": "string",
+                        "maxLength": 10,
+                    },
+                ]
+            })],
+        );
+
+        check_schema_intersection(
+            [
+                json!({
+                    "type": "string",
+                    "maxLength": 10,
+                }),
+                json!({
+                    "anyOf": [
+                        {
+                            "type": "string",
+                            "minLength": 8,
+                        },
+                        {
+                            "type": "string",
+                            "maxLength": 25,
+                        },
+                    ]
+                }),
+                json!({
+                    "type": "string",
+                    "maxLength": 5,
+                }),
+            ],
+            [json!({
+                "type": "string",
+                "maxLength": 5,
+            })],
+        );
+    }
 }