@simplysm/sd-cli 14.0.29 → 14.0.32

package/src/utils/package-classify.ts

@@ -0,0 +1,182 @@
+import path from "path";
+import { consola } from "consola";
+import { pathx } from "@simplysm/core-node";
+import type {
+  BuildTarget,
+  SdBuildPackageConfig,
+  SdClientPackageConfig,
+  SdPackageConfig,
+  SdScriptsPackageConfig,
+  SdServerPackageConfig,
+} from "../sd-config.types";
+
+const logger = consola.withTag("sd:cli:package-classify");
+
+/**
+ * 패키지 config를 순회하며 null 필터링 + target 필터링을 수행한다.
+ * 3개 분류 함수(classifyPackages, classifyWatchPackages, classifyDevPackages)의
+ * 공통 순회 로직을 추출한 유틸이다.
+ */
+export function iteratePackages(
+  packages: Record<string, SdPackageConfig | undefined>,
+  targets: string[],
+): Array<{ name: string; config: SdPackageConfig }> {
+  const result: Array<{ name: string; config: SdPackageConfig }> = [];
+  for (const [name, config] of Object.entries(packages)) {
+    if (config == null) continue;
+    if (targets.length > 0 && !targets.includes(name)) continue;
+    result.push({ name, config });
+  }
+  return result;
+}
+
+/**
+ * targets로 패키지 설정을 필터링한다 (scripts target 제외)
+ * @param packages 패키지 설정 맵
+ * @param targets 필터링할 패키지명 목록. 빈 배열이면 scripts를 제외한 모든 패키지 반환
+ * @returns 필터링된 패키지 설정 맵
+ * @internal 테스트용으로 export
+ */
+export function filterPackagesByTargets(
+  packages: Record<string, SdPackageConfig | undefined>,
+  targets: string[],
+): Record<string, SdPackageConfig> {
+  logger.debug(`패키지 필터링 시작 (targets: ${targets.length > 0 ? targets.join(", ") : "전체"})`);
+  const result: Record<string, SdPackageConfig> = {};
+
+  for (const [name, config] of Object.entries(packages)) {
+    if (config == null) continue;
+
+    // watch hook이 설정되지 않은 scripts target 제외
+    if (config.target === "scripts" && config.watch == null) continue;
+
+    // targets가 비어있으면 모든 패키지 포함
+    if (targets.length === 0) {
+      result[name] = config;
+      continue;
+    }
+
+    // targets에 포함된 패키지만 필터링
+    if (targets.includes(name)) {
+      result[name] = config;
+    }
+  }
+
+  logger.debug(`패키지 필터링 완료 (${Object.keys(result).length}개)`);
+  return result;
+}
+
+//#region Classify functions
+
+const isLibraryTarget = (target: string): target is BuildTarget =>
+  target === "node" || target === "browser" || target === "neutral";
+
+export interface WatchClassifiedPackages {
+  libraryPackages: Array<{ name: string; dir: string; config: SdBuildPackageConfig }>;
+  watchHookPackages: Array<{ name: string; dir: string; config: SdBuildPackageConfig | SdScriptsPackageConfig }>;
+}
+
+/**
+ * Watch 모드용 패키지 분류.
+ * Watch 모드용 패키지 분류. WatchOrchestrator에서 사용한다.
+ */
+export function classifyWatchPackages(
+  allPackages: Record<string, SdPackageConfig>,
+  cwd: string,
+  pathMap: Map<string, string>,
+): WatchClassifiedPackages {
+  logger.debug("watch 패키지 분류 시작");
+  const libraryPackages: WatchClassifiedPackages["libraryPackages"] = [];
+  const watchHookPackages: WatchClassifiedPackages["watchHookPackages"] = [];
+
+  for (const { name, config } of iteratePackages(allPackages, [])) {
+    const relPath = pathMap.get(name) ?? `packages/${name}`;
+    const pkgDir = pathx.posix(path.join(cwd, relPath));
+    if (isLibraryTarget(config.target)) {
+      const buildConfig = config as SdBuildPackageConfig;
+      libraryPackages.push({ name, dir: pkgDir, config: buildConfig });
+      if (buildConfig.watch != null) {
+        watchHookPackages.push({ name, dir: pkgDir, config: buildConfig });
+      }
+    } else if (config.target === "scripts" && (config).watch != null) {
+      watchHookPackages.push({
+        name,
+        dir: pkgDir,
+        config: config,
+      });
+    }
+  }
+
+  logger.debug(`watch 패키지 분류 완료 (library: ${libraryPackages.length}, watchHook: ${watchHookPackages.length})`);
+  return { libraryPackages, watchHookPackages };
+}
+
+export interface DevClassifiedPackages {
+  serverPackages: Array<{ name: string; dir: string; config: SdServerPackageConfig }>;
+  clientPackages: Array<{ name: string; dir: string; config: SdClientPackageConfig }>;
+  serverClientsMap: Map<string, string[]>;
+}
+
+/**
+ * Dev 모드용 패키지 분류.
+ * Dev 모드용 패키지 분류. DevOrchestrator에서 사용한다.
+ */
+export function classifyDevPackages(
+  allPackages: Record<string, SdPackageConfig>,
+  cwd: string,
+  pathMap: Map<string, string>,
+): DevClassifiedPackages {
+  logger.debug("dev 패키지 분류 시작");
+  const serverPackages: DevClassifiedPackages["serverPackages"] = [];
+  const clientPackages: DevClassifiedPackages["clientPackages"] = [];
+  const serverClientsMap = new Map<string, string[]>();
+
+  const entries = iteratePackages(allPackages, []);
+
+  // 1차 패스: 서버 이름 수집
+  const serverNames = new Set<string>();
+  for (const { name, config } of entries) {
+    if (config.target === "server") {
+      serverNames.add(name);
+    }
+  }
+
+  // 2차 패스: 모든 패키지 분류
+  for (const { name, config } of entries) {
+    const relPath = pathMap.get(name) ?? `packages/${name}`;
+    const pkgDir = pathx.posix(path.join(cwd, relPath));
+    if (config.target === "server") {
+      serverPackages.push({
+        name,
+        dir: pkgDir,
+        config: config,
+      });
+    } else if (config.target === "client") {
+      clientPackages.push({
+        name,
+        dir: pkgDir,
+        config: config,
+      });
+
+      // 서버-클라이언트 매핑 구성
+      const clientConfig = config;
+      if (typeof clientConfig.server === "string") {
+        if (serverNames.has(clientConfig.server)) {
+          const clients = serverClientsMap.get(clientConfig.server) ?? [];
+          clients.push(name);
+          serverClientsMap.set(clientConfig.server, clients);
+        } else {
+          process.stdout.write(
+            `⚠ 클라이언트 "${name}"의 서버 "${clientConfig.server}"가 dev 대상에 없어 독립 실행됩니다.\n`,
+          );
+        }
+      }
+    }
+    // 라이브러리 및 scripts 패키지는 dev 모드에서 제외
+  }
+
+  logger.debug(`dev 패키지 분류 완료 (server: ${serverPackages.length}, client: ${clientPackages.length})`);
+  return { serverPackages, clientPackages, serverClientsMap };
+}
+
+//#endregion

package/src/utils/package-utils.ts

@@ -4,34 +4,12 @@ import { consola } from "consola";
 import { SdError } from "@simplysm/core-common";
 import { pathx } from "@simplysm/core-node";
 import type {
-  BuildTarget,
   SdBuildPackageConfig,
-  SdClientPackageConfig,
   SdPackageConfig,
-  SdScriptsPackageConfig,
-  SdServerPackageConfig,
 } from "../sd-config.types";
 
 const logger = consola.withTag("sd:cli:package-utils");
 
-/**
- * 패키지 config를 순회하며 null 필터링 + target 필터링을 수행한다.
- * 3개 분류 함수(classifyPackages, classifyWatchPackages, classifyDevPackages)의
- * 공통 순회 로직을 추출한 유틸이다.
- */
-export function iteratePackages(
-  packages: Record<string, SdPackageConfig | undefined>,
-  targets: string[],
-): Array<{ name: string; config: SdPackageConfig }> {
-  const result: Array<{ name: string; config: SdPackageConfig }> = [];
-  for (const [name, config] of Object.entries(packages)) {
-    if (config == null) continue;
-    if (targets.length > 0 && !targets.includes(name)) continue;
-    result.push({ name, config });
-  }
-  return result;
-}
-
 /**
  * import.meta.dirname에서 위로 탐색하여 package.json을 찾고 패키지 루트를 반환한다.
  */
@@ -120,91 +98,6 @@ export function mergeTestsPackagesIntoConfig(
   return { merged, pathMap };
 }
 
-export interface DepsResult {
-  workspaceDeps: string[];
-  replaceDeps: string[];
-}
-
-/**
- * pnpm-workspace.yaml 기반으로 workspace 패키지의 name → 상대 디렉토리 맵을 구성한다.
- * 예: "@simplysm/core-node" → "packages/core-node"
- */
-function buildWorkspacePkgMap(cwd: string): Map<string, string> {
-  const map = new Map<string, string>();
-  const wsPkgs = discoverWorkspacePackages(cwd);
-  for (const [, relDir] of wsPkgs) {
-    const pkgJsonPath = pathx.posix(path.join(cwd, relDir, "package.json"));
-    if (!fs.existsSync(pkgJsonPath)) continue;
-    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8")) as { name: string };
-    map.set(pkgJson.name, relDir);
-  }
-  return map;
-}
-
-export function collectDeps(
-  pkgDir: string,
-  cwd: string,
-  replaceDepsConfig?: Record<string, string>,
-): DepsResult {
-  const startTime = performance.now();
-  logger.debug("의존성 수집 시작");
-
-  // pnpm-workspace.yaml에서 workspace 패키지 디렉토리 패턴을 읽어 실제 패키지 맵 구성
-  const workspacePkgMap = buildWorkspacePkgMap(cwd);
-
-  const replaceDepsPatterns: Array<{ regex: RegExp }> = [];
-  if (replaceDepsConfig != null) {
-    for (const pattern of Object.keys(replaceDepsConfig)) {
-      const regexStr = pattern.replace(/[.+]/g, (ch) => `\\${ch}`).replace(/\*/g, "[^/]+");
-      replaceDepsPatterns.push({ regex: new RegExp(`^${regexStr}$`) });
-    }
-  }
-
-  const workspaceDeps: string[] = [];
-  const replaceDeps: string[] = [];
-  const visited = new Set<string>();
-
-  function traverse(dir: string): void {
-    const pkgJsonPath = pathx.posix(path.join(dir, "package.json"));
-    if (!fs.existsSync(pkgJsonPath)) return;
-
-    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8")) as {
-      dependencies?: Record<string, string>;
-    };
-    const deps = Object.keys(pkgJson.dependencies ?? {});
-
-    for (const dep of deps) {
-      if (visited.has(dep)) continue;
-      visited.add(dep);
-
-      // 워크스페이스 패키지 확인
-      const wsDir = workspacePkgMap.get(dep);
-      if (wsDir != null) {
-        workspaceDeps.push(path.basename(wsDir));
-        traverse(pathx.posix(path.join(cwd, wsDir)));
-        continue;
-      }
-
-      // replaceDeps 패턴 확인
-      const matched = replaceDepsPatterns.find((p) => p.regex.test(dep));
-      if (matched != null) {
-        replaceDeps.push(dep);
-        const depNodeModulesDir = pathx.posix(path.join(cwd, "node_modules", ...dep.split("/")));
-        if (fs.existsSync(pathx.posix(path.join(depNodeModulesDir, "package.json")))) {
-          traverse(depNodeModulesDir);
-        }
-        continue;
-      }
-    }
-  }
-
-  traverse(pkgDir);
-  logger.debug(
-    `의존성 수집 완료: workspace=${String(workspaceDeps.length)}, replace=${String(replaceDeps.length)} (${Math.round(performance.now() - startTime)}ms)`,
-  );
-  return { workspaceDeps, replaceDeps };
-}
-
 /**
  * 지정된 디렉토리의 package.json에 @angular/core가
  * dependencies 또는 peerDependencies에 있는지 확인한다.
@@ -245,153 +138,3 @@ export function validateTargets(
   }
 }
 
-/**
- * targets로 패키지 설정을 필터링한다 (scripts target 제외)
- * @param packages 패키지 설정 맵
- * @param targets 필터링할 패키지명 목록. 빈 배열이면 scripts를 제외한 모든 패키지 반환
- * @returns 필터링된 패키지 설정 맵
- * @internal 테스트용으로 export
- */
-export function filterPackagesByTargets(
-  packages: Record<string, SdPackageConfig | undefined>,
-  targets: string[],
-): Record<string, SdPackageConfig> {
-  logger.debug(`패키지 필터링 시작 (targets: ${targets.length > 0 ? targets.join(", ") : "전체"})`);
-  const result: Record<string, SdPackageConfig> = {};
-
-  for (const [name, config] of Object.entries(packages)) {
-    if (config == null) continue;
-
-    // watch hook이 설정되지 않은 scripts target 제외
-    if (config.target === "scripts" && config.watch == null) continue;
-
-    // targets가 비어있으면 모든 패키지 포함
-    if (targets.length === 0) {
-      result[name] = config;
-      continue;
-    }
-
-    // targets에 포함된 패키지만 필터링
-    if (targets.includes(name)) {
-      result[name] = config;
-    }
-  }
-
-  logger.debug(`패키지 필터링 완료 (${Object.keys(result).length}개)`);
-  return result;
-}
-
-//#region Classify functions
-
-const isLibraryTarget = (target: string): target is BuildTarget =>
-  target === "node" || target === "browser" || target === "neutral";
-
-export interface WatchClassifiedPackages {
-  libraryPackages: Array<{ name: string; dir: string; config: SdBuildPackageConfig }>;
-  watchHookPackages: Array<{ name: string; dir: string; config: SdBuildPackageConfig | SdScriptsPackageConfig }>;
-}
-
-/**
- * Watch 모드용 패키지 분류.
- * DevWatchOrchestrator._classifyWatchPackages에서 추출한 standalone 함수.
- */
-export function classifyWatchPackages(
-  allPackages: Record<string, SdPackageConfig>,
-  cwd: string,
-  pathMap: Map<string, string>,
-): WatchClassifiedPackages {
-  logger.debug("watch 패키지 분류 시작");
-  const libraryPackages: WatchClassifiedPackages["libraryPackages"] = [];
-  const watchHookPackages: WatchClassifiedPackages["watchHookPackages"] = [];
-
-  for (const { name, config } of iteratePackages(allPackages, [])) {
-    const relPath = pathMap.get(name) ?? `packages/${name}`;
-    const pkgDir = pathx.posix(path.join(cwd, relPath));
-    if (isLibraryTarget(config.target)) {
-      const buildConfig = config as SdBuildPackageConfig;
-      libraryPackages.push({ name, dir: pkgDir, config: buildConfig });
-      if (buildConfig.watch != null) {
-        watchHookPackages.push({ name, dir: pkgDir, config: buildConfig });
-      }
-    } else if (config.target === "scripts" && (config).watch != null) {
-      watchHookPackages.push({
-        name,
-        dir: pkgDir,
-        config: config,
-      });
-    }
-  }
-
-  logger.debug(`watch 패키지 분류 완료 (library: ${libraryPackages.length}, watchHook: ${watchHookPackages.length})`);
-  return { libraryPackages, watchHookPackages };
-}
-
-export interface DevClassifiedPackages {
-  serverPackages: Array<{ name: string; dir: string; config: SdServerPackageConfig }>;
-  clientPackages: Array<{ name: string; dir: string; config: SdClientPackageConfig }>;
-  serverClientsMap: Map<string, string[]>;
-}
-
-/**
- * Dev 모드용 패키지 분류.
- * DevWatchOrchestrator._classifyDevPackages에서 추출한 standalone 함수.
- */
-export function classifyDevPackages(
-  allPackages: Record<string, SdPackageConfig>,
-  cwd: string,
-  pathMap: Map<string, string>,
-): DevClassifiedPackages {
-  logger.debug("dev 패키지 분류 시작");
-  const serverPackages: DevClassifiedPackages["serverPackages"] = [];
-  const clientPackages: DevClassifiedPackages["clientPackages"] = [];
-  const serverClientsMap = new Map<string, string[]>();
-
-  const entries = iteratePackages(allPackages, []);
-
-  // 1차 패스: 서버 이름 수집
-  const serverNames = new Set<string>();
-  for (const { name, config } of entries) {
-    if (config.target === "server") {
-      serverNames.add(name);
-    }
-  }
-
-  // 2차 패스: 모든 패키지 분류
-  for (const { name, config } of entries) {
-    const relPath = pathMap.get(name) ?? `packages/${name}`;
-    const pkgDir = pathx.posix(path.join(cwd, relPath));
-    if (config.target === "server") {
-      serverPackages.push({
-        name,
-        dir: pkgDir,
-        config: config,
-      });
-    } else if (config.target === "client") {
-      clientPackages.push({
-        name,
-        dir: pkgDir,
-        config: config,
-      });
-
-      // 서버-클라이언트 매핑 구성
-      const clientConfig = config;
-      if (typeof clientConfig.server === "string") {
-        if (serverNames.has(clientConfig.server)) {
-          const clients = serverClientsMap.get(clientConfig.server) ?? [];
-          clients.push(name);
-          serverClientsMap.set(clientConfig.server, clients);
-        } else {
-          process.stdout.write(
-            `⚠ 클라이언트 "${name}"의 서버 "${clientConfig.server}"가 dev 대상에 없어 독립 실행됩니다.\n`,
-          );
-        }
-      }
-    }
-    // 라이브러리 및 scripts 패키지는 dev 모드에서 제외
-  }
-
-  logger.debug(`dev 패키지 분류 완료 (server: ${serverPackages.length}, client: ${clientPackages.length})`);
-  return { serverPackages, clientPackages, serverClientsMap };
-}
-
-//#endregion

package/src/utils/tsc-build.ts

@@ -12,7 +12,7 @@ import {
   getCompilerOptionsForEnv,
   type TypecheckEnv,
 } from "./tsconfig";
-import { serializeDiagnostic, type SerializedDiagnostic } from "./typecheck-serialization";
+import { serializeDiagnostic, type SerializedDiagnostic } from "../typecheck/typecheck-serialization";
 import { createOutputPathRewriter, addJsExtensionToImports } from "./output-path-rewriter";
 import { isWorkspaceDiagnostic, formatDiagnosticError } from "./diagnostic-utils";
 

package/src/workers/build-change-filter.ts

@@ -0,0 +1,27 @@
+import type { ConsolaInstance } from "consola";
+
+export interface FsChange {
+  event: string;
+  path: string;
+}
+
+export function hasFileAddOrRemove(changes: FsChange[]): boolean {
+  return changes.some((c) => c.event === "add" || c.event === "unlink");
+}
+
+export function shouldSkipRebuild(
+  filePaths: Iterable<string>,
+  hasAddOrRemove: boolean,
+  lastSourceFilePaths: Set<string> | undefined,
+  logger: ConsolaInstance,
+): boolean {
+  if (hasAddOrRemove) return false;
+  if (lastSourceFilePaths == null) return false;
+
+  for (const p of filePaths) {
+    if (lastSourceFilePaths.has(p)) return false;
+  }
+
+  logger.debug("변경된 파일이 빌드에 포함되지 않아 리빌드 건너뜀");
+  return true;
+}

package/src/workers/build-watch-paths.ts

@@ -0,0 +1,54 @@
+import { pathx } from "@simplysm/core-node";
+import { collectDeps, type DepsResult } from "../deps/replace-deps/collect-deps";
+
+export interface BuildWatchPathsOptions {
+  pkgDir: string;
+  cwd: string;
+  /** 자체 src 디렉토리 내 glob 패턴 (예: "*.ts", "*.{ts,scss,css}", "*") */
+  srcGlobs: string[];
+  /** src 외에 추가로 감시할 디렉토리와 해당 glob */
+  extraDirs?: Array<{ dir: string; globs: string[] }>;
+  /** sd.config.ts의 replaceDeps 설정 */
+  replaceDeps?: Record<string, string>;
+}
+
+export interface BuildWatchPathsResult {
+  watchPaths: string[];
+  deps: DepsResult;
+}
+
+export function buildWatchPaths(options: BuildWatchPathsOptions): BuildWatchPathsResult {
+  const { pkgDir, cwd, srcGlobs, extraDirs, replaceDeps: replaceDepsConfig } = options;
+  const deps = collectDeps(pkgDir, cwd, replaceDepsConfig);
+
+  const watchDirs = [
+    pkgDir,
+    ...deps.workspaceDeps.map((d) => pathx.posixResolve(cwd, "packages", d)),
+  ];
+
+  const watchPaths: string[] = [];
+
+  for (const dir of watchDirs) {
+    for (const glob of srcGlobs) {
+      watchPaths.push(pathx.posixResolve(dir, "src", "**", glob));
+    }
+    if (extraDirs != null) {
+      for (const extra of extraDirs) {
+        for (const glob of extra.globs) {
+          watchPaths.push(pathx.posixResolve(dir, extra.dir, "**", glob));
+        }
+      }
+    }
+  }
+
+  for (const pkg of deps.replaceDeps) {
+    watchPaths.push(
+      pathx.posixResolve(cwd, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"),
+    );
+    watchPaths.push(
+      pathx.posixResolve(pkgDir, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"),
+    );
+  }
+
+  return { watchPaths, deps };
+}