Small fixes

Author: andrewbranch

package-lock.json

@@ -21,7 +21,7 @@
     "@types/node": "^18.11.18",
     "esbuild": "^0.18.12",
     "prettier": "^3.0.3",
-    "typescript": "^5.3.0-dev.20231007"
+    "typescript": "^5.2.2"
   },
   "volta": {
     "node": "19.8.1"

package.json

@@ -69,9 +69,12 @@ export async function typed(analysis: core.Analysis, opts: Opts) {
     return chalk.bold[color](entrypointNames[i]);
   });
 
-  const getCellContents = memo((entrypoint: string, resolutionKind: core.ResolutionKind) => {
-    const problemsForCell = groupProblemsByKind(filterProblems(problems, analysis, { entrypoint, resolutionKind }));
-    const resolution = analysis.entrypoints[entrypoint].resolutions[resolutionKind].resolution;
+  const getCellContents = memo((subpath: string, resolutionKind: core.ResolutionKind) => {
+    const problemsForCell = groupProblemsByKind(
+      filterProblems(problems, analysis, { entrypoint: subpath, resolutionKind }),
+    );
+    const entrypoint = analysis.entrypoints[subpath].resolutions[resolutionKind];
+    const resolution = entrypoint.resolution;
     const kinds = Object.keys(problemsForCell) as core.ProblemKind[];
     if (kinds.length) {
       return kinds
@@ -80,12 +83,13 @@ export async function typed(analysis: core.Analysis, opts: Opts) {
     }
 
     const jsonResult = !opts.emoji ? "OK (JSON)" : "🟢 (JSON)";
-    const moduleResult =
-      (!opts.emoji ? "OK " : "🟢 ") +
-      moduleKinds[
-        analysis.programInfo[getResolutionOption(resolutionKind)].moduleKinds?.[resolution?.fileName ?? ""]
-          ?.detectedKind || ""
-      ];
+    const moduleResult = entrypoint.isWildcard
+      ? "(wildcard)"
+      : (!opts.emoji ? "OK " : "🟢 ") +
+        moduleKinds[
+          analysis.programInfo[getResolutionOption(resolutionKind)].moduleKinds?.[resolution?.fileName ?? ""]
+            ?.detectedKind || ""
+        ];
     return resolution?.isJson ? jsonResult : moduleResult;
   });
 

packages/cli/src/render/typed.ts

@@ -57,7 +57,7 @@
   "devDependencies": {
     "@types/node": "^18.15.11",
     "@types/semver": "^7.5.0",
-    "@types/ts-expose-internals": "npm:ts-expose-internals@5.1.3",
+    "@types/ts-expose-internals": "npm:ts-expose-internals@5.2.2",
     "@types/validate-npm-package-name": "^4.0.0"
   },
   "volta": {

packages/core/package.json

@@ -241,11 +241,8 @@ function getEntrypointResolution(
   const moduleSpecifier = packageName + entrypoint.substring(1); // remove leading . before slash
   const importingFileName = resolutionKind === "node16-esm" ? "/index.mts" : "/index.ts";
   const resolutionMode = resolutionKind === "node16-esm" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
-
   const resolution = tryResolve();
-  const implementationResolution =
-    !resolution || ts.isDeclarationFileName(resolution.fileName) ? tryResolve(/*noDtsResolution*/ true) : undefined;
-
+  const implementationResolution = tryResolve(/*noDtsResolution*/ true);
   const files = resolution
     ? host
         .createProgram([resolution.fileName])

packages/core/src/checkPackage.ts

@@ -9,6 +9,10 @@ export default defineCheck({
   execute: ([subpath, resolutionKind], context) => {
     const problems: Problem[] = [];
     const entrypoint = context.entrypoints[subpath].resolutions[resolutionKind];
+    if (entrypoint.isWildcard) {
+      return;
+    }
+
     if (!entrypoint.resolution) {
       problems.push({
         kind: "NoResolution",
@@ -24,9 +28,14 @@ export default defineCheck({
     }
 
     if (
-      entrypoint.resolution &&
       resolutionKind === "node16-cjs" &&
-      context.programInfo["node16"].moduleKinds![entrypoint.resolution.fileName].detectedKind === ts.ModuleKind.ESNext
+      ((!entrypoint.implementationResolution &&
+        entrypoint.resolution &&
+        context.programInfo["node16"].moduleKinds![entrypoint.resolution.fileName]?.detectedKind ===
+          ts.ModuleKind.ESNext) ||
+        (entrypoint.implementationResolution &&
+          context.programInfo["node16"].moduleKinds![entrypoint.implementationResolution.fileName]?.detectedKind ===
+            ts.ModuleKind.ESNext))
     ) {
       problems.push({
         kind: "CJSResolvesToESM",

packages/core/src/internal/checks/entrypointResolutions.ts

@@ -16,7 +16,7 @@ export default defineCheck({
     return [typesFileName, implementationFileName];
   },
   execute: ([typesFileName, implementationFileName], context) => {
-    if (!typesFileName || !implementationFileName) {
+    if (!typesFileName || !implementationFileName || !ts.hasTSFileExtension(typesFileName)) {
       return;
     }
     const host = context.hosts.findHostForFiles([typesFileName])!;

packages/core/src/internal/checks/exportDefaultDisagreement.ts

@@ -6,10 +6,10 @@ import moduleKindDisagreement from "./moduleKindDisagreement.js";
 import unexpectedModuleSyntax from "./unexpectedModuleSyntax.js";
 
 export default [
-  cjsOnlyExportsDefault,
   entrypointResolutions,
-  exportDefaultDisagreement,
-  internalResolutionError,
   moduleKindDisagreement,
+  exportDefaultDisagreement,
+  cjsOnlyExportsDefault,
   unexpectedModuleSyntax,
+  internalResolutionError,
 ];

packages/core/src/internal/checks/index.ts

@@ -36,16 +36,16 @@ export type Serializable =
   | undefined
   | boolean
   | { [key: string]: Serializable }
-  | Serializable[];
+  | readonly Serializable[];
 
 export interface AnyCheck {
   name: string;
   enumerateFiles?: boolean;
-  dependencies: (context: CheckDependenciesContext<boolean>) => EnsureSerializable<any[]>;
+  dependencies: (context: CheckDependenciesContext<boolean>) => EnsureSerializable<readonly any[]>;
   execute: (dependencies: any, context: CheckExecutionContext) => Problem[] | Problem | undefined;
 }
 
-export function defineCheck<const Dependencies extends any[], EnumerateFiles extends boolean>(options: {
+export function defineCheck<const Dependencies extends readonly any[], EnumerateFiles extends boolean>(options: {
   name: string;
   enumerateFiles?: EnumerateFiles;
   dependencies: (context: CheckDependenciesContext<EnumerateFiles>) => EnsureSerializable<Dependencies>;

packages/core/src/internal/defineCheck.ts

@@ -61,7 +61,7 @@ export function ChecksTable(props: { analysis?: CheckResult }) {
                       )
                       .join("<br />")
                   : resolutionInfo.isWildcard
-                  ? "❓ (wildcard)"
+                  ? "(wildcard)"
                   : resolutionInfo.resolution?.isJson
                   ? "✅ (JSON)"
                   : "✅ " +