@simplysm/sd-cli 11.0.9 → 11.0.11

package/src/builders/SdCliTsLibBuilder.ts

@@ -1,17 +1,22 @@
-import {FsUtil, Logger, SdFsWatcher} from "@simplysm/sd-core-node";
+import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
 import path from "path";
-import {ISdCliBuilderResult} from "../commons";
+import {ISdCliBuilderResult, ISdCliConfig, ISdCliLibPackageConfig, ISdCliPackageBuildResult} from "../commons";
 import {EventEmitter} from "events";
 import {SdTsCompiler} from "../build-tools/SdTsCompiler";
 import {SdLinter} from "../build-tools/SdLinter";
 import {FunctionQueue} from "@simplysm/sd-core-common";
+import {SdCliIndexFileGenerator} from "../build-tools/SdCliIndexFileGenerator";
 
 export class SdCliTsLibBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
 
-  public constructor(private readonly _pkgPath: string,
-                     private readonly _withLint: boolean) {
+  private readonly _pkgConf: ISdCliLibPackageConfig;
+  private _builder?: SdTsCompiler;
+
+  public constructor(private readonly _projConf: ISdCliConfig,
+                     private readonly _pkgPath: string) {
     super();
+    this._pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdCliLibPackageConfig;
   }
 
   public override on(event: "change", listener: () => void): this;
@@ -25,72 +30,75 @@ export class SdCliTsLibBuilder extends EventEmitter {
     this._debug("dist 초기화...");
     await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
 
-    this._debug(`BUILD 준비...`);
-    const builder = new SdTsCompiler({
-      pkgPath: this._pkgPath,
-      emit: true,
-      emitDts: true,
-      globalStyle: true
-    });
-
-    this._debug(`BUILD & CHECK...`);
-    const checkResult = await builder.buildAsync();
-
-    this._debug("LINT...");
-    const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, builder.program);
+    this._debug("GEN index.ts...");
+    await SdCliIndexFileGenerator.runAsync(this._pkgPath, this._pkgConf.polyfills);
 
-    this._debug(`빌드 완료`);
-    return {
-      affectedFilePaths: checkResult.affectedFilePaths,
-      buildResults: [...checkResult.results, ...lintResults]
-    };
+    return await this._runAsync();
   }
 
   public async watchAsync(): Promise<void> {
+    this.emit("change");
+
     this._debug("dist 초기화...");
     await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
 
-    this._debug(`BUILD 준비...`);
-    const builder = new SdTsCompiler({
-      pkgPath: this._pkgPath,
-      emit: true,
-      emitDts: true,
-      globalStyle: true
-    });
+    this._debug("WATCH GEN index.ts...");
+    await SdCliIndexFileGenerator.watchAsync(this._pkgPath, this._pkgConf.polyfills);
+
+    const result = await this._runAsync();
+    this.emit("complete", result);
 
     this._debug("WATCH...");
     const fnQ = new FunctionQueue();
     const watcher = SdFsWatcher
-      .watch([
-        path.resolve(this._pkgPath, "src/**/*.*")
-      ], {
-        ignoreInitial: false
-      })
-      .onChange({
-        delay: 100,
-      }, (changeInfos) => {
-        builder.markChanges(changeInfos.map((item) => item.path));
+      .watch(result.watchFilePaths)
+      .onChange({delay: 100,}, (changeInfos) => {
+        this._builder!.markChanges(changeInfos.map((item) => item.path));
 
         fnQ.runLast(async () => {
           this.emit("change");
 
-          this._debug(`CHECK & BUILD...`);
-          const checkResult = await builder.buildAsync();
-
-          this._debug("LINT...");
-          const lintResults = !this._withLint ? [] : await SdLinter.lintAsync(checkResult.affectedFilePaths, builder.program);
+          const watchResult = await this._runAsync();
+          this.emit("complete", watchResult);
 
-          this._debug(`빌드 완료`);
-          this.emit("complete", {
-            affectedFilePaths: checkResult.affectedFilePaths,
-            buildResults: [...checkResult.results, ...lintResults]
-          });
-
-          watcher.add(builder.program.getSourceFiles().map((item) => item.fileName).distinct());
+          watcher.add(watchResult.watchFilePaths);
         });
       });
   }
 
+  private async _runAsync(): Promise<{
+    watchFilePaths: string[];
+    affectedFilePaths: string[];
+    buildResults: ISdCliPackageBuildResult[];
+  }> {
+    this._debug(`BUILD 준비...`);
+    this._builder = this._builder ?? new SdTsCompiler({
+      pkgPath: this._pkgPath,
+      emit: true,
+      emitDts: true,
+      globalStyle: true
+    });
+
+    this._debug(`BUILD && CHECK...`);
+    const buildAndCheckResult = await this._builder.buildAsync();
+
+    this._debug("LINT...");
+    const lintResults = await SdLinter.lintAsync(buildAndCheckResult.affectedFilePaths, this._builder.program);
+
+    this._debug(`빌드 완료`);
+    const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
+      .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
+    const watchFilePaths = buildAndCheckResult.filePaths.filter(item =>
+      PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
+      localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
+    );
+    return {
+      watchFilePaths,
+      affectedFilePaths: buildAndCheckResult.affectedFilePaths,
+      buildResults: [...buildAndCheckResult.results, ...lintResults]
+    };
+  }
+
   private _debug(msg: string): void {
     this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
   }

package/src/commons.ts

@@ -27,8 +27,7 @@ export interface ISdCliBuildClusterReqMessage {
   cmd: "watch" | "build";
   projConf: ISdCliConfig;
   pkgPath: string;
-  builderKey?: "web" | "electron";
-  withLint: boolean;
+  // builderKey?: "web" | "electron";
 }
 
 export interface ISdCliBuildClusterResMessage {

package/src/entry/SdCliElectron.ts

@@ -13,7 +13,7 @@ export class SdCliElectron {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "runAsync"]);
 
     const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
-    const electronPath = path.resolve(pkgPath, ".cache/dev/electron/src");
+    const electronPath = path.resolve(pkgPath, ".electron/dev/src");
 
     logger.log("설정 가져오기...");
     const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;
@@ -62,8 +62,8 @@ export class SdCliElectron {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliElectron", "buildForDevAsync"]);
 
     const pkgPath = path.resolve(process.cwd(), `packages/${opt.pkgName}`);
-    const electronPath = path.resolve(pkgPath, ".cache/dev/electron/src");
-    const electronDistPath = path.resolve(pkgPath, ".cache/dev/electron/dist");
+    const electronPath = path.resolve(pkgPath, ".electron/dev/src");
+    const electronDistPath = path.resolve(pkgPath, ".electron/dev/dist");
 
     logger.log("설정 가져오기...");
     const projConf = (await import(pathToFileURL(path.resolve(process.cwd(), opt.confFileRelPath)).href)).default(true, opt.optNames) as ISdCliConfig;

package/src/entry/SdCliProject.ts

@@ -13,8 +13,7 @@ import cp from "child_process";
 import {fileURLToPath, pathToFileURL} from "url";
 import {SdCliBuildResultUtil} from "../utils/SdCliBuildResultUtil";
 import semver from "semver";
-import {NotImplementError, StringUtil, Wait} from "@simplysm/sd-core-common";
-import {SdCliIndexFileGenerator} from "../build-tools/SdCliIndexFileGenerator";
+import {NeverEntryError, StringUtil, Wait} from "@simplysm/sd-core-common";
 import {SdStorage} from "@simplysm/sd-storage";
 import {SdCliLocalUpdate} from "./SdCliLocalUpdate";
 
@@ -23,7 +22,6 @@ export class SdCliProject {
     confFileRelPath: string;
     optNames: string[];
     pkgNames: string[];
-    withLint: boolean;
   }): Promise<void> {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "watchAsync"]);
 
@@ -57,14 +55,6 @@ export class SdCliProject {
       throw new Error("패키지를 찾을 수 없습니다. (" + notExistsPkgs.join(", ") + ")");
     }
 
-    logger.debug("라이브러리 INDEX 파일 생성...");
-    await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf.packages[path.basename(pkgPath)]!;
-      if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
-        await SdCliIndexFileGenerator.watchAsync(pkgPath, pkgConf.polyfills);
-      }
-    });
-
     logger.debug("빌드 프로세스 준비...");
     const cluster = await this._prepareClusterAsync();
 
@@ -202,11 +192,11 @@ export class SdCliProject {
       if (pkgConf.type === "client") {
         const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
         await builderKeys.parallelAsync(async (builderKey) => {
-          await this._runCommandAsync(cluster, "watch", projConf, pkgPath, opt.withLint, builderKey);
+          await this._runCommandAsync(cluster, "watch", projConf, pkgPath, builderKey);
         });
       }
       else {
-        await this._runCommandAsync(cluster, "watch", projConf, pkgPath, opt.withLint);
+        await this._runCommandAsync(cluster, "watch", projConf, pkgPath);
       }
     });
 
@@ -221,7 +211,6 @@ export class SdCliProject {
     confFileRelPath: string;
     optNames: string[];
     pkgNames: string[];
-    withLint: boolean;
   }): Promise<void> {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "buildAsync"]);
 
@@ -244,14 +233,6 @@ export class SdCliProject {
     logger.debug("프로젝트 및 패키지 버전 설정...");
     await this._upgradeVersionAsync(projNpmConf, allPkgPaths);
 
-    logger.debug("라이브러리 INDEX 파일 생성...");
-    await pkgPaths.parallelAsync(async (pkgPath) => {
-      const pkgConf = projConf.packages[path.basename(pkgPath)]!;
-      if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
-        await SdCliIndexFileGenerator.runAsync(pkgPath, pkgConf.polyfills);
-      }
-    });
-
     logger.debug("빌드 프로세스 준비...");
     const cluster = await this._prepareClusterAsync();
 
@@ -262,11 +243,11 @@ export class SdCliProject {
         if (pkgConf.type === "client") {
           const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
           return (await builderKeys.parallelAsync(async (builderKey) => {
-            return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint, builderKey);
+            return await this._runCommandAsync(cluster, "build", projConf, pkgPath, builderKey);
           })).mapMany();
         }
         else {
-          return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint);
+          return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
         }
       })
     ).mapMany();
@@ -282,7 +263,6 @@ export class SdCliProject {
     confFileRelPath: string;
     optNames: string[];
     pkgNames: string[];
-    withLint: boolean;
   }): Promise<void> {
     const logger = Logger.get(["simplysm", "sd-cli", "SdCliProject", "publishAsync"]);
 
@@ -321,14 +301,6 @@ export class SdCliProject {
 
     // 빌드
     if (!opt.noBuild) {
-      logger.debug("라이브러리 INDEX 파일 생성...");
-      await pkgPaths.parallelAsync(async (pkgPath) => {
-        const pkgConf = projConf.packages[path.basename(pkgPath)]!;
-        if (pkgConf.type === "library" && FsUtil.exists(path.resolve(pkgPath, "tsconfig.json"))) {
-          await SdCliIndexFileGenerator.runAsync(pkgPath, pkgConf.polyfills);
-        }
-      });
-
       logger.debug("빌드 프로세스 준비...");
       const cluster = await this._prepareClusterAsync();
 
@@ -339,11 +311,11 @@ export class SdCliProject {
           if (pkgConf.type === "client") {
             const builderKeys = Object.keys(pkgConf.builder ?? {web: {}});
             return (await builderKeys.parallelAsync(async (builderKey) => {
-              return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint, builderKey);
+              return await this._runCommandAsync(cluster, "build", projConf, pkgPath, builderKey);
             })).mapMany();
           }
           else {
-            return await this._runCommandAsync(cluster, "build", projConf, pkgPath, opt.withLint);
+            return await this._runCommandAsync(cluster, "build", projConf, pkgPath);
           }
         })
       ).mapMany();
@@ -417,7 +389,7 @@ export class SdCliProject {
       await ftp.closeAsync();
     }
     else {
-      throw new NotImplementError();
+      throw new NeverEntryError();
     }
   }
 
@@ -536,9 +508,9 @@ export class SdCliProject {
     });
   }
 
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<void>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[]>;
-  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", projConf: ISdCliConfig, pkgPath: string, withLint: boolean, builderKey?: string): Promise<ISdCliPackageBuildResult[] | void> {
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<void>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "build", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<ISdCliPackageBuildResult[]>;
+  private static async _runCommandAsync(cluster: cp.ChildProcess, cmd: "watch" | "build", projConf: ISdCliConfig, pkgPath: string, builderKey?: string): Promise<ISdCliPackageBuildResult[] | void> {
     return await new Promise<ISdCliPackageBuildResult[] | void>((resolve) => {
       const cb = (message: ISdCliBuildClusterResMessage): void => {
         if (cmd === "watch" && message.type === "ready" && message.req.cmd === cmd && message.req.pkgPath === pkgPath) {
@@ -556,8 +528,7 @@ export class SdCliProject {
         cmd,
         projConf,
         pkgPath,
-        builderKey,
-        withLint
+        builderKey
       } as ISdCliBuildClusterReqMessage);
     });
   }

package/src/index.ts

@@ -1,5 +1,6 @@
 export * from "./build-tools/SdCliCordova";
 export * from "./build-tools/SdCliIndexFileGenerator";
+export * from "./build-tools/SdCliNgRoutesFileGenerator";
 export * from "./build-tools/SdLinter";
 export * from "./build-tools/SdNgBundler";
 export * from "./build-tools/SdTsBundler";
@@ -13,3 +14,5 @@ export * from "./entry/SdCliElectron";
 export * from "./entry/SdCliLocalUpdate";
 export * from "./entry/SdCliProject";
 export * from "./utils/SdCliBuildResultUtil";
+export * from "./utils/SdMemoryLoadResultCache";
+export * from "./utils/SdSourceFileCache";

package/src/sd-cli.ts

@@ -57,11 +57,6 @@ const argv = (
             string: true,
             array: true,
             describe: "수행할 패키지 설정"
-          },
-          withoutLint: {
-            type: "boolean",
-            default: false,
-            describe: "린트 수행 여부"
           }
         })
     )
@@ -83,11 +78,6 @@ const argv = (
             string: true,
             array: true,
             describe: "수행할 패키지 설정"
-          },
-          withoutLint: {
-            type: "boolean",
-            default: false,
-            describe: "린트 수행 여부"
           }
         })
     )
@@ -114,11 +104,6 @@ const argv = (
             type: "string",
             array: true,
             describe: "수행할 패키지 설정"
-          },
-          withoutLint: {
-            type: "boolean",
-            default: false,
-            describe: "린트 수행 여부"
           }
         })
     )
@@ -212,8 +197,7 @@ else if (argv._[0] === "watch") {
     .watchAsync({
       confFileRelPath: argv.config ?? "simplysm.cjs",
       optNames: argv.options ?? [],
-      pkgNames: argv.packages ?? [],
-      withLint: argv.withoutLint !== true
+      pkgNames: argv.packages ?? []
     });
 }
 else if (argv._[0] === "build") {
@@ -221,8 +205,7 @@ else if (argv._[0] === "build") {
     .buildAsync({
       confFileRelPath: argv.config ?? "simplysm.cjs",
       optNames: argv.options ?? [],
-      pkgNames: argv.packages ?? [],
-      withLint: argv.withoutLint !== true
+      pkgNames: argv.packages ?? []
     });
 }
 else if (argv._[0] === "publish") {
@@ -231,8 +214,7 @@ else if (argv._[0] === "publish") {
       noBuild: argv.noBuild,
       confFileRelPath: argv.config ?? "simplysm.cjs",
       optNames: argv.options ?? [],
-      pkgNames: argv.packages ?? [],
-      withLint: argv.withoutLint !== true
+      pkgNames: argv.packages ?? []
     });
 }
 else if (argv._[0] === "run-electron") {

package/src/utils/SdMemoryLoadResultCache.ts

@@ -0,0 +1,44 @@
+import {MemoryLoadResultCache} from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
+import {OnLoadResult} from 'esbuild';
+import path from "path";
+
+export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
+  loadResults = new Map<string, OnLoadResult>();
+  fileDependencies = new Map<string, Set<string>>();
+
+  override get(getPath: string): OnLoadResult | undefined {
+    return this.loadResults.get(getPath);
+  }
+
+  override put(putPath: string, result: OnLoadResult): Promise<void> {
+    this.loadResults.set(putPath, result);
+    if (result.watchFiles) {
+      for (const watchFile of result.watchFiles) {
+        // Normalize the watch file path to ensure OS consistent paths
+        const watchFilePath = path.resolve(watchFile);
+        let affected = this.fileDependencies.get(watchFilePath);
+        if (affected === undefined) {
+          affected = new Set();
+          this.fileDependencies.set(watchFilePath, affected);
+        }
+        affected.add(putPath);
+      }
+    }
+
+    return Promise.resolve();
+  }
+
+  override invalidate(invalidatePath: string): boolean {
+    const affected = this.fileDependencies.get(invalidatePath);
+    let found = false;
+
+    if (affected) {
+      affected.forEach((a) => (found ||= this.loadResults.delete(a)));
+      this.fileDependencies.delete(invalidatePath);
+    }
+
+    found ||= this.loadResults.delete(invalidatePath);
+
+    return found;
+  }
+}

package/src/utils/SdSourceFileCache.ts

@@ -0,0 +1,6 @@
+import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
+import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
+
+export class SdSourceFileCache extends SourceFileCache {
+  override readonly loadResultCache = new SdMemoryLoadResultCache();
+}