@simplysm/sd-cli 12.13.19 → 12.13.21

package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts

@@ -1,22 +1,30 @@
 import path from "path";
-import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
+import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
 import { StringUtils } from "@simplysm/sd-core-common";
 
 export class SdCliNgRoutesFileGenerator {
   cachedHash?: string;
 
-  /*watch(pkgPath: string, noLazyRoute?: boolean) {
+  watch(pkgPath: string, noLazyRoute?: boolean) {
     const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
-    this.cachedHash = FsUtils.exists(routesFilePath) ? HashUtils.get(FsUtils.readFile(routesFilePath)) : undefined;
+    this.cachedHash = FsUtils.exists(routesFilePath)
+      ? HashUtils.get(FsUtils.readFile(routesFilePath))
+      : undefined;
 
-    SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
-      this.run(pkgPath, noLazyRoute);
+    SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
+      ignored: [routesFilePath],
+    }).onChange({ delay: 50 }, (changeInfos) => {
+      if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
+        this.run(pkgPath, noLazyRoute);
     });
 
     this.run(pkgPath, noLazyRoute);
-  }*/
+  }
 
-  run(pkgPath: string, noLazyRoute?: boolean): { changed: boolean; filePath: string; content: string } {
+  run(
+    pkgPath: string,
+    noLazyRoute?: boolean,
+  ): { changed: boolean; filePath: string; content: string } {
     const appDirPath = path.resolve(pkgPath, "src/app");
     const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
 
@@ -54,7 +62,9 @@ export class SdCliNgRoutesFileGenerator {
         cont += indentStr + `  path: "${key}",\n`;
         if (val.relModulePath != null) {
           if (noLazyRoute) {
-            cont += indentStr + `  component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
+            cont +=
+              indentStr +
+              `  component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
             imports.push(
               `import { ${StringUtils.toPascalCase(path.basename(val.relModulePath))} } from "./app/${val.relModulePath}";`,
             );

package/src/pkg-builders/client/sd-client.build-runner.ts

@@ -10,12 +10,9 @@ import { INpmConfig } from "../../types/common-configs.types";
 export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
   protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
 
-  #routeGenerator = new SdCliNgRoutesFileGenerator();
   #ngBundlers?: SdNgBundler[];
   #cordova?: SdCliCordova;
 
-  #hasGenRoutesError = false;
-
   protected override async _runAsync(
     dev: boolean,
     emitOnly: boolean,
@@ -24,8 +21,8 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
   ): Promise<IBuildRunnerRunResult> {
     // 최초 한번
     if (!modifiedFileSet) {
-      // config
       if (!noEmit) {
+        // config
         this._debug("GEN .config...");
         const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
         FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
@@ -39,6 +36,13 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
           });
           await this.#cordova.initializeAsync();
         }
+
+        // routes
+        const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
+        if ("@angular/router" in (npmConf.dependencies ?? {})) {
+          this._debug(`GEN routes.ts...`);
+          new SdCliNgRoutesFileGenerator().watch(this._pkgPath, this._pkgConf.noLazyRoute);
+        }
       }
 
       // ng
@@ -108,18 +112,6 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
         emitFileSet,
       };
     } else {
-      const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
-
-      let routesFileNPath: TNormPath | undefined;
-      if ("@angular/router" in (npmConf.dependencies ?? {})) {
-        this._debug(`GEN routes.ts...`);
-        const genRoutesResult = this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
-        if (modifiedFileSet && (genRoutesResult.changed || this.#hasGenRoutesError)) {
-          modifiedFileSet.add(PathUtils.norm(genRoutesResult.filePath));
-        }
-        routesFileNPath = PathUtils.norm(genRoutesResult.filePath);
-      }
-
       if (modifiedFileSet) {
         for (const ngBundler of this.#ngBundlers!) {
           ngBundler.markForChanges(Array.from(modifiedFileSet));
@@ -150,9 +142,6 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
         });
       }
 
-      this.#hasGenRoutesError =
-        routesFileNPath != null && results.map((item) => item.filePath).includes(routesFileNPath);
-
       this._debug(`빌드 완료`);
 
       return {

package/src/pkg-builders/client/sd-ng.bundler.ts

@@ -26,11 +26,17 @@ import {
 import { Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
 import { CrossOrigin } from "@angular/build/src/builders/application/schema";
 import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
-import { createSourcemapIgnorelistPlugin } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
-import { StylesheetPluginFactory } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
+import {
+  createSourcemapIgnorelistPlugin
+} from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
+import {
+  StylesheetPluginFactory
+} from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
 import { SassStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/sass-language";
 import { CssStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/css-language";
-import { createCssResourcePlugin } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
+import {
+  createCssResourcePlugin
+} from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 import { createSdNgPlugin } from "./sd-ng.plugin-creator";
 import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
@@ -130,142 +136,154 @@ export class SdNgBundler {
     //-- results
     const results = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
 
-    this.#debug(`convert result...`);
-
-    const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(
-      (item) =>
-        item.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [],
-    );
-    const initialFiles = new Map<string, InitialFileRecord>();
-    const metafile: {
-      inputs: Metafile["inputs"];
-      outputs: Metafile["outputs"];
-    } = {
-      inputs: {},
-      outputs: {},
-    };
-    for (const bundlingResult of bundlingResults) {
-      bundlingResult.initialFiles.forEach((v, k) => initialFiles.set(k, v));
-      metafile.inputs = { ...metafile.inputs, ...bundlingResult.metafile?.inputs };
-      metafile.outputs = { ...metafile.outputs, ...bundlingResult.metafile?.outputs };
-    }
-    const assetFiles: { source: string; destination: string }[] = [];
-
-    //-- cordova empty
-    /*if (this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins) {
-      outputFiles.push(createOutputFile("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
-    }*/
-
-    this.#debug(`create index.html...`);
-    await perf.run("create index.html", async () => {
-      const genIndexHtmlResult = await this.#genIndexHtmlAsync(outputFiles, initialFiles);
-      for (const warning of genIndexHtmlResult.warnings) {
-        results.push({
-          filePath: undefined,
-          line: undefined,
-          char: undefined,
-          code: undefined,
-          severity: "warning",
-          message: `${warning}`,
-          type: "gen-index",
-        });
-      }
-      for (const error of genIndexHtmlResult.errors) {
-        results.push({
-          filePath: undefined,
-          line: undefined,
-          char: undefined,
-          code: undefined,
-          severity: "error",
-          message: `${error}`,
-          type: "gen-index",
-        });
-      }
-      outputFiles.push(
-        createOutputFile("index.html", genIndexHtmlResult.csrContent, BuildOutputFileType.Root),
+    if (this._opt.noEmit) {
+      return {
+        watchFileSet: this.#ngResultCache.watchFileSet!,
+        affectedFileSet: this.#ngResultCache.affectedFileSet!,
+        results,
+        emitFileSet: new Set<TNormPath>(),
+      };
+    } else {
+      this.#debug(`convert result...`);
+
+      const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(
+        (item) =>
+          item.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ?? [],
       );
-    });
-
-    await perf.run("assets", async () => {
-      //-- copy assets
-      assetFiles.push(...(await this.#copyAssetsAsync()));
-
-      //-- extract 3rdpartylicenses
-      if (!this._opt.dev) {
-        outputFiles.push(
-          createOutputFile(
-            "3rdpartylicenses.txt",
-            await extractLicenses(metafile, this._opt.pkgPath),
-            BuildOutputFileType.Root,
-          ),
-        );
+      const initialFiles = new Map<string, InitialFileRecord>();
+      const metafile: {
+        inputs: Metafile["inputs"];
+        outputs: Metafile["outputs"];
+      } = {
+        inputs: {},
+        outputs: {},
+      };
+      for (const bundlingResult of bundlingResults) {
+        bundlingResult.initialFiles.forEach((v, k) => initialFiles.set(k, v));
+        metafile.inputs = { ...metafile.inputs, ...bundlingResult.metafile?.inputs };
+        metafile.outputs = { ...metafile.outputs, ...bundlingResult.metafile?.outputs };
       }
-    });
 
-    //-- service worker
-    if (FsUtils.exists(this.#swConfFilePath)) {
-      this.#debug(`prepare service worker...`);
+      //-- cordova empty
+      /*if (this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins) {
+      outputFiles.push(createOutputFile("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
+    }*/
 
-      await perf.run("prepare service worker", async () => {
-        try {
-          const serviceWorkerResult = await this.#genServiceWorkerAsync(outputFiles, assetFiles);
-          outputFiles.push(
-            createOutputFile("ngsw.json", serviceWorkerResult.manifest, BuildOutputFileType.Root),
-          );
-          assetFiles.push(...serviceWorkerResult.assetFiles);
-        } catch (err) {
+      this.#debug(`create index.html...`);
+      await perf.run("create index.html", async () => {
+        const genIndexHtmlResult = await this.#genIndexHtmlAsync(outputFiles, initialFiles);
+        for (const warning of genIndexHtmlResult.warnings) {
+          results.push({
+            filePath: undefined,
+            line: undefined,
+            char: undefined,
+            code: undefined,
+            severity: "warning",
+            message: `${warning}`,
+            type: "gen-index",
+          });
+        }
+        for (const error of genIndexHtmlResult.errors) {
           results.push({
             filePath: undefined,
             line: undefined,
             char: undefined,
             code: undefined,
             severity: "error",
-            message: `${err.toString()}`,
-            type: "gen-sw",
+            message: `${error}`,
+            type: "gen-index",
           });
         }
+        outputFiles.push(
+          createOutputFile("index.html", genIndexHtmlResult.csrContent, BuildOutputFileType.Root),
+        );
       });
-    }
 
-    //-- write
-    this.#debug(`write output files...(${outputFiles.length})`);
-
-    const emitFileSet = new Set<TNormPath>();
-    perf.run("write output file", () => {
-      for (const outputFile of outputFiles) {
-        const distFilePath = PathUtils.norm(this._opt.outputPath, outputFile.path);
-        const prevHash = this.#outputHashCache.get(distFilePath);
-        const currHash = HashUtils.get(Buffer.from(outputFile.contents));
-        if (prevHash !== currHash) {
-          FsUtils.writeFile(distFilePath, outputFile.contents);
-          this.#outputHashCache.set(distFilePath, currHash);
-          emitFileSet.add(distFilePath);
+      const assetFiles: { source: string; destination: string }[] = [];
+      await perf.run("assets", async () => {
+        //-- copy assets
+        assetFiles.push(...(await this.#copyAssetsAsync()));
+
+        //-- extract 3rdpartylicenses
+        if (!this._opt.dev) {
+          outputFiles.push(
+            createOutputFile(
+              "3rdpartylicenses.txt",
+              await extractLicenses(metafile, this._opt.pkgPath),
+              BuildOutputFileType.Root,
+            ),
+          );
         }
+      });
+
+      //-- service worker
+      if (FsUtils.exists(this.#swConfFilePath)) {
+        this.#debug(`prepare service worker...`);
+
+        await perf.run("prepare service worker", async () => {
+          try {
+            const serviceWorkerResult = await this.#genServiceWorkerAsync(outputFiles, assetFiles);
+            outputFiles.push(
+              createOutputFile("ngsw.json", serviceWorkerResult.manifest, BuildOutputFileType.Root),
+            );
+            assetFiles.push(...serviceWorkerResult.assetFiles);
+          } catch (err) {
+            results.push({
+              filePath: undefined,
+              line: undefined,
+              char: undefined,
+              code: undefined,
+              severity: "error",
+              message: `${err.toString()}`,
+              type: "gen-sw",
+            });
+          }
+        });
       }
-      for (const assetFile of assetFiles) {
-        const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
-        const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
-        if (prevHash !== currHash) {
-          FsUtils.copy(assetFile.source, path.resolve(this._opt.outputPath, assetFile.destination));
-          this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
-          emitFileSet.add(PathUtils.norm(this._opt.outputPath, assetFile.destination));
+
+      //-- write
+      this.#debug(`write output files...(${outputFiles.length})`);
+
+      const emitFileSet = new Set<TNormPath>();
+      perf.run("write output file", () => {
+        for (const outputFile of outputFiles) {
+          const distFilePath = PathUtils.norm(this._opt.outputPath, outputFile.path);
+          const prevHash = this.#outputHashCache.get(distFilePath);
+          const currHash = HashUtils.get(Buffer.from(outputFile.contents));
+          if (prevHash !== currHash) {
+            FsUtils.writeFile(distFilePath, outputFile.contents);
+            this.#outputHashCache.set(distFilePath, currHash);
+            emitFileSet.add(distFilePath);
+          }
         }
-      }
-    });
+        for (const assetFile of assetFiles) {
+          const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
+          const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
+          if (prevHash !== currHash) {
+            FsUtils.copy(
+              assetFile.source,
+              path.resolve(this._opt.outputPath, assetFile.destination),
+            );
+            this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
+            emitFileSet.add(PathUtils.norm(this._opt.outputPath, assetFile.destination));
+          }
+        }
+      });
 
-    this.#debug(perf.toString());
-
-    return {
-      watchFileSet: new Set([
-        ...this.#ngResultCache.watchFileSet!,
-        ...this.#styleLoadResultCache.watchFiles.map((item) => PathUtils.norm(item)),
-        ...assetFiles.map((item) => PathUtils.norm(item.source)),
-        PathUtils.norm(this.#indexHtmlFilePath),
-      ]),
-      affectedFileSet: this.#ngResultCache.affectedFileSet!,
-      results,
-      emitFileSet: emitFileSet,
-    };
+      this.#debug(perf.toString());
+
+      return {
+        watchFileSet: new Set([
+          ...this.#ngResultCache.watchFileSet!,
+          ...this.#styleLoadResultCache.watchFiles.map((item) => PathUtils.norm(item)),
+          ...assetFiles.map((item) => PathUtils.norm(item.source)),
+          PathUtils.norm(this.#indexHtmlFilePath),
+        ]),
+        affectedFileSet: this.#ngResultCache.affectedFileSet!,
+        results,
+        emitFileSet: emitFileSet,
+      };
+    }
   }
 
   async #genIndexHtmlAsync(

package/src/pkg-builders/client/sd-ng.plugin-creator.ts

@@ -53,7 +53,7 @@ export function createSdNgPlugin(conf: {
         Math.floor((os.cpus().length * 2) / 3),
       );
 
-      let cssStore = new Map<TNormPath, Buffer>();
+      // let cssStore = new Map<TNormPath, Buffer>();
 
       //---------------------------
 
@@ -67,7 +67,7 @@ export function createSdNgPlugin(conf: {
 
           tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
 
-          cssStore.clear();
+          // cssStore.clear();
 
           conf.result.watchFileSet = tsCompileResult.watchFileSet;
           conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
@@ -97,7 +97,7 @@ export function createSdNgPlugin(conf: {
         return res;
       });
 
-      build.onResolve({ filter: /\.css$/ }, (args) => {
+      /*build.onResolve({ filter: /\.css$/ }, (args) => {
         if (args.path.startsWith("sd-css-asset:")) return;
         return {
           path: path.resolve(args.resolveDir, args.path),
@@ -106,7 +106,7 @@ export function createSdNgPlugin(conf: {
       });
 
       build.onLoad({ filter: /\.css$/, namespace: "sd-css" }, async (args) => {
-        const code = /* language=javascript */ `
+        const code = /!* language=javascript *!/ `
 import href from "sd-css-asset:${PathUtils.posix(args.path)}"
 (function __sdEnsureStyle(href) {
   let link = document.querySelector('link[data-sd-style="' + href + '"]');
@@ -136,7 +136,14 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
           cssStore.get(PathUtils.norm(args.path)) ??
           cssStore.get(PathUtils.norm(args.path.replace(/[\\\/]src[\\\/]/, "\\dist\\")));
         if (cssContent == null) {
-          return { errors: [{ text: `Missing CSS for ${PathUtils.norm(args.path)}` }] };
+          return {
+            errors: [
+              {
+                location: null,
+                text: `Missing CSS for ${PathUtils.norm(args.path)}`,
+              },
+            ],
+          };
         }
 
         return {
@@ -144,12 +151,12 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
           loader: "file",
           resolveDir: path.dirname(args.path),
         };
-      });
+      });*/
 
       build.onLoad({ filter: /\.ts$/ }, async (args) => {
         const emittedFiles = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path));
 
-        try {
+        /*try {
           const css = emittedFiles?.single((item) => Boolean(item.outAbsPath?.endsWith(".css")));
           if (css) {
             cssStore.set(PathUtils.norm(css.outAbsPath!), Buffer.from(css.text));
@@ -165,7 +172,7 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
               },
             ],
           };
-        }
+        }*/
 
         const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
         if (output != null) {
@@ -188,7 +195,7 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
         return { contents: newContents, loader: "js" };
       });
 
-      build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
+      build.onLoad({ filter: /\.mjs$/ }, async (args) => {
         conf.result.watchFileSet!.add(PathUtils.norm(args.path));
 
         const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
@@ -209,14 +216,12 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
 
             const contents = await FsUtils.readFileBufferAsync(args.path);
 
-            return args.path.includes("node_modules") && !args.path.includes("angular")
-              ? contents
-              : await javascriptTransformer.transformData(
-                  args.path,
-                  contents.toString(),
-                  false,
-                  sideEffects,
-                );
+            return await javascriptTransformer.transformData(
+              args.path,
+              contents.toString(),
+              false,
+              sideEffects,
+            );
           });
 
           outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);