nsgm-cli 2.0.25 → 2.1.1

package/babel.config.js

@@ -0,0 +1,18 @@
+module.exports = {
+  presets: [
+    ['next/babel', {
+      'preset-env': {
+        targets: {
+          node: '18'
+        }
+      }
+    }]
+  ],
+  plugins: [
+    ['styled-components', {
+      ssr: true,
+      displayName: true,
+      preprocess: false
+    }]
+  ]
+}

package/client/components/Button.tsx

@@ -0,0 +1,8 @@
+// src/components/Button.js
+import React from 'react';
+
+const Button = ({ onClick, children }) => (
+  <button onClick={onClick}>{children}</button>
+);
+
+export default Button;

package/client/components/__tests__/Button.test.tsx

@@ -0,0 +1,15 @@
+// src/components/Button.test.js
+import { render, screen, fireEvent } from '@testing-library/react';
+import Button from '../Button';
+
+test('renders button with text', () => {
+  render(<Button>Click me</Button>);
+  expect(screen.getByText('Click me')).toBeInTheDocument();
+});
+
+test('calls onClick when clicked', () => {
+  const handleClick = jest.fn();
+  render(<Button onClick={handleClick}>Click me</Button>);
+  fireEvent.click(screen.getByText('Click me'));
+  expect(handleClick).toHaveBeenCalledTimes(1);
+});

package/client/redux/store.ts

@@ -1,15 +1,13 @@
 import { useMemo } from 'react'
 import { combineReducers } from 'redux'
-import { configureStore, Tuple } from '@reduxjs/toolkit'
-import { thunk } from 'redux-thunk'
+import { configureStore, type EnhancedStore } from '@reduxjs/toolkit'
 import reducers from './reducers'
-import _ from 'lodash'
 
-let store: any
+let store: EnhancedStore | undefined
 
-const reducersKeysLen = _.keys(reducers).length
+const reducersKeysLen = Object.keys(reducers).length
 
-let combineReducer: any = function () { }
+let combineReducer: any = () => ({})
 
 if (reducersKeysLen > 0) {
   combineReducer = combineReducers({ ...reducers })
@@ -17,17 +15,21 @@ if (reducersKeysLen > 0) {
 
 export type RootState = ReturnType<typeof combineReducer>
 
-function initStore(initialState: any) {
+function initStore(initialState?: any): EnhancedStore {
   return configureStore({
     reducer: combineReducer,
     preloadedState: initialState,
-    devTools: true,
+    devTools: process.env.NODE_ENV !== 'production',
     middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware().concat(thunk),
+      getDefaultMiddleware({
+        serializableCheck: {
+          ignoredActions: ['persist/PERSIST', 'persist/REHYDRATE'],
+        },
+      }),
   })
 }
 
-export const initializeStore = (preloadedState: any) => {
+export const initializeStore = (preloadedState?: any): EnhancedStore => {
   let _store = store ?? initStore(preloadedState)
 
   if (preloadedState && store) {
@@ -45,7 +47,7 @@ export const initializeStore = (preloadedState: any) => {
   return _store
 }
 
-export function useStore(initialState: any) {
+export function useStore(initialState?: any): EnhancedStore {
   const store = useMemo(() => initializeStore(initialState), [initialState])
   return store
 }

package/client/utils/fetch.ts

@@ -1,25 +1,54 @@
 import axios from 'axios'
 import { getLocalApiPrefix } from './common'
 
-export const getLocalGraphql = (query: string, variables: any = {}) => {
+// 添加缓存机制
+const queryCache = new Map<string, { data: any; timestamp: number }>()
+const CACHE_DURATION = 5 * 60 * 1000 // 5分钟缓存
+
+export const getLocalGraphql = (query: string, variables: any = {}, useCache = false) => {
   return new Promise((resolve, reject) => {
+    // 生成缓存键
+    const cacheKey = `${query}:${JSON.stringify(variables)}`
+    
+    // 检查缓存
+    if (useCache && queryCache.has(cacheKey)) {
+      const cached = queryCache.get(cacheKey)!
+      if (Date.now() - cached.timestamp < CACHE_DURATION) {
+        resolve(cached.data)
+        return
+      }
+    }
+    
     axios
       .post(getLocalApiPrefix() + '/graphql', {
         query,
         variables
       })
       .then((res) => {
-        // console.log('axios_res', res)
         if (res) {
           const { data } = res
+          
+          // 缓存结果
+          if (useCache && data && !data.errors) {
+            queryCache.set(cacheKey, {
+              data,
+              timestamp: Date.now()
+            })
+          }
+          
           resolve(data)
         } else {
-          reject()
+          reject(new Error('No data received'))
         }
       })
-      .catch((_e) => {
-        // console.error('axios_e', _e)
-        reject(_e)
+      .catch((error) => {
+        console.error('GraphQL query failed:', error)
+        reject(error)
       })
   })
 }
+
+// 清除缓存
+export const clearGraphqlCache = () => {
+  queryCache.clear()
+}

package/eslint.config.js

@@ -0,0 +1,87 @@
+const js = require('@eslint/js');
+const typescript = require('@typescript-eslint/eslint-plugin');
+const typescriptParser = require('@typescript-eslint/parser');
+const prettier = require('eslint-plugin-prettier');
+
+module.exports = [
+  js.configs.recommended,
+  {
+    files: ['src/**/*.{ts,tsx}'],
+    languageOptions: {
+      parser: typescriptParser,
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: 'module',
+        project: './tsconfig.json'
+      },
+      globals: {
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        console: 'readonly',
+        setTimeout: 'readonly',
+        clearTimeout: 'readonly',
+        setInterval: 'readonly',
+        clearInterval: 'readonly'
+      }
+    },
+    plugins: {
+      '@typescript-eslint': typescript,
+      'prettier': prettier
+    },
+    rules: {
+      'no-console': 'off', // 允许 console 语句用于调试
+      'no-eval': 'off',
+      'no-undef': 'off',
+      'no-unused-vars': 'off', // 关闭原生规则，使用 TypeScript 版本
+      'no-case-declarations': 'off',
+      'no-fallthrough': 'off',
+      'prefer-const': 'warn',
+      'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
+      'no-unreachable': 'error',
+      'no-duplicate-imports': 'error',
+      'prefer-template': 'warn',
+      'prefer-arrow-callback': 'warn',
+      '@typescript-eslint/no-var-requires': 'off', // 允许 require
+      '@typescript-eslint/no-explicit-any': 'warn', // 警告但不报错
+      '@typescript-eslint/no-unused-vars': ['warn', { 
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_'
+      }],
+      '@typescript-eslint/no-inferrable-types': 'warn',
+      '@typescript-eslint/prefer-optional-chain': 'warn',
+      '@typescript-eslint/no-explicit-any': 'off',
+      'prettier/prettier': 'error'
+    }
+  },
+  {
+    files: ['**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: 'commonjs',
+      globals: {
+        require: 'readonly',
+        module: 'readonly',
+        exports: 'readonly',
+        __dirname: 'readonly',
+        __filename: 'readonly',
+        process: 'readonly',
+        Buffer: 'readonly',
+        console: 'readonly'
+      }
+    },
+    rules: {
+      'no-console': 'off'
+    }
+  },
+  {
+    ignores: [
+      'node_modules/**',
+      'lib/**',
+      '.next/**',
+      'coverage/**',
+      '*.config.js'
+    ]
+  }
+];

package/generation/eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+  env: {
+    node: true,
+    es2022: true
+  },
+  extends: [
+    'eslint:recommended'
+  ],
+  parserOptions: {
+    ecmaVersion: 2022,
+    sourceType: 'module'
+  },
+  rules: {
+    'no-console': 'off'
+  }
+};

package/generation/server/rest.js

@@ -1,5 +1,5 @@
 const express = require('express')
-const moment = require('moment')
+const dayjs = require('dayjs')
 const sso = require('./apis/sso')
 //const template = require('./apis/template')
 
@@ -7,7 +7,7 @@ const router = express.Router()
 
 router.use((req, res, next) => {
     const fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl
-    console.log(moment().format('YYYY-MM-DD HH:mm:ss') + ' ' + fullUrl)
+    console.log(dayjs().format('YYYY-MM-DD HH:mm:ss') + ' ' + fullUrl)
     next()
 })
 

package/generation/server/utils/common.js

@@ -1,7 +1,9 @@
 const { serverDB } = require('nsgm-cli')
 
-const { getConnection } = serverDB
+const { getConnection, executeQuery, executePaginatedQuery } = serverDB
 
 module.exports = {
-  getConnection
+  getConnection,        // 兼容旧版本
+  executeQuery,         // 新的查询方法
+  executePaginatedQuery // 新的分页查询方法
 }

package/generation/tsconfig.json

@@ -20,7 +20,8 @@
     "incremental": true
   },
   "include": [
-    "next-env.d.ts"
+    "**/*.ts",
+    "**/*.tsx"
   ],
   "exclude": [
     "node_modules"

package/jest.config.js

@@ -0,0 +1,29 @@
+module.exports = {
+  testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
+  transform: {
+    '^.+\\.(js|jsx|ts|tsx)$': ['babel-jest', { presets: ['next/babel'] }]
+  },
+  testMatch: [
+    '**/__tests__/**/*.(ts|tsx|js)',
+    '**/*.(test|spec).(ts|tsx|js)'
+  ],
+  collectCoverage: true,
+  collectCoverageFrom: [
+    'client/**/*.{js,jsx,ts,tsx}',
+    'pages/**/*.{js,jsx,ts,tsx}',
+    'server/**/*.{js,jsx,ts,tsx}',
+    'src/**/*.{js,jsx,ts,tsx}',
+    '!**/*.d.ts',
+    '!**/node_modules/**',
+    '!**/.next/**'
+  ],
+  coverageDirectory: 'coverage',
+  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  globals: {
+    'ts-jest': {
+      useESM: true
+    }
+  }
+}

package/lib/args.js

@@ -4,24 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProcessArgvs = void 0;
-var lodash_1 = __importDefault(require("lodash"));
-var getProcessArgvs = function (removeItems) {
-    if (removeItems === void 0) { removeItems = 2; }
-    var args = process.argv.slice(removeItems);
-    var result = {
+const lodash_1 = __importDefault(require("lodash"));
+const getProcessArgvs = (removeItems = 2) => {
+    const args = process.argv.slice(removeItems);
+    const result = {
         command: '', // dev, start, build, export, create, delete, init, help
         dictionary: '', // export/init dictionary=${dictionary}
         controller: '',
         action: '' // create/delete controller=${controller} action=${action}
     };
-    lodash_1.default.each(args, function (item, index) {
+    lodash_1.default.each(args, (item, index) => {
         if (item.indexOf('=') !== -1) {
-            var itemArr = item.split('=');
-            var key = itemArr[0].toLowerCase();
+            const itemArr = item.split('=');
+            const key = itemArr[0].toLowerCase();
             result[key] = itemArr[1];
         }
         else {
-            var command = result.command;
+            const { command } = result;
             switch (index) {
                 case 0:
                     result.command = item;