@kdcloudjs/cli 0.0.3 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/cli",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Kingdee CLI",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/actions/debug/index.js

@@ -50,38 +50,43 @@ module.exports = async function debug(options = {}) {
   }
 
   // 3. Get Form IDs
-  const pagesDir = path.join(root, 'app/pages')
-  const pageFiles = walk(pagesDir)
-  const forms = []
-  
-  for (const file of pageFiles) {
-    const id = getFormId(file)
-    if (id) {
-      forms.push({
-        title: id,
-        value: id
-      })
+  let formId = options.formid
+
+  if (!formId) {
+    const pagesDir = path.join(root, 'app/pages')
+    const pageFiles = walk(pagesDir)
+    const forms = []
+    
+    for (const file of pageFiles) {
+      const id = getFormId(file)
+      if (id) {
+        forms.push({
+          title: id,
+          value: id
+        })
+      }
     }
-  }
 
-  if (forms.length === 0) {
-    error('No pages found in app/pages')
-    return
-  }
+    if (forms.length === 0) {
+      error('No pages found in app/pages')
+      return
+    }
 
-  // 4. Select Form
-  const response = await safePrompts({
-    type: 'select',
-    name: 'formId',
-    message: 'Select a form to debug',
-    choices: forms
-  })
+    // 4. Select Form
+    const response = await safePrompts({
+      type: 'select',
+      name: 'formId',
+      message: 'Select a form to debug',
+      choices: forms
+    })
 
-  if (!response.formId) return
+    if (!response.formId) return
+    formId = response.formId
+  }
 
   // 5. Construct URL
   const targetUrl = new URL(env.url)
-  targetUrl.searchParams.append('formId', response.formId)
+  targetUrl.searchParams.append('formId', formId)
   targetUrl.searchParams.append('kdkwc_cdn', 'http://localhost:3333')
   const finalUrl = targetUrl.toString()
 

package/src/actions/env/auth/index.js

@@ -7,7 +7,7 @@ const openapiAuth = require('./openapi')
 const { error } = require('../../../utils/log')
 
 module.exports = async function doAuth(options ={}) {
-  let { type, env } = options
+  let { type, targetEnv: env } = options
 
   if (env === undefined) {
     env = loadDefaultEnv()?.name

package/src/actions/env/auth/openapi.js

@@ -3,7 +3,7 @@ const { getAllDataCenters, getAccessToken, getIsv } = require('../../../api')
 const { safePrompts } = require('../../../utils/prompts')
 const { encrypt } = require('../../../utils/crypto')
 const { isValidUrl } = require('../../../utils/validator')
-const { error } = require('../../../utils/log')
+const { error, success } = require('../../../utils/log')
 module.exports = async function authOpenAPI(options = {}) {
     const { env } = options
 
@@ -63,6 +63,8 @@ module.exports = async function authOpenAPI(options = {}) {
             error('Failed to obtain access_token. Please check your credentials and reauthentication.')
             return
         } 
+        success(`Successfully authenticated with OpenAPI.`)
+
 
         // 获取isv
         const { isv } = await getIsv(url, token) || {}

package/src/actions/env/auth/web.js

@@ -1,3 +1,3 @@
 module.exports = async function authWeb(options) {
-    console.log('Web authentication initiated with options:', options)
+    console.log('Web authentication is not supported at the moment; OpenAPI authentication is recommended.')
 }

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

@@ -36,13 +36,13 @@ function createPageXml(name) {
             <name>region1</name>
             <controls>
               <!-- <control>
-                    <type>ReactDemoAp</type>
-                    <name>ReactDemo</name>
-                    <label>测试组件名称</label>
+                    <type>controlAp</type>
+                    <name>controlKey</name>
+                    <label>组件名称</label>
                     <propertys>
                         <property>
                             <name>StringValue</name>
-                            <value>3333</value>
+                            <value>hello world</value>
                         </property>
                     </propertys>
                 </control> -->

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

@@ -20,19 +20,24 @@ module.exports = async function deploy(options = {}) {
 
       validateDeploy(ctx)
 
-      const files = collectMeta(ctx)
+      try {
+        const files = collectMeta(ctx)
 
-      if(!files || files.length === 0) {
-        error('No files to deploy')
-        return
-      }
+        if(!files || files.length === 0) {
+          error('No files to deploy')
+          return
+        }
 
-      // 更新isv信息到元数据描述文件 updateIsv
-      // 在上传前，统一注入 ISV
-      updateIsv(files, env?.isv)
+        // 更新isv信息到元数据描述文件 updateIsv
+        // 在上传前，统一注入 ISV
+        updateIsv(files, env?.isv)
 
-      await upload(files, env)
+        await upload(files, env)
 
-      // success('部署完成')
+        // success('部署完成')
+      } catch (err) {
+        error(err.message)
+        return
+      }
 
 }

package/src/api/index.js

@@ -7,7 +7,13 @@ async function getAllDataCenters (url) {
     url = url.trim().replace(/\/+$/, '')
     const resp = await fetch(`${url}/auth/getAllDatacenters.do`)
     if (resp?.status === 200) {
-      const data = await resp.json()
+      let data
+      try {
+        data = await resp.json()
+      } catch (e) {
+        error(`⚠  Data center response parsing failed, error message: ${e?.message}`)
+        return []
+      }
       if (Array.isArray(data) && data.length > 0) {
         for (let i = 0; i < data.length; i++) {
           const d = data[i]
@@ -54,7 +60,13 @@ async function getAccessToken (url, params) {
       body: JSON.stringify(body)
     })
     if (resp?.status === 200) {
-      const respData = await resp.json()
+      let respData
+      try {
+        respData = await resp.json()
+      } catch (e) {
+        error(`⚠  Token response parsing failed, error message: ${e?.message}`)
+        return {}
+      }
       if (respData?.status) {
         res = respData?.data || {}
       } else {
@@ -81,7 +93,13 @@ async function getIsv (url, access_token) {
     })
 
     if (resp.status === 200) {
-      const respData = await resp.json()
+      let respData
+      try {
+        respData = await resp.json()
+      } catch (e) {
+        error(`⚠  ISV response parsing failed, error message: ${e?.message}`)
+        return {}
+      }
       if (respData?.status) {
         res = respData?.data || {}
       } else {

package/src/commands/debug.js

@@ -1,8 +1,9 @@
 module.exports = function registerDebug(program) {
   program
     .command('debug')
-    .description('Debug project')
+    .description('debug project')
     .option('-e, --target-env <env>', 'specified target environment')
+    .option('-f, --formid <formId>', 'specified form id to debug')
     .action((options) =>
       require('../actions/debug')(options)
     )

package/src/commands/env/index.js

@@ -3,14 +3,14 @@ const KdHelp = require('../../utils/help')
 module.exports = function registerEnv(program) {
   const env = program
     .command('env')
-    .description('Environment management')
+    .description('environment management')
     .usage('[command] [options]')
 
   env.createHelp = () => new KdHelp(env.configureHelp())
 
   env
     .command('create <name>')
-    .description('Create a new environment')
+    .description('create a new environment')
     .option('--url <url>', 'environment url')
     .action((name, options) =>
       require('./create')(name, options)
@@ -18,46 +18,46 @@ module.exports = function registerEnv(program) {
 
   const set = env
     .command('set')
-    .description('Set environment config')
+    .description('set environment config')
     .usage('[command] [options]')
 
   set.createHelp = () => new KdHelp(set.configureHelp())
 
   set
     .command('target-env <name>')
-    .description('Set default environment')
+    .description('set default environment')
     .action(name =>
       require('./set')(name)
     )
 
   env
     .command('info')
-    .description('Show current environment info')
+    .description('show current environment info')
     .action(() =>
       require('./info')()
     )
 
   env
     .command('list')
-    .description('List all environments')
+    .description('list all environments')
     .action(() =>
       require('./list')()
     )
 
   env
     .command('delete <name>')
-    .description('Delete an environment')
+    .description('delete an environment')
     .action(name =>
       require('./delete')(name)
     )
 
   const auth = env
     .command('auth')
-    .description('Authenticate environment')
+    .description('authenticate environment')
 
   auth
     .command('web')
-    .description('Authenticate via Web (username/password)')
+    .description('authenticate via Web (username/password)')
     .option('-e --target-env <name>', 'target environment name')
     .action((options) =>
       require('./auth')('web', options)
@@ -65,7 +65,7 @@ module.exports = function registerEnv(program) {
 
   auth
     .command('openapi')
-    .description('Authenticate via OpenAPI (client credentials)')
+    .description('authenticate via OpenAPI (client credentials)')
     .option('-e --target-env <name>', 'target environment name')
     .action((options) =>
       require('./auth')('openapi', options)

package/src/commands/project/index.js

@@ -3,20 +3,20 @@ const KdHelp = require('../../utils/help')
 module.exports = function registerProject(program) {
   const project = program
     .command('project')
-    .description('Project management')
+    .description('project management')
     .usage('[command] [options]')
 
   project.createHelp = () => new KdHelp(project.configureHelp())
 
   project
     .command('init <name>')
-    .description('Initialize a new project')
+    .description('initialize a new project')
     .option('-s, --source <source>', 'specified repository source', 'outer')
     .action((name, options) => require('./init')(name, options))
 
   project
     .command('create <name>')
-    .description('Create control or page xml')
+    .description('create control or page xml')
     .option('--type <type>', 'project type: kwc | page')
     .action((name, options) =>
       require('./create')(name, options)
@@ -24,7 +24,7 @@ module.exports = function registerProject(program) {
 
   project
     .command('deploy')
-    .description('Deploy current project')
+    .description('deploy current project')
     .option('-e --target-env <env>', 'specified target environment')
     .option('-d --source-dir <dir>', 'specified source directory to deploy')
     // .option('-f --force', 'force deploy, ignore warnings')

package/src/utils/index.js

@@ -1,8 +1,10 @@
 exports.capitalize = function (name) {
+  if (!name || typeof name !== 'string') return ''
   return name[0].toUpperCase() + name.slice(1)
 }
 
 exports.toPascalCase = function (name) {
+  if (!name || typeof name !== 'string') return ''
   return name
     .replace(/(-\w)/g, (match) => match[1].toUpperCase()) // kebab-case to camelCase
     .replace(/^[a-z]/, (match) => match.toUpperCase())    // first char to Upper

package/src/utils/printTable.js

@@ -76,10 +76,10 @@ module.exports = function printTable(headers, rows, options = {}) {
     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': '│' 
+      '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'],

package/src/utils/projectConfig.js

@@ -1,20 +1,27 @@
 const fs = require('fs')
 const path = require('path')
+const { error } = require('./log')
 
 function getConfig(root) {
   const configPath = path.join(root, '.kd', 'config.json')
 
   if (!fs.existsSync(configPath)) {
-    throw new Error('.kd/config.json not found')
+    error('.kd/config.json not found, please run "kd project init" first')
+    process.exit(1)
   }
 
-  return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
+  try {
+    return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
+  } catch (e) {
+    error('Failed to parse .kd/config.json, please check if the file is valid JSON')
+    process.exit(1)
+  }
 }
 
 function getConfigValue(root, key) {
   const config = getConfig(root)
 
-  if (!config[key]) {
+  if (!config || !config[key]) {
     throw new Error(`${key} is missing in config.json`)
   }