@cplieger/deadset-ts 7.1.0 → 7.2.0-dev.2

package/src/verbs/analyze.ts

@@ -6,7 +6,7 @@ import {
   type RunAnalysis,
   type RunProject,
 } from "../analysis.ts";
-import { ConfigError, type Format } from "../config.ts";
+import { ConfigError, kindOf, type Format } from "../config.ts";
 import { CONFORMANCE, DECLARED_GAPS } from "../conformance.ts";
 import { moduleIdentity } from "../consumers.ts";
 import { analyzerProvenance, verdictOf } from "../findings-pass.ts";
@@ -16,6 +16,7 @@ import type { NotBuilt } from "../discover.ts";
 import { partialNotes } from "../partial.ts";
 import {
   buildReport,
+  LANGUAGE,
   capFindings,
   sortFindings,
   type Report,
@@ -265,7 +266,11 @@ export const analyzeVerb: Verb = ({ err, host, inputs, scope, openClient, option
       version,
       conformance: CONFORMANCE,
       declaredGaps: DECLARED_GAPS,
-      target: { kind, root, identity: moduleIdentity(host, scoped.target) },
+      target: {
+        kind: kindOf(kind, LANGUAGE),
+        root,
+        identity: moduleIdentity(host, scoped.target),
+      },
       configurations: configurationsOf(run.projects, targetRoot),
       notBuilt: notBuiltOf(run.notBuilt, targetRoot),
       loaded: run.consumers.map((consumer) => ({

package/src/version.ts

@@ -4,4 +4,4 @@
  * independently of the analyzer's own version, which is the one the host answers
  * from the package the analyzer was installed from.
  */
-export const CONTRACT_VERSION = "7.1.0";
+export const CONTRACT_VERSION = "7.2.0";

package/src/workspace-resolution.ts

@@ -45,7 +45,6 @@ const DEPENDENCY_MEMBERS = [
 ] as const;
 
 const SOURCE = /(?<!\.d)\.(?:[mc]?ts|tsx)$/u;
-const OUTPUT = /(?:\.d\.[mc]?ts|\.[mc]?js|\.jsx)$/u;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -70,7 +69,7 @@ export function packageNameOf(specifier: string): string | undefined {
 }
 
 function inside(dir: string, path: string): boolean {
-  return path === dir || relativePath(dir, path) !== undefined;
+  return relativePath(dir, path) !== undefined;
 }
 
 /** The `exports` entry one subpath selects, with what a pattern's `*` matched. */
@@ -274,12 +273,10 @@ export function workspaceResolver(host: Host, workspace: Workspace): WorkspaceRe
         return found;
       }
     }
-    if (OUTPUT.test(path)) {
-      const beside = emittedFrom(path, { sourceDirs: [] });
-      const found = beside.find((candidate) => host.kindOf(candidate) === "file");
-      if (found !== undefined) {
-        return found;
-      }
+    const beside = emittedFrom(path, { sourceDirs: [] });
+    const found = beside.find((candidate) => host.kindOf(candidate) === "file");
+    if (found !== undefined) {
+      return found;
     }
     return compiled(member, path) && host.kindOf(path) === "file" ? path : undefined;
   };

package/src/workspace.ts

@@ -266,7 +266,7 @@ function memberDirectories(
   }
   return [...included].filter((dir) => {
     const below = relativePath(root, dir);
-    const segments = below === undefined || below === "." || below === "" ? [] : below.split("/");
+    const segments = below === undefined ? [] : below.split("/");
     return dir === root || !excluded.some((pattern) => pathMatches(pattern, segments));
   });
 }
@@ -274,7 +274,7 @@ function memberDirectories(
 /** Whether a workspace's patterns name one directory below its root, read without listing any. */
 function namesDirectory(root: string, patterns: readonly string[], dir: string): boolean {
   const below = relativePath(root, dir);
-  if (below === undefined || below === "" || below.startsWith("..")) {
+  if (below === undefined || below.startsWith("..")) {
     return false;
   }
   const path = below.split("/");