@simplysm/sd-cli 12.7.5 → 12.7.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/entry/{SdAiCommand.d.ts → sd-cli-ai-command.d.ts} +1 -1
- package/dist/entry/{SdAiCommand.js → sd-cli-ai-command.js} +5 -5
- package/dist/entry/sd-cli-ai-command.js.map +1 -0
- package/dist/entry/{SdCliCordova.d.ts → sd-cli-cordova.d.ts} +1 -1
- package/dist/entry/{SdCliCordova.js → sd-cli-cordova.js} +33 -33
- package/dist/entry/sd-cli-cordova.js.map +1 -0
- package/dist/entry/{SdCliElectron.d.ts → sd-cli-electron.d.ts} +1 -1
- package/dist/entry/{SdCliElectron.js → sd-cli-electron.js} +18 -18
- package/dist/entry/sd-cli-electron.js.map +1 -0
- package/dist/entry/{SdCliLocalUpdate.js → sd-cli-local-update.js} +12 -12
- package/dist/entry/sd-cli-local-update.js.map +1 -0
- package/dist/entry/{SdCliProject.js → sd-cli-project.js} +36 -36
- package/dist/entry/sd-cli-project.js.map +1 -0
- package/dist/index.d.ts +30 -30
- package/dist/index.js +30 -30
- package/dist/index.js.map +1 -1
- package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.js → sd-cli-ng-routes.file-generator.js} +12 -12
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -0
- package/dist/pkg-builders/client/{SdClientBuildRunner.d.ts → sd-client.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdClientBuildRunner.js → sd-client.build-runner.js} +34 -27
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundlerContext.js → sd-ng.bundler-context.js} +5 -5
- package/dist/pkg-builders/client/sd-ng.bundler-context.js.map +1 -0
- package/dist/pkg-builders/client/{SdNgBundler.d.ts → sd-ng.bundler.d.ts} +2 -2
- package/dist/pkg-builders/client/{SdNgBundler.js → sd-ng.bundler.js} +55 -37
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -0
- package/dist/pkg-builders/client/{createSdNgPlugin.d.ts → sd-ng.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/client/{createSdNgPlugin.js → sd-ng.plugin-creator.js} +17 -17
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.js → sd-cli-index.file-generator.js} +8 -8
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -0
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.d.ts → sd-js-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdJsLibBuildRunner.js → sd-js-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.d.ts → sd-ts-lib.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/lib/{SdTsLibBuildRunner.js → sd-ts-lib.build-runner.js} +17 -17
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -0
- package/dist/pkg-builders/lib/{SdTsLibBuilder.d.ts → sd-ts-lib.builder.d.ts} +1 -1
- package/dist/pkg-builders/lib/{SdTsLibBuilder.js → sd-ts-lib.builder.js} +11 -11
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -0
- package/dist/pkg-builders/{SdMultiBuildRunner.d.ts → sd-multi.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/{SdMultiBuildRunner.js → sd-multi.build-runner.js} +13 -13
- package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBuildRunner.d.ts → sd-server.build-runner.d.ts} +2 -2
- package/dist/pkg-builders/server/{SdServerBuildRunner.js → sd-server.build-runner.js} +35 -35
- package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -0
- package/dist/pkg-builders/server/{SdServerBundler.d.ts → sd-server.bundler.d.ts} +1 -1
- package/dist/pkg-builders/server/{SdServerBundler.js → sd-server.bundler.js} +15 -15
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -0
- package/dist/pkg-builders/server/{createSdServerPlugin.d.ts → sd-server.plugin-creator.d.ts} +1 -1
- package/dist/pkg-builders/server/{createSdServerPlugin.js → sd-server.plugin-creator.js} +10 -10
- package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -0
- package/dist/sd-cli.js +10 -10
- package/dist/sd-cli.js.map +1 -1
- package/dist/{ts-builder/SdTsCompiler.d.ts → ts-compiler/sd-ts-compiler.d.ts} +1 -1
- package/dist/{ts-builder/SdTsCompiler.js → ts-compiler/sd-ts-compiler.js} +60 -60
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -0
- package/dist/types/{build-plugin.type.js → build-plugin.types.js} +1 -1
- package/dist/types/build-plugin.types.js.map +1 -0
- package/dist/types/{build-runner.type.d.ts → build-runner.types.d.ts} +1 -1
- package/dist/types/build-runner.types.js +3 -0
- package/dist/types/build-runner.types.js.map +1 -0
- package/dist/types/{build.type.js → build.types.js} +1 -1
- package/dist/types/build.types.js.map +1 -0
- package/dist/types/common-configs.types.js +2 -0
- package/dist/types/common-configs.types.js.map +1 -0
- package/dist/types/config.types.js +2 -0
- package/dist/types/config.types.js.map +1 -0
- package/dist/types/{ts-compiler.type.d.ts → ts-compiler.types.d.ts} +1 -1
- package/dist/types/{ts-compiler.type.js → ts-compiler.types.js} +2 -2
- package/dist/types/ts-compiler.types.js.map +1 -0
- package/dist/types/{workers.type.d.ts → worker.types.d.ts} +2 -2
- package/dist/types/worker.types.js +3 -0
- package/dist/types/worker.types.js.map +1 -0
- package/dist/utils/{SdCliConvertMessageUtil.d.ts → sd-cli-convert-message.utils.d.ts} +2 -2
- package/dist/utils/{SdCliConvertMessageUtil.js → sd-cli-convert-message.utils.js} +7 -7
- package/dist/utils/sd-cli-convert-message.utils.js.map +1 -0
- package/dist/utils/{SdCliPerformanceTime.js → sd-cli-performance-time.js} +1 -1
- package/dist/utils/sd-cli-performance-time.js.map +1 -0
- package/dist/workers/{build-runner-worker.js → build-runner.worker.js} +13 -13
- package/dist/workers/build-runner.worker.js.map +1 -0
- package/dist/workers/{server-worker.js → server.worker.js} +6 -6
- package/dist/workers/server.worker.js.map +1 -0
- package/package.json +5 -5
- package/src/entry/{SdAiCommand.ts → sd-cli-ai-command.ts} +4 -4
- package/src/entry/{SdCliCordova.ts → sd-cli-cordova.ts} +32 -32
- package/src/entry/{SdCliElectron.ts → sd-cli-electron.ts} +17 -17
- package/src/entry/{SdCliLocalUpdate.ts → sd-cli-local-update.ts} +11 -11
- package/src/entry/{SdCliProject.ts → sd-cli-project.ts} +36 -36
- package/src/index.ts +30 -30
- package/src/pkg-builders/client/{SdCliNgRoutesFileGenerator.ts → sd-cli-ng-routes.file-generator.ts} +11 -11
- package/src/pkg-builders/client/{SdClientBuildRunner.ts → sd-client.build-runner.ts} +52 -45
- package/src/pkg-builders/client/{SdNgBundlerContext.ts → sd-ng.bundler-context.ts} +4 -4
- package/src/pkg-builders/client/{SdNgBundler.ts → sd-ng.bundler.ts} +94 -61
- package/src/pkg-builders/client/{createSdNgPlugin.ts → sd-ng.plugin-creator.ts} +16 -16
- package/src/pkg-builders/lib/{SdCliIndexFileGenerator.ts → sd-cli-index.file-generator.ts} +7 -7
- package/src/pkg-builders/lib/{SdJsLibBuildRunner.ts → sd-js-lib.build-runner.ts} +16 -16
- package/src/pkg-builders/lib/{SdTsLibBuildRunner.ts → sd-ts-lib.build-runner.ts} +17 -17
- package/src/pkg-builders/lib/{SdTsLibBuilder.ts → sd-ts-lib.builder.ts} +10 -10
- package/src/pkg-builders/{SdMultiBuildRunner.ts → sd-multi.build-runner.ts} +12 -12
- package/src/pkg-builders/server/{SdServerBuildRunner.ts → sd-server.build-runner.ts} +34 -34
- package/src/pkg-builders/server/{SdServerBundler.ts → sd-server.bundler.ts} +14 -14
- package/src/pkg-builders/server/{createSdServerPlugin.ts → sd-server.plugin-creator.ts} +9 -9
- package/src/sd-cli.ts +10 -10
- package/src/{ts-builder/SdTsCompiler.ts → ts-compiler/sd-ts-compiler.ts} +60 -60
- package/src/types/{build-runner.type.ts → build-runner.types.ts} +1 -1
- package/src/types/{ts-compiler.type.ts → ts-compiler.types.ts} +1 -1
- package/src/types/{workers.type.ts → worker.types.ts} +2 -2
- package/src/utils/{SdCliConvertMessageUtil.ts → sd-cli-convert-message.utils.ts} +6 -6
- package/src/workers/{build-runner-worker.ts → build-runner.worker.ts} +12 -12
- package/src/workers/{server-worker.ts → server.worker.ts} +5 -5
- package/dist/entry/SdAiCommand.js.map +0 -1
- package/dist/entry/SdCliCordova.js.map +0 -1
- package/dist/entry/SdCliElectron.js.map +0 -1
- package/dist/entry/SdCliLocalUpdate.js.map +0 -1
- package/dist/entry/SdCliProject.js.map +0 -1
- package/dist/pkg-builders/SdMultiBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +0 -1
- package/dist/pkg-builders/client/SdClientBuildRunner.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundler.js.map +0 -1
- package/dist/pkg-builders/client/SdNgBundlerContext.js.map +0 -1
- package/dist/pkg-builders/client/createSdNgPlugin.js.map +0 -1
- package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +0 -1
- package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +0 -1
- package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBuildRunner.js.map +0 -1
- package/dist/pkg-builders/server/SdServerBundler.js.map +0 -1
- package/dist/pkg-builders/server/createSdServerPlugin.js.map +0 -1
- package/dist/ts-builder/SdTsCompiler.js.map +0 -1
- package/dist/types/build-plugin.type.js.map +0 -1
- package/dist/types/build-runner.type.js +0 -3
- package/dist/types/build-runner.type.js.map +0 -1
- package/dist/types/build.type.js.map +0 -1
- package/dist/types/common-configs.type.js +0 -2
- package/dist/types/common-configs.type.js.map +0 -1
- package/dist/types/sd-configs.type.js +0 -2
- package/dist/types/sd-configs.type.js.map +0 -1
- package/dist/types/ts-compiler.type.js.map +0 -1
- package/dist/types/workers.type.js +0 -3
- package/dist/types/workers.type.js.map +0 -1
- package/dist/utils/SdCliConvertMessageUtil.js.map +0 -1
- package/dist/utils/SdCliPerformanceTime.js.map +0 -1
- package/dist/workers/build-runner-worker.js.map +0 -1
- package/dist/workers/server-worker.js.map +0 -1
- /package/dist/entry/{SdCliLocalUpdate.d.ts → sd-cli-local-update.d.ts} +0 -0
- /package/dist/entry/{SdCliProject.d.ts → sd-cli-project.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.d.ts → sd-cli-ng-routes.file-generator.d.ts} +0 -0
- /package/dist/pkg-builders/client/{SdNgBundlerContext.d.ts → sd-ng.bundler-context.d.ts} +0 -0
- /package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.d.ts → sd-cli-index.file-generator.d.ts} +0 -0
- /package/dist/types/{build-plugin.type.d.ts → build-plugin.types.d.ts} +0 -0
- /package/dist/types/{build.type.d.ts → build.types.d.ts} +0 -0
- /package/dist/types/{common-configs.type.d.ts → common-configs.types.d.ts} +0 -0
- /package/dist/types/{sd-configs.type.d.ts → config.types.d.ts} +0 -0
- /package/dist/utils/{SdCliPerformanceTime.d.ts → sd-cli-performance-time.d.ts} +0 -0
- /package/dist/workers/{build-runner-worker.d.ts → build-runner.worker.d.ts} +0 -0
- /package/dist/workers/{server-worker.d.ts → server.worker.d.ts} +0 -0
- /package/src/types/{build-plugin.type.ts → build-plugin.types.ts} +0 -0
- /package/src/types/{build.type.ts → build.types.ts} +0 -0
- /package/src/types/{common-configs.type.ts → common-configs.types.ts} +0 -0
- /package/src/types/{sd-configs.type.ts → config.types.ts} +0 -0
- /package/src/utils/{SdCliPerformanceTime.ts → sd-cli-performance-time.ts} +0 -0
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import path from "path";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { SdLogger } from "@simplysm/sd-core-node";
|
|
4
|
+
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
5
5
|
export class SdNgBundlerContext {
|
|
6
|
-
#logger =
|
|
6
|
+
#logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundlerContext"]);
|
|
7
7
|
constructor(_pkgPath, _esbuildOptions) {
|
|
8
8
|
this._pkgPath = _pkgPath;
|
|
9
9
|
this._esbuildOptions = _esbuildOptions;
|
|
@@ -27,7 +27,7 @@ export class SdNgBundlerContext {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
this.#debug(`convert results...`);
|
|
30
|
-
const results =
|
|
30
|
+
const results = SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(esbuildResult, this._pkgPath);
|
|
31
31
|
const initialFiles = new Map();
|
|
32
32
|
for (const outputFile of esbuildResult.outputFiles ?? []) {
|
|
33
33
|
const relativeFilePath = path.isAbsolute(outputFile.path)
|
|
@@ -87,4 +87,4 @@ export class SdNgBundlerContext {
|
|
|
87
87
|
.join(", ")})`, ...msg);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
//# sourceMappingURL=
|
|
90
|
+
//# sourceMappingURL=sd-ng.bundler-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-ng.bundler-context.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-ng.bundler-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
2
|
-
import { type ISdClientBuilderCordovaConfig } from "../../types/
|
|
3
|
-
import { type ISdBuildMessage } from "../../types/build.
|
|
2
|
+
import { type ISdClientBuilderCordovaConfig } from "../../types/config.types";
|
|
3
|
+
import { type ISdBuildMessage } from "../../types/build.types";
|
|
4
4
|
export declare class SdNgBundler {
|
|
5
5
|
#private;
|
|
6
6
|
private _opt;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import esbuild, {} from "esbuild";
|
|
3
|
-
import {
|
|
3
|
+
import { FsUtils, PathUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
4
4
|
import { fileURLToPath } from "url";
|
|
5
5
|
import nodeStdLibBrowser from "node-stdlib-browser";
|
|
6
6
|
import nodeStdLibBrowserPlugin from "node-stdlib-browser/helpers/esbuild/plugin";
|
|
7
7
|
import browserslist from "browserslist";
|
|
8
|
-
import { SdNgBundlerContext } from "./
|
|
8
|
+
import { SdNgBundlerContext } from "./sd-ng.bundler-context";
|
|
9
9
|
import { MemoryLoadResultCache } from "@angular/build/src/tools/esbuild/load-result-cache";
|
|
10
10
|
import { convertOutputFile, createOutputFile, transformSupportedBrowsersToTargets, } from "@angular/build/src/tools/esbuild/utils";
|
|
11
11
|
import { BuildOutputFileType, } from "@angular/build/src/tools/esbuild/bundler-context";
|
|
@@ -14,21 +14,21 @@ import { IndexHtmlGenerator, } from "@angular/build/src/utils/index-file/index-h
|
|
|
14
14
|
import {} from "@angular/build/src/utils/index-file/augment-index-html";
|
|
15
15
|
import { CrossOrigin } from "@angular/build/src/builders/application/schema";
|
|
16
16
|
import { augmentAppWithServiceWorkerEsbuild } from "@angular/build/src/utils/service-worker";
|
|
17
|
-
import { createSourcemapIgnorelistPlugin } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
|
|
18
|
-
import { StylesheetPluginFactory } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
|
|
17
|
+
import { createSourcemapIgnorelistPlugin, } from "@angular/build/src/tools/esbuild/sourcemap-ignorelist-plugin";
|
|
18
|
+
import { StylesheetPluginFactory, } from "@angular/build/src/tools/esbuild/stylesheets/stylesheet-plugin-factory";
|
|
19
19
|
import { SassStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/sass-language";
|
|
20
20
|
import { CssStylesheetLanguage } from "@angular/build/src/tools/esbuild/stylesheets/css-language";
|
|
21
|
-
import { createCssResourcePlugin } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
|
|
21
|
+
import { createCssResourcePlugin, } from "@angular/build/src/tools/esbuild/stylesheets/css-resource-plugin";
|
|
22
22
|
import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
|
|
23
|
-
import { createSdNgPlugin } from "./
|
|
24
|
-
import { SdCliPerformanceTimer } from "../../utils/
|
|
25
|
-
import {} from "../../types/common-configs.
|
|
26
|
-
import {} from "../../types/
|
|
27
|
-
import {} from "../../types/build-plugin.
|
|
28
|
-
import {} from "../../types/build.
|
|
23
|
+
import { createSdNgPlugin } from "./sd-ng.plugin-creator";
|
|
24
|
+
import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
|
|
25
|
+
import {} from "../../types/common-configs.types";
|
|
26
|
+
import {} from "../../types/config.types";
|
|
27
|
+
import {} from "../../types/build-plugin.types";
|
|
28
|
+
import {} from "../../types/build.types";
|
|
29
29
|
import nodeModule from "node:module";
|
|
30
30
|
export class SdNgBundler {
|
|
31
|
-
#logger =
|
|
31
|
+
#logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundler"]);
|
|
32
32
|
#modifiedFileSet = new Set();
|
|
33
33
|
#ngResultCache = {
|
|
34
34
|
affectedFileSet: new Set(),
|
|
@@ -47,7 +47,7 @@ export class SdNgBundler {
|
|
|
47
47
|
#baseHref;
|
|
48
48
|
constructor(_opt) {
|
|
49
49
|
this._opt = _opt;
|
|
50
|
-
this.#pkgNpmConf =
|
|
50
|
+
this.#pkgNpmConf = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
51
51
|
this.#mainFilePath = path.resolve(this._opt.pkgPath, "src/main.ts");
|
|
52
52
|
this.#tsConfigFilePath = path.resolve(this._opt.pkgPath, "tsconfig.json");
|
|
53
53
|
this.#swConfFilePath = path.resolve(this._opt.pkgPath, "ngsw-config.json");
|
|
@@ -63,8 +63,8 @@ export class SdNgBundler {
|
|
|
63
63
|
}
|
|
64
64
|
markForChanges(filePaths) {
|
|
65
65
|
for (const filePath of filePaths) {
|
|
66
|
-
this.#modifiedFileSet.add(
|
|
67
|
-
this.#styleLoadResultCache.invalidate(
|
|
66
|
+
this.#modifiedFileSet.add(PathUtils.norm(filePath));
|
|
67
|
+
this.#styleLoadResultCache.invalidate(PathUtils.norm(filePath));
|
|
68
68
|
}
|
|
69
69
|
// this._sourceFileCache.invalidate(filePaths);
|
|
70
70
|
}
|
|
@@ -85,7 +85,8 @@ export class SdNgBundler {
|
|
|
85
85
|
//-- results
|
|
86
86
|
const results = bundlingResults.mapMany((bundlingResult) => bundlingResult.results);
|
|
87
87
|
this.#debug(`convert result...`);
|
|
88
|
-
const outputFiles = bundlingResults.mapMany((item) => item.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root))
|
|
88
|
+
const outputFiles = bundlingResults.mapMany((item) => item.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root))
|
|
89
|
+
?? []);
|
|
89
90
|
const initialFiles = new Map();
|
|
90
91
|
const metafile = {
|
|
91
92
|
inputs: {},
|
|
@@ -137,7 +138,7 @@ export class SdNgBundler {
|
|
|
137
138
|
}
|
|
138
139
|
});
|
|
139
140
|
//-- service worker
|
|
140
|
-
if (
|
|
141
|
+
if (FsUtils.exists(this.#swConfFilePath)) {
|
|
141
142
|
this.#debug(`prepare service worker...`);
|
|
142
143
|
await perf.run("prepare service worker", async () => {
|
|
143
144
|
try {
|
|
@@ -163,21 +164,21 @@ export class SdNgBundler {
|
|
|
163
164
|
const emitFileSet = new Set();
|
|
164
165
|
perf.run("write output file", () => {
|
|
165
166
|
for (const outputFile of outputFiles) {
|
|
166
|
-
const distFilePath =
|
|
167
|
+
const distFilePath = PathUtils.norm(this._opt.outputPath, outputFile.path);
|
|
167
168
|
const prev = this.#outputCache.get(distFilePath);
|
|
168
169
|
if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
|
|
169
|
-
|
|
170
|
+
FsUtils.writeFile(distFilePath, outputFile.contents);
|
|
170
171
|
this.#outputCache.set(distFilePath, Buffer.from(outputFile.contents).toString("base64"));
|
|
171
|
-
emitFileSet.add(
|
|
172
|
+
emitFileSet.add(PathUtils.norm(outputFile.path));
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
for (const assetFile of assetFiles) {
|
|
175
|
-
const prev = this.#outputCache.get(
|
|
176
|
-
const curr =
|
|
176
|
+
const prev = this.#outputCache.get(PathUtils.norm(assetFile.source));
|
|
177
|
+
const curr = FsUtils.lstat(assetFile.source).mtime.getTime();
|
|
177
178
|
if (prev !== curr) {
|
|
178
|
-
|
|
179
|
-
this.#outputCache.set(
|
|
180
|
-
emitFileSet.add(
|
|
179
|
+
FsUtils.copy(assetFile.source, path.resolve(this._opt.outputPath, assetFile.destination));
|
|
180
|
+
this.#outputCache.set(PathUtils.norm(assetFile.source), curr);
|
|
181
|
+
emitFileSet.add(PathUtils.norm(assetFile.destination));
|
|
181
182
|
}
|
|
182
183
|
}
|
|
183
184
|
});
|
|
@@ -185,9 +186,9 @@ export class SdNgBundler {
|
|
|
185
186
|
return {
|
|
186
187
|
watchFileSet: new Set([
|
|
187
188
|
...this.#ngResultCache.watchFileSet,
|
|
188
|
-
...this.#styleLoadResultCache.watchFiles.map((item) =>
|
|
189
|
-
...assetFiles.map((item) =>
|
|
190
|
-
|
|
189
|
+
...this.#styleLoadResultCache.watchFiles.map((item) => PathUtils.norm(item)),
|
|
190
|
+
...assetFiles.map((item) => PathUtils.norm(item.source)),
|
|
191
|
+
PathUtils.norm(this.#indexHtmlFilePath),
|
|
191
192
|
]),
|
|
192
193
|
affectedFileSet: this.#ngResultCache.affectedFileSet,
|
|
193
194
|
results,
|
|
@@ -260,7 +261,8 @@ export class SdNgBundler {
|
|
|
260
261
|
{ input: "public", glob: "**/*", output: "." },
|
|
261
262
|
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
262
263
|
...(this._opt.dev && this._opt.builderType === "cordova"
|
|
263
|
-
? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} })
|
|
264
|
+
? Object.keys(this._opt.cordovaConfig?.platform ?? { browser: {} })
|
|
265
|
+
.mapMany((platform) => [
|
|
264
266
|
{
|
|
265
267
|
input: `.cordova/platforms/${platform}/platform_www/plugins`,
|
|
266
268
|
glob: "**/*",
|
|
@@ -289,7 +291,8 @@ export class SdNgBundler {
|
|
|
289
291
|
return await augmentAppWithServiceWorkerEsbuild(this._opt.pkgPath, this.#swConfFilePath, this.#baseHref, "index.html", outputFiles, assetFiles);
|
|
290
292
|
}
|
|
291
293
|
_getAppContext() {
|
|
292
|
-
const workerEntries =
|
|
294
|
+
const workerEntries = FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts"))
|
|
295
|
+
.toObject((p) => "workers/" + path.basename(p, path.extname(p)));
|
|
293
296
|
return new SdNgBundlerContext(this._opt.pkgPath, {
|
|
294
297
|
absWorkingDir: this._opt.pkgPath,
|
|
295
298
|
bundle: true,
|
|
@@ -306,7 +309,7 @@ export class SdNgBundler {
|
|
|
306
309
|
pure: ["forwardRef"],
|
|
307
310
|
outdir: this._opt.pkgPath,
|
|
308
311
|
outExtension: undefined,
|
|
309
|
-
sourcemap: this._opt.dev,
|
|
312
|
+
sourcemap: false, //this._opt.dev,
|
|
310
313
|
chunkNames: "[name]-[hash]",
|
|
311
314
|
tsconfig: this.#tsConfigFilePath,
|
|
312
315
|
write: false,
|
|
@@ -376,7 +379,9 @@ export class SdNgBundler {
|
|
|
376
379
|
target: this.#browserTarget,
|
|
377
380
|
format: "esm",
|
|
378
381
|
splitting: true,
|
|
379
|
-
inject: [
|
|
382
|
+
inject: [
|
|
383
|
+
PathUtils.posix(fileURLToPath(import.meta.resolve("node-stdlib-browser/helpers/esbuild/shim"))),
|
|
384
|
+
],
|
|
380
385
|
}),
|
|
381
386
|
plugins: [
|
|
382
387
|
createSourcemapIgnorelistPlugin(),
|
|
@@ -387,13 +392,26 @@ export class SdNgBundler {
|
|
|
387
392
|
result: this.#ngResultCache,
|
|
388
393
|
watchScopePaths: this._opt.watchScopePaths,
|
|
389
394
|
}),
|
|
390
|
-
...(this._opt.builderType === "electron"
|
|
395
|
+
...(this._opt.builderType === "electron"
|
|
396
|
+
? []
|
|
397
|
+
: [nodeStdLibBrowserPlugin(nodeStdLibBrowser)]),
|
|
398
|
+
// {
|
|
399
|
+
// name: "log-circular",
|
|
400
|
+
// setup(build) {
|
|
401
|
+
// build.onEnd(result => {
|
|
402
|
+
// if (result.metafile) {
|
|
403
|
+
// const analysis = esbuild.analyzeMetafile(result.metafile);
|
|
404
|
+
// console.log(analysis);
|
|
405
|
+
// }
|
|
406
|
+
// });
|
|
407
|
+
// },
|
|
408
|
+
// },
|
|
391
409
|
],
|
|
392
410
|
});
|
|
393
411
|
}
|
|
394
412
|
_getStyleContext() {
|
|
395
413
|
const pluginFactory = new StylesheetPluginFactory({
|
|
396
|
-
sourcemap: this._opt.dev,
|
|
414
|
+
sourcemap: false, //this._opt.dev,
|
|
397
415
|
includePaths: [],
|
|
398
416
|
}, this.#styleLoadResultCache);
|
|
399
417
|
return new SdNgBundlerContext(this._opt.pkgPath, {
|
|
@@ -404,7 +422,7 @@ export class SdNgBundler {
|
|
|
404
422
|
logLevel: "silent",
|
|
405
423
|
minify: !this._opt.dev,
|
|
406
424
|
metafile: true,
|
|
407
|
-
sourcemap: this._opt.dev,
|
|
425
|
+
sourcemap: false, //this._opt.dev,
|
|
408
426
|
outdir: this._opt.pkgPath,
|
|
409
427
|
write: false,
|
|
410
428
|
platform: "browser",
|
|
@@ -437,7 +455,7 @@ export class SdNgBundler {
|
|
|
437
455
|
logLevel: "silent",
|
|
438
456
|
minify: !this._opt.dev,
|
|
439
457
|
outdir: this._opt.pkgPath,
|
|
440
|
-
sourcemap: this._opt.dev,
|
|
458
|
+
sourcemap: false, //this._opt.dev,
|
|
441
459
|
tsconfig: this.#tsConfigFilePath,
|
|
442
460
|
write: false,
|
|
443
461
|
preserveSymlinks: false,
|
|
@@ -460,4 +478,4 @@ export class SdNgBundler {
|
|
|
460
478
|
this.#logger.debug(`[${path.basename(this._opt.pkgPath)}]`, ...msg);
|
|
461
479
|
}
|
|
462
480
|
}
|
|
463
|
-
//# sourceMappingURL=
|
|
481
|
+
//# sourceMappingURL=sd-ng.bundler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-ng.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-ng.bundler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,EAAE,EAAiB,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAkB,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,uBAAuB,MAAM,4CAA4C,CAAC;AACjF,OAAO,YAAY,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,mCAAmC,GACpC,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAEL,mBAAmB,GAEpB,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAEL,kBAAkB,GAEnB,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,gDAAgD,CAAC;AAC7E,OAAO,EAAE,kCAAkC,EAAE,MAAM,yCAAyC,CAAC;AAC7F,OAAO,EACL,+BAA+B,GAChC,MAAM,8DAA8D,CAAC;AACtE,OAAO,EACL,uBAAuB,GACxB,MAAM,wEAAwE,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,4DAA4D,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,EACL,uBAAuB,GACxB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAmB,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAsC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAkC,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAwB,MAAM,yBAAyB,CAAC;AAC/D,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,WAAW;IACb,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAE9D,gBAAgB,GAAG,IAAI,GAAG,EAAa,CAAC;IACxC,cAAc,GAA8B;QACnD,eAAe,EAAE,IAAI,GAAG,EAAa;QACrC,YAAY,EAAE,IAAI,GAAG,EAAa;KACnC,CAAC;IACO,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC;IAE7D,SAAS,CAAmC;IAEnC,YAAY,GAAG,IAAI,GAAG,EAA8B,CAAC;IAErD,WAAW,CAAa;IACxB,aAAa,CAAS;IACtB,iBAAiB,CAAS;IAC1B,eAAe,CAAS;IACxB,cAAc,CAAW;IACzB,kBAAkB,CAAS;IAC3B,QAAQ,CAAS;IACjB,SAAS,CAAS;IAE3B,YACU,IASP;QATO,SAAI,GAAJ,IAAI,CASX;QAED,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACrF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACpE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC1E,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAC3E,IAAI,CAAC,cAAc,GAAG,mCAAmC,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,SAAS;YACZ,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK;gBAC7B,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG;gBACtB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACb,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG;oBAC/C,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEM,cAAc,CAAC,SAAmB;QACvC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,+CAA+C;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW;QAMtB,MAAM,IAAI,GAAG,IAAI,qBAAqB,CAAC,WAAW,CAAC,CAAC;QAEpD,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE/B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC;gBAC9C,IAAI,CAAC,cAAc,EAAE;gBACrB,IAAI,CAAC,gBAAgB,EAAE;gBACvB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aAClF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAExB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YACzD,OAAO,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,YAAY;QACZ,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAEpF,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAEjC,MAAM,WAAW,GAAsB,eAAe,CAAC,OAAO,CAC5D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;eACvF,EAAE,CACR,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,GAAG,EAA6B,CAAC;QAC1D,MAAM,QAAQ,GAGV;YACF,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,EAAE;SACZ,CAAC;QACF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC7C,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACtE,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC7E,QAAQ,CAAC,OAAO,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QAClF,CAAC;QACD,MAAM,UAAU,GAA8C,EAAE,CAAC;QAEjE,kBAAkB;QAClB;;WAEG;QAEH,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YACpF,KAAK,MAAM,OAAO,IAAI,kBAAkB,CAAC,QAAQ,EAAE,CAAC;gBAClD,OAAO,CAAC,IAAI,CAAC;oBACX,QAAQ,EAAE,SAAS;oBACnB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,SAAS;oBACnB,OAAO,EAAE,GAAG,OAAO,EAAE;oBACrB,IAAI,EAAE,WAAW;iBAClB,CAAC,CAAC;YACL,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAC9C,OAAO,CAAC,IAAI,CAAC;oBACX,QAAQ,EAAE,SAAS;oBACnB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAE,GAAG,KAAK,EAAE;oBACnB,IAAI,EAAE,WAAW;iBAClB,CAAC,CAAC;YACL,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAC/B,YAAY,EACZ,kBAAkB,CAAC,UAAU,EAC7B,mBAAmB,CAAC,IAAI,CACzB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAClC,gBAAgB;YAChB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAEpD,6BAA6B;YAC7B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACnB,WAAW,CAAC,IAAI,CACd,gBAAgB,CACd,sBAAsB,EACtB,MAAM,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAClD,mBAAmB,CAAC,IAAI,CACzB,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,mBAAmB;QACnB,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;YAEzC,MAAM,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;gBAClD,IAAI,CAAC;oBACH,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;oBACvF,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAC/B,WAAW,EACX,mBAAmB,CAAC,QAAQ,EAC5B,mBAAmB,CAAC,IAAI,CACzB,CAAC,CAAC;oBACH,UAAU,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;gBACrD,CAAC;gBACD,OAAO,GAAG,EAAE,CAAC;oBACX,OAAO,CAAC,IAAI,CAAC;wBACX,QAAQ,EAAE,SAAS;wBACnB,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,OAAO;wBACjB,OAAO,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,EAAE;wBAC5B,IAAI,EAAE,QAAQ;qBACf,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,UAAU;QACV,IAAI,CAAC,MAAM,CAAC,yBAAyB,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;QAE5D,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,EAAE;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACjD,IAAI,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACjE,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;oBACrD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;oBACzF,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;YACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBACrE,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBAC7D,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;oBAC1F,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;oBAC9D,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7B,OAAO;YACL,YAAY,EAAE,IAAI,GAAG,CAAC;gBACpB,GAAG,IAAI,CAAC,cAAc,CAAC,YAAa;gBACpC,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC5E,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;aACxC,CAAC;YACF,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,eAAgB;YACrD,OAAO;YACP,WAAW,EAAE,WAAW;SACzB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,WAAiC,EACjC,YAA4C;QAE5C,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAmB,EAAE;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACjD,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YACnF,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC;YAChD,SAAS,EAAE,IAAI,CAAC,kBAAkB;YAClC,WAAW,EAAE;gBACX,CAAC,WAAW,EAAE,IAAI,CAAC;gBACnB,CAAC,QAAQ,EAAE,KAAK,CAAC;gBACjB,CAAC,MAAM,EAAE,IAAI,CAAC;gBACd,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,IAAI,CAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACxF;YACD,GAAG,EAAE,KAAK;YACV,YAAY,EAAE;gBACZ,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBACvB,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACtB,cAAc,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBAC9B,qBAAqB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;iBACtC;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;aAClC;YACD,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,2BAA2B,EAAE,KAAK;SACnC,CAAC,CAAC;QACH,kBAAkB,CAAC,SAAS,GAAG,SAAS,CAAC;QAEzC,MAAM,cAAc,GAAqD,EAAE,CAAC;QAC5E,MAAM,KAAK,GAAmD,EAAE,CAAC;QACjE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;oBACzC,SAAS;gBACX,CAAC;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC5B,cAAc,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,eAAwB,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACxF,CAAC;gBACD,uEAAuE;qBAClE,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAChC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAkB,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;YACD,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;YACjD,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7C,CAAC;QAED,OAAO,MAAM,kBAAkB,CAAC,OAAO,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChD,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;gBACvB,IAAI;gBACJ,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;aAC9B,CAAC,CAAC;YACH,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAM5B,OAAO,MAAM,aAAa,CACxB;YACE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;YAC9C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS;gBACtD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;qBAChE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACrB;wBACE,KAAK,EAAE,sBAAsB,QAAQ,uBAAuB;wBAC5D,IAAI,EAAE,MAAM;wBACZ,MAAM,EAAE,WAAW,QAAQ,UAAU;qBACtC;oBACD;wBACE,KAAK,EAAE,sBAAsB,QAAQ,eAAe;wBACpD,IAAI,EAAE,YAAY;wBAClB,MAAM,EAAE,WAAW,QAAQ,EAAE;qBAC9B;oBACD;wBACE,KAAK,EAAE,sBAAsB,QAAQ,eAAe;wBACpD,IAAI,EAAE,oBAAoB;wBAC1B,MAAM,EAAE,WAAW,QAAQ,EAAE;qBAC9B;oBACD;wBACE,KAAK,EAAE,sBAAsB,QAAQ,MAAM;wBAC3C,IAAI,EAAE,YAAY;wBAClB,MAAM,EAAE,WAAW,QAAQ,EAAE;qBAC9B;iBACF,CAAC;gBACJ,CAAC,CAAC,EAAE,CAAC;SACR,EACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAClB,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAClC,WAA8B,EAC9B,UAGG;QAQH,OAAO,MAAM,kCAAkC,CAC7C,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,SAAS,EACd,YAAY,EACZ,WAAW,EACX,UAAU,CACX,CAAC;IACJ,CAAC;IAEO,cAAc;QACpB,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;aACpF,QAAQ,CACP,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QAEJ,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAChC,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;YAC1C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;YACjD,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YAC7C,QAAQ,EAAE,QAAQ;YAClB,iBAAiB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACjC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAC5B,gBAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YAChC,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YACzB,YAAY,EAAE,SAAS;YACvB,SAAS,EAAE,KAAK,EAAE,gBAAgB;YAClC,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,IAAI,CAAC,iBAAiB;YAChC,KAAK,EAAE,KAAK;YACZ,gBAAgB,EAAE,KAAK;YACvB,MAAM,EAAE;gBACN,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,WAAW,EAAE,OAAO;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,QAAQ;gBAClB,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAClE,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;gBACpF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACf,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CACnC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,GAAG,EAAE,EAC7B,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAI,CAAC,GAAG,CAAC,CAAC,CAC7C;oBACD,CAAC,CAAC,EAAE,CAAC;aACR;YACD,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC;YAC7D,UAAU,EAAE,cAAc;YAC1B,WAAW,EAAE;gBACX,IAAI,EAAE,IAAI,CAAC,aAAa;gBACxB,6BAA6B;gBAC7B,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAC9D,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS;oBACrC,CAAC,CAAC;wBACA,eAAe,EAAE,IAAI,CAAC,OAAO,CAC3B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAC5C,+BAA+B,CAChC;qBACF;oBACD,CAAC,CAAC,EAAE,CAAC;gBAEP,2BAA2B;gBAC3B,GAAG,aAAa;aACjB;YACD,SAAS,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE;YAChE,MAAM,EAAE;gBACN,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;aACf;YACD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,UAAU;gBACtC,CAAC,CAAC;oBACA,QAAQ,EAAE,MAAM;oBAChB,MAAM,EAAE,QAAQ;oBAChB,QAAQ,EAAE,CAAC,UAAU,EAAE,GAAG,UAAU,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAC5E;gBACD,CAAC,CAAC;oBACA,QAAQ,EAAE,SAAS;oBACnB,MAAM,EAAE,IAAI,CAAC,cAAc;oBAC3B,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,IAAI;oBACf,MAAM,EAAE;wBACN,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAC/C,0CAA0C,CAAC,CAAC,CAAC;qBAChD;iBACF,CAAC;YACJ,OAAO,EAAE;gBACP,+BAA+B,EAAE;gBACjC,gBAAgB,CAAC;oBACf,eAAe,EAAE,IAAI,CAAC,gBAAgB;oBACtC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG;oBAClB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;oBAC1B,MAAM,EAAE,IAAI,CAAC,cAAc;oBAC3B,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe;iBAC3C,CAAC;gBACF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,UAAU;oBACtC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,CAAC;gBACjD,IAAI;gBACJ,0BAA0B;gBAC1B,mBAAmB;gBACnB,8BAA8B;gBAC9B,+BAA+B;gBAC/B,qEAAqE;gBACrE,iCAAiC;gBACjC,UAAU;gBACV,UAAU;gBACV,OAAO;gBACP,KAAK;aACN;SACF,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB;QACtB,MAAM,aAAa,GAAG,IAAI,uBAAuB,CAC/C;YACE,SAAS,EAAE,KAAK,EAAC,gBAAgB;YACjC,YAAY,EAAE,EAAE;SACjB,EACD,IAAI,CAAC,qBAAqB,CAC3B,CAAC;QAEF,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAChC,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,cAAc;YAC1B,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACtB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,KAAK,EAAC,gBAAgB;YACjC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YACzB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,SAAS;YACnB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,gBAAgB,EAAE,KAAK;YACvB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;YAC7B,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;YAC7B,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;YAC9C,WAAW,EAAE;gBACX,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC;aAC3D;YACD,OAAO,EAAE;gBACP,aAAa,CAAC,MAAM,CAAC,sBAAsB,CAAC;gBAC5C,aAAa,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBAC3C,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC;aACpD;SACF,CAAC,CAAC;IACL,CAAC;IAEO,uBAAuB;QAC7B,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAChC,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,cAAc;YAC1B,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;YAC1C,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;YACjD,QAAQ,EAAE,IAAI;YACd,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YAC7C,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACtB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YACzB,SAAS,EAAE,KAAK,EAAC,gBAAgB;YACjC,QAAQ,EAAE,IAAI,CAAC,iBAAiB;YAChC,KAAK,EAAE,KAAK;YACZ,gBAAgB,EAAE,KAAK;YACvB,QAAQ,EAAE,CAAC,UAAU,CAAC;YACtB,MAAM,EAAE;gBACN,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,wBAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;gBAClE,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC;gBACpF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBACf,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CACnC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,GAAG,EAAE,EAC7B,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAI,CAAC,GAAG,CAAC,CAAC,CAC7C;oBACD,CAAC,CAAC,EAAE,CAAC;aACR;YACD,QAAQ,EAAE,MAAM;YAChB,WAAW,EAAE;gBACX,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC;aACzE;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAAG,GAAU;QAClB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;IACtE,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import esbuild from "esbuild";
|
|
2
2
|
import { type TNormPath } from "@simplysm/sd-core-node";
|
|
3
|
-
import { type ISdCliNgPluginResultCache } from "../../types/build-plugin.
|
|
3
|
+
import { type ISdCliNgPluginResultCache } from "../../types/build-plugin.types";
|
|
4
4
|
export declare function createSdNgPlugin(conf: {
|
|
5
5
|
pkgPath: TNormPath;
|
|
6
6
|
dev: boolean;
|
|
@@ -2,17 +2,17 @@ import esbuild from "esbuild";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import os from "os";
|
|
4
4
|
import { JavaScriptTransformer } from "@angular/build/src/tools/esbuild/javascript-transformer";
|
|
5
|
-
import {
|
|
6
|
-
import { SdCliPerformanceTimer } from "../../utils/
|
|
7
|
-
import {
|
|
8
|
-
import {} from "../../types/build-plugin.
|
|
9
|
-
import {} from "../../types/ts-compiler.
|
|
10
|
-
import { SdTsCompiler } from "../../ts-
|
|
5
|
+
import { SdLogger, PathUtils } from "@simplysm/sd-core-node";
|
|
6
|
+
import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
|
|
7
|
+
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
8
|
+
import {} from "../../types/build-plugin.types";
|
|
9
|
+
import {} from "../../types/ts-compiler.types";
|
|
10
|
+
import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
|
|
11
11
|
export function createSdNgPlugin(conf) {
|
|
12
12
|
let webWorkerResultMap = new Map();
|
|
13
13
|
// let workerRevDepMap = new Map<TNormPath, Set<TNormPath>>();
|
|
14
14
|
let perf;
|
|
15
|
-
const logger =
|
|
15
|
+
const logger = SdLogger.get(["simplysm", "sd-cli", "createSdNgPlugin"]);
|
|
16
16
|
function debug(...msg) {
|
|
17
17
|
logger.debug(`[${path.basename(conf.pkgPath)}]`, ...msg);
|
|
18
18
|
}
|
|
@@ -84,7 +84,7 @@ export function createSdNgPlugin(conf) {
|
|
|
84
84
|
//-- js babel transformer
|
|
85
85
|
const javascriptTransformer = new JavaScriptTransformer({
|
|
86
86
|
thirdPartySourcemaps: conf.dev,
|
|
87
|
-
sourcemap: conf.dev,
|
|
87
|
+
sourcemap: false, //conf.dev,
|
|
88
88
|
jit: false,
|
|
89
89
|
advancedOptimizations: true,
|
|
90
90
|
}, os.cpus().length);
|
|
@@ -104,7 +104,7 @@ export function createSdNgPlugin(conf) {
|
|
|
104
104
|
tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
|
|
105
105
|
conf.result.watchFileSet = tsCompileResult.watchFileSet;
|
|
106
106
|
conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
|
|
107
|
-
const tsEsbuildResult =
|
|
107
|
+
const tsEsbuildResult = SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
|
|
108
108
|
//-- return err/warn
|
|
109
109
|
return {
|
|
110
110
|
errors: [
|
|
@@ -131,11 +131,11 @@ export function createSdNgPlugin(conf) {
|
|
|
131
131
|
return res;
|
|
132
132
|
});
|
|
133
133
|
build.onLoad({ filter: /\.ts$/ }, async (args) => {
|
|
134
|
-
const output = outputContentsCacheMap.get(
|
|
134
|
+
const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
|
|
135
135
|
if (output != null) {
|
|
136
136
|
return { contents: output, loader: "js" };
|
|
137
137
|
}
|
|
138
|
-
const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(
|
|
138
|
+
const emittedJsFile = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path))?.last();
|
|
139
139
|
if (!emittedJsFile) {
|
|
140
140
|
return {
|
|
141
141
|
errors: [
|
|
@@ -151,12 +151,12 @@ export function createSdNgPlugin(conf) {
|
|
|
151
151
|
resolveDir: build.initialOptions.absWorkingDir ?? "",
|
|
152
152
|
});
|
|
153
153
|
const newContents = await javascriptTransformer.transformData(args.path, contents, true, sideEffects);
|
|
154
|
-
outputContentsCacheMap.set(
|
|
154
|
+
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
155
155
|
return { contents: newContents, loader: "js" };
|
|
156
156
|
});
|
|
157
157
|
build.onLoad({ filter: /\.[cm]?js$/ }, async (args) => {
|
|
158
|
-
conf.result.watchFileSet.add(
|
|
159
|
-
const output = outputContentsCacheMap.get(
|
|
158
|
+
conf.result.watchFileSet.add(PathUtils.norm(args.path));
|
|
159
|
+
const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
|
|
160
160
|
if (output != null) {
|
|
161
161
|
return { contents: output, loader: "js" };
|
|
162
162
|
}
|
|
@@ -165,7 +165,7 @@ export function createSdNgPlugin(conf) {
|
|
|
165
165
|
resolveDir: build.initialOptions.absWorkingDir ?? "",
|
|
166
166
|
});
|
|
167
167
|
const newContents = await javascriptTransformer.transformFile(args.path, false, sideEffects);
|
|
168
|
-
outputContentsCacheMap.set(
|
|
168
|
+
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
169
169
|
return {
|
|
170
170
|
contents: newContents,
|
|
171
171
|
loader: "js",
|
|
@@ -178,7 +178,7 @@ export function createSdNgPlugin(conf) {
|
|
|
178
178
|
.join("|") +
|
|
179
179
|
")$"),
|
|
180
180
|
}, (args) => {
|
|
181
|
-
conf.result.watchFileSet.add(
|
|
181
|
+
conf.result.watchFileSet.add(PathUtils.norm(args.path));
|
|
182
182
|
return null;
|
|
183
183
|
});
|
|
184
184
|
build.onEnd((result) => {
|
|
@@ -207,4 +207,4 @@ export function createSdNgPlugin(conf) {
|
|
|
207
207
|
},
|
|
208
208
|
};
|
|
209
209
|
}
|
|
210
|
-
//# sourceMappingURL=
|
|
210
|
+
//# sourceMappingURL=sd-ng.plugin-creator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-ng.plugin-creator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-ng.plugin-creator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
export class SdCliIndexFileGenerator {
|
|
4
4
|
static watch(pkgPath, polyfills) {
|
|
5
5
|
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
6
|
-
let cache =
|
|
6
|
+
let cache = FsUtils.exists(indexFilePath) ? FsUtils.readFile(indexFilePath) : undefined;
|
|
7
7
|
SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
|
|
8
8
|
cache = this.run(pkgPath, polyfills, cache);
|
|
9
9
|
});
|
|
@@ -21,10 +21,10 @@ export class SdCliIndexFileGenerator {
|
|
|
21
21
|
// 내부 파일들 import
|
|
22
22
|
const filePaths = this.#getFilePaths(pkgPath);
|
|
23
23
|
for (const filePath of filePaths.orderBy()) {
|
|
24
|
-
const requirePath =
|
|
24
|
+
const requirePath = PathUtils.posix(path.relative(path.dirname(indexFilePath), filePath))
|
|
25
25
|
.replace(/\.tsx?$/, "")
|
|
26
26
|
.replace(/\/index$/, "");
|
|
27
|
-
const sourceTsFileContent =
|
|
27
|
+
const sourceTsFileContent = FsUtils.readFile(filePath);
|
|
28
28
|
if (sourceTsFileContent.split("\n").some((line) => line.startsWith("export "))) {
|
|
29
29
|
importTexts.push(`export * from "./${requirePath}";`);
|
|
30
30
|
}
|
|
@@ -34,15 +34,15 @@ export class SdCliIndexFileGenerator {
|
|
|
34
34
|
}
|
|
35
35
|
const content = importTexts.join("\n") + "\n";
|
|
36
36
|
if (content.trim() !== cache?.trim()) {
|
|
37
|
-
|
|
37
|
+
FsUtils.writeFile(indexFilePath, content);
|
|
38
38
|
}
|
|
39
39
|
return content;
|
|
40
40
|
}
|
|
41
41
|
static #getFilePaths(pkgPath) {
|
|
42
42
|
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
43
|
-
const tsconfig =
|
|
43
|
+
const tsconfig = FsUtils.readJson(path.resolve(pkgPath, "tsconfig.json"));
|
|
44
44
|
const entryFilePaths = tsconfig.files?.map((item) => path.resolve(pkgPath, item)) ?? [];
|
|
45
|
-
return
|
|
45
|
+
return FsUtils.glob(path.resolve(pkgPath, "src/**/*{.ts,.tsx}"), { nodir: true, ignore: tsconfig.excludes }).filter((item) => !entryFilePaths.includes(item) && item !== indexFilePath && !item.endsWith(".d.ts"));
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
-
//# sourceMappingURL=
|
|
48
|
+
//# sourceMappingURL=sd-cli-index.file-generator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-cli-index.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-index.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { type ISdProjectConfig } from "../../types/
|
|
3
|
-
import { type ISdBuildRunnerResult } from "../../types/build.
|
|
2
|
+
import { type ISdProjectConfig } from "../../types/config.types";
|
|
3
|
+
import { type ISdBuildRunnerResult } from "../../types/build.types";
|
|
4
4
|
export declare class SdJsLibBuildRunner extends EventEmitter {
|
|
5
5
|
#private;
|
|
6
6
|
private readonly _projConf;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { FsUtils, SdLogger, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { EventEmitter } from "events";
|
|
4
|
-
import {
|
|
4
|
+
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
5
5
|
// import { TSdLintWorkerType } from "../../types/workers.type";
|
|
6
|
-
import {} from "../../types/
|
|
7
|
-
import {} from "../../types/build.
|
|
6
|
+
import {} from "../../types/config.types";
|
|
7
|
+
import {} from "../../types/build.types";
|
|
8
8
|
import { ESLint } from "eslint";
|
|
9
9
|
export class SdJsLibBuildRunner extends EventEmitter {
|
|
10
10
|
// private readonly _lintWorker: SdWorker<TSdLintWorkerType>;
|
|
@@ -12,7 +12,7 @@ export class SdJsLibBuildRunner extends EventEmitter {
|
|
|
12
12
|
super();
|
|
13
13
|
this._projConf = _projConf;
|
|
14
14
|
this._pkgPath = _pkgPath;
|
|
15
|
-
this._logger =
|
|
15
|
+
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdJsLibBuildRunner"]);
|
|
16
16
|
this._pkgName = path.basename(_pkgPath);
|
|
17
17
|
// this._lintWorker = new SdWorker(import.meta.resolve("../../workers/lint-worker"));
|
|
18
18
|
}
|
|
@@ -23,12 +23,12 @@ export class SdJsLibBuildRunner extends EventEmitter {
|
|
|
23
23
|
async buildAsync() {
|
|
24
24
|
this._debug("LINT...");
|
|
25
25
|
const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
|
|
26
|
-
const srcFilePaths =
|
|
26
|
+
const srcFilePaths = FsUtils.glob(srcGlobPath);
|
|
27
27
|
const lintResults = await this.#lintAsync(new Set(srcFilePaths));
|
|
28
|
-
const messages =
|
|
28
|
+
const messages = SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(lintResults);
|
|
29
29
|
this._debug(`LINT 완료`);
|
|
30
30
|
return {
|
|
31
|
-
affectedFilePathSet: new Set(srcFilePaths.map((item) =>
|
|
31
|
+
affectedFilePathSet: new Set(srcFilePaths.map((item) => PathUtils.norm(item))),
|
|
32
32
|
buildMessages: messages,
|
|
33
33
|
emitFileSet: new Set(),
|
|
34
34
|
};
|
|
@@ -37,27 +37,27 @@ export class SdJsLibBuildRunner extends EventEmitter {
|
|
|
37
37
|
this.emit("change");
|
|
38
38
|
this._debug("LINT...");
|
|
39
39
|
const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.js");
|
|
40
|
-
const srcFilePaths =
|
|
40
|
+
const srcFilePaths = FsUtils.glob(srcGlobPath);
|
|
41
41
|
const lintResults = await this.#lintAsync(new Set(srcFilePaths));
|
|
42
|
-
const messages =
|
|
42
|
+
const messages = SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(lintResults);
|
|
43
43
|
this._debug(`LINT 완료`);
|
|
44
44
|
const res = {
|
|
45
|
-
affectedFilePathSet: new Set(srcFilePaths.map((item) =>
|
|
45
|
+
affectedFilePathSet: new Set(srcFilePaths.map((item) => PathUtils.norm(item))),
|
|
46
46
|
buildMessages: messages,
|
|
47
47
|
emitFileSet: new Set(),
|
|
48
48
|
};
|
|
49
49
|
this.emit("complete", res);
|
|
50
50
|
SdFsWatcher.watch([srcGlobPath]).onChange({ delay: 100 }, async (changeInfos) => {
|
|
51
|
-
const watchFilePaths = changeInfos.filter((item) =>
|
|
51
|
+
const watchFilePaths = changeInfos.filter((item) => FsUtils.exists(item.path)).map((item) => item.path);
|
|
52
52
|
if (watchFilePaths.length < 1)
|
|
53
53
|
return;
|
|
54
54
|
this.emit("change");
|
|
55
55
|
this._debug("LINT...");
|
|
56
56
|
const watchLintResults = await this.#lintAsync(new Set(watchFilePaths));
|
|
57
|
-
const watchMessages =
|
|
57
|
+
const watchMessages = SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(watchLintResults);
|
|
58
58
|
this._debug(`LINT 완료`);
|
|
59
59
|
const watchRes = {
|
|
60
|
-
affectedFilePathSet: new Set(changeInfos.map((item) =>
|
|
60
|
+
affectedFilePathSet: new Set(changeInfos.map((item) => PathUtils.norm(item.path))),
|
|
61
61
|
buildMessages: watchMessages,
|
|
62
62
|
emitFileSet: new Set(),
|
|
63
63
|
};
|
|
@@ -66,9 +66,9 @@ export class SdJsLibBuildRunner extends EventEmitter {
|
|
|
66
66
|
}
|
|
67
67
|
async #lintAsync(fileSet) {
|
|
68
68
|
const lintFilePaths = Array.from(fileSet)
|
|
69
|
-
.filter((item) =>
|
|
69
|
+
.filter((item) => PathUtils.isChildPath(item, this._pkgPath))
|
|
70
70
|
.filter((item) => item.endsWith(".js"))
|
|
71
|
-
.filter((item) =>
|
|
71
|
+
.filter((item) => FsUtils.exists(item));
|
|
72
72
|
if (lintFilePaths.length === 0) {
|
|
73
73
|
return [];
|
|
74
74
|
}
|
|
@@ -79,4 +79,4 @@ export class SdJsLibBuildRunner extends EventEmitter {
|
|
|
79
79
|
this._logger.debug(`[${this._pkgName}] ${msg}`);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=
|
|
82
|
+
//# sourceMappingURL=sd-js-lib.build-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sd-js-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-js-lib.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { type ISdProjectConfig } from "../../types/
|
|
3
|
-
import { type ISdBuildRunnerResult } from "../../types/build.
|
|
2
|
+
import { type ISdProjectConfig } from "../../types/config.types";
|
|
3
|
+
import { type ISdBuildRunnerResult } from "../../types/build.types";
|
|
4
4
|
export declare class SdTsLibBuildRunner extends EventEmitter {
|
|
5
5
|
private _logger;
|
|
6
6
|
private _projConf;
|