Type check test files (#248)

* Rename all tsconfig.dest.json to tsconfig.json

* Rename all instances of tsconfig.dest.json to tsconfig.json

* Ignore tsbuildinfo

* Fix jest types

See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64936/files

* Move anvil tests into src and skip for now

* Do not exclude test folders

* Rename package.scripts to package.common

* Remove explicit reference to tsconfig in project references

* Handle non-objects in update_package_jsons

* Add files and types entries to all packages

* Remove tsbuildinfo

* Fix jest config for aztec-rpc

* Fix jest config for aztec-node

* Add types patch to dockerfiles

* Drop tsconfig.json from build command since we're using the default

README.md

@@ -5,11 +5,11 @@ All the packages that make up Aztec 3. Typescript projects exist in yarn-project
 Package development:
 
 - Run `yarn build:dev` in the root to interactively build the package.
-- Run `yarn prepare` in the root to update tsconfig.dest.json and build_manifest.json files based on package.json contents.
+- Run `yarn prepare` in the root to update tsconfig.json and build_manifest.json files based on package.json contents.
   Note this only analyzes package.json imports to @aztec/\* packages.
 
 Repo architecture:
 
 - yarn-project/tsconfig.json: Base tsconfig file, extended by all packages. Used directly by vscode and eslint, where it functions to include the whole project without listing project references.
-- yarn-project/tsconfig.dest.json: Used by `yarn build:dev` in root.
-- package/tsconfig.dest.json: Each package has its own file that specifies its project reference dependencies. This allows them to be built independently.
+- yarn-project/tsconfig.json: Used by `yarn build:dev` in root.
+- package/tsconfig.json: Each package has its own file that specifies its project reference dependencies. This allows them to be built independently.

yarn-project/.gitignore

@@ -5,6 +5,7 @@ node_modules
 *.log
 *.swp
 .tsbuildinfo
+tsconfig.tsbuildinfo
 
 # Zero install: https://yarnpkg.com/features/zero-installs
 .yarn/*

yarn-project/@types/jest/index.d.ts

@@ -0,0 +1,10 @@
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64936/files
+declare namespace jest {
+  /**
+   * Replaces property on an object with another value.
+   *
+   * @remarks
+   * For mocking functions, and 'get' or 'set' accessors, use `jest.spyOn()` instead.
+   */
+  function replaceProperty<T extends {}, K extends keyof T>(obj: T, key: K, value: T[K]): ReplaceProperty<T[K]>;
+}

yarn-project/acir-simulator/package.json

@@ -6,20 +6,20 @@
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "displayName": "Acir Simulator",
-    "tsconfig": "./tsconfig.dest.json"
+    "tsconfig": "./tsconfig.json"
   },
   "scripts": {
     "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json",
     "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check",
-    "build": "yarn clean && tsc -b tsconfig.dest.json",
-    "build:dev": "tsc -b tsconfig.dest.json --watch",
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
   },
   "inherits": [
-    "../package.scripts.json"
+    "../package.common.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
@@ -56,5 +56,11 @@
     "ts-jest": "^28.0.7",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
-  }
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dest/index.d.ts"
 }

yarn-project/acir-simulator/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "extends": "..",
+  "compilerOptions": {
+    "outDir": "dest",
+    "rootDir": "src",
+    "tsBuildInfoFile": ".tsbuildinfo"
+  },
+  "references": [
+    {
+      "path": "../barretenberg.js"
+    },
+    {
+      "path": "../circuits.js"
+    },
+    {
+      "path": "../foundation"
+    },
+    {
+      "path": "../merkle-tree"
+    },
+    {
+      "path": "../noir-contracts"
+    }
+  ],
+  "include": ["src"]
+}

yarn-project/archiver/package.json

@@ -6,24 +6,24 @@
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "displayName": "Archiver",
-    "tsconfig": "./tsconfig.dest.json"
+    "tsconfig": "./tsconfig.json"
   },
   "scripts": {
     "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json",
     "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check",
-    "build": "yarn clean && tsc -b tsconfig.dest.json",
-    "build:dev": "tsc -b tsconfig.dest.json --watch",
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
     "start": "node ./dest",
-    "start:dev": "tsc-watch -p tsconfig.dest.json --onSuccess 'yarn start'",
+    "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
     "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "inherits": [
-    "../package.scripts.json"
+    "../package.common.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
@@ -57,5 +57,11 @@
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.3"
-  }
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dest/index.d.ts"
 }

yarn-project/l1-contracts/tsconfig.dest.json → yarn-project/archiver/tsconfig.json

@@ -7,12 +7,17 @@
   },
   "references": [
     {
-      "path": "../ethereum.js/tsconfig.dest.json"
+      "path": "../ethereum.js"
     },
     {
-      "path": "../foundation/tsconfig.dest.json"
+      "path": "../foundation"
+    },
+    {
+      "path": "../l1-contracts"
+    },
+    {
+      "path": "../types"
     }
   ],
-  "include": ["src"],
-  "exclude": ["**/*.test.*", "**/fixtures/*"]
+  "include": ["src"]
 }

yarn-project/aztec-cli/package.json

@@ -6,23 +6,23 @@
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "displayName": "Aztec cli",
-    "tsconfig": "./tsconfig.dest.json"
+    "tsconfig": "./tsconfig.json"
   },
   "bin": {
     "aztec_cli": "index.js"
   },
   "scripts": {
     "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json",
     "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check",
-    "build": "yarn clean && tsc -b tsconfig.dest.json",
-    "build:dev": "tsc -b tsconfig.dest.json --watch",
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
   },
   "inherits": [
-    "../package.scripts.json"
+    "../package.common.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
@@ -52,5 +52,11 @@
     "ts-jest": "^28.0.7",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
-  }
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dest/index.d.ts"
 }

yarn-project/aztec-cli/tsconfig.dest.json → yarn-project/aztec-cli/tsconfig.json

@@ -7,9 +7,8 @@
   },
   "references": [
     {
-      "path": "../foundation/tsconfig.dest.json"
+      "path": "../foundation"
     }
   ],
-  "exclude": ["**/*.test.*", "**/fixtures/*"],
   "include": ["src"]
 }

yarn-project/aztec-node/package.json

@@ -7,13 +7,13 @@
   "typedoc": {
     "entryPoint": "./src/index.ts",
     "displayName": "Aztec Node",
-    "tsconfig": "./tsconfig.dest.json"
+    "tsconfig": "./tsconfig.json"
   },
   "scripts": {
     "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json",
     "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check",
-    "build": "yarn clean && tsc -b tsconfig.dest.json",
-    "build:dev": "tsc -b tsconfig.dest.json --watch",
+    "build": "yarn clean && tsc -b",
+    "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
@@ -22,16 +22,10 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "inherits": [
-    "../package.scripts.json"
+    "../package.common.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
-    "globals": {
-      "ts-jest": {
-        "useESM": true,
-        "tsconfig": "../tsconfig.json"
-      }
-    },
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.js$": "$1"
     },
@@ -54,12 +48,18 @@
   "devDependencies": {
     "@jest/globals": "^29.4.3",
     "@rushstack/eslint-patch": "^1.1.4",
-    "@types/jest": "^29.4.0",
+    "@types/jest": "^29.5.0",
     "@types/node": "^18.7.23",
     "concurrently": "^7.6.0",
-    "jest": "^28.1.3",
-    "ts-jest": "^28.0.7",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
-  }
+  },
+  "files": [
+    "dest",
+    "src",
+    "!*.test.*"
+  ],
+  "types": "./dest/index.d.ts"
 }

yarn-project/aztec-node/test/aztec_node.test.ts → yarn-project/aztec-node/src/test/aztec_node.test.ts

@@ -5,16 +5,20 @@ import { WalletProvider } from '@aztec/ethereum.js/provider';
 import { EthAddress, createDebugLogger, sleep } from '@aztec/foundation';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/l1-contracts';
 import { Tx } from '@aztec/types';
-import { AztecNode } from '../index.js';
-import { AztecNodeConfig } from './config.js';
-import { createProvider, createTx, deployRollupContract, deployUnverifiedDataEmitterContract } from './fixtures.js';
+import { AztecNode, AztecNodeConfig } from '../index.js';
+import {
+  createProvider,
+  createTx,
+  deployRollupContract,
+  deployUnverifiedDataEmitterContract,
+} from '../aztec-node/fixtures.js';
 
 const ETHEREUM_HOST = 'http://127.0.0.1:8545/';
 const MNEMONIC = 'test test test test test test test test test test test junk';
 
 const logger = createDebugLogger('aztec:e2e_test');
 
-describe('AztecNode', () => {
+describe.skip('AztecNode', () => {
   let rollupAddress: EthAddress;
   let unverifiedDataEmitterAddress: EthAddress;
   let node: AztecNode;