@ontrails/adapter-kit 1.0.0-beta.29 → 1.0.0-beta.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ontrails/adapter-kit",
-  "version": "1.0.0-beta.29",
+  "version": "1.0.0-beta.32",
   "description": "Internal adapter authoring kit for Trails metadata, scaffolding, and checks.",
   "files": [
     "src/**/*.ts",
@@ -19,5 +19,8 @@
     "typecheck": "tsc --noEmit",
     "lint": "oxlint ./src",
     "clean": "rm -rf dist *.tsbuildinfo"
+  },
+  "dependencies": {
+    "@ontrails/core": "^1.0.0-beta.32"
   }
 }

package/src/catalog.ts

@@ -6,15 +6,11 @@
  * internal tooling package.
  */
 
-import {
-  existsSync,
-  readdirSync,
-  readFileSync,
-  realpathSync,
-  statSync,
-} from 'node:fs';
+import { existsSync, readFileSync, realpathSync, statSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 
+import { listWorkspacePackages } from '@ontrails/core';
+
 export const adapterTargetPlacements = ['extracted', 'subpath'] as const;
 
 export type AdapterTargetPlacementValue =
@@ -66,16 +62,16 @@ export interface AdapterTargetCatalog {
   readonly targets: readonly AdapterTargetCatalogEntry[];
 }
 
-interface RootManifest {
-  readonly workspaces?: unknown;
-}
-
 export interface AdapterTargetPackageManifest {
   readonly exports?: unknown;
   readonly name?: unknown;
   readonly trails?: unknown;
 }
 
+type NamedAdapterTargetPackageManifest = AdapterTargetPackageManifest & {
+  readonly name: string;
+};
+
 export interface AdapterTargetParseContext {
   readonly blockedExportSpecifiers: readonly string[];
   readonly exportTargets: Readonly<Record<string, string>>;
@@ -181,14 +177,6 @@ const localDeclarationKind = (
   return typeDeclarationPattern.test(code) ? 'type' : undefined;
 };
 
-const readJson = <T>(path: string): T | undefined => {
-  try {
-    return JSON.parse(readFileSync(path, 'utf8')) as T;
-  } catch {
-    return undefined;
-  }
-};
-
 const maskDeadSourceText = (
   source: string,
   options: { strings: boolean }
@@ -414,44 +402,6 @@ const exportedLocalBindingKind = (
   return importSpecifier ? resolveImportKind(importSpecifier) : undefined;
 };
 
-const workspacePatternsFromManifest = (
-  manifest: RootManifest | undefined
-): readonly string[] => {
-  const { workspaces } = manifest ?? {};
-  if (Array.isArray(workspaces)) {
-    return workspaces.filter(
-      (pattern): pattern is string => typeof pattern === 'string'
-    );
-  }
-
-  const packages = isRecord(workspaces) ? workspaces['packages'] : undefined;
-  return Array.isArray(packages)
-    ? packages.filter(
-        (pattern): pattern is string => typeof pattern === 'string'
-      )
-    : [];
-};
-
-const workspaceDirsForPattern = (
-  rootDir: string,
-  pattern: string
-): readonly string[] => {
-  if (!pattern.endsWith('/*')) {
-    const workspaceDir = join(rootDir, pattern);
-    return existsSync(workspaceDir) ? [workspaceDir] : [];
-  }
-
-  const groupDir = join(rootDir, pattern.slice(0, -2));
-  if (!existsSync(groupDir)) {
-    return [];
-  }
-
-  return readdirSync(groupDir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => join(groupDir, entry.name))
-    .toSorted();
-};
-
 const exportConditions = new Set([
   'bun',
   'node',
@@ -1401,40 +1351,27 @@ export const parseAdapterTargetsFromManifest = (
 export const deriveAdapterTargetCatalog = (
   rootDir: string
 ): AdapterTargetCatalog => {
-  const normalizedRoot = normalizeRealPath(rootDir);
-  const rootManifest = readJson<RootManifest>(
-    join(normalizedRoot, 'package.json')
-  );
   const diagnostics: AdapterTargetCatalogDiagnostic[] = [];
   const targets: AdapterTargetCatalogEntry[] = [];
 
-  for (const pattern of workspacePatternsFromManifest(rootManifest)) {
-    for (const workspaceDir of workspaceDirsForPattern(
-      normalizedRoot,
-      pattern
-    )) {
-      const packageJsonPath = join(workspaceDir, 'package.json');
-      const manifest = readJson<AdapterTargetPackageManifest>(packageJsonPath);
-      if (!manifest || typeof manifest.name !== 'string') {
-        continue;
-      }
-
-      const packageRoot = normalizeRealPath(dirname(packageJsonPath));
-      const normalizedExports = normalizeExportTargets(
-        packageRoot,
-        manifest.name,
-        manifest.exports
-      );
-      const parsed = parseAdapterTargetsFromManifest(manifest, {
-        blockedExportSpecifiers: normalizedExports.blocked,
-        exportTargets: normalizedExports.targets,
-        packageJsonPath: normalizeRealPath(packageJsonPath),
-        packageName: manifest.name,
-        packageRoot,
-      });
-      diagnostics.push(...parsed.diagnostics);
-      targets.push(...parsed.targets);
-    }
+  for (const workspacePackage of listWorkspacePackages<NamedAdapterTargetPackageManifest>(
+    rootDir
+  )) {
+    const { manifest, packageJsonPath, packageRoot } = workspacePackage;
+    const normalizedExports = normalizeExportTargets(
+      packageRoot,
+      manifest.name,
+      manifest.exports
+    );
+    const parsed = parseAdapterTargetsFromManifest(manifest, {
+      blockedExportSpecifiers: normalizedExports.blocked,
+      exportTargets: normalizedExports.targets,
+      packageJsonPath,
+      packageName: manifest.name,
+      packageRoot,
+    });
+    diagnostics.push(...parsed.diagnostics);
+    targets.push(...parsed.targets);
   }
 
   const sortedTargets = targets.toSorted((left, right) =>

package/src/check.ts

@@ -14,6 +14,12 @@ import {
 } from 'node:fs';
 import { dirname, join, relative, resolve } from 'node:path';
 
+import { escapeRegExp, listWorkspacePackages } from '@ontrails/core';
+import type {
+  DiagnosticBase,
+  WorkspacePackage as CoreWorkspacePackage,
+} from '@ontrails/core';
+
 import { deriveAdapterTargetCatalog } from './catalog.js';
 import type {
   AdapterTargetCatalog,
@@ -33,15 +39,14 @@ export type AdapterCheckDiagnosticCode =
   | 'unknown-adapter-target'
   | 'unsupported-placement';
 
-export type AdapterCheckDiagnosticSeverity = 'error' | 'warn';
+export type AdapterCheckDiagnosticSeverity = DiagnosticBase['severity'];
 
-export interface AdapterCheckDiagnostic {
+export interface AdapterCheckDiagnostic extends DiagnosticBase<AdapterCheckDiagnosticCode> {
   readonly code: AdapterCheckDiagnosticCode;
   readonly message: string;
   readonly packageJsonPath: string;
   readonly packageName?: string | undefined;
   readonly placement?: AdapterTargetPlacement | undefined;
-  readonly severity: AdapterCheckDiagnosticSeverity;
   readonly target?: string | undefined;
 }
 
@@ -93,10 +98,6 @@ export interface AdapterCheckReport {
   readonly targets: readonly AdapterTargetCatalogEntry[];
 }
 
-interface RootManifest {
-  readonly workspaces?: unknown;
-}
-
 interface AdapterCheckPackageManifest {
   readonly dependencies?: unknown;
   readonly devDependencies?: unknown;
@@ -107,12 +108,7 @@ interface AdapterCheckPackageManifest {
   readonly trails?: unknown;
 }
 
-interface WorkspacePackage {
-  readonly manifest: AdapterCheckPackageManifest;
-  readonly packageJsonPath: string;
-  readonly packageRoot: string;
-  readonly workspacePath: string;
-}
+type WorkspacePackage = CoreWorkspacePackage<AdapterCheckPackageManifest>;
 
 interface AdapterMetadata {
   readonly target: string;
@@ -135,84 +131,8 @@ const normalizeRealPath = (path: string): string => {
   }
 };
 
-const readJson = <T>(path: string): T | undefined => {
-  try {
-    return JSON.parse(readFileSync(path, 'utf8')) as T;
-  } catch {
-    return undefined;
-  }
-};
-
-const workspacePatternsFromManifest = (
-  manifest: RootManifest | undefined
-): readonly string[] => {
-  const { workspaces } = manifest ?? {};
-  if (Array.isArray(workspaces)) {
-    return workspaces.filter(
-      (pattern): pattern is string => typeof pattern === 'string'
-    );
-  }
-
-  const packages = isRecord(workspaces) ? workspaces['packages'] : undefined;
-  return Array.isArray(packages)
-    ? packages.filter(
-        (pattern): pattern is string => typeof pattern === 'string'
-      )
-    : [];
-};
-
-const workspaceDirsForPattern = (
-  rootDir: string,
-  pattern: string
-): readonly string[] => {
-  if (!pattern.endsWith('/*')) {
-    const workspaceDir = join(rootDir, pattern);
-    return existsSync(workspaceDir) ? [workspaceDir] : [];
-  }
-
-  const groupDir = join(rootDir, pattern.slice(0, -2));
-  if (!existsSync(groupDir)) {
-    return [];
-  }
-
-  return readdirSync(groupDir, { withFileTypes: true })
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => join(groupDir, entry.name))
-    .toSorted();
-};
-
-const workspacePackages = (rootDir: string): readonly WorkspacePackage[] => {
-  const normalizedRoot = normalizeRealPath(rootDir);
-  const rootManifest = readJson<RootManifest>(
-    join(normalizedRoot, 'package.json')
-  );
-  const packages: WorkspacePackage[] = [];
-
-  for (const pattern of workspacePatternsFromManifest(rootManifest)) {
-    for (const workspaceDir of workspaceDirsForPattern(
-      normalizedRoot,
-      pattern
-    )) {
-      const packageJsonPath = join(workspaceDir, 'package.json');
-      const manifest = readJson<AdapterCheckPackageManifest>(packageJsonPath);
-      if (!manifest || typeof manifest.name !== 'string') {
-        continue;
-      }
-
-      const packageRoot = normalizeRealPath(dirname(packageJsonPath));
-      packages.push({
-        manifest,
-        packageJsonPath: normalizeRealPath(packageJsonPath),
-        packageRoot,
-        workspacePath: normalizePath(relative(normalizedRoot, packageRoot)),
-      });
-    }
-  }
-
-  return packages.toSorted((left, right) =>
-    left.workspacePath.localeCompare(right.workspacePath)
-  );
-};
+const workspacePackages = (rootDir: string): readonly WorkspacePackage[] =>
+  listWorkspacePackages<AdapterCheckPackageManifest>(rootDir);
 
 const resolveExportTarget = (
   target: unknown,
@@ -433,9 +353,6 @@ const collectSourceFiles = (dir: string): readonly string[] => {
   return files.toSorted();
 };
 
-const escapeRegExp = (value: string): string =>
-  value.replaceAll(/[.*+?^${}()|[\]\\]/gu, '\\$&');
-
 const isIdentifierChar = (char: string | undefined): boolean =>
   char !== undefined && /[$\w]/u.test(char);