Skip to content

Commit 133e73b

Browse files
erishenerishen
committed
update
1 parent fa4cd40 commit 133e73b

2 files changed

Lines changed: 30 additions & 32 deletions

File tree

‎lib/generators/resolver-generator.js‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
1111
return `\`${this.controller}\``;
1212
}
1313
generate() {
14-
// Variables used in generated template string (prefixed with _ to satisfy ESLint)
15-
// @ts-ignore - Variable is used in generated template string
14+
// @ts-ignore - Used in string concatenation for generated code
1615
const _selectFields = this.fields.map((f) => f.name).join(", ");
1716
const insertFields = this.getFormFields();
1817
const searchableFields = this.getSearchableFields();
19-
// @ts-ignore - Variable is used in generated template string
18+
// @ts-ignore - Used in string concatenation for generated code
2019
const _quotedTableName = this.getQuotedTableName();
21-
// @ts-ignore - Variable is used in generated template string
20+
// @ts-ignore - Used in string concatenation for generated code
2221
const _insertFieldNames = insertFields.map((f) => f.name).join(", ");
23-
// @ts-ignore - Variable is used in generated template string
22+
// @ts-ignore - Used in string concatenation for generated code
2423
const _insertPlaceholders = insertFields.map(() => "?").join(", ");
2524
const insertValues = insertFields
2625
.map((f) => {
@@ -31,7 +30,7 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
3130
})
3231
.join(", ");
3332
const searchConditions = this.generateSearchConditions(searchableFields);
34-
// @ts-ignore - Variable is used in generated template string
33+
// @ts-ignore - Used in string concatenation for generated code
3534
const _updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
3635
return `const { executeQuery, executePaginatedQuery } = require('../../utils/common')
3736
const { validateInteger, validatePagination, validateId } = require('../../utils/validation')
@@ -42,8 +41,8 @@ module.exports = {
4241
try {
4342
const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
4443
45-
const sql = \`SELECT \${_selectFields} FROM \${_quotedTableName} LIMIT ? OFFSET ?\`;
46-
const countSql = \`SELECT COUNT(*) as counts FROM \${_quotedTableName}\`;
44+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' LIMIT ? OFFSET ?';
45+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName;
4746
const values = [validPageSize, validPage * validPageSize];
4847
4948
console.log('执行分页查询:', { sql, values, countSql });
@@ -113,8 +112,8 @@ module.exports = {
113112
let whereSql = '';
114113
${searchConditions}
115114
116-
const sql = \`SELECT \${_selectFields} FROM \${_quotedTableName} WHERE 1=1\${whereSql} LIMIT ? OFFSET ?\`;
117-
const countSql = \`SELECT COUNT(*) as counts FROM \${_quotedTableName} WHERE 1=1\${whereSql}\`;
115+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql + ' LIMIT ? OFFSET ?';
116+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql;
118117
119118
values.push(validPageSize, validPage * validPageSize);
120119
@@ -132,7 +131,7 @@ ${searchConditions}
132131
try {
133132
${this.generateNewValidationCalls(insertFields)}
134133
135-
const sql = \`INSERT INTO \${_quotedTableName} (\${_insertFieldNames}) VALUES (\${_insertPlaceholders})\`;
134+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES (' + _insertPlaceholders + ')';
136135
const values = [${insertValues}];
137136
138137
console.log('添加${this.controller}:', { sql, values });
@@ -171,8 +170,8 @@ ${this.generateBatchValidation(insertFields)}
171170
}
172171
});
173172
174-
const placeholders = validatedDatas.map(() => \`(\${_insertPlaceholders})\`).join(',');
175-
const sql = \`INSERT INTO \${_quotedTableName} (\${_insertFieldNames}) VALUES \${placeholders}\`;
173+
const placeholders = validatedDatas.map(() => '(' + _insertPlaceholders + ')').join(',');
174+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES ' + placeholders;
176175
const values = validatedDatas.flatMap(data => [${this.generateBatchInsertValues(insertFields)}]);
177176
178177
console.log('批量添加${this.controller}:', { sql, values });
@@ -196,7 +195,7 @@ ${this.generateBatchValidation(insertFields)}
196195
197196
${this.generateUpdateValidation(insertFields)}
198197
199-
const sql = \`UPDATE \${_quotedTableName} SET \${_updateFields} WHERE id = ?\`;
198+
const sql = 'UPDATE ' + _quotedTableName + ' SET ' + _updateFields + ' WHERE id = ?';
200199
const values = [${this.generateUpdateValues(insertFields)}, validId];
201200
202201
console.log('更新${this.controller}:', { sql, values });
@@ -225,7 +224,7 @@ ${this.generateUpdateValidation(insertFields)}
225224
try {
226225
const validId = validateId(id);
227226
228-
const sql = \`DELETE FROM \${_quotedTableName} WHERE id = ?\`;
227+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id = ?';
229228
const values = [validId];
230229
231230
console.log('删除${this.controller}:', { sql, values });
@@ -266,7 +265,7 @@ ${this.generateUpdateValidation(insertFields)}
266265
});
267266
268267
const placeholders = validIds.map(() => '?').join(',');
269-
const sql = \`DELETE FROM \${_quotedTableName} WHERE id IN (\${placeholders})\`;
268+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id IN (' + placeholders + ')';
270269
271270
console.log('批量删除${this.controller}:', { sql, values: validIds });
272271

‎src/generators/resolver-generator.ts‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ export class ResolverGenerator extends BaseGenerator {
1010
}
1111

1212
generate(): string {
13-
// Variables used in generated template string (prefixed with _ to satisfy ESLint)
14-
// @ts-ignore - Variable is used in generated template string
13+
// @ts-ignore - Used in string concatenation for generated code
1514
const _selectFields = this.fields.map((f) => f.name).join(", ");
1615
const insertFields = this.getFormFields();
1716
const searchableFields = this.getSearchableFields();
18-
// @ts-ignore - Variable is used in generated template string
17+
// @ts-ignore - Used in string concatenation for generated code
1918
const _quotedTableName = this.getQuotedTableName();
20-
// @ts-ignore - Variable is used in generated template string
19+
// @ts-ignore - Used in string concatenation for generated code
2120
const _insertFieldNames = insertFields.map((f) => f.name).join(", ");
22-
// @ts-ignore - Variable is used in generated template string
21+
// @ts-ignore - Used in string concatenation for generated code
2322
const _insertPlaceholders = insertFields.map(() => "?").join(", ");
2423
const insertValues = insertFields
2524
.map((f) => {
@@ -31,7 +30,7 @@ export class ResolverGenerator extends BaseGenerator {
3130
.join(", ");
3231

3332
const searchConditions = this.generateSearchConditions(searchableFields);
34-
// @ts-ignore - Variable is used in generated template string
33+
// @ts-ignore - Used in string concatenation for generated code
3534
const _updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
3635

3736
return `const { executeQuery, executePaginatedQuery } = require('../../utils/common')
@@ -43,8 +42,8 @@ module.exports = {
4342
try {
4443
const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
4544
46-
const sql = \`SELECT \${_selectFields} FROM \${_quotedTableName} LIMIT ? OFFSET ?\`;
47-
const countSql = \`SELECT COUNT(*) as counts FROM \${_quotedTableName}\`;
45+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' LIMIT ? OFFSET ?';
46+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName;
4847
const values = [validPageSize, validPage * validPageSize];
4948
5049
console.log('执行分页查询:', { sql, values, countSql });
@@ -114,8 +113,8 @@ module.exports = {
114113
let whereSql = '';
115114
${searchConditions}
116115
117-
const sql = \`SELECT \${_selectFields} FROM \${_quotedTableName} WHERE 1=1\${whereSql} LIMIT ? OFFSET ?\`;
118-
const countSql = \`SELECT COUNT(*) as counts FROM \${_quotedTableName} WHERE 1=1\${whereSql}\`;
116+
const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql + ' LIMIT ? OFFSET ?';
117+
const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql;
119118
120119
values.push(validPageSize, validPage * validPageSize);
121120
@@ -133,7 +132,7 @@ ${searchConditions}
133132
try {
134133
${this.generateNewValidationCalls(insertFields)}
135134
136-
const sql = \`INSERT INTO \${_quotedTableName} (\${_insertFieldNames}) VALUES (\${_insertPlaceholders})\`;
135+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES (' + _insertPlaceholders + ')';
137136
const values = [${insertValues}];
138137
139138
console.log('添加${this.controller}:', { sql, values });
@@ -172,8 +171,8 @@ ${this.generateBatchValidation(insertFields)}
172171
}
173172
});
174173
175-
const placeholders = validatedDatas.map(() => \`(\${_insertPlaceholders})\`).join(',');
176-
const sql = \`INSERT INTO \${_quotedTableName} (\${_insertFieldNames}) VALUES \${placeholders}\`;
174+
const placeholders = validatedDatas.map(() => '(' + _insertPlaceholders + ')').join(',');
175+
const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES ' + placeholders;
177176
const values = validatedDatas.flatMap(data => [${this.generateBatchInsertValues(insertFields)}]);
178177
179178
console.log('批量添加${this.controller}:', { sql, values });
@@ -197,7 +196,7 @@ ${this.generateBatchValidation(insertFields)}
197196
198197
${this.generateUpdateValidation(insertFields)}
199198
200-
const sql = \`UPDATE \${_quotedTableName} SET \${_updateFields} WHERE id = ?\`;
199+
const sql = 'UPDATE ' + _quotedTableName + ' SET ' + _updateFields + ' WHERE id = ?';
201200
const values = [${this.generateUpdateValues(insertFields)}, validId];
202201
203202
console.log('更新${this.controller}:', { sql, values });
@@ -226,7 +225,7 @@ ${this.generateUpdateValidation(insertFields)}
226225
try {
227226
const validId = validateId(id);
228227
229-
const sql = \`DELETE FROM \${_quotedTableName} WHERE id = ?\`;
228+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id = ?';
230229
const values = [validId];
231230
232231
console.log('删除${this.controller}:', { sql, values });
@@ -267,7 +266,7 @@ ${this.generateUpdateValidation(insertFields)}
267266
});
268267
269268
const placeholders = validIds.map(() => '?').join(',');
270-
const sql = \`DELETE FROM \${_quotedTableName} WHERE id IN (\${placeholders})\`;
269+
const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id IN (' + placeholders + ')';
271270
272271
console.log('批量删除${this.controller}:', { sql, values: validIds });
273272

0 commit comments

Comments
 (0)