nsgm-cli 2.1.13 → 2.1.15

package/lib/generators/sql-generator.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SQLGenerator = void 0;
+const base_generator_1 = require("./base-generator");
+/**
+ * SQL生成器
+ * 专门负责生成数据库表结构
+ */
+class SQLGenerator extends base_generator_1.BaseGenerator {
+    generate() {
+        const fieldDefinitions = this.fields.map((field) => {
+            let sql = `  \`${field.name}\``;
+            // 数据类型
+            sql += ` ${this.getSQLType(field)}`;
+            // 是否必填
+            if (field.required && !field.isAutoIncrement) {
+                sql += ' NOT NULL';
+            }
+            else if (!field.required) {
+                sql += ' DEFAULT NULL';
+            }
+            // 自增
+            if (field.isAutoIncrement) {
+                sql += ' AUTO_INCREMENT';
+            }
+            // 默认值
+            if (field.type === 'timestamp' && field.name === 'create_date') {
+                sql += ' DEFAULT CURRENT_TIMESTAMP(3)';
+            }
+            else if (field.type === 'timestamp' && field.name === 'update_date') {
+                sql += ' DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)';
+            }
+            else if (field.type === 'varchar' && field.name !== 'id' && !field.required) {
+                sql += " DEFAULT ''";
+            }
+            // 注释
+            if (field.comment) {
+                sql += ` COMMENT '${field.comment}'`;
+            }
+            return sql;
+        });
+        const primaryKeyField = this.fields.find((f) => f.isPrimaryKey);
+        const primaryKey = primaryKeyField ? `  PRIMARY KEY (\`${primaryKeyField.name}\`)` : '';
+        return `use crm_demo;
+
+CREATE TABLE \`${this.controller}\` (
+${fieldDefinitions.join(',\n')},
+${primaryKey}
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;`;
+    }
+}
+exports.SQLGenerator = SQLGenerator;

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 #! /usr/bin/env node
-export declare const startExpress: (options: any, callback?: () => void) => void;
+export declare const startExpress: (options: any, callback?: () => void, command?: string) => void;

package/lib/index.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startExpress = void 0;
 // 加载环境变量
-require('dotenv').config();
+require('dotenv').config({ quiet: true });
 // 仅在开发环境中禁用TLS证书验证
 if (process.env.NODE_ENV === 'development') {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -16,24 +16,17 @@ const express_1 = __importDefault(require("express"));
 const url_1 = require("url");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
 const body_parser_1 = __importDefault(require("body-parser"));
 const express_fileupload_1 = __importDefault(require("express-fileupload"));
-const args_1 = require("./args");
 const graphql_1 = __importDefault(require("./server/graphql"));
 const config_1 = __importDefault(require("next/config"));
-const generate_1 = require("./generate");
-const lodash_1 = __importDefault(require("lodash"));
 const cors_1 = __importDefault(require("cors"));
 const express_session_1 = __importDefault(require("express-session"));
 const csrf_1 = require("./server/csrf");
+const cli_1 = require("./cli");
 const { resolve } = path_1.default;
 const curFolder = process.cwd();
-const processArgvs = (0, args_1.getProcessArgvs)(2);
-// console.log('processArgvs', processArgvs)
-const { command, dictionary, controller, action } = processArgvs;
-// console.log('processArgvs', processArgvs)
-const handleServer = (server, prefix) => {
+const handleServer = (server, prefix, _command) => {
     // 本项目路径是 NSGM-CLI/server 目录，生成项目路径是 generation/server 目录
     const serverPath = resolve(`${curFolder}/server/`);
     if (fs_1.default.existsSync(serverPath)) {
@@ -48,7 +41,6 @@ const handleServer = (server, prefix) => {
                 if (item.indexOf('.') !== -1) {
                     filename = item.split('.')[0];
                 }
-                // console.log('resolverPath', resolverPath, filename)
                 if (server && filename !== undefined && filename !== '') {
                     try {
                         const routeModule = require(resolverPath);
@@ -71,7 +63,7 @@ const handleServer = (server, prefix) => {
         });
     }
 };
-const startExpress = (options, callback) => {
+const startExpress = (options, callback, command = 'dev') => {
     // console.info('startExpress', curFolder)
     const app = (0, next_1.default)(options);
     const handle = app.getRequestHandler();
@@ -105,18 +97,18 @@ const startExpress = (options, callback) => {
                 httpOnly: true,
                 maxAge: 24 * 60 * 60 * 1000, // 24小时
                 sameSite: 'lax', // 设置 SameSite 策略
-                domain: undefined // 不设置 domain，使用默认
-            }
+                domain: undefined, // 不设置 domain，使用默认
+            },
         }));
         // 初始化 CSRF token - 移除全局初始化，让每个端点自己处理
         // server.use(setupCSRFToken)
         server.use(body_parser_1.default.urlencoded({
-            extended: false
+            extended: false,
         }));
         // 支持跨域，nsgm export 之后前后分离
         server.use((0, cors_1.default)({
             credentials: true, // 允许发送 cookies
-            origin: process.env.ALLOWED_ORIGINS?.split(',') || ['http://localhost:3000']
+            origin: process.env.ALLOWED_ORIGINS?.split(',') || ['http://localhost:3000'],
         }));
         server.use(body_parser_1.default.json());
         // 添加基本安全中间件
@@ -139,10 +131,9 @@ const startExpress = (options, callback) => {
             server.use(`${prefix}/static`, express_1.default.static(path_1.default.join(__dirname, 'public')));
             server.use(`${prefix}/graphql`, (0, graphql_1.default)(command));
         }
-        handleServer(server, prefix);
+        handleServer(server, prefix, command);
         server.get('*', (req, res) => {
             const { url } = req;
-            // console.log('url: ' + url)
             const parsedUrl = (0, url_1.parse)(url, true);
             return handle(req, res, parsedUrl);
         });
@@ -156,158 +147,8 @@ const startExpress = (options, callback) => {
     });
 };
 exports.startExpress = startExpress;
-console.log();
-switch (command) {
-    case 'dev':
-        (0, exports.startExpress)({ dev: true }, undefined);
-        break;
-    case 'start':
-        (0, exports.startExpress)({ dev: false }, undefined);
-        break;
-    case 'build':
-        (0, child_process_1.exec)('next build', {}, (err, stdout) => {
-            if (err) {
-                console.log(err);
-                return;
-            }
-            console.log(`stdout: ${stdout}`);
-            process.exit(0);
-        });
-        break;
-    case 'export':
-        let shellCommand = `next ${command}`;
-        // console.log('dictionary', dictionary)
-        if (dictionary === '') {
-            shellCommand += ' -o webapp';
-        }
-        else {
-            shellCommand += ` -o ${dictionary}`;
-        }
-        (0, child_process_1.exec)(shellCommand, {}, (err, stdout) => {
-            if (err) {
-                console.log(err);
-                return;
-            }
-            console.log(`stdout: ${stdout}`);
-            process.exit(0);
-        });
-        break;
-    case '-i':
-    case 'init':
-    case '--init':
-        let initFlag = true;
-        // console.log('process.argv', process.argv)
-        const argvArr = process.argv;
-        const argvArrLen = argvArr.length;
-        let fileName = '';
-        if (argvArrLen > 2) {
-            fileName = argvArr[2];
-        }
-        else if (argvArrLen > 1) {
-            fileName = argvArr[1];
-        }
-        // console.log('fileName', fileName)
-        if (fileName !== '') {
-            if (fileName.indexOf('\\') !== -1) {
-                fileName = fileName.replace(/\\/g, '/');
-                // console.log('fileName2', fileName)
-            }
-            const fileNameArr = fileName.split('/');
-            const fileNameArrLen = fileNameArr.length;
-            const fileNameStr = fileNameArr[fileNameArrLen - 1];
-            // console.log('fileNameStr', fileNameStr)
-            if (fileNameStr === 'app') {
-                initFlag = false;
-            }
-            lodash_1.default.each(fileNameArr, (item) => {
-                if (item === 'pm2') {
-                    initFlag = false;
-                    return false;
-                }
-                return;
-            });
-        }
-        console.log('initFlag', initFlag);
-        if (initFlag) {
-            (0, generate_1.initFiles)(dictionary);
-        }
-        process.exit(0);
-    case '-u':
-    case 'upgrade':
-    case '--upgrade':
-        (0, generate_1.initFiles)(dictionary, true);
-        process.exit(0);
-    case '-c':
-    case 'create':
-    case '--create':
-        console.log(command, controller, action);
-        if (controller !== '') {
-            if (action === '') {
-                (0, generate_1.createFiles)(controller, 'manage');
-            }
-            else {
-                (0, generate_1.createFiles)(controller, action);
-            }
-        }
-        break;
-    case '-d':
-    case 'delete':
-    case '--delete':
-        console.log(command, controller, action);
-        if (controller !== '') {
-            if (action === '' || action === 'all') {
-                (0, generate_1.deleteFiles)(controller, 'all');
-            }
-            else {
-                (0, generate_1.deleteFiles)(controller, action);
-            }
-        }
-        break;
-    case '-db':
-    case 'deletedb':
-    case '--deletedb':
-        console.log(command, controller, action);
-        if (controller !== '') {
-            if (action === '' || action === 'all') {
-                (0, generate_1.deleteFiles)(controller, 'all', true);
-            }
-            else {
-                (0, generate_1.deleteFiles)(controller, action);
-            }
-        }
-        break;
-    case '-v':
-    case 'version':
-    case '--version':
-        const { version } = require('../package.json');
-        console.log(`version: ${version}`);
-        /*
-        startExpress({ dev: true, quiet: true, dir: '.' }, () => {
-          const nextConfig = getConfig()
-          const { publicRuntimeConfig } = nextConfig
-          const { version } = publicRuntimeConfig
-          console.log('version: ' + version)
-          process.exit(0)
-        })
-        */
-        process.exit(0);
-    case '-h':
-    case 'help':
-    case '--help':
-    default:
-        console.log('Welcome to use NSGM');
-        console.log(`   -h or help: get nsgm help infomation`);
-        console.log(`   -v or version: get nsgm version`);
-        console.log(`   -i or init: nsgm init dictionary (default dictionary is .)`);
-        console.log(`   -u or upgrade: nsgm upgrade`);
-        console.log(`   -c or create: nsgm create controller action (default action is manage)`);
-        console.log(`   -d or delete: nsgm delete controller action (default action is manage)`);
-        console.log(`   dev: nsgm dev (development mode)`);
-        console.log(`   build: nsgm build (production mode)`);
-        console.log(`   start: nsgm start (production mode)`);
-        console.log(`   export: nsgm export dictionary (default dictionary is webapp)`);
-        console.log('Happy to use');
-        console.log('If you have some question, please contact Erishen (787058731@qq.com). Thanks!');
-        break;
-}
-console.log();
+// 使用新的 CLI 架构
+(0, cli_1.runCli)().catch((error) => {
+    console.error('CLI 执行失败:', error);
+    process.exit(1);
+});

package/lib/server/csrf.js

@@ -12,7 +12,7 @@ const luscaConfig = {
         header: 'x-csrf-token', // 从 header 中读取 token
         cookie: '_csrf', // cookie 名称
         key: 'csrf', // session key
-        secret: process.env.CSRF_SECRET || 'your-csrf-secret-change-in-production'
+        secret: process.env.CSRF_SECRET || 'your-csrf-secret-change-in-production',
     },
     // 内容安全策略
     csp: {
@@ -22,18 +22,17 @@ const luscaConfig = {
             'style-src': "'self' 'unsafe-inline'",
             'img-src': "'self' data: https:",
             'font-src': "'self' https:",
-            'connect-src': "'self'"
-        }
+            'connect-src': "'self'",
+        },
     },
     // 其他安全设置
     xframe: 'SAMEORIGIN',
     nosniff: true,
     xssProtection: true,
-    referrerPolicy: 'same-origin'
+    referrerPolicy: 'same-origin',
 };
 // 条件性 CSRF 保护中间件
 const csrfProtection = (req, res, next) => {
-    // console.log('CSRF 中间件 - 路径:', req.path, '方法:', req.method)
     // 跳过 GET 请求和某些不需要 CSRF 保护的路径
     if (req.method === 'GET' ||
         req.path.startsWith('/static') ||
@@ -41,11 +40,9 @@ const csrfProtection = (req, res, next) => {
         req.path.startsWith('/_next') || // Next.js 内部资源
         req.path.startsWith('/__next') // Next.js 开发模式内部端点
     ) {
-        // console.log('CSRF 中间件 - 跳过保护')
         return next();
     }
     // 对其他请求应用 Lusca CSRF 保护
-    // console.log('CSRF 中间件 - 应用 Lusca 保护')
     return lusca_1.default.csrf(luscaConfig.csrf)(req, res, next);
 };
 exports.csrfProtection = csrfProtection;
@@ -58,18 +55,14 @@ const getCSRFToken = (req, res) => {
             // 如果没有 token，先生成一个
             lusca_1.default.csrf(luscaConfig.csrf)(req, res, () => {
                 const newToken = req.session._csrf || req.session[luscaConfig.csrf.key] || req.csrfToken?.();
-                // console.log('生成新的 CSRF token:', newToken)
-                // console.log('Token 生成时的 Session ID:', req.sessionID)
                 res.json({
-                    csrfToken: newToken
+                    csrfToken: newToken,
                 });
             });
         }
         else {
-            // console.log('返回现有 CSRF token:', csrfToken)
-            // console.log('Token 生成时的 Session ID:', req.sessionID)
             res.json({
-                csrfToken: csrfToken
+                csrfToken: csrfToken,
             });
         }
     }
@@ -77,7 +70,7 @@ const getCSRFToken = (req, res) => {
         console.error('获取 CSRF token 错误:', error);
         res.status(500).json({
             error: 'Failed to generate CSRF token',
-            message: '生成 CSRF 令牌失败'
+            message: '生成 CSRF 令牌失败',
         });
     }
 };
@@ -89,8 +82,8 @@ exports.securityMiddleware = {
         xframe: luscaConfig.xframe,
         nosniff: luscaConfig.nosniff,
         xssProtection: luscaConfig.xssProtection,
-        referrerPolicy: luscaConfig.referrerPolicy
-    })
+        referrerPolicy: luscaConfig.referrerPolicy,
+    }),
 };
 // CSP 中间件
 const createCSPMiddleware = () => {

package/lib/server/db.js

@@ -20,7 +20,6 @@ const getMysqlConfig = () => {
             mysqlConfig = require('../../mysql.config.js');
         }
     }
-    // console.log('mysqlConfig', mysqlConfig)
     return mysqlConfig;
 };
 // 创建连接池
@@ -39,7 +38,7 @@ const createPool = ({ user, password, host, port, database }) => {
                 maxIdle: 10, // 最大空闲连接数
                 multipleStatements: false, // 禁用多语句查询以提高安全性
                 bigNumberStrings: true, // 将大数字作为字符串返回
-                supportBigNumbers: true // 支持大数字
+                supportBigNumbers: true, // 支持大数字
             });
             // 监听连接池事件
             pool.on('connection', (connection) => {
@@ -101,7 +100,7 @@ const executePaginatedQuery = async (sql, countSql, values, countValues = []) =>
         const [results, countResults] = await Promise.all([executeQuery(sql, values), executeQuery(countSql, countValues)]);
         return {
             totalCounts: countResults[0].counts,
-            items: results
+            items: results,
         };
     }
     catch (error) {
@@ -141,13 +140,13 @@ const mysqlConnect = ({ user, password, host, port, database }) => {
                         resolve(connection);
                     }
                     else {
-                        console.log('err_mysqlConnect: ', err);
+                        console.error('err_mysqlConnect: ', err);
                         reject();
                     }
                 });
             }
             catch (e) {
-                console.log('e_mysqlConnect: ', e);
+                console.error('e_mysqlConnect: ', e);
                 reject();
             }
         }
@@ -167,7 +166,7 @@ const getConnection = () => {
                     mysqlConnect(mysqlOptions)
                         .then(resolve)
                         .catch((err) => {
-                        console.log('e_getConnection');
+                        console.error('e_getConnection', err);
                         reject(err);
                     });
                 }
@@ -188,5 +187,5 @@ exports.default = {
     getPool, // 新的连接池方法
     executeQuery, // 新的查询方法
     executePaginatedQuery, // 新的分页查询方法
-    closePool // 关闭连接池方法
+    closePool, // 关闭连接池方法
 };

package/lib/server/graphql.js

@@ -35,7 +35,7 @@ const handleOutPlugins = () => {
                 const pluginModule = require(resolverPath);
                 result = {
                     ...result,
-                    ...(pluginModule.default || pluginModule)
+                    ...(pluginModule.default || pluginModule),
                 };
             }
         });
@@ -50,7 +50,7 @@ function generateTypeDefsAndResolvers() {
     if (process.env.NODE_ENV === 'production' && cachedSchema && cachedResolvers) {
         return {
             schemaStr: cachedSchema,
-            resolvers: cachedResolvers
+            resolvers: cachedResolvers,
         };
     }
     const querySchemes = ['_: Boolean'];
@@ -59,14 +59,13 @@ function generateTypeDefsAndResolvers() {
     const typeSchemes = [];
     const resolvers = {
         ...date_1.default,
-        ...handleOutPlugins()
+        ...handleOutPlugins(),
     };
     const scalars = lodash_1.default.keys(resolvers);
     let scalarStr = '';
     lodash_1.default.each(scalars, (item) => {
         scalarStr += `scalar ${item}\n    `;
     });
-    // console.log('resolvers', resolvers, _.keys(resolvers), scalarStr)
     const _generateAllComponentRecursive = (path = defaultPath) => {
         if (!fs_1.default.existsSync(path))
             return;
@@ -149,7 +148,7 @@ function generateTypeDefsAndResolvers() {
     return { querySchemes, mutationSchemes, subscriptionSchemes, typeSchemes, resolvers, scalarStr, schemaStr };
 }
 const generateResult = generateTypeDefsAndResolvers();
-const { querySchemes: querySchemesV, mutationSchemes: mutationSchemesV, subscriptionSchemes: subscriptionSchemesV, typeSchemes: typeSchemesV, resolvers: resolversV, scalarStr: scalarStrV, schemaStr: generatedSchemaStr } = generateResult;
+const { querySchemes: querySchemesV, mutationSchemes: mutationSchemesV, subscriptionSchemes: subscriptionSchemesV, typeSchemes: typeSchemesV, resolvers: resolversV, scalarStr: scalarStrV, schemaStr: generatedSchemaStr, } = generateResult;
 // 导出 handler 函数，兼容 express 用法
 const handler = (command) => {
     const schemaStr = generatedSchemaStr ||
@@ -177,7 +176,7 @@ const handler = (command) => {
     // graphql-http 不再内置 graphiql，需手动集成 playground 或 altair，以下为基础 handler
     return (0, express_1.createHandler)({
         schema: (0, graphql_1.buildSchema)(schemaStr),
-        rootValue: resolversV
+        rootValue: resolversV,
     });
 };
 exports.default = handler;

package/lib/server/plugins/date.js

@@ -35,6 +35,6 @@ const customScalarDate = new graphql_1.GraphQLScalarType({
             return date.valueOf();
         }
         return null;
-    }
+    },
 });
 exports.default = { Date: customScalarDate };

package/lib/server/utils/graphql-cache.js

@@ -27,7 +27,7 @@ const graphqlCacheMiddleware = (req, res, next) => {
             if (!data.errors) {
                 queryCache.set(cacheKey, {
                     data,
-                    timestamp: now
+                    timestamp: now,
                 });
                 // 清理过期缓存
                 cleanExpiredCache();
@@ -62,8 +62,8 @@ const getCacheStats = () => {
         size: queryCache.size,
         entries: Array.from(queryCache.keys()).map((key) => ({
             query: `${key.substring(0, 100)}...`,
-            age: Date.now() - queryCache.get(key).timestamp
-        }))
+            age: Date.now() - queryCache.get(key).timestamp,
+        })),
     };
 };
 exports.getCacheStats = getCacheStats;