@simplysm/sd-cli 12.13.21 → 12.13.35

package/dist/pkg-builders/SdProjectBuildRunner.js

@@ -0,0 +1,235 @@
+import { FsUtils, PathUtils, SdFsWatcher, SdLogger, SdWorker, } from "@simplysm/sd-core-node";
+import path from "path";
+export class SdProjectBuildRunner {
+    static #logger = SdLogger.get(["simplysm", "sd-cli", "SdProjectBuildRunner"]);
+    static #buildInfoMap = new Map();
+    static #serverInfoMap = new Map();
+    static #resultCache = new Map();
+    static async watchAsync(opt) {
+        const scopePathSet = await this.#getScopePathSetAsync(opt.pkgPaths, Object.keys(opt.projConf.localUpdates ?? {}));
+        const watcher = SdFsWatcher.watch(Array.from(scopePathSet), {
+            ignoreInitial: false,
+        });
+        watcher.onChange({ delay: 300 }, async (changeInfos) => {
+            // 변경된 패키지 정보 구성
+            const changeFiles = changeInfos.map((item) => PathUtils.norm(item.path));
+            const changedPkgInfos = opt.pkgPaths
+                .map((pkgPath) => {
+                let buildInfo = this.#buildInfoMap.get(pkgPath);
+                if (!buildInfo)
+                    return { pkgPath };
+                const modifiedFileSet = new Set(changeFiles.filter((item) => buildInfo.watchFileSet.has(item)));
+                if (modifiedFileSet.size < 1)
+                    return;
+                return { pkgPath, buildInfo: buildInfo, modifiedFileSet };
+            })
+                .filterExists();
+            if (changedPkgInfos.length < 1)
+                return;
+            // 변경된 패키지들에 대한 change처리
+            opt.onChange();
+            const buildResults = await changedPkgInfos.parallelAsync(async (changedPkgInfo) => {
+                // 처음
+                if (!changedPkgInfo.buildInfo) {
+                    const buildWorker = new SdWorker(import.meta.resolve("../workers/build-runner.worker"));
+                    await buildWorker.run("initialize", [
+                        {
+                            pkgPath: changedPkgInfo.pkgPath,
+                            projConf: opt.projConf,
+                            scopePathSet: scopePathSet,
+                            watch: true,
+                            emitOnly: opt.emitOnly,
+                            noEmit: opt.noEmit,
+                        },
+                    ]);
+                    const result = await buildWorker.run("rebuild", []);
+                    this.#buildInfoMap.set(changedPkgInfo.pkgPath, {
+                        buildWorker,
+                        watchFileSet: result.watchFileSet,
+                    });
+                    return {
+                        isFirst: true,
+                        pkgPath: changedPkgInfo.pkgPath,
+                        emitFileSet: result.emitFileSet,
+                        affectedFileSet: result.affectedFileSet,
+                        buildMessages: result.buildMessages,
+                    };
+                }
+                // changed
+                else {
+                    const result = await changedPkgInfo.buildInfo.buildWorker.run("rebuild", [
+                        changedPkgInfo.modifiedFileSet,
+                    ]);
+                    changedPkgInfo.buildInfo.watchFileSet = result.watchFileSet;
+                    return {
+                        isFirst: false,
+                        pkgPath: changedPkgInfo.pkgPath,
+                        emitFileSet: result.emitFileSet,
+                        affectedFileSet: result.affectedFileSet,
+                        buildMessages: result.buildMessages,
+                    };
+                }
+            });
+            if (!opt.noEmit) {
+                // 서버 구성 및 재시작
+                for (const buildResult of buildResults) {
+                    const pkgConf = opt.projConf.packages[path.basename(buildResult.pkgPath)];
+                    if (pkgConf.type === "server") {
+                        const serverName = path.basename(buildResult.pkgPath);
+                        this.#logger.debug(`서버 '${serverName}' 재시작...`);
+                        const serverInfo = this.#serverInfoMap.getOrCreate(serverName, {});
+                        const restartServerResult = await this.#restartServerAsync(serverInfo.worker, buildResult.pkgPath, pkgConf);
+                        serverInfo.worker = restartServerResult.worker;
+                        serverInfo.port = restartServerResult.port;
+                        /*await serverInfo.worker.run("addPathProxy", [
+                          "node_modules",
+                          path.resolve(process.cwd(), "node_modules"),
+                        ]);
+                        if (serverInfo.clientMap) {
+                          for (const [clientName, clientInfo] of serverInfo.clientMap.entries()) {
+                            await serverInfo.worker.run("addPathProxy", [clientName, clientInfo.path]);
+                          }
+                        }*/
+                    }
+                    else if (pkgConf.type === "client" && typeof pkgConf.server === "object") {
+                        const serverName = pkgConf.server.port.toString();
+                        this.#logger.debug(`서버 '${serverName}' 재시작...`);
+                        const serverInfo = this.#serverInfoMap.getOrCreate(serverName, {});
+                        const restartServerResult = await this.#restartServerAsync(serverInfo.worker, buildResult.pkgPath, pkgConf.server.port);
+                        serverInfo.worker = restartServerResult.worker;
+                        serverInfo.port = restartServerResult.port;
+                        /*await worker.run("addPathProxy", [
+                          "node_modules",
+                          path.resolve(process.cwd(), "node_modules"),
+                        ]);*/
+                    }
+                }
+                // 클라이언트 구성 및 변경 Reload
+                for (const buildResult of buildResults) {
+                    const pkgConf = opt.projConf.packages[path.basename(buildResult.pkgPath)];
+                    if (pkgConf.type === "client") {
+                        const clientName = path.basename(buildResult.pkgPath);
+                        const serverKey = typeof pkgConf.server === "string"
+                            ? pkgConf.server
+                            : typeof pkgConf.server === "object"
+                                ? pkgConf.server.port.toString()
+                                : undefined;
+                        if (serverKey == null)
+                            continue;
+                        const serverInfo = this.#serverInfoMap.get(serverKey);
+                        if (!serverInfo || !serverInfo.worker)
+                            continue;
+                        const distPath = path.resolve(buildResult.pkgPath, "dist");
+                        serverInfo.clientMap = serverInfo.clientMap ?? new Map();
+                        serverInfo.clientMap.set(clientName, {
+                            distPath,
+                            buildTypes: (pkgConf.builder ? Object.keys(pkgConf.builder) : ["web"]),
+                        });
+                        if (buildResult.isFirst)
+                            continue;
+                        this.#logger.debug(`클라이언트 '${clientName}' 새로고침...`);
+                        await serverInfo.worker.run("broadcastReload", [
+                            clientName,
+                            new Set(Array.from(buildResult.emitFileSet)
+                                .filter((item) => !item.endsWith(".map"))
+                                .map((item) => path.relative(distPath, item))),
+                        ]);
+                    }
+                }
+                // 서버 Proxy 설정
+                for (const serverInfo of this.#serverInfoMap.values()) {
+                    if (!serverInfo.worker)
+                        continue;
+                    await serverInfo.worker.run("setPathProxy", [
+                        {
+                            ...Array.from(serverInfo.clientMap?.entries() ?? []).toObject((entry) => entry[0], (entry) => entry[1].distPath),
+                            node_modules: path.resolve(process.cwd(), "node_modules"),
+                        },
+                    ]);
+                }
+                // 접속주소 logging
+                for (const serverName of this.#serverInfoMap.keys()) {
+                    const serverInfo = this.#serverInfoMap.get(serverName);
+                    const clientPaths = [];
+                    for (const [clientName, clientInfo] of serverInfo?.clientMap?.entries() ?? []) {
+                        for (const buildType of clientInfo.buildTypes) {
+                            if (buildType === "web") {
+                                clientPaths.push(`http://localhost:${serverInfo.port}/${clientName}/`);
+                            }
+                            else {
+                                clientPaths.push(`http://localhost:${serverInfo.port}/${clientName}/${buildType}`);
+                            }
+                        }
+                    }
+                    this.#logger.info("클라이언트 개발 서버 접속 주소\n" + clientPaths.join("\n"));
+                }
+            }
+            // 빌드 완료 이벤트
+            for (const buildResult of buildResults) {
+                this.#resultCache.delete(buildResult.pkgPath);
+                for (const affectedFilePath of buildResult.affectedFileSet) {
+                    this.#resultCache.delete(affectedFilePath);
+                }
+                for (const buildMessage of buildResult.buildMessages) {
+                    if (!buildMessage.filePath ||
+                        PathUtils.isChildPath(buildMessage.filePath, buildResult.pkgPath)) {
+                        const cacheItem = this.#resultCache.getOrCreate(buildMessage.filePath ?? buildResult.pkgPath, []);
+                        cacheItem.push(buildMessage);
+                    }
+                }
+            }
+            opt.onComplete(Array.from(this.#resultCache.values()).mapMany());
+        });
+    }
+    static async buildAsync(opt) {
+        const scopePathSet = await this.#getScopePathSetAsync(opt.pkgPaths, Object.keys(opt.projConf.localUpdates ?? {}));
+        const buildResults = await opt.pkgPaths.parallelAsync(async (pkgPath) => {
+            const worker = new SdWorker(import.meta.resolve("../workers/build-runner.worker"));
+            await worker.run("initialize", [
+                {
+                    pkgPath,
+                    projConf: opt.projConf,
+                    scopePathSet: scopePathSet,
+                },
+            ]);
+            const result = await worker.run("rebuild", []);
+            await worker.killAsync();
+            return {
+                buildMessages: result.buildMessages,
+            };
+        });
+        return buildResults.mapMany((item) => item.buildMessages);
+    }
+    static async #getScopePathSetAsync(pkgPaths, localUpdateGlobs) {
+        const workspacePaths = pkgPaths.mapMany((item) => [
+            path.resolve(item, "src"),
+            path.resolve(item, "public"),
+            path.resolve(item, "public-dev"),
+        ]);
+        const localUpdatePaths = (await localUpdateGlobs.mapManyAsync(async (key) => await FsUtils.globAsync(path.resolve(process.cwd(), "node_modules", key)))).mapMany((key) => [
+            path.resolve(process.cwd(), "node_modules", key, "dist"),
+            path.resolve(process.cwd(), "node_modules", key, "src/**/*.scss"),
+        ]);
+        return new Set([...workspacePaths, ...localUpdatePaths].map((item) => PathUtils.norm(item)));
+    }
+    static async #restartServerAsync(prevWorker, pkgPath, pkgConfOrPort) {
+        if (prevWorker) {
+            await prevWorker.killAsync();
+        }
+        const npmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
+        const worker = new SdWorker(import.meta.resolve("../workers/server.worker"), {
+            env: {
+                NODE_ENV: "development",
+                TZ: "Asia/Seoul",
+                SD_VERSION: npmConf.version,
+                ...(typeof pkgConfOrPort === "number" ? {} : pkgConfOrPort.env),
+            },
+        });
+        const port = await worker.run("listen", [
+            typeof pkgConfOrPort === "number" ? pkgConfOrPort : pkgPath,
+        ]);
+        this.#logger.debug("서버가 시작되었습니다.");
+        return { worker, port };
+    }
+}
+//# sourceMappingURL=SdProjectBuildRunner.js.map

package/dist/pkg-builders/SdProjectBuildRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdProjectBuildRunner.js","sourceRoot":"","sources":["../../src/pkg-builders/SdProjectBuildRunner.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/client/{sd-cli-ng-routes.file-generator.js → SdCliNgRoutesFileGenerator.js}

@@ -86,4 +86,4 @@ ${routes}
         }
     }
 }
-//# sourceMappingURL=sd-cli-ng-routes.file-generator.js.map
+//# sourceMappingURL=SdCliNgRoutesFileGenerator.js.map

package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdCliNgRoutesFileGenerator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdCliNgRoutesFileGenerator.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/client/SdClientBuildRunner.d.ts

@@ -0,0 +1,8 @@
+import { SdLogger, TNormPath } from "@simplysm/sd-core-node";
+import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
+export declare class SdClientBuildRunner extends SdBuildRunnerBase<"client"> {
+    #private;
+    protected _logger: SdLogger;
+    protected _runAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult>;
+}

package/dist/pkg-builders/client/{sd-client.build-runner.js → SdClientBuildRunner.js}

@@ -1,21 +1,21 @@
 import { FsUtils, PathUtils, SdLogger } from "@simplysm/sd-core-node";
 import path from "path";
-import { SdNgBundler } from "./sd-ng.bundler";
-import { SdCliCordova } from "../../entry/sd-cli-cordova";
-import { SdCliElectron } from "../../entry/sd-cli-electron";
-import { BuildRunnerBase } from "../commons/build-runner.base";
-import { SdCliNgRoutesFileGenerator } from "./sd-cli-ng-routes.file-generator";
-export class SdClientBuildRunner extends BuildRunnerBase {
+import { SdBuildRunnerBase } from "../commons/SdBuildRunnerBase";
+import { SdNgBundler } from "./SdNgBundler";
+import { SdCliCordova } from "../../entry/SdCliCordova";
+import { SdCliNgRoutesFileGenerator } from "./SdCliNgRoutesFileGenerator";
+import { SdCliElectron } from "../../entry/SdCliElectron";
+export class SdClientBuildRunner extends SdBuildRunnerBase {
     constructor() {
         super(...arguments);
         this._logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
     }
     #ngBundlers;
     #cordova;
-    async _runAsync(dev, emitOnly, noEmit, modifiedFileSet) {
+    async _runAsync(modifiedFileSet) {
         // 최초 한번
         if (!modifiedFileSet) {
-            if (!noEmit) {
+            if (!this._noEmit) {
                 // config
                 this._debug("GEN .config...");
                 const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
@@ -40,16 +40,17 @@ export class SdClientBuildRunner extends BuildRunnerBase {
             this._debug(`BUILD 준비...`);
             const ngBundlerBuilderTypes = Object.keys(this._pkgConf.builder ?? { web: {} });
             this.#ngBundlers = ngBundlerBuilderTypes.map((ngBundlerBuilderType) => new SdNgBundler({
-                dev,
-                emitOnly,
-                noEmit,
+                watch: this._watch,
+                dev: this._dev,
+                emitOnly: this._emitOnly ?? false,
+                noEmit: this._noEmit ?? false,
                 builderType: ngBundlerBuilderType,
                 pkgPath: this._pkgPath,
                 outputPath: ngBundlerBuilderType === "web"
                     ? PathUtils.norm(this._pkgPath, "dist")
-                    : ngBundlerBuilderType === "electron" && !dev
+                    : ngBundlerBuilderType === "electron" && !this._dev
                         ? PathUtils.norm(this._pkgPath, ".electron/src")
-                        : ngBundlerBuilderType === "cordova" && !dev
+                        : ngBundlerBuilderType === "cordova" && !this._dev
                             ? PathUtils.norm(this._pkgPath, ".cordova/www")
                             : PathUtils.norm(this._pkgPath, "dist", ngBundlerBuilderType),
                 env: {
@@ -60,46 +61,41 @@ export class SdClientBuildRunner extends BuildRunnerBase {
                     ? (this._pkgConf.builder?.electron?.reinstallDependencies ?? [])
                     : [],
                 cordovaConfig: ngBundlerBuilderType === "cordova" ? this._pkgConf.builder.cordova : undefined,
-                watchScopePathSet: this._watchScopePathSet,
+                scopePathSet: this._scopePathSet,
             }));
         }
-        if (noEmit) {
-            if (modifiedFileSet) {
-                for (const ngBundler of this.#ngBundlers) {
-                    ngBundler.markForChanges(Array.from(modifiedFileSet));
-                }
+        if (modifiedFileSet) {
+            for (const ngBundler of this.#ngBundlers) {
+                ngBundler.markForChanges(Array.from(modifiedFileSet));
             }
+        }
+        if (this._noEmit) {
             this._debug(`BUILD...`);
             const buildResults = await Promise.all(this.#ngBundlers.map((builder) => builder.bundleAsync()));
             const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
             const affectedFileSet = new Set(buildResults.mapMany((item) => Array.from(item.affectedFileSet)));
             const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
-            const results = buildResults.mapMany((item) => item.results).distinct();
+            const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
             this._debug(`빌드 완료`);
             return {
+                buildMessages,
                 watchFileSet,
                 affectedFileSet,
-                buildMessages: results,
                 emitFileSet,
             };
         }
         else {
-            if (modifiedFileSet) {
-                for (const ngBundler of this.#ngBundlers) {
-                    ngBundler.markForChanges(Array.from(modifiedFileSet));
-                }
-            }
             this._debug(`BUILD...`);
             const buildResults = await Promise.all(this.#ngBundlers.map((builder) => builder.bundleAsync()));
             const watchFileSet = new Set(buildResults.mapMany((item) => Array.from(item.watchFileSet)));
             const affectedFileSet = new Set(buildResults.mapMany((item) => Array.from(item.affectedFileSet)));
             const emitFileSet = new Set(buildResults.mapMany((item) => Array.from(item.emitFileSet)));
-            const results = buildResults.mapMany((item) => item.results).distinct();
-            if (!dev && this.#cordova) {
+            const buildMessages = buildResults.mapMany((item) => item.buildMessages).distinct();
+            if (!this._dev && this.#cordova) {
                 this._debug("CORDOVA BUILD...");
                 await this.#cordova.buildAsync(path.resolve(this._pkgPath, "dist"));
             }
-            if (!dev && this._pkgConf.builder?.electron) {
+            if (!this._dev && this._pkgConf.builder?.electron) {
                 this._debug("ELECTRON BUILD...");
                 await SdCliElectron.buildAsync({
                     pkgPath: this._pkgPath,
@@ -108,12 +104,12 @@ export class SdClientBuildRunner extends BuildRunnerBase {
             }
             this._debug(`빌드 완료`);
             return {
+                buildMessages,
                 watchFileSet,
                 affectedFileSet,
-                buildMessages: results,
                 emitFileSet,
             };
         }
     }
 }
-//# sourceMappingURL=sd-client.build-runner.js.map
+//# sourceMappingURL=SdClientBuildRunner.js.map

package/dist/pkg-builders/client/SdClientBuildRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdClientBuildRunner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdClientBuildRunner.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/client/{sd-ng.bundler.d.ts → SdNgBundler.d.ts}

@@ -1,11 +1,12 @@
 import { TNormPath } from "@simplysm/sd-core-node";
-import { ISdClientBuilderCordovaConfig } from "../../types/config.types";
-import { ISdBuildMessage } from "../../types/build.types";
-import { ScopePathSet } from "../commons/scope-path";
+import { ISdClientBuilderCordovaConfig } from "../../types/config/ISdProjectConfig";
+import { ScopePathSet } from "../commons/ScopePathSet";
+import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 export declare class SdNgBundler {
     #private;
     private readonly _opt;
     constructor(_opt: {
+        watch: boolean;
         dev: boolean;
         emitOnly: boolean;
         noEmit: boolean;
@@ -15,13 +16,8 @@ export declare class SdNgBundler {
         env: Record<string, string> | undefined;
         external: string[];
         cordovaConfig: ISdClientBuilderCordovaConfig | undefined;
-        watchScopePathSet: ScopePathSet;
+        scopePathSet: ScopePathSet;
     });
     markForChanges(filePaths: string[]): void;
-    bundleAsync(): Promise<{
-        watchFileSet: Set<TNormPath>;
-        affectedFileSet: Set<TNormPath>;
-        results: ISdBuildMessage[];
-        emitFileSet: Set<TNormPath>;
-    }>;
+    bundleAsync(): Promise<ISdBuildResult>;
 }

package/dist/pkg-builders/client/{sd-ng.bundler.js → SdNgBundler.js}

@@ -4,7 +4,7 @@ import { fileURLToPath } from "url";
 import nodeStdLibBrowser from "node-stdlib-browser";
 import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
 import browserslist from "browserslist";
-import { SdNgBundlerContext } from "./sd-ng.bundler-context";
+import { SdNgBundlerContext } from "./SdNgBundlerContext";
 import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-result-cache";
 import { convertOutputFile, createOutputFile, transformSupportedBrowsersToTargets, } from "@angular/build/src/tools/esbuild/utils";
 import { BuildOutputFileType, } from "@angular/build/src/tools/esbuild/bundler-context";
@@ -18,8 +18,8 @@ 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 { createSdNgPlugin } from "./sd-ng.plugin-creator";
-import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
+import { createSdNgPlugin } from "./createSdNgPlugin";
+import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTimer";
 import nodeModule from "module";
 export class SdNgBundler {
     #logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundler"]);
@@ -79,12 +79,12 @@ export class SdNgBundler {
             return await this.#contexts.mapAsync(async (ctx) => await ctx.bundleAsync());
         });
         //-- results
-        const results = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
+        const buildMessages = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
         if (this._opt.noEmit) {
             return {
                 watchFileSet: this.#ngResultCache.watchFileSet,
                 affectedFileSet: this.#ngResultCache.affectedFileSet,
-                results,
+                buildMessages,
                 emitFileSet: new Set(),
             };
         }
@@ -109,7 +109,7 @@ export class SdNgBundler {
             await perf.run("create index.html", async () => {
                 const genIndexHtmlResult = await this.#genIndexHtmlAsync(outputFiles, initialFiles);
                 for (const warning of genIndexHtmlResult.warnings) {
-                    results.push({
+                    buildMessages.push({
                         filePath: undefined,
                         line: undefined,
                         char: undefined,
@@ -120,7 +120,7 @@ export class SdNgBundler {
                     });
                 }
                 for (const error of genIndexHtmlResult.errors) {
-                    results.push({
+                    buildMessages.push({
                         filePath: undefined,
                         line: undefined,
                         char: undefined,
@@ -151,7 +151,7 @@ export class SdNgBundler {
                         assetFiles.push(...serviceWorkerResult.assetFiles);
                     }
                     catch (err) {
-                        results.push({
+                        buildMessages.push({
                             filePath: undefined,
                             line: undefined,
                             char: undefined,
@@ -196,7 +196,7 @@ export class SdNgBundler {
                     PathUtils.norm(this.#indexHtmlFilePath),
                 ]),
                 affectedFileSet: this.#ngResultCache.affectedFileSet,
-                results,
+                buildMessages,
                 emitFileSet: emitFileSet,
             };
         }
@@ -393,12 +393,13 @@ export class SdNgBundler {
                 createSourcemapIgnorelistPlugin(),
                 createSdNgPlugin({
                     modifiedFileSet: this.#modifiedFileSet,
+                    watch: this._opt.watch,
                     dev: this._opt.dev,
                     emitOnly: this._opt.emitOnly,
                     noEmit: this._opt.noEmit,
                     pkgPath: this._opt.pkgPath,
                     result: this.#ngResultCache,
-                    watchScopePathSet: this._opt.watchScopePathSet,
+                    scopePathSet: this._opt.scopePathSet,
                 }),
                 ...(this._opt.builderType === "electron"
                     ? []
@@ -486,4 +487,4 @@ export class SdNgBundler {
         this.#logger.debug(`[${path.basename(this._opt.pkgPath)}]`, ...msg);
     }
 }
-//# sourceMappingURL=sd-ng.bundler.js.map
+//# sourceMappingURL=SdNgBundler.js.map

package/dist/pkg-builders/client/SdNgBundler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdNgBundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdNgBundler.ts"],"names":[],"mappings":"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"}

package/dist/pkg-builders/client/{sd-ng.bundler-context.d.ts → SdNgBundlerContext.d.ts}

@@ -13,7 +13,7 @@ export declare class SdNgBundlerContext {
     private readonly _esbuildOptions;
     constructor(_pkgPath: string, _esbuildOptions: esbuild.BuildOptions);
     bundleAsync(): Promise<{
-        results: import("../../types/build.types").ISdBuildMessage[];
+        results: import("../../types/build/ISdBuildMessage").ISdBuildMessage[];
         initialFiles: Map<string, InitialFileRecord>;
         outputFiles: esbuild.OutputFile[] | undefined;
         metafile: esbuild.Metafile | undefined;

package/dist/pkg-builders/client/{sd-ng.bundler-context.js → SdNgBundlerContext.js}

@@ -1,7 +1,7 @@
 import esbuild from "esbuild";
 import path from "path";
 import { SdLogger } from "@simplysm/sd-core-node";
-import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
+import { SdCliConvertMessageUtils } from "../../utils/SdCliConvertMessageUtils";
 export class SdNgBundlerContext {
     #logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundlerContext"]);
     #context;
@@ -84,8 +84,7 @@ export class SdNgBundlerContext {
         };
     }
     #debug(...msg) {
-        this.#logger.debug(`[${path.basename(this._pkgPath)}] (${Object.keys(this._esbuildOptions.entryPoints)
-            .join(", ")})`, ...msg);
+        this.#logger.debug(`[${path.basename(this._pkgPath)}] (${Object.keys(this._esbuildOptions.entryPoints).join(", ")})`, ...msg);
     }
 }
-//# sourceMappingURL=sd-ng.bundler-context.js.map
+//# sourceMappingURL=SdNgBundlerContext.js.map

package/dist/pkg-builders/client/SdNgBundlerContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SdNgBundlerContext.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/SdNgBundlerContext.ts"],"names":[],"mappings":"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"}