@adviser/cement 0.4.51 → 0.4.52-pre

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adviser/cement",
-  "version": "0.4.51",
+  "version": "0.4.52-pre",
   "description": "better try/catch/finally handling",
   "main": "./cjs/index.js",
   "type": "module",
@@ -47,12 +47,37 @@
       "import": "./esm/import-meta-env.module.js"
     }
   },
+  "scripts": {
+    "clean": "rm -rf dist node_modules",
+    "build": "pnpm run build:tsgo; pnpm run build:js; pnpm run build:deno",
+    "build:tsc": "rm -rf ./dist/ts ; pnpm run /^build:tsc:/",
+    "build:tsgo": "rm -rf ./dist/ts ; pnpm run /^build:tsgo:/",
+    "build:tsgo:global": "tsgo --noEmit",
+    "build:tsgo:esm": "tsgo -p ./tsconfig.esm.json; src/cli/run.sh generateVersionTs -t ./tsconfig.esm.json",
+    "build:tsgo:cjs": "tsgo -p ./tsconfig.cjs.json; src/cli/run.sh generateVersionTs -t ./tsconfig.cjs.json",
+    "build:js": "rm -rf dist/pkg ; mkdir -p dist/pkg; cp -pr ./dist/ts/* dist/pkg",
+    "build:deno": "deno publish --dry-run --unstable-sloppy-imports --allow-dirty --set-version 0.0.0-dev --quiet",
+    "test": "pnpm run test:js; pnpm run test:deno",
+    "test:deno": "deno run --quiet --allow-net --allow-write --allow-run  --allow-sys --allow-ffi  --allow-read --allow-env  ./node_modules/vitest/vitest.mjs --run --project node",
+    "test:js": "vitest --run",
+    "pubdir": "src/cli/run.sh preparePubdir",
+    "presmoke": "pnpm run pubdir ; cd pubdir",
+    "deno:publish": "pnpm run pubdir; cd pubdir ; pnpm exec deno publish --allow-dirty --unstable-sloppy-imports --quiet",
+    "smoke": "bash ./smoke/it.sh",
+    "lint": "eslint .",
+    "prettier": "prettier .",
+    "format": "prettier ."
+  },
   "keywords": [],
   "author": "Meno Abels <meno.abels@adviser.com>",
   "license": "AFL-2.0",
   "bugs": {
     "url": "https://github.com/mabels/cement/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mabels/cement"
+  },
   "homepage": "https://github.com/mabels/cement#readme",
   "dependencies": {
     "ts-essentials": "^10.0.2",
@@ -64,6 +89,7 @@
     "@types/deno": "^2.3.0",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^24.4.0",
+    "@types/semver": "^7.7.1",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
     "@typescript/native-preview": "7.0.0-dev.20251006.1",
@@ -71,13 +97,11 @@
     "@vitest/runner": "^3.2.4",
     "cmd-ts": "^0.14.1",
     "deno": "^2.5.1",
-    "esbuild-plugin-replace": "^1.4.0",
-    "esbuild-plugin-resolve": "^2.0.0",
     "eslint": "^9.35.0",
     "jscodeshift": "^17.3.0",
     "playwright": "^1.54.1",
-    "playwright-chromium": "^1.54.1",
     "prettier": "^3.6.2",
+    "semver": "^7.7.3",
     "tsup": "^8.3.0",
     "tsx": "^4.19.1",
     "typescript": "^5.9.2",
@@ -90,25 +114,18 @@
   "engines": {
     "node": ">=20.19.0"
   },
-  "scripts": {
-    "clean": "rm -rf dist node_modules",
-    "build": "pnpm run build:tsgo; pnpm run build:js; pnpm run build:deno",
-    "build:tsc": "rm -rf ./dist/ts ; pnpm run /^build:tsc:/",
-    "build:tsgo": "rm -rf ./dist/ts ; pnpm run /^build:tsgo:/",
-    "build:tsgo:global": "tsgo --noEmit",
-    "build:tsgo:esm": "tsgo -p ./tsconfig.esm.json; src/cli/run.sh generateVersionTs -t ./tsconfig.esm.json",
-    "build:tsgo:cjs": "tsgo -p ./tsconfig.cjs.json; src/cli/run.sh generateVersionTs -t ./tsconfig.cjs.json",
-    "build:js": "rm -rf dist/pkg ; mkdir -p dist/pkg; cp -pr ./dist/ts/* dist/pkg",
-    "build:deno": "deno publish --dry-run --unstable-sloppy-imports --allow-dirty --set-version 0.0.0-dev",
-    "test": "pnpm run test:js; pnpm run test:deno",
-    "test:deno": "deno run --quiet --allow-net --allow-write --allow-run  --allow-sys --allow-ffi  --allow-read --allow-env  ./node_modules/vitest/vitest.mjs --run --project node",
-    "test:js": "vitest --run",
-    "pubdir": "src/cli/run.sh preparePubdir",
-    "presmoke": "pnpm run pubdir ; cd pubdir ; pnpm pack",
-    "deno:publish": "pnpm run pubdir; cd pubdir ; pnpm exec deno publish --allow-dirty --unstable-sloppy-imports",
-    "smoke": "bash ./smoke/it.sh",
-    "lint": "eslint .",
-    "prettier": "prettier .",
-    "format": "prettier ."
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "edgedriver",
+      "geckodriver",
+      "msw",
+      "sharp"
+    ],
+    "onlyBuiltDependencies": [
+      "deno",
+      "esbuild",
+      "playwright-chromium",
+      "workerd"
+    ]
   }
-}
+}

package/src/cli/generate-version-ts-cmd.ts

@@ -0,0 +1,43 @@
+import * as ts from "typescript";
+import { command, option, string } from "cmd-ts";
+import { createCompilerHost, readTSConfig, getVersion } from "./utils.js";
+
+export function generateVersionTsCmd(): ReturnType<typeof command> {
+  return command({
+    name: "fireproof build cli",
+    description: "helps to build fp",
+    version: "1.0.0",
+    args: {
+      version: option({
+        long: "version",
+        short: "v",
+        defaultValue: () => getVersion(),
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Version to patch in, defaults to reading from package.json.",
+      }),
+      versionFile: option({
+        long: "versionFile",
+        short: "f",
+        defaultValue: () => "src/version.ts",
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Path to the file containing the version, defaults to './src/version.ts'.",
+      }),
+      tsconfig: option({
+        long: "tsconfig",
+        short: "t",
+        defaultValue: () => "tsconfig.json",
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Path to the tsconfig.json file, defaults to './tsconfig.json'.",
+      }),
+    },
+    handler: (args) => {
+      const options = readTSConfig(args.tsconfig);
+      const host = createCompilerHost(options, args.version);
+      const program = ts.createProgram([args.versionFile], options, host);
+      program.emit();
+    },
+  }) as ReturnType<typeof command>;
+}

package/src/cli/main.ts

@@ -1,5 +1,9 @@
 import { run, subcommands } from "cmd-ts";
-import { patchVersionCmd, generateVersionTsCmd, setUpDenoJsonCmd, preparePubdirCmd } from "./patch-version-cmd.js";
+import { patchVersionCmd } from "./patch-version-cmd.js";
+import { generateVersionTsCmd } from "./generate-version-ts-cmd.js";
+import { setUpDenoJsonCmd } from "./setup-deno-json-cmd.js";
+import { preparePubdirCmd } from "./prepare-pubdir-cmd.js";
+import { publishTagsCmd } from "./publish-tags-cmd.js";
 
 (async (): Promise<void> => {
   const cmd = subcommands({
@@ -11,6 +15,7 @@ import { patchVersionCmd, generateVersionTsCmd, setUpDenoJsonCmd, preparePubdirC
       generateVersionTs: generateVersionTsCmd(),
       setUpDenoJson: setUpDenoJsonCmd(),
       preparePubdir: preparePubdirCmd(),
+      publishTags: publishTagsCmd(),
     },
   });
 

package/src/cli/patch-version-cmd.ts

@@ -1,117 +1,7 @@
-import * as ts from "typescript";
 import { command, option, restPositionals, string } from "cmd-ts";
-import * as path from "node:path";
 import * as fs from "node:fs";
 import * as process from "node:process";
-import { $, cd, glob } from "zx";
-
-// Custom compiler host
-function createCompilerHost(options: ts.CompilerOptions, version: string): ts.CompilerHost {
-  const host = ts.createCompilerHost(options);
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  const myGetSourceFile = host.getSourceFile;
-
-  host.getSourceFile = (fileName, languageVersion, onError, shouldCreateNewSourceFile): ts.SourceFile => {
-    const sourceFile = myGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
-    if (!sourceFile) {
-      throw new Error("getSourceFile is not defined");
-    }
-
-    // Patch version.ts during compilation
-    if (fileName.endsWith("version.ts") && sourceFile) {
-      const newText = `export const VERSION: string = "${version}";`;
-      return ts.createSourceFile(fileName, newText, languageVersion);
-    }
-
-    return sourceFile;
-  };
-  return host;
-}
-
-function readTSConfig(configPath = "./tsconfig.json"): ts.CompilerOptions {
-  // Read the config file
-  // eslint-disable-next-line @typescript-eslint/unbound-method
-  const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-
-  if (configFile.error) {
-    throw new Error(`Error reading tsconfig: ${configFile.error.messageText as string}`);
-  }
-
-  // Parse and resolve the config
-  const parsedConfig = ts.parseJsonConfigFileContent(configFile.config, ts.sys, path.dirname(configPath), undefined, configPath);
-
-  if (parsedConfig.errors.length > 0) {
-    const errors = parsedConfig.errors.map((err) => err.messageText as string).join("\n");
-    throw new Error(`Error parsing tsconfig: ${errors}`);
-  }
-
-  return parsedConfig.options; // This is CompilerOptions
-}
-
-function versionFromPackageJson(): string {
-  const packageJson = JSON.parse(fs.readFileSync("package.json").toString()) as { version: string };
-  return packageJson.version;
-}
-
-const versionArgs = {
-  version: option({
-    long: "version",
-    short: "v",
-    defaultValue: () => getVersion(),
-    defaultValueIsSerializable: true,
-    type: string,
-    description: "Version to patch in, defaults to reading from package.json.",
-  }),
-  versionFile: option({
-    long: "versionFile",
-    short: "f",
-    defaultValue: () => "src/version.ts",
-    defaultValueIsSerializable: true,
-    type: string,
-    description: "Path to the file containing the version, defaults to './src/version.ts'.",
-  }),
-
-  tsconfig: option({
-    long: "tsconfig",
-    short: "t",
-    defaultValue: () => "tsconfig.json",
-    defaultValueIsSerializable: true,
-    type: string,
-    description: "Path to the tsconfig.json file, defaults to './tsconfig.json'.",
-  }),
-};
-
-export function generateVersionTsCmd(): ReturnType<typeof command> {
-  return command({
-    name: "fireproof build cli",
-    description: "helps to build fp",
-    version: "1.0.0",
-    args: versionArgs,
-    handler: (args) => {
-      const options = readTSConfig(args.tsconfig);
-      const host = createCompilerHost(options, args.version);
-      const program = ts.createProgram([args.versionFile], options, host);
-      program.emit();
-    },
-  }) as ReturnType<typeof command>;
-}
-
-function getVersion(iversion?: string): string {
-  const ghref = iversion || process.env.GITHUB_REF || versionFromPackageJson() || "a/v0.0.0-smoke";
-  let lastPart = ghref.split("/").slice(-1)[0];
-  if (iversion) {
-    return iversion.replace(/^[vdsp]/, "");
-  }
-  const short = $.sync`git rev-parse --short HEAD`.stdout.trim();
-  if (process.env.GITHUB_REF) {
-    lastPart = lastPart.replace(/^[vdsp]/, "");
-    if (lastPart.match(/^\d+\.\d+\.\d+/)) {
-      return lastPart;
-    }
-    return `0.0.0-dev-ci-${short}`;
-  }
-  return `0.0.0-dev-local-${Date.now()}`;
-}
+import { getVersion } from "./utils.js";
 
 export function patchVersionCmd(): ReturnType<typeof command> {
   return command({
@@ -145,181 +35,3 @@ export function patchVersionCmd(): ReturnType<typeof command> {
     },
   }) as ReturnType<typeof command>;
 }
-
-// node ./setup-jsr-json.cjs ./pubdir/deno.json
-function setupDenoJson(packageJsonFile: string, jsrJsonFile: string): void {
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonFile).toString()) as { dependencies: Record<string, string> };
-  const jsrJson = JSON.parse(fs.readFileSync(jsrJsonFile).toString()) as {
-    name: string;
-    exports: Record<string, string>;
-    imports: Record<string, string>;
-  };
-  // self imports
-  const jsrJsonImports = Object.fromEntries(Object.entries(jsrJson.exports ?? {}).map(([k, v]) => [path.join(jsrJson.name, k), v]));
-  const nodeJsonImports = Object.fromEntries(
-    Array.from(Object.entries(packageJson.dependencies ?? {})).map(([k, v]) => [k, `npm:${k}@${v.replace(/^npm:/, "")}`]),
-  );
-  jsrJson.imports = { ...jsrJson.imports, ...jsrJsonImports, ...nodeJsonImports };
-  fs.writeFileSync(jsrJsonFile, JSON.stringify(jsrJson, undefined, 2) + "\n");
-}
-
-export function setUpDenoJsonCmd(): ReturnType<typeof command> {
-  return command({
-    name: "setup-deno-json",
-    description: "setup deno.json",
-    version: "1.0.0",
-    args: {
-      packageJson: option({
-        long: "packageJson",
-        short: "p",
-        defaultValue: () => "package.json",
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Path to the package.json file, defaults to './package.json'.",
-      }),
-      jsrJson: option({
-        long: "jsrJson",
-        short: "j",
-        defaultValue: () => "deno.json",
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Path to the deno.json file, defaults to './deno.json'.",
-      }),
-    },
-    handler: (args) => {
-      // eslint-disable-next-line no-console
-      console.log(`Setup deno.json ${args.jsrJson} from ${args.packageJson}`);
-      setupDenoJson(args.packageJson, args.jsrJson);
-    },
-  }) as ReturnType<typeof command>;
-}
-
-export async function preparePubdir(pubdir: string, version: string, baseDir: string, srcDir: string): Promise<void> {
-  // Set shell options equivalent to 'set -ex'
-  $.verbose = true;
-
-  // Build if not in CI
-  if (process.env.IN_CI !== "in_ci") {
-    await $`pnpm run build`;
-  }
-
-  // Clean and create pubdir
-  await $`rm -rf ${pubdir}`;
-  await $`mkdir -p ${pubdir}`;
-
-  // Copy files to pubdir
-  await $`cp -pr ${path.join(baseDir, ".gitignore")} ${path.join(baseDir, "README.md")} ${path.join(baseDir, "LICENSE")} ./dist/ts/ ${pubdir}/`;
-
-  // Copy from dist/pkg
-  cd("dist/pkg");
-  await $`cp -pr . ../../${pubdir}/`;
-  cd("../..");
-
-  // Copy from src
-  cd(srcDir);
-  await $`cp -pr . ../${pubdir}/${srcDir}/`;
-  cd("..");
-
-  // Rename .js files to .cjs in pubdir/cjs
-  const jsFiles = await glob(`${pubdir}/cjs/**/*.js`);
-  for (const file of jsFiles) {
-    const newFile = file.replace(/\.js$/, ".cjs");
-    await $`mv ${file} ${newFile}`;
-  }
-
-  // Rename .js.map files to .cjs.map in pubdir/cjs
-  const mapFiles = await glob(`${pubdir}/cjs/**/*.js.map`);
-  for (const file of mapFiles) {
-    const newFile = file.replace(/\.js\.map$/, ".cjs.map");
-    await $`mv ${file} ${newFile}`;
-  }
-
-  // Run jscodeshift on .cjs files
-  const cjsFiles = await glob(`${pubdir}/cjs/**/*.cjs`);
-  if (cjsFiles.length > 0) {
-    await $`pnpm exec jscodeshift --parser=babel -t=./to-cjs.js ${cjsFiles}`;
-  }
-
-  // Copy package.json
-  await $`cp package.json ${pubdir}/`;
-
-  // Clean up test files in pubdir/src
-  cd(`${pubdir}/${srcDir}`);
-  await $`rm -f test/test-exit-handler.* ./utils/stream-test-helper.ts`.catch(() => {
-    // Ignore errors if files don't exist
-  });
-  cd("../..");
-
-  // Remove __screenshots__ directories
-  const screenshotDirs = await glob(`${pubdir}/${srcDir}/**/__screenshots__`);
-  for (const dir of screenshotDirs) {
-    await $`rm -rf ${dir}`;
-  }
-
-  // Remove test files
-  const testFiles = await glob(`${pubdir}/${srcDir}/**/*.test.ts`);
-  for (const file of testFiles) {
-    await $`rm -f ${file}`;
-  }
-
-  // Copy deno.json
-  await $`cp ./deno.json ./${pubdir}/`;
-
-  // Patch version in package.json and deno.json
-  await patchVersionCmd().handler({ version, files: [`${pubdir}/package.json`, `${pubdir}/deno.json`] });
-  // await $`sh src/cli/run.sh patchVersion ./pubdir/package.json ./pubdir/deno.json`;
-
-  // Setup JSR JSON
-  await setUpDenoJsonCmd().handler({ packageJson: `${pubdir}/package.json`, jsrJson: `${pubdir}/deno.json` });
-  // await $`node ./setup-jsr-json.cjs ./pubdir/deno.json`;
-
-  // Pack and publish
-  cd("pubdir");
-  await $`pnpm pack`;
-  await $`deno publish --dry-run --unstable-sloppy-imports --allow-dirty`;
-}
-
-export function preparePubdirCmd(): ReturnType<typeof command> {
-  return command({
-    name: "prepare-pubdir",
-    description: "prepare pubdir",
-    version: "1.0.0",
-    args: {
-      pubdir: option({
-        long: "pubdir",
-        short: "p",
-        defaultValue: () => "pubdir",
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Path to the pubdir, defaults to './pubdir'.",
-      }),
-      srcDir: option({
-        long: "srcDir",
-        short: "s",
-        defaultValue: () => "src",
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Path to the src directory, defaults to './src'.",
-      }),
-      baseDir: option({
-        long: "baseDir",
-        short: "b",
-        defaultValue: () => "../",
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Path to the base directory of the project, defaults to '../'.",
-      }),
-      version: option({
-        long: "version",
-        short: "v",
-        defaultValue: () => getVersion(),
-        defaultValueIsSerializable: true,
-        type: string,
-        description: "Version to patch in, defaults to reading from package.json.",
-      }),
-    },
-    handler: async (args) => {
-      await preparePubdir(args.pubdir, args.version, args.baseDir, args.srcDir);
-    },
-  }) as ReturnType<typeof command>;
-}

package/src/cli/prepare-pubdir-cmd.ts

@@ -0,0 +1,156 @@
+import { command, option, string } from "cmd-ts";
+import * as path from "node:path";
+import * as process from "node:process";
+import { $, cd, glob } from "zx";
+import { getVersion } from "./utils.js";
+import { setUpDenoJsonCmd } from "./setup-deno-json-cmd.js";
+import { patchVersionCmd } from "./patch-version-cmd.js";
+
+function disableVerbose(fn: () => Promise<void>): Promise<void> {
+  const verbose = $.verbose;
+  $.verbose = false;
+  return fn().finally(() => {
+    $.verbose = verbose;
+  });
+}
+
+export async function preparePubdir(pubdir: string, version: string, baseDir: string, srcDir: string): Promise<void> {
+  // Set shell options equivalent to 'set -ex'
+  $.verbose = true;
+
+  // Build if not in CI
+  if (process.env.IN_CI !== "in_ci") {
+    await $`pnpm run build`;
+  }
+
+  // Clean and create pubdir
+  await $`rm -rf ${pubdir}`;
+  await $`mkdir -p ${pubdir}`;
+
+  // Copy files to pubdir
+  await $`cp -pr ${path.join(baseDir, ".gitignore")} ${path.join(baseDir, "README.md")} ${path.join(baseDir, "LICENSE")} ./dist/ts/ ${pubdir}/`;
+
+  // Copy from dist/pkg
+  cd("dist/pkg");
+  await $`cp -pr . ../../${pubdir}/`;
+  cd("../..");
+
+  // Copy from src
+  cd(srcDir);
+  await $`cp -pr . ../${pubdir}/${srcDir}/`;
+  cd("..");
+
+  // Rename .js files to .cjs in pubdir/cjs
+  const jsFiles = await glob(`${pubdir}/cjs/**/*.js`);
+
+  await disableVerbose(async () => {
+    for (const file of jsFiles) {
+      const newFile = file.replace(/\.js$/, ".cjs");
+      await $`mv ${file} ${newFile}`;
+    }
+
+    // Rename .js.map files to .cjs.map in pubdir/cjs
+    const mapFiles = await glob(`${pubdir}/cjs/**/*.js.map`);
+    for (const file of mapFiles) {
+      const newFile = file.replace(/\.js\.map$/, ".cjs.map");
+      await $`mv ${file} ${newFile}`;
+    }
+  });
+
+  // Run jscodeshift on .cjs files
+  const cjsFiles = await glob(`${pubdir}/cjs/**/*.cjs`);
+  if (cjsFiles.length > 0) {
+    await $`pnpm exec jscodeshift -s --parser=babel -t=./to-cjs.js ${cjsFiles}`;
+  }
+
+  // Copy package.json
+  await $`cp package.json ${pubdir}/`;
+
+  // Clean up test files in pubdir/src
+  cd(`${pubdir}/${srcDir}`);
+  await $`rm -f test/test-exit-handler.* ./utils/stream-test-helper.ts`.catch(() => {
+    // Ignore errors if files don't exist
+  });
+  cd("../..");
+
+  // Remove __screenshots__ directories
+  const screenshotDirs = await glob(`${pubdir}/${srcDir}/**/__screenshots__`);
+  for (const dir of screenshotDirs) {
+    await $`rm -rf ${dir}`;
+  }
+
+  // Remove test files
+  await disableVerbose(async () => {
+    const testFiles = await glob(`${pubdir}/${srcDir}/**/*.test.ts`);
+    for (const file of testFiles) {
+      await $`rm -f ${file}`;
+    }
+  });
+
+  // Copy tsconfig.json
+  await $`cp ./tsconfig.json ./${pubdir}/`;
+
+  // Copy deno.json
+  await $`cp ./deno.json ./${pubdir}/`;
+
+  // Patch version in package.json and deno.json
+  await patchVersionCmd().handler({ version, files: [`${pubdir}/package.json`, `${pubdir}/deno.json`] });
+  // await $`sh src/cli/run.sh patchVersion ./pubdir/package.json ./pubdir/deno.json`;
+
+  // Setup JSR JSON
+  await setUpDenoJsonCmd().handler({ packageJson: `${pubdir}/package.json`, jsrJson: `${pubdir}/deno.json` });
+  // await $`node ./setup-jsr-json.cjs ./pubdir/deno.json`;
+
+  // Pack and publish
+  cd("pubdir");
+  await $`pnpm pack 2>&1 | head -10 && echo "..."`;
+  await $`deno publish --dry-run --unstable-sloppy-imports --allow-dirty --quiet`;
+
+  // eslint-disable-next-line no-console
+  console.log(`Prepared ${pubdir} for version ${version}`);
+}
+
+export function preparePubdirCmd(): ReturnType<typeof command> {
+  return command({
+    name: "prepare-pubdir",
+    description: "prepare pubdir",
+    version: "1.0.0",
+    args: {
+      pubdir: option({
+        long: "pubdir",
+        short: "p",
+        defaultValue: () => "pubdir",
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Path to the pubdir, defaults to './pubdir'.",
+      }),
+      srcDir: option({
+        long: "srcDir",
+        short: "s",
+        defaultValue: () => "src",
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Path to the src directory, defaults to './src'.",
+      }),
+      baseDir: option({
+        long: "baseDir",
+        short: "b",
+        defaultValue: () => "../",
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Path to the base directory of the project, defaults to '../'.",
+      }),
+      version: option({
+        long: "version",
+        short: "v",
+        defaultValue: () => getVersion(),
+        defaultValueIsSerializable: true,
+        type: string,
+        description: "Version to patch in, defaults to reading from package.json.",
+      }),
+    },
+    handler: async (args) => {
+      await preparePubdir(args.pubdir, args.version, args.baseDir, args.srcDir);
+    },
+  }) as ReturnType<typeof command>;
+}