@simplysm/sd-cli 7.0.249 → 7.0.263
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/README.md +48 -0
- package/dist/bin/sd-cli.mjs +171 -13
- package/dist/build-tool/SdCliElectron.mjs +3 -2
- package/dist/builder/SdCliClientBuilder.mjs +11 -7
- package/dist/builder/SdCliTsLibBuilder.mjs +18 -12
- package/dist/commons.d.ts +6 -1
- package/dist/entry-points/SdCliProjectGenerator.d.ts +37 -0
- package/dist/entry-points/SdCliProjectGenerator.mjs +288 -0
- package/dist/entry-points/SdCliWorkspace.d.ts +6 -6
- package/dist/entry-points/SdCliWorkspace.mjs +61 -107
- package/dist/entry-points/file/base/fc_package_eslintrc.d.ts +3 -0
- package/dist/entry-points/file/base/fc_package_eslintrc.mjs +31 -0
- package/dist/entry-points/file/base/fc_package_npmconfig.d.ts +9 -0
- package/dist/entry-points/file/base/fc_package_npmconfig.mjs +32 -0
- package/dist/entry-points/file/base/fc_package_tsconfig.d.ts +4 -0
- package/dist/entry-points/file/base/fc_package_tsconfig.mjs +12 -0
- package/dist/entry-points/file/client/fc_package_AppModule.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_AppModule.mjs +37 -0
- package/dist/entry-points/file/client/fc_package_AppPage.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_AppPage.mjs +34 -0
- package/dist/entry-points/file/client/fc_package_appicons.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_appicons.mjs +6 -0
- package/dist/entry-points/file/client/fc_package_client_main.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_client_main.mjs +19 -0
- package/dist/entry-points/file/client/fc_package_index.d.ts +3 -0
- package/dist/entry-points/file/client/fc_package_index.mjs +88 -0
- package/dist/entry-points/file/client/fc_package_manifest.d.ts +5 -0
- package/dist/entry-points/file/client/fc_package_manifest.mjs +54 -0
- package/dist/entry-points/file/client/fc_package_polyfills.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_polyfills.mjs +11 -0
- package/dist/entry-points/file/client/fc_package_styles.d.ts +1 -0
- package/dist/entry-points/file/client/fc_package_styles.mjs +7 -0
- package/dist/entry-points/file/db/fc_package_DbContext.d.ts +3 -0
- package/dist/entry-points/file/db/fc_package_DbContext.mjs +14 -0
- package/dist/entry-points/file/db/fc_package_DbModel.d.ts +4 -0
- package/dist/entry-points/file/db/fc_package_DbModel.mjs +12 -0
- package/dist/entry-points/file/project/fc_project_editor_config.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_editor_config.mjs +22 -0
- package/dist/entry-points/file/project/fc_project_eslintrc.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_eslintrc.mjs +30 -0
- package/dist/entry-points/file/project/fc_project_gitattributes.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_gitattributes.mjs +6 -0
- package/dist/entry-points/file/project/fc_project_gitignore.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_gitignore.mjs +17 -0
- package/dist/entry-points/file/project/fc_project_npmconfig.d.ts +7 -0
- package/dist/entry-points/file/project/fc_project_npmconfig.mjs +35 -0
- package/dist/entry-points/file/project/fc_project_readme.d.ts +3 -0
- package/dist/entry-points/file/project/fc_project_readme.mjs +12 -0
- package/dist/entry-points/file/project/fc_project_simplysm.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_simplysm.mjs +2 -0
- package/dist/entry-points/file/project/fc_project_tsconfig.d.ts +1 -0
- package/dist/entry-points/file/project/fc_project_tsconfig.mjs +26 -0
- package/dist/entry-points/file/server/fc_package_server_main.d.ts +4 -0
- package/dist/entry-points/file/server/fc_package_server_main.mjs +60 -0
- package/dist/index.d.ts +23 -0
- package/dist/index.mjs +24 -1
- package/dist/packages/SdCliPackage.d.ts +1 -0
- package/dist/packages/SdCliPackage.mjs +68 -62
- package/dist/utils/SdCliBuildResultUtil.mjs +2 -2
- package/package.json +10 -8
- package/src/bin/sd-cli.ts +198 -12
- package/src/build-tool/SdCliElectron.ts +2 -1
- package/src/builder/SdCliClientBuilder.ts +13 -7
- package/src/builder/SdCliJsLibBuilder.ts +70 -70
- package/src/builder/SdCliTsLibBuilder.ts +450 -445
- package/src/commons.ts +6 -1
- package/src/entry-points/SdCliProjectGenerator.ts +353 -0
- package/src/entry-points/SdCliWorkspace.ts +74 -122
- package/src/entry-points/file/assets/assets/icons/icon-128x128.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-144x144.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-152x152.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-192x192.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-384x384.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-512x512.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-72x72.png +0 -0
- package/src/entry-points/file/assets/assets/icons/icon-96x96.png +0 -0
- package/src/entry-points/file/assets/favicon.ico +0 -0
- package/src/entry-points/file/base/fc_package_eslintrc.ts +30 -0
- package/src/entry-points/file/base/fc_package_npmconfig.ts +43 -0
- package/src/entry-points/file/base/fc_package_tsconfig.ts +11 -0
- package/src/entry-points/file/client/fc_package_AppModule.ts +36 -0
- package/src/entry-points/file/client/fc_package_AppPage.ts +33 -0
- package/src/entry-points/file/client/fc_package_appicons.ts +5 -0
- package/src/entry-points/file/client/fc_package_client_main.ts +18 -0
- package/src/entry-points/file/client/fc_package_index.ts +87 -0
- package/src/entry-points/file/client/fc_package_manifest.ts +53 -0
- package/src/entry-points/file/client/fc_package_polyfills.ts +10 -0
- package/src/entry-points/file/client/fc_package_styles.ts +6 -0
- package/src/entry-points/file/db/fc_package_DbContext.ts +14 -0
- package/src/entry-points/file/db/fc_package_DbModel.ts +11 -0
- package/src/entry-points/file/project/fc_project_editor_config.ts +21 -0
- package/src/entry-points/file/project/fc_project_eslintrc.ts +29 -0
- package/src/entry-points/file/project/fc_project_gitattributes.ts +5 -0
- package/src/entry-points/file/project/fc_project_gitignore.ts +16 -0
- package/src/entry-points/file/project/fc_project_npmconfig.ts +34 -0
- package/src/entry-points/file/project/fc_project_readme.ts +11 -0
- package/src/entry-points/file/project/fc_project_simplysm.ts +1 -0
- package/src/entry-points/file/project/fc_project_tsconfig.ts +25 -0
- package/src/entry-points/file/server/fc_package_server_main.ts +62 -0
- package/src/index.ts +23 -0
- package/src/packages/SdCliPackage.ts +75 -58
- package/src/utils/SdCliBuildResultUtil.ts +76 -76
|
@@ -104,25 +104,31 @@ export class SdCliTsLibBuilder extends EventEmitter {
|
|
|
104
104
|
const watchBuildResults = [];
|
|
105
105
|
this._logger.debug("프로그램 로딩...");
|
|
106
106
|
const watchBuildPack = this._createSdBuildPack(this._parsedTsconfig);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
this.
|
|
107
|
+
const promises = [];
|
|
108
|
+
// 빌드
|
|
109
|
+
promises.push(this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
|
|
110
|
+
// watchBuildResults.push(...await this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
|
|
111
|
+
// 린트
|
|
110
112
|
const lintFilePaths = [
|
|
111
113
|
...watchBuildPack.affectedSourceFiles.map((item) => item.fileName),
|
|
112
114
|
...changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path)
|
|
113
115
|
];
|
|
114
116
|
if (lintFilePaths.length > 0) {
|
|
115
|
-
|
|
117
|
+
promises.push(this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
|
|
118
|
+
// watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
|
|
116
119
|
}
|
|
120
|
+
this._logger.debug("빌드...");
|
|
121
|
+
watchBuildResults.push(...(await Promise.all(promises)).mapMany());
|
|
117
122
|
this._logger.debug("변경감지 대상목록 재구성...");
|
|
118
123
|
const watchRelatedPaths = await this.getAllRelatedPathsAsync();
|
|
119
124
|
watcher.add(watchRelatedPaths);
|
|
120
125
|
this.emit("complete", watchBuildResults);
|
|
121
126
|
});
|
|
122
127
|
this._logger.debug("빌드...");
|
|
123
|
-
const buildResults = await
|
|
124
|
-
|
|
125
|
-
|
|
128
|
+
const buildResults = (await Promise.all([
|
|
129
|
+
this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler),
|
|
130
|
+
this._linter.lintAsync(relatedPaths, buildPack.program)
|
|
131
|
+
].filterExists())).mapMany();
|
|
126
132
|
this._logger.debug("변경감지 대상목록 재구성...");
|
|
127
133
|
const watchRelatedPaths = await this.getAllRelatedPathsAsync();
|
|
128
134
|
watcher.add(watchRelatedPaths);
|
|
@@ -142,11 +148,11 @@ export class SdCliTsLibBuilder extends EventEmitter {
|
|
|
142
148
|
this._logger.debug("프로그램 로딩...");
|
|
143
149
|
const buildPack = this._createSdBuildPack(this._parsedTsconfig);
|
|
144
150
|
this._logger.debug("빌드...");
|
|
145
|
-
const buildResults = await this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler);
|
|
146
|
-
this._logger.debug("린트...");
|
|
147
151
|
const relatedPaths = await this.getAllRelatedPathsAsync();
|
|
148
|
-
|
|
149
|
-
|
|
152
|
+
return (await Promise.all([
|
|
153
|
+
this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler),
|
|
154
|
+
this._linter.lintAsync(relatedPaths, buildPack.program)
|
|
155
|
+
].filterExists())).mapMany();
|
|
150
156
|
}
|
|
151
157
|
async getAllRelatedPathsAsync() {
|
|
152
158
|
const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath);
|
|
@@ -308,4 +314,4 @@ export class SdCliTsLibBuilder extends EventEmitter {
|
|
|
308
314
|
return this._npmConfigMap.get(pkgPath);
|
|
309
315
|
}
|
|
310
316
|
}
|
|
311
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
|
|
317
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/commons.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export interface INpmConfig {
|
|
|
4
4
|
description?: string;
|
|
5
5
|
author?: string;
|
|
6
6
|
license?: string;
|
|
7
|
-
repository
|
|
7
|
+
repository?: {
|
|
8
8
|
type: string;
|
|
9
9
|
url: string;
|
|
10
10
|
directory?: string;
|
|
@@ -27,6 +27,8 @@ export interface INpmConfig {
|
|
|
27
27
|
}
|
|
28
28
|
export interface ITsconfig {
|
|
29
29
|
compilerOptions?: {
|
|
30
|
+
module?: string;
|
|
31
|
+
lib?: string[];
|
|
30
32
|
outDir?: string;
|
|
31
33
|
baseUrl?: string;
|
|
32
34
|
paths?: Record<string, string[]>;
|
|
@@ -102,8 +104,10 @@ export interface ISdCliGithubPublishConfig {
|
|
|
102
104
|
}[];
|
|
103
105
|
}
|
|
104
106
|
export interface ISdCliClientBuilderWebConfig {
|
|
107
|
+
env?: Record<string, string>;
|
|
105
108
|
}
|
|
106
109
|
export interface ISdCliClientBuilderCordovaConfig {
|
|
110
|
+
env?: Record<string, string>;
|
|
107
111
|
appId: string;
|
|
108
112
|
appName: string;
|
|
109
113
|
plugins?: string[];
|
|
@@ -127,4 +131,5 @@ export interface ISdCliClientBuilderElectronConfig {
|
|
|
127
131
|
appId: string;
|
|
128
132
|
icon?: string;
|
|
129
133
|
installerIcon?: string;
|
|
134
|
+
env?: Record<string, string>;
|
|
130
135
|
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export declare class SdCliProjectGenerator {
|
|
2
|
+
private readonly _rootPath;
|
|
3
|
+
private readonly _logger;
|
|
4
|
+
constructor(_rootPath: string);
|
|
5
|
+
initAsync(opt: {
|
|
6
|
+
name?: string;
|
|
7
|
+
description: string;
|
|
8
|
+
author: string;
|
|
9
|
+
gitUrl: string;
|
|
10
|
+
}): Promise<void>;
|
|
11
|
+
addTsLibAsync(opt: {
|
|
12
|
+
name: string;
|
|
13
|
+
description: string;
|
|
14
|
+
useDom: boolean;
|
|
15
|
+
}): Promise<void>;
|
|
16
|
+
addDbLibAsync(opt: {
|
|
17
|
+
name: string;
|
|
18
|
+
}): Promise<void>;
|
|
19
|
+
addDbLibModelAsync(opt: {
|
|
20
|
+
dbPkgName: string;
|
|
21
|
+
category: string;
|
|
22
|
+
name: string;
|
|
23
|
+
description: string;
|
|
24
|
+
}): Promise<void>;
|
|
25
|
+
addServerAsync(opt: {
|
|
26
|
+
name?: string;
|
|
27
|
+
description?: string;
|
|
28
|
+
}): Promise<void>;
|
|
29
|
+
addClientAsync(opt: {
|
|
30
|
+
name: string;
|
|
31
|
+
description: string;
|
|
32
|
+
serverName: string;
|
|
33
|
+
}): Promise<void>;
|
|
34
|
+
private _addPackageBaseTemplate;
|
|
35
|
+
private _addPackageToSimplysmJson;
|
|
36
|
+
private _getProjNpmConfigAsync;
|
|
37
|
+
}
|
|
@@ -0,0 +1,288 @@
|
|
|
1
|
+
import { FsUtil, Logger, SdProcess } from "@simplysm/sd-core-node";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import { StringUtil } from "@simplysm/sd-core-common";
|
|
4
|
+
import { fc_project_editor_config } from "./file/project/fc_project_editor_config";
|
|
5
|
+
import { fc_project_eslintrc } from "./file/project/fc_project_eslintrc";
|
|
6
|
+
import { fc_project_gitignore } from "./file/project/fc_project_gitignore";
|
|
7
|
+
import { fc_project_gitattributes } from "./file/project/fc_project_gitattributes";
|
|
8
|
+
import { fc_project_npmconfig } from "./file/project/fc_project_npmconfig";
|
|
9
|
+
import { fc_project_readme } from "./file/project/fc_project_readme";
|
|
10
|
+
import { fc_project_simplysm } from "./file/project/fc_project_simplysm";
|
|
11
|
+
import { fc_project_tsconfig } from "./file/project/fc_project_tsconfig";
|
|
12
|
+
import { fc_package_eslintrc } from "./file/base/fc_package_eslintrc";
|
|
13
|
+
import { fc_package_npmconfig } from "./file/base/fc_package_npmconfig";
|
|
14
|
+
import { fc_package_tsconfig } from "./file/base/fc_package_tsconfig";
|
|
15
|
+
import { fc_package_DbContext } from "./file/db/fc_package_DbContext";
|
|
16
|
+
import { fc_package_DbModel } from "./file/db/fc_package_DbModel";
|
|
17
|
+
import { fc_package_server_main } from "./file/server/fc_package_server_main";
|
|
18
|
+
import { fc_package_appicons } from "./file/client/fc_package_appicons";
|
|
19
|
+
import { fc_package_AppModule } from "./file/client/fc_package_AppModule";
|
|
20
|
+
import { fc_package_AppPage } from "./file/client/fc_package_AppPage";
|
|
21
|
+
import { fileURLToPath } from "url";
|
|
22
|
+
import { fc_package_index } from "./file/client/fc_package_index";
|
|
23
|
+
import { fc_package_client_main } from "./file/client/fc_package_client_main";
|
|
24
|
+
import { fc_package_manifest } from "./file/client/fc_package_manifest";
|
|
25
|
+
import { fc_package_polyfills } from "./file/client/fc_package_polyfills";
|
|
26
|
+
import { fc_package_styles } from "./file/client/fc_package_styles";
|
|
27
|
+
export class SdCliProjectGenerator {
|
|
28
|
+
constructor(_rootPath) {
|
|
29
|
+
this._rootPath = _rootPath;
|
|
30
|
+
this._logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
|
|
31
|
+
}
|
|
32
|
+
async initAsync(opt) {
|
|
33
|
+
if ((await FsUtil.readdirAsync(this._rootPath)).filter((item) => ![".idea", "package.json", "node_modules", "package-lock.json"].includes(path.basename(item))).length > 0) {
|
|
34
|
+
throw new Error("빈 디렉토리가 아닙니다. (package-lock.json, package.json, node_modules 외의 파일/폴더가 존재하는 경우, 초기화할 수 없습니다.)");
|
|
35
|
+
}
|
|
36
|
+
const projName = opt.name ?? path.basename(this._rootPath);
|
|
37
|
+
this._logger.log("'.editorconfig' 파일 생성");
|
|
38
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".editorconfig"), fc_project_editor_config());
|
|
39
|
+
this._logger.log(`[${projName}] '.eslintrc.cjs' 파일 생성`);
|
|
40
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".eslintrc.cjs"), fc_project_eslintrc());
|
|
41
|
+
this._logger.log(`[${projName}]'.gitattributes' 파일 생성`);
|
|
42
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".gitattributes"), fc_project_gitattributes());
|
|
43
|
+
this._logger.log(`[${projName}] '.gitignore' 파일 생성`);
|
|
44
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, ".gitignore"), fc_project_gitignore());
|
|
45
|
+
this._logger.log(`[${projName}] 'package.json' 파일 생성`);
|
|
46
|
+
let cliVersion;
|
|
47
|
+
if (FsUtil.exists(path.resolve(this._rootPath, "package.json"))) {
|
|
48
|
+
const npmConfig = await FsUtil.readJsonAsync(path.resolve(this._rootPath, "package.json"));
|
|
49
|
+
cliVersion = npmConfig.dependencies?.["@simplysm/sd-cli"];
|
|
50
|
+
}
|
|
51
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, "package.json"), fc_project_npmconfig({
|
|
52
|
+
name: projName,
|
|
53
|
+
description: opt.description,
|
|
54
|
+
author: opt.author,
|
|
55
|
+
gitUrl: opt.gitUrl,
|
|
56
|
+
cliVersion
|
|
57
|
+
}));
|
|
58
|
+
this._logger.log(`[${projName}] 'README.md' 파일 생성`);
|
|
59
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, "README.md"), fc_project_readme({
|
|
60
|
+
description: opt.description
|
|
61
|
+
}));
|
|
62
|
+
this._logger.log(`[${projName}] 'simplysm.json' 파일 생성`);
|
|
63
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, "simplysm.json"), fc_project_simplysm());
|
|
64
|
+
this._logger.log(`[${projName}] 'tsconfig.json' 파일 생성`);
|
|
65
|
+
await FsUtil.writeFileAsync(path.resolve(this._rootPath, "tsconfig.json"), fc_project_tsconfig());
|
|
66
|
+
this._logger.log(`[${projName}] 'packages' 디렉토리 생성`);
|
|
67
|
+
await FsUtil.mkdirsAsync(path.resolve(this._rootPath, "packages"));
|
|
68
|
+
this._logger.log(`[${projName}] npm install`);
|
|
69
|
+
await SdProcess.spawnAsync("npm install", { cwd: this._rootPath }, true);
|
|
70
|
+
}
|
|
71
|
+
async addTsLibAsync(opt) {
|
|
72
|
+
await this._addPackageBaseTemplate({
|
|
73
|
+
...opt,
|
|
74
|
+
isModule: true,
|
|
75
|
+
isForAngular: false,
|
|
76
|
+
types: "dist/index.d.ts",
|
|
77
|
+
main: "dist/index.mjs",
|
|
78
|
+
dependencies: {}
|
|
79
|
+
});
|
|
80
|
+
this._logger.log(`[${opt.name}] 'simplysm.json' 파일에 등록`);
|
|
81
|
+
await this._addPackageToSimplysmJson({
|
|
82
|
+
name: opt.name,
|
|
83
|
+
type: "library",
|
|
84
|
+
useAutoIndex: true
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
async addDbLibAsync(opt) {
|
|
88
|
+
const pkgName = "db-" + opt.name;
|
|
89
|
+
const pkgPath = path.resolve(this._rootPath, "packages", pkgName);
|
|
90
|
+
const projNpmConfig = await this._getProjNpmConfigAsync();
|
|
91
|
+
const projName = projNpmConfig.name;
|
|
92
|
+
await this._addPackageBaseTemplate({
|
|
93
|
+
name: pkgName,
|
|
94
|
+
description: "DB " + opt.name.toUpperCase(),
|
|
95
|
+
useDom: false,
|
|
96
|
+
isModule: false,
|
|
97
|
+
isForAngular: false,
|
|
98
|
+
types: "dist/index.d.ts",
|
|
99
|
+
main: "dist/index.cjs",
|
|
100
|
+
dependencies: {
|
|
101
|
+
"@simplysm/sd-core-common": "~7.0.0",
|
|
102
|
+
"@simplysm/sd-orm-common": "~7.0.0"
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
this._logger.log(`[${pkgName}] 'src/${StringUtil.toPascalCase(opt.name)}DbContext.ts' 파일 생성`);
|
|
106
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, `src/${StringUtil.toPascalCase(opt.name)}DbContext.ts`), fc_package_DbContext({
|
|
107
|
+
name: opt.name
|
|
108
|
+
}));
|
|
109
|
+
this._logger.log(`[${pkgName}] 'src/models' 디렉토리 생성`);
|
|
110
|
+
await FsUtil.mkdirsAsync(path.resolve(pkgPath, "src/models"));
|
|
111
|
+
this._logger.log(`[${pkgName}] 'simplysm.json' 파일에 등록`);
|
|
112
|
+
await this._addPackageToSimplysmJson({
|
|
113
|
+
name: pkgName,
|
|
114
|
+
type: "library",
|
|
115
|
+
useAutoIndex: true
|
|
116
|
+
});
|
|
117
|
+
this._logger.log(`[${projName}] npm install`);
|
|
118
|
+
await SdProcess.spawnAsync("npm install", { cwd: this._rootPath }, true);
|
|
119
|
+
}
|
|
120
|
+
async addDbLibModelAsync(opt) {
|
|
121
|
+
const pkgName = "db-" + opt.dbPkgName;
|
|
122
|
+
const pkgPath = path.resolve(this._rootPath, "packages", pkgName);
|
|
123
|
+
this._logger.log(`[${pkgName}] 'src/models/${opt.category}/${opt.name}.ts' 파일 생성`);
|
|
124
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, `src/models/${opt.category}/${opt.name}.ts`), fc_package_DbModel({
|
|
125
|
+
name: opt.name,
|
|
126
|
+
description: opt.description
|
|
127
|
+
}));
|
|
128
|
+
this._logger.log(`[${pkgName}] DbContext 파일에 등록`);
|
|
129
|
+
let dbContextContent = await FsUtil.readFileAsync(path.resolve(pkgPath, `src/${StringUtil.toPascalCase(opt.dbPkgName)}DbContext.ts`));
|
|
130
|
+
if (!dbContextContent.includes(`Queryable`)) {
|
|
131
|
+
this._logger.log(`[${pkgName}] DbContext 파일에 등록: import: Queryable`);
|
|
132
|
+
dbContextContent = dbContextContent.replace(/ } from "@simplysm\/sd-orm-common";/, `, Queryable } from "@simplysm/sd-orm-common";`);
|
|
133
|
+
}
|
|
134
|
+
this._logger.log(`[${pkgName}] DbContext 파일에 등록: import: MODEL`);
|
|
135
|
+
dbContextContent = `import { ${opt.name} } from "./models/${opt.category}/${opt.name}";\n` + dbContextContent;
|
|
136
|
+
if (!dbContextContent.includes(`//-- ${opt.category}\n`)) {
|
|
137
|
+
this._logger.log(`[${opt.name}] DbContext 파일에 등록: CATEGORY`);
|
|
138
|
+
dbContextContent = dbContextContent.replace(/\n}/, `\n\n //-- ${opt.category}\n}`);
|
|
139
|
+
}
|
|
140
|
+
this._logger.log(`[${pkgName}] DbContext 파일에 등록: MODEL`);
|
|
141
|
+
dbContextContent = dbContextContent.replace(new RegExp(`//-- ${opt.category}\n`), `
|
|
142
|
+
//-- ${opt.category}
|
|
143
|
+
public readonly ${StringUtil.toCamelCase(opt.name)} = new Queryable(this, ${opt.name});
|
|
144
|
+
`.trim() + "\n");
|
|
145
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, `src/${StringUtil.toPascalCase(opt.dbPkgName)}DbContext.ts`), dbContextContent);
|
|
146
|
+
}
|
|
147
|
+
async addServerAsync(opt) {
|
|
148
|
+
const pkgName = "server" + (opt.name === undefined ? "" : `-${opt.name}`);
|
|
149
|
+
const pkgPath = path.resolve(this._rootPath, "packages", pkgName);
|
|
150
|
+
const projNpmConfig = await this._getProjNpmConfigAsync();
|
|
151
|
+
const projName = projNpmConfig.name;
|
|
152
|
+
await this._addPackageBaseTemplate({
|
|
153
|
+
name: pkgName,
|
|
154
|
+
description: (opt.description === undefined ? "" : `${opt.description.toUpperCase()} `) + "서버",
|
|
155
|
+
useDom: false,
|
|
156
|
+
isModule: false,
|
|
157
|
+
isForAngular: false,
|
|
158
|
+
main: "dist/main.js",
|
|
159
|
+
dependencies: {
|
|
160
|
+
"@simplysm/sd-core-common": "~7.0.0",
|
|
161
|
+
"@simplysm/sd-core-node": "~7.0.0",
|
|
162
|
+
"@simplysm/sd-service-common": "~7.0.0",
|
|
163
|
+
"@simplysm/sd-service-server": "~7.0.0"
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
this._logger.log(`[${pkgName}] 'src/main.ts' 파일 등록`);
|
|
167
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, `src/main.ts`), fc_package_server_main({
|
|
168
|
+
projPath: this._rootPath,
|
|
169
|
+
pkgName: pkgName
|
|
170
|
+
}));
|
|
171
|
+
this._logger.log(`[${pkgName}] 'simplysm.json' 파일에 등록`);
|
|
172
|
+
await this._addPackageToSimplysmJson({
|
|
173
|
+
name: pkgName,
|
|
174
|
+
type: "server",
|
|
175
|
+
useAutoIndex: false
|
|
176
|
+
});
|
|
177
|
+
this._logger.log(`[${projName}] npm install`);
|
|
178
|
+
await SdProcess.spawnAsync("npm install", { cwd: this._rootPath }, true);
|
|
179
|
+
}
|
|
180
|
+
async addClientAsync(opt) {
|
|
181
|
+
const pkgName = `client-${opt.name}`;
|
|
182
|
+
const pkgPath = path.resolve(this._rootPath, "packages", pkgName);
|
|
183
|
+
const projNpmConfig = await this._getProjNpmConfigAsync();
|
|
184
|
+
const projName = projNpmConfig.name;
|
|
185
|
+
await this._addPackageBaseTemplate({
|
|
186
|
+
name: pkgName,
|
|
187
|
+
description: `${opt.description} 클라이언트`,
|
|
188
|
+
useDom: true,
|
|
189
|
+
isModule: true,
|
|
190
|
+
isForAngular: true,
|
|
191
|
+
dependencies: {
|
|
192
|
+
"@angular/common": "^13.2.0",
|
|
193
|
+
"@angular/core": "^13.2.0",
|
|
194
|
+
"@angular/platform-browser": "^13.2.0",
|
|
195
|
+
"@angular/platform-browser-dynamic": "^13.2.0",
|
|
196
|
+
"@fortawesome/angular-fontawesome": "^0.10.2",
|
|
197
|
+
"@fortawesome/fontawesome-svg-core": "^6.1.0",
|
|
198
|
+
"@fortawesome/free-brands-svg-icons": "^6.1.0",
|
|
199
|
+
"@fortawesome/pro-duotone-svg-icons": "^6.1.0",
|
|
200
|
+
"@fortawesome/pro-light-svg-icons": "^6.1.0",
|
|
201
|
+
"@fortawesome/pro-regular-svg-icons": "^6.1.0",
|
|
202
|
+
"@fortawesome/pro-solid-svg-icons": "^6.1.0",
|
|
203
|
+
"@simplysm/sd-angular": "~7.0.0",
|
|
204
|
+
"@simplysm/sd-core-browser": "~7.0.0",
|
|
205
|
+
"@simplysm/sd-core-common": "~7.0.0",
|
|
206
|
+
"rxjs": "^6.6.7",
|
|
207
|
+
"zone.js": "~0.11.4"
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
this._logger.log(`[${pkgName}] 'src/app-icons.ts' 파일 등록`);
|
|
211
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/app-icons.ts"), fc_package_appicons());
|
|
212
|
+
this._logger.log(`[${pkgName}] 'src/AppModule.ts' 파일 등록`);
|
|
213
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/AppModule.ts"), fc_package_AppModule());
|
|
214
|
+
this._logger.log(`[${pkgName}] 'src/AppPage.ts' 파일 등록`);
|
|
215
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/AppPage.ts"), fc_package_AppPage());
|
|
216
|
+
this._logger.log(`[${pkgName}] 'src/index.html' 파일 등록`);
|
|
217
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/index.html"), fc_package_index({
|
|
218
|
+
description: opt.description
|
|
219
|
+
}));
|
|
220
|
+
this._logger.log(`[${pkgName}] 'src/main.ts' 파일 등록`);
|
|
221
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/main.ts"), fc_package_client_main());
|
|
222
|
+
this._logger.log(`[${pkgName}] 'src/manifest.json' 파일 등록`);
|
|
223
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/manifest.json"), fc_package_manifest({
|
|
224
|
+
description: projNpmConfig.description,
|
|
225
|
+
author: projNpmConfig.author,
|
|
226
|
+
version: projNpmConfig.version
|
|
227
|
+
}));
|
|
228
|
+
this._logger.log(`[${pkgName}] 'src/polyfills.ts' 파일 등록`);
|
|
229
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/polyfills.ts"), fc_package_polyfills());
|
|
230
|
+
this._logger.log(`[${pkgName}] 'src/styles.scss' 파일 등록`);
|
|
231
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "src/styles.scss"), fc_package_styles());
|
|
232
|
+
this._logger.log(`[${pkgName}] 'src/assets' 파일 복사`);
|
|
233
|
+
await FsUtil.copyAsync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), "file/assets"), path.resolve(pkgPath, "src"));
|
|
234
|
+
await this._addPackageToSimplysmJson({
|
|
235
|
+
name: pkgName,
|
|
236
|
+
type: "client",
|
|
237
|
+
useAutoIndex: false,
|
|
238
|
+
serverName: opt.serverName
|
|
239
|
+
});
|
|
240
|
+
this._logger.log(`[${projName}] npm install`);
|
|
241
|
+
await SdProcess.spawnAsync("npm install", { cwd: this._rootPath }, true);
|
|
242
|
+
}
|
|
243
|
+
async _addPackageBaseTemplate(opt) {
|
|
244
|
+
const pkgPath = path.resolve(this._rootPath, "packages", opt.name);
|
|
245
|
+
this._logger.log(`[${opt.name}] '.eslintrc.cjs' 파일 생성`);
|
|
246
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, ".eslintrc.cjs"), fc_package_eslintrc({
|
|
247
|
+
isForAngular: opt.isForAngular
|
|
248
|
+
}));
|
|
249
|
+
this._logger.log(`[${opt.name}] 'package.json' 파일 생성`);
|
|
250
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "package.json"), fc_package_npmconfig({
|
|
251
|
+
projPath: this._rootPath,
|
|
252
|
+
name: opt.name,
|
|
253
|
+
description: opt.description,
|
|
254
|
+
isModule: opt.isModule,
|
|
255
|
+
main: opt.main,
|
|
256
|
+
types: opt.types,
|
|
257
|
+
dependencies: opt.dependencies
|
|
258
|
+
}));
|
|
259
|
+
this._logger.log(`[${opt.name}] 'tsconfig.json' 파일 생성`);
|
|
260
|
+
await FsUtil.writeFileAsync(path.resolve(pkgPath, "tsconfig.json"), fc_package_tsconfig({
|
|
261
|
+
isModule: opt.isModule,
|
|
262
|
+
useDom: opt.useDom
|
|
263
|
+
}));
|
|
264
|
+
this._logger.log(`[${opt.name}] 'src' 디렉토리 생성`);
|
|
265
|
+
await FsUtil.mkdirsAsync(path.resolve(pkgPath, "src"));
|
|
266
|
+
}
|
|
267
|
+
async _addPackageToSimplysmJson(opt) {
|
|
268
|
+
const config = await FsUtil.readJsonAsync(path.resolve(this._rootPath, "simplysm.json"));
|
|
269
|
+
config.packages = config.packages ?? {};
|
|
270
|
+
config.packages[opt.name] = {
|
|
271
|
+
type: opt.type,
|
|
272
|
+
...opt.useAutoIndex ? { autoIndex: {} } : {},
|
|
273
|
+
...opt.serverName !== undefined ? { server: opt.serverName } : {}
|
|
274
|
+
};
|
|
275
|
+
await FsUtil.writeJsonAsync(path.resolve(this._rootPath, "simplysm.json"), config, { space: 2 });
|
|
276
|
+
}
|
|
277
|
+
async _getProjNpmConfigAsync() {
|
|
278
|
+
const projNpmConfig = await FsUtil.readJsonAsync(path.resolve(this._rootPath, "package.json"));
|
|
279
|
+
if (projNpmConfig.description === undefined) {
|
|
280
|
+
throw new Error("프로젝트 package.json 파일에 description 이 설정되어있지 않습니다.");
|
|
281
|
+
}
|
|
282
|
+
if (projNpmConfig.author === undefined) {
|
|
283
|
+
throw new Error("프로젝트 package.json 파일에 author 가 설정되어있지 않습니다.");
|
|
284
|
+
}
|
|
285
|
+
return projNpmConfig;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliProjectGenerator.js","sourceRoot":"","sources":["../../src/entry-points/SdCliProjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,23 +9,23 @@ export declare class SdCliWorkspace {
|
|
|
9
9
|
optNames: string[];
|
|
10
10
|
pkgs: string[];
|
|
11
11
|
}): Promise<void>;
|
|
12
|
-
private _runServerWorkerAsync;
|
|
13
|
-
private _reloadServerWorkerPathProxyAsync;
|
|
14
|
-
private _sendServerWorkerBroadcastReloadAsync;
|
|
15
|
-
private _isServerRestarting;
|
|
16
|
-
private _restartServerAsync;
|
|
17
12
|
buildAsync(opt: {
|
|
18
13
|
confFileRelPath: string;
|
|
19
14
|
optNames: string[];
|
|
20
15
|
pkgs: string[];
|
|
21
16
|
}): Promise<void>;
|
|
22
|
-
private _buildPkgsAsync;
|
|
23
17
|
publishAsync(opt: {
|
|
24
18
|
noBuild: boolean;
|
|
25
19
|
confFileRelPath: string;
|
|
26
20
|
optNames: string[];
|
|
27
21
|
pkgs: string[];
|
|
28
22
|
}): Promise<void>;
|
|
23
|
+
private _runServerWorkerAsync;
|
|
24
|
+
private _reloadServerWorkerPathProxyAsync;
|
|
25
|
+
private _sendServerWorkerBroadcastReloadAsync;
|
|
26
|
+
private _isServerRestarting;
|
|
27
|
+
private _restartServerAsync;
|
|
28
|
+
private _buildPkgsAsync;
|
|
29
29
|
private _upgradeVersionAsync;
|
|
30
30
|
private _waitSecMessageAsync;
|
|
31
31
|
private _getPackagesAsync;
|