@yorha2b-lab/autodev 5.6.1 → 5.6.3

package/bin/autodev.js

@@ -5,10 +5,10 @@ const pkg = require('../package.json')
 const { program } = require('commander')
 const local = Intl.DateTimeFormat().resolvedOptions().locale.toUpperCase()
 
-const { matrixEffect } = require('../src/utils/ux')
+const { matchDialog, matrixEffect } = require('../src/utils/ux')
 const recruiter = require('../src/kernel/recruiter')
 const dialogs = recruiter(path.join(__dirname, '../src/dialogs'))
-const dialog = dialogs[local] ?? dialogs['EN-US']
+const dialog = matchDialog(local, dialogs) ?? dialogs['EN-US']
 
 program
     .version(pkg.version)
@@ -45,7 +45,7 @@ program
         require('../src/commands/watch')()
         process.on('SIGINT', () => {
             result.yorha.commander.report(dialog.bunker.systemOffline, 'gray')
-            matrixEffect(500, dialog)
+            matrixEffect(500, dialog, result)
         })
     })
 

package/config.js

@@ -7,6 +7,8 @@ module.exports = {
 
     useDemo: true,
     needMock: false,
+    //默认拉取克隆数彩蛋
+    fetchClone: true,
     // 是否开启自动联调对齐协议 (42153 拦截塔)
     enableAutoAlignment: false,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yorha2b-lab/autodev",
-  "version": "5.6.1",
+  "version": "5.6.3",
   "description": "基于视觉大模型的前端(react+Antd)全自动 CRUD 代码生成器",
   "bin": {
     "autodev": "bin/autodev.js"

package/src/ai/index.js

@@ -1,8 +1,8 @@
 const askAI = async ({ model, yorha, dialog, openAI, messages, response_format = { type: 'json_object' }, retryCount = 0 }) => {
 
-    if (retryCount > 3) {
+    if (retryCount >= 3) {
         yorha.commander.report(dialog.bunker.linkSevered, 'red')
-        throw new Error()
+        throw new Error(dialog.bunker.linkSevered)
     }
 
     try {
@@ -20,10 +20,10 @@ const askAI = async ({ model, yorha, dialog, openAI, messages, response_format =
         return JSON5.parse(match ? match[0] : raw)
     } catch (err) {
         const statusCode = err.status || err.response?.status
-        const isAuthError = err.message.includes('401') || err.message.includes('402') || [401, 402].includes(statusCode)
+        const isAuthError = [401, 402].includes(statusCode)
         if (isAuthError) {
             yorha.commander.report(dialog.bunker.accessDenied, 'red')
-            throw new Error()
+            throw new Error(dialog.bunker.accessDenied)
         }
 
         yorha.commander.report(dialog.bunker.networkInstability(retryCount + 1))

package/src/commands/watch.js

@@ -5,17 +5,17 @@ module.exports = () => {
     const chokidar = require('chokidar')
 
     const bootstrap = require('../bootstrap')
-    const queue = require('../kernel/queue')(2)
 
     const ctx = bootstrap.get()
     const routes = Object.values(ctx.handlers)
     const config = ctx.utils.foundation.getConfig()
+    const queue = require('../kernel/queue')(2, ctx)
 
     queue.onIdle(() => {
         ctx.yorha.pod042.report(ctx.dialog.pod042.queueEmpty)
         const utilsDir = path.join(process.cwd(), config.utilsDir)
         if (!fs.existsSync(utilsDir)) fs.mkdirSync(utilsDir, { recursive: true })
-        fs.writeFileSync(path.join(utilsDir, 'menus.js'), `export const menus = ${ctx.utils.generator.contextStringify({ context: ctx.menus, maxLength: 50 })}`)
+        fs.writeFileSync(path.join(utilsDir, 'menus.js'), `export const menus = ${ctx.utils.generator.contextStringify({ context: ctx.utils.foundation.getExistingMenus(config.pagesDir), maxLength: 50 })}`)
         ctx.yorha.commander.report(ctx.dialog.bunker.systemStandby, 'gray')
     })
 

package/src/framework/react/generator/index.js

@@ -1,10 +1,116 @@
 module.exports = ({ utils, engine }) => {
 
     const { indexTpl, resourceTpl } = engine
+    const { wrapCode, cleanCode, contextStringify } = utils.generator
     const { needMock, responseSuccess } = utils.foundation.getConfig()
-    const { cleanCode, contextStringify, generateSmartImports, formatFormItemAndColumns } = utils.generator
+
+    const formatFormItemAndColumns = ({ pageConfig }) => {
+
+        const codePresets = {
+            money: 'text => moneyRender(text)',
+            date: 'text => timeRender({time: text})',
+            index: '(_, record, index) => index + 1',
+            tag: `text => <Tag color='magenta'>{text}</Tag>`,
+            badge: `text => <Badge status='success' text={text} />`,
+            enum: dataIndex => `text => ${dataIndex}Options.find(item => item.value === text)?.label ?? text`,
+        }
+
+        const columns = pageConfig.table?.columns ?? pageConfig?.columns ?? []
+
+        const tableDicts = columns?.filter(item => item.type === 'enum')?.map(item => `${item.dataIndex}Options`) ?? []
+        const formDicts = pageConfig.formItems?.filter(item => item.type === 'select')?.map(item => `${item.name}Options`) ?? []
+        const dictBlocks = Array.from(new Set([...formDicts, ...tableDicts]))
+
+        const formItems = pageConfig.formItems?.map(item => {
+            if (item.type === 'text') {
+                delete item.type
+            }
+            return {
+                ...item,
+                ...(item.type === 'select' ? { options: wrapCode(`${item.name}Options`) } : {})
+            }
+        })
+
+        const processedColumns = columns?.map(col => {
+            if (col.type === 'text') {
+                delete col.type
+            }
+            if (['image'].includes(col.type)) {
+                return { ...col, renderAction: true }
+            }
+            if (col.type && codePresets[col.type]) {
+                const renderCode = typeof codePresets[col.type] === 'function' ? codePresets[col.type](col.dataIndex) : codePresets[col.type]
+                return { ...col, render: wrapCode(renderCode) }
+            }
+            return col
+        })
+
+        return { formItems, dictBlocks, processedColumns }
+    }
+
+    const generateSmartImports = ({ module, hasTabs, bodyCode, hasFormItems }) => {
+
+        const hooksLib = ['useTableQuery']
+        const utilsLib = ['timeRender', 'moneyRender']
+        const reactLib = ['useState', 'useEffect', 'useRef', 'useMemo']
+        const componentsLib = ['MyTable', 'MyImage', 'MyModalForm', 'MySearchForm']
+        const antdLib = ['Tag', 'Card', 'Badge', 'Space', 'Modal', 'Alert', 'Image', 'Table', 'Input', 'Select', 'Button']
+
+        const usedAntd = antdLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
+        const usedUtils = utilsLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
+        const usedHooks = hooksLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
+        const usedReact = reactLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
+        const usedComps = componentsLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
+
+        const imports = [
+            usedReact.length && `import { ${usedReact.join(', ')} } from 'react'`,
+            usedAntd.length && `import { ${hasFormItems && module === 'index' ? 'Form, ' : ''}${usedAntd.join(', ')} } from 'antd'`,
+            ...usedHooks.map(hook => `import { ${hook} } from '../../hooks/${hook}'`),
+            ...usedComps.map(comp => `import { ${comp} } from '../../components/${comp}'`),
+            ...(module === 'index' ? [
+                `import { request } from '../../utils/request'`,
+                `import { formatQuery } from '../../utils/utils'`,
+                `import { ${hasTabs ? 'tabs, ' : ''}${hasFormItems ? 'formItems, ' : ''}modalItems, tableColumns} from './resource'`
+            ] : [
+                usedUtils.length && `import { ${usedUtils.join(', ')} } from '../../utils/utils'`
+            ]),
+        ].sort((a, b) => a.length - b.length)
+
+        return imports.filter(Boolean).join('\n')
+    }
 
     return {
+        formatFormItemAndColumns,
+        resource: ({ pageConfig }) => {
+
+            const { formItems, processedColumns, dictBlocks } = formatFormItemAndColumns({ pageConfig })
+
+            const hasTabs = pageConfig.tabs?.length > 0
+            const hasFormItems = pageConfig.formItems?.length > 0
+            const tabKeys = pageConfig.tabs?.map(tab => tab.key).sort((a, b) => a.length - b.length)
+            const optionDict = pageConfig.optionList?.reduce((acc, item) => ({ ...acc, [item.name]: item.options }), {})
+
+            const columnsData = processedColumns.map(item => {
+                delete item.type
+                return item
+            })
+
+            const viewData = {
+                hasTabs,
+                columnsData,
+                hasFormItems,
+                tabs: pageConfig.tabs,
+                dictBlocks: dictBlocks.map(item => ({ name: item, data: optionDict[item] ?? [] })),
+                tabColumns: contextStringify({ context: Object.fromEntries(tabKeys.map(tab => [tab, wrapCode('commonColumns')])), maxLength: 100 }),
+                formItemsData: !hasTabs ?
+                    `export const formItems = ${contextStringify({ context: formItems, maxLength: 120 })}` :
+                    `const searchItems = ${contextStringify({ context: formItems, maxLength: 120 })}\n\nexport const formItems = ${contextStringify({ context: Object.fromEntries(tabKeys.map(tab => [tab, wrapCode('searchItems')])), maxLength: 100 })}`,
+            }
+
+            const bodyCode = resourceTpl(viewData)
+            const importsStr = generateSmartImports({ module: 'resource', hasTabs, bodyCode, hasFormItems })
+            return cleanCode(`${importsStr}\n\n${bodyCode}`)
+        },
         index: ({ fileName, pageConfig }) => {
             const hasTabs = pageConfig.tabs?.length > 0
             const hasPagination = pageConfig.table.pagination
@@ -21,7 +127,7 @@ module.exports = ({ utils, engine }) => {
                 columnsValue = `${columnsValue}.concat(operate)`
             }
 
-            const imgAction = Object.fromEntries(pageConfig.table?.columns?.filter(item => item.type === 'image')?.map(item => [item.dataIndex, `_CODE_(_, record) => <a onClick={() => showImg(record, '${item.dataIndex}')}>查看图片</a>_CODE_`]))
+            const imgAction = Object.fromEntries(pageConfig.table?.columns?.filter(item => item.type === 'image')?.map(item => [item.dataIndex, wrapCode(`(_, record) => <a onClick={() => showImg(record, '${item.dataIndex}')}>查看图片</a>`)]))
             const renderAction = `{${contextStringify({ context: imgAction, maxLength: 120 })}}`.replace(/\n/g, '\n    ')
 
             const viewData = {
@@ -50,35 +156,5 @@ module.exports = ({ utils, engine }) => {
             const importsStr = generateSmartImports({ module: 'index', hasTabs, bodyCode, hasFormItems })
             return cleanCode(`${importsStr}\n\n${bodyCode}`)
         },
-        resource: ({ pageConfig }) => {
-
-            const { formItems, processedColumns, dictBlocks } = formatFormItemAndColumns({ pageConfig })
-
-            const hasTabs = pageConfig.tabs?.length > 0
-            const hasFormItems = pageConfig.formItems?.length > 0
-            const tabKeys = pageConfig.tabs.map(tab => tab.key).sort((a, b) => a.length - b.length)
-            const optionDict = pageConfig.optionList?.reduce((acc, item) => ({ ...acc, [item.name]: item.options }), {})
-
-            const columnsData = processedColumns.map(item => {
-                delete item.type
-                return item
-            })
-
-            const viewData = {
-                hasTabs,
-                columnsData,
-                hasFormItems,
-                tabs: pageConfig.tabs,
-                dictBlocks: dictBlocks.map(item => ({ name: item, data: optionDict[item] ?? [] })),
-                tabColumns: contextStringify({ context: Object.fromEntries(tabKeys.map(tab => [tab, '_CODE_commonColumns_CODE_'])), maxLength: 100 }),
-                formItemsData: !hasTabs ?
-                    `export const formItems = ${contextStringify({ context: formItems, maxLength: 120 })}` :
-                    `const searchItems = ${contextStringify({ context: formItems, maxLength: 120 })}\n\nexport const formItems = ${contextStringify({ context: Object.fromEntries(tabKeys.map(tab => [tab, '_CODE_searchItems_CODE_'])), maxLength: 100 })}`,
-            }
-
-            const bodyCode = resourceTpl(viewData)
-            const importsStr = generateSmartImports({ module: 'resource', hasTabs, bodyCode, hasFormItems })
-            return cleanCode(`${importsStr}\n\n${bodyCode}`)
-        }
     }
 }

package/src/handlers/page.js

@@ -16,7 +16,6 @@ module.exports = {
 
 
         const startTime = Date.now()
-        const menus = utils.foundation.getExistingMenus(pagesDir)
         const fileName = path.basename(filePath, path.extname(filePath))
         const mockDir = path.join(process.cwd(), 'mock')
         const targetDir = path.join(process.cwd(), pagesDir, fileName)
@@ -44,10 +43,6 @@ module.exports = {
             fs.writeFileSync(path.join(targetDir, 'resource.js'), resource({ pageConfig }))
             fs.writeFileSync(path.join(targetDir, 'index.js'), index({ fileName, pageConfig }))
 
-            if (!menus.find(m => m.key === fileName)) {
-                menus.push({ label: fileName, key: fileName })
-            }
-
             if (needMock) {
                 nineS.update(spinner, dialog.nineS.dataCamouflage(fileName))
                 const rawContent = await generateMock({ columns: pageConfig.table.columns, fileName })

package/src/handlers/part.js

@@ -5,12 +5,13 @@ module.exports = {
     async handle(filePath) {
 
         const chalk = require('chalk')
-        const { llm, utils, yorha, dialog, prompts } = require('../bootstrap').get()
+        const { llm, utils, yorha, dialog, prompts, generator } = require('../bootstrap').get()
 
         const { pod042 } = yorha
         const { recognizePage } = llm
         const { part: prompt } = prompts
-        const { cleanCode, contextStringify, formatFormItemAndColumns } = utils.generator
+        const { formatFormItemAndColumns } = generator
+        const { cleanCode, contextStringify } = utils.generator
 
         const startTime = Date.now()
 

package/src/kernel/queue.js

@@ -1,4 +1,4 @@
-module.exports = (concurrency = 1) => {
+module.exports = (concurrency = 1, { yorha, dialog }) => {
 
     let running = 0
     let queue = []
@@ -14,7 +14,7 @@ module.exports = (concurrency = 1) => {
         try {
             await task()
         } catch (err) {
-            console.error('任务执行异常:', err)
+            yorha.pod153.report(dialog.pod153.signalLinkFault(err.message), 'red')
         } finally {
             running--
             next()

package/src/utils/generator.js

@@ -1,5 +1,7 @@
 const stringify = require('json-stringify-pretty-compact')
 
+const wrapCode = code => `_CODE_${code}_CODE_`
+
 const cleanCode = str => str
     .replace(/```[a-z]*\n?/gi, '')// 物理超度 Markdown 糖衣（解决```json 报错）
     .replace(/```/g, '')
@@ -13,86 +15,10 @@ const cleanCode = str => str
     .replace(/^\s+/, '')         // 去掉文件头部的空行
     .trim() + '\n'
 
-const formatFormItemAndColumns = ({ pageConfig }) => {
-
-    const codePresets = {
-        money: 'text => moneyRender(text)',
-        date: 'text => timeRender({time: text})',
-        index: '(_, record, index) => index + 1',
-        tag: `text => <Tag color='magenta'>{text}</Tag>`,
-        badge: `text => <Badge status='success' text={text} />`,
-        enum: dataIndex => `text => ${dataIndex}Options.find(item => item.value === text)?.label ?? text`,
-    }
-
-    const columns = pageConfig.table?.columns ?? pageConfig?.columns ?? []
-
-    const tableDicts = columns?.filter(item => item.type === 'enum')?.map(item => `${item.dataIndex}Options`) ?? []
-    const formDicts = pageConfig.formItems?.filter(item => item.type === 'select')?.map(item => `${item.name}Options`) ?? []
-    const dictBlocks = Array.from(new Set([...formDicts, ...tableDicts]))
-
-    const formItems = pageConfig.formItems?.map(item => {
-        if (item.type === 'text') {
-            delete item.type
-        }
-        return {
-            ...item,
-            ...(item.type === 'select' ? { options: `_CODE_${item.name}Options_CODE_` } : {})
-        }
-    })
-
-    const processedColumns = columns?.map(col => {
-        if (col.type === 'text') {
-            delete col.type
-        }
-        if (['image'].includes(col.type)) {
-            return { ...col, renderAction: true }
-        }
-        if (col.type && codePresets[col.type]) {
-            const renderCode = typeof codePresets[col.type] === 'function' ? codePresets[col.type](col.dataIndex) : codePresets[col.type]
-            return { ...col, render: `_CODE_${renderCode}_CODE_` }
-        }
-        return col
-    })
-
-    return { formItems, dictBlocks, processedColumns }
-}
-
-const generateSmartImports = ({ module, hasTabs, bodyCode, hasFormItems }) => {
-
-    const hooksLib = ['useTableQuery']
-    const utilsLib = ['timeRender', 'moneyRender']
-    const reactLib = ['useState', 'useEffect', 'useRef', 'useMemo']
-    const componentsLib = ['MyTable', 'MyImage', 'MyModalForm', 'MySearchForm']
-    const antdLib = ['Tag', 'Card', 'Badge', 'Space', 'Modal', 'Alert', 'Image', 'Table', 'Input', 'Select', 'Button']
-
-    const usedAntd = antdLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
-    const usedUtils = utilsLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
-    const usedHooks = hooksLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
-    const usedReact = reactLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
-    const usedComps = componentsLib.filter(name => new RegExp(`\\b${name}\\b`).test(bodyCode))
-
-    const imports = [
-        usedReact.length && `import { ${usedReact.join(', ')} } from 'react'`,
-        usedAntd.length && `import { ${hasFormItems && module === 'index' ? 'Form, ' : ''}${usedAntd.join(', ')} } from 'antd'`,
-        ...usedHooks.map(hook => `import { ${hook} } from '../../hooks/${hook}'`),
-        ...usedComps.map(comp => `import { ${comp} } from '../../components/${comp}'`),
-        ...(module === 'index' ? [
-            `import { request } from '../../utils/request'`,
-            `import { formatQuery } from '../../utils/utils'`,
-            `import { ${hasTabs ? 'tabs, ' : ''}${hasFormItems ? 'formItems, ' : ''}modalItems, tableColumns} from './resource'`
-        ] : [
-            usedUtils.length && `import { ${usedUtils.join(', ')} } from '../../utils/utils'`
-        ]),
-    ].sort((a, b) => a.length - b.length)
-
-    return imports.filter(Boolean).join('\n')
-}
-
 const contextStringify = ({ context, indent = 4, maxLength = 200 }) => stringify.default(context, { indent, maxLength })
 
 module.exports = {
+    wrapCode,
     cleanCode,
     contextStringify,
-    generateSmartImports,
-    formatFormItemAndColumns,
 }

package/src/utils/ux.js

@@ -38,6 +38,13 @@ const yorha = () => {
 
 }
 
+const matchDialog = (locale, dialogs) => {
+    if (dialogs[locale]) return dialogs[locale]
+    const lang = locale.split('-')[0] // 取 ZH-HANS-CN → ZH
+    const matched = Object.keys(dialogs).find(key => key.startsWith(lang + '-'))
+    return matched ? dialogs[matched] : null
+}
+
 const bootSequence = async (version, local) => {
 
     const lines = [
@@ -58,18 +65,20 @@ const bootSequence = async (version, local) => {
     }
 }
 
-const matrixEffect = async (duration = 1500, dialog) => {
+const matrixEffect = async (duration = 1500, dialog, result) => {
 
     let currentTotal = 0
     const MIRROR_URL = 'https://cdn.jsdelivr.net/gh/yorha2b-lab/auto-crud-copilot@github-repo-stats/bunker-stats.json'
 
     try {
-        const controller = new AbortController()
-        const timeoutId = setTimeout(() => controller.abort(), 800)
-        const response = await fetch(MIRROR_URL, { signal: controller.signal })
-        const stats = await response.json()
-        currentTotal = stats.total_clones || 0
-        clearTimeout(timeoutId)
+        if (result.utils.foundation.getConfig().fetchClone) {
+            const controller = new AbortController()
+            const timeoutId = setTimeout(() => controller.abort(), 800)
+            const response = await fetch(MIRROR_URL, { signal: controller.signal })
+            const stats = await response.json()
+            currentTotal = stats.total_clones || 0
+            clearTimeout(timeoutId)
+        }
     } catch (e) {
         currentTotal = 0
     }
@@ -130,6 +139,7 @@ const matrixEffect = async (duration = 1500, dialog) => {
 
 module.exports = {
     yorha,
+    matchDialog,
     bootSequence,
     matrixEffect
 }