jiradc-cli 1.0.34 → 1.0.35

package/dist/index.js

@@ -2014,22 +2014,35 @@ var WILDCARD = "*";
 var NEGATION = "-";
 function buildFieldNameIndex(fields) {
   const ids = /* @__PURE__ */ new Set();
+  const idsByLower = /* @__PURE__ */ new Map();
   const byName = /* @__PURE__ */ new Map();
+  const record = (alias, id) => {
+    const key = alias.toLowerCase();
+    const already = byName.get(key);
+    if (!already) {
+      byName.set(key, [id]);
+      return;
+    }
+    if (!already.includes(id)) already.push(id);
+  };
   for (const field of fields) {
     ids.add(field.id);
-    byName.set(field.name.toLowerCase(), field.id);
-    for (const clause of field.clauseNames ?? []) byName.set(clause.toLowerCase(), field.id);
+    idsByLower.set(field.id.toLowerCase(), field.id);
+    record(field.name, field.id);
+    for (const clause of field.clauseNames ?? []) record(clause, field.id);
   }
-  for (const field of fields) byName.set(field.id.toLowerCase(), field.id);
-  return { ids, byName };
+  return { ids, idsByLower, byName };
 }
-function resolveOne(token, index) {
-  if (index.ids.has(token)) return token;
-  return index.byName.get(token.toLowerCase());
+function candidatesFor(token, index) {
+  if (index.ids.has(token)) return [token];
+  const byId = index.idsByLower.get(token.toLowerCase());
+  if (byId !== void 0) return [byId];
+  return index.byName.get(token.toLowerCase()) ?? [];
 }
 function resolveFieldSelectors(tokens, index) {
   const resolved = [];
   const unresolved = [];
+  const ambiguous = [];
   for (const token of tokens) {
     if (token.startsWith(WILDCARD)) {
       resolved.push(token);
@@ -2037,22 +2050,48 @@ function resolveFieldSelectors(tokens, index) {
     }
     const negated = token.startsWith(NEGATION);
     const bare = negated ? token.slice(1) : token;
-    const id = resolveOne(bare, index);
-    if (id === void 0) {
+    const candidates = candidatesFor(bare, index);
+    if (candidates.length === 0) {
       unresolved.push(token);
       continue;
     }
-    resolved.push(negated ? `${NEGATION}${id}` : id);
+    if (candidates.length > 1) {
+      ambiguous.push({ name: bare, candidates });
+      continue;
+    }
+    resolved.push(negated ? `${NEGATION}${candidates[0]}` : candidates[0]);
+  }
+  if (unresolved.length > 0 || ambiguous.length > 0) {
+    throw new CliUsageError(describeFailure(unresolved, ambiguous), recoveryFor(unresolved, ambiguous), {
+      ...unresolved.length > 0 ? { unresolved } : {},
+      ...ambiguous.length > 0 ? { ambiguous } : {}
+    });
+  }
+  return [...new Set(resolved)];
+}
+function describeFailure(unresolved, ambiguous) {
+  const parts = [];
+  if (unresolved.length > 0) {
+    parts.push(`Unknown field name${unresolved.length > 1 ? "s" : ""}: ${unresolved.join(", ")}`);
+  }
+  for (const { name, candidates } of ambiguous) {
+    parts.push(`'${name}' matches ${candidates.length} fields on this instance: ${candidates.join(", ")}`);
   }
+  return parts.join(". ");
+}
+function recoveryFor(unresolved, ambiguous) {
+  const parts = [];
   if (unresolved.length > 0) {
-    const plural = unresolved.length > 1 ? "s" : "";
-    throw new CliUsageError(
-      `Unknown field name${plural}: ${unresolved.join(", ")}`,
-      `Jira selects fields by id, and these matched no field id, name or JQL clause name on this instance. Run jiradc field search <keyword> to find the right name or id. Left unresolved these would be dropped silently, returning an answer missing the field${plural} you asked for.`,
-      { unresolved }
+    parts.push(
+      "Jira selects fields by id, and these matched no field id, name or JQL clause name on this instance. Run jiradc field search <keyword> to find the right name or id."
     );
   }
-  return [...new Set(resolved)];
+  if (ambiguous.length > 0) {
+    parts.push(
+      `Field names are not unique on a Jira instance. Re-run with the id you mean \u2014 ${ambiguous.map((a) => a.candidates.join(" or ")).join("; ")} \u2014 or run jiradc issue get <key> --all-fields to see which one this issue carries. Choosing one for you would return an answer that looks complete and names no field it dropped.`
+    );
+  }
+  return parts.join(" ");
 }
 function parseFieldSelectors(raw) {
   return raw.split(",").map((token) => token.trim()).filter((token) => token.length > 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jiradc-cli",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "publish": true,
   "type": "module",
   "main": "dist/index.js",
@@ -23,8 +23,8 @@
     "tsx": "^4.19.2",
     "typescript": "^5.7.2",
     "vitest": "^4.0.16",
-    "cli-utils": "1.0.0",
     "config-eslint": "0.0.0",
+    "cli-utils": "1.0.0",
     "config-typescript": "0.0.0"
   },
   "engines": {