fix: merge conflicts

metatypedev · Nov 14, 2024 · cfb0745 · cfb0745
2 parents 1f9f159 + 7681e24
commit cfb0745
Show file tree

Hide file tree

Showing 293 changed files with 13,020 additions and 7,497 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,37 +28,35 @@ repos:
       - id: deno-fmt
         name: Deno format
         language: system
-        entry: bash -c 'cd src/typegate && deno fmt --ignore=native,src/typegraphs,tmp,tests/e2e/nextjs,tests/metagen/typegraphs/sample/ts/client.ts && cd ../../tools && deno fmt && cd ../src/typegraph/deno && deno fmt --ignore=node_modules,dist && cd ../../../src/metagen/src && deno fmt'
+        entry: bash -c 'deno fmt'
         pass_filenames: false
         types:
+          - javascript
           - ts
-        files: ^(src/typegate|tools|src/typegraph/deno)/
+          - tsx
+          - json
+          - yaml
       - id: deno-lint
         name: Deno lint
         language: system
-        entry: bash -c 'cd src/typegate && deno lint --rules-exclude=no-explicit-any --ignore=native,tmp,tests/e2e/nextjs && cd ../../tools && deno lint && cd ../src/metagen/src/ && deno lint'
+        entry: bash -c 'deno lint && ghjk x lint-deno'
         pass_filenames: false
         types:
+          - javascript
           - ts
+          - tsx
+          - json
+          - yaml
         files: ^(src/typegate|tools)/
       - id: es-lint
         name: Eslint website
         language: system
-        entry: bash -c 'cd website && [ -f node_modules/.bin/eslint ] && pnpm lint && pnpm prettier'
+        entry: bash -c 'cd ./docs/metatype.dev/ && [ -f node_modules/.bin/eslint ] && pnpm lint && pnpm prettier'
         pass_filenames: false
         types_or:
           - ts
           - tsx
-        files: ^website/
-        exclude: ^website/typegraphs/
-      - id: devtools-lint
-        name: ESLint meta-lsp
-        language: system
-        entry: bash -c 'cd meta-lsp && pnpm lint'
-        pass_filenames: false
-        types:
-          - ts
-        files: ^meta-lsp/
+        files: ^docs/metatype.dev
       #- id: cargo-udeps
       #  name: Check for unused cargo dependencies
       #  language: system
@@ -87,10 +85,9 @@ repos:
             .*deno.lock|
             CHANGELOG.md|
             .*\.snap$|
-            typegate/src/typegraphs/.*\.json|
-            src/typegraph/core/src/types/sdk/.*\.rs|
-            website/docs/reference/|
-            libs/pyrt_wit_wire/pyrt|
+            src/typegate/src/typegraphs/.*\.json|
+            docs/metatype.dev/reference/|
+            src/pyrt_wit_wire/pyrt|
             migration_lock.toml|
             tests/metagen/typegraphs/sample/[rs|ts|py]/client\.[rs|ts|py]
           )
@@ -104,9 +101,10 @@ repos:
           - --license-filepath=tools/license-header-MPL-2.0.txt
           - "--comment-style=#"
           - "--skip-license-insertion-comment=no-auto-license-header"
+          - "--skip-license-insertion-comment=@generated"
         types_or:
           - python
-        files: ^typegraph/
+        exclude: ^examples/|src/metagen/src/.*/static/.*
       - id: insert-license
         name: "License MPL-2.0 rust"
         args:
@@ -117,50 +115,19 @@ repos:
           - "--skip-license-insertion-comment=@generated"
         types_or:
           - rust
-        files: ^(typegate|libs!(/metagen/.*))/
-      - id: insert-license
-        name: "License MPL-2.0 rust"
-        args:
-          #- --remove-header
-          - --license-filepath=tools/license-header-MPL-2.0.txt
-          - "--comment-style=//"
-          - "--skip-license-insertion-comment=no-auto-license-header"
-        types_or:
-          - rust
-        files: ^(meta-cli|typegraph|libs/metagen)/
-      - id: insert-license
-        name: "License MPL-2.0 deno"
-        args:
-          #- --remove-header
-          - --license-filepath=tools/license-header-MPL-2.0.txt
-          - "--comment-style=//"
-          - "--skip-license-insertion-comment=no-auto-license-header"
-          - "--skip-license-insertion-comment=@generated"
-        types_or:
-          - ts
-        files: ^(typegate|tools)/
-      - id: insert-license
-        name: "License MPL-2.0 deno"
-        args:
-          #- --remove-header
-          - --license-filepath=tools/license-header-MPL-2.0.txt
-          - "--comment-style=//"
-          - "--skip-license-insertion-comment=no-auto-license-header"
-        types_or:
-          - ts
-        files: ^typegraph/
+        exclude: ^examples/|src/metagen/src/.*/static/.*
       - id: insert-license
         name: "License MPL-2.0 typescript"
         args:
           #- --remove-header
           - --license-filepath=tools/license-header-MPL-2.0.txt
           - "--comment-style=//"
           - "--skip-license-insertion-comment=no-auto-license-header"
+          - "--skip-license-insertion-comment=@generated"
         types_or:
           - ts
           - tsx
-        files: ^website/
-        exclude: website/typegraphs
+        exclude: ^examples/|src/metagen/src/.*/static/.*
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.28.6
     hooks:

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,19 +1,19 @@
 {
-    "recommendations": [
-        "charliermarsh.ruff",
-        "rust-lang.rust-analyzer",
-        "ms-python.black-formatter",
-        "denoland.vscode-deno",
-        "ms-vscode-remote.remote-containers",
-        "dbaeumer.vscode-eslint",
-        "graphql.vscode-graphql-syntax",
-        "unifiedjs.vscode-mdx",
-        "ms-python.vscode-pylance",
-        "ms-python.python",
-        "chrischinchilla.vale-vscode",
-        "hediet.vscode-drawio",
-        "davidlday.languagetool-linter",
-        "dtsvet.vscode-wasm",
-        "bierner.comment-tagged-templates"
-    ]
+  "recommendations": [
+    "charliermarsh.ruff",
+    "rust-lang.rust-analyzer",
+    "ms-python.black-formatter",
+    "denoland.vscode-deno",
+    "ms-vscode-remote.remote-containers",
+    "dbaeumer.vscode-eslint",
+    "graphql.vscode-graphql-syntax",
+    "unifiedjs.vscode-mdx",
+    "ms-python.vscode-pylance",
+    "ms-python.python",
+    "chrischinchilla.vale-vscode",
+    "hediet.vscode-drawio",
+    "davidlday.languagetool-linter",
+    "dtsvet.vscode-wasm",
+    "bierner.comment-tagged-templates"
+  ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,33 +1,33 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-{
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"type": "extensionHost",
-			"request": "launch",
-			"name": "Launch Client",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}/meta-lsp"
-			],
-			"outFiles": [
-				"${workspaceRoot}/meta-lsp/vscode-metatype-support/out/**/*.js"
-			],
-			"preLaunchTask": "vscode-ext:build"
-		},
-		{
-			"name": "Language Server E2E Test",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}",
-				"--extensionTestsPath=${workspaceRoot}/client/out/test/index",
-				"${workspaceRoot}/client/testFixture"
-			],
-			"outFiles": [
-				"${workspaceRoot}/client/out/test/**/*.js"
-			]
-		}
-	]
+// A launch configuration that compiles the extension and then opens it inside a new window
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "extensionHost",
+      "request": "launch",
+      "name": "Launch Client",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}/meta-lsp"
+      ],
+      "outFiles": [
+        "${workspaceRoot}/meta-lsp/vscode-metatype-support/out/**/*.js"
+      ],
+      "preLaunchTask": "vscode-ext:build"
+    },
+    {
+      "name": "Language Server E2E Test",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceRoot}",
+        "--extensionTestsPath=${workspaceRoot}/client/out/test/index",
+        "${workspaceRoot}/client/testFixture"
+      ],
+      "outFiles": [
+        "${workspaceRoot}/client/out/test/**/*.js"
+      ]
+    }
+  ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,46 +1,46 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"label": "vscode-ext:build",
-			"type": "shell",
-			"command": "pnpm",
-			"args": [
-				"compile:vscode"
-			],
-			"group": "build",
-			"presentation": {
-				"panel": "dedicated",
-				"reveal": "never"
-			},
-			"problemMatcher": [
-				"$tsc"
-			],
-			"options": {
-				"cwd": "${workspaceFolder}/meta-lsp"
-			}
-		},
-		{
-			"label": "vscode-ext:build:watch",
-			"type": "shell",
-			"command": "pnpm",
-			"args": [
-				"watch"
-			],
-			"isBackground": true,
-			"group": {
-				"kind": "build"
-			},
-			"presentation": {
-				"panel": "dedicated",
-				"reveal": "never"
-			},
-			"problemMatcher": [
-				"$tsc-watch"
-			],
-			"options": {
-				"cwd": "${workspaceFolder}/meta-lsp/vscode-metatype-support"
-			}
-		}
-	]
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "vscode-ext:build",
+      "type": "shell",
+      "command": "pnpm",
+      "args": [
+        "compile:vscode"
+      ],
+      "group": "build",
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": [
+        "$tsc"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/meta-lsp"
+      }
+    },
+    {
+      "label": "vscode-ext:build:watch",
+      "type": "shell",
+      "command": "pnpm",
+      "args": [
+        "watch"
+      ],
+      "isBackground": true,
+      "group": {
+        "kind": "build"
+      },
+      "presentation": {
+        "panel": "dedicated",
+        "reveal": "never"
+      },
+      "problemMatcher": [
+        "$tsc-watch"
+      ],
+      "options": {
+        "cwd": "${workspaceFolder}/meta-lsp/vscode-metatype-support"
+      }
+    }
+  ]
 }
diff --git a/deno.jsonc b/deno.jsonc
@@ -11,10 +11,26 @@
       "./examples/" // needed for published_test
     ]
   },
+  "fmt": {
+    "exclude": [
+      "target",
+      "src/typegraph/deno/src/gen",
+      "src/typegraph/node",
+      "*.md",
+      "**/*.md",
+      ".ghjk/**",
+      ".git",
+      "vendor/**",
+      "node_modules",
+      "docs/metatype.dev/docusaurus.config.js",
+      "docs/metatype.dev/**/*.js",
+      "docs/metatype.dev/**/*.ts",
+      "docs/metatype.dev/**/*.tsx"
+    ]
+  },
   "compilerOptions": {
     "allowJs": false,
     "strict": true,
-    "experimentalDecorators": true,
     "types": [
       "./src/typegate/engine/runtime.d.ts"
     ],
@@ -27,13 +43,22 @@
   "nodeModulesDir": false,
   "lock": "deno.lock",
   "lint": {
+    "exclude": [
+      ".git",
+      "node_modules",
+      "./src/typegraph/deno/src/gen",
+      "./docs/metatype.dev",
+      "./src/typegraph/node",
+      "./src/meta-lsp",
+      "target"
+    ],
     "rules": {
       "include": [
         "no-sync-fn-in-async-fn",
-        "no-external-import",
         "no-inferrable-types",
         "no-self-compare",
         "no-throw-literal"
+        // "no-external-import",
         // "verbatim-module-syntax"
         // "no-await-in-loop"
         // "ban-untagged-todo"