@simplysm/sd-cli 10.0.45 → 10.0.49

package/src/entry/SdCliElectron.ts

@@ -17,7 +17,7 @@ export class SdCliElectron {
 
     logger.log("설정 가져오기...");
     const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
-    const pkgConf = projConf[opt.pkgName];
+    const pkgConf = projConf.packages[opt.pkgName];
     if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
       throw new Error();
     }
@@ -67,7 +67,7 @@ export class SdCliElectron {
 
     logger.log("설정 가져오기...");
     const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
-    const pkgConf = projConf[opt.pkgName];
+    const pkgConf = projConf.packages[opt.pkgName];
     if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
       throw new Error();
     }

package/src/entry/SdCliLocalUpdate.ts

@@ -0,0 +1,127 @@
+import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
+import path from "path";
+import {pathToFileURL} from "url";
+import {TSdCliConfig} from "../commons";
+
+export class SdCliLocalUpdate {
+  public static async runAsync(opt: {
+    confFileRelPath: string;
+    optNames: string[];
+  }): Promise<void> {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "runAsync"]);
+
+    logger.debug("프로젝트 설정 가져오기...");
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
+    if (!projConf.localUpdates) return;
+
+    const updatePathInfos = await this._getUpdatePathInfosAsync(projConf.localUpdates);
+    logger.debug("로컬 업데이트 구성", updatePathInfos);
+
+    logger.log("로컬 라이브러리 업데이트 시작...");
+    for (const updatePathInfo of updatePathInfos) {
+      if (!FsUtil.exists(updatePathInfo.source)) {
+        logger.warn(`소스경로를 찾을 수 없어 무시됩니다(${updatePathInfo.source})`);
+        return;
+      }
+
+      // 소스경로에서 대상경로로 파일 복사
+      await FsUtil.copyAsync(updatePathInfo.source, updatePathInfo.target, (src) => {
+        return !src.includes("node_modules") && !src.endsWith("package.json");
+      });
+    }
+    logger.info("로컬 라이브러리 업데이트 완료");
+  }
+
+  public static async watchAsync(opt: {
+    confFileRelPath: string;
+    optNames: string[];
+  }): Promise<void> {
+    const logger = Logger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "watchAsync"]);
+
+    logger.debug("프로젝트 설정 가져오기...");
+    const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as TSdCliConfig;
+    if (!projConf.localUpdates) return;
+
+    const updatePathInfos = await this._getUpdatePathInfosAsync(projConf.localUpdates);
+    logger.debug("로컬 업데이트 구성");
+
+    const watchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
+
+    const watcher = SdFsWatcher.watch(watchPaths);
+    watcher.onChange({delay: 1000}, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+      if (changeFilePaths.length === 0) return;
+
+      logger.log("로컬 라이브러리 변경감지...");
+      for (const changedFilePath of changeFilePaths) {
+        if (!FsUtil.exists(changedFilePath)) continue;
+
+        for (const updatePathInfo of updatePathInfos) {
+          if (!PathUtil.isChildPath(changedFilePath, updatePathInfo.source)) continue;
+
+          const sourceRelPath = path.relative(updatePathInfo.source, changedFilePath);
+          if (sourceRelPath.includes("node_modules")) continue;
+          if (sourceRelPath.includes("package.json")) continue;
+
+          const targetFilePath = path.resolve(updatePathInfo.target, sourceRelPath);
+
+          logger.debug(`변경파일감지(복사): ${changedFilePath} => ${targetFilePath}`);
+          await FsUtil.copyAsync(changedFilePath, targetFilePath);
+        }
+      }
+
+      const watchWatchPaths = (await updatePathInfos.mapManyAsync(async (item) => await this._getWatchPathsAsync(item.source))).distinct();
+      watcher.add(watchWatchPaths);
+
+      logger.info("로컬 라이브러리 복사 완료");
+    });
+  }
+
+  private static async _getUpdatePathInfosAsync(record: Record<string, string>): Promise<IUpdatePathInfo[]> {
+    const result: IUpdatePathInfo[] = [];
+    for (const pkgGlobPath of Object.keys(record)) {
+      // "node_modules'에서 로컬업데이트 설정에 맞는 패키지를 "glob"하여 대상 패키지경로 목록 가져오기
+      const targetPaths = [
+        ...await FsUtil.globAsync(path.resolve(process.cwd(), "node_modules", pkgGlobPath)),
+        ...await FsUtil.globAsync(path.resolve(process.cwd(), "packages", "*", "node_modules", pkgGlobPath))
+      ];
+
+      result.push(
+        ...targetPaths
+          .map((targetPath) => {
+            // 대상의 명칭 추출
+            const regexpText = pkgGlobPath.replace(/[\\/.*]/g, (item) => (
+              item === "/" ? "[\\\\\\/]"
+                : item === "." ? "\\."
+                  : item === "*" ? "(.*)"
+                    : item
+            ));
+            const targetNameMatch = new RegExp(regexpText).exec(targetPath);
+            if (!targetNameMatch || typeof targetNameMatch[1] === "undefined") return undefined;
+            const targetName = targetNameMatch[1];
+
+            // 가져올 소스 경로 추출
+            const sourcePath = path.resolve(record[pkgGlobPath].replace(/\*/g, targetName));
+            return {source: sourcePath, target: targetPath};
+          })
+          .filterExists()
+      );
+    }
+
+    return result;
+  }
+
+  private static async _getWatchPathsAsync(sourcePath: string): Promise<string[]> {
+    return await FsUtil.globAsync(path.resolve(sourcePath, "**"), {
+      ignore: [
+        "**/node_modules/**",
+        "**/package.json"
+      ]
+    });
+  }
+}
+
+interface IUpdatePathInfo {
+  source: string;
+  target: string;
+}

package/src/entry/SdCliProject.ts

@@ -5,6 +5,7 @@ import {
   ISdCliBuildClusterReqMessage,
   ISdCliBuildClusterResMessage,
   ISdCliPackageBuildResult,
+  ISdCliServerPackageConfig,
   TSdCliConfig,
   TSdCliPackageConfig
 } from "../commons";
@@ -36,20 +37,20 @@ export class SdCliProject {
       throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
     }
     const allPkgPaths = await projNpmConf.workspaces.mapManyAsync(async (item) => await FsUtil.globAsync(item));
-    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf);
+    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
     if (opt.pkgNames.length !== 0) {
       pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
     }
 
     logger.debug("패키지 존재 확인...");
-    const notExistsPkgs = Object.keys(projConf).filter((pkgConfKey) => allPkgPaths.every((pkgPath) => path.basename(pkgPath) !== pkgConfKey));
+    const notExistsPkgs = Object.keys(projConf.packages).filter((pkgConfKey) => allPkgPaths.every((pkgPath) => path.basename(pkgPath) !== pkgConfKey));
     if (notExistsPkgs.length > 0) {
       throw new Error("패키지를 찾을 수 없습니다. (" + notExistsPkgs.join(", ") + ")");
     }
 
     logger.debug("라이브러리 INDEX 파일 생성...");
     await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf[path.basename(pkgPath)]!;
+      const pkgConf = projConf.packages[path.basename(pkgPath)]!;
       if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
         await SdCliIndexFileGenerator.watchAsync(pkgPath, pkgConf.polyfills);
       }
@@ -131,7 +132,11 @@ export class SdCliProject {
               if (serverInfo.pkgPath !== undefined && serverInfo.hasChanges) {
                 logger.debug("서버 재시작...");
                 try {
-                  const restartServerResult = await this._restartServerAsync(serverInfo.pkgPath, serverInfo.worker);
+                  const restartServerResult = await this._restartServerAsync(
+                    serverInfo.pkgPath,
+                    projConf.packages[path.basename(serverInfo.pkgPath)] as ISdCliServerPackageConfig,
+                    serverInfo.worker
+                  );
                   serverInfo.worker = restartServerResult.worker;
                   serverInfo.port = restartServerResult.port;
                   serverInfo.hasChanges = false;
@@ -177,15 +182,15 @@ export class SdCliProject {
     logger.log("빌드를 시작합니다...");
 
     await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf[path.basename(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", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint, builderKey);
+          await this._runCommandAsync(cluster, "watch", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
         });
       }
       else {
-        await this._runCommandAsync(cluster, "watch", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint);
+        await this._runCommandAsync(cluster, "watch", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
       }
     });
 
@@ -215,7 +220,7 @@ export class SdCliProject {
       throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
     }
     const allPkgPaths = await projNpmConf.workspaces.mapManyAsync(async (item) => await FsUtil.globAsync(item));
-    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf);
+    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
     if (opt.pkgNames.length !== 0) {
       pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
     }
@@ -225,7 +230,7 @@ export class SdCliProject {
 
     logger.debug("라이브러리 INDEX 파일 생성...");
     await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf[path.basename(pkgPath)]!;
+      const pkgConf = projConf.packages[path.basename(pkgPath)]!;
       if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
         await SdCliIndexFileGenerator.runAsync(pkgPath, pkgConf.polyfills);
       }
@@ -237,15 +242,15 @@ export class SdCliProject {
     logger.debug("빌드 프로세스 명령 전달...");
     const results = (
       await pkgPaths.parallelAsync(async (pkgPath) => {
-        const pkgConf = projConf[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) => {
-            return await this._runCommandAsync(cluster, "build", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint, builderKey);
+            return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
           })).mapMany();
         }
         else {
-          return await this._runCommandAsync(cluster, "build", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint);
+          return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
         }
       })
     ).mapMany();
@@ -290,7 +295,7 @@ export class SdCliProject {
       throw new Error("프로젝트 package.json에 workspaces가 설정되어있지 않습니다.");
     }
     const allPkgPaths = await projNpmConf.workspaces.mapManyAsync(async (item) => await FsUtil.globAsync(item));
-    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf);
+    let pkgPaths = allPkgPaths.filter((pkgPath) => path.basename(pkgPath) in projConf.packages);
     if (opt.pkgNames.length !== 0) {
       pkgPaths = pkgPaths.filter((pkgPath) => opt.pkgNames.includes(path.basename(pkgPath)));
     }
@@ -302,7 +307,7 @@ export class SdCliProject {
     if (!opt.noBuild) {
       logger.debug("라이브러리 INDEX 파일 생성...");
       await pkgPaths.parallelAsync(async (pkgPath) => {
-        const pkgConf = projConf[path.basename(pkgPath)]!;
+        const pkgConf = projConf.packages[path.basename(pkgPath)]!;
         if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
           await SdCliIndexFileGenerator.runAsync(pkgPath, pkgConf.polyfills);
         }
@@ -314,15 +319,15 @@ export class SdCliProject {
       logger.debug("빌드 프로세스 명령 전달...");
       const results = (
         await pkgPaths.parallelAsync(async (pkgPath) => {
-          const pkgConf = projConf[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) => {
-              return await this._runCommandAsync(cluster, "build", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint, builderKey);
+              return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint, builderKey);
             })).mapMany();
           }
           else {
-            return await this._runCommandAsync(cluster, "build", pkgPath, projConf[path.basename(pkgPath)]!, opt.withLint);
+            return await this._runCommandAsync(cluster, "build", pkgPath, projConf.packages[path.basename(pkgPath)]!, opt.withLint);
           }
         })
       ).mapMany();
@@ -348,7 +353,7 @@ export class SdCliProject {
     logger.debug("배포 시작...");
     await pkgPaths.parallelAsync(async (pkgPath) => {
       const pkgName = path.basename(pkgPath);
-      const pkgConf = projConf[pkgName];
+      const pkgConf = projConf.packages[pkgName];
       if (pkgConf?.publish == null) return;
 
       logger.debug(`[${pkgName}] 배포 시작...`);
@@ -545,7 +550,7 @@ export class SdCliProject {
     cluster.kill("SIGKILL");
   }
 
-  private static async _restartServerAsync(pkgPath: string, prevServerProcess?: cp.ChildProcess): Promise<{
+  private static async _restartServerAsync(pkgPath: string, pkgConf: ISdCliServerPackageConfig, prevServerProcess?: cp.ChildProcess): Promise<{
     worker: cp.ChildProcess,
     port: number
   }> {
@@ -555,6 +560,8 @@ export class SdCliProject {
       prevServerProcess.kill("SIGKILL");
     }
 
+    const npmConf = (await FsUtil.readJsonAsync(path.resolve(pkgPath, "package.json"))) as INpmConfig;
+
     return await new Promise<{
       worker: cp.ChildProcess,
       port: number
@@ -564,7 +571,13 @@ export class SdCliProject {
         [pkgPath],
         {
           stdio: ["pipe", "pipe", "pipe", "ipc"],
-          env: process.env
+          env: {
+            ...process.env,
+            NODE_ENV: "development",
+            TZ: "Asia/Seoul",
+            SD_VERSION: npmConf.version,
+            ...pkgConf.env
+          }
         }
       );
 

package/src/index.ts

@@ -7,6 +7,7 @@ export * from "./builders/SdCliServerBuilder";
 export * from "./builders/SdCliTsLibBuilder";
 export * from "./commons";
 export * from "./entry/SdCliElectron";
+export * from "./entry/SdCliLocalUpdate";
 export * from "./entry/SdCliProject";
 export * from "./utils/getElectronReactExternals";
 export * from "./utils/SdCliBuildResultUtil";

package/src/sd-cli.ts

@@ -6,6 +6,7 @@ import {SdCliProject} from "./entry/SdCliProject";
 import {Logger, LoggerSeverity} from "@simplysm/sd-core-node";
 import {EventEmitter} from "events";
 import {SdCliElectron} from "./entry/SdCliElectron";
+import {SdCliLocalUpdate} from "./entry/SdCliLocalUpdate";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;
@@ -21,6 +22,22 @@ const argv = (
         default: false
       }
     })
+    .command(
+      "local-update",
+      "로컬 라이브러리 업데이트를 수행합니다.",
+      (cmd) => cmd.version(false).hide("help").hide("debug")
+        .options({
+          config: {
+            string: true,
+            describe: "simplysm.cjs 파일 경로"
+          },
+          options: {
+            string: true,
+            array: true,
+            describe: "옵션 설정"
+          }
+        })
+    )
     .command(
       "watch",
       "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.",
@@ -163,7 +180,13 @@ else {
   });
 }
 
-if (argv._[0] === "watch") {
+if (argv._[0] === "local-update") {
+  await SdCliLocalUpdate.runAsync({
+    confFileRelPath: argv.config ?? "simplysm.cjs",
+    optNames: argv.options ?? [],
+  });
+}
+else if (argv._[0] === "watch") {
   await SdCliProject
     .watchAsync({
       confFileRelPath: argv.config ?? "simplysm.cjs",