@mettlecast/domain-cli 0.2.87 → 0.2.88

package/dist/commands/create-project.js

@@ -1,7 +1,6 @@
 import { mkdir, writeFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { createInterface } from 'node:readline';
-import { Readable } from 'node:stream';
 import { execSync } from 'node:child_process';
 import * as tar from 'tar';
 import { cliLogger } from '../utils/logger.js';
@@ -60,27 +59,24 @@ function topoSort(modules, selected) {
 async function parseTarball(buf) {
     const entries = [];
     await new Promise((resolve, reject) => {
-        const parser = new tar.Parser({
-            gzip: true,
-            onentry(entry) {
-                if (entry.type !== 'File') {
-                    entry.resume();
-                    return;
-                }
-                const chunks = [];
-                entry.on('data', (chunk) => {
-                    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                });
-                entry.on('end', () => {
-                    entries.push({ path: entry.path, content: Buffer.concat(chunks) });
-                });
-                entry.on('error', reject);
-            },
+        const parser = new tar.Parser({ gzip: true });
+        parser.on('entry', (entry) => {
+            if (entry.type !== 'File') {
+                entry.resume();
+                return;
+            }
+            const chunks = [];
+            entry.on('data', (chunk) => {
+                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            });
+            entry.on('end', () => {
+                entries.push({ path: entry.path, content: Buffer.concat(chunks) });
+            });
+            entry.on('error', reject);
         });
         parser.on('finish', resolve);
         parser.on('error', reject);
-        const readable = Readable.from(buf);
-        readable.pipe(parser);
+        parser.end(buf);
     });
     return entries;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mettlecast/domain-cli",
-  "version": "0.2.87",
+  "version": "0.2.88",
   "type": "module",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -22,8 +22,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
     "@aws-sdk/client-sfn": "^3.0.0",
-    "@mettlecast/domain-cdk-packer": "0.2.88",
-    "@mettlecast/domain-runtime": "0.2.87",
+    "@mettlecast/domain-cdk-packer": "0.2.89",
+    "@mettlecast/domain-runtime": "0.2.88",
     "commander": "^12.0.0",
     "dotenv": "^16.0.0",
     "fastify": "^5.0.0",

package/src/__tests__/smoke/scaffold.test.ts

@@ -28,7 +28,7 @@ import {
 } from 'vitest';
 import { createHash } from 'node:crypto';
 import { spawnSync, type SpawnSyncReturns } from 'node:child_process';
-import { mkdir, mkdtemp, readdir, readFile, rm, stat } from 'node:fs/promises';
+import { mkdir, mkdtemp, readdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -51,9 +51,13 @@ vi.mock('node:readline', () => ({
   createInterface: vi.fn(),
 }));
 
-vi.mock('node:child_process', () => ({
-  execSync: vi.fn(),
-}));
+vi.mock('node:child_process', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('node:child_process')>();
+  return {
+    ...actual,
+    execSync: vi.fn(),
+  };
+});
 
 vi.mock('../../utils/logger.js', () => ({
   cliLogger: {
@@ -163,54 +167,59 @@ async function packModuleTarball(moduleId: string): Promise<PackResult> {
   const overrides = await readFileOverrides(moduleId);
   const files = await walkDir(moduleDir);
 
-  const tarFiles: Array<{ path: string; content: string }> = [];
-  const manifestEntries: TarballEntry[] = [];
-
-  for (const file of files) {
-    const content = (await readFile(file.fullPath)).toString('utf-8');
-    const isTemplate = file.relPath.endsWith('.tpl');
-
-    // Strip .tpl to get the "manifest path" (the canonical install path
-    // before any installedAs override).
-    const manifestPath = isTemplate ? file.relPath.slice(0, -4) : file.relPath;
-    const override = overrides.find(
-      (o) => o.path === file.relPath || o.path === manifestPath,
-    );
+  // Stage the virtual files in a temp directory so tar.c can create a
+  // proper tarball (tar v7 no longer supports the stream-based Pack with
+  // plain-object entries).
+  const stageDir = await mkdtemp(join(tmpdir(), 'mc-stage-'));
+  const tarballPath = join(stageDir, 'module.tar.gz');
+  try {
+    const tarFiles: Array<{ path: string; content: string }> = [];
+    const manifestEntries: TarballEntry[] = [];
+
+    for (const file of files) {
+      const content = (await readFile(file.fullPath)).toString('utf-8');
+      const isTemplate = file.relPath.endsWith('.tpl');
+
+      // Strip .tpl to get the "manifest path" (the canonical install path
+      // before any installedAs override).
+      const manifestPath = isTemplate ? file.relPath.slice(0, -4) : file.relPath;
+      const override = overrides.find(
+        (o) => o.path === file.relPath || o.path === manifestPath,
+      );
 
-    manifestEntries.push({
-      path: file.relPath,
-      sha256: sha256(content),
-      isTemplate,
-      ...(override?.installedAs ? { installedAs: override.installedAs } : {}),
-      ...(override?.policy ? { policy: override.policy } : {}),
-    });
+      manifestEntries.push({
+        path: file.relPath,
+        sha256: sha256(content),
+        isTemplate,
+        ...(override?.installedAs ? { installedAs: override.installedAs } : {}),
+        ...(override?.policy ? { policy: override.policy } : {}),
+      });
 
-    tarFiles.push({ path: file.relPath, content });
-  }
+      tarFiles.push({ path: file.relPath, content });
+    }
 
-  // Synthesise MANIFEST.json — the CLI's create-project.ts parses this
-  // verbatim to know which files to extract from the tarball.
-  const manifestJson = JSON.stringify(manifestEntries, null, 2);
-  tarFiles.push({ path: 'MANIFEST.json', content: manifestJson });
+    // Synthesise MANIFEST.json — the CLI's create-project.ts parses this
+    // verbatim to know which files to extract from the tarball.
+    const manifestJson = JSON.stringify(manifestEntries, null, 2);
+    tarFiles.push({ path: 'MANIFEST.json', content: manifestJson });
 
-  const tarball = await new Promise<Buffer>((resolvePack, reject) => {
-    const chunks: Buffer[] = [];
-    const pack = tar.create({ gzip: true, cwd: '.' }, []);
-    pack.on('data', (chunk: Buffer) => {
-      chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-    });
-    pack.on('end', () => resolvePack(Buffer.concat(chunks)));
-    pack.on('error', reject);
+    // Write every file to the staging directory.
     for (const f of tarFiles) {
-      // tar's Pack.write accepts a path string OR a ReadEntry-shaped object
-      // with { path, content }. The TypeScript types only model the string
-      // form, so we cast through `unknown` to keep strict mode happy.
-      pack.write({ path: f.path, content: f.content } as unknown as string);
+      const dest = join(stageDir, f.path);
+      await mkdir(dirname(dest), { recursive: true });
+      await writeFile(dest, f.content, 'utf-8');
     }
-    pack.end();
-  });
 
-  return { tarball, entries: manifestEntries };
+    // Create a gzipped tarball from the staging directory.  tar.c in v7
+    // writes the tarball to the file specified by options.file.
+    const paths = tarFiles.map((f) => f.path);
+    await tar.c({ gzip: true, cwd: stageDir, file: tarballPath }, paths);
+
+    const tarball = await readFile(tarballPath);
+    return { tarball, entries: manifestEntries };
+  } finally {
+    await rm(stageDir, { recursive: true, force: true });
+  }
 }
 
 /** Drive readline with a fixed sequence of answers. */
@@ -435,8 +444,10 @@ describe('scaffold smoke test (issue #3831)', () => {
     expect(allDeps['@tanstack/react-router']).toMatch(/\^1\./);
     expect(allDeps['@tanstack/react-query']).toMatch(/\^5\./);
     expect(allDeps['@tanstack/react-query-devtools']).toMatch(/\^5\./);
-    expect(allDeps['react']).toMatch(/\^19\./);
-    expect(allDeps['react-dom']).toMatch(/\^19\./);
+    expect(allDeps['react']).toBe('19.2.7');
+    expect(allDeps['react-dom']).toBe('19.2.7');
+    expect(allDeps['@types/react']).toBe('19.2.17');
+    expect(allDeps['@types/react-dom']).toBe('19.2.3');
     // zod may be ^3 or ^4 depending on the seed file
     expect(allDeps['zod']).toMatch(/\^[34]\./);
   });

package/src/commands/create-project.ts

@@ -105,30 +105,26 @@ async function parseTarball(buf: Buffer): Promise<TarEntry[]> {
   const entries: TarEntry[] = [];
 
   await new Promise<void>((resolve, reject) => {
-    const parser = new tar.Parser({
-      gzip: true,
-      onentry(entry: tar.ReadEntry) {
-        if (entry.type !== 'File') {
-          entry.resume();
-          return;
-        }
+    const parser = new tar.Parser({ gzip: true });
+    parser.on('entry', (entry: tar.ReadEntry) => {
+      if (entry.type !== 'File') {
+        entry.resume();
+        return;
+      }
 
-        const chunks: Buffer[] = [];
-        entry.on('data', (chunk: Buffer) => {
-          chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk as ArrayBuffer));
-        });
-        entry.on('end', () => {
-          entries.push({ path: entry.path, content: Buffer.concat(chunks) });
-        });
-        entry.on('error', reject);
-      },
+      const chunks: Buffer[] = [];
+      entry.on('data', (chunk: Buffer) => {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk as ArrayBuffer));
+      });
+      entry.on('end', () => {
+        entries.push({ path: entry.path, content: Buffer.concat(chunks) });
+      });
+      entry.on('error', reject);
     });
-
     parser.on('finish', resolve);
     parser.on('error', reject);
 
-    const readable = Readable.from(buf);
-    readable.pipe(parser);
+    parser.end(buf);
   });
 
   return entries;

package/src/commands/validate.ts

@@ -2,8 +2,8 @@ import { stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import type {
   RegistryEntry,
-  ActionRegistryEntry,
 } from '@mettlecast/domain-cdk-packer';
+import type { ActionRegistryEntry } from '../types.js';
 import { validRange } from 'semver';
 import type { DomainModuleConfig } from '@mettlecast/domain-runtime/types';
 import { buildRegistry } from '../builder/build-registry.js';

package/toolchain-manifest.json

@@ -2,9 +2,9 @@
   "schemaVersion": 1,
   "registrySchemaVersion": "1",
   "packages": {
-    "domainCli": "0.2.87",
-    "domainCdkPacker": "0.2.88",
-    "domainRuntime": "0.2.87",
-    "eslintPluginDomainModule": "0.2.87"
+    "domainCli": "0.2.88",
+    "domainCdkPacker": "0.2.89",
+    "domainRuntime": "0.2.88",
+    "eslintPluginDomainModule": "0.2.88"
   }
 }