@simplysm/sd-cli 12.9.16 → 12.9.18

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.
Files changed (105) hide show
  1. package/dist/entry/sd-cli-cordova.d.ts +1 -1
  2. package/dist/entry/sd-cli-cordova.js +3 -3
  3. package/dist/entry/sd-cli-cordova.js.map +1 -1
  4. package/dist/entry/sd-cli-electron.d.ts +2 -2
  5. package/dist/entry/sd-cli-local-update.d.ts +2 -2
  6. package/dist/entry/sd-cli-local-update.js.map +1 -1
  7. package/dist/entry/sd-cli-project.d.ts +3 -3
  8. package/dist/entry/sd-cli-project.js +4 -4
  9. package/dist/entry/sd-cli-project.js.map +1 -1
  10. package/dist/entry/utils/loadProjConfAsync.d.ts +1 -1
  11. package/dist/entry/utils/loadProjConfAsync.js +1 -1
  12. package/dist/entry/utils/loadProjConfAsync.js.map +1 -1
  13. package/dist/fix/convert-private-underscore.d.ts +1 -0
  14. package/dist/fix/convert-private-underscore.js +49 -0
  15. package/dist/fix/convert-private-underscore.js.map +1 -0
  16. package/dist/fix/convert-private.d.ts +1 -0
  17. package/dist/fix/convert-private.js +60 -0
  18. package/dist/fix/convert-private.js.map +1 -0
  19. package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.d.ts +1 -1
  20. package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js +3 -3
  21. package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -1
  22. package/dist/pkg-builders/client/sd-client.build-runner.d.ts +5 -18
  23. package/dist/pkg-builders/client/sd-client.build-runner.js +32 -90
  24. package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
  25. package/dist/pkg-builders/client/sd-ng.bundler.d.ts +2 -1
  26. package/dist/pkg-builders/client/sd-ng.bundler.js +2 -2
  27. package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -1
  28. package/dist/pkg-builders/client/sd-ng.plugin-creator.d.ts +2 -1
  29. package/dist/pkg-builders/client/sd-ng.plugin-creator.js +1 -1
  30. package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -1
  31. package/dist/pkg-builders/commons/build-runner.base.d.ts +27 -0
  32. package/dist/pkg-builders/commons/build-runner.base.js +93 -0
  33. package/dist/pkg-builders/commons/build-runner.base.js.map +1 -0
  34. package/dist/pkg-builders/commons/scope-path.d.ts +7 -0
  35. package/dist/pkg-builders/commons/scope-path.js +13 -0
  36. package/dist/pkg-builders/commons/scope-path.js.map +1 -0
  37. package/dist/pkg-builders/lib/sd-cli-index.file-generator.d.ts +1 -1
  38. package/dist/pkg-builders/lib/sd-cli-index.file-generator.js +2 -2
  39. package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -1
  40. package/dist/pkg-builders/lib/sd-js-lib.build-runner.d.ts +7 -15
  41. package/dist/pkg-builders/lib/sd-js-lib.build-runner.js +15 -54
  42. package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -1
  43. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.d.ts +5 -16
  44. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +31 -85
  45. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
  46. package/dist/pkg-builders/lib/sd-ts-lib.builder.d.ts +2 -1
  47. package/dist/pkg-builders/lib/sd-ts-lib.builder.js +2 -2
  48. package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -1
  49. package/dist/pkg-builders/sd-multi.build-runner.d.ts +2 -1
  50. package/dist/pkg-builders/sd-multi.build-runner.js +4 -4
  51. package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -1
  52. package/dist/pkg-builders/server/sd-server.build-runner.d.ts +6 -17
  53. package/dist/pkg-builders/server/sd-server.build-runner.js +87 -137
  54. package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -1
  55. package/dist/pkg-builders/server/sd-server.bundler.d.ts +2 -1
  56. package/dist/pkg-builders/server/sd-server.bundler.js +2 -2
  57. package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -1
  58. package/dist/pkg-builders/server/sd-server.plugin-creator.d.ts +2 -1
  59. package/dist/pkg-builders/server/sd-server.plugin-creator.js +3 -2
  60. package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -1
  61. package/dist/sd-cli-entry.js +69 -61
  62. package/dist/sd-cli-entry.js.map +1 -1
  63. package/dist/sd-cli.js +33 -28
  64. package/dist/sd-cli.js.map +1 -1
  65. package/dist/ts-compiler/sd-dependency-analyzer.d.ts +3 -3
  66. package/dist/ts-compiler/sd-dependency-analyzer.js +9 -16
  67. package/dist/ts-compiler/sd-dependency-analyzer.js.map +1 -1
  68. package/dist/ts-compiler/sd-ts-compiler.d.ts +1 -2
  69. package/dist/ts-compiler/sd-ts-compiler.js +70 -19
  70. package/dist/ts-compiler/sd-ts-compiler.js.map +1 -1
  71. package/dist/types/config.types.d.ts +3 -2
  72. package/dist/types/ts-compiler.types.d.ts +2 -1
  73. package/package.json +8 -7
  74. package/src/entry/sd-cli-cordova.ts +4 -4
  75. package/src/entry/sd-cli-electron.ts +2 -2
  76. package/src/entry/sd-cli-local-update.ts +2 -2
  77. package/src/entry/sd-cli-project.ts +6 -6
  78. package/src/entry/utils/loadProjConfAsync.ts +2 -2
  79. package/src/fix/convert-private-underscore.ts +69 -0
  80. package/src/fix/convert-private.ts +74 -0
  81. package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts +3 -3
  82. package/src/pkg-builders/client/sd-client.build-runner.ts +39 -126
  83. package/src/pkg-builders/client/sd-ng.bundler.ts +4 -3
  84. package/src/pkg-builders/client/sd-ng.plugin-creator.ts +3 -2
  85. package/src/pkg-builders/commons/build-runner.base.ts +149 -0
  86. package/src/pkg-builders/commons/scope-path.ts +17 -0
  87. package/src/pkg-builders/lib/sd-cli-index.file-generator.ts +2 -2
  88. package/src/pkg-builders/lib/sd-js-lib.build-runner.ts +29 -74
  89. package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +35 -130
  90. package/src/pkg-builders/lib/sd-ts-lib.builder.ts +3 -2
  91. package/src/pkg-builders/sd-multi.build-runner.ts +4 -4
  92. package/src/pkg-builders/server/sd-server.build-runner.ts +99 -187
  93. package/src/pkg-builders/server/sd-server.bundler.ts +4 -3
  94. package/src/pkg-builders/server/sd-server.plugin-creator.ts +13 -8
  95. package/src/sd-cli-entry.ts +115 -81
  96. package/src/sd-cli.ts +14 -11
  97. package/src/ts-compiler/sd-dependency-analyzer.ts +10 -17
  98. package/src/ts-compiler/sd-ts-compiler.ts +79 -30
  99. package/src/types/config.types.ts +9 -2
  100. package/src/types/ts-compiler.types.ts +2 -1
  101. package/tests/deps/sd-dependency-analyzer.spec.ts +1 -1
  102. package/dist/workers/style-bundler.worker.d.ts +0 -1
  103. package/dist/workers/style-bundler.worker.js +0 -56
  104. package/dist/workers/style-bundler.worker.js.map +0 -1
  105. package/src/workers/style-bundler.worker.ts +0 -70
@@ -1,15 +1,18 @@
1
1
  import ts from "typescript";
2
2
  import path from "path";
3
- import { FsUtils, PathUtils, SdLogger, SdWorker } from "@simplysm/sd-core-node";
3
+ import { FsUtils, PathUtils, SdLogger } from "@simplysm/sd-core-node";
4
4
  import { StringUtils } from "@simplysm/sd-core-common";
5
5
  import { NgtscProgram, OptimizeFor } from "@angular/compiler-cli";
6
6
  import { replaceBootstrap, } from "@angular/build/src/tools/angular/transformers/jit-bootstrap-transformer";
7
7
  import { SdCliPerformanceTimer } from "../utils/sd-cli-performance-time";
8
8
  import { SdCliConvertMessageUtils } from "../utils/sd-cli-convert-message.utils";
9
9
  import { createWorkerTransformer, } from "@angular/build/src/tools/angular/transformers/web-worker-transformer";
10
- import { ESLint } from "eslint";
11
10
  import { SdDependencyCache } from "./sd-dependency-cache";
12
11
  import { SdDependencyAnalyzer } from "./sd-dependency-analyzer";
12
+ import { FlatESLint } from "eslint/use-at-your-own-risk";
13
+ import { ComponentStylesheetBundler, } from "@angular/build/src/tools/esbuild/angular/component-stylesheets";
14
+ import { transformSupportedBrowsersToTargets } from "@angular/build/src/tools/esbuild/utils";
15
+ import browserslist from "browserslist";
13
16
  export class SdTsCompiler {
14
17
  constructor(_opt) {
15
18
  this._opt = _opt;
@@ -24,6 +27,28 @@ export class SdTsCompiler {
24
27
  const tsconfigPath = path.resolve(this._opt.pkgPath, "tsconfig.json");
25
28
  const tsconfig = FsUtils.readJson(tsconfigPath);
26
29
  this._isForAngular = Boolean(tsconfig.angularCompilerOptions);
30
+ this._stylesheetBundler = new ComponentStylesheetBundler({
31
+ workspaceRoot: this._opt.pkgPath,
32
+ optimization: !this._opt.isDevMode,
33
+ inlineFonts: true,
34
+ preserveSymlinks: false,
35
+ sourcemap: this._opt.isDevMode ? "inline" : false,
36
+ outputNames: { bundles: "[name]", media: "media/[name]" },
37
+ includePaths: [],
38
+ // sass:
39
+ externalDependencies: [],
40
+ target: transformSupportedBrowsersToTargets(browserslist(["Chrome > 78"])),
41
+ tailwindConfiguration: undefined,
42
+ postcssConfiguration: {
43
+ plugins: [["css-has-pseudo"]],
44
+ },
45
+ // publicPath:
46
+ cacheOptions: {
47
+ enabled: true,
48
+ path: ".cache/angular",
49
+ basePath: ".cache",
50
+ },
51
+ }, "scss", this._opt.isDevMode);
27
52
  }
28
53
  _parseTsConfig() {
29
54
  const tsconfigPath = path.resolve(this._opt.pkgPath, "tsconfig.json");
@@ -75,14 +100,22 @@ export class SdTsCompiler {
75
100
  }
76
101
  return compilerHost;
77
102
  }
78
- async _getOrCreateStyleBundleWorkerAsync() {
79
- if (this._stylesheetBundlingWorker) {
80
- return this._stylesheetBundlingWorker;
81
- }
82
- this._stylesheetBundlingWorker = new SdWorker(import.meta.resolve("../workers/style-bundler.worker"));
83
- await this._stylesheetBundlingWorker.run("prepare", [this._opt.pkgPath, this._opt.isDevMode]);
84
- return this._stylesheetBundlingWorker;
85
- }
103
+ // private async _getOrCreateStyleBundleWorkerAsync() {
104
+ // if (this._stylesheetBundlingWorker) {
105
+ // return this._stylesheetBundlingWorker;
106
+ // }
107
+ //
108
+ // this._stylesheetBundlingWorker = new SdWorker<TStyleBundlerWorkerType>(
109
+ // import.meta.resolve("../workers/style-bundler.worker"),
110
+ // );
111
+ //
112
+ // await this._stylesheetBundlingWorker.run(
113
+ // "prepare",
114
+ // [this._opt.pkgPath, this._opt.isDevMode],
115
+ // );
116
+ //
117
+ // return this._stylesheetBundlingWorker;
118
+ // }
86
119
  async _bundleStylesheetAsync(data, containingFile, resourceFile = null) {
87
120
  // containingFile: 포함된 파일 (.ts)
88
121
  // resourceFile: 외부 리소스 파일 (styleUrls로 입력하지 않고 styles에 직접 입력한 경우 null)
@@ -94,13 +127,29 @@ export class SdTsCompiler {
94
127
  return this._stylesheetBundlingResultMap.get(fileNPath);
95
128
  }
96
129
  try {
97
- const worker = this._stylesheetBundlingWorker;
98
- const result = await worker.run("bundle", [data, containingFile, resourceFile]);
130
+ // const result = await new SdSassEmbeddedBundler(this._opt.isDevMode)
131
+ // .bundleAsync(data, resourceFile ?? containingFile);
132
+ // const worker = this._stylesheetBundlingWorker!;
133
+ // const result = await worker.run("bundle", [data, containingFile, resourceFile]);
134
+ const result = resourceFile != null
135
+ ? await this._stylesheetBundler.bundleFile(resourceFile)
136
+ : await this._stylesheetBundler.bundleInline(data, containingFile, "scss");
99
137
  for (const referencedFile of result.referencedFiles ?? []) {
138
+ // for (const referencedFile of result.referencedFiles) {
100
139
  // 참조하는 파일과 참조된 파일 사이의 의존성 관계 추가
101
140
  this._depCache.addImport(fileNPath, PathUtils.norm(referencedFile), 0);
102
141
  }
103
- this._stylesheetBundlingResultMap.set(fileNPath, result);
142
+ // this._stylesheetBundlingResultMap.set(fileNPath, {
143
+ // errors: undefined,
144
+ // warnings: [],
145
+ // ...result,
146
+ // });
147
+ //
148
+ // return {
149
+ // errors: undefined,
150
+ // warnings: [],
151
+ // ...result,
152
+ // };
104
153
  return result;
105
154
  }
106
155
  catch (err) {
@@ -142,11 +191,12 @@ export class SdTsCompiler {
142
191
  };
143
192
  }
144
193
  async _prepareAsync(modifiedFileSet) {
145
- const worker = await this._getOrCreateStyleBundleWorkerAsync();
194
+ // const worker = await this._getOrCreateStyleBundleWorkerAsync();
146
195
  const tsconfig = this._parseTsConfig();
147
196
  if (modifiedFileSet.size !== 0) {
148
197
  this._debug(`캐시 무효화 및 초기화 중...`);
149
- await this._perf.run("캐시 무효화 및 초기화", async () => {
198
+ // this._perf.run("캐시 무효화 및 초기화", () => {
199
+ this._perf.run("캐시 무효화 및 초기화", () => {
150
200
  // 기존 의존성에 의해 영향받는 파일들 계산
151
201
  const affectedFileSet = this._depCache.getAffectedFileSet(modifiedFileSet);
152
202
  const getTreeText = (node, indent = "") => {
@@ -161,7 +211,8 @@ export class SdTsCompiler {
161
211
  영향받은 기존파일:
162
212
  ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
163
213
  // 스타일 번들러에서 영향받은 파일 관련 항목 무효화
164
- await worker.run("invalidate", [affectedFileSet]);
214
+ this._stylesheetBundler.invalidate(affectedFileSet);
215
+ // await worker.run("invalidate", [affectedFileSet]);
165
216
  // 의존성 캐시에서 영향받은 파일 관련 항목 무효화
166
217
  this._depCache.invalidates(affectedFileSet);
167
218
  // 내부 캐시에서 영향받은 파일 관련 항목 무효화
@@ -193,10 +244,10 @@ ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
193
244
  this._debug(`새 의존성 분석 중...`);
194
245
  this._perf.run("새 의존성 분석", () => {
195
246
  // SdTsDependencyAnalyzer를 통해 의존성 분석 및 SdDepCache 업데이트
196
- SdDependencyAnalyzer.analyze(this._program, compilerHost, this._opt.watchScopePaths, this._depCache);
247
+ SdDependencyAnalyzer.analyze(this._program, compilerHost, this._opt.watchScopePathSet, this._depCache);
197
248
  // Angular 리소스 의존성 추가
198
249
  if (this._ngProgram) {
199
- SdDependencyAnalyzer.analyzeAngularResources(this._ngProgram, this._opt.watchScopePaths, this._depCache);
250
+ SdDependencyAnalyzer.analyzeAngularResources(this._ngProgram, this._opt.watchScopePathSet, this._depCache);
200
251
  }
201
252
  });
202
253
  const affectedFileSet = modifiedFileSet.size === 0
@@ -219,7 +270,7 @@ ${affectedFileTree.map(item => getTreeText(item)).join("\n")}`.trim());
219
270
  if (lintFilePaths.length === 0) {
220
271
  return [];
221
272
  }
222
- const linter = new ESLint({
273
+ const linter = new FlatESLint({
223
274
  cwd: this._opt.pkgPath,
224
275
  cache: false,
225
276
  overrideConfig: {
@@ -1 +1 @@
1
- {"version":3,"file":"sd-ts-compiler.js","sourceRoot":"","sources":["../../src/ts-compiler/sd-ts-compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sd-ts-compiler.js","sourceRoot":"","sources":["../../src/ts-compiler/sd-ts-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,EACL,gBAAgB,GACjB,MAAM,yEAAyE,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAMjF,OAAO,EACL,uBAAuB,GACxB,MAAM,sEAAsE,CAAC;AAC9E,OAAO,EAA2B,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EACL,0BAA0B,GAC3B,MAAM,gEAAgE,CAAC;AACxE,OAAO,EAAE,mCAAmC,EAAE,MAAM,wCAAwC,CAAC;AAC7F,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,OAAO,YAAY;IA0BvB,YAA6B,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;QAzB9C,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;QASvE,UAAU;QACF,cAAS,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACpC,wBAAmB,GAAG,IAAI,GAAG,EAA4B,CAAC;QAC1D,0BAAqB,GAAG,IAAI,GAAG,EAMpC,CAAC;QAEJ,UAAU;QACF,iCAA4B,GAAG,IAAI,GAAG,EAAwC,CAAC;QAKrF,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAExB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAE9D,IAAI,CAAC,kBAAkB,GAAG,IAAI,0BAA0B,CACtD;YACE,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAChC,YAAY,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;YAClC,WAAW,EAAE,IAAI;YACjB,gBAAgB,EAAE,KAAK;YACvB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;YACjD,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE;YACzD,YAAY,EAAE,EAAE;YAChB,QAAQ;YACR,oBAAoB,EAAE,EAAE;YACxB,MAAM,EAAE,mCAAmC,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1E,qBAAqB,EAAE,SAAS;YAChC,oBAAoB,EAAE;gBACpB,OAAO,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;aAC9B;YACD,cAAc;YACd,YAAY,EAAE;gBACZ,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,gBAAgB;gBACtB,QAAQ,EAAE,QAAQ;aACnB;SACF,EACD,MAAM,EACN,IAAI,CAAC,IAAI,CAAC,SAAS,CACpB,CAAC;IACJ,CAAC;IAEO,cAAc;QACpB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,EAAE,CAAC,0BAA0B,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxF,GAAG,QAAQ,CAAC,sBAAsB;YAClC,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB;SAC/B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAC3E,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,MAAM,CACP,CAAC,CAAC;QAEH,OAAO;YACL,SAAS,EAAE,cAAc,CAAC,SAAS;YACnC,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,QAAQ,EAAE,QAAQ;SACnB,CAAC;IACJ,CAAC;IAEO,mBAAmB,CACzB,eAAmC,EACnC,eAA+B;QAE/B,MAAM,YAAY,GAAG,EAAE,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAE5D,MAAM,iBAAiB,GAAG,YAAY,CAAC,aAAa,CAAC;QACrD,YAAY,CAAC,aAAa,GAAG,CAC3B,QAAgB,EAChB,wBAAsE,EACtE,OAAiD,EACjD,yBAAmC,EACnC,GAAG,IAAI,EACoB,EAAE;YAC7B,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE3C,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC1E,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC;YAED,MAAM,EAAE,GAA8B,iBAAiB,CAAC,IAAI,CAC1D,YAAY,EACZ,QAAQ,EACR,wBAAwB,EACxB,OAAO,EACP,IAAI,EACJ,GAAG,IAAI,CACR,CAAC;YAEF,IAAI,EAAE,EAAE,CAAC;gBACP,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YAC9C,CAAC;iBACI,CAAC;gBACJ,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;YAED,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,YAAoC,CAAC,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE;gBACxE,OAAO,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/C,CAAC,CAAC;YAED,YAAoC,CAAC,iBAAiB,GAAG,KAAK,EAC7D,IAAY,EACZ,OAIC,EACD,EAAE;gBACF,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC7B,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAChE,IAAI,EACJ,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EACtC,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAChF,CAAC;gBAEF,OAAO,WAAW,CAAC,aAAa,CAAC,wBAAwB,CAAC,QAAQ,CAAC;oBACjE,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,EAAE,OAAO,EAAE,wBAAwB,CAAC,QAAQ,EAAE,CAAC;YACrD,CAAC,CAAC;YAED,YAAoC,CAAC,wBAAwB,GAAG,GAAG,EAAE;gBACpE,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACnF,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,uDAAuD;IACvD,0CAA0C;IAC1C,6CAA6C;IAC7C,MAAM;IACN,EAAE;IACF,4EAA4E;IAC5E,8DAA8D;IAC9D,OAAO;IACP,EAAE;IACF,8CAA8C;IAC9C,iBAAiB;IACjB,gDAAgD;IAChD,OAAO;IACP,EAAE;IACF,2CAA2C;IAC3C,IAAI;IAEI,KAAK,CAAC,sBAAsB,CAClC,IAAY,EACZ,cAAyB,EACzB,eAAiC,IAAI;QAErC,+BAA+B;QAC/B,sEAAsE;QACtE,uDAAuD;QAEvD,2EAA2E;QAE3E,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAChD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,CAAC;YACjE,IAAI,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrD,OAAO,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC;gBACH,sEAAsE;gBACtE,wDAAwD;gBACxD,kDAAkD;gBAClD,mFAAmF;gBAEnF,MAAM,MAAM,GAAG,YAAY,IAAI,IAAI;oBACjC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,CAAC;oBACxD,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;gBAE7E,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC;oBAC1D,yDAAyD;oBACzD,gCAAgC;oBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzE,CAAC;gBAED,qDAAqD;gBACrD,uBAAuB;gBACvB,kBAAkB;gBAClB,eAAe;gBACf,MAAM;gBACN,EAAE;gBACF,WAAW;gBACX,uBAAuB;gBACvB,kBAAkB;gBAClB,eAAe;gBACf,KAAK;gBACL,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,MAAM,GAAG;oBACb,MAAM,EAAE;wBACN;4BACE,IAAI,EAAE,eAAe,GAAG,CAAC,OAAO,IAAI,WAAW,EAAE;4BACjD,QAAQ,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;yBACnC;qBACF;oBACD,QAAQ,EAAE,EAAE;iBACb,CAAC;gBACF,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBACzD,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,eAA+B;QAChD,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QAE1D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAEhE,MAAM,CAAC,gBAAgB,EAAE,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrE,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,aAAa,aAAa,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,aAAa,aAAa,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;QAE7D,OAAO;YACL,QAAQ,EAAE;gBACR,GAAG,wBAAwB,CAAC,gCAAgC,CAAC,WAAW,CAAC,WAAW,CAAC;gBACrF,GAAG,wBAAwB,CAAC,gCAAgC,CAAC,WAAW,CAAC;aAC1E;YACD,eAAe,EAAE,aAAa,CAAC,eAAe;YAC9C,YAAY,EAAE,aAAa,CAAC,YAAY;YACxC,2BAA2B,EAAE,IAAI,CAAC,4BAA4B;YAC9D,oBAAoB,EAAE,IAAI,CAAC,qBAAqB;YAChD,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,YAAY,EAAE,CAAC;SACpF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,eAA+B;QACzD,kEAAkE;QAElE,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAEvC,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAEjC,yCAAyC;YACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE;gBAClC,yBAAyB;gBACzB,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;gBAE3E,MAAM,WAAW,GAAG,CAAC,IAA6B,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE;oBACjE,IAAI,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAC5C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAClC,MAAM,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;oBAC9C,CAAC;oBAED,OAAO,MAAM,CAAC;gBAChB,CAAC,CAAC;gBAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;gBAC7E,IAAI,CAAC,MAAM,CAAC;;EAElB,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAE/D,8BAA8B;gBAC9B,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;gBACpD,qDAAqD;gBAErD,6BAA6B;gBAC7B,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;gBAE5C,4BAA4B;gBAC5B,KAAK,MAAM,YAAY,IAAI,eAAe,EAAE,CAAC;oBAC3C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAChD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAC9C,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAElC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC7D,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,EAAE;YACnC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,IAAI,CAAC,UAAU,GAAG,IAAI,YAAY,CAChC,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAO,EAChB,YAAY,EACZ,IAAI,CAAC,UAAU,CAChB,CAAC;gBACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YACjD,CAAC;iBACI,CAAC;gBACJ,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,aAAa,CAC9B,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,OAAO,EAChB,YAAY,EACZ,IAAI,CAAC,QAAQ,CACd,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;gBAChD,MAAM,IAAI,CAAC,UAAW,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YACjD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAE7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,EAAE;YAC9B,sDAAsD;YACtD,oBAAoB,CAAC,OAAO,CAC1B,IAAI,CAAC,QAAS,EACd,YAAY,EACZ,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAC3B,IAAI,CAAC,SAAS,CACf,CAAC;YAEF,qBAAqB;YACrB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,oBAAoB,CAAC,uBAAuB,CAC1C,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAC3B,IAAI,CAAC,SAAS,CACf,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,eAAe,CAAC,IAAI,KAAK,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAE/C,OAAO;YACL,QAAQ;YACR,YAAY;YACZ,eAAe;YACf,YAAY;SACb,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,aAA6B;QACpD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;aAC5D,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAChE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAChB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CACrB,CAAC;aACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC;YAC5B,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YACtB,KAAK,EAAE,KAAK;YACZ,cAAc,EAAE;gBACd,eAAe,EAAE;oBACf,aAAa,EAAE;wBACb,OAAO,EAAE,IAAI;wBACb,QAAQ,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;qBAC1B;iBACF;aACF;SACF,CAAC,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC/C,CAAC;IAEO,KAAK,CAAC,sBAAsB;QAClC,iBAAiB;QACjB,IACE,IAAI,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI;YACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;YAC7C,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAC9D,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAE/B,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;gBAC5C,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAoB,CAAC,CAAC;gBACzE,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAChE,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,mBAAoB,EAC9B,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAC9B,CAAC;gBACF,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAC1D,IAAI,CAAC,IAAI,CAAC,mBAAoB,EAC9B,EAAE,CACH,CAAC;gBACF,aAAa,CAAC,IAAI,CAAC;oBACjB,UAAU,EAAE,SAAS,CAAC,IAAI,CACxB,IAAI,CAAC,IAAI,CAAC,OAAO,EACjB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAoB,CAAC;yBAClF,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAC9B;oBACD,IAAI,EAAE,wBAAwB,CAAC,QAAQ,IAAI,EAAE;iBAC9C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;QACvC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,MAAM,CAAC,aAA6B;QAC1C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAC;QACzC,MAAM,WAAW,GAAoB,EAAE,CAAC;QAExC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE/B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE;YAChC,WAAW,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,QAAS,CAAC,+BAA+B,EAAE,EACnD,GAAG,IAAI,CAAC,QAAS,CAAC,qBAAqB,EAAE,EACzC,GAAG,IAAI,CAAC,QAAS,CAAC,oBAAoB,EAAE,CACzC,CAAC;YAEF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAEhC,KAAK,MAAM,YAAY,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;YACzD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,SAAS;YAEtE,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YACtE,IACE,CAAC,kBAAkB;gBACnB,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,EAC1F,CAAC;gBACD,SAAS;YACX,CAAC;YAED,6DAA6D;YAE7D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE;gBACjC,WAAW,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,QAAS,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,EAC7D,GAAG,IAAI,CAAC,QAAS,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAC7D,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,EAAE;oBAC1C,IAAI,kBAAkB,CAAC,iBAAiB;wBAAE,OAAO;oBAEjD,WAAW,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,UAAW,CAAC,QAAQ,CAAC,qBAAqB,CAChD,kBAAkB,EAClB,WAAW,CAAC,YAAY,CACzB,CACF,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAE7B,IAAI,YAAY,GAA0B,EAAE,CAAC;YAE7C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,YAAY,GAAG;oBACb,GAAG,YAAY;oBACf,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,YAAY;iBACvD,CAAC;gBACF,CAAC,YAAY,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;gBAC3F,CAAC,YAAY,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,IAAI,CAC/B,uBAAuB,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;oBAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;oBAChF,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpE,CAAC,CAAC,CACH,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE1B,yDAAyD;YACzD,4CAA4C;YAC5C,qCAAqC;YACrC,KAAK,MAAM,YAAY,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;gBACzD,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC;oBAAE,SAAS;gBAE3D,MAAM,EAAE,GAAG,IAAI,CAAC,QAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;gBACtD,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,iBAAiB;oBAAE,SAAS;gBAC1C,IAAI,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;oBAAE,SAAS;gBAC9D,IAAI,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,sBAAsB,CAAC,cAAc,CAAC,EAAE,CAAC;oBAAE,SAAS;gBAElF,6BAA6B;gBAC7B,sDAAsD;gBACtD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrF,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,QAAS,CAAC,IAAI,CACjB,EAAE,EACF,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;oBACjE,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAC7C,aAAa,CAAC,YAAY,CAAC,SAAS,CAClC,QAAQ,EACR,IAAI,EACJ,kBAAkB,EAClB,OAAO,EACP,WAAW,EACX,IAAI,CACL,CAAC;wBACF,OAAO;oBACT,CAAC;oBAED,MAAM,UAAU,GAAG,EAAE,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC;oBACvE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBACpB,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC;4BAAE,OAAO;wBACnE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;oBACnF,CAAC;oBAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAC/D,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EACnC,EAAE,CACH,CAAC;oBAEF,IAAI,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;wBAClE,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CACpC,QAAQ,EACR,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAC/B,IAAI,CACL,CAAC;wBAEF,kBAAkB,CAAC,IAAI,CAAC;4BACtB,UAAU,EAAE,IAAI,CAAC,QAAQ;4BACzB,IAAI,EAAE,IAAI,CAAC,IAAI;yBAChB,CAAC,CAAC;oBACL,CAAC;yBACI,CAAC;wBACJ,kBAAkB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;oBACpC,CAAC;oBAED,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACvD,CAAC,EACD,SAAS,EACT,SAAS,EACT,YAAY,CACb,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,WAAW;YACX,WAAW;SACZ,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAAC,QAAgB,EAAE,QAAgB,EAAE,IAAY;QAC3E,IAAI,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,QAAQ,GAAG,IAAI,CAAC;QAEpB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QAEvF,IAAI,SAAS,CAAC,WAAW,CAAC,YAAY,EAAE,cAAc,CAAC,EAAE,CAAC;YACxD,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;YAErF,yBAAyB;YACzB,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjC,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC/C,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB;gBACxF,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpD,CAAC;IAEO,MAAM,CAAC,GAAG,GAAU;QAC1B,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"}
@@ -3,14 +3,14 @@ export interface ISdProjectConfig {
3
3
  localUpdates?: Record<string, string>;
4
4
  postPublish?: TSdPostPublishConfig[];
5
5
  }
6
- export type TSdProjectConfigFn = (isDev: boolean, opts?: string[]) => ISdProjectConfig;
7
- export type TSdPackageConfig = ISdLibPackageConfig | ISdServerPackageConfig | ISdClientPackageConfig;
6
+ export type TSdPackageConfig<T extends "server" | "library" | "client" | unknown = unknown> = T extends "library" ? ISdLibPackageConfig : T extends "server" ? ISdServerPackageConfig : T extends "client" ? ISdClientPackageConfig : (ISdLibPackageConfig | ISdServerPackageConfig | ISdClientPackageConfig);
8
7
  export interface ISdLibPackageConfig {
9
8
  type: "library";
10
9
  publish?: "npm";
11
10
  polyfills?: string[];
12
11
  noGenIndex?: boolean;
13
12
  dbContext?: string;
13
+ forceProductionMode?: boolean;
14
14
  }
15
15
  export interface ISdServerPackageConfig {
16
16
  type: "server";
@@ -18,6 +18,7 @@ export interface ISdServerPackageConfig {
18
18
  publish?: ISdLocalDirectoryPublishConfig | ISdFtpPublishConfig;
19
19
  configs?: Record<string, any>;
20
20
  env?: Record<string, string>;
21
+ forceProductionMode?: boolean;
21
22
  pm2?: {
22
23
  name?: string;
23
24
  ignoreWatchPaths?: string[];
@@ -2,12 +2,13 @@ import { CompilerOptions } from "typescript";
2
2
  import esbuild from "esbuild";
3
3
  import { ISdBuildMessage } from "./build.types";
4
4
  import { TNormPath } from "@simplysm/sd-core-node";
5
+ import { ScopePathSet } from "../pkg-builders/commons/scope-path";
5
6
  export interface SdTsCompilerOptions {
6
7
  pkgPath: TNormPath;
7
8
  additionalOptions: CompilerOptions;
8
9
  isForBundle: boolean;
9
10
  isDevMode: boolean;
10
- watchScopePaths: TNormPath[];
11
+ watchScopePathSet: ScopePathSet;
11
12
  globalStyleFilePath?: TNormPath;
12
13
  }
13
14
  export interface ISdTsCompilerResult {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "12.9.16",
3
+ "version": "12.9.18",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -17,10 +17,10 @@
17
17
  "@angular/compiler-cli": "^19.2.10",
18
18
  "@anthropic-ai/sdk": "^0.41.0",
19
19
  "@electron/rebuild": "^4.0.1",
20
- "@simplysm/sd-core-common": "12.9.16",
21
- "@simplysm/sd-core-node": "12.9.16",
22
- "@simplysm/sd-service-server": "12.9.16",
23
- "@simplysm/sd-storage": "12.9.16",
20
+ "@simplysm/sd-core-common": "12.9.18",
21
+ "@simplysm/sd-core-node": "12.9.18",
22
+ "@simplysm/sd-service-server": "12.9.18",
23
+ "@simplysm/sd-storage": "12.9.18",
24
24
  "browserslist": "^4.24.5",
25
25
  "cordova": "^12.0.0",
26
26
  "css-has-pseudo": "^7.0.2",
@@ -33,13 +33,14 @@
33
33
  "postcss": "^8.5.3",
34
34
  "rxjs": "^7.8.2",
35
35
  "sass": "^1.87.0",
36
+ "sass-embedded": "^1.87.0",
36
37
  "semver": "^7.7.1",
37
38
  "specifier-resolution-node": "^1.1.4",
38
39
  "typescript": "~5.7.3",
39
- "yargs": "^17.7.2"
40
+ "yargs": "^17.7.2",
41
+ "ts-morph": "^25.0.1"
40
42
  },
41
43
  "devDependencies": {
42
- "@types/eslint": "^9.6.1",
43
44
  "@types/xml2js": "^0.4.14",
44
45
  "@types/yargs": "^17.0.33",
45
46
  "vite-tsconfig-paths": "^5.1.4",
@@ -524,16 +524,16 @@ export class SdCliCordova {
524
524
  for (const file of files) {
525
525
  const relFilePath = path.relative(dirPath, file);
526
526
  const fileBuffer = FsUtils.readFileBuffer(file);
527
- zip.write(relFilePath, new Uint8Array(fileBuffer));
527
+ zip.write(relFilePath, fileBuffer);
528
528
  }
529
529
  }
530
530
 
531
531
  static async runWebviewOnDeviceAsync(opt: {
532
532
  platform: string;
533
- pkgName: string;
533
+ package: string;
534
534
  url?: string
535
535
  }): Promise<void> {
536
- const cordovaPath = path.resolve(process.cwd(), `packages/${opt.pkgName}/.cordova/`);
536
+ const cordovaPath = path.resolve(process.cwd(), `packages/${opt.package}/.cordova/`);
537
537
 
538
538
  if (opt.url !== undefined) {
539
539
  FsUtils.remove(path.resolve(cordovaPath, "www"));
@@ -544,7 +544,7 @@ export class SdCliCordova {
544
544
  '${opt.url}'로 이동중...
545
545
  <script>
546
546
  setTimeout(function () {
547
- window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.pkgName}/cordova/";
547
+ window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.package}/cordova/";
548
548
  }, 3000);
549
549
  </script>`.trim(),
550
550
  );
@@ -8,7 +8,7 @@ import { loadProjConfAsync } from "./utils/loadProjConfAsync";
8
8
  export class SdCliElectron {
9
9
  static async runAsync(opt: {
10
10
  package: string
11
- config?: string;
11
+ config: string;
12
12
  options?: string[];
13
13
  }) {
14
14
  const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliElectron", "runAsync"]);
@@ -69,7 +69,7 @@ export class SdCliElectron {
69
69
 
70
70
  static async buildForDevAsync(opt: {
71
71
  package: string
72
- config?: string;
72
+ config: string;
73
73
  options?: string[];
74
74
  }) {
75
75
  const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliElectron", "buildForDevAsync"]);
@@ -3,7 +3,7 @@ import path from "path";
3
3
  import { loadProjConfAsync } from "./utils/loadProjConfAsync";
4
4
 
5
5
  export class SdCliLocalUpdate {
6
- static async runAsync(opt: { config?: string; options?: string[] }): Promise<void> {
6
+ static async runAsync(opt: { config: string; options?: string[] }): Promise<void> {
7
7
  const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "runAsync"]);
8
8
 
9
9
  logger.debug("프로젝트 설정 가져오기...");
@@ -28,7 +28,7 @@ export class SdCliLocalUpdate {
28
28
  logger.info("로컬 라이브러리 업데이트 완료");
29
29
  }
30
30
 
31
- static async watchAsync(opt: { config?: string; options?: string[] }): Promise<void> {
31
+ static async watchAsync(opt: { config: string; options?: string[] }): Promise<void> {
32
32
  const logger = SdLogger.get(["simplysm", "sd-cli", "SdCliLocalUpdate", "watchAsync"]);
33
33
 
34
34
  logger.debug("프로젝트 설정 가져오기...");
@@ -13,7 +13,7 @@ import { loadProjConfAsync } from "./utils/loadProjConfAsync";
13
13
 
14
14
  export class SdCliProject {
15
15
  static async watchAsync(opt: {
16
- config?: string;
16
+ config: string;
17
17
  options?: string[];
18
18
  packages?: string[];
19
19
  inspects?: string[];
@@ -58,7 +58,7 @@ export class SdCliProject {
58
58
  logger.debug("빌드를 시작합니다...");
59
59
  })
60
60
  .on("complete", (messages) => {
61
- this.#logging(messages, logger);
61
+ this._logging(messages, logger);
62
62
  });
63
63
 
64
64
  await pkgPaths.parallelAsync(async (pkgPath) => {
@@ -71,7 +71,7 @@ export class SdCliProject {
71
71
  }
72
72
 
73
73
  static async buildAsync(opt: {
74
- config?: string;
74
+ config: string;
75
75
  options?: string[];
76
76
  packages?: string[];
77
77
  }): Promise<void> {
@@ -107,7 +107,7 @@ export class SdCliProject {
107
107
  projConf: projConf,
108
108
  });
109
109
  });
110
- this.#logging(messages.mapMany(), logger);
110
+ this._logging(messages.mapMany(), logger);
111
111
  }
112
112
 
113
113
  static async publishAsync(opt: {
@@ -169,7 +169,7 @@ export class SdCliProject {
169
169
  });
170
170
  });
171
171
 
172
- this.#logging(messages.mapMany(), logger);
172
+ this._logging(messages.mapMany(), logger);
173
173
  }
174
174
  catch (err) {
175
175
  await SdProcess.spawnAsync("git checkout .");
@@ -339,7 +339,7 @@ export class SdCliProject {
339
339
  }
340
340
  }
341
341
 
342
- static #logging(buildResults: ISdBuildMessage[], logger: SdLogger): void {
342
+ private static _logging(buildResults: ISdBuildMessage[], logger: SdLogger): void {
343
343
  const messageMap = buildResults.toSetMap(
344
344
  (item) => item.severity,
345
345
  (item) => SdCliConvertMessageUtils.getBuildMessageString(item),
@@ -3,10 +3,10 @@ import path from "path";
3
3
  import { ISdProjectConfig } from "../../types/config.types";
4
4
 
5
5
  export async function loadProjConfAsync(rootPath: string, dev: boolean, opt: {
6
- config?: string;
6
+ config: string;
7
7
  options?: string[];
8
8
  }) {
9
- const filePath = path.resolve(rootPath, opt.config ?? "simplysm.js");
9
+ const filePath = path.resolve(rootPath, opt.config);
10
10
  const imported = await import(pathToFileURL(filePath).href);
11
11
  return imported.default(dev, opt.options ?? []) as ISdProjectConfig;
12
12
  }
@@ -0,0 +1,69 @@
1
+ /* eslint-disable no-console */
2
+
3
+ import {
4
+ MethodDeclaration,
5
+ Project,
6
+ PropertyAccessExpression,
7
+ PropertyDeclaration,
8
+ SyntaxKind,
9
+ } from "ts-morph";
10
+
11
+ export default function convertPrivateUnderscore() {
12
+ const project = new Project({
13
+ tsConfigFilePath: "tsconfig.base.json",
14
+ });
15
+
16
+ const sourceFiles = project.getSourceFiles("packages/*/src/**/*.ts");
17
+
18
+ for (const sourceFile of sourceFiles) {
19
+ for (const classDec of sourceFile.getClasses()) {
20
+ const members = classDec.getMembers();
21
+
22
+ for (const member of members) {
23
+ // 타입 좁히기
24
+ if (
25
+ member.getKind() !== SyntaxKind.PropertyDeclaration &&
26
+ member.getKind() !== SyntaxKind.MethodDeclaration
27
+ ) {
28
+ continue;
29
+ }
30
+
31
+ const namedMember = member as PropertyDeclaration | MethodDeclaration;
32
+ const nameNode = namedMember.getNameNode();
33
+ if (nameNode.getKind() !== SyntaxKind.Identifier) continue;
34
+
35
+ const originalName = nameNode.getText();
36
+ const modifiers = namedMember.getModifiers().map(mod => mod.getText());
37
+
38
+ // 예외 조건들
39
+ if (originalName.startsWith("_")) continue;
40
+ if (/^[A-Z0-9_]+$/.test(originalName)) continue;
41
+ if (modifiers.includes("protected") && modifiers.includes("readonly")) continue;
42
+
43
+ if (modifiers.includes("private") || modifiers.includes("protected")) {
44
+ const newName = `_${originalName}`;
45
+
46
+ namedMember.rename(newName);
47
+
48
+ // this.속성 참조도 수정
49
+ sourceFile
50
+ .getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
51
+ .forEach((expr: PropertyAccessExpression) => {
52
+ if (
53
+ expr.getName() === originalName &&
54
+ expr.getExpression().getKind() === SyntaxKind.ThisKeyword
55
+ ) {
56
+ expr.getNameNode().replaceWithText(newName);
57
+ }
58
+ });
59
+
60
+ console.log(`[updated] ${sourceFile.getBaseName()} :: ${originalName} → ${newName}`);
61
+ }
62
+ }
63
+ }
64
+
65
+ sourceFile.saveSync();
66
+ }
67
+
68
+ console.log("✅ private/protected prefix 변환 완료");
69
+ }
@@ -0,0 +1,74 @@
1
+ /* eslint-disable no-console */
2
+
3
+ import { MethodDeclaration, Project, PropertyAccessExpression, SyntaxKind } from "ts-morph";
4
+
5
+ export default function convertPrivate() {
6
+ const project = new Project({
7
+ tsConfigFilePath: "tsconfig.base.json",
8
+ });
9
+
10
+ const sourceFiles = project.getSourceFiles("packages/*/src/**/*.ts");
11
+
12
+ for (const sourceFile of sourceFiles) {
13
+ for (const classDec of sourceFile.getClasses()) {
14
+ let changed = false;
15
+
16
+ // (1) #x → private _x
17
+ for (const prop of classDec.getInstanceProperties()) {
18
+ const nameNode = prop.getNameNode();
19
+ if (nameNode.getKind() !== SyntaxKind.PrivateIdentifier) continue;
20
+
21
+ const baseName = nameNode.getText().slice(1);
22
+ const newName = `_${baseName}`;
23
+
24
+ nameNode.replaceWithText(newName);
25
+ if (!prop.hasModifier(SyntaxKind.PrivateKeyword)) {
26
+ prop.toggleModifier("private", true);
27
+ }
28
+
29
+ console.log(`[private-field] ${sourceFile.getBaseName()} :: #${baseName} → private ${newName}`);
30
+ changed = true;
31
+ }
32
+
33
+ // (2) #foo() → private _foo()
34
+ for (const member of classDec.getMembers()) {
35
+ if (member.getKind() !== SyntaxKind.MethodDeclaration) continue;
36
+
37
+ const method = member as MethodDeclaration;
38
+ const nameNode = method.getNameNode();
39
+ if (nameNode.getKind() !== SyntaxKind.PrivateIdentifier) continue;
40
+
41
+ const baseName = nameNode.getText().slice(1);
42
+ const newName = `_${baseName}`;
43
+
44
+ nameNode.replaceWithText(newName);
45
+ if (!method.hasModifier(SyntaxKind.PrivateKeyword)) {
46
+ method.toggleModifier("private", true);
47
+ }
48
+
49
+ console.log(`[private-method] ${sourceFile.getBaseName()} :: #${baseName}() → private ${newName}()`);
50
+ changed = true;
51
+ }
52
+
53
+ // (3) this.#x → this._x
54
+ classDec.getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
55
+ .forEach((expr: PropertyAccessExpression) => {
56
+ const nameNode = expr.getNameNode();
57
+ if (nameNode.getKind() !== SyntaxKind.PrivateIdentifier) return;
58
+
59
+ const baseName = nameNode.getText().slice(1);
60
+ const newName = `_${baseName}`;
61
+ nameNode.replaceWithText(newName);
62
+
63
+ console.log(`[ref] ${sourceFile.getBaseName()} :: this.#${baseName} → this.${newName}`);
64
+ changed = true;
65
+ });
66
+
67
+ if (changed) {
68
+ sourceFile.saveSync();
69
+ }
70
+ }
71
+ }
72
+
73
+ console.log("✅ ECMAScript private (#field) → TypeScript private _field 변환 완료");
74
+ }
@@ -8,13 +8,13 @@ export class SdCliNgRoutesFileGenerator {
8
8
  let cache = FsUtils.exists(routesFilePath) ? FsUtils.readFile(routesFilePath) : undefined;
9
9
 
10
10
  SdFsWatcher.watch([path.resolve(pkgPath, "src")]).onChange({ delay: 50 }, () => {
11
- cache = this.run(pkgPath, cache, noLazyRoute);
11
+ cache = this.run(pkgPath, noLazyRoute, cache);
12
12
  });
13
13
 
14
- cache = this.run(pkgPath, cache, noLazyRoute);
14
+ cache = this.run(pkgPath, noLazyRoute, cache);
15
15
  }
16
16
 
17
- static run(pkgPath: string, cache?: string, noLazyRoute?: boolean): string {
17
+ static run(pkgPath: string, noLazyRoute?: boolean, cache?: string): string {
18
18
  const appDirPath = path.resolve(pkgPath, "src/app");
19
19
  const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
20
20