@simplysm/sd-cli 7.0.249 → 7.0.267

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/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/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();
+    });
+  }
 }

package/src/build-tool/SdCliIndexFileGenerator.ts

@@ -1,80 +1,79 @@
-import { ITsconfig } from "../commons";
-import path from "path";
-import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
-import os from "os";
-import chokidar from "chokidar";
-
-export class SdCliIndexFileGenerator {
-  private readonly _indexFilePath = path.resolve(this.rootPath, "src/index.ts");
-  private _contentCache: string | undefined;
-
-  public constructor(public readonly rootPath: string,
-                     public readonly config: ISdAutoIndexConfig) {
-    this._contentCache = FsUtil.exists(this._indexFilePath) ? FsUtil.readFile(this._indexFilePath) : undefined;
-  }
-
-  public async watchAsync(): Promise<void> {
-    const watcher = chokidar.watch([path.resolve(this.rootPath, "src")], { persistent: true });
-    watcher.on("add", async (filePath) => {
-      if (filePath.endsWith(".ts")) {
-        await this.runAsync();
-      }
-    });
-    watcher.on("unlink", async (filePath) => {
-      if (filePath.endsWith(".ts")) {
-        await this.runAsync();
-      }
-    });
-
-    await this.runAsync();
-  }
-
-  public async runAsync(): Promise<void> {
-    const importTexts: string[] = [];
-
-    // 옵션의 polyfills 를 모두 import
-    if (this.config.polyfills) {
-      for (const polyfill of this.config.polyfills) {
-        importTexts.push(`import "${polyfill}";`);
-      }
-    }
-
-    // 내부 파일들 import
-    const filePaths = await this._getFilePathsAsync();
-    for (const filePath of filePaths) {
-      const requirePath = PathUtil.posix(path.relative(path.dirname(this._indexFilePath), filePath))
-        .replace(/\.ts$/, "")
-        .replace(/\/index$/, "");
-
-      const sourceTsFileContent = await FsUtil.readFileAsync(filePath);
-      if (sourceTsFileContent.split("\n").some((line) => line.startsWith("export "))) {
-        importTexts.push(`export * from "./${requirePath}";`);
-      }
-      else {
-        importTexts.push(`import "./${requirePath}";`);
-      }
-    }
-
-    const content = importTexts.join(os.EOL) + os.EOL;
-    const prevContent = this._contentCache;
-    this._contentCache = content;
-    if (content.trim() !== prevContent?.trim()) {
-      await FsUtil.writeFileAsync(this._indexFilePath, content);
-    }
-  }
-
-  private async _getFilePathsAsync(): Promise<string[]> {
-    const tsconfig: ITsconfig = await FsUtil.readJsonAsync(path.resolve(this.rootPath, "tsconfig.json"));
-    const entryFilePaths = tsconfig.files?.map((item) => path.resolve(this.rootPath, item)) ?? [];
-
-    return (await FsUtil.globAsync(path.resolve(this.rootPath, "src/**/*.ts"), { nodir: true }))
-      .filter((item) => (
-        !entryFilePaths.includes(item)
-        && item !== this._indexFilePath
-      ));
-  }
-}
-
-export interface ISdAutoIndexConfig {
-  polyfills?: string[];
-}
+import { ITsconfig } from "../commons";
+import path from "path";
+import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
+import chokidar from "chokidar";
+
+export class SdCliIndexFileGenerator {
+  private readonly _indexFilePath = path.resolve(this.rootPath, "src/index.ts");
+  private _contentCache: string | undefined;
+
+  public constructor(public readonly rootPath: string,
+                     public readonly config: ISdAutoIndexConfig) {
+    this._contentCache = FsUtil.exists(this._indexFilePath) ? FsUtil.readFile(this._indexFilePath) : undefined;
+  }
+
+  public async watchAsync(): Promise<void> {
+    const watcher = chokidar.watch([path.resolve(this.rootPath, "src")], { persistent: true });
+    watcher.on("add", async (filePath) => {
+      if (filePath.endsWith(".ts")) {
+        await this.runAsync();
+      }
+    });
+    watcher.on("unlink", async (filePath) => {
+      if (filePath.endsWith(".ts")) {
+        await this.runAsync();
+      }
+    });
+
+    await this.runAsync();
+  }
+
+  public async runAsync(): Promise<void> {
+    const importTexts: string[] = [];
+
+    // 옵션의 polyfills 를 모두 import
+    if (this.config.polyfills) {
+      for (const polyfill of this.config.polyfills) {
+        importTexts.push(`import "${polyfill}";`);
+      }
+    }
+
+    // 내부 파일들 import
+    const filePaths = await this._getFilePathsAsync();
+    for (const filePath of filePaths) {
+      const requirePath = PathUtil.posix(path.relative(path.dirname(this._indexFilePath), filePath))
+        .replace(/\.ts$/, "")
+        .replace(/\/index$/, "");
+
+      const sourceTsFileContent = await FsUtil.readFileAsync(filePath);
+      if (sourceTsFileContent.split("\n").some((line) => line.startsWith("export "))) {
+        importTexts.push(`export * from "./${requirePath}";`);
+      }
+      else {
+        importTexts.push(`import "./${requirePath}";`);
+      }
+    }
+
+    const content = importTexts.join("\n") + "\n";
+    const prevContent = this._contentCache;
+    this._contentCache = content;
+    if (content.trim() !== prevContent?.trim()) {
+      await FsUtil.writeFileAsync(this._indexFilePath, content);
+    }
+  }
+
+  private async _getFilePathsAsync(): Promise<string[]> {
+    const tsconfig: ITsconfig = await FsUtil.readJsonAsync(path.resolve(this.rootPath, "tsconfig.json"));
+    const entryFilePaths = tsconfig.files?.map((item) => path.resolve(this.rootPath, item)) ?? [];
+
+    return (await FsUtil.globAsync(path.resolve(this.rootPath, "src/**/*.ts"), { nodir: true }))
+      .filter((item) => (
+        !entryFilePaths.includes(item)
+        && item !== this._indexFilePath
+      ));
+  }
+}
+
+export interface ISdAutoIndexConfig {
+  polyfills?: string[];
+}