@simplysm/sd-cli 7.0.247 → 7.0.263

package/src/bin/sd-cli.ts

@@ -10,11 +10,11 @@ import { SdCliPrepare } from "../entry-points/SdCliPrepare";
 import { SdCliFileCrypto } from "../entry-points/SdCliFileCrypto";
 import { SdCliCordova } from "../build-tool/SdCliCordova";
 import { SdCliElectron } from "../build-tool/SdCliElectron";
+import { SdCliProjectGenerator } from "../entry-points/SdCliProjectGenerator";
 
 Error.stackTraceLimit = Infinity;
 
 const argv = yargs(hideBin(process.argv))
-  .version(false)
   .help("help", "도움말")
   .alias("help", "h")
   .options({
@@ -27,17 +27,17 @@ const argv = yargs(hideBin(process.argv))
   .command(
     "prepare",
     "sd-cli 준비",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
   )
   .command(
     "update",
     "패키지 업데이트 (npm update)",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
   )
   .command(
     "local-update",
     "로컬 라이브러리 업데이트를 수행합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .options({
         config: {
           type: "string",
@@ -48,7 +48,7 @@ const argv = yargs(hideBin(process.argv))
   .command(
     "watch",
     "프로젝트의 각 패키지에 대한 변경감지 빌드를 수행합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .options({
         config: {
           type: "string",
@@ -93,7 +93,7 @@ const argv = yargs(hideBin(process.argv))
       })
   )
   .command(
-    "run-cordova <platform> <package> [url]",
+    "run-cordova <platform> <package> <url>",
     "변경감지중인 플랫폼을 코도바 디바이스에 앱 형태로 띄웁니다.",
     (cmd) => cmd
       .positional("platform", {
@@ -115,7 +115,7 @@ const argv = yargs(hideBin(process.argv))
   .command(
     "build",
     "프로젝트의 각 패키지에 대한 빌드를 수행합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .options({
         config: {
           type: "string",
@@ -136,7 +136,7 @@ const argv = yargs(hideBin(process.argv))
   .command(
     "publish",
     "프로젝트의 각 패키지를 배포합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .options({
         noBuild: {
           type: "boolean",
@@ -162,20 +162,160 @@ const argv = yargs(hideBin(process.argv))
   .command(
     "enc-file <file>",
     "파일을 암호화 합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .positional("file", {
         type: "string",
-        describe: "암호화할 파일명"
+        describe: "암호화할 파일명",
+        demandOption: true
       })
   )
   .command(
     "dec-file <file>",
     "파일을 복호화 합니다.",
-    (cmd) => cmd.version(false)
+    (cmd) => cmd.version(false).hide("help").hide("debug")
       .positional("file", {
         type: "string",
-        describe: "암호화된 파일명"
+        describe: "암호화된 파일명",
+        demandOption: true
+      })
+  )
+  .command(
+    "init [name] <description> <author> <gitUrl>",
+    "프로젝트를 초기화 합니다.",
+    (cmd) => cmd.version(false).hide("help").hide("debug")
+      .positional("name", {
+        type: "string",
+        describe: "프로젝트 영문명 (기본값: 최종폴더명)"
+      })
+      .positional("description", {
+        type: "string",
+        describe: "프로젝트 설명(=명칭)",
+        demandOption: true
+      })
+      .positional("author", {
+        type: "string",
+        describe: "작성자",
+        demandOption: true
+      })
+      .positional("gitUrl", {
+        type: "string",
+        describe: "소스코드 관리를 위한 GIT 레파지토리 URL",
+        demandOption: true
       })
+      .example([
+        ["$0 init sample 샘플프로젝트 홍길동 https://github.com/my/sample.git"]
+      ])
+  )
+  .command(
+    "add",
+    "프로젝트에 패키지/기능등을 추가합니다.",
+    (cmd) => cmd.version(false).hide("help").hide("debug")
+      .command(
+        "ts-lib <name> <description>",
+        "타입스트립트 라이브러리 패키지를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("name", {
+            type: "string",
+            describe: "패키지명",
+            demandOption: true
+          })
+          .positional("description", {
+            type: "string",
+            describe: "패키지설명",
+            demandOption: true
+          })
+          .options({
+            useDom: {
+              type: "boolean",
+              describe: "DOM객체(window, document 등) 사용 여부",
+              default: false
+            }
+          })
+          .example([
+            ["$0 add ts-lib common 공통모듈"],
+            ["$0 sd-cli add ts-lib client-common \"클라이언트 공통\" --useDom"]
+          ])
+      )
+      .command(
+        "db-lib <name>",
+        "DB 라이브러리 패키지를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("name", {
+            type: "string",
+            describe: "패키지명",
+            demandOption: true
+          })
+          .example([
+            ["$0 add db-lib main"]
+          ])
+      )
+      .command(
+        "db-model <dbName> <category> <name> <description>",
+        "DB 패키지에 모델를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("dbName", {
+            type: "string",
+            describe: "DB 패키지 영문명 = 'DbContext'명칭",
+            demandOption: true
+          })
+          .positional("category", {
+            type: "string",
+            describe: "추가할 모델의 분류명",
+            demandOption: true
+          })
+          .positional("name", {
+            type: "string",
+            describe: "추가할 모델의 명칭 (테이블명)",
+            demandOption: true
+          })
+          .positional("description", {
+            type: "string",
+            describe: "추가할 모델의 설명 (테이블 설명)",
+            demandOption: true
+          })
+          .example([
+            ["$0 add db-model main base Employee 직원"]
+          ])
+      )
+      .command(
+        "server [name] [description]",
+        "서버 패키지를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("name", {
+            type: "string",
+            describe: "패키지명"
+          })
+          .positional("description", {
+            type: "string",
+            describe: "패키지 설명"
+          })
+          .example([
+            ["$0 add server"]
+          ])
+      )
+      .command(
+        "client <name> <description> <serverName>",
+        "클라이언트 패키지를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("name", {
+            type: "string",
+            describe: "패키지명",
+            demandOption: true
+          })
+          .positional("description", {
+            type: "string",
+            describe: "패키지 설명",
+            demandOption: true
+          })
+          .positional("serverName", {
+            type: "string",
+            describe: "서버 패키지명",
+            demandOption: true
+          })
+          .example([
+            ["$0 add client admin 관리자 server"]
+          ])
+      )
   )
   .parseSync();
 
@@ -265,6 +405,52 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
   else if (argv._[0] === "dec-file") {
     await new SdCliFileCrypto().decryptAsync(argv.file!);
   }
+  else if (argv._[0] === "init") {
+    await new SdCliProjectGenerator(process.cwd()).initAsync({
+      name: argv.name,
+      description: argv.description!,
+      author: argv.author,
+      gitUrl: argv.gitUrl
+    });
+  }
+  else if (argv._[0] === "add") {
+    if (argv._[1] === "ts-lib") {
+      await new SdCliProjectGenerator(process.cwd()).addTsLibAsync({
+        name: argv.name!,
+        description: argv.description!,
+        useDom: argv.useDom
+      });
+    }
+    else if (argv._[1] === "db-lib") {
+      await new SdCliProjectGenerator(process.cwd()).addDbLibAsync({
+        name: argv.name!
+      });
+    }
+    else if (argv._[1] === "db-model") {
+      await new SdCliProjectGenerator(process.cwd()).addDbLibModelAsync({
+        dbPkgName: argv.dbName,
+        category: argv.category,
+        name: argv.name!,
+        description: argv.description!
+      });
+    }
+    else if (argv._[1] === "server") {
+      await new SdCliProjectGenerator(process.cwd()).addServerAsync({
+        name: argv.name,
+        description: argv.description
+      });
+    }
+    else if (argv._[1] === "client") {
+      await new SdCliProjectGenerator(process.cwd()).addClientAsync({
+        name: argv.name!,
+        description: argv.description!,
+        serverName: argv.serverName
+      });
+    }
+    else {
+      throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[1]}\n`);
+    }
+  }
   else {
     throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
   }

package/src/build-tool/SdCliElectron.ts

@@ -68,7 +68,8 @@ export class SdCliElectron {
       `SD_VERSION=${npmConfig.version}`,
       `SD_ELECTRON_DEV_URL=${url.replace(/\/$/, "")}/${pkgName}/electron/`,
       (electronConfig.icon !== undefined) ? `SD_ELECTRON_ICON=${electronConfig.icon}` : `SD_ELECTRON_ICON=favicon.ico`,
-      ...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env![key]}`) : []
+      ...(pkgConfig.env !== undefined) ? Object.keys(pkgConfig.env).map((key) => `${key}=${pkgConfig.env![key]}`) : [],
+      ...(electronConfig.env !== undefined) ? Object.keys(electronConfig.env).map((key) => `${key}=${electronConfig.env![key]}`) : [],
     ].filterExists().join("\n"));
 
     let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(pkgRootPath, `src/electron.ts`));

package/src/builder/SdCliClientBuilder.ts

@@ -30,9 +30,9 @@ import { SdCliNgModuleGenerator } from "../ng-tools/SdCliNgModuleGenerator";
 import { SdCliCordova } from "../build-tool/SdCliCordova";
 import { SdCliNpmConfigUtil } from "../utils/SdCliNpmConfigUtil";
 import electronBuilder from "electron-builder";
-import LintResult = ESLint.LintResult;
 import { fileURLToPath } from "url";
 import { Entrypoint } from "@angular-devkit/build-angular/src/utils/index-file/augment-index-html";
+import LintResult = ESLint.LintResult;
 
 export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger: Logger;
@@ -111,11 +111,15 @@ export class SdCliClientBuilder extends EventEmitter {
       .map((builderType) => this._getWebpackConfig(true, builderType));
     const multiCompiler = webpack(webpackConfigs);
     await new Promise<void>((resolve, reject) => {
+      const invalidFiles: string[] = [];
       multiCompiler.hooks.invalid.tap(this.constructor.name, (fileName) => {
         if (fileName != null) {
           this._logger.debug("파일변경 감지", fileName);
+
           // NgModule 캐시 삭제
           this._ngModuleGenerator.removeCaches([path.resolve(fileName)]);
+
+          invalidFiles.push(fileName);
         }
       });
 
@@ -144,9 +148,6 @@ export class SdCliClientBuilder extends EventEmitter {
           return;
         }
 
-        // 결과 반환
-        const results = multiStats.stats.mapMany((stats) => SdCliBuildResultUtil.convertFromWebpackStats(stats));
-
         // .config.json 파일 쓰기
         const npmConfig = this._getNpmConfig(this._rootPath)!;
         const packageKey = npmConfig.name.split("/").last()!;
@@ -156,11 +157,14 @@ export class SdCliClientBuilder extends EventEmitter {
           : path.resolve(this._parsedTsconfig.options.outDir!, ".config.json");
         await FsUtil.writeFileAsync(configDistPath, JSON.stringify(this._config.configs ?? {}, undefined, 2));
 
-        // 마무리
+        // 완료 로그
         this._logger.debug("Webpack 빌드 완료");
-        resolve();
 
+        // 결과 반환
+        const results = multiStats.stats.mapMany((stats) => SdCliBuildResultUtil.convertFromWebpackStats(stats));
         this.emit("complete", results);
+
+        resolve();
       });
     });
   }
@@ -264,7 +268,8 @@ export class SdCliClientBuilder extends EventEmitter {
         "NODE_ENV=production",
         `SD_VERSION=${npmConfig.version}`,
         (this._config.builder.electron.icon !== undefined) ? `SD_ELECTRON_ICON=${this._config.builder.electron.icon}` : `SD_ELECTRON_ICON=favicon.ico`,
-        ...(this._config.env !== undefined) ? Object.keys(this._config.env).map((key) => `${key}=${this._config.env![key]}`) : []
+        ...(this._config.env !== undefined) ? Object.keys(this._config.env).map((key) => `${key}=${this._config.env![key]}`) : [],
+        ...(this._config.builder.electron.env !== undefined) ? Object.keys(this._config.builder.electron.env).map((key) => `${key}=${this._config.builder!.electron!.env![key]}`) : []
       ].filterExists().join("\n"));
 
       let electronTsFileContent = await FsUtil.readFileAsync(path.resolve(this._rootPath, `src/electron.ts`));
@@ -392,24 +397,22 @@ export class SdCliClientBuilder extends EventEmitter {
       experiments: { backCompat: false, syncWebAssembly: true, asyncWebAssembly: true },
       infrastructureLogging: { level: "error" },
       stats: "errors-warnings",
-      ...watch ? {
-        cache: {
-          type: "filesystem",
-          profile: undefined,
-          cacheDirectory: path.resolve(cacheBasePath, "angular-webpack"),
-          maxMemoryGenerations: 1,
-          name: createHash("sha1")
-            .update(workspacePkgLockContent)
-            .update(JSON.stringify(this._parsedTsconfig.options))
-            .update(JSON.stringify(this._config))
-            .update(watch.toString())
-            .digest("hex")
-        },
-        snapshot: {
-          immutablePaths: internalModuleCachePaths,
-          managedPaths: internalModuleCachePaths
-        }
-      } : {},
+      cache: {
+        type: "filesystem",
+        profile: undefined,
+        cacheDirectory: path.resolve(cacheBasePath, "angular-webpack"),
+        maxMemoryGenerations: 1,
+        name: createHash("sha1")
+          .update(workspacePkgLockContent)
+          .update(JSON.stringify(this._parsedTsconfig.options))
+          .update(JSON.stringify(this._config))
+          .update(watch.toString())
+          .digest("hex")
+      },
+      snapshot: {
+        immutablePaths: internalModuleCachePaths,
+        managedPaths: internalModuleCachePaths
+      },
       node: false,
       optimization: {
         minimizer: watch ? [] : [
@@ -484,9 +487,7 @@ export class SdCliClientBuilder extends EventEmitter {
               {
                 loader: "@angular-devkit/build-angular/src/babel/webpack-loader",
                 options: {
-                  ...watch ? {
-                    cacheDirectory: path.resolve(cacheBasePath, "babel-webpack"),
-                  } : {},
+                  cacheDirectory: path.resolve(cacheBasePath, "babel-webpack"),
                   scriptTarget: ts.ScriptTarget.ES2017,
                   aot: true,
                   optimize: !watch,
@@ -691,13 +692,11 @@ export class SdCliClientBuilder extends EventEmitter {
           ],
           deployUrl: undefined,
           sri: false,
-          ...watch ? {
-            cache: {
-              enabled: true,
-              basePath: cacheBasePath,
-              path: path.resolve(cacheBasePath, "index-webpack")
-            }
-          } : {},
+          cache: {
+            enabled: true,
+            basePath: cacheBasePath,
+            path: path.resolve(cacheBasePath, "index-webpack")
+          },
           postTransform: undefined,
           optimization: {
             scripts: !watch,
@@ -709,7 +708,8 @@ export class SdCliClientBuilder extends EventEmitter {
         }),
         new webpack.EnvironmentPlugin({
           SD_VERSION: this._getNpmConfig(this._rootPath)!.version,
-          ...this._config.env
+          ...this._config.env,
+          ...this._config.builder?.[builderType]?.env
         }),
         new ESLintWebpackPlugin({
           context: this._rootPath,

package/src/builder/SdCliJsLibBuilder.ts

@@ -1,70 +1,70 @@
-import { ISdCliPackageBuildResult } from "../commons";
-import { EventEmitter } from "events";
-import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core-node";
-import path from "path";
-import { SdCliPackageLinter } from "../build-tool/SdCliPackageLinter";
-
-export class SdCliJsLibBuilder extends EventEmitter {
-  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
-
-  private readonly _linter: SdCliPackageLinter;
-
-  public constructor(private readonly _rootPath: string) {
-    super();
-    this._linter = new SdCliPackageLinter(this._rootPath);
-  }
-
-  public override on(event: "change", listener: () => void): this;
-  public override on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
-  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
-    return super.on(event, listener);
-  }
-
-  public async watchAsync(): Promise<void> {
-    this.emit("change");
-
-    const relatedPaths = await this.getRelatedPathsAsync();
-    const watcher = SdFsWatcher.watch(relatedPaths);
-    watcher.onChange({}, async (changedInfos) => {
-      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
-      if (changeFilePaths.length === 0) return;
-
-      this._logger.debug("파일 변경 감지");
-      this.emit("change");
-      const watchBuildResults: ISdCliPackageBuildResult[] = [];
-
-      const lintFilePaths = changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
-      if (lintFilePaths.length > 0) {
-        watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths));
-      }
-
-      const watchRelatedPaths = await this.getRelatedPathsAsync();
-      watcher.add(watchRelatedPaths);
-
-      this.emit("complete", watchBuildResults);
-    });
-
-    // 빌드
-    const buildResults = await this._linter.lintAsync(relatedPaths);
-
-    this.emit("complete", buildResults);
-  }
-
-  public async buildAsync(): Promise<ISdCliPackageBuildResult[]> {
-    const relatedPaths = await this.getRelatedPathsAsync();
-    return await this._linter.lintAsync(relatedPaths);
-  }
-
-  private async getRelatedPathsAsync(): Promise<string[]> {
-    const mySourceGlobPath = path.resolve(this._rootPath, "**", "+(*.js|*.cjs|*.mjs)");
-    const mySourceFilePaths = await FsUtil.globAsync(mySourceGlobPath, {
-      ignore: [
-        "**/node_modules/**",
-        "**/dist/**",
-        "**/.*/**"
-      ]
-    });
-
-    return [...mySourceFilePaths, path.resolve(this._rootPath, ".eslintrc.cjs")].distinct();
-  }
-}
+import { ISdCliPackageBuildResult } from "../commons";
+import { EventEmitter } from "events";
+import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core-node";
+import path from "path";
+import { SdCliPackageLinter } from "../build-tool/SdCliPackageLinter";
+
+export class SdCliJsLibBuilder extends EventEmitter {
+  private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
+
+  private readonly _linter: SdCliPackageLinter;
+
+  public constructor(private readonly _rootPath: string) {
+    super();
+    this._linter = new SdCliPackageLinter(this._rootPath);
+  }
+
+  public override on(event: "change", listener: () => void): this;
+  public override on(event: "complete", listener: (results: ISdCliPackageBuildResult[]) => void): this;
+  public override on(event: string | symbol, listener: (...args: any[]) => void): this {
+    return super.on(event, listener);
+  }
+
+  public async watchAsync(): Promise<void> {
+    this.emit("change");
+
+    const relatedPaths = await this.getRelatedPathsAsync();
+    const watcher = SdFsWatcher.watch(relatedPaths);
+    watcher.onChange({}, async (changedInfos) => {
+      const changeFilePaths = changedInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
+      if (changeFilePaths.length === 0) return;
+
+      this._logger.debug("파일 변경 감지");
+      this.emit("change");
+      const watchBuildResults: ISdCliPackageBuildResult[] = [];
+
+      const lintFilePaths = changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
+      if (lintFilePaths.length > 0) {
+        watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths));
+      }
+
+      const watchRelatedPaths = await this.getRelatedPathsAsync();
+      watcher.add(watchRelatedPaths);
+
+      this.emit("complete", watchBuildResults);
+    });
+
+    // 빌드
+    const buildResults = await this._linter.lintAsync(relatedPaths);
+
+    this.emit("complete", buildResults);
+  }
+
+  public async buildAsync(): Promise<ISdCliPackageBuildResult[]> {
+    const relatedPaths = await this.getRelatedPathsAsync();
+    return await this._linter.lintAsync(relatedPaths);
+  }
+
+  private async getRelatedPathsAsync(): Promise<string[]> {
+    const mySourceGlobPath = path.resolve(this._rootPath, "**", "+(*.js|*.cjs|*.mjs)");
+    const mySourceFilePaths = await FsUtil.globAsync(mySourceGlobPath, {
+      ignore: [
+        "**/node_modules/**",
+        "**/dist/**",
+        "**/.*/**"
+      ]
+    });
+
+    return [...mySourceFilePaths, path.resolve(this._rootPath, ".eslintrc.cjs")].distinct();
+  }
+}