nsgm-cli 2.1.36 → 2.1.38

package/lib/generators/resolver-generator.js

@@ -11,16 +11,16 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
         return `\`${this.controller}\``;
     }
     generate() {
-        // @ts-ignore - Variable is used in generated template string
-        const selectFields = this.fields.map((f) => f.name).join(", ");
+        // @ts-ignore - Used in string concatenation for generated code
+        const _selectFields = this.fields.map((f) => f.name).join(", ");
         const insertFields = this.getFormFields();
         const searchableFields = this.getSearchableFields();
-        // @ts-ignore - Variable is used in generated template string
-        const quotedTableName = this.getQuotedTableName();
-        // @ts-ignore - Variable is used in generated template string
-        const insertFieldNames = insertFields.map((f) => f.name).join(", ");
-        // @ts-ignore - Variable is used in generated template string
-        const insertPlaceholders = insertFields.map(() => "?").join(", ");
+        // @ts-ignore - Used in string concatenation for generated code
+        const _quotedTableName = this.getQuotedTableName();
+        // @ts-ignore - Used in string concatenation for generated code
+        const _insertFieldNames = insertFields.map((f) => f.name).join(", ");
+        // @ts-ignore - Used in string concatenation for generated code
+        const _insertPlaceholders = insertFields.map(() => "?").join(", ");
         const insertValues = insertFields
             .map((f) => {
             if (f.type === "integer") {
@@ -30,8 +30,8 @@ class ResolverGenerator extends base_generator_1.BaseGenerator {
         })
             .join(", ");
         const searchConditions = this.generateSearchConditions(searchableFields);
-        // @ts-ignore - Variable is used in generated template string
-        const updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
+        // @ts-ignore - Used in string concatenation for generated code
+        const _updateFields = insertFields.map((f) => `${f.name} = ?`).join(", ");
         return `const { executeQuery, executePaginatedQuery } = require('../../utils/common')
 const { validateInteger, validatePagination, validateId } = require('../../utils/validation')
 
@@ -41,8 +41,8 @@ module.exports = {
         try {
             const { page: validPage, pageSize: validPageSize } = validatePagination(page, pageSize);
 
-            const sql = \`SELECT \${selectFields} FROM \${quotedTableName} LIMIT ? OFFSET ?\`;
-            const countSql = \`SELECT COUNT(*) as counts FROM \${quotedTableName}\`;
+            const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' LIMIT ? OFFSET ?';
+            const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName;
             const values = [validPageSize, validPage * validPageSize];
 
             console.log('执行分页查询:', { sql, values, countSql });
@@ -112,8 +112,8 @@ module.exports = {
             let whereSql = '';
 ${searchConditions}
 
-            const sql = \`SELECT \${selectFields} FROM \${quotedTableName} WHERE 1=1\${whereSql} LIMIT ? OFFSET ?\`;
-            const countSql = \`SELECT COUNT(*) as counts FROM \${quotedTableName} WHERE 1=1\${whereSql}\`;
+            const sql = 'SELECT ' + _selectFields + ' FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql + ' LIMIT ? OFFSET ?';
+            const countSql = 'SELECT COUNT(*) as counts FROM ' + _quotedTableName + ' WHERE 1=1' + whereSql;
 
             values.push(validPageSize, validPage * validPageSize);
 
@@ -131,7 +131,7 @@ ${searchConditions}
         try {
 ${this.generateNewValidationCalls(insertFields)}
 
-            const sql = \`INSERT INTO \${quotedTableName} (\${insertFieldNames}) VALUES (\${insertPlaceholders})\`;
+            const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES (' + _insertPlaceholders + ')';
             const values = [${insertValues}];
 
             console.log('添加${this.controller}:', { sql, values });
@@ -170,8 +170,8 @@ ${this.generateBatchValidation(insertFields)}
                 }
             });
 
-            const placeholders = validatedDatas.map(() => \`(\${insertPlaceholders})\`).join(',');
-            const sql = \`INSERT INTO \${quotedTableName} (\${insertFieldNames}) VALUES \${placeholders}\`;
+            const placeholders = validatedDatas.map(() => '(' + _insertPlaceholders + ')').join(',');
+            const sql = 'INSERT INTO ' + _quotedTableName + ' (' + _insertFieldNames + ') VALUES ' + placeholders;
             const values = validatedDatas.flatMap(data => [${this.generateBatchInsertValues(insertFields)}]);
             
             console.log('批量添加${this.controller}:', { sql, values });
@@ -195,7 +195,7 @@ ${this.generateBatchValidation(insertFields)}
             
 ${this.generateUpdateValidation(insertFields)}
             
-            const sql = \`UPDATE \${quotedTableName} SET \${updateFields} WHERE id = ?\`;
+            const sql = 'UPDATE ' + _quotedTableName + ' SET ' + _updateFields + ' WHERE id = ?';
             const values = [${this.generateUpdateValues(insertFields)}, validId];
             
             console.log('更新${this.controller}:', { sql, values });
@@ -224,7 +224,7 @@ ${this.generateUpdateValidation(insertFields)}
         try {
             const validId = validateId(id);
             
-            const sql = \`DELETE FROM \${quotedTableName} WHERE id = ?\`;
+            const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id = ?';
             const values = [validId];
             
             console.log('删除${this.controller}:', { sql, values });
@@ -265,7 +265,7 @@ ${this.generateUpdateValidation(insertFields)}
             });
             
             const placeholders = validIds.map(() => '?').join(',');
-            const sql = \`DELETE FROM \${quotedTableName} WHERE id IN (\${placeholders})\`;
+            const sql = 'DELETE FROM ' + _quotedTableName + ' WHERE id IN (' + placeholders + ')';
             
             console.log('批量删除${this.controller}:', { sql, values: validIds });