@simplysm/sd-cli 12.11.8 → 12.11.10

package/src/pkg-builders/client/sd-client.build-runner.ts

@@ -10,6 +10,7 @@ import { INpmConfig } from "../../types/common-configs.types";
 export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
 
+  #routeGenerator = new SdCliNgRoutesFileGenerator();
   #ngBundlers?: SdNgBundler[];
   #cordova?: SdCliCordova;
 
@@ -17,6 +18,7 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
     dev: boolean,
     modifiedFileSet?: Set<TNormPath>,
   ): Promise<IBuildRunnerRunResult> {
+    // 최초
     if (!modifiedFileSet) {
       this._debug("GEN .config...");
       const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
@@ -27,14 +29,14 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
       if ("@angular/router" in (npmConf.dependencies ?? {})) {
         if (!dev) {
           this._debug(`GEN routes.ts...`);
-          SdCliNgRoutesFileGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
-        }
-        else {
+          this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
+        } else {
           this._debug(`Watch for GEN routes.ts...`);
-          SdCliNgRoutesFileGenerator.watch(this._pkgPath, this._pkgConf.noLazyRoute);
+          this.#routeGenerator.watch(this._pkgPath, this._pkgConf.noLazyRoute);
         }
       }
     }
+    // watch
     else {
       for (const ngBundler of this.#ngBundlers!) {
         ngBundler.markForChanges(Array.from(modifiedFileSet));
@@ -45,7 +47,7 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
       | "web"
       | "electron"
       | "cordova"
-      )[];
+    )[];
     if (this._pkgConf.builder?.cordova && !this.#cordova) {
       this._debug("CORDOVA 준비...");
       this.#cordova = new SdCliCordova({
@@ -80,18 +82,21 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
               ngBundlerBuilderType === "electron"
                 ? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
                 : [],
-            cordovaConfig: ngBundlerBuilderType === "cordova"
-              ? this._pkgConf.builder!.cordova
-              : undefined,
+            cordovaConfig:
+              ngBundlerBuilderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
             watchScopePathSet: this._watchScopePathSet,
           }),
       );
     }
 
     this._debug(`BUILD...`);
-    const buildResults = await Promise.all(this.#ngBundlers.map((builder) => builder.bundleAsync()));
+    const buildResults = await Promise.all(
+      this.#ngBundlers.map((builder) => builder.bundleAsync()),
+    );
     const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
-    const affectedFileSet = new Set(buildResults.mapMany((item) => Array.from(item.affectedFileSet)));
+    const affectedFileSet = new Set(
+      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();
 

package/src/pkg-builders/client/sd-ng.bundler.ts

@@ -253,7 +253,7 @@ export class SdNgBundler {
       }
       for (const assetFile of assetFiles) {
         const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
-        const currHash = FsUtils.hash(assetFile.source);
+        const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
         if (prevHash !== currHash) {
           FsUtils.copy(assetFile.source, path.resolve(this._opt.outputPath, assetFile.destination));
           this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);

package/src/pkg-builders/commons/build-runner.base.ts

@@ -12,7 +12,9 @@ import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.types";
 import path from "path";
 import { ScopePathSet } from "./scope-path";
 
-export abstract class BuildRunnerBase<T extends "server" | "library" | "client"> extends EventEmitter {
+export abstract class BuildRunnerBase<
+  T extends "server" | "library" | "client",
+> extends EventEmitter {
   protected abstract _logger: SdLogger;
 
   protected _pkgName: string;
@@ -38,8 +40,8 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
     this._pkgConf = projConf.packages[this._pkgName] as TSdPackageConfig<T>;
 
     const workspacePaths = workspaceGlobs
-      .map(item => PathUtils.posix(this._pkgPath, "../../", item))
-      .mapMany(item => FsUtils.glob(item));
+      .map((item) => PathUtils.posix(this._pkgPath, "../../", item))
+      .mapMany((item) => FsUtils.glob(item));
     const localUpdatePaths = Object.keys(projConf.localUpdates ?? {}).mapMany((key) =>
       FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key)),
     );
@@ -81,10 +83,12 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
     this.emit("complete", res);
 
     this._debug("WATCH...");
-    let lastWatchFileSet = result.watchFileSet;
-    SdFsWatcher.watch(this._watchScopePathSet.toArray())
-      .onChange({ delay: 100 }, async (changeInfos) => {
+    let lastWatchFileSet = result.watchFileSet!;
+    SdFsWatcher.watch(this._watchScopePathSet.toArray()).onChange(
+      { delay: 100 },
+      async (changeInfos) => {
         const modifiedFileSet = this._getModifiedFileSet(changeInfos, lastWatchFileSet);
+
         if (modifiedFileSet.size < 1) return;
 
         this.emit("change");
@@ -93,9 +97,8 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
         try {
           watchResult = await this._runAsync(!this._pkgConf.forceProductionMode, modifiedFileSet);
 
-          lastWatchFileSet = watchResult.watchFileSet;
-        }
-        catch (err) {
+          lastWatchFileSet = watchResult.watchFileSet!;
+        } catch (err) {
           watchResult = {
             affectedFileSet: modifiedFileSet,
             buildMessages: [
@@ -119,7 +122,8 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
           buildMessages: watchResult.buildMessages,
           emitFileSet: watchResult.emitFileSet,
         });
-      });
+      },
+    );
   }
 
   protected _getModifiedFileSet(
@@ -127,11 +131,10 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
     lastWatchFileSet?: Set<TNormPath>,
   ) {
     return new Set(
-      (
-        lastWatchFileSet
-          ? changeInfos.filter((item) => lastWatchFileSet.has(item.path))
-          : changeInfos
-      ).map(item => item.path),
+      (lastWatchFileSet
+        ? changeInfos.filter((item) => lastWatchFileSet.has(item.path))
+        : changeInfos
+      ).map((item) => item.path),
     );
   }
 
@@ -150,4 +153,4 @@ export interface IBuildRunnerRunResult {
   affectedFileSet: Set<TNormPath>;
   buildMessages: ISdBuildMessage[];
   emitFileSet: Set<TNormPath>;
-}
+}

package/src/pkg-builders/lib/sd-cli-db-context.file-generator.ts

@@ -1,21 +1,23 @@
-import { FsUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
+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";
 
 export class SdCliDbContextFileGenerator {
-  static watch(pkgPath: string, kebabName: string) {
+  cachedHash?: string;
+
+  watch(pkgPath: string, kebabName: string) {
     const targetFilePath = path.resolve(pkgPath, `src/${kebabName}.ts`);
-    let cache = FsUtils.exists(targetFilePath) ? FsUtils.readFile(targetFilePath) : undefined;
+    this.cachedHash = FsUtils.exists(targetFilePath) ? HashUtils.get(FsUtils.readFile(targetFilePath)) : undefined;
 
     SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
-      cache = this.run(pkgPath, kebabName, cache);
+      this.run(pkgPath, kebabName);
     });
 
-    cache = this.run(pkgPath, kebabName, cache);
+    this.run(pkgPath, kebabName);
   }
 
-  static run(pkgPath: string, kebabName: string, cache?: string): string {
+  run(pkgPath: string, kebabName: string) {
     const npmConfig = FsUtils.readJson(path.resolve(pkgPath, "package.json")) as INpmConfig;
     const useExt = npmConfig.dependencies?.["@simplysm/sd-orm-common-ext"] != null;
 
@@ -68,7 +70,7 @@ export class SdCliDbContextFileGenerator {
           useExt &&
           [
             "systemDataLog",
-            "systemErrorLog",
+            "systemLog",
             "authentication",
             "user",
             "userConfig",
@@ -145,9 +147,10 @@ ${viewTexts.length > 0 ? "\n  // Views\n" + viewTexts.map((item) => "  " + item)
 ${spTexts.length > 0 ? "\n  // StoredProcedures\n" + spTexts.map((item) => "  " + item).join("\n") : ""}
 }
 `.trim();
-    if (content.trim() !== cache?.trim()) {
+    const currHash = HashUtils.get(content);
+    if (currHash !== this.cachedHash) {
       FsUtils.writeFile(targetFilePath, content);
+      this.cachedHash = currHash;
     }
-    return content;
   }
 }

package/src/pkg-builders/lib/sd-cli-index.file-generator.ts

@@ -1,19 +1,21 @@
-import { FsUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
+import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 
 export class SdCliIndexFileGenerator {
-  static watch(pkgPath: string, polyfills?: string[]) {
+  cachedHash?: string;
+
+  watch(pkgPath: string, polyfills?: string[]) {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
-    let cache = FsUtils.exists(indexFilePath) ? FsUtils.readFile(indexFilePath) : undefined;
+    this.cachedHash = FsUtils.exists(indexFilePath) ? FsUtils.readFile(indexFilePath) : undefined;
 
     SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
-      cache = this.run(pkgPath, polyfills, cache);
+      this.run(pkgPath, polyfills);
     });
 
-    cache = this.run(pkgPath, polyfills, cache);
+    this.run(pkgPath, polyfills);
   }
 
-  static run(pkgPath: string, polyfills?: string[], cache?: string): string {
+  run(pkgPath: string, polyfills?: string[]): string {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
 
     const importTexts: string[] = [];
@@ -41,19 +43,25 @@ export class SdCliIndexFileGenerator {
     }
 
     const content = importTexts.join("\n") + "\n";
-    if (content.trim() !== cache?.trim()) {
+    const currHash = HashUtils.get(content);
+    if (currHash !== this.cachedHash) {
       FsUtils.writeFile(indexFilePath, content);
+      this.cachedHash = currHash;
     }
     return content;
   }
 
-  static #getFilePaths(pkgPath: string): string[] {
+  #getFilePaths(pkgPath: string): string[] {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
 
     const tsconfig = FsUtils.readJson(path.resolve(pkgPath, "tsconfig.json"));
-    const entryFilePaths: string[] = tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
+    const entryFilePaths: string[] =
+      tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
 
-    return FsUtils.glob(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), { nodir: true, ignore: tsconfig.excludes }).filter(
+    return FsUtils.glob(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), {
+      nodir: true,
+      ignore: tsconfig.excludes,
+    }).filter(
       (item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"),
     );
   }

package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts

@@ -7,6 +7,8 @@ import { SdCliDbContextFileGenerator } from "./sd-cli-db-context.file-generator"
 export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdCliTsLibBuilder"]);
 
+  #indexFileGenerator = new SdCliIndexFileGenerator();
+  #dbContextGenerator = new SdCliDbContextFileGenerator();
   #builder?: SdTsLibBuilder;
 
   protected override async _runAsync(
@@ -17,23 +19,22 @@ export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
       if (!dev) {
         if (!this._pkgConf.noGenIndex) {
           this._debug("GEN index.ts...");
-          SdCliIndexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
+          this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
         }
 
         if (this._pkgConf.dbContext != null) {
           this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
-          SdCliDbContextFileGenerator.run(this._pkgPath, this._pkgConf.dbContext);
+          this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
         }
-      }
-      else {
+      } else {
         if (!this._pkgConf.noGenIndex) {
           this._debug("Watch for GEN index.ts...");
-          SdCliIndexFileGenerator.watch(this._pkgPath, this._pkgConf.polyfills);
+          this.#indexFileGenerator.watch(this._pkgPath, this._pkgConf.polyfills);
         }
 
         if (this._pkgConf.dbContext != null) {
           this._debug(`Watch for GEN ${this._pkgConf.dbContext}.ts...`);
-          SdCliDbContextFileGenerator.watch(this._pkgPath, this._pkgConf.dbContext);
+          this.#dbContextGenerator.watch(this._pkgPath, this._pkgConf.dbContext);
         }
       }
     }

package/src/pkg-builders/lib/sd-ts-lib.builder.ts

@@ -1,12 +1,13 @@
 import path from "path";
 import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
-import { FsUtils, PathUtils, TNormPath } from "@simplysm/sd-core-node";
+import { FsUtils, HashUtils, PathUtils, TNormPath } from "@simplysm/sd-core-node";
 import { ISdBuildMessage } from "../../types/build.types";
 import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
 import { ScopePathSet } from "../commons/scope-path";
 
 export class SdTsLibBuilder {
   #tsCompiler: SdTsCompiler;
+  #outputHashCache = new Map<TNormPath, string>();
 
   constructor(
     private readonly _pkgPath: TNormPath,
@@ -37,15 +38,20 @@ export class SdTsLibBuilder {
       if (emitFileInfos) {
         for (const emitFileInfo of emitFileInfos) {
           if (emitFileInfo.outAbsPath != null) {
-            FsUtils.writeFile(emitFileInfo.outAbsPath, emitFileInfo.text);
-            emitFileSet.add(emitFileInfo.outAbsPath);
+            const emitFilePath = PathUtils.norm(emitFileInfo.outAbsPath);
+            const prevHash = this.#outputHashCache.get(emitFilePath);
+            const currHash = HashUtils.get(Buffer.from(emitFileInfo.text));
+            if (prevHash !== currHash) {
+              FsUtils.writeFile(emitFilePath, emitFileInfo.text);
+              this.#outputHashCache.set(emitFilePath, currHash);
+              emitFileSet.add(emitFilePath);
+            }
           }
         }
       }
 
-      const globalStylesheetBundlingResult = tsCompileResult
-        .stylesheetBundlingResultMap
-        .get(emitFile);
+      const globalStylesheetBundlingResult =
+        tsCompileResult.stylesheetBundlingResultMap.get(emitFile);
       if (globalStylesheetBundlingResult && "outputFiles" in globalStylesheetBundlingResult) {
         for (const outputFile of globalStylesheetBundlingResult.outputFiles) {
           const distPath = PathUtils.norm(
@@ -54,17 +60,21 @@ export class SdTsLibBuilder {
             path.relative(this._pkgPath, outputFile.path),
           );
           if (PathUtils.isChildPath(distPath, path.resolve(this._pkgPath, "dist"))) {
-            FsUtils.writeFile(distPath, outputFile.text);
-            emitFileSet.add(distPath);
+            const prevHash = this.#outputHashCache.get(distPath);
+            const currHash = HashUtils.get(Buffer.from(outputFile.text));
+            if (prevHash !== currHash) {
+              FsUtils.writeFile(distPath, outputFile.text);
+              this.#outputHashCache.set(distPath, currHash);
+              emitFileSet.add(distPath);
+            }
           }
         }
       }
     }
 
-    const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values())
-      .mapMany((item) =>
-        SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._pkgPath),
-      );
+    const styleResults = Array.from(tsCompileResult.stylesheetBundlingResultMap.values()).mapMany(
+      (item) => SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(item, this._pkgPath),
+    );
 
     return {
       watchFileSet: tsCompileResult.watchFileSet,

package/src/pkg-builders/server/sd-server.build-runner.ts

@@ -149,7 +149,7 @@ Options = UnsafeLegacyRenegotiation`.trim(),
         const env = ${JSON.stringify(this._pkgConf.env)};
 
         module.exports = {
-          name: pm2Conf.name ?? npmConf.name.replace(/\@/g, "").replace(/\\\//g, "-"),
+          name: pm2Conf.name ?? npmConf.name.replace(/@/g, "").replace(/[\\\/]/g, "-"),
           script: "main.js",
           watch: true,
           watch_delay: 2000,

package/src/pkg-builders/server/sd-server.bundler.ts

@@ -23,14 +23,15 @@ export class SdServerBundler {
 
   #outputHashCache = new Map<TNormPath, string>();
 
-  constructor(private readonly _opt: {
-    dev: boolean;
-    pkgPath: TNormPath;
-    entryPoints: string[];
-    external?: string[];
-    watchScopePathSet: ScopePathSet;
-  }) {
-  }
+  constructor(
+    private readonly _opt: {
+      dev: boolean;
+      pkgPath: TNormPath;
+      entryPoints: string[];
+      external?: string[];
+      watchScopePathSet: ScopePathSet;
+    },
+  ) {}
 
   async bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<{
     watchFileSet: Set<TNormPath>;
@@ -145,7 +146,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
 
       for (const assetFile of assetFiles) {
         const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
-        const currHash = FsUtils.hash(assetFile.source);
+        const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
         if (prevHash !== currHash) {
           FsUtils.copy(
             assetFile.source,
@@ -155,8 +156,7 @@ const __dirname = __path__.dirname(__filename);`.trim(),
           emitFileSet.add(PathUtils.norm(assetFile.destination));
         }
       }
-    }
-    catch (err) {
+    } catch (err) {
       result = err;
       for (const e of err.errors) {
         if (e.detail != null) {