Merge pull request #1796 from endojs/ta/type-coverage

endojs · Oct 18, 2023 · 54ff59f · 54ff59f
2 parents 41e1215 + 72f9a4f
commit 54ff59f
Show file tree

Hide file tree

Showing 164 changed files with 924 additions and 463 deletions.
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "eslint-plugin-jsdoc": "^46.4.3",
     "lerna": "^5.6.2",
     "lerna-update-wizard": "^0.17.5",
+    "type-coverage": "^2.26.3",
     "typescript": "~5.2.2"
   },
   "scripts": {
@@ -45,5 +46,8 @@
   "prettier": {
     "arrowParens": "avoid",
     "singleQuote": true
+  },
+  "typeCoverage": {
+    "atLeast": 0
   }
 }
diff --git a/packages/base64/jsconfig.json b/packages/base64/jsconfig.json
diff --git a/packages/base64/package.json b/packages/base64/package.json
@@ -31,13 +31,13 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "cover": "c8 ava",
     "lint": "yarn lint:types && yarn lint:js",
     "lint-fix": "eslint --fix .",
     "lint:js": "eslint .",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "test": "ava"
   },
   "devDependencies": {
@@ -72,5 +72,8 @@
       "test/**/test-*.js"
     ],
     "timeout": "2m"
+  },
+  "typeCoverage": {
+    "atLeast": 95.21
   }
 }
diff --git a/packages/captp/jsconfig.build.json → packages/base64/tsconfig.build.json b/packages/captp/jsconfig.build.json → packages/base64/tsconfig.build.json
@@ -1,10 +1,13 @@
 {
-  "extends": "./jsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
+    "allowJs": true,
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
     "declarationMap": true
   },
-  "exclude": ["test/"]
+  "exclude": [
+    "test/"
+  ]
 }
diff --git a/packages/base64/tsconfig.json b/packages/base64/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.eslint-base.json",
+  "include": [
+    "*.js",
+    "*.ts",
+    "src/**/*.js",
+    "src/**/*.ts"
+  ]
+}
diff --git a/packages/bundle-source/jsconfig.json b/packages/bundle-source/jsconfig.json
diff --git a/packages/bundle-source/package.json b/packages/bundle-source/package.json
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
@@ -26,7 +26,7 @@
     "lint-check-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.js'",
     "lint": "yarn lint:types && yarn lint:eslint",
     "lint:eslint": "eslint '**/*.js'",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc"
   },
   "dependencies": {
     "@agoric/babel-generator": "^7.17.4",
@@ -82,5 +82,8 @@
     "extends": [
       "plugin:@endo/internal"
     ]
+  },
+  "typeCoverage": {
+    "atLeast": 67.65
   }
 }
diff --git a/packages/bundle-source/jsconfig.build.json → packages/bundle-source/tsconfig.build.json b/packages/bundle-source/jsconfig.build.json → packages/bundle-source/tsconfig.build.json
@@ -1,10 +1,13 @@
 {
-  "extends": "./jsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
+    "allowJs": true,
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
     "declarationMap": true
   },
-  "exclude": ["test/"]
+  "exclude": [
+    "test/"
+  ]
 }
diff --git a/packages/bundle-source/tsconfig.json b/packages/bundle-source/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.eslint-base.json",
+  "compilerOptions": {
+    "maxNodeModuleJsDepth": 1,
+    "checkJs": false
+  },
+  "include": [
+    "*.js",
+    "*.ts",
+    "src/**/*.js",
+    "src/**/*.ts"
+  ]
+}
diff --git a/packages/captp/jsconfig.json b/packages/captp/jsconfig.json
diff --git a/packages/captp/package.json b/packages/captp/package.json
@@ -30,7 +30,7 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js",
@@ -39,7 +39,7 @@
     "lint-fix": "yarn lint:eslint --fix && yarn lint:types",
     "lint": "yarn lint:eslint && yarn lint:types",
     "lint:eslint": "eslint '**/*.js'",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc"
   },
   "devDependencies": {
     "@endo/init": "^0.5.60",
@@ -69,5 +69,8 @@
     "extends": [
       "plugin:@endo/internal"
     ]
+  },
+  "typeCoverage": {
+    "atLeast": 86.52
   }
 }
diff --git a/packages/captp/src/ts-types.d.ts b/packages/captp/src/ts-types.d.ts
@@ -1,7 +1,8 @@
 /* eslint-disable */
 // eslint-disable-next-line spaced-comment
 
-import type { Unpromise } from '@endo/eventual-send';
+// @ts-expect-error FIXME these aren't defined
+import type { ESingleMethod, Unpromise } from '@endo/eventual-send';
 
 /**
  * In order to type using Trap with a handler TrapHandler<T>, this template type
@@ -21,11 +22,14 @@ export type TrapHandler<T> = T extends (...args: infer P) => infer R
 /* Types for Trap proxy calls. */
 type TrapSingleMethod<T> = {
   readonly [P in keyof T]: (
+    // @ts-expect-error FIXME Type 'T[P]' does not satisfy the constraint '(...args: any) => any'.
     ...args: Parameters<T[P]>
+    // @ts-expect-error FIXME ditto
   ) => Unpromise<ReturnType<T[P]>>;
 };
 type TrapSingleCall<T> = T extends Function
-  ? ((...args: Parameters<T>) => Unpromise<ReturnType<T>>) &
+  ? // @ts-expect-error FIXME ditto
+    ((...args: Parameters<T>) => Unpromise<ReturnType<T>>) &
       ESingleMethod<Required<T>>
   : ESingleMethod<Required<T>>;
 type TrapSingleGet<T> = {

diff --git a/packages/check-bundle/jsconfig.build.json → packages/captp/tsconfig.build.json b/packages/check-bundle/jsconfig.build.json → packages/captp/tsconfig.build.json
@@ -1,10 +1,13 @@
 {
-  "extends": "./jsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
+    "allowJs": true,
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
     "declarationMap": true
   },
-  "exclude": ["test/"]
+  "exclude": [
+    "test/"
+  ]
 }
diff --git a/packages/captp/tsconfig.json b/packages/captp/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.eslint-base.json",
+  "compilerOptions": {
+    "checkJs": true,
+    "maxNodeModuleJsDepth": 2
+  },
+  "include": [
+    "*.js",
+    "*.ts",
+    "src/**/*.js",
+    "src/**/*.ts"
+  ]
+}
diff --git a/packages/check-bundle/jsconfig.json b/packages/check-bundle/jsconfig.json
diff --git a/packages/check-bundle/package.json b/packages/check-bundle/package.json
@@ -29,12 +29,12 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "lint": "yarn lint:types && yarn lint:js",
     "lint-fix": "eslint --fix .",
     "lint:js": "eslint .",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava --config=ava-nesm.config.js"
   },
@@ -77,5 +77,8 @@
       "test/**/test-*.js"
     ],
     "timeout": "2m"
+  },
+  "typeCoverage": {
+    "atLeast": 86.95
   }
 }
diff --git a/packages/base64/jsconfig.build.json → packages/check-bundle/tsconfig.build.json b/packages/base64/jsconfig.build.json → packages/check-bundle/tsconfig.build.json
@@ -1,10 +1,13 @@
 {
-  "extends": "./jsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
+    "allowJs": true,
     "noEmit": false,
     "declaration": true,
     "emitDeclarationOnly": true,
     "declarationMap": true
   },
-  "exclude": ["test/"]
+  "exclude": [
+    "test/"
+  ]
 }
diff --git a/packages/check-bundle/tsconfig.json b/packages/check-bundle/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.eslint-base.json",
+  "include": [
+    "*.js",
+    "*.ts",
+    "src/**/*.js",
+    "src/**/*.ts"
+  ]
+}
diff --git a/packages/cjs-module-analyzer/jsconfig.build.json b/packages/cjs-module-analyzer/jsconfig.build.json
diff --git a/packages/cjs-module-analyzer/jsconfig.json b/packages/cjs-module-analyzer/jsconfig.json
diff --git a/packages/cjs-module-analyzer/package.json b/packages/cjs-module-analyzer/package.json
@@ -21,13 +21,13 @@
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "cover": "c8 ava",
     "lint": "yarn lint:types && yarn lint:js",
     "lint-fix": "eslint --fix .",
     "lint:js": "eslint .",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "test": "ava"
   },
   "devDependencies": {
@@ -61,5 +61,8 @@
       "test/**/test-*.js"
     ],
     "timeout": "2m"
+  },
+  "typeCoverage": {
+    "atLeast": 39.57
   }
 }
diff --git a/packages/cjs-module-analyzer/tsconfig.build.json b/packages/cjs-module-analyzer/tsconfig.build.json
@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "noEmit": false,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "declarationMap": true
+  },
+  "exclude": [
+    "test/"
+  ]
+}
diff --git a/packages/cjs-module-analyzer/tsconfig.json b/packages/cjs-module-analyzer/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.eslint-base.json",
+  "include": [
+    "*.js",
+    "*.ts",
+    "src/**/*.js",
+    "src/**/*.ts"
+  ]
+}
diff --git a/packages/cli/jsconfig.build.json b/packages/cli/jsconfig.build.json
diff --git a/packages/cli/jsconfig.json b/packages/cli/jsconfig.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -17,12 +17,12 @@
   "exports": {},
   "scripts": {
     "build": "exit 0",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "lint": "yarn lint:types && yarn lint:js",
     "lint-fix": "eslint --fix .",
     "lint:js": "eslint .",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "test": "exit 0"
   },
   "dependencies": {
@@ -65,5 +65,8 @@
       "test/**/test-*.js"
     ],
     "timeout": "2m"
+  },
+  "typeCoverage": {
+    "atLeast": 86.18
   }
 }