@smoothbricks/cli 0.4.2 → 0.4.3

package/dist/lib/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAMA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOvE;AAuCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAMA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOvE;AAmCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}

package/dist/lib/run.js

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { $ } from 'bun';
 export async function run(command, args, cwd, env) {
@@ -82,10 +82,6 @@ function resolveBundledCommand(command) {
         if (command === 'sherif') {
             return fileURLToPath(import.meta.resolve('sherif'));
         }
-        if (command === 'attw') {
-            const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/cli/package.json'));
-            return join(dirname(packageJson), 'dist', 'index.js');
-        }
     }
     catch {
         return null;

package/dist/monorepo/packed-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packed-package.d.ts","sourceRoot":"","sources":["../../src/monorepo/packed-package.ts"],"names":[],"mappings":"AAUA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhF;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMtF;AAED,wBAAsB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMvF;AAED,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMpF"}
+{"version":3,"file":"packed-package.d.ts","sourceRoot":"","sources":["../../src/monorepo/packed-package.ts"],"names":[],"mappings":"AAYA,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMhF;AAED,wBAAsB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMtF;AAED,wBAAsB,mCAAmC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMvF;AAED,wBAAsB,gCAAgC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAMpF"}

package/dist/monorepo/packed-package.js

@@ -1,5 +1,7 @@
-import { readFileSync, rmSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
+import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync, unlinkSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, relative } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { publint } from 'publint';
 import { formatMessage } from 'publint/utils';
 import { isRecord } from '../lib/json.js';
@@ -65,37 +67,143 @@ async function validatePackedManifest(root, pkg, packed) {
     return failures;
 }
 async function validateAttw(root, pkg, packed) {
-    const attwArgs = [
-        packed.path,
-        '--format',
-        'ascii',
-        '--no-color',
-        '--profile',
-        'node16',
-        '--ignore-rules',
-        'cjs-resolves-to-esm',
-        ...attwExcludedEntrypointArgs(pkg),
-    ];
-    const attw = await runResult('attw', attwArgs, root);
-    if (attw.exitCode === 0) {
+    const attw = await loadAttwCore();
+    const analysis = await attw.checkPackage(await createAttwPackageFromTarball(attw, root, packed.path), {
+        excludeEntrypoints: wasmExportEntrypoints(pkg.json.exports),
+    });
+    if (!isRecord(analysis) || analysis.types === false) {
         return 0;
     }
-    printAttwOutput(attw.stdout);
-    printAttwOutput(attw.stderr);
+    const rawProblems = Array.isArray(analysis.problems) ? analysis.problems : [];
+    const problems = rawProblems.filter(isReportedAttwProblem);
+    if (problems.length === 0) {
+        return 0;
+    }
+    for (const problem of problems) {
+        console.error(`${pkg.path}: are-the-types-wrong ${problem.kind}${formatProblemLocation(problem)}`);
+    }
     console.error(`${pkg.path}: are-the-types-wrong validation failed`);
     return 1;
 }
-function printAttwOutput(output) {
-    for (const line of output.split('\n')) {
-        if (!line || line.includes('(ignored)')) {
+async function loadAttwCore() {
+    const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/core/package.json'));
+    const core = await import(pathToFileURL(join(dirname(packageJson), 'dist', 'index.js')).href);
+    if (!isRecord(core)) {
+        throw new Error('@arethetypeswrong/core does not expose the expected API');
+    }
+    const PackageConstructor = core.Package;
+    const checkPackage = core.checkPackage;
+    if (typeof PackageConstructor !== 'function' || typeof checkPackage !== 'function') {
+        throw new Error('@arethetypeswrong/core does not expose the expected API');
+    }
+    return {
+        createPackage: (files, packageName, packageVersion) => Reflect.construct(PackageConstructor, [files, packageName, packageVersion]),
+        checkPackage: (pkg, options) => Promise.resolve(checkPackage(pkg, options)),
+    };
+}
+async function createAttwPackageFromTarball(attw, root, tarballPath) {
+    const temp = mkdtempSync(join(tmpdir(), 'smoo-attw-'));
+    try {
+        const extract = await runResult('tar', ['-xzf', tarballPath, '-C', temp], root);
+        if (extract.exitCode !== 0) {
+            printCommandOutput(extract.stdout, extract.stderr);
+            throw new Error('unable to extract packed package for are-the-types-wrong');
+        }
+        return createAttwPackageFromDirectory(attw, join(temp, 'package'));
+    }
+    finally {
+        rmSync(temp, { recursive: true, force: true });
+    }
+}
+function createAttwPackageFromDirectory(attw, packageDir) {
+    const packageJson = readJsonFile(join(packageDir, 'package.json'));
+    const packageName = typeof packageJson.name === 'string' ? packageJson.name : null;
+    const packageVersion = typeof packageJson.version === 'string' ? packageJson.version : null;
+    if (!packageName || !packageVersion) {
+        throw new Error('packed package.json must contain name and version');
+    }
+    const files = {};
+    collectAttwFiles(packageDir, packageDir, packageName, files);
+    return attw.createPackage(files, packageName, packageVersion);
+}
+function collectAttwFiles(root, current, packageName, files) {
+    for (const entry of readdirSync(current)) {
+        const path = join(current, entry);
+        const stat = statSync(path);
+        if (stat.isDirectory()) {
+            collectAttwFiles(root, path, packageName, files);
             continue;
         }
-        console.error(line);
+        if (!stat.isFile()) {
+            continue;
+        }
+        const packageRelativePath = relative(root, path).split('\\').join('/');
+        files[`/node_modules/${packageName}/${packageRelativePath}`] = new Uint8Array(readFileSync(path));
+    }
+}
+function readJsonFile(path) {
+    const parsed = JSON.parse(readFileSync(path, 'utf8'));
+    if (!isRecord(parsed)) {
+        throw new Error(`${path} is not a JSON object`);
+    }
+    return parsed;
+}
+function isReportedAttwProblem(problem) {
+    if (!isRecord(problem) || typeof problem.kind !== 'string') {
+        return false;
+    }
+    const flag = attwProblemFlag(problem.kind);
+    if (flag === 'cjs-resolves-to-esm') {
+        return false;
     }
+    return problem.resolutionKind !== 'node10';
 }
-function attwExcludedEntrypointArgs(pkg) {
-    const excluded = wasmExportEntrypoints(pkg.json.exports);
-    return excluded.length === 0 ? [] : ['--exclude-entrypoints', ...excluded];
+function attwProblemFlag(kind) {
+    switch (kind) {
+        case 'NoResolution':
+            return 'no-resolution';
+        case 'UntypedResolution':
+            return 'untyped-resolution';
+        case 'FalseCJS':
+            return 'false-cjs';
+        case 'FalseESM':
+            return 'false-esm';
+        case 'CJSResolvesToESM':
+            return 'cjs-resolves-to-esm';
+        case 'FallbackCondition':
+            return 'fallback-condition';
+        case 'CJSOnlyExportsDefault':
+            return 'cjs-only-exports-default';
+        case 'NamedExports':
+            return 'named-exports';
+        case 'FalseExportDefault':
+            return 'false-export-default';
+        case 'MissingExportEquals':
+            return 'missing-export-equals';
+        case 'UnexpectedModuleSyntax':
+            return 'unexpected-module-syntax';
+        case 'InternalResolutionError':
+            return 'internal-resolution-error';
+        default:
+            return null;
+    }
+}
+function formatProblemLocation(problem) {
+    if (!isRecord(problem)) {
+        return '';
+    }
+    const entrypoint = typeof problem.entrypoint === 'string' ? ` ${problem.entrypoint}` : '';
+    const resolution = typeof problem.resolutionKind === 'string' ? ` ${formatResolutionKind(problem.resolutionKind)}` : '';
+    return `${entrypoint}${resolution}`;
+}
+function formatResolutionKind(kind) {
+    if (kind === 'node16-cjs') {
+        return 'node16 (from CJS)';
+    }
+    if (kind === 'node16-esm') {
+        return 'node16 (from ESM)';
+    }
+    return kind;
 }
 function wasmExportEntrypoints(exports) {
     if (!isRecord(exports)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {
@@ -44,7 +44,7 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@arethetypeswrong/cli": "^0.18.2",
+    "@arethetypeswrong/core": "^0.18.2",
     "@smoothbricks/nx-plugin": "0.2.5",
     "@smoothbricks/validation": "0.1.1",
     "commander": "^14.0.3",

package/src/lib/run.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { $ } from 'bun';
 
@@ -106,10 +106,6 @@ function resolveBundledCommand(command: string): string | null {
     if (command === 'sherif') {
       return fileURLToPath(import.meta.resolve('sherif'));
     }
-    if (command === 'attw') {
-      const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/cli/package.json'));
-      return join(dirname(packageJson), 'dist', 'index.js');
-    }
   } catch {
     return null;
   }

package/src/monorepo/packed-package.ts

@@ -1,5 +1,7 @@
-import { readFileSync, rmSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
+import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync, unlinkSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, relative } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { publint } from 'publint';
 import { formatMessage } from 'publint/utils';
 import { isRecord } from '../lib/json.js';
@@ -86,39 +88,158 @@ async function validatePackedManifest(
 }
 
 async function validateAttw(root: string, pkg: PackageInfo, packed: { path: string }): Promise<number> {
-  const attwArgs = [
-    packed.path,
-    '--format',
-    'ascii',
-    '--no-color',
-    '--profile',
-    'node16',
-    '--ignore-rules',
-    'cjs-resolves-to-esm',
-    ...attwExcludedEntrypointArgs(pkg),
-  ];
-  const attw = await runResult('attw', attwArgs, root);
-  if (attw.exitCode === 0) {
+  const attw = await loadAttwCore();
+  const analysis = await attw.checkPackage(await createAttwPackageFromTarball(attw, root, packed.path), {
+    excludeEntrypoints: wasmExportEntrypoints(pkg.json.exports),
+  });
+  if (!isRecord(analysis) || analysis.types === false) {
     return 0;
   }
-  printAttwOutput(attw.stdout);
-  printAttwOutput(attw.stderr);
+  const rawProblems = Array.isArray(analysis.problems) ? analysis.problems : [];
+  const problems = rawProblems.filter(isReportedAttwProblem);
+  if (problems.length === 0) {
+    return 0;
+  }
+  for (const problem of problems) {
+    console.error(`${pkg.path}: are-the-types-wrong ${problem.kind}${formatProblemLocation(problem)}`);
+  }
   console.error(`${pkg.path}: are-the-types-wrong validation failed`);
   return 1;
 }
 
-function printAttwOutput(output: string): void {
-  for (const line of output.split('\n')) {
-    if (!line || line.includes('(ignored)')) {
+interface AttwCore {
+  createPackage: (files: Record<string, Uint8Array>, packageName: string, packageVersion: string) => unknown;
+  checkPackage: (pkg: unknown, options: { excludeEntrypoints: string[] }) => Promise<unknown>;
+}
+
+async function loadAttwCore(): Promise<AttwCore> {
+  const packageJson = fileURLToPath(import.meta.resolve('@arethetypeswrong/core/package.json'));
+  const core = await import(pathToFileURL(join(dirname(packageJson), 'dist', 'index.js')).href);
+  if (!isRecord(core)) {
+    throw new Error('@arethetypeswrong/core does not expose the expected API');
+  }
+  const PackageConstructor = core.Package;
+  const checkPackage = core.checkPackage;
+  if (typeof PackageConstructor !== 'function' || typeof checkPackage !== 'function') {
+    throw new Error('@arethetypeswrong/core does not expose the expected API');
+  }
+  return {
+    createPackage: (files, packageName, packageVersion) =>
+      Reflect.construct(PackageConstructor, [files, packageName, packageVersion]),
+    checkPackage: (pkg, options) => Promise.resolve(checkPackage(pkg, options)),
+  };
+}
+
+async function createAttwPackageFromTarball(attw: AttwCore, root: string, tarballPath: string): Promise<unknown> {
+  const temp = mkdtempSync(join(tmpdir(), 'smoo-attw-'));
+  try {
+    const extract = await runResult('tar', ['-xzf', tarballPath, '-C', temp], root);
+    if (extract.exitCode !== 0) {
+      printCommandOutput(extract.stdout, extract.stderr);
+      throw new Error('unable to extract packed package for are-the-types-wrong');
+    }
+    return createAttwPackageFromDirectory(attw, join(temp, 'package'));
+  } finally {
+    rmSync(temp, { recursive: true, force: true });
+  }
+}
+
+function createAttwPackageFromDirectory(attw: AttwCore, packageDir: string): unknown {
+  const packageJson = readJsonFile(join(packageDir, 'package.json'));
+  const packageName = typeof packageJson.name === 'string' ? packageJson.name : null;
+  const packageVersion = typeof packageJson.version === 'string' ? packageJson.version : null;
+  if (!packageName || !packageVersion) {
+    throw new Error('packed package.json must contain name and version');
+  }
+  const files: Record<string, Uint8Array> = {};
+  collectAttwFiles(packageDir, packageDir, packageName, files);
+  return attw.createPackage(files, packageName, packageVersion);
+}
+
+function collectAttwFiles(root: string, current: string, packageName: string, files: Record<string, Uint8Array>): void {
+  for (const entry of readdirSync(current)) {
+    const path = join(current, entry);
+    const stat = statSync(path);
+    if (stat.isDirectory()) {
+      collectAttwFiles(root, path, packageName, files);
       continue;
     }
-    console.error(line);
+    if (!stat.isFile()) {
+      continue;
+    }
+    const packageRelativePath = relative(root, path).split('\\').join('/');
+    files[`/node_modules/${packageName}/${packageRelativePath}`] = new Uint8Array(readFileSync(path));
+  }
+}
+
+function readJsonFile(path: string): Record<string, unknown> {
+  const parsed: unknown = JSON.parse(readFileSync(path, 'utf8'));
+  if (!isRecord(parsed)) {
+    throw new Error(`${path} is not a JSON object`);
+  }
+  return parsed;
+}
+
+function isReportedAttwProblem(problem: unknown): boolean {
+  if (!isRecord(problem) || typeof problem.kind !== 'string') {
+    return false;
+  }
+  const flag = attwProblemFlag(problem.kind);
+  if (flag === 'cjs-resolves-to-esm') {
+    return false;
   }
+  return problem.resolutionKind !== 'node10';
 }
 
-function attwExcludedEntrypointArgs(pkg: PackageInfo): string[] {
-  const excluded = wasmExportEntrypoints(pkg.json.exports);
-  return excluded.length === 0 ? [] : ['--exclude-entrypoints', ...excluded];
+function attwProblemFlag(kind: string): string | null {
+  switch (kind) {
+    case 'NoResolution':
+      return 'no-resolution';
+    case 'UntypedResolution':
+      return 'untyped-resolution';
+    case 'FalseCJS':
+      return 'false-cjs';
+    case 'FalseESM':
+      return 'false-esm';
+    case 'CJSResolvesToESM':
+      return 'cjs-resolves-to-esm';
+    case 'FallbackCondition':
+      return 'fallback-condition';
+    case 'CJSOnlyExportsDefault':
+      return 'cjs-only-exports-default';
+    case 'NamedExports':
+      return 'named-exports';
+    case 'FalseExportDefault':
+      return 'false-export-default';
+    case 'MissingExportEquals':
+      return 'missing-export-equals';
+    case 'UnexpectedModuleSyntax':
+      return 'unexpected-module-syntax';
+    case 'InternalResolutionError':
+      return 'internal-resolution-error';
+    default:
+      return null;
+  }
+}
+
+function formatProblemLocation(problem: unknown): string {
+  if (!isRecord(problem)) {
+    return '';
+  }
+  const entrypoint = typeof problem.entrypoint === 'string' ? ` ${problem.entrypoint}` : '';
+  const resolution =
+    typeof problem.resolutionKind === 'string' ? ` ${formatResolutionKind(problem.resolutionKind)}` : '';
+  return `${entrypoint}${resolution}`;
+}
+
+function formatResolutionKind(kind: string): string {
+  if (kind === 'node16-cjs') {
+    return 'node16 (from CJS)';
+  }
+  if (kind === 'node16-esm') {
+    return 'node16 (from ESM)';
+  }
+  return kind;
 }
 
 function wasmExportEntrypoints(exports: unknown): string[] {