tspace-mysql 1.7.8 → 1.7.9
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 +0 -12
- package/build/cli/dump/db.js +5 -2
- package/build/cli/dump/db.js.map +1 -1
- package/build/cli/generate/make.js +4 -4
- package/build/cli/generate/make.js.map +1 -1
- package/build/cli/generate/model.js +13 -3
- package/build/cli/generate/model.js.map +1 -1
- package/build/lib/core/Abstracts/AbstractBuilder.d.ts +2 -2
- package/build/lib/core/Builder.d.ts +3 -3
- package/build/lib/core/Builder.js +12 -34
- package/build/lib/core/Builder.js.map +1 -1
- package/build/lib/core/DB.js +4 -0
- package/build/lib/core/DB.js.map +1 -1
- package/build/lib/core/Model.d.ts +36 -36
- package/build/lib/core/Model.js +12 -39
- package/build/lib/core/Model.js.map +1 -1
- package/build/lib/core/Repository.js +1 -0
- package/build/lib/core/Repository.js.map +1 -1
- package/build/lib/types.d.ts +5 -5
- package/build/lib/utils/index.js +1 -1
- package/build/lib/utils/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -474,18 +474,6 @@ const users = await new DB("users")
|
|
|
474
474
|
// AND
|
|
475
475
|
// ( `users`.`id` <> '2' OR `users`.`username` = 'try to find' OR `users`.`email` = 'find@example.com');
|
|
476
476
|
|
|
477
|
-
const users = await new DB("users")
|
|
478
|
-
.where("id", 1)
|
|
479
|
-
.orWhereQuery((query) => {
|
|
480
|
-
return query
|
|
481
|
-
.where("id", "<>", 2)
|
|
482
|
-
.where("username", "try to find")
|
|
483
|
-
.where("email", "find@example.com");
|
|
484
|
-
})
|
|
485
|
-
.findMany();
|
|
486
|
-
// SELECT * FROM `users` WHERE `users`.`id` = '1'
|
|
487
|
-
// OR
|
|
488
|
-
// ( `users`.`id` <> '2' AND `users`.`username` = 'try to find' AND `users`.`email` = 'find@example.com');
|
|
489
477
|
```
|
|
490
478
|
|
|
491
479
|
### Where Object Clauses
|
package/build/cli/dump/db.js
CHANGED
|
@@ -22,7 +22,9 @@ exports.default = (cmd) => {
|
|
|
22
22
|
}
|
|
23
23
|
if (!values) {
|
|
24
24
|
const directory = `${cwd}/${dir}/dump-schema_${+new Date()}.sql`;
|
|
25
|
-
new lib_1.DB()
|
|
25
|
+
new lib_1.DB()
|
|
26
|
+
.loadEnv(env)
|
|
27
|
+
.backupSchemaToFile({
|
|
26
28
|
filePath: directory,
|
|
27
29
|
database: database
|
|
28
30
|
})
|
|
@@ -32,7 +34,8 @@ exports.default = (cmd) => {
|
|
|
32
34
|
return;
|
|
33
35
|
}
|
|
34
36
|
const directory = `${cwd}/${dir}/dump_${+new Date()}.sql`;
|
|
35
|
-
new lib_1.DB()
|
|
37
|
+
new lib_1.DB()
|
|
38
|
+
.loadEnv(env)
|
|
36
39
|
.backupToFile({
|
|
37
40
|
filePath: directory,
|
|
38
41
|
database: database
|
package/build/cli/dump/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/cli/dump/db.ts"],"names":[],"mappings":";;AAAA,mCAA8B;AAE9B,kBAAe,CAAC,GAA0B,EAAE,EAAE;IAC5C,IAAI,EACF,GAAG,EACH,GAAG,EACH,EAAE,EACF,MAAM,EACN,GAAG,EACJ,GAAG,GAAG,CAAA;IAEL,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,EAAE,CAAA;IAEtC,IAAG,GAAG,IAAI,IAAI;QAAE,GAAG,GAAG,MAAM,CAAA;IAC5B,IAAI,CAAC;QACD,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE;YACpC,SAAS,EAAE,IAAI;SAClB,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,EAAE;YAC1B,SAAS,EAAE,IAAI;SAClB,CAAC,CAAA;IACN,CAAC;IAED,IAAG,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;QACnE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,IAAG,CAAC,MAAM,EAAE,CAAC;QACT,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,gBAAgB,CAAC,IAAI,IAAI,EAAE,MAAM,CAAA;QAChE,IAAI,QAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/cli/dump/db.ts"],"names":[],"mappings":";;AAAA,mCAA8B;AAE9B,kBAAe,CAAC,GAA0B,EAAE,EAAE;IAC5C,IAAI,EACF,GAAG,EACH,GAAG,EACH,EAAE,EACF,MAAM,EACN,GAAG,EACJ,GAAG,GAAG,CAAA;IAEL,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,EAAE,CAAA;IAEtC,IAAG,GAAG,IAAI,IAAI;QAAE,GAAG,GAAG,MAAM,CAAA;IAC5B,IAAI,CAAC;QACD,EAAE,CAAC,UAAU,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE;YACpC,SAAS,EAAE,IAAI;SAClB,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,EAAE;YAC1B,SAAS,EAAE,IAAI;SAClB,CAAC,CAAA;IACN,CAAC;IAED,IAAG,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAA;QACnE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;IAED,IAAG,CAAC,MAAM,EAAE,CAAC;QACT,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,gBAAgB,CAAC,IAAI,IAAI,EAAE,MAAM,CAAA;QAChE,IAAI,QAAE,EAAE;aACP,OAAO,CAAC,GAAG,CAAC;aACZ,kBAAkB,CAAC;YAChB,QAAQ,EAAG,SAAS;YACpB,QAAQ,EAAG,QAAQ;SACtB,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;aACzD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC9B,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAE/B,OAAM;IACV,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,SAAS,CAAC,IAAI,IAAI,EAAE,MAAM,CAAA;IACzD,IAAI,QAAE,EAAE;SACP,OAAO,CAAC,GAAG,CAAC;SACZ,YAAY,CAAC;QACV,QAAQ,EAAG,SAAS;QACpB,QAAQ,EAAG,QAAQ;KACtB,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;SAC1D,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC9B,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AACnC,CAAC,CAAA"}
|
|
@@ -97,8 +97,8 @@ exports.default = (cmd) => {
|
|
|
97
97
|
fs.writeFile(`${cwd}/${dir}/${model}${type !== null && type !== void 0 ? type : '.ts'}`, data, (err) => {
|
|
98
98
|
if (err)
|
|
99
99
|
throw err;
|
|
100
|
+
console.log(`Model : '${model}' created successfully`);
|
|
100
101
|
});
|
|
101
|
-
console.log(`Model : '${model}' created successfully`);
|
|
102
102
|
}).catch(err => console.log(err));
|
|
103
103
|
}
|
|
104
104
|
console.log('\nGenerate Models has completed');
|
|
@@ -135,11 +135,11 @@ exports.default = (cmd) => {
|
|
|
135
135
|
schema.push(isLast ? str.replace(/,\s*$/, "") : str);
|
|
136
136
|
}
|
|
137
137
|
const formattedSchema = formatSchema(schema);
|
|
138
|
-
let str = "
|
|
138
|
+
let str = "{\n";
|
|
139
139
|
for (const formatKey in formattedSchema) {
|
|
140
|
-
str += `
|
|
140
|
+
str += ` ${formatKey} : ${formattedSchema[formatKey]} \n`;
|
|
141
141
|
}
|
|
142
|
-
str += "
|
|
142
|
+
str += " }";
|
|
143
143
|
const data = (0, model_1.default)(model, npm, `${str}`);
|
|
144
144
|
fs.writeFileSync(`${cwd}/${dir}/${model}${type !== null && type !== void 0 ? type : '.ts'}`, data);
|
|
145
145
|
console.log(`Model : '${model}' created successfully`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../../src/cli/generate/make.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA+B;AAC/B,sEAA6C;AAC7C,0DAAiC;
|
|
1
|
+
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../../src/cli/generate/make.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const Model = (model, npm, schema) => {
|
|
4
|
-
return `import { Model , Blueprint } from '${npm}'
|
|
5
|
-
|
|
4
|
+
return `import { Model , Blueprint , TSchema , TRelation } from '${npm}'
|
|
5
|
+
|
|
6
|
+
const schema = ${schema}
|
|
7
|
+
|
|
8
|
+
type TS = TSchema<typeof schema>
|
|
9
|
+
|
|
10
|
+
type TR = TRelation<{
|
|
11
|
+
// ... name your relationship
|
|
12
|
+
}>
|
|
13
|
+
|
|
14
|
+
class ${model} extends Model<TS,TR> {
|
|
6
15
|
constructor(){
|
|
7
16
|
super()
|
|
8
17
|
/**
|
|
@@ -10,9 +19,10 @@ class ${model} extends Model {
|
|
|
10
19
|
* @Schema table
|
|
11
20
|
*
|
|
12
21
|
*/
|
|
13
|
-
|
|
22
|
+
this.useSchema(schema)
|
|
14
23
|
}
|
|
15
24
|
}
|
|
25
|
+
|
|
16
26
|
export { ${model} }
|
|
17
27
|
export default ${model}
|
|
18
28
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/cli/generate/model.ts"],"names":[],"mappings":";;AAAA,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,MAAe,EAAE,EAAE;IAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/cli/generate/model.ts"],"names":[],"mappings":";;AAAA,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,MAAe,EAAE,EAAE;IAC9D,OAAO,4DAA4D,GAAG;;iBAErD,MAAM;;;;;;;;QAQf,KAAK;;;;;;;;;;;;WAYF,KAAK;iBACC,KAAK;CACrB,CAAA;AACD,CAAC,CAAA;AAED,kBAAe,KAAK,CAAA"}
|
|
@@ -104,8 +104,8 @@ declare abstract class AbstractBuilder {
|
|
|
104
104
|
abstract get(): Promise<any[]>;
|
|
105
105
|
abstract findOne(): Promise<Record<string, any> | null>;
|
|
106
106
|
abstract findMany(): Promise<any[]>;
|
|
107
|
-
abstract getGroupBy(column: string): Promise<any[]
|
|
108
|
-
abstract findGroupBy(column: string): Promise<any[]
|
|
107
|
+
abstract getGroupBy(column: string): Promise<Record<string, any[] | null>>;
|
|
108
|
+
abstract findGroupBy(column: string): Promise<Record<string, any[] | null>>;
|
|
109
109
|
abstract toArray(column: string): Promise<any[]>;
|
|
110
110
|
abstract toJSON(): Promise<string>;
|
|
111
111
|
abstract toSQL(): string;
|
|
@@ -1330,10 +1330,10 @@ declare class Builder extends AbstractBuilder {
|
|
|
1330
1330
|
* @param {string} column
|
|
1331
1331
|
* @returns {promise<Array>}
|
|
1332
1332
|
*/
|
|
1333
|
-
getGroupBy(column: string): Promise<any[]
|
|
1333
|
+
getGroupBy(column: string): Promise<Record<string, any[] | null>>;
|
|
1334
1334
|
/**
|
|
1335
1335
|
*
|
|
1336
|
-
* The '
|
|
1336
|
+
* The 'findGroupBy' method is used to execute a database query and retrieve the result set that matches the query conditions.
|
|
1337
1337
|
*
|
|
1338
1338
|
* It retrieves multiple records from a database table based on the criteria specified in the query.
|
|
1339
1339
|
*
|
|
@@ -1341,7 +1341,7 @@ declare class Builder extends AbstractBuilder {
|
|
|
1341
1341
|
* @param {string} column
|
|
1342
1342
|
* @returns {promise<Array>}
|
|
1343
1343
|
*/
|
|
1344
|
-
findGroupBy(column: string): Promise<any[]
|
|
1344
|
+
findGroupBy(column: string): Promise<Record<string, any[] | null>>;
|
|
1345
1345
|
/**
|
|
1346
1346
|
* The 'save' method is used to persist a new 'Model' or new 'DB' instance or update an existing model instance in the database.
|
|
1347
1347
|
*
|
|
@@ -3046,44 +3046,22 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
|
|
|
3046
3046
|
*/
|
|
3047
3047
|
getGroupBy(column) {
|
|
3048
3048
|
return __awaiter(this, void 0, void 0, function* () {
|
|
3049
|
-
this.
|
|
3050
|
-
|
|
3051
|
-
|
|
3052
|
-
|
|
3053
|
-
|
|
3054
|
-
|
|
3055
|
-
|
|
3056
|
-
|
|
3057
|
-
|
|
3058
|
-
|
|
3059
|
-
|
|
3060
|
-
const splits = (_b = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : '0';
|
|
3061
|
-
splits.forEach((split) => data = [...data, split]);
|
|
3062
|
-
});
|
|
3063
|
-
const sqlGroups = [
|
|
3064
|
-
`${this.$constants('SELECT')}`,
|
|
3065
|
-
`*`,
|
|
3066
|
-
`${this.$constants('FROM')}`,
|
|
3067
|
-
`${this.$state.get('TABLE_NAME')}`,
|
|
3068
|
-
`${this.$constants('WHERE')} id`,
|
|
3069
|
-
`${this.$constants('IN')}`,
|
|
3070
|
-
`(${data.map((a) => `'${a}'`).join(',') || ['0']})`
|
|
3071
|
-
].join(' ');
|
|
3072
|
-
const groups = yield this._queryStatement(sqlGroups);
|
|
3073
|
-
const resultData = results.map((result) => {
|
|
3074
|
-
const id = result[column];
|
|
3075
|
-
const newData = groups.filter((data) => data[column] === id);
|
|
3076
|
-
return ({
|
|
3077
|
-
[column]: id,
|
|
3078
|
-
data: newData
|
|
3079
|
-
});
|
|
3080
|
-
});
|
|
3081
|
-
return this._resultHandler(resultData);
|
|
3049
|
+
const results = yield this.get();
|
|
3050
|
+
const mapping = [...results]
|
|
3051
|
+
.reduce((prev, curr) => {
|
|
3052
|
+
const key = +curr[column];
|
|
3053
|
+
if (!prev[key]) {
|
|
3054
|
+
prev[key] = [];
|
|
3055
|
+
}
|
|
3056
|
+
prev[key].push(Object.assign({}, curr));
|
|
3057
|
+
return prev;
|
|
3058
|
+
}, {});
|
|
3059
|
+
return this._resultHandler(mapping);
|
|
3082
3060
|
});
|
|
3083
3061
|
}
|
|
3084
3062
|
/**
|
|
3085
3063
|
*
|
|
3086
|
-
* The '
|
|
3064
|
+
* The 'findGroupBy' method is used to execute a database query and retrieve the result set that matches the query conditions.
|
|
3087
3065
|
*
|
|
3088
3066
|
* It retrieves multiple records from a database table based on the criteria specified in the query.
|
|
3089
3067
|
*
|