@simplysm/sd-cli 11.0.8 → 11.0.11

package/src/build-cluster.ts

@@ -53,23 +53,22 @@ else {
   if (message.cmd === "watch") {
     // [library] javascript
     if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      if (message.withLint) {
-        await new SdCliJsLibLinter(message.pkgPath)
-          .on("change", () => {
-            sendMessage({
-              type: "change",
-              req: message
-            });
-          })
-          .on("complete", (result) => {
-            sendMessage({
-              type: "complete",
-              result,
-              req: message
-            });
-          })
-          .watchAsync();
-      }
+      await new SdCliJsLibLinter(message.pkgPath)
+        .on("change", () => {
+          sendMessage({
+            type: "change",
+            req: message
+          });
+        })
+        .on("complete", (result) => {
+          sendMessage({
+            type: "complete",
+            result,
+            req: message
+          });
+        })
+        .watchAsync();
+
       sendMessage({
         type: "ready",
         req: message
@@ -77,7 +76,7 @@ else {
     }
     // [library] typescript
     else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      await new SdCliTsLibBuilder(message.pkgPath, message.withLint)
+      await new SdCliTsLibBuilder(message.projConf, message.pkgPath)
         .on("change", () => {
           sendMessage({
             type: "change",
@@ -99,7 +98,7 @@ else {
     }
     // [server]
     else if (pkgConf.type === "server") {
-      await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint)
+      await new SdCliServerBuilder(message.projConf, message.pkgPath)
         .on("change", () => {
           sendMessage({
             type: "change",
@@ -148,25 +147,16 @@ else {
   else { // build
     // [library] javascript
     if (pkgConf.type === "library" && !FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      if (message.withLint) {
-        const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
-        sendMessage({
-          type: "complete",
-          result,
-          req: message
-        });
-      }
-      else {
-        sendMessage({
-          type: "complete",
-          result: undefined,
-          req: message
-        });
-      }
+      const result = await new SdCliJsLibLinter(message.pkgPath).buildAsync();
+      sendMessage({
+        type: "complete",
+        result,
+        req: message
+      });
     }
     // [library] typescript
     else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
-      const result = await new SdCliTsLibBuilder(message.pkgPath, message.withLint).buildAsync();
+      const result = await new SdCliTsLibBuilder(message.projConf, message.pkgPath).buildAsync();
       sendMessage({
         type: "complete",
         result,
@@ -175,7 +165,7 @@ else {
     }
     // [server]
     else if (pkgConf.type === "server") {
-      const result = await new SdCliServerBuilder(message.projConf, message.pkgPath, message.withLint).buildAsync();
+      const result = await new SdCliServerBuilder(message.projConf, message.pkgPath).buildAsync();
       sendMessage({
         type: "complete",
         result,

package/src/build-tools/SdCliCordova.ts

@@ -0,0 +1,240 @@
+import {INpmConfig, ISdCliClientBuilderCordovaConfig} from "../commons";
+import * as path from "path";
+import {FsUtil, Logger, SdProcess} from "@simplysm/sd-core-node";
+import xml2js from "xml2js";
+
+const BIN_PATH = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
+
+export class SdCliCordova {
+  protected readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliCordova"]);
+
+  private readonly _platforms: string[];
+  private readonly _npmConfig: INpmConfig;
+
+  public constructor(private readonly _opt: {
+    pkgPath: string;
+    config: ISdCliClientBuilderCordovaConfig;
+    cordovaPath: string;
+  }) {
+    this._platforms = Object.keys(this._opt.config.platform ?? {browser: {}});
+    this._npmConfig = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
+    // this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, this._npmConfig.name]);
+  }
+
+  private async _execAsync(cmd: string, cwd: string): Promise<void> {
+    this._logger.debug(cmd);
+    const msg = await SdProcess.spawnAsync(cmd, {cwd});
+    this._logger.debug(msg);
+  }
+
+  public async initializeAsync(): Promise<void> {
+    if (FsUtil.exists(this._opt.cordovaPath)) {
+      this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
+    }
+    else {
+      await this._execAsync(`${BIN_PATH} telemetry on`, this._opt.pkgPath);
+
+      // 프로젝트 생성
+      await this._execAsync(`${BIN_PATH} create "${this._opt.cordovaPath}" "${this._opt.config.appId}" "${this._opt.config.appName}"`, process.cwd());
+    }
+
+    // platforms 폴더 혹시 없으면 생성
+    await FsUtil.mkdirsAsync(path.resolve(this._opt.cordovaPath, "platforms"));
+
+    // www 폴더 혹시 없으면 생성
+    await FsUtil.mkdirsAsync(path.resolve(this._opt.cordovaPath, "www"));
+
+    // 미설치 빌드 플랫폼 신규 생성
+    const alreadyPlatforms = await FsUtil.readdirAsync(path.resolve(this._opt.cordovaPath, "platforms"));
+    for (const platform of this._platforms) {
+      if (!alreadyPlatforms.includes(platform)) {
+        await this._execAsync(`${BIN_PATH} platform add ${platform}`, this._opt.cordovaPath);
+      }
+    }
+
+    // 설치 미빌드 플랫폼 삭제
+    for (const alreadyPlatform of alreadyPlatforms) {
+      if (!this._platforms.includes(alreadyPlatform)) {
+        await this._execAsync(`${BIN_PATH} platform remove ${alreadyPlatform}`, this._opt.cordovaPath);
+      }
+    }
+
+    // 설치된 미사용 플러그인 삭제
+    const pluginsFetch = FsUtil.exists(path.resolve(this._opt.cordovaPath, "plugins/fetch.json"))
+      ? await FsUtil.readJsonAsync(path.resolve(this._opt.cordovaPath, "plugins/fetch.json"))
+      : undefined;
+    const alreadyPluginIds = pluginsFetch != undefined
+      ? Object.values(pluginsFetch)
+        .map((item: any) => (item.source.id !== undefined ? item.source.id : item.source.url))
+      : [];
+    const usePlugins = ["cordova-plugin-ionic-webview", ...this._opt.config.plugins ?? []].distinct();
+
+    for (const alreadyPluginId of alreadyPluginIds) {
+      let hasPlugin = false;
+      for (const usePlugin of usePlugins) {
+        if (
+          (usePlugin.includes("@") && alreadyPluginId === usePlugin) ||
+          (!usePlugin.includes("@") && alreadyPluginId.replace(/@.*$/, "") === usePlugin)
+        ) {
+          hasPlugin = true;
+          break;
+        }
+      }
+
+      if (!hasPlugin) {
+        await this._execAsync(`${BIN_PATH} plugin remove ${alreadyPluginId.replace(/@.*$/, "")}`, this._opt.cordovaPath);
+      }
+    }
+
+    // 미설치 플러그인들 설치
+    for (const usePlugin of usePlugins) {
+      if (
+        (usePlugin.includes("@") && !alreadyPluginIds.includes(usePlugin)) ||
+        (!usePlugin.includes("@") && !alreadyPluginIds.map((alreadyPluginId) => alreadyPluginId.replace(/@.*$/, "")).includes(usePlugin))
+      ) {
+        await this._execAsync(`${BIN_PATH} plugin add ${usePlugin}`, this._opt.cordovaPath);
+      }
+    }
+
+    // ANDROID SIGN 파일 복사
+    if (this._opt.config.platform?.android?.sign) {
+      await FsUtil.copyAsync(
+        path.resolve(this._opt.pkgPath, "src", this._opt.config.platform.android.sign.keystore),
+        path.resolve(this._opt.cordovaPath, "android.keystore")
+      );
+    }
+    else {
+      await FsUtil.removeAsync(path.resolve(this._opt.cordovaPath, "android.keystore"));
+      // SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
+      await FsUtil.removeAsync(path.resolve(this._opt.cordovaPath, "platforms/android/release-signing.properties"));
+    }
+
+    // 빌드 옵션 파일 생성
+    await FsUtil.writeJsonAsync(
+      path.resolve(this._opt.cordovaPath, "build.json"),
+      {
+        ...this._opt.config.platform?.android ? {
+          android: {
+            release: {
+              packageType: this._opt.config.platform.android.bundle ? "bundle" : "apk",
+              ...this._opt.config.platform.android.sign ? {
+                keystore: path.resolve(this._opt.cordovaPath, "android.keystore"),
+                storePassword: this._opt.config.platform.android.sign.storePassword,
+                alias: this._opt.config.platform.android.sign.alias,
+                password: this._opt.config.platform.android.sign.password,
+                keystoreType: this._opt.config.platform.android.sign.keystoreType
+              } : {}
+            }
+          }
+        } : {}
+      }
+    );
+
+    // ICON 파일 복사
+    if (this._opt.config.icon !== undefined) {
+      await FsUtil.copyAsync(path.resolve(this._opt.pkgPath, "src", this._opt.config.icon), path.resolve(this._opt.cordovaPath, "res/icon", path.basename(this._opt.config.icon)));
+    }
+    else {
+      await FsUtil.removeAsync(path.resolve(this._opt.cordovaPath, "res/icon"));
+    }
+
+    // CONFIG: 초기값 백업
+    const configFilePath = path.resolve(this._opt.cordovaPath, "config.xml");
+    const configBackFilePath = path.resolve(this._opt.cordovaPath, "config.xml.bak");
+    if (!FsUtil.exists(configBackFilePath)) {
+      await FsUtil.copyAsync(configFilePath, configBackFilePath);
+    }
+
+    // CONFIG: 초기값 읽기
+    const configFileContent = await FsUtil.readFileAsync(configBackFilePath);
+    const configXml = await xml2js.parseStringPromise(configFileContent);
+
+
+    // CONFIG: 버전 설정
+    configXml.widget.$.version = this._npmConfig.version;
+
+    // CONFIG: ICON 설정
+    if (this._opt.config.icon !== undefined) {
+      configXml["widget"]["icon"] = [{"$": {"src": "res/icon/" + path.basename(this._opt.config.icon)}}];
+    }
+
+    // CONFIG: 접근허용 세팅
+    configXml["widget"]["access"] = [{"$": {"origin": "*"}}];
+    configXml["widget"]["allow-navigation"] = [{"$": {"href": "*"}}];
+    configXml["widget"]["allow-intent"] = [{"$": {"href": "*"}}];
+    configXml["widget"]["preference"] = [{"$": {"name": "MixedContentMode", "value": "0"}}];
+
+    // CONFIG: ANDROID usesCleartextTraffic 설정
+    if (this._opt.config.platform?.android) {
+      configXml.widget.$["xmlns:android"] = "http://schemas.android.com/apk/res/android";
+
+      configXml["widget"]["platform"] = configXml["widget"]["platform"] ?? [];
+      configXml["widget"]["platform"].push({
+        "$": {
+          "name": "android"
+        },
+        "edit-config": [{
+          "$": {
+            "file": "app/src/main/AndroidManifest.xml",
+            "mode": "merge",
+            "target": "/manifest/application"
+          },
+          "application": [{
+            "$": {
+              "android:usesCleartextTraffic": "true"
+            }
+          }]
+        }]
+      });
+    }
+
+    // CONFIG: 파일 새로 쓰기
+    const configResultContent = new xml2js.Builder().buildObject(configXml);
+    await FsUtil.writeFileAsync(configFilePath, configResultContent);
+
+    // 각 플랫폼 www 준비
+    await this._execAsync(`${BIN_PATH} prepare`, this._opt.cordovaPath);
+  }
+
+  public async buildAsync(outPath: string): Promise<void> {
+    // 실행
+    const buildType = this._opt.config.debug ? "debug" : "release";
+    for (const platform of this._platforms) {
+      await this._execAsync(`${BIN_PATH} build ${platform} --${buildType}`, this._opt.cordovaPath);
+    }
+
+    // 결과물 복사: ANDROID
+    if (this._opt.config.platform?.android) {
+      const targetOutPath = path.resolve(outPath, "android");
+      const apkFileName = this._opt.config.platform.android.sign ? `app-${buildType}.apk` : `app-${buildType}-unsigned.apk`;
+      const latestDistApkFileName = path.basename(`${this._opt.config.appName}${this._opt.config.platform.android.sign ? "" : "-unsigned"}-latest.apk`);
+      await FsUtil.mkdirsAsync(targetOutPath);
+      await FsUtil.copyAsync(
+        path.resolve(this._opt.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
+        path.resolve(targetOutPath, latestDistApkFileName)
+      );
+      // 자동업데이트를 위한 파일 쓰기
+      await FsUtil.copyAsync(
+        path.resolve(this._opt.cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
+        path.resolve(path.resolve(targetOutPath, "updates"), this._npmConfig.version + ".apk")
+      );
+    }
+  }
+
+  public static async runWebviewOnDeviceAsync(opt: {
+    platform: string,
+    pkgName: string,
+    url?: string
+  }): Promise<void> {
+    const cordovaPath = path.resolve(process.cwd(), `packages/${opt.pkgName}/.cordova/`);
+
+    if (opt.url !== undefined) {
+      await FsUtil.removeAsync(path.resolve(cordovaPath, "www"));
+      await FsUtil.mkdirsAsync(path.resolve(cordovaPath, "www"));
+      await FsUtil.writeFileAsync(path.resolve(cordovaPath, "www/index.html"), `'${opt.url}'로 이동중... <script>setTimeout(function () {window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.pkgName}/cordova/"}, 3000);</script>`.trim());
+    }
+
+    const binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
+    await SdProcess.spawnAsync(`${binPath} run ${opt.platform} --device`, {cwd: cordovaPath}, true);
+  }
+}

package/src/build-tools/SdCliNgRoutesFileGenerator.ts

@@ -0,0 +1,80 @@
+import path from "path";
+import {FsUtil, PathUtil, SdFsWatcher} from "@simplysm/sd-core-node";
+import {StringUtil} from "@simplysm/sd-core-common";
+
+export class SdCliNgRoutesFileGenerator {
+  public static async watchAsync(pkgPath: string): Promise<void> {
+    const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
+    let cache = FsUtil.exists(routesFilePath) ? FsUtil.readFile(routesFilePath) : undefined;
+
+    SdFsWatcher
+      .watch([path.resolve(pkgPath, "src")])
+      .onChange({}, async () => {
+        cache = await this.runAsync(pkgPath, cache);
+      });
+
+    cache = await this.runAsync(pkgPath, cache);
+  }
+
+  public static async runAsync(pkgPath: string, cache?: string): Promise<string> {
+    const appDirPath = path.resolve(pkgPath, "src/app");
+    const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
+
+    // 내부 파일들 import
+    const result: TInfo = new Map();
+    const filePaths = await FsUtil.globAsync(path.resolve(appDirPath, "**/*Page.ts"));
+    for (const filePath of filePaths.orderBy()) {
+      const relModulePath = PathUtil.posix(path.relative(appDirPath, filePath)).slice(0, -3);
+      const codes = relModulePath.slice(0, -4).split("/").map(item => StringUtil.toKebabCase(item));
+
+      let cursorItem!: { relModulePath?: string; children: TInfo };
+      let cursor = result;
+
+      for (const code of codes) {
+        cursorItem = cursor.getOrCreate(code, {children: new Map()});
+        cursor = cursorItem.children;
+      }
+
+      cursorItem.relModulePath = relModulePath;
+    }
+
+
+    const fn = (currInfo: TInfo, indent: number): string => {
+      const indentStr = new Array(indent).fill(" ").join("");
+
+      let cont = "";
+      for (const [key, val] of currInfo) {
+        cont += indentStr + "{\n";
+        cont += indentStr + `  path: "${key}",\n`;
+        if (val.relModulePath != null) {
+          cont += indentStr + `  loadComponent: () => import("./app/${val.relModulePath}").then((m) => m.${path.basename(val.relModulePath)}),\n`;
+          cont += indentStr + `  canDeactivate: [sdCanDeactivateGuard],\n`;
+        }
+        if (val.children.size > 0) {
+          cont += indentStr + `  children: [\n`;
+          cont += fn(val.children, indent + 4) + "\n";
+          cont += indentStr + `  ]\n`;
+        }
+        cont += indentStr + "},\n";
+      }
+      return cont.trimEnd();
+    };
+
+    const content = `
+import {sdCanDeactivateGuard} from "@simplysm/sd-angular";
+import {Routes} from "@angular/router";
+
+export const routes: Routes = [
+${fn(result, 2)}
+];`.trim();
+    if (content.trim() !== cache?.trim()) {
+      await FsUtil.writeFileAsync(routesFilePath, content);
+    }
+    return content;
+  }
+}
+
+type TInfo = Map<string, {
+  relModulePath?: string;
+  children: TInfo
+}>;

package/src/build-tools/SdLinter.ts

@@ -5,6 +5,17 @@ import path from "path";
 
 export class SdLinter {
   public static async lintAsync(filePaths: string[], programOrPkgPath?: ts.Program | string): Promise<ISdCliPackageBuildResult[]> {
+    const sourceFilePaths = filePaths.filter((item) =>
+      (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
+      item.endsWith(".js") ||
+      item.endsWith(".cjs") ||
+      item.endsWith(".mjs")
+    );
+
+    if (sourceFilePaths.length === 0) {
+      return [];
+    }
+
     const linter = new ESLint(programOrPkgPath !== null ? {
       overrideConfig: {
         overrides: [
@@ -37,7 +48,7 @@ export class SdLinter {
       }
     } : undefined);
 
-    const lintResults = await linter.lintFiles(filePaths);
+    const lintResults = await linter.lintFiles(sourceFilePaths);
 
     return lintResults.mapMany((lintResult) => lintResult.messages.map((msg) => ({
       filePath: lintResult.filePath,