@simplysm/sd-cli 12.13.19 → 12.13.21

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

@@ -30,7 +30,7 @@ export abstract class BuildRunnerBase<
   }
 
   constructor(
-    projConf: ISdProjectConfig,
+    protected _projConf: ISdProjectConfig,
     protected _pkgPath: TNormPath,
     workspaceGlobs: string[],
     protected _emitOnly: boolean,
@@ -39,12 +39,16 @@ export abstract class BuildRunnerBase<
     super();
 
     this._pkgName = path.basename(_pkgPath);
-    this._pkgConf = projConf.packages[this._pkgName] as TSdPackageConfig<T>;
+    this._pkgConf = _projConf.packages[this._pkgName] as TSdPackageConfig<T>;
 
     const workspacePaths = workspaceGlobs
-      .map((item) => PathUtils.posix(this._pkgPath, "../../", item, "src"))
+      .mapMany((item) => [
+        PathUtils.posix(this._pkgPath, "../../", item, "src"),
+        PathUtils.posix(this._pkgPath, "../../", item, "public"),
+        PathUtils.posix(this._pkgPath, "../../", item, "public-dev"),
+      ])
       .mapMany((item) => FsUtils.glob(item));
-    const localUpdatePaths = Object.keys(projConf.localUpdates ?? {}).mapMany((key) => [
+    const localUpdatePaths = Object.keys(_projConf.localUpdates ?? {}).mapMany((key) => [
       ...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "dist")),
       ...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "src/**/*.scss")),
     ]);
@@ -94,87 +98,70 @@ export abstract class BuildRunnerBase<
     this.emit("complete", res);
 
     this._debug("WATCH...");
-    let lastWatchFileSet = result.watchFileSet;
-    SdFsWatcher.watch(this._watchScopePathSet.toArray(), {
-      ignore: (filePath) =>
-        (this._pkgConf.type === "client" &&
-          path.dirname(path.basename(filePath)) === "src" &&
-          path.basename(filePath) === `routes.ts`) ||
-        (this._pkgConf.type === "library" &&
-          this._pkgConf.dbContext != null &&
-          path.dirname(path.basename(filePath)) === "src" &&
-          path.basename(filePath) === `${this._pkgConf.dbContext}.ts`) ||
-        (this._pkgConf.type === "library" &&
-          !this._pkgConf.noGenIndex &&
-          path.dirname(path.basename(filePath)) === "src" &&
-          path.basename(filePath) === "index.ts"),
-    }).onChange({ delay: 100 }, async (changeInfos) => {
-      const modifiedFileSet = this._getModifiedFileSet(changeInfos, lastWatchFileSet);
-
-      if (modifiedFileSet.size < 1) return;
-
-      this.emit("change");
-
-      let watchResult: IBuildRunnerRunResult;
-      try {
-        watchResult = await this._runAsync(
-          !this._pkgConf.forceProductionMode,
-          this._emitOnly,
-          this._noEmit,
-          modifiedFileSet,
-        );
-
-        lastWatchFileSet = watchResult.watchFileSet;
-      } catch (err) {
-        watchResult = {
-          affectedFileSet: modifiedFileSet,
-          buildMessages: [
-            {
-              filePath: undefined,
-              line: undefined,
-              char: undefined,
-              code: undefined,
-              severity: "error",
-              message: `파일 변경 처리 중 오류 발생: ${err}`,
-              type: "watch",
-            },
-          ],
-          emitFileSet: new Set(),
-        };
-      }
 
-      this.emit("complete", {
-        affectedFilePathSet: watchResult.affectedFileSet,
-        buildMessages: watchResult.buildMessages,
-        emitFileSet: watchResult.emitFileSet,
-      });
-    });
+    let lastWatchFileSet = result.watchFileSet;
+    SdFsWatcher.watch(this._watchScopePathSet.toArray()).onChange(
+      { delay: 300 },
+      async (changeInfos) => {
+        const modifiedFileSet = this._getModifiedFileSet(changeInfos, lastWatchFileSet);
+
+        if (modifiedFileSet.size < 1) return;
+
+        this.emit("change");
+
+        let watchResult: IBuildRunnerRunResult;
+        try {
+          watchResult = await this._runAsync(
+            !this._pkgConf.forceProductionMode,
+            this._emitOnly,
+            this._noEmit,
+            modifiedFileSet,
+          );
+
+          lastWatchFileSet = watchResult.watchFileSet;
+        } catch (err) {
+          watchResult = {
+            affectedFileSet: modifiedFileSet,
+            buildMessages: [
+              {
+                filePath: undefined,
+                line: undefined,
+                char: undefined,
+                code: undefined,
+                severity: "error",
+                message: `파일 변경 처리 중 오류 발생: ${err}`,
+                type: "watch",
+              },
+            ],
+            emitFileSet: new Set(),
+          };
+        }
+
+        this.emit("complete", {
+          affectedFilePathSet: watchResult.affectedFileSet,
+          buildMessages: watchResult.buildMessages,
+          emitFileSet: watchResult.emitFileSet,
+        });
+      },
+    );
   }
 
   protected _getModifiedFileSet(
     changeInfos: ISdFsWatcherChangeInfo[],
     lastWatchFileSet?: Set<TNormPath>,
   ) {
+    let arr: TNormPath[];
     if (!lastWatchFileSet) {
-      return new Set(changeInfos.map((item) => item.path));
+      arr = changeInfos.map((item) => item.path);
     } else {
-      return new Set(
-        changeInfos
-          .filter(
-            (item) =>
-              Array.from(lastWatchFileSet).some((item1) =>
-                item.path.startsWith(path.dirname(item1)),
-              ) ||
-              ((this._pkgConf.type === "client" ||
-                (this._pkgConf.type === "library" && this._pkgConf.dbContext != null) ||
-                (this._pkgConf.type === "library" && this._pkgConf.noGenIndex)) &&
-                item.path.startsWith(path.resolve(this._pkgPath, "src")) &&
-                item.path.endsWith(".ts") &&
-                item.event === "add"),
-          )
-          .map((item) => item.path),
-      );
+      arr = changeInfos
+        .filter((item) =>
+          Array.from(lastWatchFileSet).some((item1) => item.path.startsWith(path.dirname(item1))),
+        )
+        .map((item) => item.path);
     }
+
+    return new Set(arr);
   }
 
   protected abstract _runAsync(

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

@@ -1,4 +1,4 @@
-import { FsUtils, HashUtils, PathUtils } 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";
@@ -6,16 +6,21 @@ import { INpmConfig } from "../../types/common-configs.types";
 export class SdCliDbContextFileGenerator {
   cachedHash?: string;
 
-  /*watch(pkgPath: string, kebabName: string) {
+  watch(pkgPath: string, kebabName: string) {
     const targetFilePath = path.resolve(pkgPath, `src/${kebabName}.ts`);
-    this.cachedHash = FsUtils.exists(targetFilePath) ? HashUtils.get(FsUtils.readFile(targetFilePath)) : undefined;
-
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
-      this.run(pkgPath, kebabName);
+    this.cachedHash = FsUtils.exists(targetFilePath)
+      ? HashUtils.get(FsUtils.readFile(targetFilePath))
+      : undefined;
+
+    SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
+      ignored: [targetFilePath],
+    }).onChange({ delay: 50 }, (changeInfos) => {
+      if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
+        this.run(pkgPath, kebabName);
     });
 
     this.run(pkgPath, kebabName);
-  }*/
+  }
 
   run(pkgPath: string, kebabName: string): { changed: boolean; filePath: string; content: string } {
     const npmConfig = FsUtils.readJson(path.resolve(pkgPath, "package.json")) as INpmConfig;
@@ -68,7 +73,14 @@ export class SdCliDbContextFileGenerator {
         importTexts.push(`import { ${className} } from "./${requirePath}";`);
         if (
           useExt &&
-          ["systemDataLog", "systemLog", "authentication", "user", "userConfig", "userPermission"].includes(varName)
+          [
+            "systemDataLog",
+            "systemLog",
+            "authentication",
+            "user",
+            "userConfig",
+            "userPermission",
+          ].includes(varName)
         ) {
           modelTexts.push(`override ${varName} = new Queryable(this, ${className})`);
         } else {

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

@@ -1,21 +1,29 @@
-import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
+import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
 import path from "path";
 
 export class SdCliIndexFileGenerator {
   cachedHash?: string;
 
-  /*watch(pkgPath: string, polyfills?: string[]) {
+  watch(pkgPath: string, polyfills?: string[]) {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
-    this.cachedHash = FsUtils.exists(indexFilePath) ? FsUtils.readFile(indexFilePath) : undefined;
+    this.cachedHash = FsUtils.exists(indexFilePath)
+      ? HashUtils.get(FsUtils.readFile(indexFilePath))
+      : undefined;
 
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
-      this.run(pkgPath, polyfills);
+    SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
+      ignored: [indexFilePath],
+    }).onChange({ delay: 50 }, (changeInfos) => {
+      if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
+        this.run(pkgPath, polyfills);
     });
 
     this.run(pkgPath, polyfills);
-  }*/
+  }
 
-  run(pkgPath: string, polyfills?: string[]): { changed: boolean; filePath: string; content: string } {
+  run(
+    pkgPath: string,
+    polyfills?: string[],
+  ): { changed: boolean; filePath: string; content: string } {
     const indexFilePath = path.resolve(pkgPath, "src/index.ts");
 
     const importTexts: string[] = [];
@@ -57,11 +65,14 @@ export class SdCliIndexFileGenerator {
     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((item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"));
+    }).filter(
+      (item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"),
+    );
   }
 }

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

@@ -7,41 +7,28 @@ import { SdCliDbContextFileGenerator } from "./sd-cli-db-context.file-generator"
 export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdTsLibBuildRunner"]);
 
-  #indexFileGenerator = new SdCliIndexFileGenerator();
-  #dbContextGenerator = new SdCliDbContextFileGenerator();
   #builder?: SdTsLibBuilder;
 
-  #hasGenIndexError = false;
-  #hasGenDbContextError = false;
-
   protected override async _runAsync(
     dev: boolean,
     emitOnly: boolean,
     noEmit: boolean,
     modifiedFileSet?: Set<TNormPath>,
   ): Promise<IBuildRunnerRunResult> {
-    let indexFileNPath: TNormPath | undefined;
-    let dbContentFileNPath: TNormPath | undefined;
-    if (!noEmit) {
-      if (!this._pkgConf.noGenIndex) {
-        this._debug("GEN index.ts...");
-        const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
-        if (modifiedFileSet && (genIndexResult.changed || this.#hasGenIndexError)) {
-          modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
+    // 최초한번
+    if (!modifiedFileSet) {
+      if (!noEmit) {
+        // index
+        if (!this._pkgConf.noGenIndex) {
+          this._debug("GEN index.ts...");
+          new SdCliIndexFileGenerator().watch(this._pkgPath, this._pkgConf.polyfills);
         }
-        indexFileNPath = PathUtils.norm(genIndexResult.filePath);
-      }
 
-      if (this._pkgConf.dbContext != null) {
-        this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
-        const genDbContextResult = this.#dbContextGenerator.run(
-          this._pkgPath,
-          this._pkgConf.dbContext,
-        );
-        if (modifiedFileSet && (genDbContextResult.changed || this.#hasGenDbContextError)) {
-          modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
+        // db-context
+        if (this._pkgConf.dbContext != null) {
+          this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
+          new SdCliDbContextFileGenerator().watch(this._pkgPath, this._pkgConf.dbContext);
         }
-        dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
       }
     }
 
@@ -55,13 +42,6 @@ export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
     );
     const buildResult = await this.#builder.buildAsync(modifiedFileSet ?? new Set());
 
-    this.#hasGenIndexError =
-      indexFileNPath != null &&
-      buildResult.results.map((item) => item.filePath).includes(indexFileNPath);
-    this.#hasGenDbContextError =
-      dbContentFileNPath != null &&
-      buildResult.results.map((item) => item.filePath).includes(dbContentFileNPath);
-
     this._debug(`빌드 완료`);
     const watchFileSet = new Set(
       Array.from(buildResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)),

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

@@ -120,63 +120,74 @@ const __dirname = __path__.dirname(__filename);`.trim(),
       });
     }
 
-    const emitFileSet = new Set<TNormPath>();
     let result: esbuild.BuildResult | esbuild.BuildFailure;
-    try {
-      result = await this.#context.rebuild();
+    result = await this.#context.rebuild();
 
-      const outputFiles: BuildOutputFile[] =
-        result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [];
+    if (this._opt.noEmit) {
+      return {
+        watchFileSet: this.#resultCache.watchFileSet!,
+        affectedFileSet: this.#resultCache.affectedFileSet!,
+        results: [],
+        emitFileSet: new Set<TNormPath>(),
+      };
+    } else {
+      const emitFileSet = new Set<TNormPath>();
 
-      for (const outputFile of outputFiles) {
-        const distFilePath = PathUtils.norm(this._opt.pkgPath, outputFile.path);
-        const prevHash = this.#outputHashCache.get(distFilePath);
-        const currHash = HashUtils.get(Buffer.from(outputFile.contents));
-        if (prevHash !== currHash) {
-          FsUtils.writeFile(distFilePath, outputFile.contents);
-          this.#outputHashCache.set(distFilePath, currHash);
-          emitFileSet.add(distFilePath);
+      try {
+        const outputFiles: BuildOutputFile[] =
+          result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ??
+          [];
+
+        for (const outputFile of outputFiles) {
+          const distFilePath = PathUtils.norm(this._opt.pkgPath, outputFile.path);
+          const prevHash = this.#outputHashCache.get(distFilePath);
+          const currHash = HashUtils.get(Buffer.from(outputFile.contents));
+          if (prevHash !== currHash) {
+            FsUtils.writeFile(distFilePath, outputFile.contents);
+            this.#outputHashCache.set(distFilePath, currHash);
+            emitFileSet.add(distFilePath);
+          }
         }
-      }
 
-      //-- copy assets
-      const assetFiles = await resolveAssets(
-        [
-          { input: "public", glob: "**/*", output: "." },
-          ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
-        ],
-        this._opt.pkgPath,
-      );
+        //-- copy assets
+        const assetFiles = await resolveAssets(
+          [
+            { input: "public", glob: "**/*", output: "." },
+            ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
+          ],
+          this._opt.pkgPath,
+        );
 
-      for (const assetFile of assetFiles) {
-        const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
-        const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
-        if (prevHash !== currHash) {
-          FsUtils.copy(
-            assetFile.source,
-            path.resolve(this._opt.pkgPath, "dist", assetFile.destination),
-          );
-          this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
-          emitFileSet.add(PathUtils.norm(this._opt.pkgPath, "dist", assetFile.destination));
+        for (const assetFile of assetFiles) {
+          const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
+          const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
+          if (prevHash !== currHash) {
+            FsUtils.copy(
+              assetFile.source,
+              path.resolve(this._opt.pkgPath, "dist", assetFile.destination),
+            );
+            this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
+            emitFileSet.add(PathUtils.norm(this._opt.pkgPath, "dist", assetFile.destination));
+          }
         }
-      }
-    } catch (err) {
-      result = err;
-      for (const e of err.errors) {
-        if (e.detail != null) {
-          this.#logger.error(e.detail);
+      } catch (err) {
+        result = err;
+        for (const e of err.errors) {
+          if (e.detail != null) {
+            this.#logger.error(e.detail);
+          }
         }
       }
-    }
 
-    return {
-      watchFileSet: this.#resultCache.watchFileSet!,
-      affectedFileSet: this.#resultCache.affectedFileSet!,
-      results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(
-        result,
-        this._opt.pkgPath,
-      ),
-      emitFileSet: emitFileSet,
-    };
+      return {
+        watchFileSet: this.#resultCache.watchFileSet!,
+        affectedFileSet: this.#resultCache.affectedFileSet!,
+        results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(
+          result,
+          this._opt.pkgPath,
+        ),
+        emitFileSet: emitFileSet,
+      };
+    }
   }
 }