@simplysm/sd-cli 14.0.19 → 14.0.22

package/src/utils/server-production-files.ts

@@ -0,0 +1,186 @@
+import type { ServerBuildInfo } from "../workers/server-build.worker";
+import path from "path";
+import fs from "fs";
+import { cpx } from "@simplysm/core-node";
+import { consola } from "consola";
+import { collectAllDependencyExternals } from "./esbuild-config";
+
+const logger = consola.withTag("sd:cli:server-production-files");
+
+/**
+ * 세 가지 소스에서 외부 모듈을 수집하고 병합한다.
+ * collectAllDependencyExternals를 통한 단일 패스 의존성 트리 순회를 사용한다.
+ */
+export function collectAllExternals(pkgDir: string, manualExternals?: string[]): string[] {
+  logger.debug("의존성 트리 스캔 중...");
+  const { optionalPeerDeps, nativeModules } = collectAllDependencyExternals(pkgDir);
+
+  const manual = manualExternals ?? [];
+  return [...new Set([...optionalPeerDeps, ...nativeModules, ...manual])];
+}
+
+/**
+ * pnpm-lock.yaml의 packages 섹션을 파싱하여 name→version 맵을 생성한다.
+ * Lockfile v9 형식: `packages:` 섹션의 `'name@version':` 키를 파싱한다.
+ * YAML 파서 의존성을 피하기 위해 단순 라인 기반 파싱을 사용한다.
+ */
+export function parseLockfileVersions(cwd: string): Map<string, string> {
+  const lockfilePath = path.join(cwd, "pnpm-lock.yaml");
+  if (!fs.existsSync(lockfilePath)) {
+    throw new Error(`pnpm-lock.yaml not found in ${cwd}. Run "pnpm install" first.`);
+  }
+
+  const content = fs.readFileSync(lockfilePath, "utf-8");
+  const map = new Map<string, string>();
+
+  // "packages:" 섹션을 찾고 "'@scope/name@1.2.3':" 또는 "'name@1.2.3':" 형태의 항목을 파싱
+  const lines = content.split("\n");
+  let inPackages = false;
+  for (const line of lines) {
+    if (line === "packages:") {
+      inPackages = true;
+      continue;
+    }
+    if (inPackages && line.length > 0 && !line.startsWith(" ") && !line.startsWith("'")) {
+      break; // 다음 최상위 섹션
+    }
+    if (!inPackages) continue;
+
+    // "'@scope/name@version':" 또는 "'name@version':" 매칭
+    const match = /^\s{2}'(.+)@(\d[^']*)':\s*$/.exec(line);
+    if (match != null) {
+      const name = match[1];
+      const version = match[2];
+      // 첫 번째 항목 유지 (lockfile은 각 버전을 한 번만 기록)
+      if (!map.has(name)) {
+        map.set(name, version);
+      }
+    }
+  }
+
+  return map;
+}
+
+/**
+ * pnpm-lock.yaml에서 주어진 모든 패키지의 잠긴 버전을 확인한다.
+ * lockfile에서 패키지를 찾을 수 없으면 에러를 던진다.
+ */
+export function resolveLockedVersions(cwd: string, pkgNames: string[]): Record<string, string> {
+  const versionMap = parseLockfileVersions(cwd);
+  const result: Record<string, string> = {};
+  for (const name of pkgNames) {
+    const version = versionMap.get(name);
+    if (version == null) {
+      throw new Error(
+        `External dependency "${name}" not found in pnpm-lock.yaml. ` +
+          `Run "pnpm install" and try again.`,
+      );
+    }
+    result[name] = version;
+  }
+  return result;
+}
+
+/**
+ * 프로덕션 배포용 파일을 생성한다
+ */
+export function generateProductionFiles(
+  info: ServerBuildInfo,
+  externals: string[],
+): void {
+  const distDir = path.join(info.pkgDir, "dist");
+  const pkgJson = JSON.parse(fs.readFileSync(path.join(info.pkgDir, "package.json"), "utf-8"));
+
+  // dist/package.json
+  const distPkgJson: Record<string, unknown> = {
+    name: pkgJson.name,
+    version: pkgJson.version,
+    type: pkgJson.type,
+  };
+  if (externals.length > 0) {
+    distPkgJson["dependencies"] = resolveLockedVersions(info.cwd, externals);
+  }
+  if (info.packageManager === "volta") {
+    const nodeVersion = cpx.spawnSync("node", ["-v"]).stdout.trim();
+    distPkgJson["volta"] = { node: nodeVersion };
+  }
+  fs.writeFileSync(path.join(distDir, "package.json"), JSON.stringify(distPkgJson, undefined, 2));
+
+  // dist/mise.toml
+  if (info.packageManager === "mise") {
+    const rootMiseTomlPath = path.join(info.cwd, "mise.toml");
+    let nodeVersion = "20";
+    if (fs.existsSync(rootMiseTomlPath)) {
+      const miseContent = fs.readFileSync(rootMiseTomlPath, "utf-8");
+      const match = /node\s*=\s*"([^"]+)"/.exec(miseContent);
+      if (match != null) {
+        nodeVersion = match[1];
+      }
+    }
+    fs.writeFileSync(path.join(distDir, "mise.toml"), `[tools]\nnode = "${nodeVersion}"\n`);
+  }
+
+  // dist/openssl.cnf
+  fs.writeFileSync(
+    path.join(distDir, "openssl.cnf"),
+    [
+      "nodejs_conf = openssl_init",
+      "",
+      "[openssl_init]",
+      "providers = provider_sect",
+      "ssl_conf = ssl_sect",
+      "",
+      "[provider_sect]",
+      "default = default_sect",
+      "legacy = legacy_sect",
+      "",
+      "[default_sect]",
+      "activate = 1",
+      "",
+      "[legacy_sect]",
+      "activate = 1",
+      "",
+      "[ssl_sect]",
+      "system_default = system_default_sect",
+      "",
+      "[system_default_sect]",
+      "Options = UnsafeLegacyRenegotiation",
+    ].join("\n"),
+  );
+
+  // dist/pm2.config.cjs
+  if (info.pm2 != null) {
+    const pm2Name = info.pm2.name ?? pkgJson.name.replace(/@/g, "").replace(/[/\\]/g, "-");
+    const ignoreWatch = JSON.stringify([
+      "node_modules",
+      "www",
+      ...(info.pm2.ignoreWatchPaths ?? []),
+    ]);
+    const envObj: Record<string, string> = {
+      NODE_ENV: "production",
+      TZ: "Asia/Seoul",
+      ...(info.env ?? {}),
+    };
+    const envStr = JSON.stringify(envObj, undefined, 4);
+
+    const useInterpreter = info.packageManager !== "volta";
+
+    const pm2Config = [
+      ...(useInterpreter ? [`const cp = require("child_process");`, ``] : []),
+      `module.exports = {`,
+      `  name: ${JSON.stringify(pm2Name)},`,
+      `  script: "main.js",`,
+      `  watch: true,`,
+      `  watch_delay: 2000,`,
+      `  ignore_watch: ${ignoreWatch},`,
+      ...(useInterpreter ? [`  interpreter: cp.execSync("mise which node").toString().trim(),`] : []),
+      `  interpreter_args: "--openssl-config=openssl.cnf",`,
+      `  env: ${envStr.replace(/\n/g, "\n  ")},`,
+      `  arrayProcess: "concat",`,
+      `  useDelTargetNull: true,`,
+      `};`,
+    ].join("\n");
+
+    fs.writeFileSync(path.join(distDir, "pm2.config.cjs"), pm2Config);
+  }
+}

package/src/utils/vite-config.ts

@@ -207,7 +207,7 @@ export async function createClientViteConfig(
     optimizeDeps: {
       ...optimizeDepsConfig,
       esbuildOptions: {
-        target: esbuildTarget as string[],
+        target: esbuildTarget,
       },
     },
   };

package/src/workers/client.worker.ts

@@ -412,6 +412,9 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
     const polyfills = fs.existsSync(polyfillsPath) ? ["./src/polyfills.ts"] : undefined;
 
     let lintResult: LintWithProgramResult | undefined;
+    let buildSuccess = true;
+    let buildErrors: string[] | undefined;
+    let buildWarnings: string[] | undefined;
 
     const viteConfig = await createClientViteConfig({
       framework: info.framework,
@@ -423,6 +426,9 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
       env: info.env,
       enableLint: info.enableLint,
       onBuild: (result) => {
+        buildSuccess = result.success;
+        buildErrors = result.errors;
+        buildWarnings = result.warnings;
         if (result.lint != null) {
           lintResult = result.lint;
         }
@@ -443,7 +449,7 @@ async function build(info: ClientBuildInfo): Promise<ClientBuildResult> {
     writeConfigJson(path.join(info.pkgDir, "dist"), info.configs);
 
     logger.debug(`[${info.name}] client worker build 완료`);
-    return { success: true, lint: lintResult };
+    return { success: buildSuccess, errors: buildErrors, warnings: buildWarnings, lint: lintResult };
   } catch (err) {
     const message = errNs.message(err);
     logger.debug(`[${info.name}] client worker build 예외: ${message}`);

package/src/workers/lint.worker.ts

@@ -1,5 +1,5 @@
 import { createWorker } from "@simplysm/core-node";
-import { executeLint, type LintOptions, type LintResult } from "../commands/lint";
+import { executeLint, type LintOptions, type LintResult } from "../utils/lint-core";
 
 //#region Worker
 

package/src/workers/server-build.worker.ts

@@ -2,7 +2,7 @@ import type ts from "typescript";
 import path from "path";
 import fs from "fs";
 import esbuild from "esbuild";
-import { cpx, createWorker, FsWatcher, pathx } from "@simplysm/core-node";
+import { createWorker, FsWatcher, pathx } from "@simplysm/core-node";
 import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { BuildOutput } from "../engines/types";
@@ -14,9 +14,9 @@ import {
 } from "../utils/tsconfig";
 import {
   createServerEsbuildOptions,
-  collectAllDependencyExternals,
   writeChangedOutputFiles,
 } from "../utils/esbuild-config";
+import { collectAllExternals, generateProductionFiles } from "../utils/server-production-files";
 import { runTscPackageBuild } from "../utils/tsc-build";
 import { LintWithProgramRunner } from "../utils/lint-with-program";
 import { registerCleanupHandlers, createOnceGuard, setupWorkerConsola } from "../utils/worker-utils";
@@ -136,184 +136,6 @@ async function cleanup(): Promise<void> {
   }
 }
 
-/**
- * 세 가지 소스에서 외부 모듈을 수집하고 병합한다.
- * collectAllDependencyExternals를 통한 단일 패스 의존성 트리 순회를 사용한다.
- */
-function collectAllExternals(pkgDir: string, manualExternals?: string[]): string[] {
-  logger.debug("의존성 트리 스캔 중...");
-  const { optionalPeerDeps, nativeModules } = collectAllDependencyExternals(pkgDir);
-
-  const manual = manualExternals ?? [];
-  return [...new Set([...optionalPeerDeps, ...nativeModules, ...manual])];
-}
-
-/**
- * pnpm-lock.yaml의 packages 섹션을 파싱하여 name→version 맵을 생성한다.
- * Lockfile v9 형식: `packages:` 섹션의 `'name@version':` 키를 파싱한다.
- * YAML 파서 의존성을 피하기 위해 단순 라인 기반 파싱을 사용한다.
- */
-function parseLockfileVersions(cwd: string): Map<string, string> {
-  const lockfilePath = path.join(cwd, "pnpm-lock.yaml");
-  if (!fs.existsSync(lockfilePath)) {
-    throw new Error(`pnpm-lock.yaml not found in ${cwd}. Run "pnpm install" first.`);
-  }
-
-  const content = fs.readFileSync(lockfilePath, "utf-8");
-  const map = new Map<string, string>();
-
-  // "packages:" 섹션을 찾고 "'@scope/name@1.2.3':" 또는 "'name@1.2.3':" 형태의 항목을 파싱
-  const lines = content.split("\n");
-  let inPackages = false;
-  for (const line of lines) {
-    if (line === "packages:") {
-      inPackages = true;
-      continue;
-    }
-    if (inPackages && line.length > 0 && !line.startsWith(" ") && !line.startsWith("'")) {
-      break; // 다음 최상위 섹션
-    }
-    if (!inPackages) continue;
-
-    // "'@scope/name@version':" 또는 "'name@version':" 매칭
-    const match = /^\s{2}'(.+)@(\d[^']*)':\s*$/.exec(line);
-    if (match != null) {
-      const name = match[1];
-      const version = match[2];
-      // 첫 번째 항목 유지 (lockfile은 각 버전을 한 번만 기록)
-      if (!map.has(name)) {
-        map.set(name, version);
-      }
-    }
-  }
-
-  return map;
-}
-
-/**
- * pnpm-lock.yaml에서 주어진 모든 패키지의 잠긴 버전을 확인한다.
- * lockfile에서 패키지를 찾을 수 없으면 에러를 던진다.
- */
-function resolveLockedVersions(cwd: string, pkgNames: string[]): Record<string, string> {
-  const versionMap = parseLockfileVersions(cwd);
-  const result: Record<string, string> = {};
-  for (const name of pkgNames) {
-    const version = versionMap.get(name);
-    if (version == null) {
-      throw new Error(
-        `External dependency "${name}" not found in pnpm-lock.yaml. ` +
-          `Run "pnpm install" and try again.`,
-      );
-    }
-    result[name] = version;
-  }
-  return result;
-}
-
-/**
- * 프로덕션 배포용 파일을 생성한다
- */
-function generateProductionFiles(
-  info: ServerBuildInfo,
-  externals: string[],
-): void {
-  const distDir = path.join(info.pkgDir, "dist");
-  const pkgJson = JSON.parse(fs.readFileSync(path.join(info.pkgDir, "package.json"), "utf-8"));
-
-  // dist/package.json
-  const distPkgJson: Record<string, unknown> = {
-    name: pkgJson.name,
-    version: pkgJson.version,
-    type: pkgJson.type,
-  };
-  if (externals.length > 0) {
-    distPkgJson["dependencies"] = resolveLockedVersions(info.cwd, externals);
-  }
-  if (info.packageManager === "volta") {
-    const nodeVersion = cpx.spawnSync("node", ["-v"]).stdout.trim();
-    distPkgJson["volta"] = { node: nodeVersion };
-  }
-  fs.writeFileSync(path.join(distDir, "package.json"), JSON.stringify(distPkgJson, undefined, 2));
-
-  // dist/mise.toml
-  if (info.packageManager === "mise") {
-    const rootMiseTomlPath = path.join(info.cwd, "mise.toml");
-    let nodeVersion = "20";
-    if (fs.existsSync(rootMiseTomlPath)) {
-      const miseContent = fs.readFileSync(rootMiseTomlPath, "utf-8");
-      const match = /node\s*=\s*"([^"]+)"/.exec(miseContent);
-      if (match != null) {
-        nodeVersion = match[1];
-      }
-    }
-    fs.writeFileSync(path.join(distDir, "mise.toml"), `[tools]\nnode = "${nodeVersion}"\n`);
-  }
-
-  // dist/openssl.cnf
-  fs.writeFileSync(
-    path.join(distDir, "openssl.cnf"),
-    [
-      "nodejs_conf = openssl_init",
-      "",
-      "[openssl_init]",
-      "providers = provider_sect",
-      "ssl_conf = ssl_sect",
-      "",
-      "[provider_sect]",
-      "default = default_sect",
-      "legacy = legacy_sect",
-      "",
-      "[default_sect]",
-      "activate = 1",
-      "",
-      "[legacy_sect]",
-      "activate = 1",
-      "",
-      "[ssl_sect]",
-      "system_default = system_default_sect",
-      "",
-      "[system_default_sect]",
-      "Options = UnsafeLegacyRenegotiation",
-    ].join("\n"),
-  );
-
-  // dist/pm2.config.cjs
-  if (info.pm2 != null) {
-    const pm2Name = info.pm2.name ?? pkgJson.name.replace(/@/g, "").replace(/[/\\]/g, "-");
-    const ignoreWatch = JSON.stringify([
-      "node_modules",
-      "www",
-      ...(info.pm2.ignoreWatchPaths ?? []),
-    ]);
-    const envObj: Record<string, string> = {
-      NODE_ENV: "production",
-      TZ: "Asia/Seoul",
-      ...(info.env ?? {}),
-    };
-    const envStr = JSON.stringify(envObj, undefined, 4);
-
-    const useInterpreter = info.packageManager !== "volta";
-
-    const pm2Config = [
-      ...(useInterpreter ? [`const cp = require("child_process");`, ``] : []),
-      `module.exports = {`,
-      `  name: ${JSON.stringify(pm2Name)},`,
-      `  script: "main.js",`,
-      `  watch: true,`,
-      `  watch_delay: 2000,`,
-      `  ignore_watch: ${ignoreWatch},`,
-      ...(useInterpreter ? [`  interpreter: cp.execSync("mise which node").toString().trim(),`] : []),
-      `  interpreter_args: "--openssl-config=openssl.cnf",`,
-      `  env: ${envStr.replace(/\n/g, "\n  ")},`,
-      `  arrayProcess: "concat",`,
-      `  useDelTargetNull: true,`,
-      `};`,
-    ].join("\n");
-
-    fs.writeFileSync(path.join(distDir, "pm2.config.cjs"), pm2Config);
-  }
-}
-
 registerCleanupHandlers(cleanup, logger);
 
 //#endregion
@@ -610,11 +432,15 @@ async function startWatch(info: ServerWatchInfo): Promise<void> {
           const newExternal = cachedExternal;
 
           const oldContext = esbuildContext;
-          if (info.output.js) {
-            esbuildContext = await createEsbuildWatchContext(info, newEntryPoints, newExternal);
-          }
-          if (oldContext != null) {
-            await oldContext.dispose();
+          esbuildContext = undefined; // 선제 초기화 — 생성 실패 시 disposed 참조 방지 (LOGIC-001)
+          try {
+            if (info.output.js) {
+              esbuildContext = await createEsbuildWatchContext(info, newEntryPoints, newExternal);
+            }
+          } finally {
+            if (oldContext != null) {
+              await oldContext.dispose();
+            }
           }
 
           const result = await rebuildAll();

package/tests/angular/vite-postcss-inline-plugin.spec.ts

@@ -39,6 +39,16 @@ describe("processPostCssInline", () => {
     expect(result).toBe(input);
   });
 
+  // Acceptance: double-quote 문자열의 인용부호가 보존된다
+  it("preserves double-quote style when processing inline CSS", async () => {
+    const input = `Component({ styles: [".host { color: blue; }"] })`;
+    const result = await processPostCssInline(input, "test.js", [testPlugin]);
+
+    expect(result).toContain("color: red");
+    // double-quote가 보존되어야 한다
+    expect(result).toMatch(/".host \{ color: red; \}"/);
+  });
+
   // Unit: multiple styles in array
   it("processes multiple styles in the array", async () => {
     const input = `Component({ styles: ['.a { color: blue; }', '.b { color: green; }'] })`;

package/tests/capacitor/capacitor-android-exports.verify.md

@@ -0,0 +1,11 @@
+# Capacitor Android 설정 분리 — LLM 검증
+
+## 검증 항목
+
+- [x] configureAndroid이 capacitor-android.ts에서 export된다: line 13 `export async function configureAndroid`
+- [x] findJava21이 capacitor-android.ts에서 export된다: line 53 `export async function findJava21`
+- [x] findAndroidSdk가 capacitor-android.ts에서 export된다: line 76 `export async function findAndroidSdk`
+- [x] 내부 configure 함수들(_configureJavaHomePath 등)은 export되지 않는다: `^export` 검색 결과 3개만 확인
+- [x] Capacitor 클래스의 _validateTools가 findAndroidSdk/findJava21을 import하여 사용한다: line 8 import, line 217/229 호출
+- [x] Capacitor 클래스에서 9개 Android 설정 private 메서드가 삭제되었다: `_configureAndroid` 등 검색 결과 0건
+- [x] capacitor.ts에서 env import가 제거되었다: `import.*env.*from` 검색 결과 0건