@simplysm/sd-cli 12.5.21 → 12.5.23

package/src/{build-tools → pkg-builders/client}/SdNgBundler.ts

@@ -1,14 +1,11 @@
 import path from "path";
 import esbuild, { Metafile } from "esbuild";
-import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil, TNormPath } from "@simplysm/sd-core-node";
 import { fileURLToPath } from "url";
 import nodeStdLibBrowser from "node-stdlib-browser";
 import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
-import { INpmConfig, ISdCliClientBuilderCordovaConfig, ISdCliPackageBuildResult } from "../commons";
 import browserslist from "browserslist";
 import { SdNgBundlerContext } from "./SdNgBundlerContext";
-import { INgPluginResultCache, sdNgPlugin } from "../bundle-plugins/sdNgPlugin";
-import ts from "typescript";
 import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-result-cache";
 import {
   convertOutputFile,
@@ -21,14 +18,9 @@ import {
   InitialFileRecord,
 } from "@angular/build/src/tools/esbuild/bundler-context";
 import { extractLicenses } from "@angular/build/src/tools/esbuild/license-extractor";
-import {
-  HintMode,
-  IndexHtmlGenerator,
-  IndexHtmlProcessResult,
-} from "@angular/build/src/utils/index-file/index-html-generator";
+import { IndexHtmlGenerator, IndexHtmlProcessResult } from "@angular/build/src/utils/index-file/index-html-generator";
 import { Entrypoint } from "@angular/build/src/utils/index-file/augment-index-html";
 import { CrossOrigin } from "@angular/build/src/builders/application/schema";
-import { InlineCriticalCssProcessor } from "@angular/build/src/utils/index-file/inline-critical-css";
 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";
@@ -36,27 +28,26 @@ import { SassStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesh
 import { CssStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/css-language";
 import { createCssResourcePlugin } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
-import { SdCliPerformanceTimer } from "../utils/SdCliPerformanceTime";
+import { createSdNgPlugin } from "./createSdNgPlugin";
+import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTime";
+import { INpmConfig } from "../../types/common-configs.type";
+import { ISdClientBuilderCordovaConfig } from "../../types/sd-configs.type";
+import { ISdCliNgPluginResultCache } from "../../types/build-plugin.type";
+import { ISdBuildMessage } from "../../types/build.type";
 
 export class SdNgBundler {
   readonly #logger = Logger.get(["simplysm", "sd-cli", "SdNgBundler"]);
 
-  // private readonly _sourceFileCache = new SourceFileCache(
-  //   path.resolve(this.#opt.pkgPath, ".cache")
-  // );
-
-  readonly #modifiedFileSet = new Set<string>();
-  readonly #ngResultCache: INgPluginResultCache = {
-    affectedFileSet: new Set<string>(),
-    watchFileSet: new Set<string>(),
+  readonly #modifiedFileSet = new Set<TNormPath>();
+  readonly #ngResultCache: ISdCliNgPluginResultCache = {
+    affectedFileSet: new Set<TNormPath>(),
+    watchFileSet: new Set<TNormPath>(),
   };
   readonly #styleLoadResultCache = new MemoryLoadResultCache();
 
   #contexts: SdNgBundlerContext[] | undefined;
 
-  readonly #outputCache = new Map<string, string | number>();
-
-  readonly #opt: IOptions;
+  readonly #outputCache = new Map<TNormPath, string | number>();
 
   readonly #pkgNpmConf: INpmConfig;
   readonly #mainFilePath: string;
@@ -67,34 +58,45 @@ export class SdNgBundler {
   readonly #pkgName: string;
   readonly #baseHref: string;
 
-  // #loadFilePathSet = new Set<string>();
-
-  public constructor(opt: IOptions) {
-    this.#opt = opt;
-    this.#pkgNpmConf = FsUtil.readJson(path.resolve(opt.pkgPath, "package.json"));
-    this.#mainFilePath = path.resolve(opt.pkgPath, "src/main.ts");
-    this.#tsConfigFilePath = path.resolve(opt.pkgPath, "tsconfig.json");
-    this.#swConfFilePath = path.resolve(opt.pkgPath, "ngsw-config.json");
+  public constructor(
+    private _opt: {
+      dev: boolean;
+      outputPath: TNormPath;
+      pkgPath: TNormPath;
+      builderType: string;
+      env: Record<string, string> | undefined;
+      cordovaConfig: ISdClientBuilderCordovaConfig | undefined;
+      watchScopePaths: TNormPath[];
+    },
+  ) {
+    this.#pkgNpmConf = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
+    this.#mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
+    this.#tsConfigFilePath = path.resolve(this._opt.pkgPath, "tsconfig.json");
+    this.#swConfFilePath = path.resolve(this._opt.pkgPath, "ngsw-config.json");
     this.#browserTarget = transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"]));
-    this.#indexHtmlFilePath = path.resolve(opt.pkgPath, "src/index.html");
-    this.#pkgName = path.basename(opt.pkgPath);
+    this.#indexHtmlFilePath = path.resolve(this._opt.pkgPath, "src/index.html");
+    this.#pkgName = path.basename(this._opt.pkgPath);
     this.#baseHref =
-      opt.builderType === "web" ? `/${this.#pkgName}/` : opt.dev ? `/${this.#pkgName}/${opt.builderType}/` : ``;
+      this._opt.builderType === "web"
+        ? `/${this.#pkgName}/`
+        : this._opt.dev
+          ? `/${this.#pkgName}/${this._opt.builderType}/`
+          : ``;
   }
 
   public markForChanges(filePaths: string[]): void {
     for (const filePath of filePaths) {
-      this.#modifiedFileSet.add(path.normalize(filePath));
-      this.#styleLoadResultCache.invalidate(path.normalize(filePath));
+      this.#modifiedFileSet.add(PathUtil.norm(filePath));
+      this.#styleLoadResultCache.invalidate(PathUtil.norm(filePath));
     }
     // this._sourceFileCache.invalidate(filePaths);
   }
 
   public async bundleAsync(): Promise<{
-    program?: ts.Program;
-    watchFileSet: Set<string>;
-    affectedFileSet: Set<string>;
-    results: ISdCliPackageBuildResult[];
+    watchFileSet: Set<TNormPath>;
+    affectedFileSet: Set<TNormPath>;
+    results: ISdBuildMessage[];
+    emitFileSet: Set<TNormPath>;
   }> {
     const perf = new SdCliPerformanceTimer("ng bundle");
 
@@ -104,14 +106,14 @@ export class SdNgBundler {
       this.#contexts = perf.run("get contexts", () => [
         this._getAppContext(),
         this._getStyleContext(),
-        ...(this.#opt.builderType === "electron" ? [this._getElectronMainContext()] : []),
+        ...(this._opt.builderType === "electron" ? [this._getElectronMainContext()] : []),
       ]);
     }
 
     this.#debug(`build...`);
 
     const bundlingResults = await perf.run("build", async () => {
-      return await this.#contexts!.mapAsync(async (ctx, i) => await ctx.bundleAsync());
+      return await this.#contexts!.mapAsync(async (ctx) => await ctx.bundleAsync());
     });
 
     //-- results
@@ -138,13 +140,13 @@ export class SdNgBundler {
     const assetFiles: { source: string; destination: string }[] = [];
 
     //-- cordova empty
-    if (this.#opt.builderType === "cordova" && this.#opt.cordovaConfig?.plugins) {
+    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);
+      const genIndexHtmlResult = await this._genIndexHtmlAsync(initialFiles);
       for (const warning of genIndexHtmlResult.warnings) {
         results.push({
           filePath: undefined,
@@ -152,8 +154,8 @@ export class SdNgBundler {
           char: undefined,
           code: undefined,
           severity: "warning",
-          message: `(gen-index) ${warning}`,
-          type: "build",
+          message: `${warning}`,
+          type: "gen-index",
         });
       }
       for (const error of genIndexHtmlResult.errors) {
@@ -163,8 +165,8 @@ export class SdNgBundler {
           char: undefined,
           code: undefined,
           severity: "error",
-          message: `(gen-index) ${error}`,
-          type: "build",
+          message: `${error}`,
+          type: "gen-index",
         });
       }
       outputFiles.push(createOutputFile("index.html", genIndexHtmlResult.csrContent, BuildOutputFileType.Root));
@@ -175,11 +177,11 @@ export class SdNgBundler {
       assetFiles.push(...(await this._copyAssetsAsync()));
 
       //-- extract 3rdpartylicenses
-      if (!this.#opt.dev) {
+      if (!this._opt.dev) {
         outputFiles.push(
           createOutputFile(
             "3rdpartylicenses.txt",
-            await extractLicenses(metafile, this.#opt.pkgPath),
+            await extractLicenses(metafile, this._opt.pkgPath),
             BuildOutputFileType.Root,
           ),
         );
@@ -202,8 +204,8 @@ export class SdNgBundler {
             char: undefined,
             code: undefined,
             severity: "error",
-            message: `(gen-sw) ${err.toString()}`,
-            type: "build",
+            message: `${err.toString()}`,
+            type: "gen-sw",
           });
         }
       });
@@ -212,21 +214,24 @@ export class SdNgBundler {
     //-- write
     this.#debug(`write output files...(${outputFiles.length})`);
 
-    await perf.run("write output file", async () => {
+    const emitFileSet = new Set<TNormPath>();
+    perf.run("write output file", () => {
       for (const outputFile of outputFiles) {
-        const distFilePath = path.resolve(this.#opt.outputPath, outputFile.path);
+        const distFilePath = PathUtil.norm(this._opt.outputPath, outputFile.path);
         const prev = this.#outputCache.get(distFilePath);
         if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
-          await FsUtil.writeFileAsync(distFilePath, outputFile.contents);
+          FsUtil.writeFile(distFilePath, outputFile.contents);
           this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
+          emitFileSet.add(PathUtil.norm(outputFile.path));
         }
       }
       for (const assetFile of assetFiles) {
-        const prev = this.#outputCache.get(assetFile.source);
+        const prev = this.#outputCache.get(PathUtil.norm(assetFile.source));
         const curr = FsUtil.lstat(assetFile.source).mtime.getTime();
         if (prev !== curr) {
-          await FsUtil.copyAsync(assetFile.source, path.resolve(this.#opt.outputPath, assetFile.destination));
-          this.#outputCache.set(assetFile.source, curr);
+          FsUtil.copy(assetFile.source, path.resolve(this._opt.outputPath, assetFile.destination));
+          this.#outputCache.set(PathUtil.norm(assetFile.source), curr);
+          emitFileSet.add(PathUtil.norm(assetFile.destination));
         }
       }
     });
@@ -234,71 +239,41 @@ export class SdNgBundler {
     this.#debug(perf.toString());
 
     return {
-      program: this.#ngResultCache.program,
       watchFileSet: new Set([
         ...this.#ngResultCache.watchFileSet!,
-        ...this.#styleLoadResultCache.watchFiles,
-        this.#indexHtmlFilePath,
+        ...this.#styleLoadResultCache.watchFiles.map((item) => PathUtil.norm(item)),
+        PathUtil.norm(this.#indexHtmlFilePath),
       ]),
       affectedFileSet: this.#ngResultCache.affectedFileSet!,
       results,
+      emitFileSet: emitFileSet,
     };
   }
 
-  private async _genIndexHtmlAsync(
-    outputFiles: esbuild.OutputFile[],
-    initialFiles: Map<string, InitialFileRecord>,
-  ): Promise<IndexHtmlProcessResult> {
-    const readAsset = (filePath: string): Promise<string> => {
-      const relFilePath = path.relative("/", filePath);
-      const currFile = outputFiles.find((outputFile) => outputFile.path === relFilePath);
-      if (currFile) {
-        return Promise.resolve(currFile.text);
-      }
-
-      throw new Error(`Output file does not exist: ${relFilePath}`);
-    };
-
+  private async _genIndexHtmlAsync(initialFiles: Map<string, InitialFileRecord>): Promise<IndexHtmlProcessResult> {
     const indexHtmlGenerator = new IndexHtmlGenerator({
       indexPath: this.#indexHtmlFilePath,
       entrypoints: [
-        ["runtime", true],
         ["polyfills", true],
         ["styles", false],
-        ["vendor", true],
         ["main", true],
-        ...(this.#opt.builderType === "cordova" ? [["cordova-entry", true] as Entrypoint] : []),
+        ...(this._opt.builderType === "cordova" ? [["cordova-entry", true] as Entrypoint] : []),
       ],
+      sri: false,
       optimization: {
-        scripts: !this.#opt.dev,
-        fonts: { inline: !this.#opt.dev },
+        scripts: !this._opt.dev,
         styles: {
-          minify: !this.#opt.dev,
-          inlineCritical: false,
+          minify: !this._opt.dev,
+          inlineCritical: !this._opt.dev,
+          removeSpecialComments: !this._opt.dev,
         },
+        fonts: { inline: !this._opt.dev },
       },
       crossOrigin: CrossOrigin.None,
+      generateDedicatedSSRContent: false,
     });
-    indexHtmlGenerator.readAsset = readAsset;
-
-    const hints: { url: string; mode: HintMode; as?: string }[] = [];
-    if (!this.#opt.dev) {
-      for (const [key, value] of initialFiles) {
-        if (value.entrypoint) {
-          continue;
-        }
-
-        if (value.type === "script") {
-          hints.push({ url: key, mode: "modulepreload" as const });
-        }
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        else if (value.type === "style") {
-          hints.push({ url: key, mode: "preload" as const, as: "style" });
-        }
-      }
-    }
 
-    const transformResult = await indexHtmlGenerator.process({
+    return await indexHtmlGenerator.process({
       baseHref: this.#baseHref,
       lang: undefined,
       outputPath: "/",
@@ -307,29 +282,9 @@ export class SdNgBundler {
         file,
         extension: path.extname(file),
       })),
-      hints,
     });
-
-    if (this.#opt.dev) {
-      return transformResult;
-    } else {
-      const inlineCriticalCssProcessor = new InlineCriticalCssProcessor({
-        minify: false,
-        readAsset,
-      });
-      const { content, errors, warnings } = await inlineCriticalCssProcessor.process(transformResult.csrContent, {
-        outputPath: "/",
-      });
-
-      return {
-        warnings: [...transformResult.warnings, ...warnings],
-        errors: [...transformResult.errors, ...errors],
-        csrContent: content,
-      };
-    }
   }
 
-  //TODO: index.html  파일에 manifest.json 정보 추가? manifest.webmanifest ? PWA?
   private async _copyAssetsAsync(): Promise<
     {
       source: string;
@@ -338,13 +293,10 @@ export class SdNgBundler {
   > {
     return await resolveAssets(
       [
-        { input: "src", glob: "favicon.ico", output: "" },
-        { input: "src", glob: "manifest.webmanifest", output: "" },
-        { input: "src", glob: "manifest.json", output: "" },
-        { input: "src/assets", glob: "**/*", output: "assets" },
-        ...(this.#opt.dev ? [{ input: "src/assets-dev", glob: "**/*", output: "assets-dev" }] : []),
-        ...(this.#opt.dev && this.#opt.builderType === "cordova"
-          ? Object.keys(this.#opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
+        { input: "public", glob: "**/*", output: "." },
+        ...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
+        ...(this._opt.dev && this._opt.builderType === "cordova"
+          ? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} }).mapMany((platform) => [
               {
                 input: `.cordova/platforms/${platform}/platform_www/plugins`,
                 glob: "**/*",
@@ -368,7 +320,7 @@ export class SdNgBundler {
             ])
           : []),
       ],
-      this.#opt.pkgPath,
+      this._opt.pkgPath,
     );
   }
 
@@ -386,7 +338,7 @@ export class SdNgBundler {
     }[];
   }> {
     return await augmentAppWithServiceWorkerEsbuild(
-      this.#opt.pkgPath,
+      this._opt.pkgPath,
       this.#swConfFilePath,
       this.#baseHref,
       "index.html",
@@ -396,12 +348,12 @@ export class SdNgBundler {
   }
 
   private _getAppContext() {
-    const workerEntries = FsUtil.glob(path.resolve(this.#opt.pkgPath, "src/workers/*.ts")).toObject(
+    const workerEntries = FsUtil.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")).toObject(
       (p) => "worker/" + path.basename(p, path.extname(p)),
     );
 
-    return new SdNgBundlerContext(this.#opt.pkgPath, {
-      absWorkingDir: this.#opt.pkgPath,
+    return new SdNgBundlerContext(this._opt.pkgPath, {
+      absWorkingDir: this._opt.pkgPath,
       bundle: true,
       keepNames: true,
       format: "esm",
@@ -409,32 +361,32 @@ export class SdNgBundler {
       conditions: ["es2020", "es2015", "module"],
       resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
       metafile: true,
-      legalComments: this.#opt.dev ? "eof" : "none",
+      legalComments: this._opt.dev ? "eof" : "none",
       logLevel: "silent",
-      minifyIdentifiers: !this.#opt.dev,
-      minifySyntax: !this.#opt.dev,
-      minifyWhitespace: !this.#opt.dev,
+      minifyIdentifiers: !this._opt.dev,
+      minifySyntax: !this._opt.dev,
+      minifyWhitespace: !this._opt.dev,
       pure: ["forwardRef"],
-      outdir: this.#opt.pkgPath,
+      outdir: this._opt.pkgPath,
       outExtension: undefined,
-      sourcemap: true, //this.#opt.dev,
+      sourcemap: true, //this._opt.dev,
       splitting: true,
       chunkNames: "[name]-[hash]",
       tsconfig: this.#tsConfigFilePath,
       write: false,
       preserveSymlinks: false,
       define: {
-        ...(!this.#opt.dev ? { ngDevMode: "false" } : {}),
+        ...(!this._opt.dev ? { ngDevMode: "false" } : {}),
         "ngJitMode": "false",
         "global": "global",
         "process": "process",
         "Buffer": "Buffer",
         "process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
-        "process.env.NODE_ENV": JSON.stringify(this.#opt.dev ? "development" : "production"),
-        ...(this.#opt.env
-          ? Object.keys(this.#opt.env).toObject(
+        "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
+        ...(this._opt.env
+          ? Object.keys(this._opt.env).toObject(
               (key) => `process.env.${key}`,
-              (key) => JSON.stringify(this.#opt.env![key]),
+              (key) => JSON.stringify(this._opt.env![key]),
             )
           : {}),
       },
@@ -444,10 +396,13 @@ export class SdNgBundler {
       entryPoints: {
         main: this.#mainFilePath,
         // polyfills: 'angular:polyfills',
-        polyfills: path.resolve(this.#opt.pkgPath, "src/polyfills.ts"),
-        ...(this.#opt.builderType === "cordova"
+        polyfills: path.resolve(this._opt.pkgPath, "src/polyfills.ts"),
+        ...(this._opt.builderType === "cordova"
           ? {
-              "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../lib/cordova-entry.js`),
+              "cordova-entry": path.resolve(
+                path.dirname(fileURLToPath(import.meta.url)),
+                `../../../lib/cordova-entry.js`,
+              ),
             }
           : {}),
         ...workerEntries,
@@ -484,12 +439,12 @@ export class SdNgBundler {
       },
       inject: [PathUtil.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim")))],
       plugins: [
-        ...(this.#opt.builderType === "cordova" && this.#opt.cordovaConfig?.plugins
+        ...(this._opt.builderType === "cordova" && this._opt.cordovaConfig?.plugins
           ? [
               {
                 name: "cordova:plugin-empty",
                 setup: ({ onResolve }) => {
-                  onResolve({ filter: new RegExp("(" + this.#opt.cordovaConfig!.plugins!.join("|") + ")") }, () => {
+                  onResolve({ filter: new RegExp("(" + this._opt.cordovaConfig!.plugins!.join("|") + ")") }, () => {
                     return {
                       path: `./cordova-empty.js`,
                       external: true,
@@ -504,19 +459,19 @@ export class SdNgBundler {
         //   loadContent: () => ({
         //     contents: `import "./src/polyfills.ts";`,
         //     loader: 'js',
-        //     resolveDir: this.#opt.pkgPath
+        //     resolveDir: this._opt.pkgPath
         //   })
         // }) as esbuild.Plugin,
         createSourcemapIgnorelistPlugin(),
-        sdNgPlugin({
+        createSdNgPlugin({
           modifiedFileSet: this.#modifiedFileSet,
-          dev: this.#opt.dev,
-          pkgPath: this.#opt.pkgPath,
+          dev: this._opt.dev,
+          pkgPath: this._opt.pkgPath,
           result: this.#ngResultCache,
-          watchScopePaths: this.#opt.watchScopePaths,
+          watchScopePaths: this._opt.watchScopePaths,
         }),
         // createCompilerPlugin({
-        //   sourcemap: this.#opt.dev,
+        //   sourcemap: this._opt.dev,
         //   tsconfig: this._tsConfigFilePath,
         //   jit: false,
         //   advancedOptimizations: true,
@@ -524,11 +479,11 @@ export class SdNgBundler {
         //   fileReplacements: undefined,
         //   sourceFileCache: this._sourceFileCache,
         //   loadResultCache: this._sourceFileCache.loadResultCache,
-        //   incremental: this.#opt.dev
+        //   incremental: this._opt.dev
         // }, {
-        //   workspaceRoot: this.#opt.pkgPath,
-        //   optimization: !this.#opt.dev,
-        //   sourcemap: this.#opt.dev ? 'inline' : false,
+        //   workspaceRoot: this._opt.pkgPath,
+        //   optimization: !this._opt.dev,
+        //   sourcemap: this._opt.dev ? 'inline' : false,
         //   outputNames: {bundles: '[name]', media: 'media/[name]'},
         //   includePaths: [],
         //   externalDependencies: [],
@@ -554,22 +509,22 @@ export class SdNgBundler {
   private _getStyleContext(): SdNgBundlerContext {
     const pluginFactory = new StylesheetPluginFactory(
       {
-        sourcemap: true, //this.#opt.dev,
+        sourcemap: true, //this._opt.dev,
         includePaths: [],
       },
       this.#styleLoadResultCache,
     );
 
-    return new SdNgBundlerContext(this.#opt.pkgPath, {
-      absWorkingDir: this.#opt.pkgPath,
+    return new SdNgBundlerContext(this._opt.pkgPath, {
+      absWorkingDir: this._opt.pkgPath,
       bundle: true,
       entryNames: "[name]",
       assetNames: "media/[name]",
       logLevel: "silent",
-      minify: !this.#opt.dev,
+      minify: !this._opt.dev,
       metafile: true,
-      sourcemap: true, //this.#opt.dev,
-      outdir: this.#opt.pkgPath,
+      sourcemap: true, //this._opt.dev,
+      outdir: this._opt.pkgPath,
       write: false,
       platform: "browser",
       target: this.#browserTarget,
@@ -577,10 +532,10 @@ export class SdNgBundler {
       external: [],
       conditions: ["style", "sass"],
       mainFields: ["style", "sass"],
-      legalComments: !this.#opt.dev ? "none" : "eof",
+      legalComments: !this._opt.dev ? "none" : "eof",
       entryPoints: {
         // styles: 'angular:styles/global;styles'
-        styles: path.resolve(this.#opt.pkgPath, "src/styles.scss"),
+        styles: path.resolve(this._opt.pkgPath, "src/styles.scss"),
       },
       plugins: [
         // createVirtualModulePlugin({
@@ -589,7 +544,7 @@ export class SdNgBundler {
         //   loadContent: () => ({
         //     contents: `@import 'src/styles.scss';`,
         //     loader: 'css',
-        //     resolveDir: this.#opt.pkgPath
+        //     resolveDir: this._opt.pkgPath
         //   }),
         // }) as esbuild.Plugin,
         pluginFactory.create(SassStylesheetLanguage) as esbuild.Plugin,
@@ -600,52 +555,42 @@ export class SdNgBundler {
   }
 
   private _getElectronMainContext() {
-    return new SdNgBundlerContext(this.#opt.pkgPath, {
-      absWorkingDir: this.#opt.pkgPath,
+    return new SdNgBundlerContext(this._opt.pkgPath, {
+      absWorkingDir: this._opt.pkgPath,
       bundle: true,
       entryNames: "[name]",
       assetNames: "media/[name]",
       conditions: ["es2020", "es2015", "module"],
       resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
       metafile: true,
-      legalComments: this.#opt.dev ? "eof" : "none",
+      legalComments: this._opt.dev ? "eof" : "none",
       logLevel: "silent",
-      minify: !this.#opt.dev,
-      outdir: this.#opt.pkgPath,
-      sourcemap: true, //this.#opt.dev,
+      minify: !this._opt.dev,
+      outdir: this._opt.pkgPath,
+      sourcemap: true, //this._opt.dev,
       tsconfig: this.#tsConfigFilePath,
       write: false,
       preserveSymlinks: false,
       external: ["electron"],
       define: {
-        ...(!this.#opt.dev ? { ngDevMode: "false" } : {}),
+        ...(!this._opt.dev ? { ngDevMode: "false" } : {}),
         "process.env.SD_VERSION": JSON.stringify(this.#pkgNpmConf.version),
-        "process.env.NODE_ENV": JSON.stringify(this.#opt.dev ? "development" : "production"),
-        ...(this.#opt.env
-          ? Object.keys(this.#opt.env).toObject(
+        "process.env.NODE_ENV": JSON.stringify(this._opt.dev ? "development" : "production"),
+        ...(this._opt.env
+          ? Object.keys(this._opt.env).toObject(
               (key) => `process.env.${key}`,
-              (key) => JSON.stringify(this.#opt.env![key]),
+              (key) => JSON.stringify(this._opt.env![key]),
             )
           : {}),
       },
       platform: "node",
       entryPoints: {
-        "electron-main": path.resolve(this.#opt.pkgPath, "src/electron-main.ts"),
+        "electron-main": path.resolve(this._opt.pkgPath, "src/electron-main.ts"),
       },
     });
   }
 
   #debug(...msg: any[]): void {
-    this.#logger.debug(`[${path.basename(this.#opt.pkgPath)}]`, ...msg);
+    this.#logger.debug(`[${path.basename(this._opt.pkgPath)}]`, ...msg);
   }
 }
-
-interface IOptions {
-  dev: boolean;
-  outputPath: string;
-  pkgPath: string;
-  builderType: string;
-  env: Record<string, string> | undefined;
-  cordovaConfig: ISdCliClientBuilderCordovaConfig | undefined;
-  watchScopePaths: string[];
-}