tspace-mysql 1.7.8-beta.1 → 1.7.8-beta.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/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
|
|
@@ -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
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
|
+
// ...
|
|
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"}
|
|
@@ -105,7 +105,7 @@ declare class Model<TS extends Record<string, any> = any, TR = unknown> extends
|
|
|
105
105
|
* }
|
|
106
106
|
* @returns {void} void
|
|
107
107
|
*/
|
|
108
|
-
protected globalScope<
|
|
108
|
+
protected globalScope<M extends Model>(callback: (query: M) => M): this;
|
|
109
109
|
/**
|
|
110
110
|
* The 'define' method is a special method that you can define within a model.
|
|
111
111
|
* @example
|
|
@@ -1485,7 +1485,7 @@ import { alias } from 'yargs';
|
|
|
1485
1485
|
* @param {Function} callback callback query
|
|
1486
1486
|
* @returns {this}
|
|
1487
1487
|
*/
|
|
1488
|
-
whereQuery<
|
|
1488
|
+
whereQuery<M extends Model>(callback: (query: M) => M): this;
|
|
1489
1489
|
/**
|
|
1490
1490
|
* @override
|
|
1491
1491
|
* @param {string[]} columns
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tspace-mysql",
|
|
3
|
-
"version": "1.7.8-beta.
|
|
3
|
+
"version": "1.7.8-beta.2",
|
|
4
4
|
"description": "Tspace MySQL is a promise-based ORM for Node.js, designed with modern TypeScript and providing type safety for schema databases.",
|
|
5
5
|
"main": "build/lib/index.js",
|
|
6
6
|
"types": "build/lib/index.d.ts",
|