@simplysm/sd-cli 12.5.15 → 12.5.16

package/src/builders/SdCliServerBuilder.ts

@@ -1,17 +1,17 @@
-import {EventEmitter} from "events";
-import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
+import { EventEmitter } from "events";
+import { FsUtil, Logger, PathUtil, SdFsWatcher } from "@simplysm/sd-core-node";
 import {
   INpmConfig,
   ISdCliBuilderResult,
   ISdCliConfig,
   ISdCliPackageBuildResult,
   ISdCliServerPackageConfig,
-  ITsConfig
+  ITsConfig,
 } from "../commons";
 import path from "path";
-import {SdLinter} from "../build-tools/SdLinter";
-import {FunctionQueue, ObjectUtil, StringUtil} from "@simplysm/sd-core-common";
-import {SdServerBundler} from "../build-tools/SdServerBundler";
+import { SdLinter } from "../build-tools/SdLinter";
+import { FunctionQueue, ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
+import { SdServerBundler } from "../build-tools/SdServerBundler";
 
 export class SdCliServerBuilder extends EventEmitter {
   #logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuilder"]);
@@ -19,8 +19,10 @@ export class SdCliServerBuilder extends EventEmitter {
   #builder?: SdServerBundler;
   #extModules?: { name: string; exists: boolean }[];
 
-  public constructor(private readonly _projConf: ISdCliConfig,
-                     private readonly _pkgPath: string) {
+  public constructor(
+    private readonly _projConf: ISdCliConfig,
+    private readonly _pkgPath: string,
+  ) {
     super();
     this.#pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdCliServerPackageConfig;
   }
@@ -42,37 +44,35 @@ export class SdCliServerBuilder extends EventEmitter {
     const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
     await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this.#pkgConf.configs ?? {}, undefined, 2));
 
-    const result = await this._runAsync({dev: true});
+    const result = await this._runAsync({ dev: true });
     this.emit("complete", {
       affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults
+      buildResults: result.buildResults,
     });
 
     this._debug("WATCH...");
     let changeFiles: string[] = [];
     const fnQ = new FunctionQueue();
-    const watcher = SdFsWatcher
-      .watch(Array.from(result.watchFileSet))
-      .onChange({delay: 100}, (changeInfos) => {
-        changeFiles.push(...changeInfos.map((item) => item.path));
+    const watcher = SdFsWatcher.watch(Array.from(result.watchFileSet)).onChange({ delay: 100 }, (changeInfos) => {
+      changeFiles.push(...changeInfos.map((item) => item.path));
 
-        fnQ.runLast(async () => {
-          const currChangeFiles = [...changeFiles];
-          changeFiles = [];
+      fnQ.runLast(async () => {
+        const currChangeFiles = [...changeFiles];
+        changeFiles = [];
 
-          this.emit("change");
+        this.emit("change");
 
-          this.#builder!.markForChanges(currChangeFiles);
+        this.#builder!.markForChanges(currChangeFiles);
 
-          const watchResult = await this._runAsync({dev: true});
-          this.emit("complete", {
-            affectedFilePaths: Array.from(watchResult.affectedFileSet),
-            buildResults: watchResult.buildResults
-          });
-
-          watcher.add(watchResult.watchFileSet);
+        const watchResult = await this._runAsync({ dev: true });
+        this.emit("complete", {
+          affectedFilePaths: Array.from(watchResult.affectedFileSet),
+          buildResults: watchResult.buildResults,
         });
+
+        watcher.add(watchResult.watchFileSet);
       });
+    });
   }
 
   public async buildAsync(): Promise<ISdCliBuilderResult> {
@@ -84,7 +84,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
     this._debug("GEN .config.json...");
     const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-    await FsUtil.writeJsonAsync(confDistPath, this.#pkgConf.configs ?? {}, {space: 2});
+    await FsUtil.writeJsonAsync(confDistPath, this.#pkgConf.configs ?? {}, { space: 2 });
 
     this._debug("GEN package.json...");
     {
@@ -100,14 +100,10 @@ export class SdCliServerBuilder extends EventEmitter {
       delete distNpmConfig.peerDependencies;
 
       if (this.#pkgConf.pm2 && !this.#pkgConf.pm2.noStartScript) {
-        distNpmConfig.scripts = {"start": "pm2 start pm2.json"};
+        distNpmConfig.scripts = { start: "pm2 start pm2.json" };
       }
 
-      await FsUtil.writeJsonAsync(
-        path.resolve(this._pkgPath, "dist/package.json"),
-        distNpmConfig,
-        {space: 2}
-      );
+      await FsUtil.writeJsonAsync(path.resolve(this._pkgPath, "dist/package.json"), distNpmConfig, { space: 2 });
     }
 
     this._debug("GEN openssl.cnf...");
@@ -135,11 +131,10 @@ activate = 1
 system_default = system_default_sect
 
 [system_default_sect]
-Options = UnsafeLegacyRenegotiation`.trim()
+Options = UnsafeLegacyRenegotiation`.trim(),
       );
     }
 
-
     if (this.#pkgConf.pm2) {
       this._debug("GEN pm2.json...");
 
@@ -150,26 +145,25 @@ Options = UnsafeLegacyRenegotiation`.trim()
           script: "main.js",
           watch: true,
           watch_delay: 2000,
-          ignore_watch: [
-            "node_modules",
-            "www",
-            ...this.#pkgConf.pm2.ignoreWatchPaths ?? []
-          ],
-          ...this.#pkgConf.pm2.noInterpreter ? {} : {
-            "interpreter": "node@" + process.versions.node,
-          },
+          ignore_watch: ["node_modules", "www", ...(this.#pkgConf.pm2.ignoreWatchPaths ?? [])],
+          ...(this.#pkgConf.pm2.noInterpreter
+            ? {}
+            : {
+                interpreter: "node@" + process.versions.node,
+              }),
           interpreter_args: "--openssl-config=openssl.cnf",
           env: {
             NODE_ENV: "production",
             TZ: "Asia/Seoul",
             SD_VERSION: npmConfig.version,
-            ...this.#pkgConf.env
+            ...this.#pkgConf.env,
           },
           arrayProcess: "concat",
-          useDelTargetNull: true
-        }, {
-          space: 2
-        }
+          useDelTargetNull: true,
+        },
+        {
+          space: 2,
+        },
       );
     }
 
@@ -178,13 +172,17 @@ Options = UnsafeLegacyRenegotiation`.trim()
 
       const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
       const serverExeFilePath = this.#pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
-      await FsUtil.writeFileAsync(iisDistPath, `
+      await FsUtil.writeFileAsync(
+        iisDistPath,
+        `
 <configuration>
   <appSettings>
     <add key="NODE_ENV" value="production" />
     <add key="TZ" value="Asia/Seoul" />
     <add key="SD_VERSION" value="${npmConfig.version}" />
-    ${Object.keys(this.#pkgConf.env ?? {}).map(key => `<add key="${key}" value="${this.#pkgConf.env![key]}"/>`).join("\n    ")}
+    ${Object.keys(this.#pkgConf.env ?? {})
+      .map((key) => `<add key="${key}" value="${this.#pkgConf.env![key]}"/>`)
+      .join("\n    ")}
   </appSettings>
   <system.webServer>
     <handlers>
@@ -205,13 +203,14 @@ Options = UnsafeLegacyRenegotiation`.trim()
   </system.webServer>
 </configuration>
 
-`.trim());
+`.trim(),
+      );
     }
 
-    const result = await this._runAsync({dev: false});
+    const result = await this._runAsync({ dev: false });
     return {
       affectedFilePaths: Array.from(result.affectedFileSet),
-      buildResults: result.buildResults
+      buildResults: result.buildResults,
     };
   }
 
@@ -222,70 +221,89 @@ Options = UnsafeLegacyRenegotiation`.trim()
   }> {
     this._debug(`BUILD 준비...`);
     const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
-    this.#extModules = this.#extModules ?? await this._getExternalModulesAsync();
-    this.#builder = this.#builder ?? new SdServerBundler({
-      dev: opt.dev,
-      pkgPath: this._pkgPath,
-      entryPoints: tsConfig.files ? tsConfig.files.map((item) => path.resolve(this._pkgPath, item)) : [
-        path.resolve(this._pkgPath, "src/main.ts")
-      ],
-      external: this.#extModules.map((item) => item.name)
-    });
+    this.#extModules = this.#extModules ?? (await this._getExternalModulesAsync());
+    this.#builder =
+      this.#builder ??
+      new SdServerBundler({
+        dev: opt.dev,
+        pkgPath: this._pkgPath,
+        entryPoints: tsConfig.files
+          ? tsConfig.files.map((item) => path.resolve(this._pkgPath, item))
+          : [path.resolve(this._pkgPath, "src/main.ts")],
+        external: this.#extModules.map((item) => item.name),
+      });
 
     this._debug(`BUILD & CHECK...`);
     const buildResult = await this.#builder.bundleAsync();
 
     //-- filePaths
 
-    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
-      .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
-    const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter(item =>
-      PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
-      localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
-    ));
+    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {}).mapMany((key) =>
+      FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
+    );
+    const watchFileSet = new Set(
+      Array.from(buildResult.watchFileSet).filter(
+        (item) =>
+          PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
+          localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu)),
+      ),
+    );
 
     this._debug(`LINT...`);
-    const lintResults = await SdLinter.lintAsync(Array.from(buildResult.affectedFileSet).filter(item => PathUtil.isChildPath(item, this._pkgPath)), buildResult.program);
+    const lintResults = await SdLinter.lintAsync(this._pkgPath, buildResult.affectedFileSet, buildResult.program);
 
     this._debug(`빌드 완료`);
     return {
       watchFileSet,
       affectedFileSet: buildResult.affectedFileSet,
-      buildResults: [...buildResult.results, ...lintResults]
+      buildResults: [...buildResult.results, ...lintResults],
     };
   }
 
-  private async _getExternalModulesAsync(): Promise<{
-    name: string;
-    exists: boolean
-  }[]> {
+  private async _getExternalModulesAsync(): Promise<
+    {
+      name: string;
+      exists: boolean;
+    }[]
+  > {
     const loadedModuleNames: string[] = [];
     const results: {
       name: string;
-      exists: boolean
+      exists: boolean;
     }[] = [];
 
     const npmConfigMap = new Map<string, INpmConfig>();
 
     const fn = async (currPath: string): Promise<void> => {
-      const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
+      const npmConfig = npmConfigMap.getOrCreate(
+        currPath,
+        await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")),
+      );
 
       const deps = {
         defaults: [
           ...Object.keys(npmConfig.dependencies ?? {}),
-          ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
+          ...Object.keys(npmConfig.peerDependencies ?? {}).filter(
+            (item) => !npmConfig.peerDependenciesMeta?.[item]?.optional,
+          ),
         ].distinct(),
         optionals: [
           ...Object.keys(npmConfig.optionalDependencies ?? {}),
-          ...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
-        ].distinct()
+          ...Object.keys(npmConfig.peerDependencies ?? {}).filter(
+            (item) => npmConfig.peerDependenciesMeta?.[item]?.optional,
+          ),
+        ].distinct(),
       };
 
       for (const moduleName of deps.defaults) {
         if (loadedModuleNames.includes(moduleName)) continue;
         loadedModuleNames.push(moduleName);
 
-        const modulePath = FsUtil.findAllParentChildPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
+        const modulePath = FsUtil.findAllParentChildPaths(
+          "node_modules/" + moduleName,
+          currPath,
+          path.resolve(this._pkgPath, "../../"),
+        ).first();
         if (StringUtil.isNullOrEmpty(modulePath)) {
           continue;
         }
@@ -293,14 +311,14 @@ Options = UnsafeLegacyRenegotiation`.trim()
         if (FsUtil.glob(path.resolve(modulePath, "binding.gyp")).length > 0) {
           results.push({
             name: moduleName,
-            exists: true
+            exists: true,
           });
         }
 
         if (this.#pkgConf.externals?.includes(moduleName)) {
           results.push({
             name: moduleName,
-            exists: true
+            exists: true,
           });
         }
 
@@ -311,11 +329,15 @@ Options = UnsafeLegacyRenegotiation`.trim()
         if (loadedModuleNames.includes(optModuleName)) continue;
         loadedModuleNames.push(optModuleName);
 
-        const optModulePath = FsUtil.findAllParentChildPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
+        const optModulePath = FsUtil.findAllParentChildPaths(
+          "node_modules/" + optModuleName,
+          currPath,
+          path.resolve(this._pkgPath, "../../"),
+        ).first();
         if (StringUtil.isNullOrEmpty(optModulePath)) {
           results.push({
             name: optModuleName,
-            exists: false
+            exists: false,
           });
           continue;
         }
@@ -323,14 +345,14 @@ Options = UnsafeLegacyRenegotiation`.trim()
         if (FsUtil.glob(path.resolve(optModulePath, "binding.gyp")).length > 0) {
           results.push({
             name: optModuleName,
-            exists: true
+            exists: true,
           });
         }
 
         if (this.#pkgConf.externals?.includes(optModuleName)) {
           results.push({
             name: optModuleName,
-            exists: true
+            exists: true,
           });
         }
 
@@ -341,10 +363,10 @@ Options = UnsafeLegacyRenegotiation`.trim()
     await fn(this._pkgPath);
 
     for (const external of this.#pkgConf.externals ?? []) {
-      if (!results.some(item => item.name === external)) {
+      if (!results.some((item) => item.name === external)) {
         results.push({
           name: external,
-          exists: false
+          exists: false,
         });
       }
     }

package/src/builders/SdCliTsLibBuilder.ts

@@ -93,10 +93,10 @@ export class SdCliTsLibBuilder extends EventEmitter {
     const buildResult = await this.#bundler.buildAsync();
 
     this._debug("LINT...");
-    const lintFilePaths = Array.from(buildResult.affectedFileSet).filter((item) =>
+    /*const lintFilePaths = Array.from(buildResult.affectedFileSet).filter((item) =>
       PathUtil.isChildPath(item, this.#pkgPath),
-    );
-    const lintResults = await SdLinter.lintAsync(lintFilePaths, buildResult.program);
+    );*/
+    const lintResults = await SdLinter.lintAsync(this.#pkgPath, buildResult.affectedFileSet, buildResult.program);
 
     this._debug(`빌드 완료`);
     const localUpdatePaths = Object.keys(this.#projConf.localUpdates ?? {}).mapMany((key) =>

package/src/bundle-plugins/sdNgPlugin.ts

@@ -15,7 +15,12 @@ export function sdNgPlugin(conf: {
   return {
     name: "sd-ng-compiler",
     setup: (build: esbuild.PluginBuild) => {
-      const compiler = new SdTsCompiler(conf.pkgPath, { declaration: false }, conf.dev);
+      const compiler = new SdTsCompiler({
+        pkgPath: conf.pkgPath,
+        additionalOptions: { declaration: false },
+        isDevMode: conf.dev,
+        isForBundle: true,
+      });
 
       let buildResult: ISdTsCompilerResult;
       const outputContentsCacheMap = new Map<string, Uint8Array>();

package/src/bundle-plugins/sdServerPlugin.ts

@@ -1,8 +1,8 @@
 import esbuild from "esbuild";
 import ts from "typescript";
 import path from "path";
-import {ISdTsCompilerResult, SdTsCompiler} from "../build-tools/SdTsCompiler";
-import {convertTypeScriptDiagnostic} from "@angular/build/src/tools/esbuild/angular/diagnostics";
+import { ISdTsCompilerResult, SdTsCompiler } from "../build-tools/SdTsCompiler";
+import { convertTypeScriptDiagnostic } from "@angular/build/src/tools/esbuild/angular/diagnostics";
 
 export function sdServerPlugin(conf: {
   pkgPath: string;
@@ -13,7 +13,12 @@ export function sdServerPlugin(conf: {
   return {
     name: "sd-server-compiler",
     setup: (build: esbuild.PluginBuild) => {
-      const compiler = new SdTsCompiler(conf.pkgPath, {declaration: false}, conf.dev);
+      const compiler = new SdTsCompiler({
+        pkgPath: conf.pkgPath,
+        additionalOptions: { declaration: false },
+        isDevMode: conf.dev,
+        isForBundle: true,
+      });
 
       let buildResult: ISdTsCompilerResult;
 
@@ -28,33 +33,44 @@ export function sdServerPlugin(conf: {
         //-- return err/warn
 
         return {
-          errors: buildResult.typescriptDiagnostics.filter(item => item.category === ts.DiagnosticCategory.Error).map(item => convertTypeScriptDiagnostic(ts, item)),
-          warnings: buildResult.typescriptDiagnostics.filter(item => item.category !== ts.DiagnosticCategory.Error).map(item => convertTypeScriptDiagnostic(ts, item)),
+          errors: buildResult.typescriptDiagnostics
+            .filter((item) => item.category === ts.DiagnosticCategory.Error)
+            .map((item) => convertTypeScriptDiagnostic(ts, item)),
+          warnings: buildResult.typescriptDiagnostics
+            .filter((item) => item.category !== ts.DiagnosticCategory.Error)
+            .map((item) => convertTypeScriptDiagnostic(ts, item)),
         };
       });
 
-
-      build.onLoad({filter: /\.ts$/}, (args) => {
+      build.onLoad({ filter: /\.ts$/ }, (args) => {
         const emittedJsFile = buildResult.emittedFilesCacheMap.get(path.normalize(args.path))?.last();
         if (!emittedJsFile) {
           throw new Error(`ts 빌더 결과 emit 파일이 존재하지 않습니다. ${args.path}`);
         }
 
         const contents = emittedJsFile.text;
-        return {contents, loader: "js"};
+        return { contents, loader: "js" };
       });
 
-      build.onLoad({filter: /\.[cm]?js$/}, (args) => {
+      build.onLoad({ filter: /\.[cm]?js$/ }, (args) => {
         conf.result.watchFileSet!.add(path.normalize(args.path));
         return null;
       });
 
       build.onLoad(
-        {filter: new RegExp("(" + Object.keys(build.initialOptions.loader!).map(item => "\\" + item).join("|") + ")$")},
+        {
+          filter: new RegExp(
+            "(" +
+              Object.keys(build.initialOptions.loader!)
+                .map((item) => "\\" + item)
+                .join("|") +
+              ")$",
+          ),
+        },
         (args) => {
           conf.result.watchFileSet!.add(path.normalize(args.path));
           return null;
-        }
+        },
       );
 
       build.onEnd((result) => {
@@ -63,7 +79,7 @@ export function sdServerPlugin(conf: {
 
         conf.modifiedFileSet.clear();
       });
-    }
+    },
   };
 }
 
@@ -73,4 +89,4 @@ export interface IServerPluginResultCache {
   outputFiles?: esbuild.OutputFile[];
   metafile?: esbuild.Metafile;
   program?: ts.Program;
-}
+}

package/src/entry/SdCliElectron.ts

@@ -28,7 +28,7 @@ export class SdCliElectron {
     const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
 
     await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
-      name: npmConfig.name,
+      name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
       version: npmConfig.version,
       description: npmConfig.description,
       main: "electron-main.js",
@@ -78,7 +78,7 @@ export class SdCliElectron {
     const externalPkgNames = pkgConf.builder.electron.reinstallDependencies ?? [];
 
     await FsUtil.writeJsonAsync(path.resolve(electronPath, `package.json`), {
-      name: npmConfig.name,
+      name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
       version: npmConfig.version,
       description: npmConfig.description,
       main: "electron-main.js",
@@ -107,7 +107,7 @@ export class SdCliElectron {
       config: {
         appId: pkgConf.builder.electron.appId,
         productName: npmConfig.description,
-        // asar: false,
+        asar: false,
         win: {
           target: "nsis"
         },
@@ -144,7 +144,7 @@ export class SdCliElectron {
     const externalPkgNames = opt.config.reinstallDependencies ?? [];
 
     await FsUtil.writeJsonAsync(path.resolve(electronSrcPath, `package.json`), {
-      name: npmConfig.name,
+      name: npmConfig.name.replace(/^@/, "").replace(/\//, "-"),
       version: npmConfig.version,
       description: npmConfig.description,
       main: "electron-main.js",
@@ -173,7 +173,7 @@ export class SdCliElectron {
       config: {
         appId: opt.config.appId,
         productName: npmConfig.description,
-        // asar: false,
+        asar: false,
         win: {
           target: "nsis"
         },

package/src/entry/SdCliProject.ts

@@ -100,8 +100,10 @@ export class SdCliProject {
         }
 
         for (const buildResult of message.result!.buildResults) {
-          const cacheItem = resultCache.getOrCreate(buildResult.filePath ?? "none", []);
-          cacheItem.push(buildResult);
+          if (buildResult.filePath == null || PathUtil.isChildPath(buildResult.filePath, message.req.pkgPath)) {
+            const cacheItem = resultCache.getOrCreate(buildResult.filePath ?? "none", []);
+            cacheItem.push(buildResult);
+          }
         }
 
         const pkgConf = message.req.projConf.packages[path.basename(message.req.pkgPath)]!;