@simplysm/sd-cli 13.0.100 → 14.0.1

package/src/orchestrators/WatchOrchestrator.ts

@@ -1,277 +0,0 @@
-import path from "path";
-import { spawn } from "child_process";
-import { consola } from "consola";
-import type { BuildTarget, SdBuildPackageConfig, SdConfig, SdScriptsPackageConfig } from "../sd-config.types";
-import { loadSdConfig } from "../utils/sd-config";
-import { filterPackagesByTargets } from "../utils/package-utils";
-import { watchReplaceDeps, type WatchReplaceDepResult } from "../utils/replace-deps";
-import { printErrors } from "../utils/output-utils";
-import { RebuildManager } from "../utils/rebuild-manager";
-import { ResultCollector } from "../infra/ResultCollector";
-import { SignalHandler } from "../infra/SignalHandler";
-import { LibraryBuilder } from "../builders/LibraryBuilder";
-import { DtsBuilder } from "../builders/DtsBuilder";
-import type { BuildPackageInfo } from "../builders/types";
-import { watchCopySrcFiles } from "../utils/copy-src";
-import { FsWatcher } from "@simplysm/core-node";
-
-/**
- * Watch command options
- */
-export interface WatchOrchestratorOptions {
-  targets: string[];
-  options: string[];
-}
-
-/**
- * Orchestrator that coordinates watch mode execution
- *
- * Manages watch mode execution for Library packages (node/browser/neutral).
- * - LibraryBuilder: esbuild watch
- * - DtsBuilder: .d.ts generation
- */
-export class WatchOrchestrator {
-  private readonly _cwd: string;
-  private readonly _options: WatchOrchestratorOptions;
-  private readonly _logger = consola.withTag("sd:cli:watch");
-
-  private _resultCollector!: ResultCollector;
-  private _signalHandler!: SignalHandler;
-  private _rebuildManager!: RebuildManager;
-  private _libraryBuilder!: LibraryBuilder;
-  private _dtsBuilder!: DtsBuilder;
-  private _packages: BuildPackageInfo[] = [];
-  private _copySrcWatchers: FsWatcher[] = [];
-  private _replaceDepWatcher: WatchReplaceDepResult | undefined;
-  private readonly _watchHookPackages: Array<{ name: string; dir: string; config: SdScriptsPackageConfig }> = [];
-  private readonly _watchHookWatchers: FsWatcher[] = [];
-
-  constructor(options: WatchOrchestratorOptions) {
-    this._cwd = process.cwd();
-    this._options = options;
-  }
-
-  /**
-   * Initialize Orchestrator
-   * - Load sd.config.ts
-   * - Classify packages
-   * - Create and initialize builders
-   */
-  async initialize(): Promise<void> {
-    this._logger.debug("watch start", { targets: this._options.targets });
-
-    // Load sd.config.ts
-    let sdConfig: SdConfig;
-    try {
-      sdConfig = await loadSdConfig({
-        cwd: this._cwd,
-        dev: true,
-        options: this._options.options,
-      });
-      this._logger.debug("sd.config.ts loaded");
-    } catch (err) {
-      this._logger.error(`Failed to load sd.config.ts: ${err instanceof Error ? err.message : err}`);
-      process.exitCode = 1;
-      throw err;
-    }
-
-    // Start watch if replaceDeps config exists (initial replacement handled in sd-cli.ts)
-    if (sdConfig.replaceDeps != null) {
-      this._replaceDepWatcher = await watchReplaceDeps(this._cwd, sdConfig.replaceDeps);
-    }
-
-    // Filter by targets
-    const allPackages = filterPackagesByTargets(sdConfig.packages, this._options.targets);
-
-    // Classify packages: library (node/browser/neutral) vs scripts+watch
-    const isLibraryTarget = (target: string): target is BuildTarget =>
-      target === "node" || target === "browser" || target === "neutral";
-
-    const libraryConfigs: Record<string, SdBuildPackageConfig> = {};
-    for (const [name, config] of Object.entries(allPackages)) {
-      if (isLibraryTarget(config.target)) {
-        libraryConfigs[name] = config as SdBuildPackageConfig;
-      } else if (config.target === "scripts" && config.watch != null) {
-        this._watchHookPackages.push({
-          name,
-          dir: path.join(this._cwd, "packages", name),
-          config: config,
-        });
-      }
-    }
-
-    if (Object.keys(libraryConfigs).length === 0 && this._watchHookPackages.length === 0) {
-      process.stdout.write("⚠ No packages to watch.\n");
-      return;
-    }
-
-    // Create PackageInfo array for library packages
-    this._packages = Object.entries(libraryConfigs).map(([name, config]) => ({
-      name,
-      dir: path.join(this._cwd, "packages", name),
-      config,
-    }));
-
-    // Initialize infrastructure
-    this._signalHandler = new SignalHandler();
-
-    // Initialize library builders only if there are library packages
-    if (this._packages.length > 0) {
-      this._resultCollector = new ResultCollector();
-      this._rebuildManager = new RebuildManager(this._logger);
-
-      // Print errors on batch completion
-      this._rebuildManager.on("batchComplete", () => {
-        printErrors(this._resultCollector.toMap());
-      });
-
-      // Create builders
-      const builderOptions = {
-        cwd: this._cwd,
-        packages: this._packages,
-        resultCollector: this._resultCollector,
-        rebuildManager: this._rebuildManager,
-      };
-
-      this._libraryBuilder = new LibraryBuilder(builderOptions);
-      this._dtsBuilder = new DtsBuilder(builderOptions);
-
-      // Initialize builders
-      await Promise.all([this._libraryBuilder.initialize(), this._dtsBuilder.initialize()]);
-    }
-  }
-
-  /**
-   * Start watch mode
-   * - Run initial build
-   * - Start watch hook watchers
-   * - Output results
-   */
-  async start(): Promise<void> {
-    if (this._packages.length === 0 && this._watchHookPackages.length === 0) {
-      return;
-    }
-
-    // Start library build if there are library packages
-    if (this._packages.length > 0) {
-      // Set up initial build promises
-      const buildPromises = this._libraryBuilder.getInitialBuildPromises();
-      const dtsPromises = this._dtsBuilder.getInitialBuildPromises();
-
-      // Start copySrc watch
-      for (const pkg of this._packages) {
-        if (pkg.config.copySrc != null && pkg.config.copySrc.length > 0) {
-          const watcher = await watchCopySrcFiles(pkg.dir, pkg.config.copySrc);
-          this._copySrcWatchers.push(watcher);
-        }
-      }
-
-      // Start watch (run in background)
-      void this._libraryBuilder.startWatch();
-      void this._dtsBuilder.startWatch();
-
-      // Start initial build
-      this._logger.start("Running initial build...");
-
-      // Set up complete promise array for library build and DTS build
-      const allBuildTasks: Array<{ name: string; promise: Promise<void> }> = [];
-
-      // Library build tasks
-      for (const pkg of this._packages) {
-        const promise = buildPromises.get(`${pkg.name}:build`) ?? Promise.resolve();
-        allBuildTasks.push({
-          name: `${pkg.name}:build`,
-          promise,
-        });
-      }
-
-      // DTS tasks
-      for (const pkg of this._packages) {
-        const promise = dtsPromises.get(`${pkg.name}:dts`) ?? Promise.resolve();
-        allBuildTasks.push({
-          name: `${pkg.name}:dts`,
-          promise,
-        });
-      }
-
-      // Run all build tasks concurrently (wait until initial build completes)
-      await Promise.allSettled(allBuildTasks.map((task) => task.promise));
-
-      this._logger.success("Initial build completed");
-
-      // Output initial build results
-      printErrors(this._resultCollector.toMap());
-    }
-
-    // Start watch hook watchers for scripts+watch packages
-    for (const pkg of this._watchHookPackages) {
-      const watchConfig = pkg.config.watch!;
-      const watchTargets = watchConfig.target.map((t) => path.resolve(pkg.dir, t));
-
-      // Run initial hook
-      this._runWatchHookCmd(pkg.name, pkg.dir, watchConfig.cmd, watchConfig.args);
-
-      // Start watching
-      const watcher = await FsWatcher.watch(watchTargets);
-      watcher.onChange({ delay: 300 }, () => {
-        this._runWatchHookCmd(pkg.name, pkg.dir, watchConfig.cmd, watchConfig.args);
-      });
-      this._watchHookWatchers.push(watcher);
-
-      this._logger.success(`Watch hook started: ${pkg.name}`);
-    }
-  }
-
-  /**
-   * Run watch hook command
-   */
-  private _runWatchHookCmd(pkgName: string, cwd: string, cmd: string, args?: string[]): void {
-    const child = spawn(cmd, args ?? [], { cwd, stdio: "inherit", shell: true });
-    child.on("error", (err) => {
-      this._logger.error(`Watch hook error (${pkgName}): ${err.message}`);
-    });
-    child.on("close", (code) => {
-      if (code !== 0 && code !== null) {
-        this._logger.warn(`Watch hook (${pkgName}) exited with code ${String(code)}`);
-      }
-    });
-  }
-
-  /**
-   * Wait for termination signal
-   */
-  async awaitTermination(): Promise<void> {
-    if (this._packages.length === 0 && this._watchHookPackages.length === 0) {
-      return;
-    }
-    await this._signalHandler.waitForTermination();
-  }
-
-  /**
-   * Shutdown Orchestrator
-   */
-  async shutdown(): Promise<void> {
-    if (this._packages.length === 0 && this._watchHookPackages.length === 0) {
-      return;
-    }
-
-    process.stdout.write("⏳ Shutting down...\n");
-
-    const shutdownTasks: Array<Promise<void>> = [];
-
-    if (this._packages.length > 0) {
-      shutdownTasks.push(this._libraryBuilder.shutdown());
-      shutdownTasks.push(this._dtsBuilder.shutdown());
-      shutdownTasks.push(...this._copySrcWatchers.map((w) => w.close()));
-    }
-
-    shutdownTasks.push(...this._watchHookWatchers.map((w) => w.close()));
-
-    await Promise.all(shutdownTasks);
-    this._copySrcWatchers = [];
-    this._watchHookWatchers.length = 0;
-    this._replaceDepWatcher?.dispose();
-
-    process.stdout.write("✔ Done\n");
-  }
-}

package/src/utils/tailwind-config-deps.ts

@@ -1,98 +0,0 @@
-import fs from "fs";
-import path from "path";
-
-const jsExtensions = [".js", ".cjs", ".mjs"];
-
-const jsResolutionOrder = ["", ".js", ".cjs", ".mjs", ".ts", ".cts", ".mts", ".jsx", ".tsx"];
-const tsResolutionOrder = ["", ".ts", ".cts", ".mts", ".tsx", ".js", ".cjs", ".mjs", ".jsx"];
-
-function resolveWithExtension(file: string, extensions: string[]): string | null {
-  for (const ext of extensions) {
-    const full = `${file}${ext}`;
-    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
-      return full;
-    }
-  }
-  for (const ext of extensions) {
-    const full = `${file}/index${ext}`;
-    if (fs.existsSync(full) && fs.statSync(full).isFile()) {
-      return full;
-    }
-  }
-  return null;
-}
-
-function resolvePackageFile(specifier: string, fromDir: string): string | null {
-  const parts = specifier.split("/");
-  const pkgName = specifier.startsWith("@") ? parts.slice(0, 2).join("/") : parts[0];
-  const subPath = specifier.startsWith("@") ? parts.slice(2).join("/") : parts.slice(1).join("/");
-
-  let searchDir = fromDir;
-  while (true) {
-    const candidate = path.join(searchDir, "node_modules", pkgName);
-    if (fs.existsSync(candidate)) {
-      const realDir = fs.realpathSync(candidate);
-      if (subPath) {
-        return resolveWithExtension(path.join(realDir, subPath), tsResolutionOrder);
-      }
-      return resolveWithExtension(path.join(realDir, "index"), tsResolutionOrder);
-    }
-    const parent = path.dirname(searchDir);
-    if (parent === searchDir) break;
-    searchDir = parent;
-  }
-  return null;
-}
-
-/**
- * Recursively collect dependencies of Tailwind config file
- *
- * Tailwind built-in `getModuleDependencies` only tracks relative path imports,
- * but this function also resolves `node_modules` symlinks to track actual files for packages in specified scope.
- */
-export function getTailwindConfigDeps(configPath: string, replaceDeps: string[]): string[] {
-  const seen = new Set<string>();
-
-  function isReplaceDepImport(specifier: string): boolean {
-    return replaceDeps.some((dep) => specifier === dep || specifier.startsWith(dep + "/"));
-  }
-
-  function walk(absoluteFile: string): void {
-    if (seen.has(absoluteFile)) return;
-    if (!fs.existsSync(absoluteFile)) return;
-    seen.add(absoluteFile);
-
-    const base = path.dirname(absoluteFile);
-    const ext = path.extname(absoluteFile);
-    const extensions = jsExtensions.includes(ext) ? jsResolutionOrder : tsResolutionOrder;
-
-    let contents: string;
-    try {
-      contents = fs.readFileSync(absoluteFile, "utf-8");
-    } catch {
-      return;
-    }
-
-    for (const match of [
-      ...contents.matchAll(/import[\s\S]*?['"](.{3,}?)['"]/gi),
-      ...contents.matchAll(/import[\s\S]*from[\s\S]*?['"](.{3,}?)['"]/gi),
-      ...contents.matchAll(/require\(['"`](.+)['"`]\)/gi),
-    ]) {
-      const specifier = match[1];
-      let resolved: string | null = null;
-
-      if (specifier.startsWith(".")) {
-        resolved = resolveWithExtension(path.resolve(base, specifier), extensions);
-      } else if (isReplaceDepImport(specifier)) {
-        resolved = resolvePackageFile(specifier, base);
-      }
-
-      if (resolved != null) {
-        walk(resolved);
-      }
-    }
-  }
-
-  walk(path.resolve(configPath));
-  return [...seen];
-}

package/src/utils/template.ts

@@ -1,56 +0,0 @@
-import path from "path";
-import Handlebars from "handlebars";
-import { fsx } from "@simplysm/core-node";
-
-/**
- * Recursively traverse template directory, render with Handlebars, and generate files
- *
- * - `.hbs` extension files: Compile with Handlebars → save with `.hbs` removed from name
- * - If `.hbs` result is empty string/whitespace only: skip file creation
- * - Other files: copy as-is (binary)
- *
- * @param srcDir - Template source directory
- * @param destDir - Output destination directory
- * @param context - Handlebars template variables
- * @param dirReplacements - Directory name substitution map (e.g., `{ __CLIENT__: "client-admin" }`)
- */
-export async function renderTemplateDir(
-  srcDir: string,
-  destDir: string,
-  context: Record<string, unknown>,
-  dirReplacements?: Record<string, string>,
-): Promise<void> {
-  await fsx.mkdir(destDir);
-
-  const entries = await fsx.readdir(srcDir);
-
-  for (const entry of entries) {
-    const srcPath = path.join(srcDir, entry);
-    const stat = await fsx.stat(srcPath);
-
-    if (stat.isDirectory()) {
-      // Apply directory name substitution
-      const destName = dirReplacements?.[entry] ?? entry;
-      await renderTemplateDir(
-        path.join(srcDir, entry),
-        path.join(destDir, destName),
-        context,
-        dirReplacements,
-      );
-    } else if (entry.endsWith(".hbs")) {
-      // Render Handlebars template
-      const source = await fsx.read(srcPath);
-      const template = Handlebars.compile(source, { noEscape: true });
-      const result = template(context);
-
-      // Skip file creation if result is empty or whitespace-only
-      if (result.trim().length === 0) continue;
-
-      const destFileName = entry.slice(0, -4); // Remove .hbs
-      await fsx.write(path.join(destDir, destFileName), result);
-    } else {
-      // Copy binary files as-is
-      await fsx.copy(srcPath, path.join(destDir, entry));
-    }
-  }
-}