chore: Fix typechecks

eslint.config.mjs

@@ -1,30 +1,22 @@
 // @ts-check
 
-import metamaskConfig from '@metamask/eslint-config';
+import metamaskConfig, { createConfig } from '@metamask/eslint-config';
 import metamaskNodeConfig from '@metamask/eslint-config-nodejs';
 import metamaskTypescriptConfig from '@metamask/eslint-config-typescript';
 import metamaskVitestConfig from '@metamask/eslint-config-vitest';
 import globals from 'globals';
 
-/** @type {import('eslint').Linter.Config[]} */
-const config = [
-  ...metamaskConfig,
-  ...metamaskNodeConfig,
-  ...metamaskTypescriptConfig.map((options) => ({
-    ...options,
-    files: ['**/*.{ts,mts,cts}'],
-  })),
-  ...metamaskVitestConfig.map((options) => ({
-    ...options,
-    files: ['**/*.test.{ts,js}'],
-  })),
+const config = createConfig([
+  {
+    extends: [metamaskConfig, metamaskNodeConfig],
+  },
 
   {
     ignores: ['node_modules', '**/dist', '**/docs', '**/coverage'],
   },
 
   {
-    files: ['**/*.{js,mjs}'],
+    files: ['**/*.js', '**/*.mjs'],
     languageOptions: {
       sourceType: 'module',
     },
@@ -40,41 +32,15 @@ const config = [
   {
     languageOptions: {
       parserOptions: {
-        tsconfigRootDir: new URL('.', import.meta.url).pathname,
-      },
-      globals: {
-        ...globals['shared-node-browser'],
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
       },
     },
-    rules: {
-      'import-x/no-useless-path-segments': [
-        'error',
-        {
-          // Enabling this causes false errors in ESM files.
-          noUselessIndex: false,
-        },
-      ],
-
-      // We have been hoisted by our own petard in the past.
-      'import-x/no-cycle': ['error', { ignoreExternal: true, maxDepth: 3 }],
-
-      // This is not compatible with ESM.
-      'import-x/extensions': 'off',
-
-      // We use unassigned imports for e.g. `import '@ocap/shims/endoify'`.
-      'import-x/no-unassigned-import': 'off',
-
-      // This prevents pretty formatting of comments with multi-line lists entries.
-      'jsdoc/check-indentation': 'off',
-
-      // This prevents using Node.js and/or browser specific globals. We
-      // currently use both in our codebase, so this rule is disabled.
-      'no-restricted-globals': 'off',
-    },
   },
 
   {
-    files: ['**/*.{ts,mts,cts}'],
+    files: ['**/*.ts', '**/*.mts', '**/*.cts'],
+    extends: [metamaskTypescriptConfig],
     rules: {
       '@typescript-eslint/explicit-function-return-type': [
         'error',
@@ -96,6 +62,7 @@ const config = [
 
   {
     files: ['**/*.test.ts'],
+    extends: [metamaskVitestConfig],
     rules: {
       // This causes false positives in tests especially.
       '@typescript-eslint/unbound-method': 'off',
@@ -115,6 +82,39 @@ const config = [
     },
   },
 
+  {
+    languageOptions: {
+      globals: {
+        ...globals['shared-node-browser'],
+      },
+    },
+    rules: {
+      'import-x/no-useless-path-segments': [
+        'error',
+        {
+          // Enabling this causes false errors in ESM files.
+          noUselessIndex: false,
+        },
+      ],
+
+      // We have been hoisted by our own petard in the past.
+      'import-x/no-cycle': ['error', { ignoreExternal: true, maxDepth: 3 }],
+
+      // This is not compatible with ESM.
+      'import-x/extensions': 'off',
+
+      // We use unassigned imports for e.g. `import '@ocap/shims/endoify'`.
+      'import-x/no-unassigned-import': 'off',
+
+      // This prevents pretty formatting of comments with multi-line lists entries.
+      'jsdoc/check-indentation': 'off',
+
+      // This prevents using Node.js and/or browser specific globals. We
+      // currently use both in our codebase, so this rule is disabled.
+      'no-restricted-globals': 'off',
+    },
+  },
+
   // ////////////////////////// //
   // Package-specific overrides //
   // ////////////////////////// //
@@ -125,6 +125,6 @@ const config = [
       globals: { lockdown: 'readonly' },
     },
   },
-];
+]);
 
 export default config;

package.json

@@ -29,12 +29,13 @@
     "postinstall": "simple-git-hooks",
     "prepack": "./scripts/prepack.sh",
     "test": "yarn workspaces foreach --all --parallel --verbose run test",
+    "test:ts": "yarn workspaces foreach --all --parallel --verbose run test:ts",
     "test:clean": "yarn workspaces foreach --all --parallel --verbose run test:clean && yarn test",
     "test:verbose": "yarn workspaces foreach --all --parallel --verbose run test:verbose",
     "why:batch": "./scripts/why-batch.sh"
   },
   "simple-git-hooks": {
-    "pre-commit": "yarn lint-staged && yarn dedupe --check"
+    "pre-commit": "yarn lint-staged && yarn test:ts && yarn dedupe --check"
   },
   "lint-staged": {
     "*.{js,mjs,cjs,ts,mts,cts}": [

packages/errors/package.json

@@ -36,6 +36,7 @@
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore",
     "publish:preview": "yarn npm publish --tag preview",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",
     "test:verbose": "yarn test --reporter verbose",

packages/errors/src/BaseError.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect } from 'vitest';
 
 import { BaseError } from './BaseError.js';
 import { ErrorCode } from './constants.js';
+import { unmarshalErrorOptions } from './marshal/unmarshalError.js';
 import type { MarshaledOcapError } from './types.js';
 
 describe('BaseError', () => {
@@ -57,9 +58,9 @@ describe('BaseError', () => {
   });
 
   it('throws an error when unmarshal is called', () => {
-    expect(() => BaseError.unmarshal({} as MarshaledOcapError)).toThrow(
-      'Unmarshal method not implemented',
-    );
+    expect(() =>
+      BaseError.unmarshal({} as MarshaledOcapError, unmarshalErrorOptions),
+    ).toThrow('Unmarshal method not implemented');
   });
 
   it('initializes the stack property automatically if not provided', () => {

packages/errors/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

packages/errors/vitest.config.ts

@@ -4,6 +4,7 @@
 import path from 'path';
 import { defineConfig, mergeConfig } from 'vite';
 
+// @ts-expect-error - no declaration for module
 import { getDefaultConfig } from '../../vitest.config.packages.js';
 
 const defaultConfig = getDefaultConfig();

packages/extension/package.json

@@ -26,6 +26,7 @@
     "publish:preview": "yarn npm publish --tag preview",
     "start": "yarn build:vite:dev --watch",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:build": "node ./test/build-tests.mjs",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",

packages/extension/tsconfig.json

@@ -22,6 +22,7 @@
     "./vite-plugins/*.ts",
     "./test/**/*.ts",
     "./vite.config.ts",
-    "./vitest.config.ts"
+    "./vitest.config.ts",
+    "./scripts/build-constants.mjs"
   ]
 }

packages/extension/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src", "./test", "./scripts"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

packages/extension/vite.config.ts

@@ -11,8 +11,8 @@ import {
   buildDir,
   jsTrustedPreludes,
 } from './scripts/build-constants.mjs';
-import { htmlTrustedPrelude } from './vite-plugins/html-trusted-prelude';
-import { jsTrustedPrelude } from './vite-plugins/js-trusted-prelude';
+import { htmlTrustedPrelude } from './vite-plugins/html-trusted-prelude.js';
+import { jsTrustedPrelude } from './vite-plugins/js-trusted-prelude.js';
 
 /**
  * Files that need to be statically copied to the destination directory.

packages/kernel/package.json

@@ -36,6 +36,7 @@
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore",
     "publish:preview": "yarn npm publish --tag preview",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",
     "test:verbose": "yarn test --reporter verbose",

packages/kernel/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src", "./test"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

packages/shims/package.json

@@ -30,6 +30,7 @@
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore",
     "publish:preview": "yarn npm publish --tag preview",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",
     "test:verbose": "yarn test --reporter verbose",

packages/shims/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

packages/streams/package.json

@@ -40,6 +40,7 @@
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore",
     "publish:preview": "yarn npm publish --tag preview",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",
     "test:verbose": "yarn test --reporter verbose",

packages/streams/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src", "./test"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

packages/utils/package.json

@@ -36,6 +36,7 @@
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.html' '!**/CHANGELOG.old.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path ../../.gitignore",
     "publish:preview": "yarn npm publish --tag preview",
     "test": "vitest run --config vitest.config.ts",
+    "test:ts": "tsc --project tsconfig.test.json --noEmit",
     "test:clean": "yarn test --no-cache --coverage.clean",
     "test:dev": "yarn test --coverage false",
     "test:verbose": "yarn test --reporter verbose",

packages/utils/tsconfig.test.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "skipLibCheck": true
+  },
+  "include": ["./src"],
+  "exclude": ["./vite.config.ts", "./vitest.config.ts"]
+}

yarn.config.cjs

@@ -233,8 +233,8 @@ module.exports = defineConfig({
           );
           expectWorkspaceField(
             workspace,
-            'scripts.test',
-            'vitest run --config vitest.config.ts',
+            'scripts.test:ts',
+            'tsc --project tsconfig.test.json --noEmit',
           );
           expectWorkspaceField(
             workspace,