@simplysm/sd-cli 11.1.45 → 11.1.51

package/src/build-cluster.ts

@@ -39,9 +39,10 @@ if (cluster.isPrimary) {
     sendMessage(message);
   });
 
-  process.on("message", (message) => {
+  process.on("message", (message: ISdCliBuildClusterReqMessage) => {
     cluster.fork({
-      "SD_CLUSTER_MESSAGE": JSON.stringify(message)
+      "SD_CLUSTER_MESSAGE": JSON.stringify(message),
+      "NODE_OPTIONS": message.execArgs?.join(" ")
     });
   });
   process.send!("ready");
@@ -67,6 +68,7 @@ else {
               result,
               req: message
             });
+            logMemory(message);
           })
           .watchAsync();
 
@@ -90,6 +92,7 @@ else {
               result,
               req: message
             });
+            logMemory(message);
           })
           .watchAsync();
         sendMessage({
@@ -112,6 +115,7 @@ else {
               result,
               req: message
             });
+            logMemory(message);
           })
           .watchAsync();
         sendMessage({
@@ -134,6 +138,7 @@ else {
               result,
               req: message
             });
+            logMemory(message);
           })
           .watchAsync();
         sendMessage({
@@ -154,6 +159,7 @@ else {
           result,
           req: message
         });
+        logMemory(message);
       }
       // [library] typescript
       else if (pkgConf.type === "library" && FsUtil.exists(path.resolve(message.pkgPath, "tsconfig.json"))) {
@@ -163,6 +169,7 @@ else {
           result,
           req: message
         });
+        logMemory(message);
       }
       // [server]
       else if (pkgConf.type === "server") {
@@ -170,8 +177,9 @@ else {
         sendMessage({
           type: "complete",
           result,
-          req: message
+          req: message,
         });
+        logMemory(message);
       }
       // [client]
       else if (pkgConf.type === "client") {
@@ -179,8 +187,9 @@ else {
         sendMessage({
           type: "complete",
           result,
-          req: message
+          req: message,
         });
+        logMemory(message);
       }
       else {
         throw new NeverEntryError();
@@ -196,3 +205,8 @@ else {
 function sendMessage(message: ISdCliBuildClusterResMessage): void {
   process.send!(message);
 }
+
+function logMemory(message: ISdCliBuildClusterReqMessage) {
+  /*global.gc!();
+  logger.log(`[${process.pid}:${path.basename(message.pkgPath)}] 메모리 사용량: ${Math.round(process.memoryUsage().heapUsed / 1024 / 1024)}MB`);*/
+}

package/src/build-tools/SdLibBundler.ts

@@ -0,0 +1,70 @@
+import {SdCliBuildResultUtil} from "../utils/SdCliBuildResultUtil";
+import {ISdCliPackageBuildResult} from "../commons";
+import {SdTsCompiler} from "./SdTsCompiler";
+import ts from "typescript";
+import path from "path";
+import {FsUtil, PathUtil} from "@simplysm/sd-core-node";
+
+export class SdLibBundler {
+  readonly #compiler: SdTsCompiler;
+
+  readonly #pkgPath: string;
+
+  public constructor(pkgPath: string, dev: boolean) {
+    this.#pkgPath = pkgPath;
+    this.#compiler = new SdTsCompiler(
+      pkgPath,
+      {declaration: true},
+      dev,
+      path.resolve(pkgPath, "src/styles.scss")
+    );
+  }
+
+  public markChanges(modifiedFileSet: Set<string>): void {
+    this.#compiler.invalidate(modifiedFileSet);
+  }
+
+  public async buildAsync(): Promise<{
+    program: ts.Program;
+    watchFileSet: Set<string>;
+    affectedFileSet: Set<string>;
+    results: ISdCliPackageBuildResult[];
+  }> {
+    const buildResult = await this.#compiler.buildAsync();
+
+    for (const affectedFilePath of buildResult.affectedFileSet) {
+      const emittedFiles = buildResult.emittedFilesCacheMap.get(affectedFilePath) ?? [];
+      for (const emittedFile of emittedFiles) {
+        if (emittedFile.outRelPath != null) {
+          const distPath = path.resolve(this.#pkgPath, "dist", emittedFile.outRelPath);
+          if (PathUtil.isChildPath(distPath, path.resolve(this.#pkgPath, "dist"))) {
+            await FsUtil.writeFileAsync(distPath, emittedFile.text);
+          }
+        }
+      }
+
+      const globalStylesheetResult = buildResult.stylesheetResultMap.get(affectedFilePath);
+      if (globalStylesheetResult) {
+        for (const outputFile of globalStylesheetResult.outputFiles) {
+          const distPath = path.resolve(this.#pkgPath, "dist", path.relative(this.#pkgPath, outputFile.path));
+          if (PathUtil.isChildPath(distPath, path.resolve(this.#pkgPath, "dist"))) {
+            await FsUtil.writeFileAsync(distPath, outputFile.text);
+          }
+        }
+      }
+    }
+
+    return {
+      program: buildResult.program,
+      watchFileSet: buildResult.watchFileSet,
+      affectedFileSet: buildResult.affectedFileSet,
+      results: [
+        ...buildResult.typescriptDiagnostics.map((item) => SdCliBuildResultUtil.convertFromTsDiag(item, "build")),
+        ...Array.from(buildResult.stylesheetResultMap.values()).mapMany(item => item.errors ?? [])
+          .map(err => SdCliBuildResultUtil.convertFromEsbuildResult(err, "build", "error")),
+        /*...Array.from(buildResult.stylesheetResultMap.values()).mapMany(item => item.warnings!)
+          .map(warn => SdCliBuildResultUtil.convertFromEsbuildResult(warn, "build", "warning"))*/
+      ]
+    };
+  }
+}

package/src/build-tools/SdLinter.ts

@@ -4,18 +4,18 @@ import ts from "typescript";
 
 export abstract class SdLinter {
   static async lintAsync(fileSet: Iterable<string>, tsProgram: ts.Program | undefined): Promise<ISdCliPackageBuildResult[]> {
-    const sourceFilePaths = Array.from(fileSet).filter((item) =>
+    const lintFilePaths = Array.from(fileSet).filter((item) =>
       (!item.endsWith(".d.ts") && item.endsWith(".ts")) ||
       item.endsWith(".js") ||
       item.endsWith(".cjs") ||
       item.endsWith(".mjs")
     );
 
-    if (sourceFilePaths.length === 0) {
+    if (lintFilePaths.length === 0) {
       return [];
     }
 
-    const linter = new ESLint(tsProgram !== null ? {
+    const linter = new ESLint(tsProgram != null ? {
       cache: false,
       overrideConfig: {
         overrides: [
@@ -40,7 +40,7 @@ export abstract class SdLinter {
     } : undefined);
 
 
-    const lintResults = await linter.lintFiles(sourceFilePaths);
+    const lintResults = await linter.lintFiles(lintFilePaths);
 
     return lintResults.mapMany((lintResult) => lintResult.messages.map((msg) => ({
       filePath: lintResult.filePath,