@simplysm/sd-cli 7.0.263 → 7.0.266

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "7.0.263",
+  "version": "7.0.266",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -23,11 +23,11 @@
     "@babel/parser": "^7.17.0",
     "@babel/types": "^7.17.0",
     "@ngtools/webpack": "^13.2.2",
-    "@simplysm/sd-core-common": "7.0.263",
-    "@simplysm/sd-core-node": "7.0.263",
-    "@simplysm/sd-service-common": "7.0.263",
-    "@simplysm/sd-service-server": "7.0.263",
-    "@simplysm/sd-storage": "7.0.263",
+    "@simplysm/sd-core-common": "7.0.266",
+    "@simplysm/sd-core-node": "7.0.266",
+    "@simplysm/sd-service-common": "7.0.266",
+    "@simplysm/sd-service-server": "7.0.266",
+    "@simplysm/sd-storage": "7.0.266",
     "browserslist": "^4.19.1",
     "chokidar": "^3.5.3",
     "connect": "^3.7.0",

package/src/SdCliBuildResultError.ts

@@ -1,9 +1,9 @@
-import { SdError } from "@simplysm/sd-core-common";
-import { ISdCliPackageBuildResult } from "./commons";
-import { SdCliBuildResultUtil } from "./utils/SdCliBuildResultUtil";
-
-export class SdCliBuildResultError extends SdError {
-  public constructor(buildResult: ISdCliPackageBuildResult) {
-    super(SdCliBuildResultUtil.getMessage(buildResult));
-  }
-}
+import { SdError } from "@simplysm/sd-core-common";
+import { ISdCliPackageBuildResult } from "./commons";
+import { SdCliBuildResultUtil } from "./utils/SdCliBuildResultUtil";
+
+export class SdCliBuildResultError extends SdError {
+  public constructor(buildResult: ISdCliPackageBuildResult) {
+    super(SdCliBuildResultUtil.getMessage(buildResult));
+  }
+}

package/src/bin/sd-cli.ts

@@ -14,7 +14,7 @@ import { SdCliProjectGenerator } from "../entry-points/SdCliProjectGenerator";
 
 Error.stackTraceLimit = Infinity;
 
-const argv = yargs(hideBin(process.argv))
+const argv = (yargs(hideBin(process.argv)) as any)
   .help("help", "도움말")
   .alias("help", "h")
   .options({
@@ -229,6 +229,11 @@ const argv = yargs(hideBin(process.argv))
               type: "boolean",
               describe: "DOM객체(window, document 등) 사용 여부",
               default: false
+            },
+            isForAngular: {
+              type: "boolean",
+              describe: "Angular 라이브러리 여부 (useDom 옵션을 덮어씁니다)",
+              default: false
             }
           })
           .example([
@@ -250,7 +255,7 @@ const argv = yargs(hideBin(process.argv))
           ])
       )
       .command(
-        "db-model <dbName> <category> <name> <description>",
+        "db-model <dbName> <category></category> <name> <description>",
         "DB 패키지에 모델를 추가합니다.",
         (cmd1) => cmd1.version(false).hide("help").hide("debug")
           .positional("dbName", {
@@ -316,10 +321,39 @@ const argv = yargs(hideBin(process.argv))
             ["$0 add client admin 관리자 server"]
           ])
       )
+      .command(
+        "page <pkgName> <name> [category]",
+        "패키지에 페이지를 추가합니다.",
+        (cmd1) => cmd1.version(false).hide("help").hide("debug")
+          .positional("pkgName", {
+            type: "string",
+            describe: "패키지명",
+            demandOption: true
+          })
+          .positional("name", {
+            type: "string",
+            describe: "페이지명",
+            demandOption: true
+          })
+          .positional("category", {
+            type: "string",
+            describe: "추가할 페이지의 분류명"
+          })
+          .options({
+            isRouteParent: {
+              type: "boolean",
+              describe: "router-outlet 포함 여부",
+              default: false
+            }
+          })
+          .example([
+            ["$0 add page admin Employee home/base"]
+          ])
+      )
   )
   .parseSync();
 
-if (argv.debug) {
+if (Boolean(argv.debug)) {
   process.env["SD_CLI_LOGGER_SEVERITY"] = "DEBUG";
 
   Logger.setConfig({
@@ -395,7 +429,7 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
         optNames: argv.options ?? [],
         pkgs: argv.packages ?? []
       });
-    if (!argv.noBuild) {
+    if (!Boolean(argv.noBuild)) {
       process.exit(0);
     }
   }
@@ -418,7 +452,8 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
       await new SdCliProjectGenerator(process.cwd()).addTsLibAsync({
         name: argv.name!,
         description: argv.description!,
-        useDom: argv.useDom
+        useDom: argv.useDom,
+        isForAngular: argv.isForAngular
       });
     }
     else if (argv._[1] === "db-lib") {
@@ -434,6 +469,14 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
         description: argv.description!
       });
     }
+    else if (argv._[1] === "page") {
+      await new SdCliProjectGenerator(process.cwd()).addPageAsync({
+        pkgName: argv.pkgName,
+        category: argv.category,
+        name: argv.name!,
+        isRouteParent: argv.isRouteParent
+      });
+    }
     else if (argv._[1] === "server") {
       await new SdCliProjectGenerator(process.cwd()).addServerAsync({
         name: argv.name,

package/src/build-tool/SdCliCacheCompilerHost.ts

@@ -1,77 +1,77 @@
-import ts from "typescript";
-import { PathUtil } from "@simplysm/sd-core-node";
-
-export class SdCliCacheCompilerHost {
-  public static create(parsedTsconfig: ts.ParsedCommandLine,
-                       moduleResolutionCache: ts.ModuleResolutionCache,
-                       sourceFileCache: Map<string, IFileCache>,
-                       outputFileCache: Map<string, string>): ts.CompilerHost {
-    const compilerHost = ts.createIncrementalCompilerHost(parsedTsconfig.options);
-
-    const cacheCompilerHost = { ...compilerHost };
-
-    cacheCompilerHost.fileExists = (fileName: string) => {
-      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
-      if (cache.exists === undefined) {
-        cache.exists = compilerHost.fileExists.call(cacheCompilerHost, fileName);
-      }
-      return cache.exists;
-    };
-
-    cacheCompilerHost.getSourceFile = (fileName: string, languageVersion: ts.ScriptTarget) => {
-      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
-      if (!cache.sourceFile) {
-        cache.sourceFile = compilerHost.getSourceFile.call(cacheCompilerHost, fileName, languageVersion);
-      }
-      return cache.sourceFile;
-    };
-
-    cacheCompilerHost.writeFile = (fileName: string,
-                                   data: string,
-                                   writeByteOrderMark: boolean,
-                                   onError?: (message: string) => void,
-                                   sourceFiles?: readonly ts.SourceFile[]) => {
-      if (parsedTsconfig.options.module === ts.ModuleKind.CommonJS) {
-        fileName = fileName.replace(/\.js(\.map)?$/, ".cjs$1");
-      }
-      else {
-        fileName = fileName.replace(/\.js(\.map)?$/, ".mjs$1");
-      }
-
-
-      const writeCache = outputFileCache.get(PathUtil.posix(fileName));
-      if (writeCache !== data) {
-        outputFileCache.set(PathUtil.posix(fileName), data);
-        compilerHost.writeFile.call(cacheCompilerHost, fileName, data, writeByteOrderMark, onError, sourceFiles);
-      }
-    };
-
-    cacheCompilerHost.readFile = (fileName: string) => {
-      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
-      if (cache.content === undefined) {
-        cache.content = compilerHost.readFile.call(cacheCompilerHost, fileName);
-      }
-      return cache.content;
-    };
-
-    cacheCompilerHost.resolveModuleNames = (moduleNames: string[], containingFile: string) => {
-      return moduleNames.map((moduleName) => {
-        return ts.resolveModuleName(
-          moduleName,
-          PathUtil.posix(containingFile),
-          parsedTsconfig.options,
-          compilerHost,
-          moduleResolutionCache
-        ).resolvedModule;
-      });
-    };
-
-    return cacheCompilerHost;
-  }
-}
-
-interface IFileCache {
-  exists?: boolean;
-  sourceFile?: ts.SourceFile;
-  content?: string;
-}
+import ts from "typescript";
+import { PathUtil } from "@simplysm/sd-core-node";
+
+export class SdCliCacheCompilerHost {
+  public static create(parsedTsconfig: ts.ParsedCommandLine,
+                       moduleResolutionCache: ts.ModuleResolutionCache,
+                       sourceFileCache: Map<string, IFileCache>,
+                       outputFileCache: Map<string, string>): ts.CompilerHost {
+    const compilerHost = ts.createIncrementalCompilerHost(parsedTsconfig.options);
+
+    const cacheCompilerHost = { ...compilerHost };
+
+    cacheCompilerHost.fileExists = (fileName: string) => {
+      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
+      if (cache.exists === undefined) {
+        cache.exists = compilerHost.fileExists.call(cacheCompilerHost, fileName);
+      }
+      return cache.exists;
+    };
+
+    cacheCompilerHost.getSourceFile = (fileName: string, languageVersion: ts.ScriptTarget) => {
+      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
+      if (!cache.sourceFile) {
+        cache.sourceFile = compilerHost.getSourceFile.call(cacheCompilerHost, fileName, languageVersion);
+      }
+      return cache.sourceFile;
+    };
+
+    cacheCompilerHost.writeFile = (fileName: string,
+                                   data: string,
+                                   writeByteOrderMark: boolean,
+                                   onError?: (message: string) => void,
+                                   sourceFiles?: readonly ts.SourceFile[]) => {
+      if (parsedTsconfig.options.module === ts.ModuleKind.CommonJS) {
+        fileName = fileName.replace(/\.js(\.map)?$/, ".cjs$1");
+      }
+      else {
+        fileName = fileName.replace(/\.js(\.map)?$/, ".mjs$1");
+      }
+
+
+      const writeCache = outputFileCache.get(PathUtil.posix(fileName));
+      if (writeCache !== data) {
+        outputFileCache.set(PathUtil.posix(fileName), data);
+        compilerHost.writeFile.call(cacheCompilerHost, fileName, data, writeByteOrderMark, onError, sourceFiles);
+      }
+    };
+
+    cacheCompilerHost.readFile = (fileName: string) => {
+      const cache = sourceFileCache.getOrCreate(PathUtil.posix(fileName), {});
+      if (cache.content === undefined) {
+        cache.content = compilerHost.readFile.call(cacheCompilerHost, fileName);
+      }
+      return cache.content;
+    };
+
+    cacheCompilerHost.resolveModuleNames = (moduleNames: string[], containingFile: string) => {
+      return moduleNames.map((moduleName) => {
+        return ts.resolveModuleName(
+          moduleName,
+          PathUtil.posix(containingFile),
+          parsedTsconfig.options,
+          compilerHost,
+          moduleResolutionCache
+        ).resolvedModule;
+      });
+    };
+
+    return cacheCompilerHost;
+  }
+}
+
+interface IFileCache {
+  exists?: boolean;
+  sourceFile?: ts.SourceFile;
+  content?: string;
+}

package/src/build-tool/SdCliCordova.ts

@@ -8,7 +8,7 @@ export class SdCliCordova {
 
   private readonly _npmConfig: INpmConfig;
 
-  public readonly cordovaPath = path.resolve(this._rootPath, ".cordova");
+  public readonly cordovaPath = path.resolve(this._rootPath, ".cache", "cordova");
   private readonly _binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
 
   public get platforms(): ("browser" | "android")[] {
@@ -34,7 +34,7 @@ export class SdCliCordova {
       this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
     }
     else {
-      await this._execAsync(`${this._binPath} telemetry on`, this._rootPath);
+      await this._execAsync(`${this._binPath} telemetry on`, this.cordovaPath);
 
       // 프로젝트 생성
       await this._execAsync(`${this._binPath} create "${this.cordovaPath}" "${this._config.appId}" "${this._config.appName}"`, process.cwd());

package/src/build-tool/SdCliGithubApi.ts

@@ -1,111 +1,111 @@
-import https from "https";
-import { SdProcess } from "@simplysm/sd-core-node";
-import mime from "mime";
-
-export class SdCliGithubApi {
-  public constructor(private readonly _apiKey: string,
-                     private readonly _repoOwner: string,
-                     private readonly _repoName: string) {
-  }
-
-  public async uploadAsync(version: string, files: { name: string; buffer: Buffer }[]): Promise<void> {
-    const releaseId = await this._createReleaseTagAsync(version);
-
-    for (const file of files) {
-      await this._uploadFileAsync(releaseId, file.name, file.buffer);
-    }
-  }
-
-  private async _uploadFileAsync(releaseId: number, fileName: string, buffer: Buffer): Promise<void> {
-    const contentLength = buffer.length;
-
-    await new Promise<void>((resolve, reject) => {
-      const req = https.request(
-        `https://uploads.github.com/repos/${this._repoOwner}/${this._repoName}/releases/${releaseId}/assets?name=${fileName}&label=${fileName}`,
-        {
-          method: "POST",
-          headers: {
-            "Authorization": `token ${this._apiKey}`,
-            "Accept": "application/vnd.github.v3+json",
-            "User-Agent": "@simplysm/sd-cli:publish",
-            "Content-Length": contentLength,
-            "Content-Type": mime.getType(fileName)!
-          }
-        },
-        (res) => {
-          let dataBuffer = Buffer.from([]);
-          res.on("data", data => {
-            dataBuffer = Buffer.concat([dataBuffer, data]);
-          });
-
-          res.on("end", () => {
-            if (res.statusCode !== 201) {
-              const errObj = JSON.parse(dataBuffer.toString());
-              throw new Error(errObj.message + "(" + errObj.documentation_url + ")");
-            }
-            else {
-              resolve();
-            }
-          });
-        }
-      );
-
-      req.on("error", (error) => {
-        reject(error);
-      });
-      req.write(buffer);
-      req.end();
-    });
-  }
-
-  private async _createReleaseTagAsync(ver: string): Promise<number> {
-    const currentBranch = (await SdProcess.spawnAsync("git branch --show-current")).trim();
-
-    return await new Promise<number>((resolve, reject) => {
-      const req = https.request(
-        `https://api.github.com/repos/${this._repoOwner}/${this._repoName}/releases`,
-        {
-          method: "POST",
-          headers: {
-            "Authorization": `token ${this._apiKey}`,
-            "Accept": "application/vnd.github.v3+json",
-            "User-Agent": "@simplysm/sd-cli:publish"
-          }
-        },
-        (res) => {
-          let dataBuffer = Buffer.from([]);
-          res.on("data", data => {
-            dataBuffer = Buffer.concat([dataBuffer, data]);
-          });
-
-          res.on("end", () => {
-            if (res.statusCode !== 201) {
-              const errObj = JSON.parse(dataBuffer.toString());
-              throw new Error(errObj.message + "(" + errObj.documentation_url + ")");
-            }
-            else {
-              // console.log(JSON.parse(dataBuffer.toString()));
-              const resData = JSON.parse(dataBuffer.toString());
-              resolve(resData.id);
-            }
-          });
-        }
-      );
-
-      req.on("error", (error) => {
-        reject(error);
-      });
-
-      req.write(JSON.stringify({
-        tag_name: `v${ver}`,
-        target_commitish: currentBranch,
-        name: `v${ver}`,
-        body: `v${ver}`,
-        draft: false,
-        prerelease: false
-      }));
-
-      req.end();
-    });
-  }
+import https from "https";
+import { SdProcess } from "@simplysm/sd-core-node";
+import mime from "mime";
+
+export class SdCliGithubApi {
+  public constructor(private readonly _apiKey: string,
+                     private readonly _repoOwner: string,
+                     private readonly _repoName: string) {
+  }
+
+  public async uploadAsync(version: string, files: { name: string; buffer: Buffer }[]): Promise<void> {
+    const releaseId = await this._createReleaseTagAsync(version);
+
+    for (const file of files) {
+      await this._uploadFileAsync(releaseId, file.name, file.buffer);
+    }
+  }
+
+  private async _uploadFileAsync(releaseId: number, fileName: string, buffer: Buffer): Promise<void> {
+    const contentLength = buffer.length;
+
+    await new Promise<void>((resolve, reject) => {
+      const req = https.request(
+        `https://uploads.github.com/repos/${this._repoOwner}/${this._repoName}/releases/${releaseId}/assets?name=${fileName}&label=${fileName}`,
+        {
+          method: "POST",
+          headers: {
+            "Authorization": `token ${this._apiKey}`,
+            "Accept": "application/vnd.github.v3+json",
+            "User-Agent": "@simplysm/sd-cli:publish",
+            "Content-Length": contentLength,
+            "Content-Type": mime.getType(fileName)!
+          }
+        },
+        (res) => {
+          let dataBuffer = Buffer.from([]);
+          res.on("data", data => {
+            dataBuffer = Buffer.concat([dataBuffer, data]);
+          });
+
+          res.on("end", () => {
+            if (res.statusCode !== 201) {
+              const errObj = JSON.parse(dataBuffer.toString());
+              throw new Error(errObj.message + "(" + errObj.documentation_url + ")");
+            }
+            else {
+              resolve();
+            }
+          });
+        }
+      );
+
+      req.on("error", (error) => {
+        reject(error);
+      });
+      req.write(buffer);
+      req.end();
+    });
+  }
+
+  private async _createReleaseTagAsync(ver: string): Promise<number> {
+    const currentBranch = (await SdProcess.spawnAsync("git branch --show-current")).trim();
+
+    return await new Promise<number>((resolve, reject) => {
+      const req = https.request(
+        `https://api.github.com/repos/${this._repoOwner}/${this._repoName}/releases`,
+        {
+          method: "POST",
+          headers: {
+            "Authorization": `token ${this._apiKey}`,
+            "Accept": "application/vnd.github.v3+json",
+            "User-Agent": "@simplysm/sd-cli:publish"
+          }
+        },
+        (res) => {
+          let dataBuffer = Buffer.from([]);
+          res.on("data", data => {
+            dataBuffer = Buffer.concat([dataBuffer, data]);
+          });
+
+          res.on("end", () => {
+            if (res.statusCode !== 201) {
+              const errObj = JSON.parse(dataBuffer.toString());
+              throw new Error(errObj.message + "(" + errObj.documentation_url + ")");
+            }
+            else {
+              // console.log(JSON.parse(dataBuffer.toString()));
+              const resData = JSON.parse(dataBuffer.toString());
+              resolve(resData.id);
+            }
+          });
+        }
+      );
+
+      req.on("error", (error) => {
+        reject(error);
+      });
+
+      req.write(JSON.stringify({
+        tag_name: `v${ver}`,
+        target_commitish: currentBranch,
+        name: `v${ver}`,
+        body: `v${ver}`,
+        draft: false,
+        prerelease: false
+      }));
+
+      req.end();
+    });
+  }
 }