@simplysm/sd-cli 12.10.37 → 12.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js +29 -16
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js.map +1 -1
- package/dist/sd-cli.js +1 -0
- package/dist/sd-cli.js.map +1 -1
- package/package.json +6 -6
- package/src/pkg-builders/lib/sd-cli-db-context.file-generator.ts +39 -34
- package/src/sd-cli.ts +1 -0
|
@@ -16,15 +16,17 @@ export class SdCliDbContextFileGenerator {
|
|
|
16
16
|
const targetFilePath = path.resolve(pkgPath, `src/${kebabName}.ts`);
|
|
17
17
|
const importTexts = [];
|
|
18
18
|
if (useExt) {
|
|
19
|
-
importTexts.push(
|
|
19
|
+
importTexts.push('import { DbContextExt } from "@simplysm/sd-orm-common-ext";');
|
|
20
20
|
}
|
|
21
21
|
else {
|
|
22
|
-
importTexts.push(
|
|
22
|
+
importTexts.push('import { DbContext } from "@simplysm/sd-orm-common";');
|
|
23
23
|
}
|
|
24
24
|
// Migrations
|
|
25
25
|
const migTexts = [];
|
|
26
26
|
{
|
|
27
|
-
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/migrations/**/*.ts"), {
|
|
27
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/migrations/**/*.ts"), {
|
|
28
|
+
nodir: true,
|
|
29
|
+
});
|
|
28
30
|
for (const filePath of filePaths.orderBy()) {
|
|
29
31
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
30
32
|
.replace(/\.tsx?$/, "")
|
|
@@ -47,7 +49,20 @@ export class SdCliDbContextFileGenerator {
|
|
|
47
49
|
const varName = fileName.includes("_") ? fileName : StringUtils.toCamelCase(fileName);
|
|
48
50
|
const className = fileName.includes("_") ? fileName : StringUtils.toPascalCase(fileName);
|
|
49
51
|
importTexts.push(`import { ${className} } from "./${requirePath}";`);
|
|
50
|
-
|
|
52
|
+
if (useExt &&
|
|
53
|
+
[
|
|
54
|
+
"systemDataLog",
|
|
55
|
+
"systemErrorLog",
|
|
56
|
+
"authentication",
|
|
57
|
+
"user",
|
|
58
|
+
"userConfig",
|
|
59
|
+
"userPermission",
|
|
60
|
+
].includes(varName)) {
|
|
61
|
+
modelTexts.push(`override ${varName} = new Queryable(this, ${className})`);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
modelTexts.push(`${varName} = new Queryable(this, ${className})`);
|
|
65
|
+
}
|
|
51
66
|
}
|
|
52
67
|
}
|
|
53
68
|
// Views
|
|
@@ -68,7 +83,9 @@ export class SdCliDbContextFileGenerator {
|
|
|
68
83
|
// Stored Procedures
|
|
69
84
|
const spTexts = [];
|
|
70
85
|
{
|
|
71
|
-
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/stored-procedures/**/*.ts"), {
|
|
86
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/stored-procedures/**/*.ts"), {
|
|
87
|
+
nodir: true,
|
|
88
|
+
});
|
|
72
89
|
for (const filePath of filePaths.orderBy()) {
|
|
73
90
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
74
91
|
.replace(/\.tsx?$/, "")
|
|
@@ -81,25 +98,21 @@ export class SdCliDbContextFileGenerator {
|
|
|
81
98
|
}
|
|
82
99
|
}
|
|
83
100
|
importTexts.push(...[
|
|
84
|
-
`import { IDbMigration${modelTexts.length > 0 || viewTexts.length > 0
|
|
85
|
-
|
|
86
|
-
: ""}${spTexts.length > 0
|
|
87
|
-
? ", StoredProcedure"
|
|
88
|
-
: ""} } from "@simplysm/sd-orm-common";`,
|
|
89
|
-
"import { Type } from \"@simplysm/sd-core-common\";",
|
|
101
|
+
`import { IDbMigration${modelTexts.length > 0 || viewTexts.length > 0 ? ", Queryable" : ""}${spTexts.length > 0 ? ", StoredProcedure" : ""} } from "@simplysm/sd-orm-common";`,
|
|
102
|
+
'import { Type } from "@simplysm/sd-core-common";',
|
|
90
103
|
]);
|
|
91
104
|
const content = `
|
|
92
105
|
${importTexts.join("\n")}
|
|
93
106
|
|
|
94
|
-
export class
|
|
107
|
+
export class ${StringUtils.toPascalCase(kebabName)} extends DbContext${useExt ? "Ext" : ""} {
|
|
95
108
|
get migrations(): Type<IDbMigration>[] {
|
|
96
109
|
return [
|
|
97
|
-
${migTexts.map(item => " " + item).join("\n")}
|
|
110
|
+
${migTexts.map((item) => " " + item).join("\n")}
|
|
98
111
|
];
|
|
99
112
|
}
|
|
100
|
-
${
|
|
101
|
-
${
|
|
102
|
-
${spTexts.length > 0 ? "\n // StoredProcedures\n" + spTexts.map(item => " " + item).join("\n") : ""}
|
|
113
|
+
${modelTexts.length > 0 ? "\n // Models\n" + modelTexts.map((item) => " " + item).join("\n") : ""}
|
|
114
|
+
${viewTexts.length > 0 ? "\n // Views\n" + viewTexts.map((item) => " " + item).join("\n") : ""}
|
|
115
|
+
${spTexts.length > 0 ? "\n // StoredProcedures\n" + spTexts.map((item) => " " + item).join("\n") : ""}
|
|
103
116
|
}
|
|
104
117
|
`.trim();
|
|
105
118
|
if (content.trim() !== cache?.trim()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,MAAM,OAAO,2BAA2B;IACtC,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,SAAiB;QAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,SAAS,KAAK,CAAC,CAAC;QACpE,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE1F,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE;YAC7E,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,OAAe,EAAE,SAAiB,EAAE,KAAc;QAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAe,CAAC;QACxF,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,6BAA6B,CAAC,IAAI,IAAI,CAAC;QAE/E,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,SAAS,KAAK,CAAC,CAAC;QAEpE,MAAM,WAAW,GAAa,EAAE,CAAC;QAEjC,IAAI,MAAM,EAAE,CAAC;YACX,WAAW,CAAC,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"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"}
|
package/dist/sd-cli.js
CHANGED
package/dist/sd-cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli.js","sourceRoot":"","sources":["../src/sd-cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sd-cli.js","sourceRoot":"","sources":["../src/sd-cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.11.2",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -17,16 +17,16 @@
|
|
|
17
17
|
"@angular/compiler-cli": "^19.2.13",
|
|
18
18
|
"@anthropic-ai/sdk": "^0.52.0",
|
|
19
19
|
"@electron/rebuild": "^4.0.1",
|
|
20
|
-
"@simplysm/sd-core-common": "12.
|
|
21
|
-
"@simplysm/sd-core-node": "12.
|
|
22
|
-
"@simplysm/sd-service-server": "12.
|
|
23
|
-
"@simplysm/sd-storage": "12.
|
|
20
|
+
"@simplysm/sd-core-common": "12.11.2",
|
|
21
|
+
"@simplysm/sd-core-node": "12.11.2",
|
|
22
|
+
"@simplysm/sd-service-server": "12.11.2",
|
|
23
|
+
"@simplysm/sd-storage": "12.11.2",
|
|
24
24
|
"browserslist": "^4.24.5",
|
|
25
25
|
"cordova": "^12.0.0",
|
|
26
26
|
"css-has-pseudo": "^7.0.2",
|
|
27
27
|
"electron": "^36.3.1",
|
|
28
28
|
"electron-builder": "26.0.15",
|
|
29
|
-
"esbuild": "^0.25.
|
|
29
|
+
"esbuild": "^0.25.5",
|
|
30
30
|
"eslint": "^9.27.0",
|
|
31
31
|
"glob": "^11.0.2",
|
|
32
32
|
"node-stdlib-browser": "^1.3.1",
|
|
@@ -24,19 +24,17 @@ export class SdCliDbContextFileGenerator {
|
|
|
24
24
|
const importTexts: string[] = [];
|
|
25
25
|
|
|
26
26
|
if (useExt) {
|
|
27
|
-
importTexts.push(
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
importTexts.push("import { DbContext } from \"@simplysm/sd-orm-common\";");
|
|
27
|
+
importTexts.push('import { DbContextExt } from "@simplysm/sd-orm-common-ext";');
|
|
28
|
+
} else {
|
|
29
|
+
importTexts.push('import { DbContext } from "@simplysm/sd-orm-common";');
|
|
31
30
|
}
|
|
32
31
|
|
|
33
32
|
// Migrations
|
|
34
33
|
const migTexts: string[] = [];
|
|
35
34
|
{
|
|
36
|
-
const filePaths = FsUtils.glob(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
);
|
|
35
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/migrations/**/*.ts"), {
|
|
36
|
+
nodir: true,
|
|
37
|
+
});
|
|
40
38
|
|
|
41
39
|
for (const filePath of filePaths.orderBy()) {
|
|
42
40
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
@@ -54,10 +52,7 @@ export class SdCliDbContextFileGenerator {
|
|
|
54
52
|
// Models
|
|
55
53
|
const modelTexts: string[] = [];
|
|
56
54
|
{
|
|
57
|
-
const filePaths = FsUtils.glob(
|
|
58
|
-
path.resolve(pkgPath, "src/models/**/*.ts"),
|
|
59
|
-
{ nodir: true },
|
|
60
|
-
);
|
|
55
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/models/**/*.ts"), { nodir: true });
|
|
61
56
|
|
|
62
57
|
for (const filePath of filePaths.orderBy()) {
|
|
63
58
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
@@ -69,17 +64,28 @@ export class SdCliDbContextFileGenerator {
|
|
|
69
64
|
const className = fileName.includes("_") ? fileName : StringUtils.toPascalCase(fileName);
|
|
70
65
|
|
|
71
66
|
importTexts.push(`import { ${className} } from "./${requirePath}";`);
|
|
72
|
-
|
|
67
|
+
if (
|
|
68
|
+
useExt &&
|
|
69
|
+
[
|
|
70
|
+
"systemDataLog",
|
|
71
|
+
"systemErrorLog",
|
|
72
|
+
"authentication",
|
|
73
|
+
"user",
|
|
74
|
+
"userConfig",
|
|
75
|
+
"userPermission",
|
|
76
|
+
].includes(varName)
|
|
77
|
+
) {
|
|
78
|
+
modelTexts.push(`override ${varName} = new Queryable(this, ${className})`);
|
|
79
|
+
} else {
|
|
80
|
+
modelTexts.push(`${varName} = new Queryable(this, ${className})`);
|
|
81
|
+
}
|
|
73
82
|
}
|
|
74
83
|
}
|
|
75
84
|
|
|
76
85
|
// Views
|
|
77
86
|
const viewTexts: string[] = [];
|
|
78
87
|
{
|
|
79
|
-
const filePaths = FsUtils.glob(
|
|
80
|
-
path.resolve(pkgPath, "src/views/**/*.ts"),
|
|
81
|
-
{ nodir: true },
|
|
82
|
-
);
|
|
88
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/views/**/*.ts"), { nodir: true });
|
|
83
89
|
|
|
84
90
|
for (const filePath of filePaths.orderBy()) {
|
|
85
91
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
@@ -98,10 +104,9 @@ export class SdCliDbContextFileGenerator {
|
|
|
98
104
|
// Stored Procedures
|
|
99
105
|
const spTexts: string[] = [];
|
|
100
106
|
{
|
|
101
|
-
const filePaths = FsUtils.glob(
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
);
|
|
107
|
+
const filePaths = FsUtils.glob(path.resolve(pkgPath, "src/stored-procedures/**/*.ts"), {
|
|
108
|
+
nodir: true,
|
|
109
|
+
});
|
|
105
110
|
|
|
106
111
|
for (const filePath of filePaths.orderBy()) {
|
|
107
112
|
const requirePath = PathUtils.posix(path.relative(path.dirname(targetFilePath), filePath))
|
|
@@ -117,27 +122,27 @@ export class SdCliDbContextFileGenerator {
|
|
|
117
122
|
}
|
|
118
123
|
}
|
|
119
124
|
|
|
120
|
-
importTexts.push(
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
? ", StoredProcedure"
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
importTexts.push(
|
|
126
|
+
...[
|
|
127
|
+
`import { IDbMigration${
|
|
128
|
+
modelTexts.length > 0 || viewTexts.length > 0 ? ", Queryable" : ""
|
|
129
|
+
}${spTexts.length > 0 ? ", StoredProcedure" : ""} } from "@simplysm/sd-orm-common";`,
|
|
130
|
+
'import { Type } from "@simplysm/sd-core-common";',
|
|
131
|
+
],
|
|
132
|
+
);
|
|
128
133
|
|
|
129
134
|
const content = `
|
|
130
135
|
${importTexts.join("\n")}
|
|
131
136
|
|
|
132
|
-
export class
|
|
137
|
+
export class ${StringUtils.toPascalCase(kebabName)} extends DbContext${useExt ? "Ext" : ""} {
|
|
133
138
|
get migrations(): Type<IDbMigration>[] {
|
|
134
139
|
return [
|
|
135
|
-
${migTexts.map(item => " " + item).join("\n")}
|
|
140
|
+
${migTexts.map((item) => " " + item).join("\n")}
|
|
136
141
|
];
|
|
137
142
|
}
|
|
138
|
-
${
|
|
139
|
-
${
|
|
140
|
-
${spTexts.length > 0 ? "\n // StoredProcedures\n" + spTexts.map(item => " " + item).join("\n") : ""}
|
|
143
|
+
${modelTexts.length > 0 ? "\n // Models\n" + modelTexts.map((item) => " " + item).join("\n") : ""}
|
|
144
|
+
${viewTexts.length > 0 ? "\n // Views\n" + viewTexts.map((item) => " " + item).join("\n") : ""}
|
|
145
|
+
${spTexts.length > 0 ? "\n // StoredProcedures\n" + spTexts.map((item) => " " + item).join("\n") : ""}
|
|
141
146
|
}
|
|
142
147
|
`.trim();
|
|
143
148
|
if (content.trim() !== cache?.trim()) {
|