fix: TS LSP being slow (#7181)

Potential fix for Typescript LSP being slow. Based on microsoft/TypeScript#42761 (comment) and microsoft/TypeScript#52994 --------- Co-authored-by: Santiago Palladino <[email protected]>
AztecProtocol · Jun 27, 2024 · e934e87 · e934e87
1 parent ed815a3
commit e934e87
Show file tree

Hide file tree

Showing 38 changed files with 167 additions and 104 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -169,4 +169,5 @@
     "**/noir/noir-repo/docs/versioned_docs/**": true
   },
   "cmake.sourceDirectory": "${workspaceFolder}/barretenberg/cpp",
+  "typescript.tsserver.maxTsServerMemory": 4096,
 }
diff --git a/yarn-project/.earthlyignore b/yarn-project/.earthlyignore
@@ -39,10 +39,9 @@ cmake-build-debug
 **/tsconfig.tsbuildinfo
 **/.eslintcache
 **/target
-accounts/src/artifacts
+accounts/artifacts
 aztec-faucet/data*
 aztec-node/data*
-aztec-js/src/account_contract/artifacts
 aztec/log
 circuits.js/fixtures/*.json
 docs/dist
@@ -51,8 +50,8 @@ end-to-end/log
 end-to-end/data
 end-to-end/src/web/main.js
 end-to-end/src/web/main.js.LICENSE.txt
-entry-points/src/artifacts
 l1-contracts/generated
+noir-protocol-circuits-types/artifacts
 builder/target/
 builder/proofs/
 builder/Prover.toml
@@ -64,7 +63,7 @@ builder/Verifier.toml
 builder/src/target
 builder/src/crs
 builder/src/types
-protocol-contracts/src/artifacts
+protocol-contracts/artifacts
 scripts/tmp
 noir-contracts.js/src
 noir-contracts.js/artifacts/

diff --git a/yarn-project/.gitignore b/yarn-project/.gitignore
@@ -12,10 +12,9 @@
 **/.debounce-*
 **/.tsc.pid
 **/*.result
-accounts/src/artifacts
+accounts/artifacts
 aztec-faucet/data*
 aztec-node/data*
-aztec-js/src/account_contract/artifacts
 aztec/log
 circuits.js/fixtures/*.json
 circuits.js/src/structs/kernel/private_kernel_reset_circuit_private_inputs_variants.ts
@@ -25,9 +24,9 @@ end-to-end/log
 end-to-end/data
 end-to-end/src/web/main.js
 end-to-end/src/web/main.js.LICENSE.txt
-entry-points/src/artifacts
 l1-artifacts/generated
 l1-contracts/generated
+noir-protocol-circuits-types/artifacts
 builder/target/
 builder/proofs/
 builder/Prover.toml
@@ -40,7 +39,7 @@ builder/src/target
 builder/src/crs
 builder/src/types
 noir-protocol-circuits-types/src/types/
-protocol-contracts/src/artifacts
+protocol-contracts/artifacts
 scripts/tmp
 noir-contracts.js/src
 noir-contracts.js/artifacts/

diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
@@ -73,8 +73,7 @@ bb-cli:
         ../barretenberg/ts/dest/browser \
         aztec.js/dest/main.js \
         end-to-end \
-        **/src \
-        **/artifacts
+        **/src
 
     # yarn symlinks the binary to node_modules/.bin
     ENTRYPOINT ["/usr/src/yarn-project/node_modules/.bin/bb-cli"]
@@ -124,8 +123,7 @@ txe:
         ../l1-contracts \
         ../barretenberg/ts/src \
         ../barretenberg/ts/dest/node-cjs \
-        ../barretenberg/ts/dest/browser \
-        **/artifacts
+        ../barretenberg/ts/dest/browser
     SAVE ARTIFACT /usr/src /usr/src
 
 aztec-prod:
@@ -140,8 +138,7 @@ aztec-prod:
         ../barretenberg/ts/dest/browser \
         aztec.js/dest/main.js \
         end-to-end \
-        **/src \
-        **/artifacts
+        **/src
     COPY --dir +rollup-verifier-contract/usr/src/bb /usr/src
     SAVE ARTIFACT /usr/src /usr/src
 
@@ -172,8 +169,7 @@ aztec-faucet-build:
         ../barretenberg/ts/dest/browser \
         aztec.js/dest/main.js \
         end-to-end \
-        **/src \
-        **/artifacts
+        **/src
     SAVE ARTIFACT /usr/src /usr/src
 
 aztec-faucet:
@@ -193,8 +189,7 @@ end-to-end-prod:
         ../l1-contracts \
         ../barretenberg/ts/src \
         ../barretenberg/ts/dest/node-cjs \
-        ../barretenberg/ts/dest/browser \
-        **/artifacts
+        ../barretenberg/ts/dest/browser
     COPY --dir +rollup-verifier-contract/usr/src/bb /usr/src
     SAVE ARTIFACT /usr/src /usr/src
 

diff --git a/yarn-project/accounts/.prettierignore b/yarn-project/accounts/.prettierignore
@@ -1 +1 @@
-src/artifacts/*.json
+artifacts/*.json
diff --git a/yarn-project/accounts/package.json b/yarn-project/accounts/package.json
@@ -28,7 +28,7 @@
     "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
-    "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts",
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
@@ -91,7 +91,8 @@
   "files": [
     "dest",
     "src",
-    "!*.test.*"
+    "!*.test.*",
+    "artifacts"
   ],
   "engines": {
     "node": ">=18"

diff --git a/yarn-project/accounts/package.local.json b/yarn-project/accounts/package.local.json
@@ -5,6 +5,12 @@
     "generate:noir-contracts": "./scripts/copy-contracts.sh",
     "build:dev": "tsc -b --watch",
     "build:ts": "tsc -b",
-    "clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts"
-  }
-}
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts"
+  },
+  "files": [
+    "dest",
+    "src",
+    "artifacts",
+    "!*.test.*"
+  ]
+}
diff --git a/yarn-project/accounts/scripts/copy-contracts.sh b/yarn-project/accounts/scripts/copy-contracts.sh
@@ -1,9 +1,17 @@
 #! /bin/bash
 set -euo pipefail
-mkdir -p ./src/artifacts
+mkdir -p ./artifacts
 
 contracts=(schnorr_account_contract-SchnorrAccount ecdsa_account_contract-EcdsaAccount schnorr_single_key_account_contract-SchnorrSingleKeyAccount)
 
+decl=$(cat <<EOF
+import { type NoirCompiledContract } from '@aztec/types/noir';
+const circuit: NoirCompiledContract;
+export = circuit;
+EOF
+);
+
 for contract in "${contracts[@]}"; do
-  cp "../../noir-projects/noir-contracts/target/$contract.json" ./src/artifacts/${contract#*-}.json
+  cp "../../noir-projects/noir-contracts/target/$contract.json" ./artifacts/${contract#*-}.json
+  echo "$decl" > ./artifacts/${contract#*-}.d.json.ts
 done
diff --git a/yarn-project/accounts/src/ecdsa/artifact.ts b/yarn-project/accounts/src/ecdsa/artifact.ts
@@ -1,5 +1,5 @@
 import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js';
 
-import EcdsaAccountContractJson from '../artifacts/EcdsaAccount.json' assert { type: 'json' };
+import EcdsaAccountContractJson from '../../artifacts/EcdsaAccount.json' assert { type: 'json' };
 
 export const EcdsaAccountContractArtifact = loadContractArtifact(EcdsaAccountContractJson as NoirCompiledContract);
diff --git a/yarn-project/accounts/src/schnorr/artifact.ts b/yarn-project/accounts/src/schnorr/artifact.ts
@@ -1,5 +1,5 @@
 import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js';
 
-import SchnorrAccountContractJson from '../artifacts/SchnorrAccount.json' assert { type: 'json' };
+import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' assert { type: 'json' };
 
 export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
diff --git a/yarn-project/accounts/src/single_key/artifact.ts b/yarn-project/accounts/src/single_key/artifact.ts
@@ -1,6 +1,6 @@
 import { type NoirCompiledContract, loadContractArtifact } from '@aztec/aztec.js';
 
-import SchnorrSingleKeyAccountContractJson from '../artifacts/SchnorrSingleKeyAccount.json' assert { type: 'json' };
+import SchnorrSingleKeyAccountContractJson from '../../artifacts/SchnorrSingleKeyAccount.json' assert { type: 'json' };
 
 export const SchnorrSingleKeyAccountContractArtifact = loadContractArtifact(
   SchnorrSingleKeyAccountContractJson as NoirCompiledContract,

diff --git a/yarn-project/accounts/tsconfig.json b/yarn-project/accounts/tsconfig.json
@@ -28,5 +28,5 @@
       "path": "../types"
     }
   ],
-  "include": ["src", "src/**/*.json"]
+  "include": ["src", "artifacts/*.d.json.ts"]
 }
diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json
@@ -3,14 +3,14 @@
   "version": "0.1.0",
   "type": "module",
   "exports": {
-    ".": "./dest/src/index.js",
-    "./artifacts/*": "./dest/artifacts/*.json",
-    "./*": "./dest/src/*.js"
+    ".": "./dest/index.js",
+    "./artifacts/*": "./artifacts/*.json",
+    "./*": "./dest/*.js"
   },
   "scripts": {
     "build": "yarn clean && yarn generate",
     "build:dev": "tsc -b --watch",
-    "clean": "rm -rf .tsbuildinfo ./artifacts ./codegenCache.json",
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src ./codegenCache.json",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
@@ -73,4 +73,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}
diff --git a/yarn-project/noir-contracts.js/package.local.json b/yarn-project/noir-contracts.js/package.local.json
@@ -3,6 +3,6 @@
     "build": "yarn clean && yarn generate",
     "generate": "yarn generate:noir-contracts",
     "generate:noir-contracts": "./scripts/generate-types.sh && run -T prettier -w ./src --loglevel warn",
-    "clean": "rm -rf .tsbuildinfo ./artifacts ./codegenCache.json"
+    "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src ./codegenCache.json"
   }
-}
+}
diff --git a/yarn-project/noir-contracts.js/scripts/generate-types.sh b/yarn-project/noir-contracts.js/scripts/generate-types.sh
@@ -19,12 +19,21 @@ echo "// Auto generated module - do not edit!" >"$INDEX"
 # Ensure the artifacts directory exists
 mkdir -p artifacts
 
+decl=$(cat <<EOF
+import { type NoirCompiledContract } from '@aztec/types/noir';
+const circuit: NoirCompiledContract;
+export = circuit;
+EOF
+);
+
 for ABI in $(find ../../noir-projects/noir-contracts/target -maxdepth 1 -type f ! -name 'debug_*' -name '*.json'); do
   # Extract the filename from the path
   filename=$(basename "$ABI")
+  dts_file=$(echo $filename | sed 's/.json/.d.json.ts/g');
 
   # Copy the JSON file to the artifacts folder
   cp "$ABI" "artifacts/$filename"
+  echo "$decl" > "artifacts/$dts_file"
 done
 
 # Generate types for the contracts

diff --git a/yarn-project/noir-contracts.js/tsconfig.json b/yarn-project/noir-contracts.js/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "..",
   "compilerOptions": {
     "outDir": "dest",
-    "rootDir": ".",
+    "rootDir": "src",
     "tsBuildInfoFile": ".tsbuildinfo"
   },
   "references": [
@@ -15,8 +15,7 @@
   ],
   "include": [
     "src",
-    "artifacts",
-    "artifacts/*.json"
+    "artifacts/*.d.json.ts"
   ],
   "exclude": [
     "dest"

diff --git a/yarn-project/noir-protocol-circuits-types/.prettierignore b/yarn-project/noir-protocol-circuits-types/.prettierignore
@@ -1,2 +1,2 @@
 crates
-src/target
+artifacts
diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json
@@ -12,12 +12,12 @@
   ],
   "scripts": {
     "build": "yarn clean && yarn generate && tsc -b",
-    "clean": "rm -rf ./dest .tsbuildinfo src/types src/target",
+    "clean": "rm -rf ./dest .tsbuildinfo src/types artifacts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types",
     "generate": "yarn generate:noir-circuits",
-    "generate:noir-circuits": "mkdir -p ./src/target && cp ../../noir-projects/noir-protocol-circuits/target/* ./src/target && node --no-warnings --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && run -T prettier -w ./src/types",
+    "generate:noir-circuits": "mkdir -p ./artifacts && cp ../../noir-projects/noir-protocol-circuits/target/* ./artifacts && node --no-warnings --loader ts-node/esm src/scripts/generate_declaration_files.ts && node --no-warnings --loader ts-node/esm src/scripts/generate_ts_from_abi.ts && run -T prettier -w ./src/types",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests",
     "codegen": "yarn noir-codegen",
     "build:dev": "tsc -b --watch"
@@ -82,7 +82,8 @@
   "files": [
     "dest",
     "src",
-    "!*.test.*"
+    "!*.test.*",
+    "artifacts"
   ],
   "types": "./dest/index.d.ts",
   "engines": {

diff --git a/yarn-project/noir-protocol-circuits-types/package.local.json b/yarn-project/noir-protocol-circuits-types/package.local.json
@@ -1,6 +1,12 @@
 {
   "scripts": {
     "build": "yarn clean && yarn generate && tsc -b",
-    "clean": "rm -rf ./dest .tsbuildinfo src/types src/target"
-  }
-}
+    "clean": "rm -rf ./dest .tsbuildinfo src/types artifacts"
+  },
+  "files": [
+    "dest",
+    "src",
+    "artifacts",
+    "!*.test.*"
+  ]
+}