@simplysm/sd-cli 11.0.12 → 11.0.14

package/src/build-tools/SdNgBundlerContext.ts

@@ -0,0 +1,116 @@
+import esbuild from "esbuild";
+import path from "path";
+import {InitialFileRecord} from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
+import {ISdCliPackageBuildResult} from "../commons";
+
+export class SdNgBundlerContext {
+  private _context?: esbuild.BuildContext;
+
+  public constructor(private readonly _pkgPath: string,
+                     private readonly _esbuildOptions: esbuild.BuildOptions) {
+  }
+
+  public async bundleAsync() {
+    if (this._context == null) {
+      this._context = await esbuild.context(this._esbuildOptions);
+    }
+
+    let buildResult: esbuild.BuildResult;
+
+    try {
+      buildResult = await this._context.rebuild();
+    }
+    catch (err) {
+      if ("warnings" in err || "errors" in err) {
+        buildResult = err;
+      }
+      else {
+        throw err;
+      }
+    }
+
+    const results = [
+      ...buildResult.warnings.map((warn) => ({
+        filePath: warn.location?.file !== undefined ? path.resolve(this._pkgPath, warn.location.file) : undefined,
+        line: warn.location?.line,
+        char: warn.location?.column,
+        code: warn.text.slice(0, warn.text.indexOf(":")),
+        severity: "warning",
+        message: `(${warn.pluginName}) ${warn.text.slice(warn.text.indexOf(":") + 1)}`,
+        type: "build"
+      })),
+      ...buildResult.errors?.map((err) => ({
+        filePath: err.location?.file !== undefined ? path.resolve(this._pkgPath, err.location.file) : undefined,
+        line: err.location?.line,
+        char: err.location?.column !== undefined ? err.location.column + 1 : undefined,
+        code: err.text.slice(0, err.text.indexOf(":")),
+        severity: "error",
+        message: `(${err.pluginName}) ${err.text.slice(err.text.indexOf(":") + 1)}`,
+        type: "build"
+      }))
+    ] as ISdCliPackageBuildResult[];
+
+    const initialFiles = new Map<string, InitialFileRecord>();
+
+    for (const outputFile of buildResult.outputFiles ?? []) {
+      const relativeFilePath = path.relative(this._pkgPath, outputFile.path);
+      const entryPoint = buildResult.metafile?.outputs[relativeFilePath]?.entryPoint;
+
+      outputFile.path = relativeFilePath;
+
+      if (entryPoint != null) {
+        const name = path.basename(relativeFilePath).split('.', 1)[0];
+        const type = path.extname(relativeFilePath) === '.css' ? 'style' : 'script';
+
+        if (this._esbuildOptions.entryPoints?.[name] != null) {
+          initialFiles.set(relativeFilePath, {
+            name,
+            type,
+            entrypoint: true,
+          });
+        }
+      }
+    }
+
+    const files = [...initialFiles.keys()];
+    for (const file of files) {
+      for (const initialImport of buildResult.metafile?.outputs[file]?.imports ?? []) {
+        if (initialFiles.has(initialImport.path)) {
+          continue;
+        }
+
+        if (initialImport.kind === 'import-statement' || initialImport.kind === 'import-rule') {
+          const record: InitialFileRecord = {
+            type: initialImport.kind === 'import-rule' ? 'style' : 'script',
+            entrypoint: false,
+            external: initialImport.external,
+          };
+
+          initialFiles.set(initialImport.path, record);
+
+          if (!initialImport.external) {
+            files.push(initialImport.path);
+          }
+        }
+      }
+    }
+
+    const dependencyMap = new Map<string, Set<string>>();
+    if (buildResult.metafile) {
+      for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
+        for (const imp of val.imports) {
+          const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
+          deps.add(path.resolve(this._pkgPath, key));
+        }
+      }
+    }
+
+    return {
+      results,
+      initialFiles,
+      outputFiles: buildResult.outputFiles,
+      dependencyMap,
+      metafile: buildResult.metafile
+    };
+  }
+}

package/src/build-tools/SdTsBundler.ts

@@ -88,18 +88,18 @@ const __dirname = __path__.dirname(__filename);`.trim()
           filePath: warn.location?.file !== undefined ? path.resolve(warn.location.file) : undefined,
           line: warn.location?.line,
           char: warn.location?.column,
-          code: undefined,
+          code: warn.text.slice(0, warn.text.indexOf(":")),
           severity: "warning" as const,
-          message: warn.text
+          message: `(${warn.pluginName}) ${warn.text.slice(warn.text.indexOf(":") + 1)}`,
         })),
         ...result.errors.map((err) => ({
           type: "build" as const,
           filePath: err.location?.file !== undefined ? path.resolve(err.location.file) : undefined,
           line: err.location?.line,
           char: err.location?.column !== undefined ? err.location.column + 1 : undefined,
-          code: undefined,
+          code: err.text.slice(0, err.text.indexOf(":")),
           severity: "error" as const,
-          message: err.text
+          message: `(${err.pluginName}) ${err.text.slice(err.text.indexOf(":") + 1)}`,
         }))
       ]
     };

package/src/builders/SdCliClientBuilder.ts

@@ -101,7 +101,6 @@ export class SdCliClientBuilder extends EventEmitter {
         dev: opt.dev,
         builderType: builderType,
         pkgPath: this._pkgPath,
-        cordovaPlatforms: builderType === "cordova" ? Object.keys(this._pkgConf.builder!.cordova!.platform ?? {browser: {}}) : undefined,
         outputPath: builderType === "web" ? path.resolve(this._pkgPath, "dist")
           : builderType === "electron" ? path.resolve(this._pkgPath, ".electron/src")
             : builderType === "cordova" && !opt.dev ? path.resolve(this._pkgPath, ".cordova/www")
@@ -109,7 +108,8 @@ export class SdCliClientBuilder extends EventEmitter {
         env: {
           ...this._pkgConf.env,
           ...this._pkgConf.builder?.[builderType]?.env
-        }
+        },
+        cordovaConfig: builderType === "cordova" ? this._pkgConf.builder!.cordova : undefined,
       }));
     }
 

package/src/entry/SdCliProject.ts

@@ -67,6 +67,7 @@ export class SdCliProject {
       worker?: cp.ChildProcess; // persist
       port?: number;
       hasChanges: boolean;
+      hasClientChanges: boolean;
 
       //client
       pathProxy: Record<string, string | number | undefined>; // persist
@@ -95,6 +96,7 @@ export class SdCliProject {
           const pkgName = path.basename(message.req.pkgPath);
           const serverInfo = serverInfoMap.getOrCreate(pkgName, {
             hasChanges: false,
+            hasClientChanges: false,
             pathProxy: {},
             // changeFilePaths: []
           });
@@ -108,25 +110,28 @@ export class SdCliProject {
           if (pkgConf.server !== undefined) {
             const serverInfo = serverInfoMap.getOrCreate(pkgConf.server, {
               hasChanges: false,
+              hasClientChanges: false,
               pathProxy: {},
               // changeFilePaths: []
             });
             serverInfo.pathProxy[pkgName] = path.resolve(message.req.pkgPath, "dist");
-            //message.result!.port;
             // serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
 
-            serverInfo.worker?.send({type: "broadcastReload"});
+            serverInfo.hasClientChanges = true;
+            // serverInfo.worker?.send({type: "broadcastReload"});
           }
           else {
             const serverInfo = serverInfoMap.getOrCreate(pkgName, {
               hasChanges: false,
+              hasClientChanges: false,
               pathProxy: {},
               // changeFilePaths: []
             });
             serverInfo.port = message.result!.port;
             // serverInfo.changeFilePaths.push(...message.result!.affectedFilePaths);
 
-            serverInfo.worker?.send({type: "broadcastReload"});
+            serverInfo.hasClientChanges = true;
+            // serverInfo.worker?.send({type: "broadcastReload"});
           }
         }
 
@@ -158,6 +163,11 @@ export class SdCliProject {
                   type: "setPathProxy",
                   pathProxy: serverInfo.pathProxy
                 });
+
+                if (serverInfo.hasClientChanges) {
+                  logger.debug("클라이언트 새로고침...");
+                  serverInfo.worker.send({type: "broadcastReload"});
+                }
               }
             }
 
@@ -448,22 +458,19 @@ export class SdCliProject {
   }
 
   private static _logging(buildResults: ISdCliPackageBuildResult[], logger: Logger): void {
-    const messages = buildResults.filter((item) => item.severity === "message").distinct();
-    const suggestions = buildResults.filter((item) => item.severity === "suggestion").distinct();
-    const warnings = buildResults.filter((item) => item.severity === "warning").distinct();
-    const errors = buildResults.filter((item) => item.severity === "error").distinct();
+    const messageMap = buildResults.toSetMap(item => item.severity, item => SdCliBuildResultUtil.getMessage(item));
 
-    if (messages.length > 0) {
-      logger.log("\n" + messages.map((item) => SdCliBuildResultUtil.getMessage(item)).join("\n"));
+    if (messageMap.has("message")) {
+      logger.log(`알림\n${[...messageMap.get("message")!].join("\n")}`);
     }
-    if (suggestions.length > 0) {
-      logger.info("\n" + suggestions.map((item) => SdCliBuildResultUtil.getMessage(item)).join("\n"));
+    if (messageMap.has("suggestion")) {
+      logger.info(`제안\n${[...messageMap.get("suggestion")!].join("\n")}`);
     }
-    if (warnings.length > 0) {
-      logger.warn("\n" + warnings.map((item) => SdCliBuildResultUtil.getMessage(item)).join("\n"));
+    if (messageMap.has("warning")) {
+      logger.warn(`경고\n${[...messageMap.get("warning")!].join("\n")}`);
     }
-    if (errors.length > 0) {
-      logger.error("\n" + errors.map((item) => SdCliBuildResultUtil.getMessage(item)).join("\n"));
+    if (messageMap.has("error")) {
+      logger.error(`오류\n${[...messageMap.get("error")!].join("\n")}`);
     }
 
     logger.info("모든 빌드가 완료되었습니다.");

package/src/index.ts

@@ -3,6 +3,7 @@ export * from "./build-tools/SdCliIndexFileGenerator";
 export * from "./build-tools/SdCliNgRoutesFileGenerator";
 export * from "./build-tools/SdLinter";
 export * from "./build-tools/SdNgBundler";
+export * from "./build-tools/SdNgBundlerContext";
 export * from "./build-tools/SdTsBundler";
 export * from "./build-tools/SdTsCompiler";
 export * from "./builders/SdCliClientBuilder";

package/src/utils/SdCliBuildResultUtil.ts

@@ -34,9 +34,9 @@ export class SdCliBuildResultUtil {
     if (result.filePath !== undefined) {
       str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
     }
-    // if (result.code !== undefined) {
-    //   str += `${result.code}: `;
-    // }
+    if (result.code !== undefined) {
+      str += `${result.code}: `;
+    }
     str += `(${result.type}) ${result.severity} ${result.message}`;
 
     return str;

package/src/utils/SdMemoryLoadResultCache.ts

@@ -16,11 +16,7 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
       for (const watchFile of result.watchFiles) {
         // Normalize the watch file path to ensure OS consistent paths
         const watchFilePath = path.resolve(watchFile);
-        let affected = this.fileDependencies.get(watchFilePath);
-        if (affected === undefined) {
-          affected = new Set();
-          this.fileDependencies.set(watchFilePath, affected);
-        }
+        let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
         affected.add(putPath);
       }
     }

package/src/utils/SdSourceFileCache.ts

@@ -1,6 +1,14 @@
-import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
 import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
+import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
 
 export class SdSourceFileCache extends SourceFileCache {
   override readonly loadResultCache = new SdMemoryLoadResultCache();
+
+  override invalidate(files: Iterable<string>): void {
+    super.invalidate(files);
+
+    for (let file of files) {
+      this.loadResultCache.invalidate(file);
+    }
+  }
 }