@yizhuan-cli/cli 0.1.4 → 0.1.6-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yizhuan-cli/cli",
-  "version": "0.1.4",
+  "version": "0.1.6-beta.0",
   "description": "易撰命令行工具，用于通过 API Key 查询易撰真实数据。",
   "private": false,
   "type": "module",
@@ -11,13 +11,6 @@
     "src",
     "README.md"
   ],
-  "scripts": {
-    "start": "node src/index.js",
-    "pack:dry-run": "npm pack --dry-run",
-    "smoke": "node src/index.js --help && node --test src/version.test.js",
-    "test:params": "node --test src/params.test.js",
-    "test:version": "node --test src/version.test.js"
-  },
   "engines": {
     "node": ">=22"
   },
@@ -29,5 +22,12 @@
   "license": "UNLICENSED",
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "start": "node src/index.js",
+    "pack:dry-run": "npm pack --dry-run",
+    "smoke": "node src/index.js --help && node --test src/version.test.js",
+    "test:params": "node --test src/params.test.js",
+    "test:version": "node --test src/version.test.js"
   }
-}
+}

package/src/index.js

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url'
 
 const CLI_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
 const PACKAGE_PATH = path.join(CLI_DIR, 'package.json')
-const CONFIG_PATH = path.join(os.homedir(), '.config', 'yizhuan', 'config.json')
+const CONFIG_PATH = process.env.YIZHUAN_CONFIG_PATH || path.join(os.homedir(), '.config', 'yizhuan', 'config.json')
 const ABILITIES = new Set([
   'works',
   'accounts',
@@ -50,6 +50,7 @@ Usage:
   yizhuan --version
   yizhuan execute --ability <ability> [--query <text>] [--params <json>] [--platform <name>]
   yizhuan query --json '<request JSON>' [--format json|table|markdown]
+  yizhuan query --json-file <path> [--format json|table|markdown]
   yizhuan config path
   yizhuan config show
 
@@ -64,6 +65,7 @@ Examples:
 
 Notes:
   - PowerShell 推荐优先使用 --platform / --mode 等独立参数，或单引号 JSON：--params '{"platform":"douyin"}'
+  - 所有 Shell 都可用 --json-file request.json，避免 JSON 引号被终端改写
   - bash/zsh 也可用：--params '{"platform":"douyin"}' 或 --platform douyin
   - 兼容 key=value：--params platform=douyin
 
@@ -78,6 +80,7 @@ Abilities:
 
 Config:
   ${CONFIG_PATH}
+  可通过环境变量 YIZHUAN_CONFIG_PATH 指定独立配置文件
 `)
 }
 
@@ -128,7 +131,7 @@ function readFlagValue(argv, startIndex, key) {
   let raw = argv[index]
   if (raw == null) return { value: true, nextIndex: startIndex - 1 }
 
-  if (key === 'params' && /[{\[]/.test(raw)) {
+  if ((key === 'params' || key === 'json') && /[{\[]/.test(raw)) {
     let joined = raw
     while (!isBalancedJsonLike(joined) && index + 1 < argv.length && !String(argv[index + 1]).startsWith('--')) {
       index += 1
@@ -140,7 +143,7 @@ function readFlagValue(argv, startIndex, key) {
   return { value: raw, nextIndex: index }
 }
 
-function parseArgs(argv) {
+export function parseArgs(argv) {
   const args = { _: [] }
   for (let index = 0; index < argv.length; index += 1) {
     const value = argv[index]
@@ -152,13 +155,13 @@ function parseArgs(argv) {
     const body = value.slice(2)
     const eqIndex = body.indexOf('=')
     if (eqIndex > 0) {
-      const key = body.slice(0, eqIndex)
+      const key = body.slice(0, eqIndex).replace(/-([a-z])/g, (_, letter) => letter.toUpperCase())
       const raw = body.slice(eqIndex + 1)
       args[key] = raw
       continue
     }
 
-    const key = body
+    const key = body.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase())
     const next = argv[index + 1]
     if (!next || next.startsWith('--')) {
       args[key] = true
@@ -333,7 +336,12 @@ function renderQuery(payload, format) {
 }
 
 async function query(args) {
-  const request = parseParams(args.json || args.params)
+  const jsonText = args.jsonFile
+    ? fs.readFileSync(path.resolve(String(args.jsonFile)), 'utf8')
+    : args.json === '-'
+      ? fs.readFileSync(0, 'utf8')
+      : args.json || args.params
+  const request = parseParams(jsonText)
   if (!request) throw new Error('query 必须提供 --json 请求对象')
   const config = readConfig()
   const response = await fetch(`${config.apiBaseUrl}/api/agent.query`, {
@@ -386,7 +394,7 @@ const isDirectRun = (() => {
   const entry = process.argv[1]
   if (!entry) return false
   try {
-    return path.resolve(entry) === fileURLToPath(import.meta.url)
+    return fs.realpathSync(path.resolve(entry)) === fs.realpathSync(fileURLToPath(import.meta.url))
   } catch {
     return false
   }

package/src/params.test.js

@@ -1,6 +1,6 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
-import { buildExecuteParams, parseParams } from './index.js'
+import { buildExecuteParams, parseArgs, parseParams } from './index.js'
 
 test('parseParams accepts standard JSON', () => {
   assert.deepEqual(parseParams('{"platform":"douyin"}'), { platform: 'douyin' })
@@ -45,3 +45,24 @@ test('buildExecuteParams prefers explicit params keys over flags', () => {
     { platform: 'weibo' }
   )
 })
+
+test('parseArgs preserves query JSON supplied after --json', () => {
+  assert.deepEqual(
+    parseArgs(['query', '--json', '{"intent":"author_search","platform":"douyin"}']),
+    { _: ['query'], json: '{"intent":"author_search","platform":"douyin"}' }
+  )
+})
+
+test('parseArgs maps --json-file to the property used by query', () => {
+  assert.deepEqual(
+    parseArgs(['query', '--json-file', 'request.json']),
+    { _: ['query'], jsonFile: 'request.json' }
+  )
+})
+
+test('parseArgs preserves query JSON split into multiple argv fragments', () => {
+  assert.deepEqual(
+    parseArgs(['query', '--json', '{"intent":', '"author_search",', '"platform":"douyin"}']),
+    { _: ['query'], json: '{"intent":"author_search","platform":"douyin"}' }
+  )
+})