@simplysm/sd-cli 11.1.44 → 11.1.46

package/src/entry/SdCliProject.ts

@@ -2,7 +2,6 @@ import path from "path";
 import {FsUtil, Logger, PathUtil, SdProcess} from "@simplysm/sd-core-node";
 import {
   INpmConfig,
-  ISdCliBuildClusterReqMessage,
   ISdCliBuildClusterResMessage,
   ISdCliConfig,
   ISdCliPackageBuildResult,
@@ -23,6 +22,7 @@ export class SdCliProject {
     confFileRelPath: string;
     optNames: string[];
     pkgNames: string[];
+    inspectNames: string[];
   }): Promise<void> {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "watchAsync"]);
 
@@ -61,7 +61,7 @@ export class SdCliProject {
 
     logger.debug("빌드 프로세스 이벤트 준비...");
     const resultCache = new Map<string, ISdCliPackageBuildResult[]>();
-    let busyCount = 0;
+    let busyReqCntMap = new Map<string, number>();
     const serverInfoMap = new Map<string, {
       // server
       pkgOrOpt?: { path: string; conf: ISdCliServerPackageConfig } | { port: number }; // persist
@@ -76,10 +76,13 @@ export class SdCliProject {
     }>();
     cluster.on("message", (message: ISdCliBuildClusterResMessage) => {
       if (message.type === "change") {
-        if (busyCount === 0) {
+        if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
           logger.log("빌드를 시작합니다...");
         }
-        busyCount++;
+        busyReqCntMap.set(
+          message.req.cmd + "|" + message.req.pkgPath,
+          (busyReqCntMap.get(message.req.cmd + "|" + message.req.pkgPath) ?? 0) + 1
+        );
       }
       else if (message.type === "complete") {
         resultCache.delete("none");
@@ -149,8 +152,12 @@ export class SdCliProject {
         }
 
         setTimeout(async () => {
-          busyCount--;
-          if (busyCount === 0) {
+          busyReqCntMap.set(
+            message.req.cmd + "|" + message.req.pkgPath,
+            (busyReqCntMap.get(message.req.cmd + "|" + message.req.pkgPath) ?? 0) - 1
+          );
+          logger.debug("남아있는 예약 빌드", busyReqCntMap);
+          if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
             for (const serverPkgNameOrPort of serverInfoMap.keys()) {
               const serverInfo = serverInfoMap.get(serverPkgNameOrPort)!;
               if (serverInfo.pkgOrOpt && serverInfo.hasChanges) {
@@ -206,24 +213,21 @@ export class SdCliProject {
     });
 
     logger.debug("빌드 프로세스 명령 전송...");
-    busyCount++;
+    busyReqCntMap.set(
+      "all",
+      (busyReqCntMap.get("all") ?? 0) + 1
+    );
     logger.log("빌드를 시작합니다...");
 
     await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf.packages[path.basename(pkgPath)]!;
-      if (pkgConf.type === "client") {
-        const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
-        await builderKeys.parallelAsync(async (builderKey) => {
-          await this._runCommandAsync(cluster, "watch", projConf, pkgPath, builderKey);
-        });
-      }
-      else {
-        await this._runCommandAsync(cluster, "watch", projConf, pkgPath);
-      }
+      await this._runCommandAsync(cluster, "watch", projConf, pkgPath, opt.inspectNames.includes(path.basename(pkgPath)) ? ["--inspect"] : []);
     });
 
-    busyCount--;
-    if (busyCount === 0) {
+    busyReqCntMap.set(
+      "all",
+      (busyReqCntMap.get("all") ?? 0) - 1
+    );
+    if (Array.from(busyReqCntMap.values()).every(v => v === 0)) {
       const buildResults = Array.from(resultCache.values()).mapMany();
       this._logging(buildResults, logger);
     }
@@ -261,7 +265,7 @@ export class SdCliProject {
     logger.debug("빌드 프로세스 명령 전달...");
     const results = (
       await pkgPaths.parallelAsync(async (pkgPath) => {
-        const pkgConf = projConf.packages[path.basename(pkgPath)]!;
+        /*const pkgConf = projConf.packages[path.basename(pkgPath)]!;
         if (pkgConf.type === "client") {
           const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
           return (await builderKeys.parallelAsync(async (builderKey) => {
@@ -269,8 +273,8 @@ export class SdCliProject {
           })).mapMany();
         }
         else {
-          return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
-        }
+        }*/
+        return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
       })
     ).mapMany();
 
@@ -329,16 +333,7 @@ export class SdCliProject {
       logger.debug("빌드 프로세스 명령 전달...");
       const results = (
         await pkgPaths.parallelAsync(async (pkgPath) => {
-          const pkgConf = projConf.packages[path.basename(pkgPath)]!;
-          if (pkgConf.type === "client") {
-            const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
-            return (await builderKeys.parallelAsync(async (builderKey) => {
-              return await this._runCommandAsync(cluster, "build", projConf, pkgPath, builderKey);
-            })).mapMany();
-          }
-          else {
-            return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
-          }
+          return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
         })
       ).mapMany();
 
@@ -564,9 +559,9 @@ export class SdCliProject {
     });
   }
 
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<void>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<ISdCliPackageBuildResult[]>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<ISdCliPackageBuildResult[] | void> {
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", projConf: ISdCliConfig, pkgPath: string, execArgs: string[]): Promise<void>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", projConf: ISdCliConfig, pkgPath: string): Promise<ISdCliPackageBuildResult[]>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", projConf: ISdCliConfig, pkgPath: string, execArgs?: string[]): Promise<ISdCliPackageBuildResult[] | void> {
     return await new Promise<ISdCliPackageBuildResult[] | void>((resolve) => {
       const cb = (message: ISdCliBuildClusterResMessage): void => {
         if (cmd === "watch" && message.type === "ready" && message.req.cmd === cmd && message.req.pkgPath === pkgPath) {
@@ -584,8 +579,8 @@ export class SdCliProject {
         cmd,
         projConf,
         pkgPath,
-        builderKey
-      } as ISdCliBuildClusterReqMessage);
+        execArgs
+      });
     });
   }
 
@@ -654,4 +649,4 @@ export class SdCliProject {
       });
     });
   }
-}
+}

package/src/index.ts

@@ -6,6 +6,7 @@ export * from "./build-tools/SdNgBundler";
 export * from "./build-tools/SdNgBundlerContext";
 export * from "./build-tools/SdServerBundler";
 export * from "./build-tools/SdTsCompiler";
+export * from "./build-tools2/SdTsCompiler2";
 export * from "./builders/SdCliClientBuilder";
 export * from "./builders/SdCliJsLibLinter";
 export * from "./builders/SdCliServerBuilder";

package/src/sd-cli.ts

@@ -57,6 +57,11 @@ const argv = (
             string: true,
             array: true,
             describe: "수행할 패키지 설정"
+          },
+          inspects: {
+            string: true,
+            array: true,
+            describe: "크롬 inspect를 수행할 패키지 설정"
           }
         })
     )
@@ -197,7 +202,8 @@ else if (argv._[0] === "watch") {
     .watchAsync({
       confFileRelPath: argv.config ?? "simplysm.cjs",
       optNames: argv.options ?? [],
-      pkgNames: argv.packages ?? []
+      pkgNames: argv.packages ?? [],
+      inspectNames: argv.inspects ?? []
     });
 }
 else if (argv._[0] === "build") {

package/src/server-worker.ts

@@ -52,14 +52,14 @@ else {
 
 
 server.on("ready", () => {
-  process.send!({port: server!.options.port});
+  process.send!({port: server.options.port});
 });
 
 process.on("message", (message: any) => {
   if (message.type === "setPathProxy") {
-    server!.pathProxy = message.pathProxy;
+    server.pathProxy = message.pathProxy;
   }
   if (message.type === "broadcastReload") {
-    server!.broadcastReload();
+    server.broadcastReload();
   }
 });

package/src/utils/SdCliBuildResultUtil.ts

@@ -2,9 +2,10 @@ import ts from "typescript";
 import os from "os";
 import path from "path";
 import {ISdCliPackageBuildResult} from "../commons";
+import {PartialMessage} from "esbuild";
 
 export class SdCliBuildResultUtil {
-  public static convertFromTsDiag(diag: ts.Diagnostic, type: "build" | "check"): ISdCliPackageBuildResult {
+  static convertFromTsDiag(diag: ts.Diagnostic, type: "build" | "check"): ISdCliPackageBuildResult {
     const severity = diag.category === ts.DiagnosticCategory.Error ? "error" as const
       : diag.category === ts.DiagnosticCategory.Warning ? "warning" as const
         : diag.category === ts.DiagnosticCategory.Suggestion ? "suggestion" as const
@@ -19,7 +20,7 @@ export class SdCliBuildResultUtil {
     const char = position ? position.character + 1 : undefined;
 
     return {
-      filePath: filePath !== undefined ? path.resolve(filePath) : undefined,
+      filePath,
       line,
       char,
       code,
@@ -29,7 +30,25 @@ export class SdCliBuildResultUtil {
     };
   }
 
-  public static getMessage(result: ISdCliPackageBuildResult): string {
+  static convertFromEsbuildResult(msg: PartialMessage, type: "build" | "check", severity: "warning" | "error") {
+    const filePath = msg.location?.file != null ? path.resolve(msg.location.file) : undefined;
+    const line = msg.location?.line;
+    const char = msg.location?.column;
+    const code = msg.text?.slice(0, msg.text.indexOf(":"));
+    const message = `${msg.pluginName != null ? `(${msg.pluginName}) ` : ""} ${msg.text?.slice(msg.text.indexOf(":") + 1)}`;
+
+    return {
+      filePath,
+      line,
+      char,
+      code,
+      severity,
+      message,
+      type
+    };
+  }
+
+  static getMessage(result: ISdCliPackageBuildResult): string {
     let str = "";
     if (result.filePath !== undefined) {
       str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;