@simplysm/sd-cli 12.7.4 → 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.
Files changed (167) hide show
  1. package/dist/entry/sd-cli-ai-command.d.ts +3 -0
  2. package/dist/entry/{SdAiCommand.js → sd-cli-ai-command.js} +14 -9
  3. package/dist/entry/sd-cli-ai-command.js.map +1 -0
  4. package/dist/entry/{SdCliCordova.d.ts → sd-cli-cordova.d.ts} +1 -1
  5. package/dist/entry/{SdCliCordova.js → sd-cli-cordova.js} +33 -31
  6. package/dist/entry/sd-cli-cordova.js.map +1 -0
  7. package/dist/entry/{SdCliElectron.d.ts → sd-cli-electron.d.ts} +1 -1
  8. package/dist/entry/{SdCliElectron.js → sd-cli-electron.js} +18 -16
  9. package/dist/entry/sd-cli-electron.js.map +1 -0
  10. package/dist/entry/{SdCliLocalUpdate.js → sd-cli-local-update.js} +12 -11
  11. package/dist/entry/sd-cli-local-update.js.map +1 -0
  12. package/dist/entry/{SdCliProject.js → sd-cli-project.js} +36 -33
  13. package/dist/entry/sd-cli-project.js.map +1 -0
  14. package/dist/index.d.ts +30 -30
  15. package/dist/index.js +30 -30
  16. package/dist/index.js.map +1 -1
  17. package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.js → sd-cli-ng-routes.file-generator.js} +13 -12
  18. package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -0
  19. package/dist/pkg-builders/client/{SdClientBuildRunner.d.ts → sd-client.build-runner.d.ts} +3 -3
  20. package/dist/pkg-builders/client/{SdClientBuildRunner.js → sd-client.build-runner.js} +34 -24
  21. package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -0
  22. package/dist/pkg-builders/client/{SdNgBundlerContext.js → sd-ng.bundler-context.js} +5 -5
  23. package/dist/pkg-builders/client/sd-ng.bundler-context.js.map +1 -0
  24. package/dist/pkg-builders/client/{SdNgBundler.d.ts → sd-ng.bundler.d.ts} +3 -3
  25. package/dist/pkg-builders/client/{SdNgBundler.js → sd-ng.bundler.js} +55 -96
  26. package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -0
  27. package/dist/pkg-builders/client/{createSdNgPlugin.d.ts → sd-ng.plugin-creator.d.ts} +2 -2
  28. package/dist/pkg-builders/client/{createSdNgPlugin.js → sd-ng.plugin-creator.js} +18 -15
  29. package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -0
  30. package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.js → sd-cli-index.file-generator.js} +8 -8
  31. package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -0
  32. package/dist/pkg-builders/lib/{SdJsLibBuildRunner.d.ts → sd-js-lib.build-runner.d.ts} +2 -2
  33. package/dist/pkg-builders/lib/{SdJsLibBuildRunner.js → sd-js-lib.build-runner.js} +18 -15
  34. package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -0
  35. package/dist/pkg-builders/lib/{SdTsLibBuildRunner.d.ts → sd-ts-lib.build-runner.d.ts} +2 -2
  36. package/dist/pkg-builders/lib/{SdTsLibBuildRunner.js → sd-ts-lib.build-runner.js} +17 -15
  37. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -0
  38. package/dist/pkg-builders/lib/{SdTsLibBuilder.d.ts → sd-ts-lib.builder.d.ts} +2 -2
  39. package/dist/pkg-builders/lib/{SdTsLibBuilder.js → sd-ts-lib.builder.js} +11 -10
  40. package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -0
  41. package/dist/pkg-builders/{SdMultiBuildRunner.d.ts → sd-multi.build-runner.d.ts} +2 -2
  42. package/dist/pkg-builders/{SdMultiBuildRunner.js → sd-multi.build-runner.js} +13 -8
  43. package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -0
  44. package/dist/pkg-builders/server/{SdServerBuildRunner.d.ts → sd-server.build-runner.d.ts} +3 -3
  45. package/dist/pkg-builders/server/{SdServerBuildRunner.js → sd-server.build-runner.js} +35 -32
  46. package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -0
  47. package/dist/pkg-builders/server/{SdServerBundler.d.ts → sd-server.bundler.d.ts} +2 -2
  48. package/dist/pkg-builders/server/{SdServerBundler.js → sd-server.bundler.js} +15 -13
  49. package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -0
  50. package/dist/pkg-builders/server/{createSdServerPlugin.d.ts → sd-server.plugin-creator.d.ts} +2 -2
  51. package/dist/pkg-builders/server/{createSdServerPlugin.js → sd-server.plugin-creator.js} +11 -8
  52. package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -0
  53. package/dist/sd-cli.js +10 -10
  54. package/dist/sd-cli.js.map +1 -1
  55. package/dist/{ts-builder/SdTsCompiler.d.ts → ts-compiler/sd-ts-compiler.d.ts} +2 -2
  56. package/dist/{ts-builder/SdTsCompiler.js → ts-compiler/sd-ts-compiler.js} +72 -65
  57. package/dist/ts-compiler/sd-ts-compiler.js.map +1 -0
  58. package/dist/types/{build-plugin.type.d.ts → build-plugin.types.d.ts} +1 -1
  59. package/dist/types/build-plugin.types.js +3 -0
  60. package/dist/types/build-plugin.types.js.map +1 -0
  61. package/dist/types/{build-runner.type.d.ts → build-runner.types.d.ts} +2 -2
  62. package/dist/types/build-runner.types.js +3 -0
  63. package/dist/types/build-runner.types.js.map +1 -0
  64. package/dist/types/{build.type.d.ts → build.types.d.ts} +1 -1
  65. package/dist/types/build.types.js +2 -0
  66. package/dist/types/build.types.js.map +1 -0
  67. package/dist/types/common-configs.types.js +2 -0
  68. package/dist/types/common-configs.types.js.map +1 -0
  69. package/dist/types/config.types.js +2 -0
  70. package/dist/types/config.types.js.map +1 -0
  71. package/dist/types/{ts-compiler.type.d.ts → ts-compiler.types.d.ts} +3 -3
  72. package/dist/types/ts-compiler.types.js +5 -0
  73. package/dist/types/ts-compiler.types.js.map +1 -0
  74. package/dist/types/{workers.type.d.ts → worker.types.d.ts} +2 -2
  75. package/dist/types/worker.types.js +3 -0
  76. package/dist/types/worker.types.js.map +1 -0
  77. package/dist/utils/{SdCliConvertMessageUtil.d.ts → sd-cli-convert-message.utils.d.ts} +3 -3
  78. package/dist/utils/{SdCliConvertMessageUtil.js → sd-cli-convert-message.utils.js} +9 -6
  79. package/dist/utils/sd-cli-convert-message.utils.js.map +1 -0
  80. package/dist/utils/{SdCliPerformanceTime.js → sd-cli-performance-time.js} +1 -1
  81. package/dist/utils/sd-cli-performance-time.js.map +1 -0
  82. package/dist/workers/{build-runner-worker.js → build-runner.worker.js} +13 -10
  83. package/dist/workers/build-runner.worker.js.map +1 -0
  84. package/dist/workers/{server-worker.js → server.worker.js} +6 -5
  85. package/dist/workers/server.worker.js.map +1 -0
  86. package/package.json +7 -7
  87. package/src/entry/{SdAiCommand.ts → sd-cli-ai-command.ts} +18 -8
  88. package/src/entry/{SdCliCordova.ts → sd-cli-cordova.ts} +32 -32
  89. package/src/entry/{SdCliElectron.ts → sd-cli-electron.ts} +17 -17
  90. package/src/entry/{SdCliLocalUpdate.ts → sd-cli-local-update.ts} +11 -11
  91. package/src/entry/{SdCliProject.ts → sd-cli-project.ts} +36 -36
  92. package/src/index.ts +30 -30
  93. package/src/pkg-builders/client/{SdCliNgRoutesFileGenerator.ts → sd-cli-ng-routes.file-generator.ts} +14 -12
  94. package/src/pkg-builders/client/{SdClientBuildRunner.ts → sd-client.build-runner.ts} +52 -45
  95. package/src/pkg-builders/client/{SdNgBundlerContext.ts → sd-ng.bundler-context.ts} +4 -4
  96. package/src/pkg-builders/client/{SdNgBundler.ts → sd-ng.bundler.ts} +98 -130
  97. package/src/pkg-builders/client/{createSdNgPlugin.ts → sd-ng.plugin-creator.ts} +16 -16
  98. package/src/pkg-builders/lib/{SdCliIndexFileGenerator.ts → sd-cli-index.file-generator.ts} +7 -7
  99. package/src/pkg-builders/lib/{SdJsLibBuildRunner.ts → sd-js-lib.build-runner.ts} +16 -16
  100. package/src/pkg-builders/lib/{SdTsLibBuildRunner.ts → sd-ts-lib.build-runner.ts} +17 -17
  101. package/src/pkg-builders/lib/{SdTsLibBuilder.ts → sd-ts-lib.builder.ts} +10 -10
  102. package/src/pkg-builders/{SdMultiBuildRunner.ts → sd-multi.build-runner.ts} +12 -12
  103. package/src/pkg-builders/server/{SdServerBuildRunner.ts → sd-server.build-runner.ts} +34 -34
  104. package/src/pkg-builders/server/{SdServerBundler.ts → sd-server.bundler.ts} +15 -15
  105. package/src/pkg-builders/server/{createSdServerPlugin.ts → sd-server.plugin-creator.ts} +9 -9
  106. package/src/sd-cli.ts +10 -10
  107. package/src/{ts-builder/SdTsCompiler.ts → ts-compiler/sd-ts-compiler.ts} +146 -78
  108. package/src/types/{build-plugin.type.ts → build-plugin.types.ts} +1 -1
  109. package/src/types/{build-runner.type.ts → build-runner.types.ts} +2 -2
  110. package/src/types/{build.type.ts → build.types.ts} +1 -1
  111. package/src/types/{ts-compiler.type.ts → ts-compiler.types.ts} +3 -3
  112. package/src/types/{workers.type.ts → worker.types.ts} +2 -2
  113. package/src/utils/{SdCliConvertMessageUtil.ts → sd-cli-convert-message.utils.ts} +7 -7
  114. package/src/workers/{build-runner-worker.ts → build-runner.worker.ts} +12 -12
  115. package/src/workers/{server-worker.ts → server.worker.ts} +5 -5
  116. package/tsconfig.json +2 -1
  117. package/dist/entry/SdAiCommand.d.ts +0 -3
  118. package/dist/entry/SdAiCommand.js.map +0 -1
  119. package/dist/entry/SdCliCordova.js.map +0 -1
  120. package/dist/entry/SdCliElectron.js.map +0 -1
  121. package/dist/entry/SdCliLocalUpdate.js.map +0 -1
  122. package/dist/entry/SdCliProject.js.map +0 -1
  123. package/dist/pkg-builders/SdMultiBuildRunner.js.map +0 -1
  124. package/dist/pkg-builders/client/SdCliNgRoutesFileGenerator.js.map +0 -1
  125. package/dist/pkg-builders/client/SdClientBuildRunner.js.map +0 -1
  126. package/dist/pkg-builders/client/SdNgBundler.js.map +0 -1
  127. package/dist/pkg-builders/client/SdNgBundlerContext.js.map +0 -1
  128. package/dist/pkg-builders/client/createSdNgPlugin.js.map +0 -1
  129. package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js.map +0 -1
  130. package/dist/pkg-builders/lib/SdJsLibBuildRunner.js.map +0 -1
  131. package/dist/pkg-builders/lib/SdTsLibBuildRunner.js.map +0 -1
  132. package/dist/pkg-builders/lib/SdTsLibBuilder.js.map +0 -1
  133. package/dist/pkg-builders/server/SdServerBuildRunner.js.map +0 -1
  134. package/dist/pkg-builders/server/SdServerBundler.js.map +0 -1
  135. package/dist/pkg-builders/server/createSdServerPlugin.js.map +0 -1
  136. package/dist/ts-builder/SdTsCompiler.js.map +0 -1
  137. package/dist/types/build-plugin.type.js +0 -2
  138. package/dist/types/build-plugin.type.js.map +0 -1
  139. package/dist/types/build-runner.type.js +0 -2
  140. package/dist/types/build-runner.type.js.map +0 -1
  141. package/dist/types/build.type.js +0 -2
  142. package/dist/types/build.type.js.map +0 -1
  143. package/dist/types/common-configs.type.js +0 -2
  144. package/dist/types/common-configs.type.js.map +0 -1
  145. package/dist/types/sd-configs.type.js +0 -2
  146. package/dist/types/sd-configs.type.js.map +0 -1
  147. package/dist/types/ts-compiler.type.js +0 -2
  148. package/dist/types/ts-compiler.type.js.map +0 -1
  149. package/dist/types/workers.type.js +0 -2
  150. package/dist/types/workers.type.js.map +0 -1
  151. package/dist/utils/SdCliConvertMessageUtil.js.map +0 -1
  152. package/dist/utils/SdCliPerformanceTime.js.map +0 -1
  153. package/dist/workers/build-runner-worker.js.map +0 -1
  154. package/dist/workers/server-worker.js.map +0 -1
  155. /package/dist/entry/{SdCliLocalUpdate.d.ts → sd-cli-local-update.d.ts} +0 -0
  156. /package/dist/entry/{SdCliProject.d.ts → sd-cli-project.d.ts} +0 -0
  157. /package/dist/pkg-builders/client/{SdCliNgRoutesFileGenerator.d.ts → sd-cli-ng-routes.file-generator.d.ts} +0 -0
  158. /package/dist/pkg-builders/client/{SdNgBundlerContext.d.ts → sd-ng.bundler-context.d.ts} +0 -0
  159. /package/dist/pkg-builders/lib/{SdCliIndexFileGenerator.d.ts → sd-cli-index.file-generator.d.ts} +0 -0
  160. /package/dist/types/{common-configs.type.d.ts → common-configs.types.d.ts} +0 -0
  161. /package/dist/types/{sd-configs.type.d.ts → config.types.d.ts} +0 -0
  162. /package/dist/utils/{SdCliPerformanceTime.d.ts → sd-cli-performance-time.d.ts} +0 -0
  163. /package/dist/workers/{build-runner-worker.d.ts → build-runner.worker.d.ts} +0 -0
  164. /package/dist/workers/{server-worker.d.ts → server.worker.d.ts} +0 -0
  165. /package/src/types/{common-configs.type.ts → common-configs.types.ts} +0 -0
  166. /package/src/types/{sd-configs.type.ts → config.types.ts} +0 -0
  167. /package/src/utils/{SdCliPerformanceTime.ts → sd-cli-performance-time.ts} +0 -0
@@ -0,0 +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,5 +1,5 @@
1
1
  import esbuild from "esbuild";
2
- import { TNormPath } from "@simplysm/sd-core-node";
2
+ import { type TNormPath } from "@simplysm/sd-core-node";
3
3
  export interface ISdCliServerPluginResultCache {
4
4
  watchFileSet?: Set<TNormPath>;
5
5
  affectedFileSet?: Set<TNormPath>;
@@ -0,0 +1,3 @@
1
+ import esbuild from "esbuild";
2
+ import {} from "@simplysm/sd-core-node";
3
+ //# sourceMappingURL=build-plugin.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"build-plugin.types.js","sourceRoot":"","sources":["../../src/types/build-plugin.types.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAkB,MAAM,wBAAwB,CAAC"}
@@ -1,5 +1,5 @@
1
- import { TNormPath } from "@simplysm/sd-core-node";
2
- import { ISdProjectConfig } from "./sd-configs.type";
1
+ import { type TNormPath } from "@simplysm/sd-core-node";
2
+ import { type ISdProjectConfig } from "./config.types";
3
3
  export interface ISdBuildRunnerWorkerRequest {
4
4
  cmd: "watch" | "build";
5
5
  pkgPath: TNormPath;
@@ -0,0 +1,3 @@
1
+ import {} from "@simplysm/sd-core-node";
2
+ import {} from "./config.types";
3
+ //# sourceMappingURL=build-runner.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"build-runner.types.js","sourceRoot":"","sources":["../../src/types/build-runner.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAyB,MAAM,gBAAgB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { TNormPath } from "@simplysm/sd-core-node";
1
+ import { type TNormPath } from "@simplysm/sd-core-node";
2
2
  export interface ISdBuildRunnerResult {
3
3
  affectedFilePathSet: Set<TNormPath>;
4
4
  buildMessages: ISdBuildMessage[];
@@ -0,0 +1,2 @@
1
+ import {} from "@simplysm/sd-core-node";
2
+ //# sourceMappingURL=build.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"build.types.js","sourceRoot":"","sources":["../../src/types/build.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,wBAAwB,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=common-configs.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"common-configs.types.js","sourceRoot":"","sources":["../../src/types/common-configs.types.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=config.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.types.js","sourceRoot":"","sources":["../../src/types/config.types.ts"],"names":[],"mappings":""}
@@ -1,7 +1,7 @@
1
- import { CompilerOptions } from "typescript";
1
+ import { type CompilerOptions } from "typescript";
2
2
  import esbuild from "esbuild";
3
- import { ISdBuildMessage } from "./build.type";
4
- import { TNormPath } from "@simplysm/sd-core-node";
3
+ import { type ISdBuildMessage } from "./build.types";
4
+ import { type TNormPath } from "@simplysm/sd-core-node";
5
5
  export interface SdTsCompilerOptions {
6
6
  pkgPath: TNormPath;
7
7
  additionalOptions: CompilerOptions;
@@ -0,0 +1,5 @@
1
+ import {} from "typescript";
2
+ import esbuild from "esbuild";
3
+ import {} from "./build.types";
4
+ import {} from "@simplysm/sd-core-node";
5
+ //# sourceMappingURL=ts-compiler.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ts-compiler.types.js","sourceRoot":"","sources":["../../src/types/ts-compiler.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,MAAM,YAAY,CAAC;AAClD,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAwB,MAAM,eAAe,CAAC;AACrD,OAAO,EAAkB,MAAM,wBAAwB,CAAC"}
@@ -1,5 +1,5 @@
1
- import { ISdBuildRunnerWorkerRequest } from "./build-runner.type";
2
- import { ISdBuildMessage, ISdBuildRunnerResult } from "./build.type";
1
+ import { type ISdBuildRunnerWorkerRequest } from "./build-runner.types";
2
+ import { type ISdBuildMessage, type ISdBuildRunnerResult } from "./build.types";
3
3
  export interface TServerWorkerType {
4
4
  methods: {
5
5
  listen: {
@@ -0,0 +1,3 @@
1
+ import {} from "./build-runner.types";
2
+ import {} from "./build.types";
3
+ //# sourceMappingURL=worker.types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"worker.types.js","sourceRoot":"","sources":["../../src/types/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAmD,MAAM,eAAe,CAAC"}
@@ -1,8 +1,8 @@
1
1
  import ts from "typescript";
2
- import { PartialMessage } from "esbuild";
2
+ import { type PartialMessage } from "esbuild";
3
3
  import { ESLint } from "eslint";
4
- import { ISdBuildMessage } from "../types/build.type";
5
- export declare class SdCliConvertMessageUtil {
4
+ import { type ISdBuildMessage } from "../types/build.types";
5
+ export declare class SdCliConvertMessageUtils {
6
6
  static convertToBuildMessagesFromTsDiag(diags: ts.Diagnostic[]): ISdBuildMessage[];
7
7
  static convertToBuildMessagesFromEsbuild(result: {
8
8
  errors?: PartialMessage[];
@@ -1,8 +1,11 @@
1
1
  import ts from "typescript";
2
2
  import os from "os";
3
3
  import path from "path";
4
- import { PathUtil } from "@simplysm/sd-core-node";
5
- export class SdCliConvertMessageUtil {
4
+ import {} from "esbuild";
5
+ import { ESLint } from "eslint";
6
+ import {} from "../types/build.types";
7
+ import { PathUtils } from "@simplysm/sd-core-node";
8
+ export class SdCliConvertMessageUtils {
6
9
  static convertToBuildMessagesFromTsDiag(diags) {
7
10
  return diags.map((diag) => {
8
11
  const severity = diag.category === ts.DiagnosticCategory.Error
@@ -14,7 +17,7 @@ export class SdCliConvertMessageUtil {
14
17
  : "message";
15
18
  const code = `TS${diag.code}`;
16
19
  const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
17
- const filePath = diag.file ? PathUtil.norm(path.resolve(diag.file.fileName)) : undefined;
20
+ const filePath = diag.file ? PathUtils.norm(path.resolve(diag.file.fileName)) : undefined;
18
21
  const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
19
22
  const line = position ? position.line + 1 : undefined;
20
23
  const char = position ? position.character + 1 : undefined;
@@ -31,7 +34,7 @@ export class SdCliConvertMessageUtil {
31
34
  }
32
35
  static convertToBuildMessagesFromEsbuild(result, orgPath) {
33
36
  const convertFn = (msg, severity) => {
34
- const filePath = msg.location?.file != null ? PathUtil.norm(orgPath, msg.location.file) : undefined;
37
+ const filePath = msg.location?.file != null ? PathUtils.norm(orgPath, msg.location.file) : undefined;
35
38
  const line = msg.location?.line;
36
39
  const char = msg.location?.column;
37
40
  const code = msg.text.slice(0, msg.text.indexOf(":"));
@@ -53,7 +56,7 @@ export class SdCliConvertMessageUtil {
53
56
  }
54
57
  static convertToBuildMessagesFromEslint(results) {
55
58
  return results.mapMany((result) => result.messages.map((msg) => ({
56
- filePath: PathUtil.norm(result.filePath),
59
+ filePath: PathUtils.norm(result.filePath),
57
60
  line: msg.line,
58
61
  char: msg.column,
59
62
  code: msg.messageId,
@@ -134,4 +137,4 @@ export class SdCliConvertMessageUtil {
134
137
  return str;
135
138
  }
136
139
  }
137
- //# sourceMappingURL=SdCliConvertMessageUtil.js.map
140
+ //# sourceMappingURL=sd-cli-convert-message.utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sd-cli-convert-message.utils.js","sourceRoot":"","sources":["../../src/utils/sd-cli-convert-message.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAuB,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,OAAO,wBAAwB;IACnC,MAAM,CAAC,gCAAgC,CAAC,KAAsB;QAC5D,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACxB,MAAM,QAAQ,GACZ,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,KAAK;gBAC3C,CAAC,CAAE,OAAiB;gBACpB,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,OAAO;oBAC/C,CAAC,CAAE,SAAmB;oBACtB,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,kBAAkB,CAAC,UAAU;wBAClD,CAAC,CAAE,YAAsB;wBACzB,CAAC,CAAE,SAAmB,CAAC;YAE/B,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,EAAE,CAAC,4BAA4B,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAE1E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1F,MAAM,QAAQ,GACZ,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1G,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACtD,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE3D,OAAO;gBACL,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,IAAI;gBACJ,QAAQ;gBACR,OAAO;gBACP,IAAI,EAAE,SAAS;aAChB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,iCAAiC,CACtC,MAGC,EACD,OAAe;QAEf,MAAM,SAAS,GAAG,CAAC,GAAmB,EAAE,QAA6B,EAAE,EAAE;YACvE,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACrG,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC;YAChC,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;YAClC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,IAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAEzG,OAAO;gBACL,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,IAAI;gBACJ,QAAQ;gBACR,OAAO;gBACP,IAAI,EAAE,GAAG,CAAC,UAAU;aACrB,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/D,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;SACpE,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,gCAAgC,CAAC,OAA4B;QAClE,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5B,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YACzC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,IAAI,EAAE,GAAG,CAAC,SAAS;YACnB,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAE,SAAmB,CAAC,CAAC,CAAE,OAAiB;YACxE,OAAO,EAAE,GAAG,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtE,IAAI,EAAE,MAAe;SACtB,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,iCAAiC,CACtC,QAA2B,EAC3B,OAAe;QAKf,OAAO;YACL,MAAM,EAAE,QAAQ;iBACb,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC;iBACzC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACb,EAAE,EAAE,GAAG,CAAC,IAAI;gBACZ,UAAU,EAAE,GAAG,CAAC,IAAI;gBACpB,IAAI,EAAE,GAAG,CAAC,OAAO;gBACjB,QAAQ,EAAE;oBACR,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC/E,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,IAAI;iBACjB;aACF,CAAC,CAAC;YACL,QAAQ,EAAE,QAAQ;iBACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,CAAC;iBACzC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACb,EAAE,EAAE,GAAG,CAAC,IAAI;gBACZ,UAAU,EAAE,GAAG,CAAC,IAAI;gBACpB,IAAI,EAAE,GAAG,CAAC,OAAO;gBACjB,QAAQ,EAAE;oBACR,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC/E,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM,EAAE,GAAG,CAAC,IAAI;iBACjB;aACF,CAAC,CAAC;SACN,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,0BAA0B,CAC/B,OAA4B,EAC5B,OAAe;QAKf,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,CAAC,CAAC,QAAQ;iBACP,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC;iBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO;oBACL,UAAU,EAAE,MAAM;oBAClB,IAAI,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClF,QAAQ,EAAE;wBACR,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC;wBACxC,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;qBACjB;iBACF,CAAC;YACJ,CAAC,CAAC,CACL;YACD,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,CAAC,QAAQ;iBACP,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC;iBAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,OAAO;oBACL,UAAU,EAAE,MAAM;oBAClB,IAAI,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClF,QAAQ,EAAE;wBACR,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC;wBACxC,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,MAAM,EAAE,CAAC,CAAC,MAAM;qBACjB;iBACF,CAAC;YACJ,CAAC,CAAC,CACL;SACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,qBAAqB,CAAC,MAAuB;QAClD,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAClC,GAAG,IAAI,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC;QAC1E,CAAC;QACD,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC;QAC3B,GAAG,IAAI,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC;QAC7B,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,GAAG,IAAI,GAAG,MAAM,CAAC,IAAI,GAAG,CAAC;QAC3B,CAAC;QACD,GAAG,IAAI,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;QAE7B,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
@@ -37,4 +37,4 @@ ${Array.from(this.#resultMap.entries())
37
37
  ------------------------------------`;
38
38
  }
39
39
  }
40
- //# sourceMappingURL=SdCliPerformanceTime.js.map
40
+ //# sourceMappingURL=sd-cli-performance-time.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sd-cli-performance-time.js","sourceRoot":"","sources":["../../src/utils/sd-cli-performance-time.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,qBAAqB;IAChC,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,UAAU,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEvC,YAAoB,KAAa;QAAb,UAAK,GAAL,KAAK,CAAQ;IAAG,CAAC;IAErC,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,IAAY;QACd,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,GAAG,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAI,IAAY,EAAE,EAAW;QAC9B,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC;QACf,IAAI,GAAG,YAAY,OAAO,EAAE,CAAC;YAC3B,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC1B,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;gBAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;gBACzD,OAAO,OAAO,CAAC;YACjB,CAAC,CAAM,CAAC;QACV,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;QACzD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,KAAK;;EAEtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;aACpC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,IAAI,CAAC;aACpD,IAAI,CAAC,IAAI,CAAC;qCACwB,CAAC;IACpC,CAAC;CACF"}
@@ -1,21 +1,24 @@
1
- import { createSdWorker, FsUtil, Logger, LoggerSeverity } from "@simplysm/sd-core-node";
1
+ import { createSdWorker, FsUtils, SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
2
+ import {} from "../types/build.types";
2
3
  import path from "path";
3
- import { SdServerBuildRunner } from "../pkg-builders/server/SdServerBuildRunner";
4
- import { SdClientBuildRunner } from "../pkg-builders/client/SdClientBuildRunner";
5
- import { SdTsLibBuildRunner } from "../pkg-builders/lib/SdTsLibBuildRunner";
6
- import { SdJsLibBuildRunner } from "../pkg-builders/lib/SdJsLibBuildRunner";
4
+ import { SdServerBuildRunner } from "../pkg-builders/server/sd-server.build-runner";
5
+ import { SdClientBuildRunner } from "../pkg-builders/client/sd-client.build-runner";
6
+ import { SdTsLibBuildRunner } from "../pkg-builders/lib/sd-ts-lib.build-runner";
7
+ import { SdJsLibBuildRunner } from "../pkg-builders/lib/sd-js-lib.build-runner";
8
+ import {} from "../types/worker.types";
9
+ import {} from "../types/build-runner.types";
7
10
  import { EventEmitter } from "events";
8
11
  Error.stackTraceLimit = Infinity;
9
12
  EventEmitter.defaultMaxListeners = 0;
10
13
  if (process.env["SD_DEBUG"] != null) {
11
- Logger.setConfig({
14
+ SdLogger.setConfig({
12
15
  console: {
13
- level: LoggerSeverity.debug,
16
+ level: SdLoggerSeverity.debug,
14
17
  },
15
18
  });
16
19
  }
17
20
  else {
18
- Logger.setConfig({
21
+ SdLogger.setConfig({
19
22
  dot: true,
20
23
  });
21
24
  }
@@ -26,7 +29,7 @@ const worker = createSdWorker({
26
29
  ? SdServerBuildRunner
27
30
  : pkgConf.type === "client"
28
31
  ? SdClientBuildRunner
29
- : FsUtil.exists(path.resolve(req.pkgPath, "tsconfig.json"))
32
+ : FsUtils.exists(path.resolve(req.pkgPath, "tsconfig.json"))
30
33
  ? SdTsLibBuildRunner
31
34
  : SdJsLibBuildRunner;
32
35
  const builder = new buildRunnerType(req.projConf, req.pkgPath)
@@ -46,4 +49,4 @@ const worker = createSdWorker({
46
49
  }
47
50
  },
48
51
  });
49
- //# sourceMappingURL=build-runner-worker.js.map
52
+ //# sourceMappingURL=build-runner.worker.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"build-runner.worker.js","sourceRoot":"","sources":["../../src/workers/build-runner.worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAC5D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAiC,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAoC,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC;QACjB,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B;KACF,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,QAAQ,CAAC,SAAS,CAAC;QACjB,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,MAAM,MAAM,GAAG,cAAc,CAA2B;IACtD,KAAK,CAAC,GAAG,CAAC,GAAgC;QACxC,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAE,CAAC;QAEnE,MAAM,eAAe,GACnB,OAAO,CAAC,IAAI,KAAK,QAAQ;YACvB,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,mBAAmB;gBACrB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;oBAC1D,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,kBAAkB,CAAC;QAE7B,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;aAC3D,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACjB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC,CAAC;aACD,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACzB,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAC;QAEL,IAAI,GAAG,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YACvC,OAAO,GAAG,CAAC,aAAa,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
@@ -1,19 +1,20 @@
1
1
  import path from "path";
2
2
  import { pathToFileURL } from "url";
3
3
  import { SdServiceServer } from "@simplysm/sd-service-server";
4
- import { createSdWorker, Logger, LoggerSeverity } from "@simplysm/sd-core-node";
4
+ import { createSdWorker, SdLogger, SdLoggerSeverity } from "@simplysm/sd-core-node";
5
5
  import { EventEmitter } from "events";
6
+ import {} from "../types/worker.types";
6
7
  Error.stackTraceLimit = Infinity;
7
8
  EventEmitter.defaultMaxListeners = 0;
8
9
  if (process.env["SD_DEBUG"] != null) {
9
- Logger.setConfig({
10
+ SdLogger.setConfig({
10
11
  console: {
11
- level: LoggerSeverity.debug,
12
+ level: SdLoggerSeverity.debug,
12
13
  },
13
14
  });
14
15
  }
15
16
  else {
16
- Logger.setConfig({
17
+ SdLogger.setConfig({
17
18
  dot: true,
18
19
  });
19
20
  }
@@ -46,4 +47,4 @@ createSdWorker({
46
47
  server.broadcastReload(changedFileSet);
47
48
  },
48
49
  });
49
- //# sourceMappingURL=server-worker.js.map
50
+ //# sourceMappingURL=server.worker.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"server.worker.js","sourceRoot":"","sources":["../../src/workers/server.worker.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAA0B,MAAM,uBAAuB,CAAC;AAE/D,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC;AAErC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;IACpC,QAAQ,CAAC,SAAS,CAAC;QACjB,OAAO,EAAE;YACP,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B;KACF,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,QAAQ,CAAC,SAAS,CAAC;QACjB,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;AACL,CAAC;AAED,IAAI,MAAuB,CAAC;AAE5B,cAAc,CAAoB;IAChC,KAAK,CAAC,MAAM,CAAC,OAA4C;QACvD,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YACtB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAChE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC;YACpE,MAAM,UAAU,GAAG,YAAY,CAAC,OAAsC,CAAC;YACvE,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,4CAA4C,CAAC,CAAC;YAC/E,CAAC;YACD,MAAM,GAAG,UAAU,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,eAAe,CAAC;gBAC3B,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE;gBACvB,QAAQ,EAAE,EAAE;gBACZ,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC;QAED,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IACD,YAAY,CAAC,SAA0C;QACrD,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,eAAe,CAAC,cAA2B;QACzC,MAAM,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;CACF,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@simplysm/sd-cli",
3
- "version": "12.7.4",
3
+ "version": "12.7.6",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -20,18 +20,18 @@
20
20
  "@angular/build": "^18.2.12",
21
21
  "@angular/compiler": "^18.2.13",
22
22
  "@angular/compiler-cli": "^18.2.13",
23
- "@anthropic-ai/sdk": "^0.32.1",
23
+ "@anthropic-ai/sdk": "^0.33.1",
24
24
  "@electron/rebuild": "^3.7.1",
25
- "@simplysm/sd-core-common": "12.7.4",
26
- "@simplysm/sd-core-node": "12.7.4",
27
- "@simplysm/sd-service-server": "12.7.4",
28
- "@simplysm/sd-storage": "12.7.4",
25
+ "@simplysm/sd-core-common": "12.7.6",
26
+ "@simplysm/sd-core-node": "12.7.6",
27
+ "@simplysm/sd-service-server": "12.7.6",
28
+ "@simplysm/sd-storage": "12.7.6",
29
29
  "browserslist": "^4.24.3",
30
30
  "cordova": "^12.0.0",
31
31
  "css-has-pseudo": "^7.0.2",
32
32
  "electron": "^33.3.0",
33
33
  "electron-builder": "^25.1.8",
34
- "esbuild": "^0.24.0",
34
+ "esbuild": "^0.24.2",
35
35
  "eslint": "^9.17.0",
36
36
  "glob": "^11.0.0",
37
37
  "jszip": "^3.10.1",
@@ -1,23 +1,23 @@
1
1
  import { SdProcess } from "@simplysm/sd-core-node";
2
- import { NeverEntryError, StringUtil } from "@simplysm/sd-core-common";
2
+ import { NeverEntryError, StringUtils } from "@simplysm/sd-core-common";
3
3
  import Anthropic from "@anthropic-ai/sdk";
4
4
 
5
- export class SdAiCommand {
6
- static async commitMessageAsync(): Promise<void> {
7
- if (StringUtil.isNullOrEmpty(process.env["ANTHROPIC_API_KEY"])) {
5
+ export class SdCliAiCommand {
6
+ static async commitAsync(): Promise<void> {
7
+ if (StringUtils.isNullOrEmpty(process.env["ANTHROPIC_API_KEY"])) {
8
8
  throw new Error("ANTHROPIC_API_KEY 환경변수가 설정되어 있지 않습니다.");
9
9
  }
10
10
 
11
11
  process.stdout.write("실행중: git add .\n");
12
12
  await SdProcess.spawnAsync("git add .", { cwd: process.cwd() });
13
13
 
14
- process.stdout.write(`실행중: git diff --staged -- . ":(exclude).*/" ":(exclude)_*/ ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"\n`);
14
+ process.stdout.write(`실행중: git diff --staged -- . ":(exclude).*!/" ":(exclude)_*/ ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"\n`);
15
15
  const diff = await SdProcess.spawnAsync(
16
- `git diff --staged -- . ":(exclude).*" ":(exclude)_*" ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"`,
16
+ `git diff --text --staged -- . ":(exclude).*" ":(exclude)_*" ":(exclude)yarn.lock" ":(exclude)packages/*/styles.css"`,
17
17
  { cwd: process.cwd() },
18
18
  );
19
19
 
20
- if (StringUtil.isNullOrEmpty(diff.trim())) {
20
+ if (StringUtils.isNullOrEmpty(diff.trim())) {
21
21
  throw new Error("변경사항이 없습니다.");
22
22
  }
23
23
 
@@ -52,6 +52,16 @@ ${diff}`,
52
52
  if (message.content[0].type !== "text") {
53
53
  throw new NeverEntryError();
54
54
  }
55
- process.stdout.write(message.content[0].text);
55
+ // process.stdout.write(message.content[0].text);
56
+
57
+ const messages = message.content[0].text.matchAll(/```([^`]*)```/g);
58
+ const commitMessage = Array.from(messages).map(item => item[1].trim()).join("\n\n\n");
59
+
60
+ await SdProcess.spawnAsync(
61
+ `git commit -m "${commitMessage.replaceAll(/"/g, "\\\"")}"`,
62
+ { cwd: process.cwd() },
63
+ );
64
+ process.stdout.write("\n\n" + commitMessage + "\n\n");
65
+ process.stdout.write("커밋이 완료되었습니다. 위 커밋메시지가 맘에들지 않을경우, 직접 커밋을 취소하세요.\n");
56
66
  }
57
67
  }
@@ -1,21 +1,21 @@
1
1
  import * as path from "path";
2
- import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
2
+ import { FsUtils, SdLogger, SdProcess } from "@simplysm/sd-core-node";
3
3
  import xml2js from "xml2js";
4
4
  import JSZip from "jszip";
5
- import { INpmConfig } from "../types/common-configs.type";
6
- import { ISdClientBuilderCordovaConfig } from "../types/sd-configs.type";
5
+ import { type INpmConfig } from "../types/common-configs.types";
6
+ import { type ISdClientBuilderCordovaConfig } from "../types/config.types";
7
7
 
8
8
  const BIN_PATH = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
9
9
 
10
10
  export class SdCliCordova {
11
- private _logger = Logger.get(["simplysm", "sd-cli", "SdCliCordova"]);
11
+ private _logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCordova"]);
12
12
 
13
13
  private _platforms: string[];
14
14
  private _npmConfig: INpmConfig;
15
15
 
16
16
  constructor(private readonly _opt: { pkgPath: string; config: ISdClientBuilderCordovaConfig }) {
17
17
  this._platforms = Object.keys(this._opt.config.platform ?? { browser: {} });
18
- this._npmConfig = FsUtil.readJson(path.resolve(this._opt.pkgPath, "package.json"));
18
+ this._npmConfig = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
19
19
  // this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name, this._npmConfig.name]);
20
20
  }
21
21
 
@@ -28,7 +28,7 @@ export class SdCliCordova {
28
28
  public async initializeAsync(): Promise<void> {
29
29
  const cordovaPath = path.resolve(this._opt.pkgPath, ".cordova");
30
30
 
31
- if (FsUtil.exists(cordovaPath)) {
31
+ if (FsUtils.exists(cordovaPath)) {
32
32
  this._logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
33
33
  } else {
34
34
  await this._execAsync(`${BIN_PATH} telemetry on`, this._opt.pkgPath);
@@ -51,13 +51,13 @@ export class SdCliCordova {
51
51
  }
52
52
 
53
53
  // platforms 폴더 혹시 없으면 생성
54
- FsUtil.mkdirs(path.resolve(cordovaPath, "platforms"));
54
+ FsUtils.mkdirs(path.resolve(cordovaPath, "platforms"));
55
55
 
56
56
  // www 폴더 혹시 없으면 생성
57
- FsUtil.mkdirs(path.resolve(cordovaPath, "www"));
57
+ FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
58
58
 
59
59
  // 미설치 빌드 플랫폼 신규 생성
60
- const alreadyPlatforms = FsUtil.readdir(path.resolve(cordovaPath, "platforms"));
60
+ const alreadyPlatforms = FsUtils.readdir(path.resolve(cordovaPath, "platforms"));
61
61
  for (const platform of this._platforms) {
62
62
  if (!alreadyPlatforms.includes(platform)) {
63
63
  // await this._execAsync(`${BIN_PATH} platform add ${platform}`, cordovaPath);
@@ -77,8 +77,8 @@ export class SdCliCordova {
77
77
  }*/
78
78
 
79
79
  // 설치된 미사용 플러그인 삭제
80
- const pluginsFetch = FsUtil.exists(path.resolve(cordovaPath, "plugins/fetch.json"))
81
- ? FsUtil.readJson(path.resolve(cordovaPath, "plugins/fetch.json"))
80
+ const pluginsFetch = FsUtils.exists(path.resolve(cordovaPath, "plugins/fetch.json"))
81
+ ? FsUtils.readJson(path.resolve(cordovaPath, "plugins/fetch.json"))
82
82
  : undefined;
83
83
 
84
84
  const alreadyPlugins: { name: string; id: string }[] = [];
@@ -118,18 +118,18 @@ export class SdCliCordova {
118
118
 
119
119
  // ANDROID SIGN 파일 복사
120
120
  if (this._opt.config.platform?.android?.sign) {
121
- FsUtil.copy(
121
+ FsUtils.copy(
122
122
  path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore),
123
123
  path.resolve(cordovaPath, "android.keystore"),
124
124
  );
125
125
  } else {
126
- FsUtil.remove(path.resolve(cordovaPath, "android.keystore"));
126
+ FsUtils.remove(path.resolve(cordovaPath, "android.keystore"));
127
127
  // SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
128
- FsUtil.remove(path.resolve(cordovaPath, "platforms/android/release-signing.properties"));
128
+ FsUtils.remove(path.resolve(cordovaPath, "platforms/android/release-signing.properties"));
129
129
  }
130
130
 
131
131
  // 빌드 옵션 파일 생성
132
- FsUtil.writeJson(path.resolve(cordovaPath, "build.json"), {
132
+ FsUtils.writeJson(path.resolve(cordovaPath, "build.json"), {
133
133
  ...(this._opt.config.platform?.android
134
134
  ? {
135
135
  android: {
@@ -152,17 +152,17 @@ export class SdCliCordova {
152
152
 
153
153
  // ICON 파일 복사
154
154
  if (this._opt.config.icon != null) {
155
- FsUtil.copy(
155
+ FsUtils.copy(
156
156
  path.resolve(this._opt.pkgPath, this._opt.config.icon),
157
157
  path.resolve(cordovaPath, "res/icons", path.basename(this._opt.config.icon)),
158
158
  );
159
159
  } else {
160
- FsUtil.remove(path.resolve(cordovaPath, "res/icons"));
160
+ FsUtils.remove(path.resolve(cordovaPath, "res/icons"));
161
161
  }
162
162
 
163
163
  // SplashScreen 파일 생성
164
164
  if (this._opt.config.platform?.android && this._opt.config.icon != null) {
165
- FsUtil.writeFile(
165
+ FsUtils.writeFile(
166
166
  path.resolve(cordovaPath, "res/screen/android/splashscreen.xml"),
167
167
  `
168
168
  <?xml version="1.0" encoding="utf-8"?>
@@ -179,12 +179,12 @@ export class SdCliCordova {
179
179
  // CONFIG: 초기값 백업
180
180
  const configFilePath = path.resolve(cordovaPath, "config.xml");
181
181
  const configBackFilePath = path.resolve(cordovaPath, "config.xml.bak");
182
- if (!FsUtil.exists(configBackFilePath)) {
183
- FsUtil.copy(configFilePath, configBackFilePath);
182
+ if (!FsUtils.exists(configBackFilePath)) {
183
+ FsUtils.copy(configFilePath, configBackFilePath);
184
184
  }
185
185
 
186
186
  // CONFIG: 초기값 읽기
187
- const configFileContent = FsUtil.readFile(configBackFilePath);
187
+ const configFileContent = FsUtils.readFile(configBackFilePath);
188
188
  const configXml = await xml2js.parseStringPromise(configFileContent);
189
189
 
190
190
  // CONFIG: 버전 설정
@@ -293,7 +293,7 @@ export class SdCliCordova {
293
293
 
294
294
  // CONFIG: 파일 새로 쓰기
295
295
  const configResultContent = new xml2js.Builder().buildObject(configXml);
296
- FsUtil.writeFile(configFilePath, configResultContent);
296
+ FsUtils.writeFile(configFilePath, configResultContent);
297
297
 
298
298
  //android.json의 undefined 문제 해결
299
299
  /*const androidJsonFilePath = path.resolve(cordovaPath, "platforms/android/android.json");
@@ -329,8 +329,8 @@ export class SdCliCordova {
329
329
  const latestDistApkFileName = path.basename(
330
330
  `${this._opt.config.appName}${this._opt.config.platform!.android!.sign ? "" : "-unsigned"}-latest.apk`,
331
331
  );
332
- FsUtil.mkdirs(targetOutPath);
333
- FsUtil.copy(
332
+ FsUtils.mkdirs(targetOutPath);
333
+ FsUtils.copy(
334
334
  path.resolve(cordovaPath, "platforms/android/app/build/outputs/apk", buildType, apkFileName),
335
335
  path.resolve(targetOutPath, latestDistApkFileName),
336
336
  );
@@ -338,13 +338,13 @@ export class SdCliCordova {
338
338
 
339
339
  // 자동업데이트를 위한 파일 쓰기 (ZIP)
340
340
  const zip = new JSZip();
341
- const wwwFiles = FsUtil.glob(path.resolve(cordovaPath, "www/**/*"), { nodir: true });
341
+ const wwwFiles = FsUtils.glob(path.resolve(cordovaPath, "www/**/*"), { nodir: true });
342
342
  for (const wwwFile of wwwFiles) {
343
343
  const relFilePath = path.relative(path.resolve(cordovaPath, "www"), wwwFile);
344
- const fileBuffer = FsUtil.readFileBuffer(wwwFile);
344
+ const fileBuffer = FsUtils.readFileBuffer(wwwFile);
345
345
  zip.file(relFilePath, fileBuffer);
346
346
  }
347
- const platformWwwFiles = FsUtil.glob(path.resolve(cordovaPath, "platforms", platform, "platform_www/**/*"), {
347
+ const platformWwwFiles = FsUtils.glob(path.resolve(cordovaPath, "platforms", platform, "platform_www/**/*"), {
348
348
  nodir: true,
349
349
  });
350
350
  for (const platformWwwFile of platformWwwFiles) {
@@ -352,11 +352,11 @@ export class SdCliCordova {
352
352
  path.resolve(cordovaPath, "platforms", platform, "platform_www"),
353
353
  platformWwwFile,
354
354
  );
355
- const fileBuffer = FsUtil.readFileBuffer(platformWwwFile);
355
+ const fileBuffer = FsUtils.readFileBuffer(platformWwwFile);
356
356
  zip.file(relFilePath, fileBuffer);
357
357
  }
358
358
 
359
- FsUtil.writeFile(
359
+ FsUtils.writeFile(
360
360
  path.resolve(path.resolve(outPath, platform, "updates"), this._npmConfig.version + ".zip"),
361
361
  await zip.generateAsync({ type: "nodebuffer" }),
362
362
  );
@@ -367,9 +367,9 @@ export class SdCliCordova {
367
367
  const cordovaPath = path.resolve(process.cwd(), `packages/${opt.pkgName}/.cordova/`);
368
368
 
369
369
  if (opt.url !== undefined) {
370
- FsUtil.remove(path.resolve(cordovaPath, "www"));
371
- FsUtil.mkdirs(path.resolve(cordovaPath, "www"));
372
- FsUtil.writeFile(
370
+ FsUtils.remove(path.resolve(cordovaPath, "www"));
371
+ FsUtils.mkdirs(path.resolve(cordovaPath, "www"));
372
+ FsUtils.writeFile(
373
373
  path.resolve(cordovaPath, "www/index.html"),
374
374
  `'${opt.url}'로 이동중... <script>setTimeout(function () {window.location.href = "${opt.url.replace(/\/$/, "")}/${opt.pkgName}/cordova/"}, 3000);</script>`.trim(),
375
375
  );