@simplysm/sd-cli 6.0.27 → 6.0.36

package/src/builders/SdCliNgLibraryBuilder.ts

@@ -1,5 +1,5 @@
 import * as ts from "typescript";
-import { ISdAutoIndexConfig, ISdPackageBuildResult, ITsconfig } from "../commons";
+import { ISdAutoIndexConfig, ISdPackageBuildResult } from "../commons";
 import * as path from "path";
 import { SdTsDiagnosticUtil } from "../utils/SdTsDiagnosticUtil";
 import { NgccProcessingCache } from "ng-packagr/lib/ng-package/ngcc-cache";
@@ -10,7 +10,7 @@ import { MetadataCollector, NgtscProgram } from "@angular/compiler-cli";
 import { ITsBuildFileCache, ITsGenResult, SdCliTypescriptBuilder } from "./SdCliTypescriptBuilder";
 import { NgCompiler } from "@angular/compiler-cli/src/ngtsc/core";
 import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import { PathUtil } from "@simplysm/sd-core-node";
 import * as os from "os";
 import * as nodeSass from "node-sass";
 import { createHash } from "crypto";
@@ -29,20 +29,10 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
 
   public constructor(public rootPath: string,
                      public tsconfigFilePath: string,
-                     ignoreProcesses: ("emit" | "check" | "lint" | "genIndex" | "genNgModule")[],
+                     skipProcesses: ("emit" | "check" | "lint" | "genIndex" | "genNgModule")[],
                      public autoIndexConfig: ISdAutoIndexConfig | undefined) {
-    super(rootPath, tsconfigFilePath, ignoreProcesses as ("emit" | "check" | "lint" | "genIndex")[], autoIndexConfig);
-    this.ignoreProcesses = ignoreProcesses;
-
-    const tsconfig: ITsconfig = FsUtil.readJson(this.tsconfigFilePath);
-    this._parsedTsconfig = {
-      ...this._parsedTsconfig,
-      options: {
-        baseUrl: path.dirname(this.tsconfigFilePath),
-        ...this._parsedTsconfig.options,
-        ...tsconfig.angularCompilerOptions
-      }
-    };
+    super(rootPath, tsconfigFilePath, skipProcesses as ("emit" | "check" | "lint" | "genIndex")[], autoIndexConfig);
+    this.skipProcesses = skipProcesses;
   }
 
   protected override async _runProgramAsync(dirtyFilePaths: string[]): Promise<ISdPackageBuildResult[]> {
@@ -53,7 +43,7 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
 
     const diagnostics: ts.Diagnostic[] = [];
 
-    if (!this.ignoreProcesses.includes("check")) {
+    if (!this.skipProcesses.includes("check")) {
       diagnostics.push(
         ...this._ngCompiler.getOptionDiagnostics(),
         ...this._builder.getOptionsDiagnostics(),
@@ -62,9 +52,10 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
 
       await this._ngCompiler.analyzeAsync();
 
-      for (const filePath of dirtyFilePaths) {
-        const sourceFile = this._builder.getSourceFile(filePath);
-        if (!sourceFile) continue;
+      for (const sourceFile of this._builder.getSourceFiles()) {
+        /*for (const filePath of dirtyFilePaths) {
+          const sourceFile = this._builder.getSourceFile(filePath);
+          if (!sourceFile) continue;*/
 
         if (this._ngCompiler.ignoreForDiagnostics.has(sourceFile)) continue;
         if (sourceFile.isDeclarationFile) continue;
@@ -77,7 +68,7 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
       }
     }
 
-    if (!this.ignoreProcesses.includes("emit")) {
+    if (!this.skipProcesses.includes("emit")) {
       const transformers = this._ngCompiler.prepareEmit().transformers;
 
       for (const filePath of dirtyFilePaths) {
@@ -88,7 +79,8 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
 
         this._builder.emit(sourceFile, undefined, undefined, undefined, transformers);
 
-        if (this._parsedTsconfig.options.declaration) {
+        // 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);
             if (metadata) {
@@ -97,6 +89,10 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
           }
         }
       }
+
+      /*if (this._parsedTsconfig.options.declaration) {
+        this._writeMetadataBundles();
+      }*/
     }
 
     const result = diagnostics.map((item) => SdTsDiagnosticUtil.convertDiagnosticsToResult(item)).filterExists();
@@ -107,9 +103,12 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
   }
 
   private _writeMetadataFile(sourceFile: ts.SourceFile, metadata: ModuleMetadata): void {
-    const metadataText = JSON.stringify([metadata]);
+    const metadataText = JSON.stringify({
+      ...metadata,
+      importAs: this.npmConfig.name
+    });
     const outFileName = path.resolve(
-      this._parsedTsconfig.options.declarationDir!,
+      this._program!.getCompilerOptions().declarationDir!,
       path.relative(path.resolve(this.rootPath, "src"), sourceFile.fileName)
     ).replace(/\.ts$/, ".sd-metadata.json");
     this._cacheCompilerHost!.writeFile(outFileName, metadataText, false, undefined, [sourceFile]);
@@ -119,15 +118,38 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
     return new MetadataCollector().getMetadata(sourceFile, true);
   }
 
+  /*private _writeMetadataBundles(): void {
+    for (const rootFilePath of this._parsedTsconfig.fileNames) {
+      const metadata = new MetadataBundler(
+        rootFilePath.replace(/\.ts$/, ""),
+        rootFilePath.endsWith("/index.ts") ? this.npmConfig.name
+          : (this.npmConfig.name + "/" + PathUtil.posix(path.relative(path.resolve(this.rootPath, "src"), rootFilePath)).replace(/\.ts/, "")),
+        new CompilerHostAdapter(this._cacheCompilerHost!, null, this._parsedTsconfig.options),
+        undefined
+      ).getMetadataBundle().metadata;
+
+      const outFileName = path.resolve(
+        this._parsedTsconfig.options.declarationDir!,
+        path.relative(path.resolve(this.rootPath, "src"), rootFilePath)
+      ).replace(/\.ts$/, ".sd-metadata.json");
+
+      const fileCache = this._fileCache.get(PathUtil.posix(rootFilePath));
+      if (!fileCache?.sourceFile) throw new NeverEntryError();
+      this._cacheCompilerHost!.writeFile(outFileName, JSON.stringify(metadata), false, undefined, [fileCache.sourceFile]);
+    }
+  }*/
+
   public override async reloadProgramAsync(watch: boolean): Promise<string[]> {
     this._logger.debug("프로그램 리로드");
 
-    this._moduleResolutionCache = ts.createModuleResolutionCache(this.rootPath, (s) => s, this._parsedTsconfig.options);
-    this._cacheCompilerHost = await this._createCacheCompilerHostAsync(this._parsedTsconfig, this._moduleResolutionCache);
+    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);
 
     this._ngProgram = new NgtscProgram(
-      this._parsedTsconfig.fileNames,
-      this._parsedTsconfig.options,
+      parsedTsconfig.fileNames,
+      parsedTsconfig.options,
       this._cacheCompilerHost,
       this._ngProgram
     );
@@ -149,15 +171,27 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
     };
 
     if (watch) {
-      const builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-        this._program,
-        this._cacheCompilerHost,
-        this._builder as ts.EmitAndSemanticDiagnosticsBuilderProgram
-      );
-      this._builder = builder;
+      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;
 
-      const affectedFilePaths: string[] = [];
+      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";
@@ -170,14 +204,20 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
           return false;
         });
 
-        if (!result) break;
-
-        if ("fileName" in result.affected) {
+        if (result && "fileName" in result.affected) {
           affectedFilePaths.push(result.affected.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;
       }
 
-      const result = affectedFilePaths.distinct();
+      const result = Array.from(affectedFilePathSet.values());
 
       this._logger.debug("프로그램 리로드", result);
 
@@ -231,7 +271,7 @@ export class SdCliNgLibraryBuilder extends SdCliTypescriptBuilder {
     this._logger.debug("Angular Module, RoutingModule 생성", dirtyFilePaths);
 
     const result: ITsGenResult = { dirtyFilePaths: [], result: [] };
-    if (this.ignoreProcesses.includes("genNgModule")) return result;
+    if (this.skipProcesses.includes("genNgModule")) return result;
 
     const reloadResult = await this._moduleFilesGenerator.reloadSourceFilesAsync(
       dirtyFilePaths,

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, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
 import { ObjectUtil, StringUtil, Wait } from "@simplysm/sd-core-common";
 import * as webpack from "webpack";
 import * as path from "path";
@@ -27,7 +27,8 @@ export class SdCliServerBuilder extends EventEmitter {
   public constructor(public rootPath: string,
                      public tsconfigFilePath: string,
                      public projectRootPath: string,
-                     public config: ISdServerPackageConfig) {
+                     public config: ISdServerPackageConfig,
+                     public useCache: boolean) {
     super();
 
     const tsconfig: ITsconfig = FsUtil.readJson(this.tsconfigFilePath);
@@ -93,13 +94,19 @@ export class SdCliServerBuilder extends EventEmitter {
             ...this.config.env ? this.config.env : {}
           }
         },
-        (typeof this.config.pm2 !== "boolean") ? this.config.pm2 : {}
+        (typeof this.config.pm2 !== "boolean") ? this.config.pm2 : {},
+        {
+          arrayProcess: "concat"
+        }
       ), undefined, 2));
     }
 
     // iis 파일 쓰기
-    if (this.config.iis) {
+    if (this.config.iis !== undefined && this.config.iis !== false) {
       const iisDistPath = path.resolve(this.parsedTsconfig.options.outDir!, "web.config");
+      const serverExeFilePath = (this.config.iis !== true && "serverExeFilePath" in this.config.iis)
+        ? (this.config.iis.serverExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe")
+        : "C:\\Program Files\\nodejs\\node.exe";
       await FsUtil.writeFileAsync(iisDistPath, `
 <configuration>
   <system.webServer>
@@ -107,7 +114,10 @@ export class SdCliServerBuilder extends EventEmitter {
     <handlers>
       <add name="iisnode" path="main.js" verb="*" modules="iisnode" />
     </handlers>
-    <iisnode nodeProcessCommandLine="C:\\Program Files\\nodejs\\node.exe" watchedFiles="web.config;*.js" loggingEnabled="true" />
+    <iisnode nodeProcessCommandLine="${serverExeFilePath}"
+             watchedFiles="web.config;*.js"
+             loggingEnabled="true"
+             devErrorsEnabled="true" />
     <rewrite>
       <rules>
         <rule name="main">
@@ -115,9 +125,10 @@ export class SdCliServerBuilder extends EventEmitter {
         </rule>
       </rules>
     </rewrite>
-    <httpErrors errorMode="Detailed" />  
+    <httpErrors errorMode="Detailed" />
   </system.webServer>
 </configuration>
+
 `.trim());
     }
 
@@ -133,12 +144,6 @@ export class SdCliServerBuilder extends EventEmitter {
 
     await FsUtil.writeFileAsync(path.resolve(this.parsedTsconfig.options.outDir!, "package.json"), JSON.stringify(distNpmConfig, undefined, 2));
 
-    // CopyWebpackPlugin 대신 직접 카피
-
-    for (const item of ["assets/"]) {
-      await FsUtil.copyAsync(path.resolve(this.rootPath, "src", item), path.resolve(this.parsedTsconfig.options.outDir!, item));
-    }
-
     this.emit("complete", buildResults);
   }
 
@@ -148,7 +153,6 @@ export class SdCliServerBuilder extends EventEmitter {
     const externalModuleNames = this._findExternalModuleNames(true);
 
     // 빌드
-
     const webpackConfig = this._getWebpackConfig(true, externalModuleNames);
     const compiler = webpack(webpackConfig);
     await new Promise<void>((resolve, reject) => {
@@ -209,9 +213,9 @@ export class SdCliServerBuilder extends EventEmitter {
 
     const mainFilePath = path.resolve(this.parsedTsconfig.options.outDir!, "main.js");
 
-    const prevLoggerConfigs = ObjectUtil.clone(Logger.configs);
+    // const prevLoggerConfigs = ObjectUtil.clone(Logger.configs);
     this._server = require(mainFilePath) as SdServiceServer | undefined;
-    Logger.configs = prevLoggerConfigs;
+    // Logger.configs = prevLoggerConfigs;
 
     if (!this._server) {
       throw new Error(`${mainFilePath}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
@@ -234,16 +238,16 @@ export class SdCliServerBuilder extends EventEmitter {
       resolve: {
         extensions: [".ts", ".tsx", ".js"],
         symlinks: true,
-        modules: [this.projectRootPath, "node_modules"],
+        // modules: [this.projectRootPath, "node_modules"],
         mainFields: ["es2020", "main", "module"]
       },
-      resolveLoader: {
+      /*resolveLoader: {
         symlinks: true,
         modules: [
           "node_modules",
           ...this._findAllNodeModules(__dirname, this.projectRootPath)
         ]
-      },
+      },*/
       context: this.projectRootPath,
       entry: {
         main: [
@@ -258,6 +262,7 @@ export class SdCliServerBuilder extends EventEmitter {
         // chunkFilename: watch ? "[name].js" : "[name].[chunkhash:20].js",
         filename: "[name].js",
         chunkFilename: "[name].js",
+        assetModuleFilename: "resources/[name][ext][query]",
         libraryTarget: watch ? "umd" : "commonjs"
       },
       performance: { hints: false },
@@ -286,10 +291,14 @@ export class SdCliServerBuilder extends EventEmitter {
                 return `${msg.file}(${msg.line}, ${msg.character}): ${msg.code}: ${msg.severity} ${msg.content}`;
               }
             }
+          },
+          {
+            test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|otf|xlsx?|pptx?|docx?|zip|pfx|pkl)$/,
+            type: "asset/resource"
           }
         ]
       },
-      cache: watch ? { type: "memory", maxGenerations: 1 } : false,
+      cache: (watch && this.useCache) ? { type: "memory", maxGenerations: 1 } : false,
       optimization: {
         minimizer: watch ? [] : [
           new JavaScriptOptimizerPlugin({
@@ -302,7 +311,7 @@ export class SdCliServerBuilder extends EventEmitter {
         ],
         moduleIds: "deterministic",
         chunkIds: watch ? "named" : "deterministic",
-        emitOnErrors: false
+        emitOnErrors: watch
       },
       plugins: [
         new DedupeModuleResolvePlugin({ verbose: false }) as any,
@@ -314,30 +323,29 @@ export class SdCliServerBuilder extends EventEmitter {
             skipChildCompilers: true
           })
         ],
-        ...watch ? [
-          new CopyWebpackPlugin({
-            patterns: ["assets/"].map((item) => ({
-              context: this.rootPath,
-              to: item,
-              from: `src/${item}`,
-              noErrorOnMissing: true,
-              force: true,
-              globOptions: {
-                dot: true,
-                followSymbolicLinks: false,
-                ignore: [
-                  ".gitkeep",
-                  "**/.DS_Store",
-                  "**/Thumbs.db"
-                ].map((i) => PathUtil.posix(this.rootPath, i))
-              },
-              priority: 0
-            }))
-          })
-        ] : [],
-        ...this.config.env ? [
-          new webpack.EnvironmentPlugin(this.config.env)
-        ] : [],
+        new CopyWebpackPlugin({
+          patterns: ["assets/"].map((item) => ({
+            context: this.rootPath,
+            to: item,
+            from: `src/${item}`,
+            noErrorOnMissing: true,
+            force: true,
+            globOptions: {
+              dot: true,
+              followSymbolicLinks: false,
+              ignore: [
+                ".gitkeep",
+                "**/.DS_Store",
+                "**/Thumbs.db"
+              ].map((i) => PathUtil.posix(this.rootPath, i))
+            },
+            priority: 0
+          }))
+        }),
+        new webpack.EnvironmentPlugin({
+          SD_VERSION: this._getNpmConfig(this.rootPath)!.version,
+          ...this.config.env
+        }),
         new ESLintWebpackPlugin({
           context: this.rootPath,
           eslintPath: path.resolve(this.projectRootPath, "node_modules", "eslint"),
@@ -365,6 +373,15 @@ export class SdCliServerBuilder extends EventEmitter {
     };
   }
 
+  /*private _findAllInternalModuleCachePaths(): string[] {
+    return this._findAllNodeModules(this.rootPath, this.projectRootPath)
+      .mapMany((item) => (
+        FsUtil.readdir(item)
+          .filter((item1) => !item1.startsWith("@simplysm"))
+          .map((item1) => path.resolve(item, item1))
+      ));
+  }*/
+
   private _findAllNodeModules(from: string, root: string): string[] {
     const nodeModules: string[] = [];