@simplysm/sd-cli 7.0.247 → 7.0.263

package/src/utils/SdCliBuildResultUtil.ts

@@ -1,76 +1,76 @@
-import ts from "typescript";
-import os from "os";
-import path from "path";
-import { ISdCliPackageBuildResult } from "../commons";
-import webpack from "webpack";
-
-export class SdCliBuildResultUtil {
-  public static convertFromTsDiag(diag: ts.Diagnostic): ISdCliPackageBuildResult | undefined {
-    const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
-      : diag.category === ts.DiagnosticCategory.Warning ? "warning"
-        : undefined;
-    if (!severity) return undefined;
-
-    const code = `TS${diag.code}`;
-    const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
-
-
-    const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
-    const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
-    const line = position ? position.line + 1 : undefined;
-    const char = position ? position.character + 1 : undefined;
-
-    return {
-      filePath,
-      line,
-      char,
-      code,
-      severity,
-      message
-    };
-  }
-
-  public static convertFromWebpackStats(stats: webpack.Stats): ISdCliPackageBuildResult[] {
-    const results: ISdCliPackageBuildResult[] = [];
-
-    for (const statWarn of stats.compilation.warnings) {
-      if (stats.compilation.options.ignoreWarnings?.some((ignoreWarning) => ignoreWarning(statWarn, stats.compilation))) continue;
-
-      results.push(this._convertFromWebpackError("warning", statWarn));
-    }
-
-    for (const statErr of stats.compilation.errors) {
-      results.push(this._convertFromWebpackError("error", statErr));
-    }
-
-    return results;
-  }
-
-  private static _convertFromWebpackError(severity: "warning" | "error", err: webpack.WebpackError): ISdCliPackageBuildResult {
-    return {
-      filePath: err.file,
-      line: err.file ? err.loc["start"]?.line : undefined,
-      char: err.file ? err.loc["start"]?.column : undefined,
-      code: err.name,
-      severity,
-      message: err.message
-    };
-  }
-
-
-  public static getMessage(result: ISdCliPackageBuildResult): string {
-    if (result.code === "ESLintError") {
-      return result.message;
-    }
-
-    let str = "";
-    if (result.filePath !== undefined) {
-      str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
-    }
-    if (result.code !== undefined) {
-      str += `${result.code}: `;
-    }
-    str += `${result.severity} ${result.message}`;
-    return str;
-  }
-}
+import ts from "typescript";
+import os from "os";
+import path from "path";
+import { ISdCliPackageBuildResult } from "../commons";
+import webpack from "webpack";
+
+export class SdCliBuildResultUtil {
+  public static convertFromTsDiag(diag: ts.Diagnostic): ISdCliPackageBuildResult | undefined {
+    const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
+      : diag.category === ts.DiagnosticCategory.Warning ? "warning"
+        : undefined;
+    if (!severity) return undefined;
+
+    const code = `TS${diag.code}`;
+    const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
+
+
+    const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
+    const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
+    const line = position ? position.line + 1 : undefined;
+    const char = position ? position.character + 1 : undefined;
+
+    return {
+      filePath,
+      line,
+      char,
+      code,
+      severity,
+      message
+    };
+  }
+
+  public static convertFromWebpackStats(stats: webpack.Stats): ISdCliPackageBuildResult[] {
+    const results: ISdCliPackageBuildResult[] = [];
+
+    for (const statWarn of stats.compilation.warnings) {
+      if (stats.compilation.options.ignoreWarnings?.some((ignoreWarning) => ignoreWarning(statWarn, stats.compilation))) continue;
+
+      results.push(this._convertFromWebpackError("warning", statWarn));
+    }
+
+    for (const statErr of stats.compilation.errors) {
+      results.push(this._convertFromWebpackError("error", statErr));
+    }
+
+    return results;
+  }
+
+  private static _convertFromWebpackError(severity: "warning" | "error", err: webpack.WebpackError): ISdCliPackageBuildResult {
+    return {
+      filePath: (err.file as string | undefined) ?? (err.module as webpack.Module | undefined)?.["request"],
+      line: err.file ? err.loc["start"]?.line : undefined,
+      char: err.file ? err.loc["start"]?.column : undefined,
+      code: err.name,
+      severity,
+      message: err.message
+    };
+  }
+
+
+  public static getMessage(result: ISdCliPackageBuildResult): string {
+    if (result.code === "ESLintError") {
+      return result.message;
+    }
+
+    let str = "";
+    if (result.filePath !== undefined) {
+      str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
+    }
+    if (result.code !== undefined) {
+      str += `${result.code}: `;
+    }
+    str += `${result.severity} ${result.message}`;
+    return str;
+  }
+}

package/src/worker/server-worker.ts

@@ -0,0 +1,72 @@
+import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
+import { JsonConvert } from "@simplysm/sd-core-common";
+import { SdServiceServer } from "@simplysm/sd-service-server";
+
+if (process.env["SD_CLI_LOGGER_SEVERITY"] === "DEBUG") {
+  Logger.setConfig({
+    console: {
+      level: LoggerSeverity.debug
+    }
+  });
+}
+else {
+  Logger.setConfig({
+    dot: true
+  });
+}
+
+const filePathOrOpt = JsonConvert.parse(process.argv[2]) as (string | { port: number });
+
+let runningServer: SdServiceServer | undefined;
+
+if (typeof filePathOrOpt === "string") {
+  import(`file:///${filePathOrOpt}`)
+    .then((serverModule) => {
+      const server = serverModule.default as SdServiceServer | undefined;
+      if (server === undefined) {
+        // eslint-disable-next-line no-console
+        console.error(`${filePathOrOpt}(0, 0): 'SdServiceServer'를 'export'해야 합니다.`);
+        process.exit(1);
+        return;
+      }
+      const protocolStr = server.options.ssl ? "https" : "http";
+      const portStr = server.options.port.toString();
+
+      runningServer = server;
+      process.send!(`${protocolStr}://localhost:${portStr}`);
+    })
+    .catch((err) => {
+      // eslint-disable-next-line no-console
+      console.error(err);
+      process.exit(1);
+    });
+}
+// DEV SERVER
+else {
+  const server = new SdServiceServer({
+    rootPath: process.cwd(),
+    services: [],
+    port: filePathOrOpt.port
+  });
+  server.listenAsync()
+    .then(() => {
+      runningServer = server;
+      process.send!(`http://localhost:${filePathOrOpt.port}`);
+    })
+    .catch((err) => {
+      // eslint-disable-next-line no-console
+      console.error(err);
+      process.exit(1);
+    });
+}
+
+process.on("message", (msg: string) => {
+  if (!runningServer) return;
+
+  if (msg === "broadcastReload") {
+    runningServer.broadcastReload();
+  }
+  else {
+    runningServer.pathProxy = JsonConvert.parse(msg);
+  }
+});

package/tsconfig-build.json

@@ -10,6 +10,7 @@
   "files": [
     "src/bin/sd-cli.ts",
     "src/index.ts",
-    "src/worker/build-worker.ts"
+    "src/worker/build-worker.ts",
+    "src/worker/server-worker.ts"
   ]
 }

package/tsconfig.json

@@ -33,6 +33,7 @@
   "files": [
     "src/bin/sd-cli.ts",
     "src/index.ts",
-    "src/worker/build-worker.ts"
+    "src/worker/build-worker.ts",
+    "src/worker/server-worker.ts"
   ]
 }