@simplysm/sd-cli 12.13.37 → 12.13.39

package/src/pkg-builders/lib/SdTsLibBuilder.ts

@@ -2,31 +2,15 @@ import path from "path";
 import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
 import { FsUtils, HashUtils, PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
-import { ScopePathSet } from "../commons/ScopePathSet";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
 
 export class SdTsLibBuilder {
   #tsCompiler: SdTsCompiler;
   #outputHashCache = new Map<TNormPath, string>();
 
-  constructor(
-    private readonly _pkgPath: TNormPath,
-    watch: boolean,
-    dev: boolean,
-    emitOnly: boolean,
-    noEmit: boolean,
-    scopePathSet: ScopePathSet,
-  ) {
-    this.#tsCompiler = new SdTsCompiler({
-      pkgPath: this._pkgPath,
-      additionalOptions: { declaration: true },
-      isWatchMode: watch,
-      isDevMode: dev,
-      isEmitOnly: emitOnly,
-      isNoEmit: noEmit,
-      isForBundle: false,
-      scopePathSet,
-    });
+  constructor(private readonly _opt: ISdTsCompilerOptions) {
+    this.#tsCompiler = new SdTsCompiler(_opt, false);
   }
 
   async buildAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
@@ -55,11 +39,11 @@ export class SdTsLibBuilder {
       if (globalStylesheetBundlingResult && "outputFiles" in globalStylesheetBundlingResult) {
         for (const outputFile of globalStylesheetBundlingResult.outputFiles) {
           const distPath = PathUtils.norm(
-            this._pkgPath,
+            this._opt.pkgPath,
             "dist",
-            path.relative(this._pkgPath, outputFile.path),
+            path.relative(this._opt.pkgPath, outputFile.path),
           );
-          if (PathUtils.isChildPath(distPath, path.resolve(this._pkgPath, "dist"))) {
+          if (PathUtils.isChildPath(distPath, path.resolve(this._opt.pkgPath, "dist"))) {
             const prevHash = this.#outputHashCache.get(distPath);
             const currHash = HashUtils.get(Buffer.from(outputFile.text));
             if (prevHash !== currHash) {
@@ -73,7 +57,7 @@ export class SdTsLibBuilder {
     }
 
     const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany(
-      (item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._pkgPath),
+      (item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._opt.pkgPath),
     );
 
     return {

package/src/pkg-builders/server/SdServerBuildRunner.ts

@@ -1,49 +1,36 @@
 import { FsUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { javascript, StringUtils } from "@simplysm/sd-core-common";
-import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { SdBuildRunnerBase } from "../SdBuildRunnerBase";
 import { SdServerBundler } from "./SdServerBundler";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
-import { ITsConfig } from "../../types/common-config/ITsConfig";
 import { INpmConfig } from "../../types/common-config/INpmConfig";
 
 export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuild2Runner"]);
 
   #serverBundler?: SdServerBundler;
-  #extModules?: { name: string; exists: boolean }[];
 
   protected override async _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
-    // prod일때 각종 파일들 생성
-    if (!this._dev) {
-      await this.#generateProductionFilesAsync();
-    }
-
     // 최초
     if (!modifiedFileSet) {
-      if (!this._noEmit) {
+      const externalModules = this.#getExternalModules();
+
+      if (!this._opt.watch?.dev) {
+        this.#generateProductionFiles(
+          externalModules.filter((item) => item.exists).map((item) => item.name),
+        );
+      }
+
+      if (!this._opt.watch?.noEmit) {
         this._debug("GEN .config...");
-        const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
+        const confDistPath = path.resolve(this._opt.pkgPath, "dist/.config.json");
         FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
       }
 
       this._debug(`BUILD 준비...`);
-      const tsConfig = FsUtils.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
-      this.#extModules = this.#extModules ?? (await this.#getExternalModulesAsync());
-      this.#serverBundler = new SdServerBundler({
-        watch: this._watch,
-        dev: this._dev,
-        emitOnly: this._emitOnly ?? false,
-        noEmit: this._noEmit ?? false,
-        pkgPath: this._pkgPath,
-        entryPoints: tsConfig.files
-          ? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
-          : [
-              path.resolve(this._pkgPath, "src/main.ts"),
-              ...FsUtils.glob(path.resolve(this._pkgPath, "src/workers/*.ts")),
-            ],
-        external: this.#extModules.map((item) => item.name),
-        scopePathSet: this._scopePathSet,
+      this.#serverBundler = new SdServerBundler(this._opt, {
+        external: externalModules.map((item) => item.name),
       });
     }
 
@@ -54,17 +41,14 @@ export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
     return bundleResult;
   }
 
-  async #generateProductionFilesAsync() {
-    const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
+  #generateProductionFiles(externals: string[]) {
+    const npmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json")) as INpmConfig;
 
     this._debug("GEN package.json...");
     {
       const projNpmConf = FsUtils.readJson(
         path.resolve(process.cwd(), "package.json"),
       ) as INpmConfig;
-      const extModules = await this.#getExternalModulesAsync();
-
-      const deps = extModules.filter((item) => item.exists).map((item) => item.name);
 
       const distNpmConfig: INpmConfig = {
         name: npmConf.name,
@@ -72,13 +56,13 @@ export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
         type: npmConf.type,
       };
       distNpmConfig.dependencies = {};
-      for (const dep of deps) {
-        distNpmConfig.dependencies[dep] = "*";
+      for (const external of externals) {
+        distNpmConfig.dependencies[external] = "*";
       }
 
       distNpmConfig.volta = projNpmConf.volta;
 
-      FsUtils.writeJson(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, {
+      FsUtils.writeJson(path.resolve(this._opt.pkgPath, "dist/package.json"), distNpmConfig, {
         space: 2,
       });
     }
@@ -86,7 +70,7 @@ export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
     this._debug("GEN .yarnrc.yml...");
     {
       FsUtils.writeFile(
-        path.resolve(this._pkgPath, "dist/.yarnrc.yml"),
+        path.resolve(this._opt.pkgPath, "dist/.yarnrc.yml"),
         "nodeLinker: node-modules",
       );
     }
@@ -94,7 +78,7 @@ export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
     this._debug("GEN openssl.cnf...");
     {
       FsUtils.writeFile(
-        path.resolve(this._pkgPath, "dist/openssl.cnf"),
+        path.resolve(this._opt.pkgPath, "dist/openssl.cnf"),
         `
 nodejs_conf = openssl_init
 
@@ -157,13 +141,13 @@ Options = UnsafeLegacyRenegotiation`.trim(),
         .replaceAll("\n        ", "\n")
         .trim();
 
-      FsUtils.writeFile(path.resolve(this._pkgPath, "dist/pm2.config.cjs"), str);
+      FsUtils.writeFile(path.resolve(this._opt.pkgPath, "dist/pm2.config.cjs"), str);
     }
 
     if (this._pkgConf.iis) {
       this._debug("GEN web.config...");
 
-      const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
+      const iisDistPath = path.resolve(this._opt.pkgPath, "dist/web.config");
       const nodeVersion = process.versions.node.substring(1);
       const serverExeFilePath =
         this._pkgConf.iis.nodeExeFilePath ??
@@ -203,12 +187,10 @@ Options = UnsafeLegacyRenegotiation`.trim(),
     }
   }
 
-  async #getExternalModulesAsync(): Promise<
-    {
-      name: string;
-      exists: boolean;
-    }[]
-  > {
+  #getExternalModules(): {
+    name: string;
+    exists: boolean;
+  }[] {
     const loadedModuleNames: string[] = [];
     const results: {
       name: string;
@@ -217,7 +199,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
 
     const npmConfigMap = new Map<string, INpmConfig>();
 
-    const fn = async (currPath: string): Promise<void> => {
+    const fn = (currPath: string) => {
       const npmConfig = npmConfigMap.getOrCreate(
         currPath,
         FsUtils.readJson(path.resolve(currPath, "package.json")),
@@ -245,7 +227,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
         const modulePath = FsUtils.findAllParentChildPaths(
           "node_modules/" + moduleName,
           currPath,
-          path.resolve(this._pkgPath, "../../"),
+          path.resolve(this._opt.pkgPath, "../../"),
         ).first();
         if (StringUtils.isNullOrEmpty(modulePath)) {
           continue;
@@ -265,7 +247,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
           });
         }
 
-        await fn(modulePath);
+        fn(modulePath);
       }
 
       for (const optModuleName of deps.optionals) {
@@ -275,7 +257,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
         const optModulePath = FsUtils.findAllParentChildPaths(
           "node_modules/" + optModuleName,
           currPath,
-          path.resolve(this._pkgPath, "../../"),
+          path.resolve(this._opt.pkgPath, "../../"),
         ).first();
         if (StringUtils.isNullOrEmpty(optModulePath)) {
           results.push({
@@ -299,11 +281,11 @@ Options = UnsafeLegacyRenegotiation`.trim(),
           });
         }
 
-        await fn(optModulePath);
+        fn(optModulePath);
       }
     };
 
-    await fn(this._pkgPath);
+    fn(this._opt.pkgPath);
 
     for (const external of this._pkgConf.externals ?? []) {
       if (!results.some((item) => item.name === external)) {

package/src/pkg-builders/server/SdServerBundler.ts

@@ -9,9 +9,9 @@ import {
 } from "@angular/build/src/tools/esbuild/bundler-context";
 import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
-import { ScopePathSet } from "../commons/ScopePathSet";
 import { ISdCliServerPluginResultCache } from "../../types/plugin/ISdCliServerPluginResultCache";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
 
 export class SdServerBundler {
   #logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBundler"]);
@@ -24,16 +24,8 @@ export class SdServerBundler {
   #outputHashCache = new Map<TNormPath, string>();
 
   constructor(
-    private readonly _opt: {
-      watch: boolean;
-      dev: boolean;
-      emitOnly: boolean;
-      noEmit: boolean;
-      pkgPath: TNormPath;
-      entryPoints: string[];
-      external?: string[];
-      scopePathSet: ScopePathSet;
-    },
+    private readonly _opt: ISdTsCompilerOptions,
+    private readonly _conf: { external: string[] },
   ) {}
 
   async bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
@@ -44,20 +36,23 @@ export class SdServerBundler {
 
     if (!this.#context) {
       this.#context = await esbuild.context({
-        entryPoints: this._opt.entryPoints,
+        entryPoints: [
+          path.resolve(this._opt.pkgPath, "src/main.ts"),
+          ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
+        ],
         keepNames: true,
         bundle: true,
-        sourcemap: this._opt.dev,
+        sourcemap: !!this._opt.watch?.dev,
         target: "node18",
         mainFields: ["es2020", "es2015", "module", "main"],
         conditions: ["es2020", "es2015", "module"],
         tsconfig: path.resolve(this._opt.pkgPath, "tsconfig.json"),
         write: false,
         metafile: true,
-        legalComments: this._opt.dev ? "eof" : "none",
-        minifyIdentifiers: !this._opt.dev,
-        minifySyntax: !this._opt.dev,
-        minifyWhitespace: !this._opt.dev,
+        legalComments: this._opt.watch?.dev ? "eof" : "none",
+        minifyIdentifiers: !this._opt.watch?.dev,
+        minifySyntax: !this._opt.watch?.dev,
+        minifyWhitespace: !this._opt.watch?.dev,
         outdir: path.resolve(this._opt.pkgPath, "dist"),
         format: "esm",
         resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
@@ -91,7 +86,7 @@ export class SdServerBundler {
         },
         platform: "node",
         logLevel: "silent",
-        external: this._opt.external,
+        external: this._conf.external,
         banner: {
           js: `
 import __path__ from 'path';
@@ -102,25 +97,14 @@ const require = __createRequire__(import.meta.url);
 const __filename = __fileURLToPath__(import.meta.url);
 const __dirname = __path__.dirname(__filename);`.trim(),
         },
-        plugins: [
-          createSdServerPlugin({
-            modifiedFileSet: this.#modifiedFileSet,
-            watch: this._opt.watch,
-            dev: this._opt.dev,
-            emitOnly: this._opt.emitOnly,
-            noEmit: this._opt.noEmit,
-            pkgPath: this._opt.pkgPath,
-            result: this.#resultCache,
-            scopePathSet: this._opt.scopePathSet,
-          }),
-        ],
+        plugins: [createSdServerPlugin(this._opt, this.#modifiedFileSet, this.#resultCache)],
       });
     }
 
     let esbuildResult: esbuild.BuildResult | esbuild.BuildFailure;
     esbuildResult = await this.#context.rebuild();
 
-    if (this._opt.noEmit) {
+    if (this._opt.watch?.noEmit) {
       return {
         buildMessages: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(
           esbuildResult,
@@ -155,7 +139,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
         const assetFiles = await resolveAssets(
           [
             { input: "public", glob: "**/*", output: "." },
-            ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
+            ...(this._opt.watch?.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
           ],
           this._opt.pkgPath,
         );

package/src/pkg-builders/server/createSdServerPlugin.ts

@@ -2,41 +2,27 @@ import esbuild from "esbuild";
 import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
 import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
-import { ScopePathSet } from "../commons/ScopePathSet";
 import { ISdCliServerPluginResultCache } from "../../types/plugin/ISdCliServerPluginResultCache";
 import { ISdTsCompilerResult } from "../../types/build/ISdTsCompilerResult";
+import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
 
-export function createSdServerPlugin(conf: {
-  pkgPath: TNormPath;
-  watch: boolean;
-  dev: boolean;
-  emitOnly: boolean;
-  noEmit: boolean;
-  modifiedFileSet: Set<TNormPath>;
-  result: ISdCliServerPluginResultCache;
-  scopePathSet: ScopePathSet;
-}): esbuild.Plugin {
+export function createSdServerPlugin(
+  conf: ISdTsCompilerOptions,
+  modifiedFileSet: Set<TNormPath>,
+  resultCache: ISdCliServerPluginResultCache,
+): esbuild.Plugin {
   return {
     name: "sd-server-compile",
     setup: (build: esbuild.PluginBuild) => {
-      const tsCompiler = new SdTsCompiler({
-        pkgPath: conf.pkgPath,
-        additionalOptions: { declaration: false },
-        isWatchMode: conf.watch,
-        isDevMode: conf.dev,
-        isNoEmit: conf.noEmit,
-        isEmitOnly: conf.emitOnly,
-        isForBundle: true,
-        scopePathSet: conf.scopePathSet,
-      });
+      const tsCompiler = new SdTsCompiler(conf, true);
 
       let tsCompileResult: ISdTsCompilerResult;
 
       build.onStart(async () => {
-        tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
+        tsCompileResult = await tsCompiler.compileAsync(modifiedFileSet);
 
-        conf.result.watchFileSet = tsCompileResult.watchFileSet;
-        conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
+        resultCache.watchFileSet = tsCompileResult.watchFileSet;
+        resultCache.affectedFileSet = tsCompileResult.affectedFileSet;
 
         //-- return err/warn
         return SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(
@@ -63,7 +49,7 @@ export function createSdServerPlugin(conf: {
       });
 
       build.onLoad({ filter: /\.[cm]?js$/ }, (args) => {
-        conf.result.watchFileSet!.add(PathUtils.norm(args.path));
+        resultCache.watchFileSet!.add(PathUtils.norm(args.path));
         return null;
       });
 
@@ -78,16 +64,16 @@ export function createSdServerPlugin(conf: {
           ),
         },
         (args) => {
-          conf.result.watchFileSet!.add(PathUtils.norm(args.path));
+          resultCache.watchFileSet!.add(PathUtils.norm(args.path));
           return null;
         },
       );
 
       build.onEnd((result) => {
-        conf.result.outputFiles = result.outputFiles;
-        conf.result.metafile = result.metafile;
+        resultCache.outputFiles = result.outputFiles;
+        resultCache.metafile = result.metafile;
 
-        conf.modifiedFileSet.clear();
+        modifiedFileSet.clear();
       });
     },
   };

package/src/sd-cli-entry.ts

@@ -16,8 +16,8 @@ import convertPrivateToHash from "./fix/convert-private-to-hash";
 import removeSdAngularSymbolNames from "./fix/remove-sd-angular-symbol-names";
 import convertSdAngularSymbolNames from "./fix/convert-sd-angular-symbol-names";
 import { removeUnusedInjects } from "./fix/remove-unused-injects";
-import { removeUnusedImports } from "./fix/remove-unused-imports";
 import removeUnusedProtectedReadonly from "./fix/remove-unused-protected-readonly";
+import { removeUnusedImports } from "./fix/remove-unused-imports";
 
 Error.stackTraceLimit = Infinity;
 EventEmitter.defaultMaxListeners = 0;

package/src/ts-compiler/SdDepAnalyzer.ts

@@ -3,7 +3,7 @@ import { SdDepCache } from "./SdDepCache";
 import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
 import { NgtscProgram } from "@angular/compiler-cli";
-import { ScopePathSet } from "../pkg-builders/commons/ScopePathSet";
+import { ScopePathSet } from "./ScopePathSet";
 
 export class SdDepAnalyzer {
   static analyze(

package/src/ts-compiler/SdStyleBundler.ts

@@ -2,8 +2,9 @@ import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { ComponentStylesheetBundler } from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
 import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
 import browserslist from "browserslist";
-import { ScopePathSet } from "../pkg-builders/commons/ScopePathSet";
 import { TStylesheetBundlingResult } from "../types/build/TStylesheetBundlingResult";
+import { ScopePathSet } from "./ScopePathSet";
+import path from "path";
 
 export class SdStyleBundler {
   #ngStyleBundler: ComponentStylesheetBundler;
@@ -12,30 +13,40 @@ export class SdStyleBundler {
   #revRefCache = new Map<TNormPath, Set<TNormPath>>();
 
   constructor(
-    private readonly _pkgPath: TNormPath,
-    private readonly _isDevMode: boolean,
-    private readonly _scopePathSet: ScopePathSet,
+    private readonly _opt: {
+      pkgPath: TNormPath;
+      scopePathSet: ScopePathSet;
+      dev: boolean;
+    },
   ) {
     this.#ngStyleBundler = new ComponentStylesheetBundler(
       {
-        workspaceRoot: this._pkgPath,
-        optimization: !this._isDevMode,
-        inlineFonts: true,
-        preserveSymlinks: false,
-        sourcemap: this._isDevMode ? "inline" : false,
-        outputNames: { bundles: "[name]", media: "media/[name]" },
+        workspaceRoot: this._opt.pkgPath,
+        inlineFonts: !this._opt.dev,
+        optimization: !this._opt.dev,
+        sourcemap: this._opt.dev ? "linked" : false,
+        sourcesContent: this._opt.dev,
+        outputNames: { bundles: "[name]-[hash]", media: "media/[name]-[hash]" },
         includePaths: [],
+        sass: {
+          fatalDeprecations: undefined,
+          silenceDeprecations: undefined,
+          futureDeprecations: undefined,
+        },
         externalDependencies: [],
         target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
+        preserveSymlinks: false,
         tailwindConfiguration: undefined,
+        postcssConfiguration: undefined,
         cacheOptions: {
           enabled: true,
-          path: ".cache/angular",
-          basePath: ".cache",
+          basePath: path.resolve(this._opt.pkgPath, ".cache"),
+          path: path.resolve(this._opt.pkgPath, ".cache/angular"),
         },
+        publicPath: undefined,
       },
       "scss",
-      this._isDevMode,
+      this._opt.dev,
     );
   }
 
@@ -68,8 +79,8 @@ export class SdStyleBundler {
 
       for (const referencedFile of result.referencedFiles ?? []) {
         if (
-          !this._scopePathSet.inScope(fileNPath) ||
-          !this._scopePathSet.inScope(PathUtils.norm(referencedFile))
+          !this._opt.scopePathSet.inScope(fileNPath) ||
+          !this._opt.scopePathSet.inScope(PathUtils.norm(referencedFile))
         )
           continue;
 
@@ -127,10 +138,18 @@ export class SdStyleBundler {
   }
 
   #addReference(fileNPath: TNormPath, referencedFile: TNormPath) {
+    if (fileNPath === referencedFile) return;
     this.#refCache.getOrCreate(fileNPath, new Set()).add(referencedFile);
     this.#revRefCache.getOrCreate(referencedFile, new Set()).add(fileNPath);
   }
 
+  getAllStyleFileSet() {
+    return new Set([
+      ...this.#revRefCache.keys(),
+      ...Array.from(this.#revRefCache.values()).mapMany((item) => Array.from(item)),
+    ]);
+  }
+
   getAffectedFileSet(modifiedNPathSet: Set<TNormPath>) {
     const affectedFileSet = new Set<TNormPath>();
     // 수정파일중 Result에 있는것