@simplysm/sd-cli 12.13.21 → 12.13.23

package/src/pkg-builders/client/{sd-client.build-runner.ts → SdClientBuildRunner.ts}

@@ -1,27 +1,23 @@
 import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
-import { SdNgBundler } from "./sd-ng.bundler";
-import { SdCliCordova } from "../../entry/sd-cli-cordova";
-import { SdCliElectron } from "../../entry/sd-cli-electron";
-import { BuildRunnerBase, IBuildRunnerRunResult } from "../commons/build-runner.base";
-import { SdCliNgRoutesFileGenerator } from "./sd-cli-ng-routes.file-generator";
-import { INpmConfig } from "../../types/common-configs.types";
-
-export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
+import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { SdNgBundler } from "./SdNgBundler";
+import { SdCliCordova } from "../../entry/SdCliCordova";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+import { INpmConfig } from "../../types/common-config/INpmConfig";
+import { SdCliNgRoutesFileGenerator } from "./SdCliNgRoutesFileGenerator";
+import { SdCliElectron } from "../../entry/SdCliElectron";
+
+export class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
 
   #ngBundlers?: SdNgBundler[];
   #cordova?: SdCliCordova;
 
-  protected override async _runAsync(
-    dev: boolean,
-    emitOnly: boolean,
-    noEmit: boolean,
-    modifiedFileSet?: Set<TNormPath>,
-  ): Promise<IBuildRunnerRunResult> {
+  protected override async _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
     // 최초 한번
     if (!modifiedFileSet) {
-      if (!noEmit) {
+      if (!this._noEmit) {
         // config
         this._debug("GEN .config...");
         const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
@@ -57,17 +53,18 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
       this.#ngBundlers = ngBundlerBuilderTypes.map(
         (ngBundlerBuilderType) =>
           new SdNgBundler({
-            dev,
-            emitOnly,
-            noEmit,
+            watch: this._watch,
+            dev: this._dev,
+            emitOnly: this._emitOnly ?? false,
+            noEmit: this._noEmit ?? false,
             builderType: ngBundlerBuilderType,
             pkgPath: this._pkgPath,
             outputPath:
               ngBundlerBuilderType === "web"
                 ? PathUtils.norm(this._pkgPath, "dist")
-                : ngBundlerBuilderType === "electron" && !dev
+                : ngBundlerBuilderType === "electron" && !this._dev
                   ? PathUtils.norm(this._pkgPath, ".electron/src")
-                  : ngBundlerBuilderType === "cordova" && !dev
+                  : ngBundlerBuilderType === "cordova" && !this._dev
                     ? PathUtils.norm(this._pkgPath, ".cordova/www")
                     : PathUtils.norm(this._pkgPath, "dist", ngBundlerBuilderType),
             env: {
@@ -80,18 +77,18 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
                 : [],
             cordovaConfig:
               ngBundlerBuilderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
-            watchScopePathSet: this._watchScopePathSet,
+            scopePathSet: this._scopePathSet,
           }),
       );
     }
 
-    if (noEmit) {
-      if (modifiedFileSet) {
-        for (const ngBundler of this.#ngBundlers!) {
-          ngBundler.markForChanges(Array.from(modifiedFileSet));
-        }
+    if (modifiedFileSet) {
+      for (const ngBundler of this.#ngBundlers!) {
+        ngBundler.markForChanges(Array.from(modifiedFileSet));
       }
+    }
 
+    if (this._noEmit) {
       this._debug(`BUILD...`);
       const buildResults = await Promise.all(
         this.#ngBundlers!.map((builder) => builder.bundleAsync()),
@@ -101,23 +98,18 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
         buildResults.mapMany((item) => Array.from(item.affectedFileSet)),
       );
       const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
-      const results = buildResults.mapMany((item) => item.results).distinct();
+      const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
 
       this._debug(`빌드 완료`);
 
       return {
+        buildMessages,
+
         watchFileSet,
         affectedFileSet,
-        buildMessages: results,
         emitFileSet,
       };
     } else {
-      if (modifiedFileSet) {
-        for (const ngBundler of this.#ngBundlers!) {
-          ngBundler.markForChanges(Array.from(modifiedFileSet));
-        }
-      }
-
       this._debug(`BUILD...`);
       const buildResults = await Promise.all(
         this.#ngBundlers!.map((builder) => builder.bundleAsync()),
@@ -127,14 +119,14 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
         buildResults.mapMany((item) => Array.from(item.affectedFileSet)),
       );
       const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
-      const results = buildResults.mapMany((item) => item.results).distinct();
+      const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
 
-      if (!dev && this.#cordova) {
+      if (!this._dev && this.#cordova) {
         this._debug("CORDOVA BUILD...");
         await this.#cordova.buildAsync(path.resolve(this._pkgPath, "dist"));
       }
 
-      if (!dev && this._pkgConf.builder?.electron) {
+      if (!this._dev && this._pkgConf.builder?.electron) {
         this._debug("ELECTRON BUILD...");
         await SdCliElectron.buildAsync({
           pkgPath: this._pkgPath,
@@ -145,9 +137,10 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
       this._debug(`빌드 완료`);
 
       return {
+        buildMessages,
+
         watchFileSet,
         affectedFileSet,
-        buildMessages: results,
         emitFileSet,
       };
     }

package/src/pkg-builders/client/{sd-ng.bundler.ts → SdNgBundler.ts}

@@ -5,7 +5,7 @@ import { fileURLToPath } from "url";
 import nodeStdLibBrowser from "node-stdlib-browser";
 import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
 import browserslist from "browserslist";
-import { SdNgBundlerContext } from "./sd-ng.bundler-context";
+import { SdNgBundlerContext } from "./SdNgBundlerContext";
 import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-result-cache";
 import {
   convertOutputFile,
@@ -26,26 +26,20 @@ import {
 import { Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
 import { CrossOrigin } from "@angular/build/src/builders/application/schema";
 import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
-import {
-  createSourcemapIgnorelistPlugin
-} from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
-import {
-  StylesheetPluginFactory
-} from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
+import { createSourcemapIgnorelistPlugin } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
+import { StylesheetPluginFactory } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
 import { SassStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/sass-language";
 import { CssStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/css-language";
-import {
-  createCssResourcePlugin
-} from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
+import { createCssResourcePlugin } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
-import { createSdNgPlugin } from "./sd-ng.plugin-creator";
-import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
-import { INpmConfig } from "../../types/common-configs.types";
-import { ISdClientBuilderCordovaConfig } from "../../types/config.types";
-import { ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
-import { ISdBuildMessage } from "../../types/build.types";
+import { createSdNgPlugin } from "./createSdNgPlugin";
+import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTimer";
+import { ISdClientBuilderCordovaConfig } from "../../types/config/ISdProjectConfig";
 import nodeModule from "module";
-import { ScopePathSet } from "../commons/scope-path";
+import { ScopePathSet } from "../commons/ScopePathSet";
+import { ISdCliNgPluginResultCache } from "../../types/plugin/ISdCliNgPluginResultCache";
+import { INpmConfig } from "../../types/common-config/INpmConfig";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 
 export class SdNgBundler {
   #logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundler"]);
@@ -72,6 +66,7 @@ export class SdNgBundler {
 
   constructor(
     private readonly _opt: {
+      watch: boolean;
       dev: boolean;
       emitOnly: boolean;
       noEmit: boolean;
@@ -81,7 +76,7 @@ export class SdNgBundler {
       env: Record<string, string> | undefined;
       external: string[];
       cordovaConfig: ISdClientBuilderCordovaConfig | undefined;
-      watchScopePathSet: ScopePathSet;
+      scopePathSet: ScopePathSet;
     },
   ) {
     this.#pkgNpmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
@@ -107,12 +102,7 @@ export class SdNgBundler {
     // this._sourceFileCache.invalidate(filePaths);
   }
 
-  async bundleAsync(): Promise<{
-    watchFileSet: Set<TNormPath>;
-    affectedFileSet: Set<TNormPath>;
-    results: ISdBuildMessage[];
-    emitFileSet: Set<TNormPath>;
-  }> {
+  async bundleAsync(): Promise<ISdBuildResult> {
     const perf = new SdCliPerformanceTimer("ng bundle");
 
     this.#debug(`get contexts...`);
@@ -134,13 +124,13 @@ export class SdNgBundler {
     });
 
     //-- results
-    const results = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
+    const buildMessages = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
 
     if (this._opt.noEmit) {
       return {
         watchFileSet: this.#ngResultCache.watchFileSet!,
         affectedFileSet: this.#ngResultCache.affectedFileSet!,
-        results,
+        buildMessages,
         emitFileSet: new Set<TNormPath>(),
       };
     } else {
@@ -173,7 +163,7 @@ export class SdNgBundler {
       await perf.run("create index.html", async () => {
         const genIndexHtmlResult = await this.#genIndexHtmlAsync(outputFiles, initialFiles);
         for (const warning of genIndexHtmlResult.warnings) {
-          results.push({
+          buildMessages.push({
             filePath: undefined,
             line: undefined,
             char: undefined,
@@ -184,7 +174,7 @@ export class SdNgBundler {
           });
         }
         for (const error of genIndexHtmlResult.errors) {
-          results.push({
+          buildMessages.push({
             filePath: undefined,
             line: undefined,
             char: undefined,
@@ -228,7 +218,7 @@ export class SdNgBundler {
             );
             assetFiles.push(...serviceWorkerResult.assetFiles);
           } catch (err) {
-            results.push({
+            buildMessages.push({
               filePath: undefined,
               line: undefined,
               char: undefined,
@@ -280,7 +270,7 @@ export class SdNgBundler {
           PathUtils.norm(this.#indexHtmlFilePath),
         ]),
         affectedFileSet: this.#ngResultCache.affectedFileSet!,
-        results,
+        buildMessages,
         emitFileSet: emitFileSet,
       };
     }
@@ -530,12 +520,13 @@ export class SdNgBundler {
         createSourcemapIgnorelistPlugin(),
         createSdNgPlugin({
           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.#ngResultCache,
-          watchScopePathSet: this._opt.watchScopePathSet,
+          scopePathSet: this._opt.scopePathSet,
         }),
         ...(this._opt.builderType === "electron"
           ? []

package/src/pkg-builders/client/{sd-ng.bundler-context.ts → SdNgBundlerContext.ts}

@@ -1,7 +1,7 @@
 import esbuild from "esbuild";
 import path from "path";
 import { SdLogger } from "@simplysm/sd-core-node";
-import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
+import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
 
 // import { InitialFileRecord } from "@angular/build/src/tools/esbuild/bundler-context";
 
@@ -22,8 +22,7 @@ export class SdNgBundlerContext {
   constructor(
     private readonly _pkgPath: string,
     private readonly _esbuildOptions: esbuild.BuildOptions,
-  ) {
-  }
+  ) {}
 
   async bundleAsync() {
     if (this.#context == null) {
@@ -36,12 +35,10 @@ export class SdNgBundlerContext {
       this.#debug(`rebuild...`);
       esbuildResult = await this.#context.rebuild();
       this.#debug(`rebuild completed`);
-    }
-    catch (err) {
+    } catch (err) {
       if ("warnings" in err || "errors" in err) {
         esbuildResult = err;
-      }
-      else {
+      } else {
         throw err;
       }
     }
@@ -120,8 +117,9 @@ export class SdNgBundlerContext {
 
   #debug(...msg: any[]): void {
     this.#logger.debug(
-      `[${path.basename(this._pkgPath)}] (${Object.keys(this._esbuildOptions.entryPoints as Record<string, any>)
-        .join(", ")})`,
+      `[${path.basename(this._pkgPath)}] (${Object.keys(
+        this._esbuildOptions.entryPoints as Record<string, any>,
+      ).join(", ")})`,
       ...msg,
     );
   }

package/src/pkg-builders/client/{sd-ng.plugin-creator.ts → createSdNgPlugin.ts}

@@ -3,21 +3,22 @@ import path from "path";
 import os from "os";
 import { JavaScriptTransformer } from "@angular/build/src/tools/esbuild/javascript-transformer";
 import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
-import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
-import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
-import { ISdTsCompilerResult } from "../../types/ts-compiler.types";
-import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
-import { ScopePathSet } from "../commons/scope-path";
+import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTimer";
+import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
+import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
+import { ScopePathSet } from "../commons/ScopePathSet";
+import { ISdCliNgPluginResultCache } from "../../types/plugin/ISdCliNgPluginResultCache";
+import { ISdTsCompilerResult } from "../../types/build/ISdTsCompilerResult";
 
 export function createSdNgPlugin(conf: {
   pkgPath: TNormPath;
+  watch: boolean;
   dev: boolean;
   emitOnly: boolean;
   noEmit: boolean;
   modifiedFileSet: Set<TNormPath>;
   result: ISdCliNgPluginResultCache;
-  watchScopePathSet: ScopePathSet;
+  scopePathSet: ScopePathSet;
 }): esbuild.Plugin {
   let perf: SdCliPerformanceTimer;
   const logger = SdLogger.get(["simplysm", "sd-cli", "createSdNgPlugin"]);
@@ -32,11 +33,12 @@ export function createSdNgPlugin(conf: {
       const tsCompiler = new SdTsCompiler({
         pkgPath: conf.pkgPath,
         additionalOptions: { declaration: false },
+        isWatchMode: conf.watch,
         isDevMode: conf.dev,
         isForBundle: true,
         isEmitOnly: conf.emitOnly,
         isNoEmit: conf.noEmit,
-        watchScopePathSet: conf.watchScopePathSet,
+        scopePathSet: conf.scopePathSet,
       });
 
       let tsCompileResult: ISdTsCompilerResult;
@@ -53,8 +55,6 @@ export function createSdNgPlugin(conf: {
         Math.floor((os.cpus().length * 2) / 3),
       );
 
-      // let cssStore = new Map<TNormPath, Buffer>();
-
       //---------------------------
 
       build.onStart(async () => {
@@ -67,8 +67,6 @@ export function createSdNgPlugin(conf: {
 
           tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
 
-          // cssStore.clear();
-
           conf.result.watchFileSet = tsCompileResult.watchFileSet;
           conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
 
@@ -76,6 +74,7 @@ export function createSdNgPlugin(conf: {
             tsCompileResult.messages,
             conf.pkgPath,
           );
+
           //-- return err/warn
           return {
             errors: [
@@ -97,83 +96,9 @@ export function createSdNgPlugin(conf: {
         return res;
       });
 
-      /*build.onResolve({ filter: /\.css$/ }, (args) => {
-        if (args.path.startsWith("sd-css-asset:")) return;
-        return {
-          path: path.resolve(args.resolveDir, args.path),
-          namespace: "sd-css",
-        };
-      });
-
-      build.onLoad({ filter: /\.css$/, namespace: "sd-css" }, async (args) => {
-        const code = /!* language=javascript *!/ `
-import href from "sd-css-asset:${PathUtils.posix(args.path)}"
-(function __sdEnsureStyle(href) {
-  let link = document.querySelector('link[data-sd-style="' + href + '"]');
-  if (link) return;
-  link = document.createElement('link');
-  link.rel = 'stylesheet';
-  link.setAttribute('data-sd-style', href);
-  link.href = href;
-  document.head.appendChild(link);
-})(href);`;
-
-        if (FsUtils.exists(args.path)) {
-          const css = await FsUtils.readFileBufferAsync(args.path);
-          cssStore.set(PathUtils.norm(args.path), css);
-        }
-
-        return { contents: code, loader: "js", resolveDir: path.dirname(args.path) };
-      });
-
-      build.onResolve({ filter: /^sd-css-asset:/ }, (args) => {
-        const real = args.path.replace(/^sd-css-asset:/, "");
-        return { path: real, namespace: "sd-css-asset" };
-      });
-
-      build.onLoad({ filter: /\.css$/, namespace: "sd-css-asset" }, (args) => {
-        const cssContent =
-          cssStore.get(PathUtils.norm(args.path)) ??
-          cssStore.get(PathUtils.norm(args.path.replace(/[\\\/]src[\\\/]/, "\\dist\\")));
-        if (cssContent == null) {
-          return {
-            errors: [
-              {
-                location: null,
-                text: `Missing CSS for ${PathUtils.norm(args.path)}`,
-              },
-            ],
-          };
-        }
-
-        return {
-          contents: cssContent,
-          loader: "file",
-          resolveDir: path.dirname(args.path),
-        };
-      });*/
-
       build.onLoad({ filter: /\.ts$/ }, async (args) => {
         const emittedFiles = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path));
 
-        /*try {
-          const css = emittedFiles?.single((item) => Boolean(item.outAbsPath?.endsWith(".css")));
-          if (css) {
-            cssStore.set(PathUtils.norm(css.outAbsPath!), Buffer.from(css.text));
-          }
-        } catch (err) {
-          return {
-            errors: [
-              {
-                text:
-                  (err?.message ?? String(err)) +
-                  "\n" +
-                  emittedFiles?.map((item) => "- " + item.outAbsPath).join("\n"),
-              },
-            ],
-          };
-        }*/
-
         const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
         if (output != null) {
           return { contents: output, loader: "js" };
@@ -210,10 +135,6 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
 
         try {
           const newContents = await perf.run("esbuild transform:js:*.js", async () => {
-            /*return /\.min\.[cm]?js$/.test(args.path)
-              ? await FsUtils.readFileBufferAsync(args.path)
-              : await javascriptTransformer.transformFile(args.path, false, sideEffects);*/
-
             const contents = await FsUtils.readFileBufferAsync(args.path);
 
             return await javascriptTransformer.transformData(
@@ -232,10 +153,6 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
           };
         } catch (err) {
           return { errors: [{ text: err?.message ?? String(err) }] };
-          /*return {
-            contents: `console.error(${JSON.stringify(err.message)});`,
-            loader: "js",
-          };*/
         }
       });
 

package/src/pkg-builders/commons/{scope-path.ts → ScopePathSet.ts}

@@ -3,8 +3,8 @@ import { PathUtils, TNormPath } from "@simplysm/sd-core-node";
 export class ScopePathSet {
   #data: Set<TNormPath>;
 
-  constructor(arr?: TNormPath[]) {
-    this.#data = new Set(arr);
+  constructor(arrOrSet?: TNormPath[] | Set<TNormPath>) {
+    this.#data = arrOrSet instanceof Set ? arrOrSet : new Set(arrOrSet);
   }
 
   inScope(filePath: string) {
@@ -14,4 +14,4 @@ export class ScopePathSet {
   toArray() {
     return Array.from(this.#data);
   }
-}
+}

package/src/pkg-builders/commons/SdBuildRunnerBase.ts

@@ -0,0 +1,47 @@
+import { FsUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
+import path from "path";
+import { ISdProjectConfig, TSdPackageConfig } from "../../types/config/ISdProjectConfig";
+import { ScopePathSet } from "./ScopePathSet";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+
+export abstract class SdBuildRunnerBase<T extends "server" | "library" | "client"> {
+  protected abstract _logger: SdLogger;
+
+  protected _pkgName: string;
+  protected _pkgConf: TSdPackageConfig<T>;
+
+  protected _scopePathSet: ScopePathSet;
+
+  constructor(
+    protected _pkgPath: TNormPath,
+    protected _projConf: ISdProjectConfig,
+    protected _watch: boolean,
+    protected _dev: boolean,
+    protected _emitOnly?: boolean,
+    protected _noEmit?: boolean,
+    scopePathSet?: Set<TNormPath>,
+  ) {
+    this._pkgName = path.basename(_pkgPath);
+    this._pkgConf = _projConf.packages[this._pkgName] as TSdPackageConfig<T>;
+
+    this._scopePathSet = new ScopePathSet(scopePathSet);
+  }
+
+  async rebuildAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
+    if (!modifiedFileSet && !this._noEmit) {
+      const distPath = path.resolve(this._pkgPath, "dist");
+      if (FsUtils.exists(distPath)) {
+        this._debug("dist 초기화...");
+        FsUtils.remove(distPath);
+      }
+    }
+
+    return await this._runAsync(modifiedFileSet);
+  }
+
+  protected abstract _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
+
+  protected _debug(msg: string): void {
+    this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
+  }
+}

package/src/pkg-builders/lib/{sd-cli-db-context.file-generator.ts → SdCliDbContextFileGenerator.ts}

@@ -1,7 +1,7 @@
 import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 import { StringUtils } from "@simplysm/sd-core-common";
-import { INpmConfig } from "../../types/common-configs.types";
+import { INpmConfig } from "../../types/common-config/INpmConfig";
 
 export class SdCliDbContextFileGenerator {
   cachedHash?: string;

package/src/pkg-builders/lib/{sd-js-lib.build-runner.ts → SdJsLibBuildRunner.ts}

@@ -1,29 +1,20 @@
-import {
-  FsUtils,
-  ISdFsWatcherChangeInfo,
-  PathUtils,
-  SdLogger,
-  TNormPath,
-} from "@simplysm/sd-core-node";
+import { FsUtils, PathUtils, SdLogger, TNormPath } from "@simplysm/sd-core-node";
 import path from "path";
-import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-// import { TSdLintWorkerType } from "../../types/workers.type";
 import { ESLint } from "eslint";
-import { BuildRunnerBase, IBuildRunnerRunResult } from "../commons/build-runner.base";
+import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
 
-export class SdJsLibBuildRunner extends BuildRunnerBase<"library"> {
+export class SdJsLibBuildRunner extends SdBuildRunnerBase<"library"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdJsLibBuildRunner"]);
 
-  protected override async _runAsync(
-    dev: boolean,
-    emitOnly: boolean,
-    noEmit: boolean,
-    modifiedFileSet?: Set<TNormPath>,
-  ): Promise<IBuildRunnerRunResult> {
-    if (emitOnly) {
+  protected override async _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
+    if (this._emitOnly) {
       return {
-        affectedFileSet: new Set(),
         buildMessages: [],
+
+        watchFileSet: new Set(),
+        affectedFileSet: new Set(),
         emitFileSet: new Set(),
       };
     }
@@ -44,24 +35,14 @@ export class SdJsLibBuildRunner extends BuildRunnerBase<"library"> {
     this._debug(`LINT 완료`);
 
     return {
-      affectedFileSet: filePathSet,
       buildMessages: messages,
+
+      watchFileSet: filePathSet,
+      affectedFileSet: filePathSet,
       emitFileSet: new Set(),
     };
   }
 
-  protected override _getModifiedFileSet(changeInfos: ISdFsWatcherChangeInfo[]) {
-    return new Set(
-      changeInfos
-        .filter(
-          (item) =>
-            FsUtils.exists(item.path) &&
-            PathUtils.isChildPath(item.path, path.resolve(this._pkgPath, "src")),
-        )
-        .map((item) => item.path),
-    );
-  }
-
   async #lintAsync(fileSet: Set<string>) {
     const lintFilePaths = Array.from(fileSet)
       .filter((item) => PathUtils.isChildPath(item, path.resolve(this._pkgPath, "src")))