nsgm-cli 2.1.41 → 2.1.43

package/README.md

@@ -113,7 +113,7 @@ cp .env.example .env
 
 ```bash
 # Generate secure password hash
-npm run generate-password yourNewPassword
+pnpm run generate-password yourNewPassword
 
 # Edit .env file with generated hash
 nano .env
@@ -123,10 +123,10 @@ nano .env
 
 ```bash
 # Install dependencies
-npm install
+pnpm install
 
 # Start development server
-npm run dev
+pnpm run dev
 ```
 
 Your application will be available at `http://localhost:3000` with:
@@ -173,9 +173,9 @@ nsgm upgrade                 # Upgrade project base files
 nsgm export                  # Export static pages
 
 # Development tools
-npm run lint                 # Code linting
-npm run test                 # Run tests
-npm run test:coverage        # Test coverage report
+pnpm run lint                 # Code linting
+pnpm run test                 # Run tests
+pnpm run test:coverage        # Test coverage report
 ```
 
 ## 🎨 Generated Controller Features

package/client/components/ClientProviders.tsx

@@ -1,14 +1,14 @@
-import React, { useEffect, useState } from "react";
+import { useEffect, useState, ReactNode, FC } from "react";
 import { ThemeProvider } from "styled-components";
 import { GlobalStyle } from "@/styled/common";
 
 interface ClientProvidersProps {
-  children: React.ReactNode;
+  children: ReactNode;
   theme: any;
   whiteColor?: boolean;
 }
 
-const ClientProviders: React.FC<ClientProvidersProps> = ({ children, theme, whiteColor = true }) => {
+const ClientProviders: FC<ClientProvidersProps> = ({ children, theme, whiteColor = true }) => {
   const [isClient, setIsClient] = useState(false);
 
   useEffect(() => {

package/client/components/LanguageSwitcher.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import { useEffect, useState, CSSProperties, FC } from "react";
 import { Select } from "antd";
 import { useRouter } from "next/router";
 import { GlobalOutlined } from "@ant-design/icons";
@@ -6,11 +6,11 @@ import { GlobalOutlined } from "@ant-design/icons";
 const { Option } = Select;
 
 interface LanguageSwitcherProps {
-  style?: React.CSSProperties;
+  style?: CSSProperties;
   size?: "small" | "middle" | "large";
 }
 
-const LanguageSwitcher: React.FC<LanguageSwitcherProps> = ({ style, size = "middle" }) => {
+const LanguageSwitcher: FC<LanguageSwitcherProps> = ({ style, size = "middle" }) => {
   const router = useRouter();
   const [mounted, setMounted] = useState(false);
   const [currentLocale, setCurrentLocale] = useState("zh-CN");

package/client/layout/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import { useEffect, useState, ReactNode } from "react";
 import { Layout, Menu, Dropdown, Space } from "antd";
 import {
   Container,
@@ -28,7 +28,7 @@ interface MenuItem {
   key: string;
   text: string;
   url: string;
-  icon?: React.ReactNode;
+  icon?: ReactNode;
   subMenus?: SubMenuItem[];
 }
 

package/client/styled/template/manage.ts

@@ -171,7 +171,7 @@ export const StyledInput = styled(Input)`
   box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
 `;
 
-export const StyledTable = styled(Table)`
+export const StyledTable: any = styled(Table)`
   margin-top: 16px;
   border-radius: 12px;
   overflow: hidden;

package/generation/README.md

@@ -17,27 +17,27 @@
 
 | 命令             | 说明         |
 | ---------------- | ------------ |
-| `npm run dev`    | 开发模式     |
-| `npm run start`  | 生产模式     |
-| `npm run build`  | 编译项目     |
-| `npm run export` | 导出静态页面 |
+| `pnpm run dev`    | 开发模式     |
+| `pnpm run start`  | 生产模式     |
+| `pnpm run build`  | 编译项目     |
+| `pnpm run export` | 导出静态页面 |
 
 ### 测试命令
 
 | 命令                    | 说明             |
 | ----------------------- | ---------------- |
-| `npm test`              | 运行所有测试     |
-| `npm run test:watch`    | 监视模式运行测试 |
-| `npm run test:coverage` | 生成覆盖率报告   |
+| `pnpm test`              | 运行所有测试     |
+| `pnpm run test:watch`    | 监视模式运行测试 |
+| `pnpm run test:coverage` | 生成覆盖率报告   |
 
 ### 代码生成命令
 
 | 命令                    | 说明                  |
 | ----------------------- | --------------------- |
-| `npm run create`        | 创建模板页面          |
-| `npm run delete`        | 删除模板页面          |
-| `npm run create-config` | 从配置文件批量创建模块 |
-| `npm run delete-config` | 从配置文件批量删除模块 |
+| `pnpm run create`        | 创建模板页面          |
+| `pnpm run delete`        | 删除模板页面          |
+| `pnpm run create-config` | 从配置文件批量创建模块 |
+| `pnpm run delete-config` | 从配置文件批量删除模块 |
 
 ### 项目维护命令
 

package/generation/package.json

@@ -1,6 +1,7 @@
 {
   "name": "nsgm-cli-project",
   "version": "1.0.0",
+  "packageManager": "pnpm@10.28.0",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -27,24 +28,28 @@
     "nsgm-cli": "^2"
   },
   "devDependencies": {
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/lodash": "^4",
-    "typescript": "^5",
-    "jest": "^30",
-    "jest-environment-jsdom": "^30",
-    "@testing-library/jest-dom": "^6",
-    "@testing-library/react": "^14",
-    "@testing-library/user-event": "^14",
-    "@typescript-eslint/eslint-plugin": "^8",
-    "@typescript-eslint/parser": "^8",
-    "@types/jest": "^30",
-    "eslint": "^9",
-    "eslint-config-prettier": "^10",
-    "eslint-plugin-prettier": "^5",
-    "prettier": "^3",
-    "next-i18next": "^15",
-    "react-i18next": "^15",
-    "i18next": "^24"
+    "@types/node": "^24.1.0",
+    "@types/react": "^18.3.23",
+    "@types/react-dom": "^18.3.7",
+    "@types/lodash": "^4.17.20",
+    "@types/express-serve-static-core": "^5.1.1",
+    "@types/qs": "^6.14.0",
+    "@types/hoist-non-react-statics": "^3.3.7",
+    "typescript": "^5.8.3",
+    "jest": "^30.0.5",
+    "jest-environment-jsdom": "^30.0.5",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/jest": "^30.0.5",
+    "@typescript-eslint/eslint-plugin": "^8.38.0",
+    "@typescript-eslint/parser": "^8.38.0",
+    "eslint": "^9.31.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.3",
+    "prettier": "^3.6.2",
+    "next-i18next": "^15.3.0",
+    "react-i18next": "^15.2.0",
+    "i18next": "^24.1.0"
   }
-}
+}

package/lib/generate.js

@@ -13,7 +13,7 @@ const generate_init_1 = require("./generate_init");
 const generate_create_1 = require("./generate_create");
 const generate_delete_1 = require("./generate_delete");
 // 常量提取
-const NPM_INSTALL_FLAGS = "--legacy-peer-deps";
+const PNPM_INSTALL_FLAGS = "--legacy-peer-deps";
 // 辅助函数
 const normalizeDirectory = (dictionary) => {
     // 禁止绝对路径，强制所有生成目录都在 cwd 下
@@ -26,11 +26,11 @@ const installNpmPackages = (targetDir) => {
     try {
         const prefix = targetDir ? `cd ${targetDir} && ` : "";
         console.log("Installing all dependencies from package.json...");
-        const installResult = shelljs_1.default.exec(`${prefix}npm install ${NPM_INSTALL_FLAGS}`);
+        const installResult = shelljs_1.default.exec(`${prefix}pnpm install ${PNPM_INSTALL_FLAGS}`);
         return installResult.code === 0;
     }
     catch (error) {
-        console.error("Failed to install npm packages:", error);
+        console.error("Failed to install pnpm packages:", error);
         return false;
     }
 };

package/lib/generators/dataloader-generator.d.ts

@@ -4,6 +4,14 @@ import { BaseGenerator } from "./base-generator";
  * 自动生成对应的 DataLoader JavaScript 文件
  */
 export declare class DataLoaderGenerator extends BaseGenerator {
+    /**
+     * 可能的 JSON 字段名（需要自动解析）
+     */
+    private jsonFieldNames;
+    /**
+     * 获取可能是 JSON 的字段
+     */
+    private getJsonFields;
     generate(): string;
     /**
      * 生成外键 DataLoader

package/lib/generators/dataloader-generator.js

@@ -7,13 +7,66 @@ const base_generator_1 = require("./base-generator");
  * 自动生成对应的 DataLoader JavaScript 文件
  */
 class DataLoaderGenerator extends base_generator_1.BaseGenerator {
+    constructor() {
+        super(...arguments);
+        /**
+         * 可能的 JSON 字段名（需要自动解析）
+         */
+        this.jsonFieldNames = [
+            "images",
+            "photos",
+            "gallery",
+            "metadata",
+            "attributes",
+            "specs",
+            "options",
+            "settings",
+            "config",
+            "extra",
+            "data",
+            "json",
+            "params",
+        ];
+    }
+    /**
+     * 获取可能是 JSON 的字段
+     */
+    getJsonFields() {
+        return this.fields
+            .filter((f) => this.jsonFieldNames.some((jsonName) => f.name.toLowerCase().includes(jsonName)))
+            .map((f) => f.name);
+    }
     generate() {
         const capitalizedController = this.getCapitalizedController();
         const selectFields = this.fields.map((f) => f.name).join(", ");
+        const jsonFields = this.getJsonFields();
+        const hasJsonFields = jsonFields.length > 0;
         return `const DataLoader = require('dataloader');
 const { executeQuery } = require('../utils/common');
 
-/**
+${hasJsonFields
+            ? `/**
+ * 处理 ${this.controller} 行数据，将 JSON 字符串解析为对象
+ */
+function process${capitalizedController}Row(row) {
+  if (!row) return row;
+  
+${jsonFields
+                .map((field) => `  // 处理 ${field} 字段（JSON 字符串转对象）
+  if (row.${field} && typeof row.${field} === 'string') {
+    try {
+      row.${field} = JSON.parse(row.${field});
+    } catch (e) {
+      row.${field} = ${field === "images" || field === "photos" || field === "gallery" ? "[]" : "{}"};
+    }
+  }`)
+                .join(",\n  ")}
+  
+  return row;
+}
+
+`
+            : ""}/**
  * ${capitalizedController} DataLoader
  * 针对 ${this.controller} 表的批量数据加载器，解决 N+1 查询问题
  */
@@ -31,9 +84,7 @@ class ${capitalizedController}DataLoader {
           const results = await executeQuery(sql, [...ids]);
           
           // 确保返回顺序与输入 keys 一致，未找到的返回 null
-          return ids.map(id => 
-            results.find((row) => row.id === id) || null
-          );
+          return ids.map(id => ${hasJsonFields ? `process${capitalizedController}Row(results.find((row) => row.id === id) || null)` : `results.find((row) => row.id === id) || null`});
         } catch (error) {
           console.error('DataLoader byId 批量加载失败:', error);
           throw error;
@@ -58,9 +109,7 @@ class ${capitalizedController}DataLoader {
           const results = await executeQuery(sql, [...names]);
           
           // 确保返回顺序与输入 keys 一致
-          return names.map(name => 
-            results.find((row) => row.name === name) || null
-          );
+          return names.map(name => ${hasJsonFields ? `process${capitalizedController}Row(results.find((row) => row.name === name) || null)` : `results.find((row) => row.name === name) || null`});
         } catch (error) {
           console.error('DataLoader byName 批量加载失败:', error);
           throw error;
@@ -83,7 +132,8 @@ class ${capitalizedController}DataLoader {
           const results = await Promise.all(
             searchTerms.map(async (term) => {
               const sql = 'SELECT ${selectFields} FROM ${this.controller} WHERE name LIKE ?';
-              return executeQuery(sql, [\`%\${term}%\`]);
+              const rows = await executeQuery(sql, [\`%\${term}%\`]);
+              ${hasJsonFields ? `return rows.map(process${capitalizedController}Row);` : "return rows;"}
             })
           );
           
@@ -100,7 +150,7 @@ class ${capitalizedController}DataLoader {
       }
     );
 
-    ${this.generateForeignKeyLoaders()}
+    ${this.generateForeignKeyLoaders(hasJsonFields, capitalizedController)}
   }
 
   /**
@@ -170,7 +220,7 @@ module.exports = { ${capitalizedController}DataLoader, create${capitalizedContro
     /**
      * 生成外键 DataLoader
      */
-    generateForeignKeyLoaders() {
+    generateForeignKeyLoaders(hasJsonFields, capitalizedController) {
         const foreignKeys = this.fields.filter((f) => f.name.endsWith("_id") && f.name !== "id");
         if (foreignKeys.length === 0) {
             return "";
@@ -193,7 +243,9 @@ module.exports = { ${capitalizedController}DataLoader, create${capitalizedContro
           
           // 按外键分组
           return ${fk.name}s.map(${fk.name} => 
-            results.filter((row) => row.${fk.name} === ${fk.name})
+            results
+              .filter((row) => row.${fk.name} === ${fk.name})
+              ${hasJsonFields ? `.map(process${capitalizedController}Row)` : ""}
           );
         } catch (error) {
           console.error('DataLoader by${capitalizedRelated}Id 批量加载失败:', error);

package/lib/generators/file-generator.js

@@ -180,7 +180,7 @@ export const ModalContainer = styled.div\`
   }
 \`
 
-export const StyledButton = styled(Button)<{ $primary?: boolean; $export?: boolean; $import?: boolean; $danger?: boolean }>\`
+export const StyledButton: any = styled(Button)\`
   display: flex;
   align-items: center;
   border-radius: 6px;
@@ -216,13 +216,13 @@ export const StyledButton = styled(Button)<{ $primary?: boolean; $export?: boole
     \`}
 \`
 
-export const StyledInput = styled(Input)\`
+export const StyledInput: any = styled(Input)\`
   width: 200px;
   border-radius: 6px;
   box-shadow: 0 2px 0 rgba(0, 0, 0, 0.015);
 \`
 
-export const StyledTable = styled(Table)\`
+export const StyledTable: any = styled(Table)\`
   margin-top: 16px;
   border-radius: 8px;
   overflow: hidden;
@@ -254,7 +254,7 @@ export const IconWrapper = styled.i\`
   margin-right: 5px;
 \`
 
-export const RoundedButton = styled(Button)\`
+export const RoundedButton: any = styled(Button)\`
   border-radius: 4px;
 \`
 

package/lib/server/csrf.d.ts

@@ -12,6 +12,6 @@ declare module "express-serve-static-core" {
 export declare const csrfProtection: (req: Request, res: Response, next: NextFunction) => unknown;
 export declare const getCSRFToken: (req: Request, res: Response) => void;
 export declare const securityMiddleware: {
-    basicHeaders: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+    basicHeaders: any;
 };
-export declare const createCSPMiddleware: () => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export declare const createCSPMiddleware: () => any;