diff --git a/Cargo.lock b/Cargo.lock index 733e73731c4..6396a99ac39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3624,7 +3624,6 @@ dependencies = [ "hash-graph-postgres-store", "hash-graph-store", "hash-graph-temporal-versioning", - "hash-graph-type-defs", "hash-graph-type-fetcher", "hash-graph-types", "hash-graph-validation", @@ -3957,16 +3956,6 @@ dependencies = [ "xxhash-rust", ] -[[package]] -name = "hash-graph-type-defs" -version = "0.0.0" -dependencies = [ - "hash-status", - "serde", - "serde_json", - "simple-mermaid", -] - [[package]] name = "hash-graph-type-fetcher" version = "0.0.0" diff --git a/Cargo.toml b/Cargo.toml index c911ddc4cb2..bb7b1fabd25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ "libs/@local/codec/rust", "libs/@local/codegen", "libs/@local/config", - "libs/@local/effect-dns/hickory", + "libs/@local/effect-dns/hickory/rust", "libs/@local/graph/api", "libs/@local/graph/authentication/", "libs/@local/graph/authorization/rust", @@ -21,7 +21,6 @@ members = [ "libs/@local/graph/postgres-store", "libs/@local/graph/store/rust", "libs/@local/graph/temporal-versioning", - "libs/@local/graph/type-defs", "libs/@local/graph/type-fetcher", "libs/@local/graph/types", "libs/@local/graph/validation", @@ -88,7 +87,6 @@ hash-graph-postgres-store.path = "libs/@local/graph/postgres-store" hash-graph-store.path = "libs/@local/graph/store/rust" hash-graph-temporal-versioning.path = "libs/@local/graph/temporal-versioning" hash-graph-test-data.path = "tests/graph/test-data/rust" -hash-graph-type-defs.path = "libs/@local/graph/type-defs" hash-graph-type-fetcher.path = "libs/@local/graph/type-fetcher" hash-graph-types.path = "libs/@local/graph/types" hash-graph-validation.path = "libs/@local/graph/validation" diff --git a/apps/hash-graph/docs/dependency-diagram.mmd b/apps/hash-graph/docs/dependency-diagram.mmd index dede0f25034..e440fe318e1 100644 --- a/apps/hash-graph/docs/dependency-diagram.mmd +++ b/apps/hash-graph/docs/dependency-diagram.mmd @@ -22,101 +22,98 @@ graph TD 10[hash-graph-postgres-store] 11[hash-graph-store] 12[hash-graph-temporal-versioning] - 13[hash-graph-type-defs] - 14[hash-graph-type-fetcher] - 15[hash-graph-types] - 16[hash-graph-validation] - 17[harpc-client] - 18[harpc-codec] - 19[harpc-net] - 20[harpc-server] - 21[harpc-system] - 22[harpc-tower] - 23[harpc-types] - 24[harpc-wire-protocol] - 25[hashql-ast] - 26[hashql-compiletest] - 27[hashql-core] - 28[hashql-diagnostics] - 29[hashql-eval] - 30[hashql-hir] - 31[hashql-macros] - 32[hashql-mir] - 33[hashql-syntax-jexpr] - 34[hash-middleware] - 35[hash-status] - 36[hash-telemetry] - 37[hash-temporal-client] - 38[darwin-kperf] - 39[darwin-kperf-criterion] - 40[darwin-kperf-events] - 41[darwin-kperf-sys] - 42[error-stack] - 43[hash-graph-test-data] + 13[hash-graph-type-fetcher] + 14[hash-graph-types] + 15[hash-graph-validation] + 16[harpc-client] + 17[harpc-codec] + 18[harpc-net] + 19[harpc-server] + 20[harpc-system] + 21[harpc-tower] + 22[harpc-types] + 23[harpc-wire-protocol] + 24[hashql-ast] + 25[hashql-compiletest] + 26[hashql-core] + 27[hashql-diagnostics] + 28[hashql-eval] + 29[hashql-hir] + 30[hashql-macros] + 31[hashql-mir] + 32[hashql-syntax-jexpr] + 33[hash-middleware] + 34[hash-status] + 35[hash-telemetry] + 36[hash-temporal-client] + 37[darwin-kperf] + 38[darwin-kperf-criterion] + 39[darwin-kperf-events] + 40[darwin-kperf-sys] + 41[error-stack] + 42[hash-graph-test-data] 0 --> 4 1 --> 12 - 1 -.-> 43 + 1 -.-> 42 2 -.-> 3 - 2 --> 24 + 2 --> 23 4 -.-> 5 4 --> 5 4 --> 13 - 4 --> 14 - 4 --> 20 - 4 --> 29 - 4 --> 33 + 4 --> 19 + 4 --> 28 + 4 --> 32 5 --> 11 - 5 -.-> 34 - 5 --> 34 + 5 -.-> 33 + 5 --> 33 6 --> 1 - 7 --> 15 - 7 -.-> 39 + 7 --> 14 + 7 -.-> 38 8 --> 9 - 8 --> 36 + 8 --> 35 10 --> 7 10 --> 8 10 -.-> 10 - 10 --> 16 - 10 --> 35 + 10 --> 15 + 10 --> 34 11 --> 6 - 11 --> 15 - 11 --> 37 + 11 --> 14 + 11 --> 36 12 --> 2 - 13 --> 35 - 14 --> 11 - 15 -.-> 43 - 16 -.-> 43 - 17 --> 21 - 18 --> 23 - 18 --> 42 - 19 --> 2 - 19 -.-> 18 - 19 --> 18 - 20 -.-> 1 - 20 -.-> 17 - 21 --> 22 - 22 -.-> 19 - 22 --> 19 - 24 -.-> 23 - 24 --> 23 - 24 --> 42 - 25 -.-> 26 - 26 --> 29 - 26 --> 33 - 27 --> 2 - 27 --> 28 - 27 --> 31 - 27 -.-> 39 - 29 --> 10 - 29 --> 32 - 30 -.-> 26 - 32 --> 30 - 33 --> 25 - 33 --> 27 - 34 --> 1 - 36 --> 42 - 37 --> 1 - 38 --> 40 - 38 --> 41 - 39 --> 38 - 43 --> 11 + 13 --> 11 + 14 -.-> 42 + 15 -.-> 42 + 16 --> 20 + 17 --> 22 + 17 --> 41 + 18 --> 2 + 18 -.-> 17 + 18 --> 17 + 19 -.-> 1 + 19 -.-> 16 + 20 --> 21 + 21 -.-> 18 + 21 --> 18 + 23 -.-> 22 + 23 --> 22 + 23 --> 41 + 24 -.-> 25 + 25 --> 28 + 25 --> 32 + 26 --> 2 + 26 --> 27 + 26 --> 30 + 26 -.-> 38 + 28 --> 10 + 28 --> 31 + 29 -.-> 25 + 31 --> 29 + 32 --> 24 + 32 --> 26 + 33 --> 1 + 35 --> 41 + 36 --> 1 + 37 --> 39 + 37 --> 40 + 38 --> 37 + 42 --> 11 diff --git a/libs/@local/effect-dns/hickory/.cargo/config.toml b/libs/@local/effect-dns/hickory/rust/.cargo/config.toml similarity index 100% rename from libs/@local/effect-dns/hickory/.cargo/config.toml rename to libs/@local/effect-dns/hickory/rust/.cargo/config.toml diff --git a/libs/@local/effect-dns/hickory/Cargo.toml b/libs/@local/effect-dns/hickory/rust/Cargo.toml similarity index 76% rename from libs/@local/effect-dns/hickory/Cargo.toml rename to libs/@local/effect-dns/hickory/rust/Cargo.toml index d45a7a7af2c..3e11052f32f 100644 --- a/libs/@local/effect-dns/hickory/Cargo.toml +++ b/libs/@local/effect-dns/hickory/rust/Cargo.toml @@ -27,11 +27,3 @@ napi-build = { workspace = true } [lints] workspace = true - - -[package.metadata.sync.turborepo] -package-name = "@local/effect-dns-hickory" -extra-dev-dependencies = [ - { name = "@local/eslint", version = "workspace:*" }, - { name = "@local/tsconfig", version = "workspace:*" }, -] diff --git a/libs/@local/effect-dns/hickory/LICENSE-APACHE.md b/libs/@local/effect-dns/hickory/rust/LICENSE-APACHE.md similarity index 100% rename from libs/@local/effect-dns/hickory/LICENSE-APACHE.md rename to libs/@local/effect-dns/hickory/rust/LICENSE-APACHE.md diff --git a/libs/@local/effect-dns/hickory/LICENSE-MIT.md b/libs/@local/effect-dns/hickory/rust/LICENSE-MIT.md similarity index 100% rename from libs/@local/effect-dns/hickory/LICENSE-MIT.md rename to libs/@local/effect-dns/hickory/rust/LICENSE-MIT.md diff --git a/libs/@local/effect-dns/hickory/LICENSE.md b/libs/@local/effect-dns/hickory/rust/LICENSE.md similarity index 100% rename from libs/@local/effect-dns/hickory/LICENSE.md rename to libs/@local/effect-dns/hickory/rust/LICENSE.md diff --git a/libs/@local/effect-dns/hickory/README.md b/libs/@local/effect-dns/hickory/rust/README.md similarity index 100% rename from libs/@local/effect-dns/hickory/README.md rename to libs/@local/effect-dns/hickory/rust/README.md diff --git a/libs/@local/effect-dns/hickory/build.rs b/libs/@local/effect-dns/hickory/rust/build.rs similarity index 100% rename from libs/@local/effect-dns/hickory/build.rs rename to libs/@local/effect-dns/hickory/rust/build.rs diff --git a/libs/@local/effect-dns/hickory/docs/dependency-diagram.mmd b/libs/@local/effect-dns/hickory/rust/docs/dependency-diagram.mmd similarity index 100% rename from libs/@local/effect-dns/hickory/docs/dependency-diagram.mmd rename to libs/@local/effect-dns/hickory/rust/docs/dependency-diagram.mmd diff --git a/libs/@local/effect-dns/hickory/rust/package.json b/libs/@local/effect-dns/hickory/rust/package.json new file mode 100644 index 00000000000..1e6fc37b6d1 --- /dev/null +++ b/libs/@local/effect-dns/hickory/rust/package.json @@ -0,0 +1,12 @@ +{ + "name": "@rust/effect-dns-hickory", + "version": "0.0.0-private", + "private": true, + "description": "Hickory DNS implementation of DNS effect library", + "license": "MIT OR Apache-2.0", + "scripts": { + "doc:dependency-diagram": "cargo run -p hash-repo-chores -- dependency-diagram --output docs/dependency-diagram.mmd --root effect-dns-hickory --root-deps-and-dependents --link-mode non-roots --include-dev-deps --include-build-deps --logging-console-level info", + "fix:clippy": "just clippy --fix", + "lint:clippy": "just clippy" + } +} diff --git a/libs/@local/effect-dns/hickory/src/lib.rs b/libs/@local/effect-dns/hickory/rust/src/lib.rs similarity index 100% rename from libs/@local/effect-dns/hickory/src/lib.rs rename to libs/@local/effect-dns/hickory/rust/src/lib.rs diff --git a/libs/@local/effect-dns/hickory/typescript/LICENSE-APACHE.md b/libs/@local/effect-dns/hickory/typescript/LICENSE-APACHE.md new file mode 100644 index 00000000000..1d1b6f8da4d --- /dev/null +++ b/libs/@local/effect-dns/hickory/typescript/LICENSE-APACHE.md @@ -0,0 +1,189 @@ +# Apache License + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +- **(a)** You must give any other recipients of the Work or Derivative Works a copy of + this License; and +- **(b)** You must cause any modified files to carry prominent notices stating that You + changed the files; and +- **(c)** You must retain, in the Source form of any Derivative Works that You distribute, + all copyright, patent, trademark, and attribution notices from the Source form + of the Work, excluding those notices that do not pertain to any part of the + Derivative Works; and +- **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any + Derivative Works that You distribute must include a readable copy of the + attribution notices contained within such NOTICE file, excluding those notices + that do not pertain to any part of the Derivative Works, in at least one of the + following places: within a NOTICE text file distributed as part of the + Derivative Works; within the Source form or documentation, if provided along + with the Derivative Works; or, within a display generated by the Derivative + Works, if and wherever such third-party notices normally appear. The contents of + the NOTICE file are for informational purposes only and do not modify the + License. You may add Your own attribution notices within Derivative Works that + You distribute, alongside or as an addendum to the NOTICE text from the Work, + provided that such additional attribution notices cannot be construed as + modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: Apply the Apache License to a specific file + +To apply the Apache License to an individual file, attach the following notice. +The text should be enclosed in the appropriate comment syntax for the file +format. + + Copyright © 2022–, HASH + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/libs/@local/effect-dns/hickory/typescript/LICENSE-MIT.md b/libs/@local/effect-dns/hickory/typescript/LICENSE-MIT.md new file mode 100644 index 00000000000..e33c1d34b0e --- /dev/null +++ b/libs/@local/effect-dns/hickory/typescript/LICENSE-MIT.md @@ -0,0 +1,21 @@ +# MIT License + +Copyright © 2022–, HASH + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libs/@local/effect-dns/hickory/typescript/LICENSE.md b/libs/@local/effect-dns/hickory/typescript/LICENSE.md new file mode 100644 index 00000000000..8b31346dd55 --- /dev/null +++ b/libs/@local/effect-dns/hickory/typescript/LICENSE.md @@ -0,0 +1,5 @@ +# License + +Licensed under either of the [Apache License, Version 2.0](LICENSE-APACHE.md) or [MIT license](LICENSE-MIT.md) at your option. + +For more information about contributing to this crate, see our top-level [CONTRIBUTING](https://github.com/hashintel/hash/blob/main/.github/CONTRIBUTING.md) policy. diff --git a/libs/@local/effect-dns/hickory/eslint.config.js b/libs/@local/effect-dns/hickory/typescript/eslint.config.js similarity index 100% rename from libs/@local/effect-dns/hickory/eslint.config.js rename to libs/@local/effect-dns/hickory/typescript/eslint.config.js diff --git a/libs/@local/effect-dns/hickory/package.json b/libs/@local/effect-dns/hickory/typescript/package.json similarity index 72% rename from libs/@local/effect-dns/hickory/package.json rename to libs/@local/effect-dns/hickory/typescript/package.json index 336c41bfbd9..e4a017eb092 100644 --- a/libs/@local/effect-dns/hickory/package.json +++ b/libs/@local/effect-dns/hickory/typescript/package.json @@ -9,9 +9,8 @@ "types": "dist/index.d.ts", "scripts": { "build": "rimraf dist && yarn build:release && tsc --build tsconfig.build.json", - "build:debug": "napi build --platform --js=impl.js --dts=impl.d.ts -o dist", - "build:release": "napi build --platform --release --js=impl.js --dts=impl.d.ts -o dist", - "doc:dependency-diagram": "cargo run -p hash-repo-chores -- dependency-diagram --output docs/dependency-diagram.mmd --root effect-dns-hickory --root-deps-and-dependents --link-mode non-roots --include-dev-deps --include-build-deps --logging-console-level info", + "build:debug": "napi build --platform --manifest-path ../rust/Cargo.toml --js=impl.js --dts=impl.d.ts -o dist", + "build:release": "napi build --platform --release --manifest-path ../rust/Cargo.toml --js=impl.js --dts=impl.d.ts -o dist", "fix:eslint": "eslint --fix .", "lint:eslint": "eslint --report-unused-disable-directives .", "lint:tsc": "tsc --noEmit", @@ -21,6 +20,7 @@ "devDependencies": { "@local/eslint": "workspace:*", "@local/tsconfig": "workspace:*", + "@rust/effect-dns-hickory": "workspace:*", "@vitest/coverage-istanbul": "4.1.10", "eslint": "9.39.4", "rimraf": "6.1.3", diff --git a/libs/@local/effect-dns/hickory/src/index.ts b/libs/@local/effect-dns/hickory/typescript/src/index.ts similarity index 100% rename from libs/@local/effect-dns/hickory/src/index.ts rename to libs/@local/effect-dns/hickory/typescript/src/index.ts diff --git a/libs/@local/effect-dns/hickory/tests/dummy.test.ts b/libs/@local/effect-dns/hickory/typescript/tests/dummy.test.ts similarity index 100% rename from libs/@local/effect-dns/hickory/tests/dummy.test.ts rename to libs/@local/effect-dns/hickory/typescript/tests/dummy.test.ts diff --git a/libs/@local/effect-dns/hickory/tsconfig.build.json b/libs/@local/effect-dns/hickory/typescript/tsconfig.build.json similarity index 100% rename from libs/@local/effect-dns/hickory/tsconfig.build.json rename to libs/@local/effect-dns/hickory/typescript/tsconfig.build.json diff --git a/libs/@local/effect-dns/hickory/tsconfig.json b/libs/@local/effect-dns/hickory/typescript/tsconfig.json similarity index 100% rename from libs/@local/effect-dns/hickory/tsconfig.json rename to libs/@local/effect-dns/hickory/typescript/tsconfig.json diff --git a/libs/@local/effect-dns/hickory/turbo.json b/libs/@local/effect-dns/hickory/typescript/turbo.json similarity index 100% rename from libs/@local/effect-dns/hickory/turbo.json rename to libs/@local/effect-dns/hickory/typescript/turbo.json diff --git a/libs/@local/effect-dns/hickory/vitest.config.ts b/libs/@local/effect-dns/hickory/typescript/vitest.config.ts similarity index 100% rename from libs/@local/effect-dns/hickory/vitest.config.ts rename to libs/@local/effect-dns/hickory/typescript/vitest.config.ts diff --git a/libs/@local/graph/api/Cargo.toml b/libs/@local/graph/api/Cargo.toml index e630d3126bc..d36c6ccd2c7 100644 --- a/libs/@local/graph/api/Cargo.toml +++ b/libs/@local/graph/api/Cargo.toml @@ -44,7 +44,6 @@ harpc-types = { workspace = true } hash-codec = { workspace = true, features = ["numeric", "utoipa"] } hash-graph-store = { workspace = true, features = ["utoipa"] } hash-graph-temporal-versioning = { workspace = true } -hash-graph-type-defs = { workspace = true } hash-graph-validation = { workspace = true } hashql-ast = { workspace = true } hashql-diagnostics = { workspace = true, features = ["serde", "render"] } diff --git a/libs/@local/graph/api/docs/dependency-diagram.mmd b/libs/@local/graph/api/docs/dependency-diagram.mmd index 8e9ec90f286..485e99a1094 100644 --- a/libs/@local/graph/api/docs/dependency-diagram.mmd +++ b/libs/@local/graph/api/docs/dependency-diagram.mmd @@ -22,103 +22,100 @@ graph TD 10[hash-graph-postgres-store] 11[hash-graph-store] 12[hash-graph-temporal-versioning] - 13[hash-graph-type-defs] - 14[hash-graph-type-fetcher] - 15[hash-graph-types] - 16[hash-graph-validation] - 17[harpc-client] - 18[harpc-codec] - 19[harpc-net] - 20[harpc-server] - 21[harpc-system] - 22[harpc-tower] - 23[harpc-types] - 24[harpc-wire-protocol] - 25[hashql-ast] - 26[hashql-compiletest] - 27[hashql-core] - 28[hashql-diagnostics] - 29[hashql-eval] - 30[hashql-hir] - 31[hashql-macros] - 32[hashql-mir] - 33[hashql-syntax-jexpr] - 34[hash-middleware] - 35[hash-status] - 36[hash-telemetry] - 37[hash-temporal-client] - 38[darwin-kperf] - 39[darwin-kperf-criterion] - 40[darwin-kperf-events] - 41[darwin-kperf-sys] - 42[error-stack] - 43[hash-graph-benches] - 44[hash-graph-test-data] + 13[hash-graph-type-fetcher] + 14[hash-graph-types] + 15[hash-graph-validation] + 16[harpc-client] + 17[harpc-codec] + 18[harpc-net] + 19[harpc-server] + 20[harpc-system] + 21[harpc-tower] + 22[harpc-types] + 23[harpc-wire-protocol] + 24[hashql-ast] + 25[hashql-compiletest] + 26[hashql-core] + 27[hashql-diagnostics] + 28[hashql-eval] + 29[hashql-hir] + 30[hashql-macros] + 31[hashql-mir] + 32[hashql-syntax-jexpr] + 33[hash-middleware] + 34[hash-status] + 35[hash-telemetry] + 36[hash-temporal-client] + 37[darwin-kperf] + 38[darwin-kperf-criterion] + 39[darwin-kperf-events] + 40[darwin-kperf-sys] + 41[error-stack] + 42[hash-graph-benches] + 43[hash-graph-test-data] 0 --> 4 1 --> 12 - 1 -.-> 44 + 1 -.-> 43 2 -.-> 3 - 2 --> 24 + 2 --> 23 4 -.-> 5 4 --> 5 4 --> 13 - 4 --> 14 - 4 --> 20 - 4 --> 29 - 4 --> 33 + 4 --> 19 + 4 --> 28 + 4 --> 32 5 --> 11 - 5 -.-> 34 - 5 --> 34 + 5 -.-> 33 + 5 --> 33 6 --> 1 - 7 --> 15 - 7 -.-> 39 + 7 --> 14 + 7 -.-> 38 8 --> 9 - 8 --> 36 + 8 --> 35 10 --> 7 10 --> 8 10 -.-> 10 - 10 --> 16 - 10 --> 35 + 10 --> 15 + 10 --> 34 11 --> 6 - 11 --> 15 - 11 --> 37 + 11 --> 14 + 11 --> 36 12 --> 2 - 13 --> 35 - 14 --> 11 - 15 -.-> 44 - 16 -.-> 44 - 17 --> 21 - 18 --> 23 - 18 --> 42 - 19 --> 2 - 19 -.-> 18 - 19 --> 18 - 20 -.-> 1 - 20 -.-> 17 - 21 --> 22 - 22 -.-> 19 - 22 --> 19 - 24 -.-> 23 - 24 --> 23 - 24 --> 42 - 25 -.-> 26 - 26 --> 29 - 26 --> 33 - 27 --> 2 - 27 --> 28 - 27 --> 31 - 27 -.-> 39 - 29 --> 10 - 29 --> 32 - 30 -.-> 26 - 32 --> 30 - 33 --> 25 - 33 --> 27 - 34 --> 1 - 36 --> 42 - 37 --> 1 - 38 --> 40 - 38 --> 41 - 39 --> 38 - 43 -.-> 4 - 44 --> 11 + 13 --> 11 + 14 -.-> 43 + 15 -.-> 43 + 16 --> 20 + 17 --> 22 + 17 --> 41 + 18 --> 2 + 18 -.-> 17 + 18 --> 17 + 19 -.-> 1 + 19 -.-> 16 + 20 --> 21 + 21 -.-> 18 + 21 --> 18 + 23 -.-> 22 + 23 --> 22 + 23 --> 41 + 24 -.-> 25 + 25 --> 28 + 25 --> 32 + 26 --> 2 + 26 --> 27 + 26 --> 30 + 26 -.-> 38 + 28 --> 10 + 28 --> 31 + 29 -.-> 25 + 31 --> 29 + 32 --> 24 + 32 --> 26 + 33 --> 1 + 35 --> 41 + 36 --> 1 + 37 --> 39 + 37 --> 40 + 38 --> 37 + 42 -.-> 4 + 43 --> 11 diff --git a/libs/@local/graph/api/openapi/models/status.json b/libs/@local/graph/api/openapi/models/status.json index 70278ac5926..5bb26e24f1b 100644 --- a/libs/@local/graph/api/openapi/models/status.json +++ b/libs/@local/graph/api/openapi/models/status.json @@ -13,17 +13,7 @@ "contents": { "type": "array", "items": { - "oneOf": [ - { - "$ref": "./status_definitions.json#/definitions/ErrorInfo" - }, - { - "$ref": "./status_definitions.json#/definitions/RequestInfo" - }, - { - "$ref": "./status_definitions.json#/definitions/ResourceInfo" - } - ] + "$ref": "./status_definitions.json#/definitions/ErrorInfo" } } }, diff --git a/libs/@local/graph/api/openapi/models/status_definitions.json b/libs/@local/graph/api/openapi/models/status_definitions.json index 0a5deff52d0..48b23f35a8a 100644 --- a/libs/@local/graph/api/openapi/models/status_definitions.json +++ b/libs/@local/graph/api/openapi/models/status_definitions.json @@ -45,48 +45,6 @@ }, "required": ["domain", "metadata", "reason"] }, - "RequestInfo": { - "type": "object", - "properties": { - "requestId": { - "description": "An opaque string that should only be interpreted by the service generating it. For example, it\ncan be used to identify requests in the service's logs.", - "type": "string", - "title": "requestId" - }, - "servingData": { - "description": "Any data that was used to serve this request. For example, an encrypted stack trace that can be\nsent back to the service provider for debugging.", - "type": "string", - "title": "servingData" - } - }, - "required": ["requestId", "servingData"] - }, - "ResourceInfo": { - "type": "object", - "properties": { - "resourceType": { - "description": "A name for the type of resource being accessed.\n\nFor example \"SQL table\", \"Entity\", \"Property Type\", \"Redis\"; or the type URL of the resource:\ne.g. \"https://blockprotocol.org/type-system/0.3/schema/meta/entity-type\".", - "type": "string", - "title": "resourceType" - }, - "resourceName": { - "description": "The name of the resource being accessed.\n\nFor example, an ontology type ID: `https://hash.ai/@alice/types/entity-type/Person/`, if the current\nerror is [@local/status/StatusCode.PermissionDenied].", - "type": "string", - "title": "resourceName" - }, - "owner": { - "description": "The owner of the resource (optional).\n\nFor example, a User's entity ID: `2cfa262a-f49a-4a61-a9c5-80a0c5959994%45e528cb-801d-49d1-8f71-d9e2af38a5e7`;", - "type": "string", - "title": "owner" - }, - "description": { - "description": "Describes what error is encountered when accessing this resource.\n\nFor example, updating a property on a user's entity may require write permission on that property.", - "type": "string", - "title": "description" - } - }, - "required": ["description", "resourceName", "resourceType"] - }, "ErrorInfoMetadata": { "description": "Construct a type with a set of properties K of type T", "title": "Record", diff --git a/libs/@local/graph/api/package.json b/libs/@local/graph/api/package.json index b4fa193046d..62972b710ea 100644 --- a/libs/@local/graph/api/package.json +++ b/libs/@local/graph/api/package.json @@ -27,7 +27,6 @@ "@rust/hash-graph-postgres-store": "workspace:*", "@rust/hash-graph-store": "workspace:*", "@rust/hash-graph-temporal-versioning": "workspace:*", - "@rust/hash-graph-type-defs": "workspace:*", "@rust/hash-graph-type-fetcher": "workspace:*", "@rust/hash-graph-types": "workspace:*", "@rust/hash-graph-validation": "workspace:*", diff --git a/libs/@local/graph/api/src/rest/entity_type.rs b/libs/@local/graph/api/src/rest/entity_type.rs index 07177880c37..adee4b5ab89 100644 --- a/libs/@local/graph/api/src/rest/entity_type.rs +++ b/libs/@local/graph/api/src/rest/entity_type.rs @@ -28,7 +28,6 @@ use hash_graph_store::{ pool::StorePool, query::ConflictBehavior, }; -use hash_graph_type_defs::error::{ErrorInfo, Status, StatusPayloadInfo}; use hash_graph_types::{Embedding, ontology::EntityTypeEmbedding}; use hash_map::HashMap; use hash_temporal_client::TemporalClient; @@ -46,7 +45,7 @@ use type_system::{ }; use utoipa::{OpenApi, ToSchema}; -use super::status::BoxedResponse; +use super::status::{BoxedResponse, ErrorInfo, Status}; use crate::rest::{ ApiConfig, AuthenticatedActorId, OpenApiQuery, QueryLogger, RestApiStore, SearchRequestError, json::Json, @@ -223,7 +222,7 @@ where including request details and logs." .to_owned(), ), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( // TODO: add information from the report here // see https://linear.app/hash/issue/H-3009 HashMap::new(), @@ -232,7 +231,7 @@ where // `ErrorReason::to_reason` or perhaps as a big enum, or // as an attachment "STORE_ACQUISITION_FAILURE".to_owned(), - ))], + )], )) })?; @@ -252,7 +251,7 @@ where sure the service is able to host a type under the domain you supplied?" .to_owned(), ), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( HashMap::from([( "entityTypeId".to_owned(), serde_json::to_value(&schema.id) @@ -262,7 +261,7 @@ where // requiring top level contexts to implement a trait // `ErrorReason::to_reason` or perhaps as a big enum "INVALID_TYPE_ID".to_owned(), - ))], + )], )) })?; @@ -324,14 +323,14 @@ where you intended to call `updateEntityType` instead?" .to_owned(), ), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( metadata, // TODO: We should encapsulate these Reasons within the type system, // perhaps requiring top level contexts to implement a trait // `ErrorReason::to_reason` or perhaps as a big enum, or as an // attachment "BASE_URI_ALREADY_EXISTS".to_owned(), - ))], + )], )); } @@ -343,13 +342,13 @@ where whatever information you can provide including request details and logs." .to_owned(), ), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( HashMap::new(), // TODO: We should encapsulate these Reasons within the type system, perhaps // requiring top level contexts to implement a trait // `ErrorReason::to_reason` or perhaps as a big enum, or as an attachment "INTERNAL".to_owned(), - ))], + )], )) })?; @@ -416,7 +415,7 @@ where including request details and logs." .to_owned(), ), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( // TODO: add information from the report here // see https://linear.app/hash/issue/H-3009 HashMap::new(), @@ -425,7 +424,7 @@ where // `ErrorReason::to_reason` or perhaps as a big enum, // or as an attachment "STORE_ACQUISITION_FAILURE".to_owned(), - ))], + )], )) })?; diff --git a/libs/@local/graph/api/src/rest/json.rs b/libs/@local/graph/api/src/rest/json.rs index 39b67fc45f5..a27f5beb743 100644 --- a/libs/@local/graph/api/src/rest/json.rs +++ b/libs/@local/graph/api/src/rest/json.rs @@ -11,12 +11,11 @@ use axum::{ response::{IntoResponse, Response}, }; use bytes::{BufMut as _, BytesMut}; -use hash_graph_type_defs::error::{ErrorInfo, Status, StatusPayloadInfo}; use hash_status::StatusCode; use serde::{Serialize, de::DeserializeOwned}; use serde_json::error::Category; -use super::status::BoxedResponse; +use super::status::{BoxedResponse, ErrorInfo, Status}; use crate::rest::status::status_to_response; #[derive(Debug, Clone, Copy, Default)] @@ -38,14 +37,14 @@ where status_to_response(Status::new( StatusCode::InvalidArgument, Some("Failed to buffer body of request".to_owned()), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( HashMap::from([( "bufferError".to_owned(), serde_json::to_value(err.to_string()) .expect("Failed to convert string to serde_json::Value"), )]), "UNKNOWN".to_owned(), - ))], + )], )) })?; @@ -74,14 +73,14 @@ where return Err(status_to_response(Status::new( StatusCode::InvalidArgument, Some(message), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( HashMap::from([( "deserializationError".to_owned(), serde_json::to_value(err.to_string()) .expect("Failed to convert string to serde_json::Value"), )]), reason, - ))], + )], ))); } }; @@ -140,14 +139,14 @@ where Err(err) => status_to_response(Status::new( StatusCode::Internal, Some("Failed to serialize response".to_owned()), - vec![StatusPayloadInfo::Error(ErrorInfo::new( + vec![ErrorInfo::new( HashMap::from([( "serializationError".to_owned(), serde_json::to_value(err.to_string()) .expect("Failed to convert string to serde_json::Value"), )]), "UNKNOWN".to_owned(), - ))], + )], )) .into_response(), } diff --git a/libs/@local/graph/api/src/rest/json_schemas/status.json b/libs/@local/graph/api/src/rest/json_schemas/status.json index 70278ac5926..5bb26e24f1b 100644 --- a/libs/@local/graph/api/src/rest/json_schemas/status.json +++ b/libs/@local/graph/api/src/rest/json_schemas/status.json @@ -13,17 +13,7 @@ "contents": { "type": "array", "items": { - "oneOf": [ - { - "$ref": "./status_definitions.json#/definitions/ErrorInfo" - }, - { - "$ref": "./status_definitions.json#/definitions/RequestInfo" - }, - { - "$ref": "./status_definitions.json#/definitions/ResourceInfo" - } - ] + "$ref": "./status_definitions.json#/definitions/ErrorInfo" } } }, diff --git a/libs/@local/graph/api/src/rest/json_schemas/status_definitions.json b/libs/@local/graph/api/src/rest/json_schemas/status_definitions.json index 0a5deff52d0..48b23f35a8a 100644 --- a/libs/@local/graph/api/src/rest/json_schemas/status_definitions.json +++ b/libs/@local/graph/api/src/rest/json_schemas/status_definitions.json @@ -45,48 +45,6 @@ }, "required": ["domain", "metadata", "reason"] }, - "RequestInfo": { - "type": "object", - "properties": { - "requestId": { - "description": "An opaque string that should only be interpreted by the service generating it. For example, it\ncan be used to identify requests in the service's logs.", - "type": "string", - "title": "requestId" - }, - "servingData": { - "description": "Any data that was used to serve this request. For example, an encrypted stack trace that can be\nsent back to the service provider for debugging.", - "type": "string", - "title": "servingData" - } - }, - "required": ["requestId", "servingData"] - }, - "ResourceInfo": { - "type": "object", - "properties": { - "resourceType": { - "description": "A name for the type of resource being accessed.\n\nFor example \"SQL table\", \"Entity\", \"Property Type\", \"Redis\"; or the type URL of the resource:\ne.g. \"https://blockprotocol.org/type-system/0.3/schema/meta/entity-type\".", - "type": "string", - "title": "resourceType" - }, - "resourceName": { - "description": "The name of the resource being accessed.\n\nFor example, an ontology type ID: `https://hash.ai/@alice/types/entity-type/Person/`, if the current\nerror is [@local/status/StatusCode.PermissionDenied].", - "type": "string", - "title": "resourceName" - }, - "owner": { - "description": "The owner of the resource (optional).\n\nFor example, a User's entity ID: `2cfa262a-f49a-4a61-a9c5-80a0c5959994%45e528cb-801d-49d1-8f71-d9e2af38a5e7`;", - "type": "string", - "title": "owner" - }, - "description": { - "description": "Describes what error is encountered when accessing this resource.\n\nFor example, updating a property on a user's entity may require write permission on that property.", - "type": "string", - "title": "description" - } - }, - "required": ["description", "resourceName", "resourceType"] - }, "ErrorInfoMetadata": { "description": "Construct a type with a set of properties K of type T", "title": "Record", diff --git a/libs/@local/graph/api/src/rest/status.rs b/libs/@local/graph/api/src/rest/status.rs index e975af81a92..4668e76a388 100644 --- a/libs/@local/graph/api/src/rest/status.rs +++ b/libs/@local/graph/api/src/rest/status.rs @@ -1,3 +1,9 @@ +//! The status payloads the REST API answers with, and their conversion into responses. +//! +//! The payload types follow the [Google Cloud error model]. +//! +//! [Google Cloud error model]: https://github.com/googleapis/googleapis/blob/master/google/rpc/error_details.proto + use core::{error::Error, mem}; use std::collections::HashMap; @@ -5,8 +11,47 @@ use axum::response::{IntoResponse, Response}; use error_stack::Report; use hash_graph_postgres_store::store::error::BaseUrlAlreadyExists; use hash_graph_store::entity::EntityValidationReport; -use hash_status::{Status, StatusCode}; -use serde::Serialize; +use hash_status::{Status as HashStatus, StatusCode}; +use serde::{Deserialize, Serialize}; + +/// Generalized information about an error, covering its cause, its origin and a collection of +/// weakly-typed metadata. +#[derive(Debug, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ErrorInfo { + /// The proximate cause of the error. + /// + /// A constant value, unique within its [`domain`], of at most 63 characters matching + /// `[A-Z][A-Z0-9_]+[A-Z0-9]`. + /// + /// [`domain`]: Self::domain + pub reason: String, + /// The logical grouping the [`reason`] belongs to, typically the registered service name of + /// the tool or product raising the error. + /// + /// [`reason`]: Self::reason + pub domain: String, + /// Additional structured details about this error. + /// + /// Keys match `[a-zA-Z0-9-_]` and are limited to 64 characters. Units belong in the key + /// rather than the value, so an exceeded limit reads `{"instanceLimitPerRequest": "100"}` + /// rather than `{"instanceLimit": "100/request"}`. + pub metadata: HashMap, +} + +impl ErrorInfo { + #[must_use] + pub fn new(metadata: HashMap, reason: String) -> Self { + Self { + domain: "HASH Graph".to_owned(), + metadata, + reason, + } + } +} + +/// The status the REST API answers errors with. +pub type Status = HashStatus; /// A boxed [`Response`], keeping the types that carry one small. pub struct BoxedResponse(Box); @@ -23,13 +68,13 @@ impl From for BoxedResponse { } } -/// Converts a [`Status`] into the response it answers with. +/// Converts a [`HashStatus`] into the response it answers with. /// /// # Panics /// -/// Panics if the [`Status`] code does not map to a valid HTTP status code. +/// Panics if the [`HashStatus`] code does not map to a valid HTTP status code. #[must_use] -pub fn status_to_response(status: Status) -> BoxedResponse +pub fn status_to_response(status: HashStatus) -> BoxedResponse where T: Serialize + Send + Sync + core::fmt::Debug, { @@ -82,13 +127,13 @@ where status_code }; - status_to_response(Status::new( + status_to_response(HashStatus::new( status_code, Some(message), vec![ValidationContent { validation, report }], )) } else { tracing::error!(error = ?report, tags.code = ?status_code.to_http_code()); - status_to_response(Status::new(status_code, Some(message), vec![report])) + status_to_response(HashStatus::new(status_code, Some(message), vec![report])) } } diff --git a/libs/@local/graph/type-defs/Cargo.toml b/libs/@local/graph/type-defs/Cargo.toml deleted file mode 100644 index fbedb4bb509..00000000000 --- a/libs/@local/graph/type-defs/Cargo.toml +++ /dev/null @@ -1,31 +0,0 @@ -[package] -name = "hash-graph-type-defs" -description = "HASH Graph type definitions" -version.workspace = true -edition.workspace = true -license.workspace = true -publish.workspace = true -authors.workspace = true - -[package.metadata.sync.turborepo] -extra-dependencies = [ - { name = "@local/status", version = "workspace:*" }, -] -extra-dev-dependencies = [ - { name = "@local/eslint", version = "workspace:*" }, -] - -[dependencies] -# Public workspace dependencies -hash-status = { workspace = true, public = true } - -# Public third-party dependencies -serde_json = { workspace = true, public = true } - -# Private workspace dependencies - -# Private third-party dependencies -serde = { workspace = true, features = ['derive'] } -simple-mermaid = { workspace = true } -[lints] -workspace = true diff --git a/libs/@local/graph/type-defs/LICENSE.md b/libs/@local/graph/type-defs/LICENSE.md deleted file mode 100644 index c7d627721e2..00000000000 --- a/libs/@local/graph/type-defs/LICENSE.md +++ /dev/null @@ -1,607 +0,0 @@ -GNU Affero General Public License -================================= - -_Version 3, 19 November 2007_ -_Copyright © 2007 Free Software Foundation, Inc. <>_ - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -## Preamble - -The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - -When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights -with two steps: **(1)** assert copyright on the software, and **(2)** offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - -A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - -The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - -An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - -The precise terms and conditions for copying, distribution and -modification follow. - -## TERMS AND CONDITIONS - -### 0. Definitions - -“This License” refers to version 3 of the GNU Affero General Public License. - -“Copyright” also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - -“The Program” refers to any copyrightable work licensed under this -License. Each licensee is addressed as “you”. “Licensees” and -“recipients” may be individuals or organizations. - -To “modify” a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a “modified version” of the -earlier work or a work “based on” the earlier work. - -A “covered work” means either the unmodified Program or a work based -on the Program. - -To “propagate” a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - -To “convey” a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays “Appropriate Legal Notices” -to the extent that it includes a convenient and prominently visible -feature that **(1)** displays an appropriate copyright notice, and **(2)** -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - -### 1. Source Code - -The “source code” for a work means the preferred form of the work -for making modifications to it. “Object code” means any non-source -form of a work. - -A “Standard Interface” means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - -The “System Libraries” of an executable work include anything, other -than the work as a whole, that **(a)** is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and **(b)** serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -“Major Component”, in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - -The “Corresponding Source” for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - -The Corresponding Source for a work in source code form is that -same work. - -### 2. Basic Permissions - -All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - -### 3. Protecting Users' Legal Rights From Anti-Circumvention Law - -No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - -When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - -### 4. Conveying Verbatim Copies - -You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - -### 5. Conveying Modified Source Versions - -You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - -* **a)** The work must carry prominent notices stating that you modified -it, and giving a relevant date. -* **b)** The work must carry prominent notices stating that it is -released under this License and any conditions added under section 7. -This requirement modifies the requirement in section 4 to -“keep intact all notices”. -* **c)** You must license the entire work, as a whole, under this -License to anyone who comes into possession of a copy. This -License will therefore apply, along with any applicable section 7 -additional terms, to the whole of the work, and all its parts, -regardless of how they are packaged. This License gives no -permission to license the work in any other way, but it does not -invalidate such permission if you have separately received it. -* **d)** If the work has interactive user interfaces, each must display -Appropriate Legal Notices; however, if the Program has interactive -interfaces that do not display Appropriate Legal Notices, your -work need not make them do so. - -A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -“aggregate” if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - -### 6. Conveying Non-Source Forms - -You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - -* **a)** Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by the -Corresponding Source fixed on a durable physical medium -customarily used for software interchange. -* **b)** Convey the object code in, or embodied in, a physical product -(including a physical distribution medium), accompanied by a -written offer, valid for at least three years and valid for as -long as you offer spare parts or customer support for that product -model, to give anyone who possesses the object code either **(1)** a -copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical -medium customarily used for software interchange, for a price no -more than your reasonable cost of physically performing this -conveying of source, or **(2)** access to copy the -Corresponding Source from a network server at no charge. -* **c)** Convey individual copies of the object code with a copy of the -written offer to provide the Corresponding Source. This -alternative is allowed only occasionally and noncommercially, and -only if you received the object code with such an offer, in accord -with subsection 6b. -* **d)** Convey the object code by offering access from a designated -place (gratis or for a charge), and offer equivalent access to the -Corresponding Source in the same way through the same place at no -further charge. You need not require recipients to copy the -Corresponding Source along with the object code. If the place to -copy the object code is a network server, the Corresponding Source -may be on a different server (operated by you or a third party) -that supports equivalent copying facilities, provided you maintain -clear directions next to the object code saying where to find the -Corresponding Source. Regardless of what server hosts the -Corresponding Source, you remain obligated to ensure that it is -available for as long as needed to satisfy these requirements. -* **e)** Convey the object code using peer-to-peer transmission, provided -you inform other peers where the object code and Corresponding -Source of the work are being offered to the general public at no -charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - -A “User Product” is either **(1)** a “consumer product”, which means any -tangible personal property which is normally used for personal, family, -or household purposes, or **(2)** anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, “normally used” refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - -“Installation Information” for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - -If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - -The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - -### 7. Additional Terms - -“Additional permissions” are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - -* **a)** Disclaiming warranty or limiting liability differently from the -terms of sections 15 and 16 of this License; or -* **b)** Requiring preservation of specified reasonable legal notices or -author attributions in that material or in the Appropriate Legal -Notices displayed by works containing it; or -* **c)** Prohibiting misrepresentation of the origin of that material, or -requiring that modified versions of such material be marked in -reasonable ways as different from the original version; or -* **d)** Limiting the use for publicity purposes of names of licensors or -authors of the material; or -* **e)** Declining to grant rights under trademark law for use of some -trade names, trademarks, or service marks; or -* **f)** Requiring indemnification of licensors and authors of that -material by anyone who conveys the material (or modified versions of -it) with contractual assumptions of liability to the recipient, for -any liability that these contractual assumptions directly impose on -those licensors and authors. - -All other non-permissive additional terms are considered “further -restrictions” within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - -### 8. Termination - -You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - -However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated **(a)** -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and **(b)** permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - -Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - -### 9. Acceptance Not Required for Having Copies - -You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - -### 10. Automatic Licensing of Downstream Recipients - -Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - -An “entity transaction” is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - -### 11. Patents - -A “contributor” is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's “contributor version”. - -A contributor's “essential patent claims” are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, “control” includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - -In the following three paragraphs, a “patent license” is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To “grant” such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - -If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either **(1)** cause the Corresponding Source to be so -available, or **(2)** arrange to deprive yourself of the benefit of the -patent license for this particular work, or **(3)** arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. “Knowingly relying” means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - -A patent license is “discriminatory” if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license **(a)** in connection with copies of the covered work -conveyed by you (or copies made from those copies), or **(b)** primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - -### 12. No Surrender of Others' Freedom - -If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - -### 13. Remote Network Interaction; Use with the GNU General Public License - -Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - -Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - -### 14. Revised Versions of this License - -The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License “or any later version” applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - -Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - -### 15. Disclaimer of Warranty - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -### 16. Limitation of Liability - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -### 17. Interpretation of Sections 15 and 16 - -If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. diff --git a/libs/@local/graph/type-defs/build.rs b/libs/@local/graph/type-defs/build.rs deleted file mode 100644 index b66070ec937..00000000000 --- a/libs/@local/graph/type-defs/build.rs +++ /dev/null @@ -1,67 +0,0 @@ -#![expect(clippy::print_stderr)] - -use std::path::PathBuf; - -const CODEGEN_PACKAGE_PATH: &str = "libs/@local/status/typescript"; -const CODEGEN_SCRIPT_PATH: &str = "scripts/codegen.ts"; -const TYPE_DEFS_PATH: &str = "./typescript"; - -fn main() { - let out_dir = std::env::var("OUT_DIR").expect("Failed to find OUT_DIR environment variable"); - - let crate_dir = PathBuf::from( - std::env::var("CARGO_MANIFEST_DIR") - .expect("Failed to find CARGO_MANIFEST_DIR environment variable"), - ); - let root_dir = crate_dir - .join("../../../..") - .canonicalize() - .expect("Failed to find virtual manifest directory"); - - let codegen_package_path = root_dir - .join(CODEGEN_PACKAGE_PATH) - .canonicalize() - .expect("Failed to find codegen package path"); - let codegen_script_path = codegen_package_path - .join(CODEGEN_SCRIPT_PATH) - .canonicalize() - .expect("Failed to find codegen script path"); - - let type_defs_path = crate_dir - .join(TYPE_DEFS_PATH) - .canonicalize() - .expect("Failed to find HASH Graph type-defs path"); - - println!("cargo:rerun-if-changed=build.rs"); - println!("cargo:rerun-if-changed={}", codegen_package_path.display()); - println!("cargo:rerun-if-changed={}", type_defs_path.display()); - - if !std::process::Command::new("yarn") - .args([ - "tsx", - &codegen_script_path.to_string_lossy(), - &type_defs_path.to_string_lossy(), - "--rust-out-dir", - &out_dir, - // Uncomment this to generate JSON Schema definitions in the `OUT_DIR` as well - // Be aware that when re-generating the JSON Schema definitions, you will need to do - // some manual work, to make sure it's compliant with OpenAPI 3.0 - // This includes: - // * remove `$schema` and `$comment`, - // * rename `Record` to `Object`, - // * move `definitions` to `status_definitions.json` (under the `definitions` key), - // * make sure all refs in `status.json` point to it - // This is a chore (I know), but otherwise openapi-generator-cli will fail to generate - // the client :/ - // "--json-schema-out-dir", - // &out_dir, - ]) - .current_dir(crate_dir) - .status() - .expect("Failed to run codegen") - .success() - { - panic!("Failed to run codegen"); - } - eprintln!("Generated files in: {out_dir}"); -} diff --git a/libs/@local/graph/type-defs/docs/dependency-diagram.mmd b/libs/@local/graph/type-defs/docs/dependency-diagram.mmd deleted file mode 100644 index 215bd844a46..00000000000 --- a/libs/@local/graph/type-defs/docs/dependency-diagram.mmd +++ /dev/null @@ -1,20 +0,0 @@ -graph TD - linkStyle default stroke-width:1.5px - classDef default stroke-width:1px - classDef root stroke-width:3px - classDef dev stroke-width:1px - classDef build stroke-width:1px - %% Legend - %% --> : Normal dependency - %% -.-> : Dev dependency - %% ---> : Build dependency - 0[hash-graph] - 1[hash-graph-api] - 2[hash-graph-type-defs] - class 2 root - 3[hash-status] - 4[hash-graph-benches] - 0 --> 1 - 1 --> 2 - 2 --> 3 - 4 -.-> 1 diff --git a/libs/@local/graph/type-defs/eslint.config.js b/libs/@local/graph/type-defs/eslint.config.js deleted file mode 100644 index cd8f2aa7fa7..00000000000 --- a/libs/@local/graph/type-defs/eslint.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { createBase } from "@local/eslint/deprecated"; - -export default [ - ...createBase(import.meta.dirname), - { - rules: { - "no-console": "off", - "@typescript-eslint/consistent-type-imports": "off", - }, - }, -]; diff --git a/libs/@local/graph/type-defs/package.json b/libs/@local/graph/type-defs/package.json deleted file mode 100644 index 6e8b6046a82..00000000000 --- a/libs/@local/graph/type-defs/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "@rust/hash-graph-type-defs", - "version": "0.0.0-private", - "private": true, - "description": "HASH Graph type definitions", - "license": "AGPL-3", - "type": "module", - "scripts": { - "doc:dependency-diagram": "cargo run -p hash-repo-chores -- dependency-diagram --output docs/dependency-diagram.mmd --root hash-graph-type-defs --root-deps-and-dependents --link-mode non-roots --include-dev-deps --include-build-deps --logging-console-level info", - "fix:clippy": "just clippy --fix", - "fix:eslint": "eslint --fix .", - "lint:clippy": "just clippy", - "lint:eslint": "eslint --report-unused-disable-directives .", - "lint:tsc": "tsc --noEmit" - }, - "dependencies": { - "@local/status": "workspace:*", - "@rust/hash-status": "workspace:*" - }, - "devDependencies": { - "@local/eslint": "workspace:*", - "eslint": "9.39.4", - "quicktype": "16.0.43", - "tsx": "4.20.6", - "typescript": "5.9.3" - } -} diff --git a/libs/@local/graph/type-defs/src/error.rs b/libs/@local/graph/type-defs/src/error.rs deleted file mode 100644 index 4a9384869d2..00000000000 --- a/libs/@local/graph/type-defs/src/error.rs +++ /dev/null @@ -1,28 +0,0 @@ -use std::collections::HashMap; - -use hash_status::Status as HashStatus; - -pub use crate::status_payloads::{ErrorInfo, RequestInfo, ResourceInfo}; - -#[derive(Debug, serde::Serialize, serde::Deserialize)] -pub enum StatusPayloadInfo { - Error(ErrorInfo), - Request(RequestInfo), - Resource(ResourceInfo), -} - -impl ErrorInfo { - #[must_use] - pub fn new(metadata: HashMap, reason: String) -> Self { - Self { - domain: "HASH Graph".to_owned(), - metadata: metadata - .into_iter() - .map(|(key, value)| (key, Some(value))) - .collect(), - reason, - } - } -} - -pub type Status = HashStatus; diff --git a/libs/@local/graph/type-defs/src/lib.rs b/libs/@local/graph/type-defs/src/lib.rs deleted file mode 100644 index 75a00df53b7..00000000000 --- a/libs/@local/graph/type-defs/src/lib.rs +++ /dev/null @@ -1,13 +0,0 @@ -//! # HASH Graph Type Defs -//! -//! ## Workspace dependencies -#![doc = simple_mermaid::mermaid!("../docs/dependency-diagram.mmd")] - -pub mod error; -pub mod status_payloads { - #![expect(dead_code)] - #![expect(warnings)] - #![expect(clippy::all)] - #![expect(rustdoc::all)] - include!(concat!(env!("OUT_DIR"), "/status_payloads.rs")); -} diff --git a/libs/@local/graph/type-defs/tsconfig.json b/libs/@local/graph/type-defs/tsconfig.json deleted file mode 100644 index 618780e98b9..00000000000 --- a/libs/@local/graph/type-defs/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@local/tsconfig/legacy-base-tsconfig-to-refactor.json", - "include": ["typescript", "eslint.config.js"], - "compilerOptions": { - "module": "NodeNext", - "moduleResolution": "NodeNext" - } -} diff --git a/libs/@local/graph/type-defs/typescript/status-payloads.ts b/libs/@local/graph/type-defs/typescript/status-payloads.ts deleted file mode 100644 index b1784822c48..00000000000 --- a/libs/@local/graph/type-defs/typescript/status-payloads.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { - ErrorInfo, - RequestInfo, - ResourceInfo, -} from "@local/status/type-defs/status-payloads"; - -export { - ErrorInfo, - RequestInfo, - ResourceInfo, -} from "@local/status/type-defs/status-payloads"; - -export type StatusPayloads = ErrorInfo | RequestInfo | ResourceInfo; diff --git a/libs/@local/graph/type-defs/typescript/status.ts b/libs/@local/graph/type-defs/typescript/status.ts deleted file mode 100644 index f2893a246eb..00000000000 --- a/libs/@local/graph/type-defs/typescript/status.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Status } from "@local/status/type-defs/status"; -import { - ErrorInfo, - RequestInfo, - ResourceInfo, -} from "@local/status/type-defs/status-payloads"; - -// We can't just import `Status` as a type alias as it confuses `quicktype` -export type GraphStatus = Status; diff --git a/libs/@local/status/rust/docs/dependency-diagram.mmd b/libs/@local/status/rust/docs/dependency-diagram.mmd index 75e5f4c7662..964ea346232 100644 --- a/libs/@local/status/rust/docs/dependency-diagram.mmd +++ b/libs/@local/status/rust/docs/dependency-diagram.mmd @@ -11,31 +11,28 @@ graph TD 0[hash-graph] 1[hash-graph-api] 2[hash-graph-postgres-store] - 3[hash-graph-type-defs] - 4[hashql-ast] - 5[hashql-compiletest] - 6[hashql-eval] - 7[hashql-hir] - 8[hashql-mir] - 9[hashql-syntax-jexpr] - 10[hash-status] - class 10 root - 11[hash-graph-benches] - 12[hash-graph-integration] + 3[hashql-ast] + 4[hashql-compiletest] + 5[hashql-eval] + 6[hashql-hir] + 7[hashql-mir] + 8[hashql-syntax-jexpr] + 9[hash-status] + class 9 root + 10[hash-graph-benches] + 11[hash-graph-integration] 0 --> 1 - 1 --> 3 - 1 --> 6 - 1 --> 9 + 1 --> 5 + 1 --> 8 2 -.-> 2 - 2 --> 10 - 3 --> 10 - 4 -.-> 5 - 5 --> 6 - 5 --> 9 - 6 --> 2 - 6 --> 8 - 7 -.-> 5 - 8 --> 7 - 9 --> 4 - 11 -.-> 1 - 12 -.-> 2 + 2 --> 9 + 3 -.-> 4 + 4 --> 5 + 4 --> 8 + 5 --> 2 + 5 --> 7 + 6 -.-> 4 + 7 --> 6 + 8 --> 3 + 10 -.-> 1 + 11 -.-> 2 diff --git a/libs/@local/tsconfig/legacy-base-tsconfig-to-refactor.json b/libs/@local/tsconfig/legacy-base-tsconfig-to-refactor.json index 8dfb7ca1f5b..57720b47719 100644 --- a/libs/@local/tsconfig/legacy-base-tsconfig-to-refactor.json +++ b/libs/@local/tsconfig/legacy-base-tsconfig-to-refactor.json @@ -44,7 +44,9 @@ "@local/harpc-client/*": ["../harpc/client/typescript/src/*/index.ts"], "@local/effect-dns": ["../effect-dns/core/src/index.ts"], "@local/effect-dns/*": ["../effect-dns/core/src/*/index.ts"], - "@local/effect-dns-hickory": ["../effect-dns/hickory/dist/index.ts"], + "@local/effect-dns-hickory": [ + "../effect-dns/hickory/typescript/dist/index.ts" + ], "@local/eslint": ["../eslint/src/index.ts"], "@local/eslint/*": ["../eslint/src/*/index.ts"] }, diff --git a/tests/graph/http/tests/hashql.http b/tests/graph/http/tests/hashql.http index a0dd8476aa1..dd5c9298a94 100644 --- a/tests/graph/http/tests/hashql.http +++ b/tests/graph/http/tests/hashql.http @@ -132,7 +132,7 @@ X-Authenticated-User-Actor-Id: {{system_machine_id}} }); client.test("error message mentions inputs", function() { client.assert(response.body.message !== undefined, "Expected error message"); - client.assert(response.body.contents[0].Error.metadata.deserializationError.includes("inputs"), + client.assert(response.body.contents[0].metadata.deserializationError.includes("inputs"), "Expected error to mention missing 'inputs' field"); }); %} diff --git a/tests/hash-backend-integration/package.json b/tests/hash-backend-integration/package.json index e7c61bd7a09..6d39cc2f2a2 100644 --- a/tests/hash-backend-integration/package.json +++ b/tests/hash-backend-integration/package.json @@ -23,7 +23,6 @@ "@local/hash-graph-store": "workspace:*", "@local/hash-isomorphic-utils": "workspace:*", "@local/status": "workspace:*", - "@rust/hash-graph-type-defs": "workspace:*", "execa": "9.6.0", "fractional-indexing": "3.2.0", "graphql": "16.11.0", diff --git a/tests/hash-backend-integration/src/tests/admin-server.ts b/tests/hash-backend-integration/src/tests/admin-server.ts index 0e149c8eee5..5a3627070f5 100644 --- a/tests/hash-backend-integration/src/tests/admin-server.ts +++ b/tests/hash-backend-integration/src/tests/admin-server.ts @@ -11,7 +11,10 @@ import { StatusCode } from "@local/status"; import { createTestImpureGraphContext } from "./util"; -import type { GraphStatus } from "@rust/hash-graph-type-defs/typescript/status"; +import type { Status } from "@local/status"; +import type { ErrorInfo } from "@local/status/type-defs/status-payloads/error-info"; + +type GraphStatus = Status; /** * Throw unless running in the snapshot group (`vitest.snapshot.config.ts`), diff --git a/yarn.lock b/yarn.lock index f50eeb4ef21..0969c7b0891 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9385,12 +9385,13 @@ __metadata: languageName: unknown linkType: soft -"@local/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory": +"@local/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory/typescript": version: 0.0.0-use.local - resolution: "@local/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory" + resolution: "@local/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory/typescript" dependencies: "@local/eslint": "workspace:*" "@local/tsconfig": "workspace:*" + "@rust/effect-dns-hickory": "workspace:*" "@vitest/coverage-istanbul": "npm:4.1.10" eslint: "npm:9.39.4" rimraf: "npm:6.1.3" @@ -14859,6 +14860,12 @@ __metadata: languageName: unknown linkType: soft +"@rust/effect-dns-hickory@workspace:*, @rust/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory/rust": + version: 0.0.0-use.local + resolution: "@rust/effect-dns-hickory@workspace:libs/@local/effect-dns/hickory/rust" + languageName: unknown + linkType: soft + "@rust/error-stack-macros@workspace:*, @rust/error-stack-macros@workspace:libs/error-stack/macros": version: 0.0.0-use.local resolution: "@rust/error-stack-macros@workspace:libs/error-stack/macros" @@ -14999,7 +15006,6 @@ __metadata: "@rust/hash-graph-postgres-store": "workspace:*" "@rust/hash-graph-store": "workspace:*" "@rust/hash-graph-temporal-versioning": "workspace:*" - "@rust/hash-graph-type-defs": "workspace:*" "@rust/hash-graph-type-fetcher": "workspace:*" "@rust/hash-graph-types": "workspace:*" "@rust/hash-graph-validation": "workspace:*" @@ -15167,20 +15173,6 @@ __metadata: languageName: unknown linkType: soft -"@rust/hash-graph-type-defs@workspace:*, @rust/hash-graph-type-defs@workspace:libs/@local/graph/type-defs": - version: 0.0.0-use.local - resolution: "@rust/hash-graph-type-defs@workspace:libs/@local/graph/type-defs" - dependencies: - "@local/eslint": "workspace:*" - "@local/status": "workspace:*" - "@rust/hash-status": "workspace:*" - eslint: "npm:9.39.4" - quicktype: "npm:16.0.43" - tsx: "npm:4.20.6" - typescript: "npm:5.9.3" - languageName: unknown - linkType: soft - "@rust/hash-graph-type-fetcher@workspace:*, @rust/hash-graph-type-fetcher@workspace:libs/@local/graph/type-fetcher": version: 0.0.0-use.local resolution: "@rust/hash-graph-type-fetcher@workspace:libs/@local/graph/type-fetcher" @@ -17612,7 +17604,6 @@ __metadata: "@local/hash-isomorphic-utils": "workspace:*" "@local/status": "workspace:*" "@local/tsconfig": "workspace:*" - "@rust/hash-graph-type-defs": "workspace:*" "@types/node-fetch": "npm:2.6.13" "@vitest/coverage-istanbul": "npm:4.1.10" eslint: "npm:9.39.4"