@simplysm/sd-cli 7.0.65 → 7.0.75

package/src/entry-points/SdCliWorkspace.ts

@@ -1,4 +1,4 @@
-import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdProcess } from "@simplysm/sd-core-node";
 import path from "path";
 import { INpmConfig, ISdCliConfig, ISdCliPackageBuildResult } from "../commons";
 import { SdCliPackage } from "../packages/SdCliPackage";
@@ -11,7 +11,6 @@ import { SdServiceServer } from "@simplysm/sd-service-server";
 import { SdCliNpm } from "./SdCliNpm";
 import { SdCliLocalUpdate } from "./SdCliLocalUpdate";
 import { NextHandleFunction } from "connect";
-import { SdCliIndexFileGenerator } from "./SdCliIndexFileGenerator";
 
 export class SdCliWorkspace {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
@@ -24,7 +23,7 @@ export class SdCliWorkspace {
     this._npmConfig = FsUtil.readJson(npmConfigFilePath);
   }
 
-  public async watchAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async watchAsync(opt: { confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), true, opt.optNames);
 
@@ -34,14 +33,7 @@ export class SdCliWorkspace {
     }
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
-
-    this._logger.debug("패키지 인덱스 생성기 실행...");
-    await pkgs.parallelAsync(async (pkg) => {
-      if (pkg.config.type === "library" && pkg.config.autoIndex) {
-        await new SdCliIndexFileGenerator(pkg.rootPath, pkg.config.autoIndex).watchAsync();
-      }
-    });
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("패키지 이벤트 설정...");
     let changeCount = 0;
@@ -74,23 +66,42 @@ export class SdCliWorkspace {
         });
     }
 
-    this._logger.debug("빌드를 시작합니다...");
-    const pkgNames = pkgs.map((item) => item.name);
-    const buildCompletedPackageNames: string[] = [];
-    await pkgs.parallelAsync(async (pkg) => {
-      await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
-      if (pkg.config.type === "client") {
-        const middlewares = (await pkg.watchAsync()) as NextHandleFunction[];
 
-        const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
-        serverInfo.middlewares.push(...middlewares);
-        serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
-      }
-      else {
-        await pkg.watchAsync();
-      }
-      buildCompletedPackageNames.push(pkg.name);
-    });
+    if (changeCount === 0) {
+      this._logger.log("빌드를 시작합니다...");
+    }
+    changeCount++;
+
+    try {
+      const pkgNames = pkgs.map((item) => item.name);
+      const buildCompletedPackageNames: string[] = [];
+      await pkgs.parallelAsync(async (pkg) => {
+        await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
+        if (pkg.config.type === "client") {
+          const middlewares = (await pkg.watchAsync()) as NextHandleFunction[];
+
+          const serverInfo = this._serverInfoMap.getOrCreate(pkg.config.server, { middlewares: [], clientInfos: [] });
+          serverInfo.middlewares.push(...middlewares);
+          serverInfo.clientInfos.push({ pkgKey: pkg.name.split("/").last()! });
+        }
+        else {
+          await pkg.watchAsync();
+        }
+        buildCompletedPackageNames.push(pkg.name);
+      });
+    }
+    catch (err) {
+      this._loggingResults(totalResultMap);
+      this._loggingOpenClientHrefs();
+      throw err;
+    }
+
+    changeCount--;
+    if (changeCount === 0) {
+      this._loggingResults(totalResultMap);
+      this._loggingOpenClientHrefs();
+      this._logger.info("모든 빌드가 완료되었습니다.");
+    }
   }
 
   private _isServerRestarting = false;
@@ -107,18 +118,22 @@ export class SdCliWorkspace {
     }
     const entryFilePath = path.resolve(pkg.rootPath, entryFileRelPath);
 
-    this._logger.log(`서버(${pkg.name}) 재시작...`);
     try {
       const serverInfo = this._serverInfoMap.getOrCreate(path.basename(pkg.rootPath), {
         middlewares: [],
         clientInfos: []
       });
       if (serverInfo.server) {
+        this._logger.log(`[${pkg.name}] 기존 서버 중지...`);
         await serverInfo.server.closeAsync();
         delete serverInfo.server;
       }
 
-      serverInfo.server = (await import("file:///" + entryFilePath + "?update=" + Uuid.new().toString())).default as SdServiceServer | undefined;
+      this._logger.log(`[${pkg.name}] 서버 시작중...`);
+
+      const serverMainPath = "file:///" + PathUtil.posix(entryFilePath) + "?update=" + Uuid.new().toString().replace(/-/g, "");
+      const serverModule = await import(serverMainPath);
+      serverInfo.server = serverModule.default as SdServiceServer | undefined;
       if (!serverInfo.server) {
         this._logger.error(`${entryFilePath}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
         this._isServerRestarting = false;
@@ -127,7 +142,7 @@ export class SdCliWorkspace {
       serverInfo.server.devMiddlewares = serverInfo.middlewares;
       await Wait.until(() => serverInfo.server!.isOpen);
 
-      this._logger.log(`서버(${pkg.name}) 재시작 완료`);
+      this._logger.log(`[${pkg.name}] 서버가 시작되었습니다.`);
     }
     catch (err) {
       this._logger.error(`서버(${pkg.name}) 재시작중 오류 발생`, err);
@@ -136,19 +151,12 @@ export class SdCliWorkspace {
     this._isServerRestarting = false;
   }
 
-  public async buildAsync(opt: { confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async buildAsync(opt: { confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false, opt.optNames);
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
-
-    this._logger.debug("패키지 인덱스 생성기 실행...");
-    await pkgs.parallelAsync(async (pkg) => {
-      if (pkg.config.type === "library" && pkg.config.autoIndex) {
-        await new SdCliIndexFileGenerator(pkg.rootPath, pkg.config.autoIndex).runAsync();
-      }
-    });
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("프로젝트 및 패키지 버전 설정...");
     await this._upgradeVersionAsync(pkgs);
@@ -162,26 +170,32 @@ export class SdCliWorkspace {
     const pkgNames = pkgs.map((item) => item.name);
     const buildCompletedPackageNames: string[] = [];
     const totalResultMap = new Map<string, ISdCliPackageBuildResult[]>();
-    await pkgs.parallelAsync(async (pkg) => {
-      await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
+    try {
+      await pkgs.parallelAsync(async (pkg) => {
+        await Wait.until(() => !pkg.allDependencies.some((dep) => pkgNames.includes(dep) && !buildCompletedPackageNames.includes(dep)));
 
-      this._logger.debug(`[${pkg.name}] 빌드를 시작합니다...`);
-      totalResultMap.set(pkg.name, await pkg.buildAsync());
-      this._logger.debug(`[${pkg.name}] 빌드가 완료되었습니다.`);
+        this._logger.debug(`[${pkg.name}] 빌드를 시작합니다...`);
+        totalResultMap.set(pkg.name, await pkg.buildAsync());
+        this._logger.debug(`[${pkg.name}] 빌드가 완료되었습니다.`);
 
-      buildCompletedPackageNames.push(pkg.name);
-    });
+        buildCompletedPackageNames.push(pkg.name);
+      });
 
-    this._loggingResults(totalResultMap);
-    if (Array.from(totalResultMap.values()).mapMany().some((item) => item.severity === "error")) {
-      throw new Error("빌드중 오류가 발생하였습니다.");
+      this._loggingResults(totalResultMap);
+      if (Array.from(totalResultMap.values()).mapMany().some((item) => item.severity === "error")) {
+        throw new Error("빌드중 오류가 발생하였습니다.");
+      }
+      else {
+        this._logger.info("모든 빌드가 완료되었습니다.");
+      }
     }
-    else {
-      this._logger.info("모든 빌드가 완료되었습니다.");
+    catch (err) {
+      this._loggingResults(totalResultMap);
+      throw new err;
     }
   }
 
-  public async publishAsync(opt: { noBuild: boolean; confFileRelPath: string; optNames: string[] }): Promise<void> {
+  public async publishAsync(opt: { noBuild: boolean; confFileRelPath: string; optNames: string[]; pkgs: string[] }): Promise<void> {
     this._logger.debug("프로젝트 설정 가져오기...");
     const config = await SdCliConfigUtil.loadConfigAsync(path.resolve(this._rootPath, opt.confFileRelPath), false, opt.optNames);
 
@@ -200,7 +214,7 @@ export class SdCliWorkspace {
     }
 
     this._logger.debug("패키지 목록 구성...");
-    const pkgs = await this._getPackagesAsync(config);
+    const pkgs = await this._getPackagesAsync(config, opt.pkgs);
 
     this._logger.debug("프로젝트 및 패키지 버전 설정...");
     await this._upgradeVersionAsync(pkgs);
@@ -273,16 +287,17 @@ export class SdCliWorkspace {
     process.stdout.clearLine(0);
   }
 
-  private async _getPackagesAsync(conf: ISdCliConfig): Promise<SdCliPackage[]> {
+  private async _getPackagesAsync(conf: ISdCliConfig, pkgs: string[]): Promise<SdCliPackage[]> {
     const pkgRootPaths = await this._npmConfig.workspaces?.mapManyAsync(async (item) => await FsUtil.globAsync(item));
     if (!pkgRootPaths) {
       throw new Error("최상위 'package.json'에서 'workspaces'를 찾을 수 없습니다.");
     }
 
-
     return pkgRootPaths.map((pkgRootPath) => {
+      if (pkgs.length > 0 && !pkgs.includes(path.basename(pkgRootPath))) return undefined;
       const pkgConfig = conf.packages[path.basename(pkgRootPath)];
-      return pkgConfig ? new SdCliPackage(this._rootPath, pkgRootPath, pkgConfig) : undefined;
+      if (!pkgConfig) return undefined;
+      return new SdCliPackage(this._rootPath, pkgRootPath, pkgConfig);
     }).filterExists();
   }
 

package/src/index.ts

@@ -1,4 +1,6 @@
 export * from "./build-tool/SdCliCacheCompilerHost";
+export * from "./build-tool/SdCliCordova";
+export * from "./build-tool/SdCliIndexFileGenerator";
 export * from "./build-tool/SdCliNgCacheCompilerHost";
 export * from "./build-tool/SdCliPackageLinter";
 export * from "./builder/SdCliClientBuilder";
@@ -6,7 +8,6 @@ export * from "./builder/SdCliJsLibBuilder";
 export * from "./builder/SdCliServerBuilder";
 export * from "./builder/SdCliTsLibBuilder";
 export * from "./commons";
-export * from "./entry-points/SdCliIndexFileGenerator";
 export * from "./entry-points/SdCliLocalUpdate";
 export * from "./entry-points/SdCliNpm";
 export * from "./entry-points/SdCliPrepare";
@@ -17,9 +18,10 @@ export * from "./ng-tools/babel/SdCliBbUtil";
 export * from "./ng-tools/babel/TSdCliBbNgMetadata";
 export * from "./ng-tools/babel/TSdCliBbTypeMetadata";
 export * from "./ng-tools/commons";
-export * from "./ng-tools/NgModuleGenerator";
+export * from "./ng-tools/SdCliNgModuleGenerator";
 export * from "./ng-tools/typescript/SdCliTsFileMetadata";
 export * from "./ng-tools/typescript/SdCliTsRootMetadata";
+export * from "./ng-tools/typescript/SdCliTsUtil";
 export * from "./packages/SdCliPackage";
 export * from "./SdCliBuildResultError";
 export * from "./utils/SdCliBuildResultUtil";