@kdcloudjs/cli 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Kingdee CLI",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -17,6 +17,7 @@
   "dependencies": {
     "axios": "^1.12.2",
     "chalk": "4.1.2",
+    "cli-table3": "^0.6.5",
     "commander": "12.1.0",
     "download-git-repo": "^3.0.2",
     "form-data": "^4.0.4",

package/src/actions/debug/index.js

@@ -87,16 +87,19 @@ module.exports = async function debug(options = {}) {
 
   // 6. Open Browser & Start Debug
   // Start server first
-  const { promise: serverPromise, child } = runDebug(root)
+  const { serverPromise, serverChild, buildPromise, buildReadyPromise } = runDebug(root)
 
   try {
-    info('Waiting for debug server to be ready...')
-    await waitForPort(3333, child)
+    info('Waiting for debug server and build watcher...')
+    await Promise.all([
+      waitForPort(3333, serverChild),
+      buildReadyPromise
+    ])
     info(`Opening: ${finalUrl}`)
     openBrowser(finalUrl)
   } catch (e) {
-    error(`Server start failed: ${e.message}`)
+    error(`Start failed: ${e.message}`)
   }
   
-  await serverPromise
+  await Promise.all([serverPromise, buildPromise])
 }

package/src/actions/debug/runner.js

@@ -1,3 +1,5 @@
+const fs = require('fs')
+const path = require('path')
 const { spawn } = require('child_process')
 const { info } = require('../../utils/log')
 
@@ -17,19 +19,62 @@ function installDeps(root) {
 }
 
 function runDebug(root) {
-  info('Starting debug server...')
-  let childProcess
-  const promise = new Promise((resolve, reject) => {
+  info('Starting build watcher...')
+  let buildChild
+  let buildReadyResolve
+  const buildReadyPromise = new Promise(resolve => {
+    buildReadyResolve = resolve
+  })
+
+  // Poll dist/kwc for content
+  const checkInterval = setInterval(() => {
+    const distDir = path.join(root, 'dist/kwc')
+    if (fs.existsSync(distDir)) {
+      try {
+        const files = fs.readdirSync(distDir)
+        if (files.length > 0) {
+          clearInterval(checkInterval)
+          buildReadyResolve()
+        }
+      } catch (e) {
+        // ignore
+      }
+    }
+  }, 1000)
+
+  const buildPromise = new Promise((resolve, reject) => {
     const child = spawn('npm', ['run', 'debug'], {
       cwd: root,
       stdio: 'inherit',
       shell: true
     })
-    childProcess = child
+    buildChild = child
+
+    child.on('close', (code) => {
+      clearInterval(checkInterval)
+      buildReadyResolve()
+      resolve(code)
+    })
+    child.on('error', (err) => {
+      clearInterval(checkInterval)
+      buildReadyResolve()
+      reject(err)
+    })
+  })
+
+  info('Starting debug server...')
+  let serverChild
+  const serverPromise = new Promise((resolve, reject) => {
+    const child = spawn('npm', ['run', 'server'], {
+      cwd: root,
+      stdio: 'inherit',
+      shell: true
+    })
+    serverChild = child
     child.on('close', resolve)
     child.on('error', reject)
   })
-  return { promise, child: childProcess }
+  return { serverPromise, serverChild, buildPromise, buildChild, buildReadyPromise }
 }
 
 module.exports = {

package/src/actions/env/info.js

@@ -24,5 +24,7 @@ module.exports = function envInfo() {
     env.url || '',
     env.default ? '★' : ''
   ])
-  printTable(headers, rows)
+  printTable(headers, rows, {
+    colWidths: [20, 50, 10]
+  })
 }

package/src/actions/env/list.js

@@ -17,5 +17,7 @@ module.exports = function listEnv() {
     envs[name].url || '',
     envs[name].default ? '★' : ''
   ])
-  printTable(headers, rows)
+  printTable(headers, rows, {
+    colWidths: [20, 50, 10]
+  })
 }

package/src/actions/project/create/createMetaXml.js

@@ -10,16 +10,47 @@ module.exports = function createMetaXml({ name, moduleId, framework }) {
     <moduleid>${moduleId}</moduleid>
     <framework>${framework}</framework>
     <targets>
-        <target>BaseFormModel</target>
-        <target>BillFormModel</target>
-        <target>DynamicFormModel</target>
-        <target>MobileBillFormModel</target>
-        <target>MobileFormModel</target>
         <target>KWCFormModel</target>
     </targets>
     <targetConfigs>
         <targetConfig>
-          <targets>BaseFormModel,BillFormModel,DynamicFormModel,MobileBillFormModel,MobileFormModel,KWCFormModel</targets>
+          <targets>KWCFormModel</targets>
+          <!-- <property
+                description="文本类型属性"
+                name="StringValue"
+                caption="文本类型属性"
+                type="String"
+                length="25"
+                default="默认值">
+            </property>
+            <property
+                name="IntValue"
+                type="Integer"
+                caption="数值类型属性"
+                description="数值类型属性"
+                max="10"
+                min="2"
+                default="2" 
+            ></property>
+            <property
+                name="ComboValue"
+                type="Combo"
+                default="0"
+                caption="下拉列表类型属性"
+                description="下拉列表类型属性" >
+                <items>
+                    <item id="0" name="默认名称" />
+                    <item id="1" name="选项1" />
+                    <item id="2" name="选项2" />
+                </items>
+            </property>
+
+            <property name="BooleanValue"
+                type="Boolean"
+                caption="布尔类型属性"
+                description="布尔类型属性"
+                default="true" > 
+            </property> -->
         </targetConfig>
     </targetConfigs>
 </KingdeeComponentBundle>`

package/src/actions/project/create/page.js

@@ -35,6 +35,17 @@ function createPageXml(name) {
         <region>
             <name>region1</name>
             <controls>
+              <!-- <control>
+                    <type>ReactDemoAp</type>
+                    <name>ReactDemo</name>
+                    <label>测试组件名称</label>
+                    <propertys>
+                        <property>
+                            <name>StringValue</name>
+                            <value>3333</value>
+                        </property>
+                    </propertys>
+                </control> -->
             </controls>
         </region>
     </regions>

package/src/actions/project/create/validate.js

@@ -27,8 +27,8 @@ module.exports = function validate({ name, type, framework }) {
         }
         break
       case FRAMEWORKS.React:
-        if (!/^[A-Z][a-zA-Z0-9]*$/.test(name) && !/^[a-z][a-z0-9]*(-[a-z0-9]+)*$/.test(name)) {
-          error('React component name must follow PascalCase (start with uppercase) or kebab-case (hyphen-separated)')
+        if (!/^[A-Z][a-zA-Z0-9]*$/.test(name)) {
+          error('React component name must follow PascalCase (start with uppercase)')
           process.exit(1)
         }
         break

package/src/actions/project/deploy/upload.js

@@ -50,11 +50,17 @@ exports.upload = async function upload(files, env) {
   const headers = ['Type', 'File', 'Status', 'Message']
   const rows = results.map(file => [
     file.type,
-    file.path,
+    path.relative(process.cwd(), file.path),
     file.status === 'success' ? '✔' : '✖',
-    file.status === 'failed' ? `Failed: ${file.message}` : 'Success'
+    file.status === 'failed' ? `${file.message}` : 'Success'
   ])
-  printTable(headers, rows)
+
+  const hasFailed = results.some(r => r.status === 'failed')
+  const colWidths = hasFailed ? [10, 30, 10, 50] : [10, 50, 10, 30]
+
+  printTable(headers, rows, {
+    colWidths
+  })
   console.timeEnd(`🕒 Upload duration`)
   return results
 }

package/src/actions/project/init/index.js

@@ -8,15 +8,15 @@ const { TEMPLATES, INNER_TEMPLATES } = require('../constants')
 
 module.exports = async function initProject({ projectName: _projectName, source }) {
     try {
+        if (fs.existsSync(path.resolve(process.cwd(), _projectName))) {
+            error(`Directory already exists: ${_projectName}`)
+            return
+        }
+        
         const { projectName, moduleId, framework, language } = await collectInitInfo(_projectName) || {}
 
         const targetDir = path.resolve(process.cwd(), projectName)
 
-        if (fs.existsSync(targetDir)) {
-            error(`Directory already exists: ${projectName}`)
-            return
-        }
-
         tip(`\n🚀 Creating project: ${projectName}\n`)
         console.time('🕒 Project initialization')
 

package/src/api/index.js

@@ -18,17 +18,17 @@ async function getAllDataCenters (url) {
               value: d.accountId
             })
           } else {
-            error(`⚠  数据中心返回异常，请检查url: ${url} 是否正确`)
+            error(`⚠  Data center response error, please check if url: ${url} is correct`)
           }
         }
       } else {
-        error(`⚠  数据中心列表为空，请检查url: ${url} 是否正确`)
+        error(`⚠  Data center list is empty, please check if url: ${url} is correct`)
       }
     } else {
-      error(`⚠  请求失败，请检查url: ${url} 是否正确。error message: ${resp?.statusText}`)
+      error(`⚠  Request failed, please check if url: ${url} is correct. error message: ${resp?.statusText}`)
     }
   } catch (e) {
-    error(`⚠  请求失败，请检查url: ${url} 是否正确。error message: ${e?.message}`)
+    error(`⚠  Request failed, please check if url: ${url} is correct. error message: ${e?.message}`)
   }
   return res
 }
@@ -58,13 +58,13 @@ async function getAccessToken (url, params) {
       if (respData?.status) {
         res = respData?.data || {}
       } else {
-        error(`⚠  获取access_token失败，请检查url、client_id、client_secret、username是否正确。errormessage: ${respData?.message}`)
+        error(`⚠  Failed to get access_token, please check url, client_id, client_secret, username. error message: ${respData?.message}`)
       }
     } else {
-      error(`⚠  获取access_token失败，请检查url、client_id、client_secret、username是否正确, response status: ${resp?.status}`)
+      error(`⚠  Failed to get access_token, please check url, client_id, client_secret, username. response status: ${resp?.status}`)
     }
   } catch (e) {
-    error(`⚠  获取access_token失败，请检查url、client_id、client_secret、username是否正确。error message: ${e?.message}`)
+    error(`⚠  Failed to get access_token, please check url, client_id, client_secret, username. error message: ${e?.message}`)
   }
   return res
 }
@@ -85,13 +85,13 @@ async function getIsv (url, access_token) {
       if (respData?.status) {
         res = respData?.data || {}
       } else {
-        error(`⚠  get isv fail，pls check url and credentials info, errormessage: ${respData?.message}`)
+        error(`⚠  get isv fail, pls check url and credentials info, errormessage: ${respData?.message}`)
       }
     } else {
-      error(`⚠  get isv fail，pls check url and credentials info, response status: ${resp?.status}`)
+      error(`⚠  get isv fail, pls check url and credentials info, response status: ${resp?.status}`)
     }
   } catch (err) {
-    error(`⚠ getIsv fail。error message: ${err.message}`)
+    error(`⚠ getIsv fail. error message: ${err.message}`)
   }
   return res
 }

package/src/api/uploader/updateKwcMeta.js

@@ -9,7 +9,7 @@ const { decrypt } = require('../../utils/crypto')
 module.exports.updateKwcMeta = async function updateKwcMeta(filePath, env = {}) {
   // TODO: 调用真实接口
   if (!fs.existsSync(filePath)) {
-    throw new Error(`❌ 未找到文件: ${filePath}`)
+    throw new Error(`❌ File not found: ${filePath}`)
   }
 
   const { url: backendUrl, client_id, client_secret, username, accountId, access_token } = env
@@ -62,7 +62,7 @@ module.exports.updateKwcMeta = async function updateKwcMeta(filePath, env = {})
       return res
     }
   } catch (err) {
-    console.warn(`⚠ 文本上传失败，尝试文件上传方式: ${err.message}`)
+    console.warn(`⚠ Text upload failed, trying file upload: ${err.message}`)
   }
 
   // ============ 第二阶段：FormData 文件流上传 ============
@@ -85,6 +85,6 @@ module.exports.updateKwcMeta = async function updateKwcMeta(filePath, env = {})
     }
     throw new Error(`File upload failed： ${res?.data?.message || res.status}`)
   } catch (err) {
-    throw new Error(`元数据上传失败：${err.message}`)
+    throw new Error(`${err.message}`)
   }
 }

package/src/api/uploader/updatePageMeta.js

@@ -14,7 +14,7 @@ const { decrypt } = require('../../utils/crypto')
 module.exports.updatePageMeta = async function updatePageMeta(filePath, env = {}) {
   // TODO: 调用真实接口
   if (!fs.existsSync(filePath)) {
-    throw new Error(`❌ 未找到文件: ${filePath}`)
+    throw new Error(`❌ File not found: ${filePath}`)
   }
 
   const { url: backendUrl, client_id, client_secret, username, accountId, access_token } = env
@@ -66,7 +66,7 @@ module.exports.updatePageMeta = async function updatePageMeta(filePath, env = {}
       return res
     }
   } catch (err) {
-    console.warn(`⚠ 文本上传失败，尝试文件上传方式: ${err.message}`)
+    console.warn(`⚠ Text upload failed, trying file upload: ${err.message}`)
   }
 
   // ============ 第二阶段：FormData 文件流上传 ============
@@ -89,6 +89,6 @@ module.exports.updatePageMeta = async function updatePageMeta(filePath, env = {}
     }
     throw new Error(`File upload failed： ${res?.data?.message || res.status}`)
   } catch (err) {
-    throw new Error(`元数据上传失败：${err.message}`)
+    throw new Error(`${err.message}`)
   }
 }

package/src/commands/env/index.js

@@ -1,7 +1,12 @@
+const KdHelp = require('../../utils/help')
+
 module.exports = function registerEnv(program) {
   const env = program
     .command('env')
     .description('Environment management')
+    .usage('[command] [options]')
+
+  env.createHelp = () => new KdHelp(env.configureHelp())
 
   env
     .command('create <name>')
@@ -11,9 +16,14 @@ module.exports = function registerEnv(program) {
       require('./create')(name, options)
     )
 
-  env
+  const set = env
     .command('set')
     .description('Set environment config')
+    .usage('[command] [options]')
+
+  set.createHelp = () => new KdHelp(set.configureHelp())
+
+  set
     .command('target-env <name>')
     .description('Set default environment')
     .action(name =>

package/src/commands/project/index.js

@@ -1,7 +1,12 @@
+const KdHelp = require('../../utils/help')
+
 module.exports = function registerProject(program) {
   const project = program
     .command('project')
     .description('Project management')
+    .usage('[command] [options]')
+
+  project.createHelp = () => new KdHelp(project.configureHelp())
 
   project
     .command('init <name>')

package/src/commands/update.js

@@ -0,0 +1,52 @@
+const { execSync } = require('child_process')
+const os = require('os')
+const ora = require('ora')
+const chalk = require('chalk')
+const { info, success, error } = require('../utils/log')
+const pkg = require('../../package.json')
+
+module.exports = async () => {
+  const spinner = ora('Checking for updates...').start()
+  
+  try {
+    // Check latest version
+    let latestVersion
+    try {
+      latestVersion = execSync(`npm view ${pkg.name} version`, { encoding: 'utf8', cwd: os.homedir() }).trim()
+    } catch (e) {
+      spinner.stop()
+      error('Failed to check for updates. Please check your network connection.')
+      return
+    }
+    
+    if (latestVersion === pkg.version) {
+      spinner.stop()
+      success(`You are already using the latest version (${chalk.green(pkg.version)}).`)
+      return
+    }
+
+    spinner.stop()
+    info(`New version available: ${chalk.green(latestVersion)} (current: ${chalk.yellow(pkg.version)})`)
+    spinner.start('Updating...')
+
+    try {
+      // Execute update
+      // Use os.homedir() as cwd to avoid reading project-specific .npmrc which might cause warnings
+      execSync(`npm install -g ${pkg.name}@latest`, { stdio: 'inherit', cwd: os.homedir() })
+      spinner.stop()
+      success(`Successfully updated to version ${chalk.green(latestVersion)}`)
+    } catch (err) {
+      spinner.stop()
+      error('Update failed')
+      console.log(chalk.red('\nPlease try running the following command manually:'))
+      console.log(chalk.cyan(`npm install -g ${pkg.name}@latest`))
+      if (process.platform !== 'win32') {
+         console.log(chalk.dim('(You may need to use sudo)'))
+      }
+    }
+  } catch (error) {
+    spinner.stop()
+    error('An error occurred during update')
+    console.error(error)
+  }
+}

package/src/index.js

@@ -3,15 +3,20 @@
 const { Command } = require('commander')
 const pkg = require('../package.json')
 const checkUpdate = require('./utils/checkUpdate')
+const KdHelp = require('./utils/help')
 
 const program = new Command()
+program.createHelp = () => new KdHelp(program.configureHelp())
 
-checkUpdate()
+if (!process.argv.includes('update')) {
+  checkUpdate()
+}
 
 program
   .name('kd')
+  .usage('[command] [options]')
   .description('Kingdee CLI')
-  .version(pkg.version)
+  .version(pkg.version, '-v, --version')
 
 program
   .command('update')

package/src/utils/help.js

@@ -0,0 +1,18 @@
+const { Help } = require('commander')
+
+class KdHelp extends Help {
+  subcommandTerm(cmd) {
+    if (cmd.name() === 'init') {
+      return 'init <name> [options]'
+    }
+    if (cmd.name() === 'create') {
+      return 'create <name> [options]'
+    }
+    if (cmd.name() === 'target-env') {
+      return 'target-env <name> [options]'
+    }
+    return super.subcommandTerm(cmd)
+  }
+}
+
+module.exports = KdHelp

package/src/utils/printTable.js

@@ -1,28 +1,98 @@
-function pad(str, len) {
-  str = String(str)
-  return str + ' '.repeat(Math.max(len - str.length, 0))
+const Table = require('cli-table3')
+
+let stringWidth
+try {
+  const m = require('string-width')
+  stringWidth = m.default || m
+} catch (e) {
+  // Fallback (simple approximation) if string-width is not available
+  stringWidth = (str) => {
+    let width = 0
+    for (let i = 0; i < str.length; i++) {
+      width += str.charCodeAt(i) > 255 ? 2 : 1
+    }
+    return width
+  }
+}
+
+function wrapText(text, width) {
+  if (width <= 0) return text
+  const lines = []
+  let line = ''
+  let lineWidth = 0
+  
+  for (const char of text) {
+      const cw = stringWidth(char)
+      if (lineWidth + cw > width) {
+          lines.push(line)
+          line = char
+          lineWidth = cw
+      } else {
+          line += char
+          lineWidth += cw
+      }
+  }
+  lines.push(line)
+  return lines.join('\n')
 }
 
-module.exports = function printTable(headers, rows) {
-  const colWidths = headers.map((h, i) =>
-    Math.max(
-      h.length,
-      ...rows.map(r => String(r[i] ?? '').length)
-    )
-  )
-
-  const line = headers
-    .map((h, i) => pad(h, colWidths[i]))
-    .join('  ')
-
-  console.log(line)
-  console.log(
-    colWidths.map(w => '-'.repeat(w)).join('  ')
-  )
-
-  rows.forEach(row => {
-    console.log(
-      row.map((cell, i) => pad(cell ?? '', colWidths[i])).join('  ')
-    )
+module.exports = function printTable(headers, rows, options = {}) {
+  const MAX_LENGTH = 500
+
+  // Pre-process rows to handle flattening, truncation, and manual wrapping
+  const processedRows = rows.map(row => {
+    return row.map((cell, colIndex) => {
+      if (typeof cell !== 'string') return cell
+
+      let text = cell
+      
+      // 1. Truncate: Limit total length first to avoid processing huge strings
+      if (text.length > MAX_LENGTH) {
+        text = text.slice(0, MAX_LENGTH) + '... (truncated)'
+      }
+      
+      // 2. Manual Wrap: If colWidth is provided, wrap manually to avoid cli-table3 CJK bugs
+      // We must handle existing newlines by wrapping each line individually
+      const colWidth = options.colWidths ? options.colWidths[colIndex] : null
+      if (colWidth && typeof colWidth === 'number') {
+        // cli-table3 default padding is 1 left + 1 right = 2
+        // We use a larger safety margin (3 or 4) to ensure we NEVER exceed the width
+        // due to potential width calculation mismatches between string-width versions
+        const padding = 2
+        const safetyMargin = 2 
+        const contentWidth = colWidth - padding - safetyMargin
+        
+        if (contentWidth > 0) {
+           // Split by existing newlines, wrap each segment, then rejoin
+           text = text.split('\n').map(line => wrapText(line, contentWidth)).join('\n')
+        }
+      }
+      
+      return text
+    })
   })
+
+  const table = new Table({
+    head: headers,
+    // Keep internal and horizontal borders, but remove left and right outer borders
+    chars: { 
+      'top': '─', 'top-mid': '┬', 'top-left': '', 'top-right': '',
+      'bottom': '─', 'bottom-mid': '┴', 'bottom-left': '', 'bottom-right': '',
+      'left': '', 'left-mid': '', 'mid': '─', 'mid-mid': '┼',
+      'right': '', 'right-mid': '', 'middle': '│' 
+    },
+    style: {
+      head: ['cyan'],
+      border: ['grey']
+    },
+    // Disable cli-table3's wordWrap if we have explicit column widths (since we manually wrapped)
+    // Otherwise enable it to let cli-table3 handle auto-sizing
+    wordWrap: !options.colWidths,
+    wrapOnWordBoundary: false,
+    colWidths: options.colWidths
+  })
+
+  processedRows.forEach(row => table.push(row))
+
+  console.log(table.toString())
 }

package/src/utils/projectConfig.js

@@ -5,7 +5,7 @@ function getConfig(root) {
   const configPath = path.join(root, '.kd', 'config.json')
 
   if (!fs.existsSync(configPath)) {
-    throw new Error('未找到 .kd/config.json')
+    throw new Error('.kd/config.json not found')
   }
 
   return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
@@ -15,7 +15,7 @@ function getConfigValue(root, key) {
   const config = getConfig(root)
 
   if (!config[key]) {
-    throw new Error(`config.json 中缺少 ${key}`)
+    throw new Error(`${key} is missing in config.json`)
   }
 
   return config[key]