sonamu 0.2.37 → 0.2.38
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/.pnp.cjs +2117 -86
- package/dist/api/decorators.js +5 -2
- package/dist/api/decorators.js.map +1 -1
- package/dist/api/sonamu.js +3 -3
- package/dist/api/sonamu.js.map +1 -1
- package/dist/bin/cli-wrapper.d.ts +3 -0
- package/dist/bin/cli-wrapper.d.ts.map +1 -0
- package/dist/bin/cli-wrapper.js +27 -0
- package/dist/bin/cli-wrapper.js.map +1 -0
- package/dist/bin/cli.js +10 -10
- package/dist/bin/cli.js.map +1 -1
- package/dist/database/base-model.d.ts.map +1 -1
- package/dist/database/base-model.js +14 -13
- package/dist/database/base-model.js.map +1 -1
- package/dist/database/db.js +1 -1
- package/dist/database/db.js.map +1 -1
- package/dist/database/upsert-builder.js +8 -5
- package/dist/database/upsert-builder.js.map +1 -1
- package/dist/entity/entity-manager.d.ts.map +1 -1
- package/dist/entity/entity-manager.js +14 -12
- package/dist/entity/entity-manager.js.map +1 -1
- package/dist/entity/entity-utils.js +5 -2
- package/dist/entity/entity-utils.js.map +1 -1
- package/dist/entity/entity.d.ts.map +1 -1
- package/dist/entity/entity.js +20 -18
- package/dist/entity/entity.js.map +1 -1
- package/dist/entity/migrator.d.ts.map +1 -1
- package/dist/entity/migrator.js +56 -52
- package/dist/entity/migrator.js.map +1 -1
- package/dist/smd/smd-manager.d.ts.map +1 -1
- package/dist/smd/smd-manager.js +13 -9
- package/dist/smd/smd-manager.js.map +1 -1
- package/dist/smd/smd.d.ts.map +1 -1
- package/dist/smd/smd.js +13 -14
- package/dist/smd/smd.js.map +1 -1
- package/dist/syncer/syncer.d.ts +1 -1
- package/dist/syncer/syncer.d.ts.map +1 -1
- package/dist/syncer/syncer.js +68 -67
- package/dist/syncer/syncer.js.map +1 -1
- package/dist/templates/generated.template.js +6 -3
- package/dist/templates/generated.template.js.map +1 -1
- package/dist/templates/generated_sso.template.js +7 -4
- package/dist/templates/generated_sso.template.js.map +1 -1
- package/dist/templates/service.template.js +13 -10
- package/dist/templates/service.template.js.map +1 -1
- package/dist/templates/view_enums_dropdown.template.js +5 -2
- package/dist/templates/view_enums_dropdown.template.js.map +1 -1
- package/dist/templates/view_form.template.d.ts.map +1 -1
- package/dist/templates/view_form.template.js +7 -4
- package/dist/templates/view_form.template.js.map +1 -1
- package/dist/templates/view_id_async_select.template.js.map +1 -1
- package/dist/templates/view_list.template.js +10 -7
- package/dist/templates/view_list.template.js.map +1 -1
- package/dist/testing/fixture-manager.js +3 -3
- package/dist/testing/fixture-manager.js.map +1 -1
- package/dist/utils/sql-parser.js +5 -2
- package/dist/utils/sql-parser.js.map +1 -1
- package/dist/utils/utils.js +2 -2
- package/dist/utils/utils.js.map +1 -1
- package/package.json +19 -5
- package/src/api/decorators.ts +3 -3
- package/src/api/sonamu.ts +3 -3
- package/src/bin/cli-wrapper.ts +34 -0
- package/src/bin/cli.ts +10 -16
- package/src/database/base-model.ts +18 -15
- package/src/database/db.ts +1 -1
- package/src/database/upsert-builder.ts +5 -5
- package/src/entity/entity-manager.ts +14 -12
- package/src/entity/entity-utils.ts +2 -2
- package/src/entity/entity.ts +13 -11
- package/src/entity/migrator.ts +70 -82
- package/src/smd/smd-manager.ts +13 -9
- package/src/smd/smd.ts +10 -11
- package/src/syncer/syncer.ts +44 -44
- package/src/templates/generated.template.ts +3 -3
- package/src/templates/generated_sso.template.ts +4 -4
- package/src/templates/service.template.ts +10 -10
- package/src/templates/view_enums_dropdown.template.ts +2 -2
- package/src/templates/view_form.template.ts +36 -33
- package/src/templates/view_id_async_select.template.ts +4 -4
- package/src/templates/view_list.template.ts +18 -18
- package/src/testing/fixture-manager.ts +3 -3
- package/src/utils/sql-parser.ts +2 -2
- package/src/utils/utils.ts +2 -2
- package/tsup.config.js +21 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view_list.template.js","sourceRoot":"","sources":["../../src/templates/view_list.template.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"view_list.template.js","sourceRoot":"","sources":["../../src/templates/view_list.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
22
22
|
exports.FixtureManager = exports.FixtureManagerClass = void 0;
|
|
23
23
|
const chalk_1 = __importDefault(require("chalk"));
|
|
24
24
|
const knex_1 = __importDefault(require("knex"));
|
|
25
|
-
const lodash_1 = require("lodash");
|
|
25
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
26
26
|
const api_1 = require("../api");
|
|
27
27
|
const base_model_1 = require("../database/base-model");
|
|
28
28
|
const entity_manager_1 = require("../entity/entity-manager");
|
|
@@ -154,7 +154,7 @@ class FixtureManagerClass {
|
|
|
154
154
|
}
|
|
155
155
|
importFixture(entityId, ids) {
|
|
156
156
|
return __awaiter(this, void 0, void 0, function* () {
|
|
157
|
-
const queries =
|
|
157
|
+
const queries = lodash_1.default.uniq((yield Promise.all(ids.map((id) => __awaiter(this, void 0, void 0, function* () {
|
|
158
158
|
return yield this.getImportQueries(entityId, "id", id);
|
|
159
159
|
})))).flat());
|
|
160
160
|
const wdb = base_model_1.BaseModel.getDB("w");
|
|
@@ -216,7 +216,7 @@ class FixtureManagerClass {
|
|
|
216
216
|
const relQueries = yield Promise.all(args.map((args) => __awaiter(this, void 0, void 0, function* () {
|
|
217
217
|
return this.getImportQueries(args.entityId, args.field, args.id);
|
|
218
218
|
})));
|
|
219
|
-
return [...
|
|
219
|
+
return [...lodash_1.default.uniq(relQueries.reverse().flat()), selfQuery];
|
|
220
220
|
});
|
|
221
221
|
}
|
|
222
222
|
destory() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixture-manager.js","sourceRoot":"","sources":["../../src/testing/fixture-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,gDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"fixture-manager.js","sourceRoot":"","sources":["../../src/testing/fixture-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/sql-parser.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.getTableNamesFromWhere = exports.getTableName = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
5
8
|
function getTableName(expr) {
|
|
6
9
|
if ("table" in expr && expr.table !== null) {
|
|
7
10
|
return typeof expr.table === "string"
|
|
@@ -29,7 +32,7 @@ function getTableNamesFromWhere(ast) {
|
|
|
29
32
|
};
|
|
30
33
|
return [...extractTableName(where.left), ...extractTableName(where.right)];
|
|
31
34
|
};
|
|
32
|
-
return
|
|
35
|
+
return lodash_1.default.uniq((Array.isArray(ast) ? ast : [ast]).flatMap((a) => a.type === "select" || a.type === "update" || a.type === "delete"
|
|
33
36
|
? extractTableNames(a.where)
|
|
34
37
|
: []));
|
|
35
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-parser.js","sourceRoot":"","sources":["../../src/utils/sql-parser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sql-parser.js","sourceRoot":"","sources":["../../src/utils/sql-parser.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAGvB,SAAgB,YAAY,CAAC,IAAe;IAC1C,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;QAC1C,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;YACnC,CAAC,CAAC,IAAI,CAAC,KAAK;YACZ,CAAC,CAAE,IAAI,CAAC,KAAyC,CAAC,KAAK,CAAC;KAC3D;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,oCAOC;AAED,yBAAyB;AACzB,SAAgB,sBAAsB,CAAC,GAAgB;IACrD,MAAM,iBAAiB,GAAG,CAAC,KAAsB,EAAY,EAAE;QAC7D,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,MAAM,IAAI,KAAK,CAAC,EAAE;YACxE,OAAO,EAAE,CAAC;SACX;QAED,MAAM,gBAAgB,GAAG,CAAC,IAA4B,EAAY,EAAE;YAClE,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC9B,MAAM,KAAK,GAAG,YAAY,CAAC,IAAiB,CAAC,CAAC;gBAC9C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7B;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,IAAI,MAAM,IAAI,IAAI,EAAE;gBACxD,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;aAChC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC;QAEF,OAAO,CAAC,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC;IAEF,OAAO,gBAAC,CAAC,IAAI,CACX,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;QAC/D,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5B,CAAC,CAAC,EAAE,CACP,CACF,CAAC;AACJ,CAAC;AA1BD,wDA0BC"}
|
package/dist/utils/utils.js
CHANGED
|
@@ -38,7 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
exports.nonNullable = exports.findApiRootPath = exports.findAppRootPath = exports.importMultiple = exports.globAsync = void 0;
|
|
39
39
|
const path_1 = __importDefault(require("path"));
|
|
40
40
|
const glob_1 = __importDefault(require("glob"));
|
|
41
|
-
const
|
|
41
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
42
42
|
function globAsync(pathPattern) {
|
|
43
43
|
return new Promise((resolve, reject) => {
|
|
44
44
|
(0, glob_1.default)(path_1.default.resolve(pathPattern), (err, files) => {
|
|
@@ -84,7 +84,7 @@ function findApiRootPath() {
|
|
|
84
84
|
dir = dir.split("/.yarn/")[0];
|
|
85
85
|
}
|
|
86
86
|
do {
|
|
87
|
-
if (
|
|
87
|
+
if (fs_extra_1.default.existsSync(path_1.default.join(dir, "/package.json"))) {
|
|
88
88
|
return dir.split(path_1.default.sep).join(path_1.default.sep);
|
|
89
89
|
}
|
|
90
90
|
dir = dir.split(path_1.default.sep).slice(0, -1).join(path_1.default.sep);
|
package/dist/utils/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,gDAAwB;AACxB,wDAA0B;AAE1B,SAAgB,SAAS,CAAC,WAAmB;IAC3C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAA,cAAI,EAAC,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAC7C,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAVD,8BAUC;AACD,SAAsB,cAAc,CAClC,SAAmB,EACnB,YAAqB,KAAK;;QAE1B,OAAO,OAAO,CAAC,GAAG,CAChB,SAAS,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;YAC/B,MAAM,UAAU,GAAG,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC7D,IAAI,SAAS,EAAE;gBACb,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;aACnD;YACD,MAAM,QAAQ,GAAG,yBAAa,UAAU,uCAAC,CAAC;YAC1C,OAAO;gBACL,QAAQ;gBACR,QAAQ;aACT,CAAC;QACJ,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AAjBD,wCAiBC;AACD,SAAsB,eAAe;;QACnC,MAAM,WAAW,GAAG,MAAM,eAAe,EAAE,CAAC;QAC5C,OAAO,WAAW,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;CAAA;AAHD,0CAGC;AAED,SAAsB,eAAe;;;QACnC,MAAM,QAAQ,GAAG,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,mCAAI,SAAS,CAAC;QACjD,IAAI,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC3B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B;QACD,GAAG;YACD,IAAI,kBAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,EAAE;gBAClD,OAAO,GAAG,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;aAC3C;YACD,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;SACvD,QAAQ,GAAG,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;;CACxD;AAbD,0CAaC;AAED,SAAgB,WAAW,CAAI,KAAQ;IACrC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAFD,kCAEC"}
|
package/package.json
CHANGED
|
@@ -1,16 +1,29 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sonamu",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.38",
|
|
4
4
|
"description": "Sonamu — TypeScript Fullstack API Framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"typescript",
|
|
7
7
|
"framework",
|
|
8
8
|
"orm"
|
|
9
9
|
],
|
|
10
|
-
"
|
|
11
|
-
|
|
10
|
+
"exports": {
|
|
11
|
+
".": {
|
|
12
|
+
"import": {
|
|
13
|
+
"types": "./dist/index.d.mts",
|
|
14
|
+
"default": "./dist/index.mjs"
|
|
15
|
+
},
|
|
16
|
+
"require": {
|
|
17
|
+
"types": "./dist/index.d.ts",
|
|
18
|
+
"default": "./dist/index.js"
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
},
|
|
22
|
+
"main": "./dist/index.js",
|
|
23
|
+
"module": "./dist/index.mjs",
|
|
12
24
|
"scripts": {
|
|
13
|
-
"dev": "yarn tsc -w -p ./tsconfig.json"
|
|
25
|
+
"dev": "yarn tsc -w -p ./tsconfig.json",
|
|
26
|
+
"build": "tsup --config ./tsup.config.js"
|
|
14
27
|
},
|
|
15
28
|
"license": "MIT",
|
|
16
29
|
"author": {
|
|
@@ -22,7 +35,7 @@
|
|
|
22
35
|
"type": "git",
|
|
23
36
|
"url": "https://github.com/ping-alive/sonamu.git"
|
|
24
37
|
},
|
|
25
|
-
"bin": "./dist/bin/cli.
|
|
38
|
+
"bin": "./dist/bin/cli-wrapper.mjs",
|
|
26
39
|
"dependencies": {
|
|
27
40
|
"chalk": "^4.1.2",
|
|
28
41
|
"dotenv": "^16.0.2",
|
|
@@ -55,6 +68,7 @@
|
|
|
55
68
|
"@types/uuid": "^8.3.4",
|
|
56
69
|
"prettier": "^3.2.5",
|
|
57
70
|
"source-map-support": "^0.5.21",
|
|
71
|
+
"tsup": "^8.1.0",
|
|
58
72
|
"typescript": "^5.2.2"
|
|
59
73
|
},
|
|
60
74
|
"peerDependencies": {
|
package/src/api/decorators.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HTTPMethods } from "fastify";
|
|
2
|
-
import
|
|
2
|
+
import inflection from "inflection";
|
|
3
3
|
import { ApiParam, ApiParamType } from "../types/types";
|
|
4
4
|
|
|
5
5
|
export type ServiceClient =
|
|
@@ -49,10 +49,10 @@ export function api(options: ApiDecoratorOptions = {}) {
|
|
|
49
49
|
return function (target: Object, propertyKey: string) {
|
|
50
50
|
const modelName = target.constructor.name.match(/(.+)Class$/)![1];
|
|
51
51
|
const methodName = propertyKey;
|
|
52
|
-
const defaultPath = `/${camelize(
|
|
52
|
+
const defaultPath = `/${inflection.camelize(
|
|
53
53
|
modelName.replace(/Model$/, ""),
|
|
54
54
|
true
|
|
55
|
-
)}/${camelize(propertyKey, true)}`;
|
|
55
|
+
)}/${inflection.camelize(propertyKey, true)}`;
|
|
56
56
|
|
|
57
57
|
const api = {
|
|
58
58
|
modelName,
|
package/src/api/sonamu.ts
CHANGED
|
@@ -14,7 +14,7 @@ import { DB, SonamuDBConfig } from "../database/db";
|
|
|
14
14
|
import { BaseModel } from "../database/base-model";
|
|
15
15
|
import { findApiRootPath } from "../utils/utils";
|
|
16
16
|
import path from "path";
|
|
17
|
-
import
|
|
17
|
+
import fs from "fs-extra";
|
|
18
18
|
import { ApiDecoratorOptions } from "./decorators";
|
|
19
19
|
|
|
20
20
|
export type SonamuConfig = {
|
|
@@ -128,11 +128,11 @@ class SonamuClass {
|
|
|
128
128
|
|
|
129
129
|
this.apiRootPath = apiRootPath ?? (await findApiRootPath());
|
|
130
130
|
const configPath = path.join(this.apiRootPath, "sonamu.config.json");
|
|
131
|
-
if (existsSync(configPath) === false) {
|
|
131
|
+
if (fs.existsSync(configPath) === false) {
|
|
132
132
|
throw new Error(`Cannot find sonamu.config.json in ${configPath}`);
|
|
133
133
|
}
|
|
134
134
|
this.config = JSON.parse(
|
|
135
|
-
readFileSync(configPath).toString()
|
|
135
|
+
fs.readFileSync(configPath).toString()
|
|
136
136
|
) as SonamuConfig;
|
|
137
137
|
|
|
138
138
|
// DB 로드
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
#!/usr/bin/env ts-node
|
|
2
|
+
|
|
3
|
+
import { spawnSync } from "child_process";
|
|
4
|
+
import { resolve } from "path";
|
|
5
|
+
import { existsSync, readFileSync } from "fs";
|
|
6
|
+
|
|
7
|
+
const cjsPath = resolve(__dirname, "bin/cli.js");
|
|
8
|
+
const esmPath = resolve(__dirname, "bin/cli.mjs");
|
|
9
|
+
|
|
10
|
+
const isESM = () => {
|
|
11
|
+
const packageJsonPath = resolve(process.cwd(), "package.json");
|
|
12
|
+
if (existsSync(packageJsonPath)) {
|
|
13
|
+
const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
|
|
14
|
+
return packageJson.type === "module";
|
|
15
|
+
}
|
|
16
|
+
return false;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const scriptPath = isESM() ? esmPath : cjsPath;
|
|
20
|
+
|
|
21
|
+
if (!existsSync(scriptPath)) {
|
|
22
|
+
console.error(`Error: Script not found at ${scriptPath}`);
|
|
23
|
+
process.exit(1);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const result = spawnSync(
|
|
27
|
+
process.execPath,
|
|
28
|
+
[scriptPath, ...process.argv.slice(2)],
|
|
29
|
+
{
|
|
30
|
+
stdio: "inherit",
|
|
31
|
+
}
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
process.exit(result.status ?? 1);
|
package/src/bin/cli.ts
CHANGED
|
@@ -12,16 +12,10 @@ import { Migrator } from "../entity/migrator";
|
|
|
12
12
|
import { FixtureManager } from "../testing/fixture-manager";
|
|
13
13
|
import { tsicli } from "tsicli";
|
|
14
14
|
import { execSync } from "child_process";
|
|
15
|
-
import
|
|
16
|
-
existsSync,
|
|
17
|
-
mkdirSync,
|
|
18
|
-
readdirSync,
|
|
19
|
-
unlinkSync,
|
|
20
|
-
writeFileSync,
|
|
21
|
-
} from "fs";
|
|
15
|
+
import fs from "fs-extra";
|
|
22
16
|
import { Sonamu } from "../api";
|
|
23
17
|
import knex, { Knex } from "knex";
|
|
24
|
-
import
|
|
18
|
+
import inflection from "inflection";
|
|
25
19
|
import prettier from "prettier";
|
|
26
20
|
import { SMDManager } from "../smd/smd-manager";
|
|
27
21
|
import process from "process";
|
|
@@ -241,11 +235,11 @@ async function fixture_sync() {
|
|
|
241
235
|
|
|
242
236
|
async function stub_practice(name: string) {
|
|
243
237
|
const practiceDir = path.join(Sonamu.apiRootPath, "src", "practices");
|
|
244
|
-
const fileNames = readdirSync(practiceDir);
|
|
238
|
+
const fileNames = fs.readdirSync(practiceDir);
|
|
245
239
|
|
|
246
240
|
const maxSeqNo = (() => {
|
|
247
|
-
if (existsSync(practiceDir) === false) {
|
|
248
|
-
mkdirSync(practiceDir, { recursive: true });
|
|
241
|
+
if (fs.existsSync(practiceDir) === false) {
|
|
242
|
+
fs.mkdirSync(practiceDir, { recursive: true });
|
|
249
243
|
}
|
|
250
244
|
|
|
251
245
|
const filteredSeqs = fileNames
|
|
@@ -282,7 +276,7 @@ async function stub_practice(name: string) {
|
|
|
282
276
|
`await BaseModel.destroy();`,
|
|
283
277
|
`});`,
|
|
284
278
|
].join("\n");
|
|
285
|
-
writeFileSync(dstPath, code);
|
|
279
|
+
fs.writeFileSync(dstPath, code);
|
|
286
280
|
|
|
287
281
|
execSync(`code ${dstPath}`);
|
|
288
282
|
|
|
@@ -338,7 +332,7 @@ async function smd_migration() {
|
|
|
338
332
|
return Object.fromEntries(
|
|
339
333
|
Object.entries(enumLabels).map(([enumLabelName, enumLabel]) => {
|
|
340
334
|
const enumName =
|
|
341
|
-
entityId + camelize(enumLabelName.toLowerCase(), false);
|
|
335
|
+
entityId + inflection.camelize(enumLabelName.toLowerCase(), false);
|
|
342
336
|
return [
|
|
343
337
|
enumName,
|
|
344
338
|
Object.fromEntries(
|
|
@@ -373,7 +367,7 @@ async function smd_migration() {
|
|
|
373
367
|
const formatted = await prettier.format(JSON.stringify(entityJson), {
|
|
374
368
|
parser: "json",
|
|
375
369
|
});
|
|
376
|
-
writeFileSync(dstPath, formatted);
|
|
370
|
+
fs.writeFileSync(dstPath, formatted);
|
|
377
371
|
console.log(chalk.blue(`CREATED: ${dstPath}`));
|
|
378
372
|
|
|
379
373
|
// smd.ts, enums.ts, genereated.ts 삭제 (트랜스파일 된 js파일도 삭제)
|
|
@@ -421,11 +415,11 @@ async function smd_migration() {
|
|
|
421
415
|
srcGeneratedPath,
|
|
422
416
|
dstGeneratedPath,
|
|
423
417
|
].map((p) => {
|
|
424
|
-
if (existsSync(p) === false) {
|
|
418
|
+
if (fs.existsSync(p) === false) {
|
|
425
419
|
console.log(chalk.yellow(`NOT FOUND: ${p}`));
|
|
426
420
|
return;
|
|
427
421
|
}
|
|
428
|
-
unlinkSync(p);
|
|
422
|
+
fs.unlinkSync(p);
|
|
429
423
|
console.log(chalk.red(`DELETED: ${p}`));
|
|
430
424
|
});
|
|
431
425
|
}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { DateTime } from "luxon";
|
|
2
2
|
import { Knex } from "knex";
|
|
3
|
-
import
|
|
3
|
+
import _ from "lodash";
|
|
4
4
|
import { attachOnDuplicateUpdate } from "./knex-plugins/knex-on-duplicate-update";
|
|
5
5
|
attachOnDuplicateUpdate();
|
|
6
6
|
import { DBPreset, DB } from "./db";
|
|
7
7
|
import { isCustomJoinClause, SubsetQuery } from "../types/types";
|
|
8
8
|
import { BaseListParams } from "../utils/model";
|
|
9
|
-
import
|
|
9
|
+
import inflection from "inflection";
|
|
10
10
|
import chalk from "chalk";
|
|
11
11
|
import { UpsertBuilder } from "./upsert-builder";
|
|
12
|
-
import
|
|
12
|
+
import SqlParser from "node-sql-parser";
|
|
13
13
|
import { getTableName, getTableNamesFromWhere } from "../utils/sql-parser";
|
|
14
14
|
|
|
15
15
|
export class BaseModelClass {
|
|
@@ -55,7 +55,7 @@ export class BaseModelClass {
|
|
|
55
55
|
selectField = unqKeyFields[0];
|
|
56
56
|
unqKeys = rows.map((row) => row[unqKeyFields[0]]);
|
|
57
57
|
}
|
|
58
|
-
const chunks = chunk(unqKeys, chunkSize);
|
|
58
|
+
const chunks = _.chunk(unqKeys, chunkSize);
|
|
59
59
|
|
|
60
60
|
let resultIds: number[] = [];
|
|
61
61
|
for (let chunk of chunks) {
|
|
@@ -114,7 +114,7 @@ export class BaseModelClass {
|
|
|
114
114
|
`${loader.manyJoin.toTable}.${loader.manyJoin.toCol}`
|
|
115
115
|
)
|
|
116
116
|
.whereIn(idColumn, fromIds)
|
|
117
|
-
.select(uniq([...loader.select, idColumn]));
|
|
117
|
+
.select(_.uniq([...loader.select, idColumn]));
|
|
118
118
|
|
|
119
119
|
// ManyToMany에서 OneJoin이 있는 경우
|
|
120
120
|
loader.oneJoins.map((join) => {
|
|
@@ -140,10 +140,10 @@ export class BaseModelClass {
|
|
|
140
140
|
}
|
|
141
141
|
|
|
142
142
|
// 불러온 row들을 참조ID 기준으로 분류 배치
|
|
143
|
-
const subRowGroups = groupBy(subRows, toCol);
|
|
143
|
+
const subRowGroups = _.groupBy(subRows, toCol);
|
|
144
144
|
rows = rows.map((row) => {
|
|
145
145
|
row[loader.as] = (subRowGroups[row[loader.manyJoin.idField]] ?? []).map(
|
|
146
|
-
(r) => omit(r, toCol)
|
|
146
|
+
(r) => _.omit(r, toCol)
|
|
147
147
|
);
|
|
148
148
|
return row;
|
|
149
149
|
});
|
|
@@ -155,7 +155,7 @@ export class BaseModelClass {
|
|
|
155
155
|
return rows.map((row: any) => {
|
|
156
156
|
// nullable relation인 경우 관련된 필드가 전부 null로 생성되는 것 방지하는 코드
|
|
157
157
|
const nestedKeys = Object.keys(row).filter((key) => key.includes("__"));
|
|
158
|
-
const groups = groupBy(nestedKeys, (key) => key.split("__")[0]);
|
|
158
|
+
const groups = _.groupBy(nestedKeys, (key) => key.split("__")[0]);
|
|
159
159
|
const nullKeys = Object.keys(groups).filter(
|
|
160
160
|
(key) =>
|
|
161
161
|
groups[key].length > 1 &&
|
|
@@ -164,7 +164,7 @@ export class BaseModelClass {
|
|
|
164
164
|
|
|
165
165
|
const hydrated = Object.keys(row).reduce((r, field) => {
|
|
166
166
|
if (!field.includes("__")) {
|
|
167
|
-
if (Array.isArray(row[field]) && isObject(row[field][0])) {
|
|
167
|
+
if (Array.isArray(row[field]) && _.isObject(row[field][0])) {
|
|
168
168
|
r[field] = this.hydrate(row[field]);
|
|
169
169
|
return r;
|
|
170
170
|
} else {
|
|
@@ -180,10 +180,10 @@ export class BaseModelClass {
|
|
|
180
180
|
.slice(1)
|
|
181
181
|
.map((part) => `[${part}]`)
|
|
182
182
|
.join("");
|
|
183
|
-
set(
|
|
183
|
+
_.set(
|
|
184
184
|
r,
|
|
185
185
|
objPath,
|
|
186
|
-
row[field] && Array.isArray(row[field]) && isObject(row[field][0])
|
|
186
|
+
row[field] && Array.isArray(row[field]) && _.isObject(row[field][0])
|
|
187
187
|
? this.hydrate(row[field])
|
|
188
188
|
: row[field]
|
|
189
189
|
);
|
|
@@ -227,7 +227,8 @@ export class BaseModelClass {
|
|
|
227
227
|
qb: Knex.QueryBuilder;
|
|
228
228
|
}> {
|
|
229
229
|
const db = _db ?? this.getDB(subset.startsWith("A") ? "w" : "r");
|
|
230
|
-
baseTable =
|
|
230
|
+
baseTable =
|
|
231
|
+
baseTable ?? inflection.pluralize(inflection.underscore(this.modelName));
|
|
231
232
|
const queryMode =
|
|
232
233
|
params.queryMode ?? (params.id !== undefined ? "list" : "both");
|
|
233
234
|
|
|
@@ -266,15 +267,17 @@ export class BaseModelClass {
|
|
|
266
267
|
}
|
|
267
268
|
|
|
268
269
|
const clonedQb = qb.clone().clear("order").clear("offset").clear("limit");
|
|
269
|
-
const parser = new Parser();
|
|
270
|
+
const parser = new SqlParser.Parser();
|
|
270
271
|
|
|
271
272
|
// optmizeCountQuery가 true인 경우 다른 clause에 영향을 주지 않는 모든 join을 제외함
|
|
272
273
|
if (optimizeCountQuery) {
|
|
273
274
|
const parsedQuery = parser.astify(clonedQb.toQuery());
|
|
274
275
|
const tables = getTableNamesFromWhere(parsedQuery);
|
|
275
276
|
// where절에 사용되는 테이블의 조인을 위해 사용되는 테이블
|
|
276
|
-
const needToJoin = uniq(
|
|
277
|
-
tables.flatMap((table) =>
|
|
277
|
+
const needToJoin = _.uniq(
|
|
278
|
+
tables.flatMap((table) =>
|
|
279
|
+
table.split("__").map((t) => inflection.pluralize(t))
|
|
280
|
+
)
|
|
278
281
|
);
|
|
279
282
|
applyJoinClause(
|
|
280
283
|
clonedQb,
|
package/src/database/db.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { v4 as uuidv4 } from "uuid";
|
|
2
|
-
import
|
|
2
|
+
import _ from "lodash";
|
|
3
3
|
import { Knex } from "knex";
|
|
4
4
|
import { EntityManager } from "../entity/entity-manager";
|
|
5
5
|
import { nonNullable } from "../utils/utils";
|
|
@@ -178,7 +178,7 @@ export class UpsertBuilder {
|
|
|
178
178
|
}
|
|
179
179
|
|
|
180
180
|
// 내부 참조 있는 경우 필터하여 분리
|
|
181
|
-
const groups = groupBy(table.rows, (row) =>
|
|
181
|
+
const groups = _.groupBy(table.rows, (row) =>
|
|
182
182
|
Object.entries(row).some(([, value]) => isRefField(value))
|
|
183
183
|
? "selfRef"
|
|
184
184
|
: "normal"
|
|
@@ -212,14 +212,14 @@ export class UpsertBuilder {
|
|
|
212
212
|
}
|
|
213
213
|
);
|
|
214
214
|
|
|
215
|
-
const extractFields = uniq(references).map(
|
|
215
|
+
const extractFields = _.uniq(references).map(
|
|
216
216
|
(reference) => reference.split(".")[1]
|
|
217
217
|
);
|
|
218
218
|
|
|
219
219
|
// UUID 기준으로 id 추출
|
|
220
220
|
const uuids = table.rows.map((row) => row.uuid);
|
|
221
221
|
const upsertedRows = await wdb(tableName)
|
|
222
|
-
.select(uniq(["uuid", "id", ...extractFields]))
|
|
222
|
+
.select(_.uniq(["uuid", "id", ...extractFields]))
|
|
223
223
|
.whereIn("uuid", uuids);
|
|
224
224
|
const uuidMap = new Map<string, any>(
|
|
225
225
|
upsertedRows.map((row: any) => [row.uuid, row])
|
|
@@ -263,7 +263,7 @@ export class UpsertBuilder {
|
|
|
263
263
|
where?: string;
|
|
264
264
|
}
|
|
265
265
|
): Promise<void> {
|
|
266
|
-
options = defaults(options, {
|
|
266
|
+
options = _.defaults(options, {
|
|
267
267
|
chunkSize: 500,
|
|
268
268
|
where: "id",
|
|
269
269
|
});
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import glob from "glob";
|
|
3
|
+
import inflection from "inflection";
|
|
4
4
|
import _ from "lodash";
|
|
5
5
|
import path from "path";
|
|
6
6
|
import { Entity } from "./entity";
|
|
7
7
|
import { EntityJson } from "../types/types";
|
|
8
8
|
import { Sonamu } from "../api/sonamu";
|
|
9
|
-
import
|
|
9
|
+
import fs from "fs-extra";
|
|
10
10
|
|
|
11
11
|
export type EntityNamesRecord = Record<
|
|
12
12
|
| "fs"
|
|
@@ -41,10 +41,10 @@ class EntityManagerClass {
|
|
|
41
41
|
!doSilent && console.log(chalk.yellow(`autoload ${pathPattern}`));
|
|
42
42
|
|
|
43
43
|
return new Promise((resolve) => {
|
|
44
|
-
glob(path.resolve(pathPattern!), (_err, files) => {
|
|
44
|
+
glob.glob(path.resolve(pathPattern!), (_err, files) => {
|
|
45
45
|
Promise.all(
|
|
46
46
|
files.map(async (file) => {
|
|
47
|
-
this.register(JSON.parse(readFileSync(file).toString()));
|
|
47
|
+
this.register(JSON.parse(fs.readFileSync(file).toString()));
|
|
48
48
|
})
|
|
49
49
|
).then(() => {
|
|
50
50
|
resolve("ok");
|
|
@@ -139,19 +139,21 @@ class EntityManagerClass {
|
|
|
139
139
|
getNamesFromId(entityId: string): EntityNamesRecord {
|
|
140
140
|
// entityId가 단복수 동형 단어인 경우 List 붙여서 생성
|
|
141
141
|
const pluralized =
|
|
142
|
-
pluralize(entityId) === entityId
|
|
142
|
+
inflection.pluralize(entityId) === entityId
|
|
143
143
|
? `${entityId}List`
|
|
144
|
-
: pluralize(entityId);
|
|
144
|
+
: inflection.pluralize(entityId);
|
|
145
145
|
|
|
146
146
|
return {
|
|
147
|
-
fs: dasherize(underscore(entityId)).toLowerCase(),
|
|
148
|
-
fsPlural:
|
|
149
|
-
|
|
150
|
-
|
|
147
|
+
fs: inflection.dasherize(inflection.underscore(entityId)).toLowerCase(),
|
|
148
|
+
fsPlural: inflection
|
|
149
|
+
.dasherize(inflection.underscore(pluralized))
|
|
150
|
+
.toLowerCase(),
|
|
151
|
+
camel: inflection.camelize(entityId, true),
|
|
152
|
+
camelPlural: inflection.camelize(pluralized, true),
|
|
151
153
|
capital: entityId,
|
|
152
154
|
capitalPlural: pluralized,
|
|
153
155
|
upper: entityId.toUpperCase(),
|
|
154
|
-
constant: underscore(entityId).toUpperCase(),
|
|
156
|
+
constant: inflection.underscore(entityId).toUpperCase(),
|
|
155
157
|
};
|
|
156
158
|
}
|
|
157
159
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import inflection from "inflection";
|
|
2
2
|
import {
|
|
3
3
|
BelongsToOneRelationProp,
|
|
4
4
|
BigIntegerProp,
|
|
@@ -208,7 +208,7 @@ function enums(
|
|
|
208
208
|
return {
|
|
209
209
|
name,
|
|
210
210
|
type: "enum",
|
|
211
|
-
id: option.id ?? `$Model${camelize(name)}`,
|
|
211
|
+
id: option.id ?? `$Model${inflection.camelize(name)}`,
|
|
212
212
|
...option,
|
|
213
213
|
};
|
|
214
214
|
}
|