@simplysm/sd-cli 6.0.44 → 6.1.1

package/src/builders/SdCliNgLibraryBuilder.ts

@@ -13,7 +13,6 @@ import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
 import { PathUtil } from "@simplysm/sd-core-node";
 import * as os from "os";
 import * as nodeSass from "node-sass";
-import { createHash } from "crypto";
 import { SdCliNgModuleFilesGenerator } from "../build-tools/SdCliNgModuleFilesGenerator";
 import { OptimizeFor } from "@angular/compiler-cli/src/ngtsc/typecheck/api";
 import { ModuleMetadata } from "@angular/compiler-cli/src/metadata/schema";
@@ -79,7 +78,6 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
 
         this._builder.emit(sourceFile, undefined, undefined, undefined, transformers);
 
-        // TODO: sd-metadata를 ModuleMetadata로 만들게 아니고, 아예 IAotModuleDefMetadata형식으로 만들어지게 해야함
         if (this._program!.getCompilerOptions().declaration) {
           if (sourceFile.fileName.endsWith(".ts") && !sourceFile.fileName.endsWith(".d.ts")) {
             const metadata = this._getMetadata(sourceFile);
@@ -139,98 +137,46 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
     }
   }*/
 
-  public override async reloadProgramAsync(watch: boolean): Promise<string[]> {
-    this._logger.debug("프로그램 리로드");
-
-    const parsedTsconfig = ts.parseJsonConfigFileContent(this._tsconfig, ts.sys, this.rootPath, this._tsconfig.angularCompilerOptions);
-
-    this._moduleResolutionCache = ts.createModuleResolutionCache(this.rootPath, (s) => s, parsedTsconfig.options);
-    this._cacheCompilerHost = await this._createCacheCompilerHostAsync(parsedTsconfig, this._moduleResolutionCache);
+  public override getParsedTsconfig(): ts.ParsedCommandLine {
+    return ts.parseJsonConfigFileContent(this._tsconfig, ts.sys, this.rootPath, this._tsconfig.angularCompilerOptions);
+  }
 
+  public override configProgram(parsedTsconfig: ts.ParsedCommandLine): void {
     this._ngProgram = new NgtscProgram(
       parsedTsconfig.fileNames,
       parsedTsconfig.options,
-      this._cacheCompilerHost,
+      this._cacheCompilerHost!,
       this._ngProgram
     );
 
     this._ngCompiler = this._ngProgram.compiler;
     this._program = this._ngProgram.getTsProgram();
+  }
 
-    const baseGetSourceFiles = this._program.getSourceFiles;
-    this._program.getSourceFiles = function (...parameters) {
-      const sourceFiles: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);
-
-      for (const sourceFile of sourceFiles) {
-        if (sourceFile.version === undefined) {
-          sourceFile.version = createHash("sha256").update(sourceFile.text).digest("hex");
-        }
-      }
-
-      return sourceFiles;
-    };
-
-    if (watch) {
-      if (this.skipProcesses.includes("emit")) {
-        this._builder = ts.createSemanticDiagnosticsBuilderProgram(
-          this._program,
-          this._cacheCompilerHost,
-          this._builder as ts.SemanticDiagnosticsBuilderProgram
-        );
-      }
-      else {
-        this._builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-          this._program,
-          this._cacheCompilerHost,
-          this._builder as ts.EmitAndSemanticDiagnosticsBuilderProgram
-        );
-      }
-      const builder = this._builder as ts.SemanticDiagnosticsBuilderProgram;
-
-      let seq = 0;
-      const affectedFilePathSet = new Set<string>();
-      while (true) {
-        const affectedFilePaths: string[] = [];
-        this._logger.debug(`프로그램 리로드 > 변경파일 목록구성: [SEQ: ${++seq}]`);
-        const result = builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
-          if (this._ngCompiler!.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
-            const originalFilename = sourceFile.fileName.slice(0, -15) + ".ts";
-            const originalSourceFile = builder.getSourceFile(originalFilename);
-            if (originalSourceFile) {
-              affectedFilePaths.push(originalSourceFile.fileName);
-            }
-            return true;
-          }
-          return false;
-        });
-
-        if (result && "fileName" in result.affected) {
-          affectedFilePaths.push(result.affected.fileName);
+  public override getSemanticDiagnosticsOfNextAffectedFiles(): string[] | undefined {
+    const builder = this._builder as ts.SemanticDiagnosticsBuilderProgram;
+    const affectedFilePaths: string[] = [];
+    const result = builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
+      if (this._ngCompiler!.ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith(".ngtypecheck.ts")) {
+        const originalFilename = sourceFile.fileName.slice(0, -15) + ".ts";
+        const originalSourceFile = builder.getSourceFile(originalFilename);
+        if (originalSourceFile) {
+          affectedFilePaths.push(originalSourceFile.fileName);
         }
-
-        affectedFilePaths.distinctThis();
-
-        this._logger.debug(`프로그램 리로드 > 변경파일 목록구성: [SEQ: ${seq}, SIZE:${affectedFilePathSet.size}]\n` + affectedFilePaths.map((item) => "- " + item).join("\n"));
-
-        affectedFilePathSet.adds(...affectedFilePaths.distinct());
-
-        if (!result) break;
+        return true;
       }
+      return false;
+    });
 
-      const result = Array.from(affectedFilePathSet.values());
-
-      this._logger.debug("프로그램 리로드", result);
-
-      return result;
+    if (result && "fileName" in result.affected) {
+      affectedFilePaths.push(result.affected.fileName);
+      return affectedFilePaths.distinct();
     }
-    else {
-      this._builder = ts.createAbstractBuilder(this._program, this._cacheCompilerHost);
-      const result = this._builder.getSourceFiles().map((item) => item.fileName).distinct();
-
-      this._logger.debug("프로그램 리로드", result);
-
-      return result;
+    if (!result) {
+      return undefined;
     }
+
+    return [];
   }
 
   protected override _deleteFileCaches(filePaths: string[]): void {
@@ -286,7 +232,9 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
     const generateResult = await this._moduleFilesGenerator.generateAsync();
     result.result.push(...generateResult.result);
     if (generateResult.changedFilePaths.length > 0) {
-      result.dirtyFilePaths = await this.reloadChangedProgramAsync(generateResult.changedFilePaths, watch);
+      const reloadChangedProgramResult = await this.reloadChangedProgramAsync(generateResult.changedFilePaths, watch);
+      result.dirtyFilePaths = reloadChangedProgramResult.dirtyFilePaths;
+      result.result.push(...reloadChangedProgramResult.result);
     }
 
     this._logger.debug("Angular Module, RoutingModule 생성 결과", result);

package/src/builders/SdCliServerBuilder.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from "events";
 import { INpmConfig, ISdPackageBuildResult, ISdServerPackageConfig, ITsconfig } from "../commons";
 import * as ts from "typescript";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
 import { ObjectUtil, StringUtil, Wait } from "@simplysm/sd-core-common";
 import * as webpack from "webpack";
 import * as path from "path";
@@ -24,16 +24,21 @@ export class SdCliServerBuilder extends EventEmitter {
   public npmConfigCache = new Map<string, INpmConfig>();
   private _server?: SdServiceServer;
 
+  protected readonly _logger: Logger;
+
   public constructor(public rootPath: string,
                      public tsconfigFilePath: string,
                      public projectRootPath: string,
                      public config: ISdServerPackageConfig,
-                     public useCache: boolean) {
+                     public skipProcesses: "lint"[]) {
     super();
 
     const tsconfig: ITsconfig = FsUtil.readJson(this.tsconfigFilePath);
     this.parsedTsconfig = ts.parseJsonConfigFileContent(tsconfig, ts.sys, this.rootPath);
-    this.npmConfigCache.set(this.rootPath, FsUtil.readJson(path.resolve(this.rootPath, "package.json")));
+    const npmConfig = FsUtil.readJson(path.resolve(this.rootPath, "package.json"));
+    this.npmConfigCache.set(this.rootPath, npmConfig);
+
+    this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, npmConfig.name]);
   }
 
   public on(event: "change", listener: () => void): this;
@@ -47,10 +52,10 @@ export class SdCliServerBuilder extends EventEmitter {
 
     await FsUtil.removeAsync(this.parsedTsconfig.options.outDir!);
 
-    const externalModuleNames = this._findExternalModuleNames(false);
-
-    // 빌드
+    const externalModuleNames = this._findExternalModules(false).map((item) => item.name);
 
+    // WEBPACK 빌드
+    this._logger.debug("Webpack 빌드 수행");
     const webpackConfig = this._getWebpackConfig(false, externalModuleNames);
     const compiler = webpack(webpackConfig);
     const buildResults = await new Promise<ISdPackageBuildResult[]>((resolve, reject) => {
@@ -66,6 +71,7 @@ export class SdCliServerBuilder extends EventEmitter {
         resolve(results);
       });
     });
+    this._logger.debug("Webpack 빌드 결과", buildResults);
 
     // .config.json 파일 쓰기
 
@@ -139,6 +145,7 @@ export class SdCliServerBuilder extends EventEmitter {
     for (const externalModuleName of externalModuleNames) {
       distNpmConfig.dependencies[externalModuleName] = "*";
     }
+    delete distNpmConfig.optionalDependencies;
     delete distNpmConfig.devDependencies;
     delete distNpmConfig.peerDependencies;
 
@@ -150,7 +157,9 @@ export class SdCliServerBuilder extends EventEmitter {
   public async watchAsync(): Promise<void> {
     await FsUtil.removeAsync(this.parsedTsconfig.options.outDir!);
 
-    const externalModuleNames = this._findExternalModuleNames(true);
+    const externalModules = this._findExternalModules(true);
+    const externalModuleNames = externalModules.map((item) => item.name);
+    const externalModulePaths = externalModules.map((item) => item.path);
 
     // 빌드
     const webpackConfig = this._getWebpackConfig(true, externalModuleNames);
@@ -160,6 +169,8 @@ export class SdCliServerBuilder extends EventEmitter {
         this.emit("change");
         callback();
 
+        this._logger.debug("Webpack 빌드 수행");
+
         await this._stopServerAsync();
       });
 
@@ -198,9 +209,73 @@ export class SdCliServerBuilder extends EventEmitter {
         // 결과 리턴
 
         this.emit("complete", results, this._server);
+        this._logger.debug("Webpack 빌드 수행 결과", results);
         resolve();
       });
     });
+
+    // external 변경에 따른 서버 재시작을 위한 WATCH 구성
+
+    const getWatchPathsAsync = async (): Promise<string[]> => {
+      const result: string[] = [];
+      for (const modulePath of externalModulePaths) {
+        const npmConfig = this._getNpmConfig(modulePath);
+        if (!npmConfig) continue;
+        const distPath = path.resolve(modulePath, path.dirname(npmConfig.es2020 ?? npmConfig.module ?? npmConfig.main ?? "dist"));
+        const watchPaths = (await FsUtil.globAsync(path.resolve(distPath, "**")))
+          .filter((item) => (
+            item.includes("@simplysm")
+            && FsUtil.exists(item)
+            && FsUtil.isDirectory(item)
+          ));
+
+        result.push(...watchPaths);
+      }
+
+      return result;
+    };
+
+    const watchPaths = await getWatchPathsAsync();
+    const watcher = new SdFsWatcher();
+    watcher
+      .onChange(async (changeInfos) => {
+        const dirtyFilePaths = changeInfos
+          .map((changeInfo) => changeInfo.filePath)
+          .filter((item) => path.basename(item).includes("."))
+          .distinct();
+
+        if (dirtyFilePaths.length === 0) return;
+
+        this.emit("change");
+        this._logger.debug("서버 재시작");
+
+        const watchPaths2 = await getWatchPathsAsync();
+        watcher.replaceWatchPaths(watchPaths2);
+
+        await this._stopServerAsync();
+
+        const results: ISdPackageBuildResult[] = [];
+
+        try {
+          await this._startServerAsync();
+        }
+        catch (error) {
+          if (error instanceof Error) {
+            results.push({
+              filePath: undefined,
+              severity: "error",
+              message: error.message
+            });
+          }
+          else {
+            throw error;
+          }
+        }
+
+        this.emit("complete", results, this._server);
+        this._logger.debug("서버 재시작 결과", results);
+      })
+      .watch(watchPaths);
   }
 
   private async _stopServerAsync(): Promise<void> {
@@ -241,10 +316,11 @@ export class SdCliServerBuilder extends EventEmitter {
       target: ["node", "es2020"],
       profile: false,
       resolve: {
+        roots: [this.rootPath],
         extensions: [".ts", ".tsx", ".js"],
         symlinks: true,
         // modules: [this.projectRootPath, "node_modules"],
-        mainFields: ["es2020", "main", "module"]
+        mainFields: ["es2020", "module", "main"]
       },
       /*resolveLoader: {
         symlinks: true,
@@ -256,7 +332,6 @@ export class SdCliServerBuilder extends EventEmitter {
       context: this.projectRootPath,
       entry: {
         main: [
-          // TODO: "source-map-support/register"??
           path.resolve(this.rootPath, "src/main.ts")
         ]
       },
@@ -303,7 +378,15 @@ export class SdCliServerBuilder extends EventEmitter {
           }
         ]
       },
-      cache: (watch && this.useCache) ? { type: "memory", maxGenerations: 1 } : false,
+      ...watch ? {
+        cache: { type: "memory", maxGenerations: 1 },
+        snapshot: {
+          immutablePaths: this._findAllInternalModuleCachePaths(),
+          managedPaths: this._findAllInternalModuleCachePaths()
+        }
+      } : {
+        cache: false
+      },
       optimization: {
         minimizer: watch ? [] : [
           new JavaScriptOptimizerPlugin({
@@ -351,41 +434,47 @@ export class SdCliServerBuilder extends EventEmitter {
           SD_VERSION: this._getNpmConfig(this.rootPath)!.version,
           ...this.config.env
         }),
-        new ESLintWebpackPlugin({
-          context: this.rootPath,
-          eslintPath: path.resolve(this.projectRootPath, "node_modules", "eslint"),
-          extensions: ["js", "ts"],
-          exclude: ["node_modules"],
-          fix: false,
-          threads: true,
-          formatter: (results: LintResult[]) => {
-            const resultMessages: string[] = [];
-            for (const result of results) {
-              for (const msg of result.messages) {
-                resultMessages.push(`${result.filePath}(${msg.line}, ${msg.column}): ${msg.ruleId ?? ""}: ${msg.severity === 1 ? "warning" : msg.severity === 2 ? "error" : ""} ${msg.message}`);
+        ...!this.skipProcesses.includes("lint") ? [
+          new ESLintWebpackPlugin({
+            context: this.rootPath,
+            eslintPath: path.resolve(this.projectRootPath, "node_modules", "eslint"),
+            extensions: ["js", "ts"],
+            exclude: ["node_modules"],
+            fix: false,
+            threads: true,
+            formatter: (results: LintResult[]) => {
+              const resultMessages: string[] = [];
+              for (const result of results) {
+                for (const msg of result.messages) {
+                  resultMessages.push(`${result.filePath}(${msg.line}, ${msg.column}): ${msg.ruleId ?? ""}: ${msg.severity === 1 ? "warning" : msg.severity === 2 ? "error" : ""} ${msg.message}`);
+                }
               }
+              return resultMessages.join(os.EOL);
             }
-            return resultMessages.join(os.EOL);
+          })
+        ] : [],
+        new webpack.ProgressPlugin({
+          handler: (per: number, msg: string, ...args: string[]) => {
+            const phaseText = msg ? ` - phase: ${msg}` : "";
+            const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
+            this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
           }
         })
       ],
       node: false,
-      externals: [
-        ...externalModuleNames,
-        ...this.config.externalDependencies ? this.config.externalDependencies : []
-      ].distinct(),
+      externals: externalModuleNames,
       stats: "errors-warnings"
     };
   }
 
-  /*private _findAllInternalModuleCachePaths(): string[] {
+  private _findAllInternalModuleCachePaths(): string[] {
     return this._findAllNodeModules(this.rootPath, this.projectRootPath)
       .mapMany((item) => (
         FsUtil.readdir(item)
-          .filter((item1) => !item1.startsWith("@simplysm"))
+          .filter((item1) => item1 !== "@simplysm")
           .map((item1) => path.resolve(item, item1))
       ));
-  }*/
+  }
 
   private _findAllNodeModules(from: string, root: string): string[] {
     const nodeModules: string[] = [];
@@ -420,27 +509,28 @@ export class SdCliServerBuilder extends EventEmitter {
     return undefined;
   }
 
-  private _findExternalModuleNames(all: boolean): string[] {
+  private _findExternalModules(all: boolean): { name: string; path: string }[] {
     const loadedModuleNames: string[] = [];
-    const externalModuleNames: string[] = [];
+    const externalModules: { name: string; path: string }[] = [];
 
-    const fn = (rootPath: string): void => {
-      const npmConfig = this._getNpmConfig(rootPath);
+    const fn = (currPath: string): void => {
+      const npmConfig = this._getNpmConfig(currPath);
       if (!npmConfig) return;
 
-      for (const moduleName of Object.keys(npmConfig.dependencies ?? {})) {
+      for (const moduleName of Object.keys({
+        ...npmConfig.dependencies,
+        ...npmConfig.optionalDependencies
+      })) {
         if (loadedModuleNames.includes(moduleName)) continue;
         loadedModuleNames.push(moduleName);
 
-        if (this.config.externalDependencies?.includes(moduleName)) {
-          externalModuleNames.push(moduleName);
-        }
-
-        const modulePath = this._findModulePath(moduleName, rootPath);
+        const modulePath = this._findModulePath(moduleName, currPath);
         if (StringUtil.isNullOrEmpty(modulePath)) continue;
 
-        if (all || FsUtil.exists(path.resolve(modulePath, "binding.gyp"))) {
-          externalModuleNames.push(moduleName);
+        if (all
+          || this.config.externalDependencies?.includes(moduleName)
+          || FsUtil.exists(path.resolve(modulePath, "binding.gyp"))) {
+          externalModules.push({ path: modulePath, name: moduleName });
         }
 
         fn(modulePath);
@@ -449,7 +539,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
     fn(this.rootPath);
 
-    return externalModuleNames.distinct();
+    return externalModules.distinct();
   }
 
   private _getNpmConfig(rootPath: string): INpmConfig | undefined {