@hzab/vite-config 0.0.2-alpha.0 → 0.0.3-alpha.1

package/src/index.ts

@@ -1,42 +1,41 @@
-export { createAppViteConfig } from "./create-app-vite-config.ts";
-export { createViteConfig } from "./create-vite-config.ts";
-export type { CreateViteConfigOptions } from "./create-vite-config.ts";
-export {
-  createLibraryViteConfig,
-  DEFAULT_LIBRARY_EXTERNALS,
-  DEFAULT_LIBRARY_GLOBALS,
-} from "./create-library-vite-config.ts";
-export { copyPlugin } from "./plugins/copy.ts";
-export type {
-  HashBuildDirNameOptions,
-  HashCleanupOptions,
-  HashDeployPluginOptions,
-  HashTimestampFormat,
-} from "./plugins/hash-deploy.ts";
-export { createHashBuildDirName, getCommitHash, hashDeployPlugin } from "./plugins/hash-deploy.ts";
-export type { LifecyclePluginOptions } from "./plugins/lifecycle.ts";
-export { lifecyclePlugin } from "./plugins/lifecycle.ts";
-export { buildLessOptions, lessTildeResolutionPlugin } from "./plugins/less-tilde.ts";
-export type { PublicAssetsPluginOptions } from "./plugins/public-assets.ts";
-export { publicAssetsPlugin } from "./plugins/public-assets.ts";
-export type { PublicConfigPluginOptions } from "./plugins/public-config.ts";
-export { publicConfigPlugin } from "./plugins/public-config.ts";
-export type { ReactCompilerPluginOptions } from "./plugins/react-compiler.ts";
-export { reactCompilerPlugin } from "./plugins/react-compiler.ts";
-export { relativeBasePlugin } from "./plugins/relative-base.ts";
-export { stubLessPlugin } from "./plugins/stub-less.ts";
-export { svgReactPlugin } from "./plugins/svg-react.ts";
-export type {
-  CopyOption,
-  CopyPluginOptions,
-  CopyTarget,
-  CreateAppViteConfigOptions,
-  CreateAppViteConfigResult,
-  CreateLibraryViteConfigOptions,
-  LessOptions,
-  LibraryFormats,
-  PublicAssetsOptions,
-  PublicConfigOptions,
-  ReactCompilerMode,
-  SvgReactOptions,
-} from "./types.ts";
+export { createAppViteConfig } from "./create-app-vite-config.ts";
+export { createViteConfig } from "./create-vite-config.ts";
+export type { CreateViteConfigOptions } from "./create-vite-config.ts";
+export {
+  createLibraryViteConfig,
+  DEFAULT_LIBRARY_EXTERNALS,
+  DEFAULT_LIBRARY_GLOBALS,
+} from "./create-library-vite-config.ts";
+export { copyPlugin } from "./plugins/copy.ts";
+export type {
+  HashBuildDirNameOptions,
+  HashCleanupOptions,
+  HashDeployPluginOptions,
+} from "./plugins/hash-deploy.ts";
+export { createHashBuildDirName, getCommitHash, hashDeployPlugin } from "./plugins/hash-deploy.ts";
+export type { LifecyclePluginOptions } from "./plugins/lifecycle.ts";
+export { lifecyclePlugin } from "./plugins/lifecycle.ts";
+export { buildLessOptions, lessTildeResolutionPlugin } from "./plugins/less-tilde.ts";
+export type { PublicAssetsPluginOptions } from "./plugins/public-assets.ts";
+export { publicAssetsPlugin } from "./plugins/public-assets.ts";
+export type { PublicConfigPluginOptions } from "./plugins/public-config.ts";
+export { publicConfigPlugin } from "./plugins/public-config.ts";
+export type { ReactCompilerPluginOptions } from "./plugins/react-compiler.ts";
+export { reactCompilerPlugin } from "./plugins/react-compiler.ts";
+export { relativeBasePlugin } from "./plugins/relative-base.ts";
+export { stubLessPlugin } from "./plugins/stub-less.ts";
+export { svgReactPlugin } from "./plugins/svg-react.ts";
+export type {
+  CopyOption,
+  CopyPluginOptions,
+  CopyTarget,
+  CreateAppViteConfigOptions,
+  CreateAppViteConfigResult,
+  CreateLibraryViteConfigOptions,
+  LessOptions,
+  LibraryFormats,
+  PublicAssetsOptions,
+  PublicConfigOptions,
+  ReactCompilerMode,
+  SvgReactOptions,
+} from "./types.ts";

package/src/plugins/copy.ts

@@ -1,25 +1,25 @@
-import { viteStaticCopy } from "vite-plugin-static-copy";
-
-import type { PluginOption } from "vite";
-import type { Target, ViteStaticCopyOptions } from "vite-plugin-static-copy";
-
-/** @public */
-export type CopyTarget = Target;
-/** @public */
-export type CopyPluginOptions = ViteStaticCopyOptions;
-
-/** @public */
-export type CopyOption = CopyPluginOptions | CopyTarget[];
-
-export function resolveCopyPluginOptions(options: CopyOption): CopyPluginOptions {
-  return Array.isArray(options) ? { targets: options } : options;
-}
-
-/**
- * 通用静态复制，封装 `vite-plugin-static-copy`。
- * 可传完整选项，或直接传 `targets` 数组。
- * @public
- */
-export function copyPlugin(options: CopyOption): PluginOption {
-  return viteStaticCopy(resolveCopyPluginOptions(options));
-}
+import { viteStaticCopy } from "vite-plugin-static-copy";
+
+import type { PluginOption } from "vite";
+import type { Target, ViteStaticCopyOptions } from "vite-plugin-static-copy";
+
+/** @public */
+export type CopyTarget = Target;
+/** @public */
+export type CopyPluginOptions = ViteStaticCopyOptions;
+
+/** @public */
+export type CopyOption = CopyPluginOptions | CopyTarget[];
+
+export function resolveCopyPluginOptions(options: CopyOption): CopyPluginOptions {
+  return Array.isArray(options) ? { targets: options } : options;
+}
+
+/**
+ * 通用静态复制，封装 `vite-plugin-static-copy`。
+ * 可传完整选项，或直接传 `targets` 数组。
+ * @public
+ */
+export function copyPlugin(options: CopyOption): PluginOption {
+  return viteStaticCopy(resolveCopyPluginOptions(options));
+}

package/src/plugins/hash-deploy.ts

@@ -1,199 +1,239 @@
-import { execFileSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-
-import type { PluginOption } from "vite";
-
-/** @public */
-export type HashTimestampFormat = "epoch" | "datetime";
-
-/** @public */
-export interface HashBuildDirNameOptions {
-  repositoryRoot?: string;
-  now?: number;
-  /** @defaultValue "epoch" */
-  timestampFormat?: HashTimestampFormat;
-}
-
-/** @public */
-export interface HashCleanupOptions {
-  /**
-   * 每次成功构建后保留的 Hash 版本总数（含本次构建）。
-   * 必须为大于等于 1 的整数。
-   */
-  keep: number;
-}
-
-/** @public */
-export interface HashDeployPluginOptions {
-  rootDir: string;
-  /** hash 子目录名，如 `{commit}-{timestamp}` 或 `{commit}-YYYY-MM-DD-HH-mm-ss` */
-  buildDirStr: string;
-  /**
-   * 与最终 Vite `base` 一致的资源前缀。
-   * - 默认相对：`./{buildDirStr}/`
-   * - 自定义 CDN：`https://cdn.example.com/app/{buildDirStr}/`
-   */
-  publicPath: string;
-  /** 旧 Hash 目录清理策略；未传时永久保留，由部署系统负责清理。 */
-  cleanup?: HashCleanupOptions;
-}
-
-const HASH_BUILD_DIR_PATTERN = /^(?:[0-9a-f]{12}|local)-(\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}|\d+)$/;
-
-function parseHashTimestamp(value: string): number {
-  if (/^\d+$/.test(value)) return Number(value);
-  const [year = 0, month = 1, day = 1, hour = 0, minute = 0, second = 0] = value
-    .split("-")
-    .map(Number);
-  return new Date(year, month - 1, day, hour, minute, second).getTime();
-}
-
-function padTwo(value: number): string {
-  return String(value).padStart(2, "0");
-}
-
-function formatHashTimestamp(now: number, format: HashTimestampFormat = "epoch"): string {
-  if (format !== "datetime") return String(now);
-  const date = new Date(now);
-  return [
-    date.getFullYear(),
-    padTwo(date.getMonth() + 1),
-    padTwo(date.getDate()),
-    padTwo(date.getHours()),
-    padTwo(date.getMinutes()),
-    padTwo(date.getSeconds()),
-  ].join("-");
-}
-
-function cleanupOldHashBuilds(deployRoot: string, currentBuildDir: string, keep: number): void {
-  const oldBuilds = fs
-    .readdirSync(deployRoot, { withFileTypes: true })
-    .flatMap((entry) => {
-      if (!entry.isDirectory() || entry.name === currentBuildDir) return [];
-      const match = HASH_BUILD_DIR_PATTERN.exec(entry.name);
-      return match ? [{ name: entry.name, timestamp: parseHashTimestamp(match[1]!) }] : [];
-    })
-    .sort((left, right) => right.timestamp - left.timestamp || right.name.localeCompare(left.name));
-
-  for (const build of oldBuilds.slice(Math.max(keep - 1, 0))) {
-    fs.rmSync(path.join(deployRoot, build.name), { recursive: true });
-  }
-}
-
-/**
- * 构建结束后写 `dist/hash.txt`，并把 hash 子目录中的 `index.html` 复制到 `dist/index.html`。
- * 相对 `base` 时为根入口补上 hash 前缀；绝对 `base` 时产物已含完整 URL，原样复制即可。
- * 配置 `cleanup.keep` 时，成功写入根入口后只保留指定数量的最新 Hash 版本。
- * @public
- */
-export function hashDeployPlugin(options: HashDeployPluginOptions): PluginOption {
-  const { rootDir, buildDirStr, publicPath, cleanup } = options;
-  if (cleanup && (!Number.isInteger(cleanup.keep) || cleanup.keep < 1)) {
-    throw new Error("[hash-deploy] cleanup.keep must be an integer greater than or equal to 1.");
-  }
-  let outputDir: string | undefined;
-  let deployRoot: string | undefined;
-
-  return {
-    name: "hash-deploy",
-    enforce: "post",
-    configResolved(config) {
-      const resolvedRoot = path.resolve(config.root);
-      const expectedRoot = path.resolve(rootDir);
-      if (resolvedRoot !== expectedRoot) {
-        throw new Error(
-          `[hash-deploy] Vite root "${resolvedRoot}" must match rootDir "${expectedRoot}".`,
-        );
-      }
-      // 相对 hash：工厂 publicPath 为 `./{hash}/`，但 Vite base 必须保持 `./`。
-      const expectedBase = publicPath.startsWith("./") ? "./" : publicPath;
-      if (config.base !== expectedBase) {
-        throw new Error(
-          `[hash-deploy] Vite base "${config.base}" must remain "${expectedBase}" during hash deployment.`,
-        );
-      }
-
-      outputDir = path.resolve(resolvedRoot, config.build.outDir);
-      if (path.basename(outputDir) !== buildDirStr) {
-        throw new Error(
-          `[hash-deploy] build.outDir "${config.build.outDir}" must end with the hash directory "${buildDirStr}".`,
-        );
-      }
-      deployRoot = path.dirname(outputDir);
-    },
-    writeBundle: {
-      sequential: true,
-      order: "post",
-      handler() {
-        if (!outputDir || !deployRoot) {
-          throw new Error("[hash-deploy] Vite configuration was not resolved before writeBundle.");
-        }
-
-        const sourceIndex = path.join(outputDir, "index.html");
-        if (!fs.existsSync(sourceIndex)) {
-          throw new Error(`[hash-deploy] Generated entry was not found: "${sourceIndex}".`);
-        }
-
-        fs.mkdirSync(deployRoot, { recursive: true });
-        fs.writeFileSync(path.join(deployRoot, "hash.txt"), buildDirStr);
-        const sourceHtml = fs.readFileSync(sourceIndex, "utf8");
-        // 相对 base（`./{hash}/`）时子目录 HTML 中的资源均相对于自身，根入口需统一补 hash；
-        // 绝对 base 时 Vite 已写出完整 URL，直接复制。
-        const rootHtml = publicPath.startsWith("./")
-          ? sourceHtml.replace(/(\b(?:href|src)\s*=\s*["'])\.\//g, `$1${publicPath}`)
-          : sourceHtml;
-        fs.writeFileSync(path.join(deployRoot, "index.html"), rootHtml);
-        if (cleanup) {
-          cleanupOldHashBuilds(deployRoot, buildDirStr, cleanup.keep);
-        }
-      },
-    },
-  };
-}
-
-/**
- * 从指定仓库读取短 commit hash；非 git 环境回退 `local`。
- * @public
- */
-export function getCommitHash(repositoryRoot: string = process.cwd()): string {
-  try {
-    return execFileSync("git", ["rev-parse", "HEAD"], {
-      cwd: repositoryRoot,
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"],
-    })
-      .trim()
-      .slice(0, 12);
-  } catch {
-    return "local";
-  }
-}
-
-/**
- * 生成 hash 构建目录名；保留仅传时间戳的旧调用方式。
- * @public
- */
-export function createHashBuildDirName(now?: number): string;
-/** @public */
-export function createHashBuildDirName(repositoryRoot: string, now?: number): string;
-/** @public */
-export function createHashBuildDirName(options: HashBuildDirNameOptions): string;
-export function createHashBuildDirName(
-  repositoryRootOrNowOrOptions?: string | number | HashBuildDirNameOptions,
-  now: number = Date.now(),
-): string {
-  if (repositoryRootOrNowOrOptions != null && typeof repositoryRootOrNowOrOptions === "object") {
-    const {
-      repositoryRoot,
-      now: optionsNow = Date.now(),
-      timestampFormat = "epoch",
-    } = repositoryRootOrNowOrOptions;
-    return `${getCommitHash(repositoryRoot)}-${formatHashTimestamp(optionsNow, timestampFormat)}`;
-  }
-  const repositoryRoot =
-    typeof repositoryRootOrNowOrOptions === "string" ? repositoryRootOrNowOrOptions : undefined;
-  const timestamp =
-    typeof repositoryRootOrNowOrOptions === "number" ? repositoryRootOrNowOrOptions : now;
-  return `${getCommitHash(repositoryRoot)}-${formatHashTimestamp(timestamp)}`;
-}
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+
+import type { PluginOption } from "vite";
+
+import {
+  compileHashDirNameMatcher,
+  DEFAULT_HASH_DIR_NAME_PATTERN,
+  expandHashDirName,
+  hasTimeToken,
+} from "./hash-dir-name.ts";
+import type { HashDirNameMatcher } from "./hash-dir-name.ts";
+
+/**
+ * 近期构建保护窗口：目录名时间戳距今不足该时长的目录不参与清理。
+ * 同机并发构建时，先完成的构建不应删掉另一个进程正在写的目录。
+ * 判据只用目录名里的时间戳，不用文件系统 mtime——CI 恢复缓存 / 解压产物会改写 mtime。
+ */
+const RECENT_BUILD_PROTECT_MS = 5 * 60 * 1000;
+
+/** @public */
+export interface HashBuildDirNameOptions {
+  repositoryRoot?: string;
+  now?: number;
+  /**
+   * Hash 子目录名模式串；不传时用默认 `hash-timestamp`（等价历史默认 `{commit}-{毫秒时间戳}`）。
+   * token 大小写敏感：`hash` = 12 位 commit（非 git 回退 `local`）、`timestamp` = 毫秒时间戳、
+   * `YYYY`/`MM`/`DD`/`HH`/`mm`/`ss`/`SSS` = 本地时区格式化时间；其余字符（含 `-`）为字面文本。
+   * 模式串必须至少含一个时间 token（`timestamp` 或日期 token），只含 `hash` 会被拒绝。
+   * 例：`hash-timestamp`、`hash-timestamp-YYYYMMDDHHmmssSSS`、`hash-YYYYMMDDHHmmssSSS`。
+   */
+  hashDirName?: string;
+}
+
+/** @public */
+export interface HashCleanupOptions {
+  /**
+   * 每次成功构建后保留的 Hash 版本总数（含本次构建）。
+   * 必须为大于等于 1 的整数。
+   */
+  keep: number;
+}
+
+/** @public */
+export interface HashDeployPluginOptions {
+  rootDir: string;
+  /** hash 子目录名，如 `{commit}-{timestamp}` 或 `{commit}-YYYY-MM-DD-HH-mm-ss` */
+  buildDirStr: string;
+  /**
+   * 生成 `buildDirStr` 的模式串（来自工厂的 `hashDirName`）；供 `cleanup` 精确识别历史目录，
+   * 且必须与实际 `buildDirStr` 匹配。未传时用默认模式串 `hash-timestamp`。
+   */
+  buildDirNamePattern?: string;
+  /**
+   * 与最终 Vite `base` 一致的资源前缀。
+   * - 默认相对：`./{buildDirStr}/`
+   * - 自定义 CDN：`https://cdn.example.com/app/{buildDirStr}/`
+   */
+  publicPath: string;
+  /** 旧 Hash 目录清理策略；未传时永久保留，由部署系统负责清理。 */
+  cleanup?: HashCleanupOptions;
+}
+
+/**
+ * 只保留最近 `keep` 个 Hash 版本（含本次构建）。
+ * 只识别 `matcher`（模式串）生成的目录名；不匹配的目录（如 `uploads-*`）一律不动。
+ * 目录名时间戳落在保护窗口内的目录视为并发构建产物，跳过清理。
+ */
+function cleanupOldHashBuilds(
+  deployRoot: string,
+  currentBuildDir: string,
+  keep: number,
+  matcher: HashDirNameMatcher,
+): void {
+  const now = Date.now();
+  const oldBuilds = fs
+    .readdirSync(deployRoot, { withFileTypes: true })
+    .flatMap((entry) => {
+      if (!entry.isDirectory() || entry.name === currentBuildDir) return [];
+      const timestamp = matcher.parseTimestamp(entry.name);
+      if (timestamp == null) return [];
+      // 保护窗口内的目录（含因时钟偏差落在未来的目录）保持不动
+      if (now - timestamp < RECENT_BUILD_PROTECT_MS) return [];
+
+      return [{ name: entry.name, timestamp }];
+    })
+    .sort((left, right) => right.timestamp - left.timestamp || right.name.localeCompare(left.name));
+
+  for (const build of oldBuilds.slice(Math.max(keep - 1, 0))) {
+    fs.rmSync(path.join(deployRoot, build.name), { recursive: true });
+  }
+}
+
+/**
+ * 构建结束后写 `dist/hash.txt`，并把 hash 子目录中的 `index.html` 复制到 `dist/index.html`。
+ * 相对 `base` 时为根入口补上 hash 前缀；绝对 `base` 时产物已含完整 URL，原样复制即可。
+ * 配置 `cleanup.keep` 时，成功写入根入口后只保留指定数量的最新 Hash 版本。
+ * @public
+ */
+export function hashDeployPlugin(options: HashDeployPluginOptions): PluginOption {
+  const { rootDir, buildDirStr, buildDirNamePattern, publicPath, cleanup } = options;
+  if (cleanup && (!Number.isInteger(cleanup.keep) || cleanup.keep < 1)) {
+    throw new Error("[hash-deploy] cleanup.keep must be an integer greater than or equal to 1.");
+  }
+
+  const resolvedBuildDirNamePattern = buildDirNamePattern ?? DEFAULT_HASH_DIR_NAME_PATTERN;
+  if (cleanup && !hasTimeToken(resolvedBuildDirNamePattern)) {
+    // 没有可排序的时间 token 时无法判断历史目录新旧，直接报错，否则会静默堆积
+    throw new Error("[hash-deploy] cleanup requires a buildDirNamePattern with a time token.");
+  }
+
+  const cleanupMatcher = compileHashDirNameMatcher(resolvedBuildDirNamePattern);
+  if (cleanup && !cleanupMatcher.regex.test(buildDirStr)) {
+    // 配了清理但模式串与实际目录名不符时直接报错，否则历史目录会静默堆积，
+    // 与「保留最近 N 个」的预期相反。
+    throw new Error(
+      `[hash-deploy] buildDirStr "${buildDirStr}" does not match buildDirNamePattern "${resolvedBuildDirNamePattern}".`,
+    );
+  }
+
+  let outputDir: string | undefined;
+  let deployRoot: string | undefined;
+
+  return {
+    name: "hash-deploy",
+    enforce: "post",
+    configResolved(config) {
+      const resolvedRoot = path.resolve(config.root);
+      const expectedRoot = path.resolve(rootDir);
+      if (resolvedRoot !== expectedRoot) {
+        throw new Error(
+          `[hash-deploy] Vite root "${resolvedRoot}" must match rootDir "${expectedRoot}".`,
+        );
+      }
+      // 相对 hash：工厂 publicPath 为 `./{hash}/`，但 Vite base 必须保持 `./`。
+      const expectedBase = publicPath.startsWith("./") ? "./" : publicPath;
+      if (config.base !== expectedBase) {
+        throw new Error(
+          `[hash-deploy] Vite base "${config.base}" must remain "${expectedBase}" during hash deployment.`,
+        );
+      }
+
+      outputDir = path.resolve(resolvedRoot, config.build.outDir);
+      if (path.basename(outputDir) !== buildDirStr) {
+        throw new Error(
+          `[hash-deploy] build.outDir "${config.build.outDir}" must end with the hash directory "${buildDirStr}".`,
+        );
+      }
+      deployRoot = path.dirname(outputDir);
+    },
+    writeBundle: {
+      sequential: true,
+      order: "post",
+      handler() {
+        if (!outputDir || !deployRoot) {
+          throw new Error("[hash-deploy] Vite configuration was not resolved before writeBundle.");
+        }
+
+        const sourceIndex = path.join(outputDir, "index.html");
+        if (!fs.existsSync(sourceIndex)) {
+          throw new Error(`[hash-deploy] Generated entry was not found: "${sourceIndex}".`);
+        }
+
+        fs.mkdirSync(deployRoot, { recursive: true });
+        fs.writeFileSync(path.join(deployRoot, "hash.txt"), buildDirStr);
+        const sourceHtml = fs.readFileSync(sourceIndex, "utf8");
+        // 相对 base（`./{hash}/`）时子目录 HTML 中的资源均相对于自身，根入口需统一补 hash；
+        // 绝对 base 时 Vite 已写出完整 URL，直接复制。
+        const rootHtml = publicPath.startsWith("./")
+          ? sourceHtml.replace(/(\b(?:href|src)\s*=\s*["'])\.\//g, `$1${publicPath}`)
+          : sourceHtml;
+        fs.writeFileSync(path.join(deployRoot, "index.html"), rootHtml);
+        if (cleanup) {
+          cleanupOldHashBuilds(deployRoot, buildDirStr, cleanup.keep, cleanupMatcher);
+        }
+      },
+    },
+  };
+}
+
+/**
+ * 从指定仓库读取短 commit hash；非 git 环境回退 `local`。
+ * @public
+ */
+export function getCommitHash(repositoryRoot: string = process.cwd()): string {
+  try {
+    return execFileSync("git", ["rev-parse", "HEAD"], {
+      cwd: repositoryRoot,
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    })
+      .trim()
+      .slice(0, 12);
+  } catch {
+    return "local";
+  }
+}
+
+/**
+ * 生成 hash 构建目录名；保留仅传时间戳的旧调用方式。
+ * 目录名一律由模式串展开，`hashDirName` 不传时用默认 `hash-timestamp`
+ * （等价历史默认 `{commit}-{毫秒时间戳}`）。
+ * @public
+ */
+export function createHashBuildDirName(now?: number): string;
+/** @public */
+export function createHashBuildDirName(repositoryRoot: string, now?: number): string;
+/** @public */
+export function createHashBuildDirName(options: HashBuildDirNameOptions): string;
+export function createHashBuildDirName(
+  repositoryRootOrNowOrOptions?: string | number | HashBuildDirNameOptions,
+  now: number = Date.now(),
+): string {
+  if (repositoryRootOrNowOrOptions != null && typeof repositoryRootOrNowOrOptions === "object") {
+    const {
+      repositoryRoot,
+      now: optionsNow = Date.now(),
+      hashDirName,
+    } = repositoryRootOrNowOrOptions;
+
+    return expandHashDirName({
+      pattern: hashDirName ?? DEFAULT_HASH_DIR_NAME_PATTERN,
+      commitHash: getCommitHash(repositoryRoot),
+      now: optionsNow,
+    });
+  }
+
+  const repositoryRoot =
+    typeof repositoryRootOrNowOrOptions === "string" ? repositoryRootOrNowOrOptions : undefined;
+  const timestamp =
+    typeof repositoryRootOrNowOrOptions === "number" ? repositoryRootOrNowOrOptions : now;
+
+  return expandHashDirName({
+    pattern: DEFAULT_HASH_DIR_NAME_PATTERN,
+    commitHash: getCommitHash(repositoryRoot),
+    now: timestamp,
+  });
+}