@simplysm/sd-cli 11.1.14 → 11.1.16

package/src/builders/SdCliClientBuilder.ts

@@ -1,12 +1,19 @@
 import {EventEmitter} from "events";
 import {FsUtil, Logger, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
-import {ISdCliBuilderResult, ISdCliClientPackageConfig, ISdCliConfig, ISdCliPackageBuildResult} from "../commons";
+import {
+  ISdCliBuilderResult,
+  ISdCliClientPackageConfig,
+  ISdCliConfig,
+  ISdCliPackageBuildResult,
+  ITsConfig
+} from "../commons";
 import {FunctionQueue} from "@simplysm/sd-core-common";
 import path from "path";
 import {SdNgBundler} from "../build-tools/SdNgBundler";
-import {SdLinter} from "../build-tools/SdLinter";
 import {SdCliCordova} from "../build-tools/SdCliCordova";
 import {SdCliNgRoutesFileGenerator} from "../build-tools/SdCliNgRoutesFileGenerator";
+import {SdLinter} from "../build-tools/SdLinter";
+import ts from "typescript";
 
 export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliClientBuilder"]);
@@ -14,6 +21,8 @@ export class SdCliClientBuilder extends EventEmitter {
   private _builders?: SdNgBundler[];
   private _cordova?: SdCliCordova;
 
+  #program?: ts.Program;
+
   public constructor(private readonly _projConf: ISdCliConfig,
                      private readonly _pkgPath: string) {
     super();
@@ -31,7 +40,7 @@ export class SdCliClientBuilder extends EventEmitter {
     this._debug("dist 초기화...");
     await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
 
-    this._debug(`GEN index.ts...`);
+    this._debug(`GEN routes.ts...`);
     await SdCliNgRoutesFileGenerator.runAsync(this._pkgPath);
 
     this._debug("GEN .config...");
@@ -41,13 +50,13 @@ export class SdCliClientBuilder extends EventEmitter {
     return await this._runAsync({dev: false});
   }
 
-  public async watchAsync(): Promise<void> {
+  public async watchAsync() {
     this.emit("change");
 
     this._debug("dist 초기화...");
     await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
 
-    this._debug(`WATCH GEN index.ts...`);
+    this._debug(`WATCH GEN routes.ts...`);
     await SdCliNgRoutesFileGenerator.watchAsync(this._pkgPath);
 
     this._debug("GEN .config...");
@@ -72,7 +81,8 @@ export class SdCliClientBuilder extends EventEmitter {
           this.emit("change");
 
           for (const builder of this._builders!) {
-            builder.removeCache(currChangeFiles);
+            // builder.removeCache(currChangeFiles);
+            builder.markForChanges(currChangeFiles);
           }
 
           const watchResult = await this._runAsync({dev: true});
@@ -122,14 +132,19 @@ export class SdCliClientBuilder extends EventEmitter {
     this._debug(`BUILD & CHECK...`);
     const buildResults = await Promise.all(this._builders.map((builder) => builder.bundleAsync()));
     const filePaths = buildResults.mapMany(item => item.filePaths).distinct();
-    const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
+    // const affectedFilePaths = buildResults.mapMany(item => item.affectedFilePaths).distinct();
     const results = buildResults.mapMany((item) => item.results).distinct();
 
     this._debug(`LINT...`);
-    const lintResults = await SdLinter.lintAsync(
-      affectedFilePaths,
-      this._pkgPath
-    );
+    const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
+    const parsedTsConfig = ts.parseJsonConfigFileContent(tsConfig, ts.sys, this._pkgPath);
+    this.#program = ts.createProgram({
+      rootNames: parsedTsConfig.fileNames,
+      options: parsedTsConfig.options,
+      oldProgram: this.#program
+    });
+    const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
+    const lintResults = await SdLinter.lintAsync(pkgFilePaths, this.#program);
 
     if (!opt.dev && this._cordova) {
       this._debug("CORDOVA BUILD...");
@@ -139,27 +154,13 @@ export class SdCliClientBuilder extends EventEmitter {
     this._debug(`빌드 완료`);
     const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
       .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
-    /*const watchFilePaths = filePaths
-      .map((item) => {
-        if (PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../"))) {
-          return path.resolve(this._pkgPath, "..", path.relative(path.resolve(this._pkgPath, "../"), item).split("\\").slice(0, 2).join("/"), "**!/!*.*");
-        }
-
-        const localUpdatePath = localUpdatePaths.single((lu) => PathUtil.isChildPath(item, lu));
-        if (localUpdatePath != null) {
-          return path.resolve(localUpdatePath, path.relative(localUpdatePath, item).split("\\").slice(0, 1).join("/"), "**!/!*.*");
-        }
-
-        return undefined;
-      }).filterExists().distinct();
-    console.log(watchFilePaths);*/
     const watchFilePaths = filePaths.filter(item =>
       PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
       localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
     );
     return {
       watchFilePaths: watchFilePaths,
-      affectedFilePaths: affectedFilePaths,
+      affectedFilePaths: pkgFilePaths,
       buildResults: [...results, ...lintResults]
     };
   }

package/src/builders/SdCliJsLibLinter.ts

@@ -24,7 +24,7 @@ export class SdCliJsLibLinter extends EventEmitter {
     this._debug("LINT...");
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.+(js|cjs|mjs)");
     const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(srcFilePaths);
+    const lintResults = await SdLinter.lintAsync(srcFilePaths, undefined);
 
     this._debug(`LINT 완료`);
     return {
@@ -38,7 +38,7 @@ export class SdCliJsLibLinter extends EventEmitter {
     this._debug("LINT...");
     const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.+(js|cjs|mjs)");
     const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
-    const lintResults = await SdLinter.lintAsync(srcFilePaths);
+    const lintResults = await SdLinter.lintAsync(srcFilePaths, undefined);
 
     this._debug(`LINT 완료`);
     this.emit("complete", {
@@ -56,7 +56,7 @@ export class SdCliJsLibLinter extends EventEmitter {
 
         this.emit("change");
         this._debug("LINT...");
-        const watchLintResults = await SdLinter.lintAsync(watchFilePaths);
+        const watchLintResults = await SdLinter.lintAsync(watchFilePaths, undefined);
 
         this._debug(`LINT 완료`);
         this.emit("complete", {

package/src/builders/SdCliServerBuilder.ts

@@ -15,16 +15,16 @@ import {FunctionQueue, ObjectUtil, StringUtil} from "@simplysm/sd-core-common";
 import {SdTsBundler} from "../build-tools/SdTsBundler";
 
 export class SdCliServerBuilder extends EventEmitter {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuilder"]);
-  private readonly _pkgConf: ISdCliServerPackageConfig;
-  private _builder?: SdTsBundler;
-  private _checker?: SdTsCompiler;
-  private _extModules?: { name: string; exists: boolean }[];
+  #logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuilder"]);
+  #pkgConf: ISdCliServerPackageConfig;
+  #builder?: SdTsBundler;
+  #checker?: SdTsCompiler;
+  #extModules?: { name: string; exists: boolean }[];
 
   public constructor(private readonly _projConf: ISdCliConfig,
                      private readonly _pkgPath: string) {
     super();
-    this._pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdCliServerPackageConfig;
+    this.#pkgConf = this._projConf.packages[path.basename(_pkgPath)] as ISdCliServerPackageConfig;
   }
 
   public override on(event: "change", listener: () => void): this;
@@ -42,7 +42,7 @@ export class SdCliServerBuilder extends EventEmitter {
 
     this._debug("GEN .config...");
     const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
-    await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
+    await FsUtil.writeFileAsync(confDistPath, JSON.stringify(this.#pkgConf.configs ?? {}, undefined, 2));
 
     const result = await this._runAsync({dev: true});
     this.emit("complete", result);
@@ -72,7 +72,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...");
     {
@@ -87,7 +87,7 @@ export class SdCliServerBuilder extends EventEmitter {
       delete distNpmConfig.devDependencies;
       delete distNpmConfig.peerDependencies;
 
-      if (this._pkgConf.pm2 && !this._pkgConf.pm2.noStartScript) {
+      if (this.#pkgConf.pm2 && !this.#pkgConf.pm2.noStartScript) {
         distNpmConfig.scripts = {"start": "pm2 start pm2.json"};
       }
 
@@ -128,7 +128,7 @@ Options = UnsafeLegacyRenegotiation`.trim()
     }
 
 
-    if (this._pkgConf.pm2) {
+    if (this.#pkgConf.pm2) {
       this._debug("GEN pm2.json...");
 
       await FsUtil.writeJsonAsync(
@@ -141,9 +141,9 @@ Options = UnsafeLegacyRenegotiation`.trim()
           ignore_watch: [
             "node_modules",
             "www",
-            ...this._pkgConf.pm2.ignoreWatchPaths ?? []
+            ...this.#pkgConf.pm2.ignoreWatchPaths ?? []
           ],
-          ...this._pkgConf.pm2.noInterpreter ? {} : {
+          ...this.#pkgConf.pm2.noInterpreter ? {} : {
             "interpreter": "node@" + process.versions.node,
           },
           interpreter_args: "--openssl-config=openssl.cnf",
@@ -151,7 +151,7 @@ Options = UnsafeLegacyRenegotiation`.trim()
             NODE_ENV: "production",
             TZ: "Asia/Seoul",
             SD_VERSION: npmConfig.version,
-            ...this._pkgConf.env
+            ...this.#pkgConf.env
           },
           arrayProcess: "concat",
           useDelTargetNull: true
@@ -161,11 +161,11 @@ Options = UnsafeLegacyRenegotiation`.trim()
       );
     }
 
-    if (this._pkgConf.iis) {
+    if (this.#pkgConf.iis) {
       this._debug("GEN web.config...");
 
       const iisDistPath = path.resolve(this._pkgPath, "dist/web.config");
-      const serverExeFilePath = this._pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
+      const serverExeFilePath = this.#pkgConf.iis.nodeExeFilePath ?? "C:\\Program Files\\nodejs\\node.exe";
       await FsUtil.writeFileAsync(iisDistPath, `
 <configuration>
   <system.webServer>
@@ -200,47 +200,52 @@ Options = UnsafeLegacyRenegotiation`.trim()
   }> {
     this._debug(`BUILD 준비...`);
 
-    this._extModules = this._extModules ?? await this._getExternalModulesAsync();
+    this.#extModules = this.#extModules ?? await this._getExternalModulesAsync();
 
+
+    this._debug(`BUILD...`);
     const tsConfig = FsUtil.readJson(path.resolve(this._pkgPath, "tsconfig.json")) as ITsConfig;
-    this._builder = this._builder ?? new SdTsBundler({
+    this.#builder = this.#builder ?? new SdTsBundler({
       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)
+      external: this.#extModules.map((item) => item.name)
     });
+    const buildResult = await this.#builder.bundleAsync();
 
-    this._checker = this._checker ?? new SdTsCompiler({
+    this._debug("CHECK...");
+    this.#checker = this.#checker ?? new SdTsCompiler({
       pkgPath: this._pkgPath,
       emit: false,
       emitDts: false,
       globalStyle: false
     });
+    const checkResult = await this.#checker.buildAsync();
 
-    this._debug(`BUILD...`);
-    const buildResult = await this._builder.bundleAsync();
+    //-- filePaths
 
-    this._debug("CHECK...");
-    const checkResult = await this._checker.buildAsync();
-
-    this._debug(`LINT...`);
-    const lintResults = await SdLinter.lintAsync(checkResult.affectedFilePaths, this._checker.program);
+    const filePaths = [
+      ...buildResult.filePaths,
+      ...checkResult.filePaths
+    ];
+    const pkgFilePaths = filePaths.filter(item => PathUtil.isChildPath(item, this._pkgPath));
 
-    this._debug(`빌드 완료`);
     const localUpdatePaths = Object.keys(this._projConf.localUpdates ?? {})
       .mapMany((key) => FsUtil.glob(path.resolve(this._pkgPath, "../../node_modules", key)));
-    const watchFilePaths = [
-      ...buildResult.filePaths,
-      ...checkResult.filePaths,
-    ].filter(item =>
+    const watchFilePaths = filePaths.filter(item =>
       PathUtil.isChildPath(item, path.resolve(this._pkgPath, "../")) ||
       localUpdatePaths.some((lu) => PathUtil.isChildPath(item, lu))
     );
+
+    this._debug(`LINT...`);
+    const lintResults = await SdLinter.lintAsync(pkgFilePaths, this.#checker!.program);
+
+    this._debug(`빌드 완료`);
     return {
       watchFilePaths,
-      affectedFilePaths: checkResult.affectedFilePaths,
+      affectedFilePaths: pkgFilePaths, //checkResult.affectedFilePaths,
       buildResults: [...buildResult.results, ...checkResult.results, ...lintResults]
     };
   }
@@ -287,7 +292,7 @@ Options = UnsafeLegacyRenegotiation`.trim()
           });
         }
 
-        if (this._pkgConf.externals?.includes(moduleName)) {
+        if (this.#pkgConf.externals?.includes(moduleName)) {
           results.push({
             name: moduleName,
             exists: true
@@ -317,7 +322,7 @@ Options = UnsafeLegacyRenegotiation`.trim()
           });
         }
 
-        if (this._pkgConf.externals?.includes(optModuleName)) {
+        if (this.#pkgConf.externals?.includes(optModuleName)) {
           results.push({
             name: optModuleName,
             exists: true
@@ -334,6 +339,6 @@ Options = UnsafeLegacyRenegotiation`.trim()
   }
 
   private _debug(msg: string): void {
-    this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
+    this.#logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
   }
 }

package/src/builders/SdCliTsLibBuilder.ts

@@ -75,15 +75,13 @@ export class SdCliTsLibBuilder extends EventEmitter {
     affectedFilePaths: string[];
     buildResults: ISdCliPackageBuildResult[];
   }> {
-    this._debug(`BUILD 준비...`);
+    this._debug(`BUILD && CHECK...`);
     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...");

package/src/bundle-plugins/sdLoadedFilesPlugin.ts

@@ -0,0 +1,19 @@
+import esbuild from "esbuild";
+
+export function sdLoadedFilesPlugin(conf: {
+  loadedFileSet: Set<string>;
+}): esbuild.Plugin {
+  return {
+    name: "sd-loaded-files",
+    setup: (build: esbuild.PluginBuild) => {
+      build.onStart(() => {
+        conf.loadedFileSet.clear();
+      });
+
+      build.onLoad({filter: /.*/}, (args) => {
+        conf.loadedFileSet.add(args.path);
+        return null;
+      });
+    }
+  };
+}