@simplysm/sd-cli 12.9.16 → 12.9.18

package/src/pkg-builders/server/sd-server.plugin-creator.ts

@@ -4,13 +4,14 @@ import { ISdCliServerPluginResultCache } from "../../types/build-plugin.types";
 import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { ISdTsCompilerResult } from "../../types/ts-compiler.types";
 import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
+import { ScopePathSet } from "../commons/scope-path";
 
 export function createSdServerPlugin(conf: {
   pkgPath: TNormPath;
   dev: boolean;
   modifiedFileSet: Set<TNormPath>;
   result: ISdCliServerPluginResultCache;
-  watchScopePaths: TNormPath[];
+  watchScopePathSet: ScopePathSet;
 }): esbuild.Plugin {
   return {
     name: "sd-server-compile",
@@ -20,7 +21,7 @@ export function createSdServerPlugin(conf: {
         additionalOptions: { declaration: false },
         isDevMode: conf.dev,
         isForBundle: true,
-        watchScopePaths: conf.watchScopePaths,
+        watchScopePathSet: conf.watchScopePathSet,
       });
 
       let tsCompileResult: ISdTsCompilerResult;
@@ -32,11 +33,15 @@ export function createSdServerPlugin(conf: {
         conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
 
         //-- return err/warn
-        return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
+        return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(
+          tsCompileResult.messages,
+          conf.pkgPath,
+        );
       });
 
       build.onLoad({ filter: /\.ts$/ }, (args) => {
-        const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))?.last();
+        const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))
+          ?.last();
         if (!emittedJsFile) {
           return {
             errors: [
@@ -60,10 +65,10 @@ export function createSdServerPlugin(conf: {
         {
           filter: new RegExp(
             "(" +
-              Object.keys(build.initialOptions.loader!)
-                .map((item) => "\\" + item)
-                .join("|") +
-              ")$",
+            Object.keys(build.initialOptions.loader!)
+              .map((item) => "\\" + item)
+              .join("|") +
+            ")$",
           ),
         },
         (args) => {

package/src/sd-cli-entry.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+/* eslint-disable no-console */
+
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { SdCliProject } from "./entry/sd-cli-project";
@@ -10,11 +12,13 @@ import { SdCliLocalUpdate } from "./entry/sd-cli-local-update";
 import { SdCliCordova } from "./entry/sd-cli-cordova";
 import { SdCliAiCommand } from "./entry/sd-cli-ai-command";
 import { SdCliPostinstall } from "./entry/sd-cli-postinstall";
+import convertPrivate from "./fix/convert-private";
+import convertPrivateUnderscore from "./fix/convert-private-underscore";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;
 
-const argv = (await yargs(hideBin(process.argv))
+await yargs(hideBin(process.argv))
   .help("help", "도움말")
   .alias("help", "h")
   .options({
@@ -24,15 +28,29 @@ const argv = (await yargs(hideBin(process.argv))
       default: false,
     },
   })
-  .command("local-update", "로컬 라이브러리 업데이트를 수행합니다.", (cmd) =>
-    cmd
+  .middleware((argv) => {
+    if (argv.debug) {
+      process.env["SD_DEBUG"] = "true";
+      SdLogger.setConfig({
+        console: { level: SdLoggerSeverity.debug },
+      });
+    }
+    else {
+      SdLogger.setConfig({ dot: true });
+    }
+  })
+  .command(
+    "local-update",
+    "로컬 라이브러리 업데이트를 수행합니다.",
+    cmd => cmd
       .version(false)
       .hide("help")
       .hide("debug")
       .options({
         config: {
           string: true,
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           string: true,
@@ -40,16 +58,20 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "옵션 설정",
         },
       }),
+    async (argv) => await SdCliLocalUpdate.runAsync(argv),
   )
-  .command("watch", "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.", (cmd) =>
-    cmd
+  .command(
+    "watch",
+    "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.",
+    (cmd) => cmd
       .version(false)
       .hide("help")
       .hide("debug")
       .options({
         config: {
           string: true,
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           string: true,
@@ -67,16 +89,20 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "크롬 inspect를 수행할 패키지 설정",
         },
       }),
+    async (argv) => await SdCliProject.watchAsync(argv),
   )
-  .command("build", "프로젝트의 각 패키지에 대한 빌드를 수행합니다.", (cmd) =>
-    cmd
+  .command(
+    "build",
+    "프로젝트의 각 패키지에 대한 빌드를 수행합니다.",
+    (cmd) => cmd
       .version(false)
       .hide("help")
       .hide("debug")
       .options({
         config: {
           string: true,
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           string: true,
@@ -89,9 +115,12 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "수행할 패키지 설정",
         },
       }),
+    async (argv) => await SdCliProject.buildAsync(argv),
   )
-  .command("publish", "프로젝트의 각 패키지를 배포합니다.", (cmd) =>
-    cmd
+  .command(
+    "publish",
+    "프로젝트의 각 패키지를 배포합니다.",
+    (cmd) => cmd
       .version(false)
       .hide("help")
       .hide("debug")
@@ -103,7 +132,8 @@ const argv = (await yargs(hideBin(process.argv))
         },
         config: {
           type: "string",
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           type: "string",
@@ -116,9 +146,15 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "수행할 패키지 설정",
         },
       }),
+    async (argv) => await SdCliProject.publishAsync(argv),
   )
-  .command("run-electron <package>", "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.", (cmd) =>
-    cmd
+  .command(
+    "run-electron <package>",
+    "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug")
       .positional("package", {
         type: "string",
         describe: "패키지명",
@@ -127,7 +163,8 @@ const argv = (await yargs(hideBin(process.argv))
       .options({
         config: {
           type: "string",
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           type: "string",
@@ -135,9 +172,15 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "옵션 설정",
         },
       }),
+    async (argv) => await SdCliElectron.runAsync(argv),
   )
-  .command("build-electron-for-dev <package>", "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.", (cmd) =>
-    cmd
+  .command(
+    "build-electron-for-dev <package>",
+    "변경감지중인 플랫폼을 ELECTRON 앱 형태로 띄웁니다.",
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug")
       .positional("package", {
         type: "string",
         describe: "패키지명",
@@ -146,7 +189,8 @@ const argv = (await yargs(hideBin(process.argv))
       .options({
         config: {
           type: "string",
-          describe: "simplysm.js 파일 경로",
+          describe: "설정 파일 경로",
+          default: "simplysm.js",
         },
         options: {
           type: "string",
@@ -154,79 +198,69 @@ const argv = (await yargs(hideBin(process.argv))
           describe: "옵션 설정",
         },
       }),
+    async (argv) => await SdCliElectron.buildForDevAsync(argv),
   )
   .command(
     "run-cordova <platform> <package> [url]",
     "변경감지중인 플랫폼을 코도바 디바이스에 앱 형태로 띄웁니다.",
-    (cmd) =>
-      cmd
-        .positional("platform", {
-          type: "string",
-          describe: "빌드 플랫폼(android,...)",
-          demandOption: true,
-        })
-        .positional("package", {
-          type: "string",
-          describe: "패키지명",
-          demandOption: true,
-        })
-        .positional("url", {
-          type: "string",
-          describe: "Webview로 오픈할 URL",
-          demandOption: true,
-        }),
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug")
+      .positional("platform", {
+        type: "string",
+        describe: "빌드 플랫폼(android,...)",
+        demandOption: true,
+      })
+      .positional("package", {
+        type: "string",
+        describe: "패키지명",
+        demandOption: true,
+      })
+      .positional("url", {
+        type: "string",
+        describe: "Webview로 오픈할 URL",
+        demandOption: true,
+      }),
+    async (argv) => await SdCliCordova.runWebviewOnDeviceAsync(argv),
   )
   .command(
     "commit",
     "AI를 통해 변경사항에 대한 커밋 메시지를 작성하여, 커밋 및 푸쉬를 수행합니다.",
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug"),
+    async () => await SdCliAiCommand.commitAsync(),
   )
   .command(
     "postinstall",
     "설치후 자동실행할 작업",
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug"),
+    () => SdCliPostinstall.run(),
   )
-  .parseAsync()) as any;
-
-if (Boolean(argv.debug)) {
-  process.env["SD_DEBUG"] = "true";
-  SdLogger.setConfig({
-    console: {
-      level: SdLoggerSeverity.debug,
+  .command(
+    "fix",
+    "가능한 내용 자동 수정",
+    (cmd) => cmd
+      .version(false)
+      .hide("help")
+      .hide("debug"),
+    () => {
+      convertPrivate();
+      convertPrivateUnderscore();
     },
-  });
-}
-else {
-  SdLogger.setConfig({
-    dot: true,
-  });
-}
-
-if (argv._[0] === "local-update") {
-  await SdCliLocalUpdate.runAsync(argv);
-}
-else if (argv._[0] === "watch") {
-  await SdCliProject.watchAsync(argv);
-}
-else if (argv._[0] === "build") {
-  await SdCliProject.buildAsync(argv);
-}
-else if (argv._[0] === "publish") {
-  await SdCliProject.publishAsync(argv);
-}
-else if (argv._[0] === "run-electron") {
-  await SdCliElectron.runAsync(argv);
-}
-else if (argv._[0] === "build-electron-for-dev") {
-  await SdCliElectron.buildForDevAsync(argv);
-}
-else if (argv._[0] === "run-cordova") {
-  await SdCliCordova.runWebviewOnDeviceAsync(argv);
-}
-else if (argv._[0] === "commit") {
-  await SdCliAiCommand.commitAsync();
-}
-else if (argv._[0] === "postinstall") {
-  SdCliPostinstall.run();
-}
-else {
-  throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
-}
+  )
+  .strict()
+  .recommendCommands()
+  .fail((msg, err, cmd) => {
+    console.error("🚫 지원되지 않는 명령입니다.");
+    console.error(msg);
+    console.log("\n명령어 목록:");
+    cmd.showHelp();
+    process.exit(1);
+  })
+  .parseAsync();

package/src/sd-cli.ts

@@ -1,12 +1,14 @@
 #!/usr/bin/env node
 
-import { exec, spawn } from "child_process";
+import { spawn } from "child_process";
 import { fileURLToPath } from "node:url";
-import os from "os";
 import path from "path";
 
+// 어차피 sd-worker가 fork로 되어있어서 CPU 제한 안걸리는듯..
+
+
 // ProcessorAffinity 마스크 계산
-function calculateAffinityMask(cpuCount: number): string {
+/*function calculateAffinityMask(cpuCount: number): string {
   const exclude = cpuCount <= 1 ? 0 : Math.ceil(cpuCount / 12); // 12개당 1개씩 뺌
   const usable = cpuCount - exclude;
 
@@ -16,31 +18,32 @@ function calculateAffinityMask(cpuCount: number): string {
 
   const maskValue = (1 << usable) - 1;
   return "0x" + maskValue.toString(16).toUpperCase();
-}
+}*/
 
 // 논리 CPU 수 기반 affinity mask 계산 (전체 - 1)
-const cpuCount = os.cpus().length;
-const affinityMask = calculateAffinityMask(cpuCount);
+/*const cpuCount = os.cpus().length;
+const affinityMask = calculateAffinityMask(cpuCount);*/
 
 // CLI 경로 확인
 const cliPath = import.meta.resolve("./sd-cli-entry");
 
 if (path.extname(cliPath) === ".ts") {
   // 현재 프로세스에 affinity 적용
-  const pid = process.pid;
+  /*const pid = process.pid;
   const command = `powershell -Command "$p = Get-Process -Id ${pid}; $p.ProcessorAffinity = ${affinityMask}"`;
 
   exec(command, (err) => {
     if (err) {
       console.error("Affinity 설정 실패:", err.message);
     }
-  });
+  });*/
 
   await import(cliPath);
 }
 else {
   // .js 등의 번들 실행
-  const child = spawn(
+  /*const child = */
+  spawn(
     "node",
     [
       "--import=specifier-resolution-node/register",
@@ -50,7 +53,7 @@ else {
     { stdio: "inherit" },
   );
 
-  child.on("spawn", () => {
+  /*child.on("spawn", () => {
     const pid = child.pid;
     const command = `powershell -Command "$p = Get-Process -Id ${pid}; $p.ProcessorAffinity = ${affinityMask}"`;
 
@@ -59,5 +62,5 @@ else {
         console.error("Affinity 설정 실패:", err.message);
       }
     });
-  });
+  });*/
 }

package/src/ts-compiler/sd-dependency-analyzer.ts

@@ -3,21 +3,18 @@ import { SdDependencyCache } from "./sd-dependency-cache";
 import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { NgtscProgram } from "@angular/compiler-cli";
+import { ScopePathSet } from "../pkg-builders/commons/scope-path";
 
 export class SdDependencyAnalyzer {
   static analyze(
     program: ts.Program,
     compilerHost: ts.CompilerHost,
-    scopePaths: TNormPath[],
+    scopePathSet: ScopePathSet,
     depCache: SdDependencyCache,
   ): void {
     const compilerOpts = program.getCompilerOptions();
     const typeChecker = program.getTypeChecker();
 
-    const inScope = (filePath: string): boolean => {
-      return scopePaths.some((scope) => PathUtils.isChildPath(filePath, scope));
-    };
-
     const resolveModule = (text: string, base: string): TNormPath[] => {
       const res = ts.resolveModuleName(
         text,
@@ -33,7 +30,7 @@ export class SdDependencyAnalyzer {
       }
 
       const absPath = path.resolve(path.dirname(base), text);
-      if (!inScope(absPath)) {
+      if (!scopePathSet.inScope(absPath)) {
         return [];
       }
       else if (
@@ -220,7 +217,7 @@ export class SdDependencyAnalyzer {
           for (const decl of valSymbol?.getDeclarations() ?? []) {
             const declFile = decl.getSourceFile();
             const declNPath = PathUtils.norm(declFile.fileName);
-            if (declNPath !== sfNPath && inScope(declNPath)) {
+            if (declNPath !== sfNPath && scopePathSet.inScope(declNPath)) {
               depCache.addImport(sfNPath, declNPath, 0);
             }
           }
@@ -235,7 +232,7 @@ export class SdDependencyAnalyzer {
             for (const decl of propSymbol.getDeclarations() ?? []) {
               const declFile = decl.getSourceFile();
               const declNPath = PathUtils.norm(declFile.fileName);
-              if (declNPath !== sfNPath && inScope(declNPath)) {
+              if (declNPath !== sfNPath && scopePathSet.inScope(declNPath)) {
                 depCache.addImport(sfNPath, declNPath, 0);
               }
             }
@@ -252,7 +249,7 @@ export class SdDependencyAnalyzer {
             for (const decl of propSymbol.getDeclarations() ?? []) {
               const declFile = decl.getSourceFile();
               const declNPath = PathUtils.norm(declFile.fileName);
-              if (declNPath !== sfNPath && inScope(declNPath)) {
+              if (declNPath !== sfNPath && scopePathSet.inScope(declNPath)) {
                 depCache.addImport(sfNPath, declNPath, 0);
               }
             }
@@ -275,7 +272,7 @@ export class SdDependencyAnalyzer {
 
     const sourceFileSet = new Set(
       program.getSourceFiles()
-        .filter((sf) => inScope(sf.fileName))
+        .filter((sf) => scopePathSet.inScope(sf.fileName))
         .map((sf) => getOrgSourceFile(sf))
         .filterExists(),
     );
@@ -288,23 +285,19 @@ export class SdDependencyAnalyzer {
 
   static analyzeAngularResources(
     ngProgram: NgtscProgram,
-    scopePaths: TNormPath[],
+    scopePathSet: ScopePathSet,
     depCache: SdDependencyCache,
   ) {
-    const inScope = (filePath: string): boolean => {
-      return scopePaths.some((scope) => PathUtils.isChildPath(filePath, scope));
-    };
 
     for (const sf of ngProgram.getTsProgram().getSourceFiles()) {
       const fileNPath = PathUtils.norm(sf.fileName);
-      if (!inScope(fileNPath)) continue;
+      if (!scopePathSet.inScope(fileNPath)) continue;
 
       const dependencies = ngProgram.compiler.getResourceDependencies(sf);
       for (const dep of dependencies) {
         const depNPath = PathUtils.norm(dep);
-        if (!inScope(depNPath)) continue;
+        if (!scopePathSet.inScope(depNPath)) continue;
 
-        console.log(fileNPath, depNPath);
         depCache.addImport(fileNPath, depNPath, 0);
       }
     }