@hangox/pm-cli 1.1.3 → 1.1.4

package/dist/index.js

@@ -1354,6 +1354,23 @@ var IssueService = class {
                   }
                 }
               }
+            } else if (field.field_format === "user") {
+              if (field.multiple && Array.isArray(field.value)) {
+                const userIds = [];
+                for (const item of field.value) {
+                  if (item.user?.id) {
+                    userIds.push(item.user.id);
+                  }
+                }
+                if (userIds.length > 0) {
+                  customFieldMap[field.id] = userIds.join(",");
+                }
+              } else {
+                const userValue = field.value;
+                if (userValue.user?.id) {
+                  customFieldMap[field.id] = userValue.user.id;
+                }
+              }
             } else {
               customFieldMap[field.id] = field.value;
             }
@@ -1458,7 +1475,7 @@ var IssueService = class {
    * @param options 选项
    */
   async batchCreateFromMarkdown(token, host, project, parentId, markdown, assignedToMail, options) {
-    const { dryRun = false, interval = 5e3 } = options || {};
+    const { dryRun = false, interval = 5e3, extraCustomFields = {} } = options || {};
     logger_default.info("\u5F00\u59CB\u6279\u91CF\u521B\u5EFA\u5B50\u5355", {
       parentId,
       assignedToMail,
@@ -1507,7 +1524,8 @@ var IssueService = class {
         assignedToMail,
         dryRun,
         interval,
-        result
+        result,
+        extraCustomFields
       );
       logger_default.info("\u6279\u91CF\u521B\u5EFA\u5B8C\u6210", {
         totalCreated: result.totalCreated,
@@ -1525,7 +1543,7 @@ var IssueService = class {
   /**
    * 递归批量创建子单
    */
-  async batchCreateRecursive(token, host, project, taskNodes, targetParentId, parentInfo, assignedToMail, dryRun, interval, result) {
+  async batchCreateRecursive(token, host, project, taskNodes, targetParentId, parentInfo, assignedToMail, dryRun, interval, result, extraCustomFields = {}) {
     for (const node of taskNodes) {
       const taskName = node.subject;
       const isLeafNode = node.children.length === 0;
@@ -1562,19 +1580,40 @@ var IssueService = class {
                   }
                 }
               }
+            } else if (field.field_format === "user") {
+              if (field.multiple && Array.isArray(field.value)) {
+                const userIds = [];
+                for (const item of field.value) {
+                  if (item.user?.id) {
+                    userIds.push(item.user.id);
+                  }
+                }
+                if (userIds.length > 0) {
+                  customFieldMap[field.id] = userIds.join(",");
+                }
+              } else {
+                const userValue = field.value;
+                if (userValue.user?.id) {
+                  customFieldMap[field.id] = userValue.user.id;
+                }
+              }
             } else {
               customFieldMap[field.id] = field.value;
             }
           }
         }
-        if (Object.keys(customFieldMap).length > 0) {
-          createParams.custom_field = JSON.stringify(customFieldMap);
+        const mergedCustomFields = { ...customFieldMap, ...extraCustomFields };
+        if (Object.keys(mergedCustomFields).length > 0) {
+          createParams.custom_field = JSON.stringify(mergedCustomFields);
         }
         if (followsMails.length > 0) {
           createParams.follows = followsMails;
         }
+      } else if (Object.keys(extraCustomFields).length > 0) {
+        createParams.custom_field = JSON.stringify(extraCustomFields);
       }
       logger_default.info(`\u6B63\u5728\u521B\u5EFA\u5B50\u4EFB\u52A1: ${taskName}`, { targetParentId, isLeafNode, estimatedHours: node.estimatedHours });
+      logger_default.debug("\u521B\u5EFA\u53C2\u6570", { custom_field: createParams.custom_field, follows: createParams.follows });
       if (dryRun) {
         logger_default.info(`[\u6A21\u62DF] \u5C06\u521B\u5EFA\u5B50\u4EFB\u52A1: ${taskName}`);
         result.totalCreated++;
@@ -1597,7 +1636,8 @@ var IssueService = class {
             assignedToMail,
             dryRun,
             interval,
-            result
+            result,
+            extraCustomFields
           );
         }
       } else {
@@ -1627,7 +1667,8 @@ var IssueService = class {
                 assignedToMail,
                 dryRun,
                 interval,
-                result
+                result,
+                extraCustomFields
               );
             }
           } else {
@@ -1859,6 +1900,74 @@ function generateAIGuideOutput(exportDir, fileCount, totalSize) {
 `.trim();
 }
 
+// src/utils/custom-field-parser.ts
+var issueService2 = new IssueService();
+async function parseCustomFieldInputs(customFieldInputs, token, host, project) {
+  if (customFieldInputs.length === 0) {
+    return { fields: {} };
+  }
+  const customFieldData = {};
+  for (const input of customFieldInputs) {
+    const match = input.match(/^([^=]+)=(.*)$/);
+    if (!match) {
+      return {
+        fields: {},
+        error: `\u81EA\u5B9A\u4E49\u5B57\u6BB5\u683C\u5F0F\u9519\u8BEF: ${input}\uFF0C\u6B63\u786E\u683C\u5F0F\u4E3A "\u5B57\u6BB5ID=\u503C" \u6216 "\u5B57\u6BB5\u540D=\u503C"`
+      };
+    }
+    const [, key, value] = match;
+    customFieldData[key.trim()] = value.trim();
+  }
+  const hasNonNumericKey = Object.keys(customFieldData).some((key) => isNaN(Number(key)));
+  if (hasNonNumericKey) {
+    const fieldOptionsResult = await issueService2.getIssueFieldOptions(token, host, project);
+    if (fieldOptionsResult.success && fieldOptionsResult.data) {
+      const fieldOptions = fieldOptionsResult.data;
+      if (fieldOptions.data?.custom_fields) {
+        const fieldMap = /* @__PURE__ */ new Map();
+        for (const field of fieldOptions.data.custom_fields) {
+          fieldMap.set(field.name, field.id);
+        }
+        const convertedData = {};
+        for (const [key, value] of Object.entries(customFieldData)) {
+          const fieldId = isNaN(Number(key)) ? fieldMap.get(key) : Number(key);
+          if (fieldId !== void 0) {
+            convertedData[fieldId] = value;
+          } else {
+            return { fields: {}, error: `\u672A\u627E\u5230\u81EA\u5B9A\u4E49\u5B57\u6BB5: ${key}` };
+          }
+        }
+        return { fields: convertedData };
+      } else {
+        return { fields: {}, error: "\u65E0\u6CD5\u83B7\u53D6\u81EA\u5B9A\u4E49\u5B57\u6BB5\u5217\u8868" };
+      }
+    } else {
+      return { fields: {}, error: "\u83B7\u53D6\u81EA\u5B9A\u4E49\u5B57\u6BB5\u5217\u8868\u5931\u8D25" };
+    }
+  } else {
+    const convertedData = {};
+    for (const [key, value] of Object.entries(customFieldData)) {
+      convertedData[Number(key)] = value;
+    }
+    return { fields: convertedData };
+  }
+}
+function collectCustomFieldInputs(options) {
+  const customFieldInputs = [];
+  if (options.customField) {
+    customFieldInputs.push(
+      ...Array.isArray(options.customField) ? options.customField : [options.customField]
+    );
+  }
+  if (options.cf) {
+    customFieldInputs.push(...Array.isArray(options.cf) ? options.cf : [options.cf]);
+  }
+  return customFieldInputs;
+}
+function mergeCustomFields(inheritedFields, userFields) {
+  return { ...inheritedFields, ...userFields };
+}
+
 // src/commands/issue/index.ts
 function createIssueCommand() {
   const issueCmd = new Command3("issue").description("\u95EE\u9898\u7BA1\u7406");
@@ -1955,7 +2064,7 @@ function createIssueCommand() {
       }
     }
   });
-  issueCmd.command("create").description("\u521B\u5EFA\u95EE\u9898").requiredOption("--subject <subject>", "\u95EE\u9898\u6807\u9898").option("--description <description>", "\u95EE\u9898\u63CF\u8FF0").option("--tracker <tracker>", "\u8DDF\u8E2A\u5668\u540D\u79F0").option("--tracker-id <id>", "\u8DDF\u8E2A\u5668 ID").option("--priority-id <id>", "\u4F18\u5148\u7EA7 ID").option("--assigned-to-mail <email>", "\u6307\u6D3E\u4EBA\u90AE\u7BB1").option("--assigned-to-id <id>", "\u6307\u6D3E\u4EBA ID").option("--parent-id <id>", "\u7236\u95EE\u9898 ID\uFF08\u5B50\u5355\u4F1A\u7EE7\u627F\u7236\u5355\u7684 tracker\u3001version\u3001assigned_to \u7B49\u4FE1\u606F\uFF09").option("--version <version>", "\u76EE\u6807\u7248\u672C\u540D\u79F0").option("--start-date <date>", "\u5F00\u59CB\u65E5\u671F").option("--due-date <date>", "\u622A\u6B62\u65E5\u671F").option("--estimated-hours <hours>", "\u9884\u4F30\u5DE5\u65F6").option("--token <token>", "API Token").option("--host <host>", "PM \u4E3B\u673A\u5730\u5740").option("--project <project>", "\u9879\u76EE\u540D\u79F0").option("--profile <name>", "\u4F7F\u7528\u914D\u7F6E profile").option("--config <path>", "\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84").option("--pretty", "\u683C\u5F0F\u5316\u8F93\u51FA JSON\uFF08\u9ED8\u8BA4\u538B\u7F29\uFF09").action(async (options) => {
+  issueCmd.command("create").description("\u521B\u5EFA\u95EE\u9898").requiredOption("--subject <subject>", "\u95EE\u9898\u6807\u9898").option("--description <description>", "\u95EE\u9898\u63CF\u8FF0").option("--tracker <tracker>", "\u8DDF\u8E2A\u5668\u540D\u79F0").option("--tracker-id <id>", "\u8DDF\u8E2A\u5668 ID").option("--priority-id <id>", "\u4F18\u5148\u7EA7 ID").option("--assigned-to-mail <email>", "\u6307\u6D3E\u4EBA\u90AE\u7BB1").option("--assigned-to-id <id>", "\u6307\u6D3E\u4EBA ID").option("--parent-id <id>", "\u7236\u95EE\u9898 ID\uFF08\u5B50\u5355\u4F1A\u7EE7\u627F\u7236\u5355\u7684 tracker\u3001version\u3001assigned_to \u7B49\u4FE1\u606F\uFF09").option("--version <version>", "\u76EE\u6807\u7248\u672C\u540D\u79F0").option("--start-date <date>", "\u5F00\u59CB\u65E5\u671F").option("--due-date <date>", "\u622A\u6B62\u65E5\u671F").option("--estimated-hours <hours>", "\u9884\u4F30\u5DE5\u65F6").option("--custom-field <key=value>", "\u81EA\u5B9A\u4E49\u5B57\u6BB5 (\u683C\u5F0F: \u5B57\u6BB5ID=\u503C \u6216 \u5B57\u6BB5\u540D=\u503C\uFF0C\u53EF\u591A\u6B21\u4F7F\u7528)").option("--cf <key=value>", "\u81EA\u5B9A\u4E49\u5B57\u6BB5\u7684\u7B80\u5199\u522B\u540D").option("--token <token>", "API Token").option("--host <host>", "PM \u4E3B\u673A\u5730\u5740").option("--project <project>", "\u9879\u76EE\u540D\u79F0").option("--profile <name>", "\u4F7F\u7528\u914D\u7F6E profile").option("--config <path>", "\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84").option("--pretty", "\u683C\u5F0F\u5316\u8F93\u51FA JSON\uFF08\u9ED8\u8BA4\u538B\u7F29\uFF09").action(async (options) => {
     const creds = resolveCredentials(options);
     const validation = validateCredentials(creds);
     if (!validation.valid) {
@@ -1998,8 +2107,8 @@ function createIssueCommand() {
           const followsMails = [];
           for (const field of parent.custom_fields) {
             if (field.value !== null && field.value !== void 0 && field.value !== "") {
-              const fieldWithIdentify = field;
-              if (fieldWithIdentify.identify === "IssuesQCFollow") {
+              const fieldWithMeta = field;
+              if (fieldWithMeta.identify === "IssuesQCFollow") {
                 const followsValue = field.value;
                 if (Array.isArray(followsValue)) {
                   for (const item of followsValue) {
@@ -2008,6 +2117,23 @@ function createIssueCommand() {
                     }
                   }
                 }
+              } else if (fieldWithMeta.field_format === "user") {
+                if (fieldWithMeta.multiple && Array.isArray(field.value)) {
+                  const userIds = [];
+                  for (const item of field.value) {
+                    if (item.user?.id) {
+                      userIds.push(item.user.id);
+                    }
+                  }
+                  if (userIds.length > 0) {
+                    customFieldMap[field.id] = userIds.join(",");
+                  }
+                } else {
+                  const userValue = field.value;
+                  if (userValue.user?.id) {
+                    customFieldMap[field.id] = userValue.user.id;
+                  }
+                }
               } else {
                 customFieldMap[field.id] = field.value;
               }
@@ -2036,6 +2162,24 @@ function createIssueCommand() {
     if (options.startDate) params.start_date = options.startDate;
     if (options.dueDate) params.due_date = options.dueDate;
     if (options.estimatedHours) params.estimated_hours = parseFloat(options.estimatedHours);
+    const customFieldInputs = collectCustomFieldInputs(options);
+    if (customFieldInputs.length > 0) {
+      const parseResult = await parseCustomFieldInputs(
+        customFieldInputs,
+        creds.token,
+        creds.host,
+        creds.project
+      );
+      if (parseResult.error) {
+        outputError(parseResult.error, options.pretty);
+        process.exit(1);
+      }
+      const existingFields = params.custom_field ? JSON.parse(params.custom_field) : {};
+      const mergedFields = mergeCustomFields(existingFields, parseResult.fields);
+      if (Object.keys(mergedFields).length > 0) {
+        params.custom_field = JSON.stringify(mergedFields);
+      }
+    }
     const result = await issueService.createIssue(params);
     if (result.success && result.data) {
       outputSuccess(result.data, options.pretty);
@@ -2474,7 +2618,7 @@ function createIssueCommand() {
       process.exit(1);
     }
   });
-  issueCmd.command("batch-create").description("\u4ECE Markdown \u6279\u91CF\u521B\u5EFA\u5B50\u5355").option("--parent-id <id>", "\u7236\u5355 ID").option("--parent-url <url>", "\u7236\u5355 PM \u94FE\u63A5").option("--markdown <file>", "Markdown \u6587\u4EF6\u8DEF\u5F84").option("--stdin", "\u4ECE\u6807\u51C6\u8F93\u5165\u8BFB\u53D6 Markdown").option("--assigned-to-mail <email>", "\u6307\u6D3E\u4EBA\u90AE\u7BB1\uFF08\u9ED8\u8BA4\u4F7F\u7528\u914D\u7F6E\u7684 userMail\uFF09").option("--interval <ms>", "\u521B\u5EFA\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09", "5000").option("--dry-run", "\u6A21\u62DF\u8FD0\u884C\uFF0C\u4E0D\u5B9E\u9645\u521B\u5EFA").option("-o, --output <path>", "\u8F93\u51FA JSON \u5230\u6307\u5B9A\u6587\u4EF6").option("--stdout", "\u5F3A\u5236\u8F93\u51FA\u5230\u63A7\u5236\u53F0\u800C\u975E\u6587\u4EF6").option("--token <token>", "API Token").option("--host <host>", "PM \u4E3B\u673A\u5730\u5740").option("--project <project>", "\u9879\u76EE\u540D\u79F0").option("--profile <name>", "\u4F7F\u7528\u914D\u7F6E profile").option("--config <path>", "\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84").option("--pretty", "\u683C\u5F0F\u5316\u8F93\u51FA JSON\uFF08\u9ED8\u8BA4\u538B\u7F29\uFF09").action(async (options) => {
+  issueCmd.command("batch-create").description("\u4ECE Markdown \u6279\u91CF\u521B\u5EFA\u5B50\u5355").option("--parent-id <id>", "\u7236\u5355 ID").option("--parent-url <url>", "\u7236\u5355 PM \u94FE\u63A5").option("--markdown <file>", "Markdown \u6587\u4EF6\u8DEF\u5F84").option("--stdin", "\u4ECE\u6807\u51C6\u8F93\u5165\u8BFB\u53D6 Markdown").option("--assigned-to-mail <email>", "\u6307\u6D3E\u4EBA\u90AE\u7BB1\uFF08\u9ED8\u8BA4\u4F7F\u7528\u914D\u7F6E\u7684 userMail\uFF09").option("--interval <ms>", "\u521B\u5EFA\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09", "5000").option("--dry-run", "\u6A21\u62DF\u8FD0\u884C\uFF0C\u4E0D\u5B9E\u9645\u521B\u5EFA").option("--custom-field <key=value>", "\u81EA\u5B9A\u4E49\u5B57\u6BB5 (\u683C\u5F0F: \u5B57\u6BB5ID=\u503C\uFF0C\u8986\u76D6\u7EE7\u627F\u7684\u503C\uFF0C\u53EF\u591A\u6B21\u4F7F\u7528)").option("--cf <key=value>", "\u81EA\u5B9A\u4E49\u5B57\u6BB5\u7684\u7B80\u5199\u522B\u540D").option("-o, --output <path>", "\u8F93\u51FA JSON \u5230\u6307\u5B9A\u6587\u4EF6").option("--stdout", "\u5F3A\u5236\u8F93\u51FA\u5230\u63A7\u5236\u53F0\u800C\u975E\u6587\u4EF6").option("--token <token>", "API Token").option("--host <host>", "PM \u4E3B\u673A\u5730\u5740").option("--project <project>", "\u9879\u76EE\u540D\u79F0").option("--profile <name>", "\u4F7F\u7528\u914D\u7F6E profile").option("--config <path>", "\u81EA\u5B9A\u4E49\u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84").option("--pretty", "\u683C\u5F0F\u5316\u8F93\u51FA JSON\uFF08\u9ED8\u8BA4\u538B\u7F29\uFF09").action(async (options) => {
     let parentId;
     let parentHost;
     if (options.parentUrl) {
@@ -2547,6 +2691,21 @@ function createIssueCommand() {
     }
     const interval = parseInt(options.interval, 10);
     const dryRun = options.dryRun || false;
+    const customFieldInputs = collectCustomFieldInputs(options);
+    let extraCustomFields = {};
+    if (customFieldInputs.length > 0) {
+      const parseResult = await parseCustomFieldInputs(
+        customFieldInputs,
+        creds.token,
+        creds.host,
+        creds.project || ""
+      );
+      if (parseResult.error) {
+        outputError(parseResult.error, options.pretty);
+        process.exit(1);
+      }
+      extraCustomFields = parseResult.fields;
+    }
     const result = await issueService.batchCreateFromMarkdown(
       creds.token,
       creds.host,
@@ -2554,7 +2713,7 @@ function createIssueCommand() {
       parentId,
       markdown,
       assignedToMail,
-      { dryRun, interval }
+      { dryRun, interval, extraCustomFields }
     );
     if (result.success && result.data) {
       const output = {
@@ -2824,6 +2983,7 @@ function createTimeCommand() {
       process.exit(1);
     }
     let projectName = creds.project;
+    let projectAutoDetected = false;
     if (!projectName) {
       logger_default.info(`\u672A\u6307\u5B9A\u9879\u76EE\uFF0C\u6B63\u5728\u4ECE\u95EE\u9898 #${issueId} \u83B7\u53D6\u9879\u76EE\u4FE1\u606F...`);
       const issueResult = await issueService.getIssue(creds.token, creds.host, "", issueId);
@@ -2837,6 +2997,7 @@ function createTimeCommand() {
         process.exit(1);
       }
       logger_default.info(`\u4ECE\u95EE\u9898\u83B7\u53D6\u5230\u9879\u76EE\u540D\u79F0: ${projectName}`);
+      projectAutoDetected = true;
     }
     const params = {
       token: creds.token,
@@ -2856,7 +3017,15 @@ function createTimeCommand() {
     if (options.comments) params.comments = options.comments;
     const result = await timeEntryService.createTimeEntry(params);
     if (result.success && result.data) {
-      outputSuccess(result.data, options.pretty);
+      if (projectAutoDetected) {
+        const dataWithHint = {
+          ...result.data,
+          _hint: `\u9879\u76EE\u540D\u79F0 "${projectName}" \u662F\u4ECE\u95EE\u9898\u81EA\u52A8\u83B7\u53D6\u7684\u3002\u5982\u9700\u8BBE\u4E3A\u9ED8\u8BA4\uFF0C\u8BF7\u6267\u884C: pm-cli config set project "${projectName}"`
+        };
+        outputSuccess(dataWithHint, options.pretty);
+      } else {
+        outputSuccess(result.data, options.pretty);
+      }
     } else {
       outputError(extractErrorMessage(result, "\u521B\u5EFA\u5DE5\u65F6\u5931\u8D25"), options.pretty);
       process.exit(1);