pipe-kan 0.13.0 → 0.13.2

package/dist/pipe-kan.js

@@ -27,15 +27,27 @@ function issueType(fields) {
   const name = fields?.issuetype?.name ?? fields?.issueType?.name;
   return typeof name === "string" ? name : undefined;
 }
+function asIssueKey(value) {
+  if (typeof value === "string") {
+    const key = value.trim();
+    return /^[A-Za-z][A-Za-z0-9_]*-\d+$/.test(key) ? key : undefined;
+  }
+  if (value && typeof value === "object" && "key" in value) {
+    return asIssueKey(value.key);
+  }
+  return;
+}
 function epicKey(fields) {
-  if (typeof fields?.parent?.key === "string")
-    return fields.parent.key;
-  const link = fields?.["Epic Link"];
-  if (typeof link === "string" && link)
-    return link;
-  if (link && typeof link === "object" && "key" in link) {
-    const key = link.key;
-    if (typeof key === "string" && key)
+  if (!fields)
+    return;
+  const named = asIssueKey(fields.parent) ?? asIssueKey(fields.parentEpic) ?? asIssueKey(fields["Epic Link"]);
+  if (named)
+    return named;
+  for (const [name, value] of Object.entries(fields)) {
+    if (!name.startsWith("customfield_"))
+      continue;
+    const key = asIssueKey(value);
+    if (key)
       return key;
   }
   return;
@@ -345,7 +357,7 @@ function createJiraCli(opts = {}) {
         "issue",
         "list",
         "-q",
-        `parent="${key}" OR "Epic Link"="${key}"`,
+        `(parent="${key}" OR "Epic Link"="${key}")`,
         "--raw"
       ]);
       if (result.code !== 0) {
@@ -364,7 +376,7 @@ function createJiraCli(opts = {}) {
         "issue",
         "list",
         "-q",
-        `parent in (${list}) OR "Epic Link" in (${list})`,
+        `(parent in (${list}) OR "Epic Link" in (${list}))`,
         "--raw"
       ]);
       if (result.code !== 0) {
@@ -550,6 +562,24 @@ function stampMissingEpic(board, epic) {
   }
   return board;
 }
+function stampRawParent(raw, epic) {
+  if (!Array.isArray(raw))
+    return [];
+  return raw.map((issue) => {
+    if (!issue || typeof issue !== "object")
+      return issue;
+    const current = issue;
+    const fields = current.fields;
+    if (!fields || typeof fields !== "object" || fields.parent)
+      return issue;
+    return { ...current, fields: { ...fields, parent: { key: epic } } };
+  });
+}
+function cardsOf(raw) {
+  if (!Array.isArray(raw))
+    return [];
+  return issuesToBoard(raw).columns.flatMap((column) => column.cards);
+}
 function createApp(opts) {
   const cli = opts.cli ?? createStoreCli(opts.store);
   let flags = DEFAULT_FLAGS;
@@ -593,22 +623,33 @@ function createApp(opts) {
     async refresh(next) {
       if (next !== undefined)
         flags = next;
-      childrenError = undefined;
       const [issues, epics] = await Promise.all([
         cli.list(flags),
         cli.listEpics()
       ]);
-      payload = JSON.parse(issues);
-      epicsPayload = JSON.parse(epics);
-      const keys = listedEpicKeys();
+      const nextPayload = JSON.parse(issues);
+      const nextEpics = JSON.parse(epics);
+      const keys = issuesToBoard(nextEpics).epics.map((epic) => epic.key);
+      let nextChildren = [];
+      let nextHasCache = false;
+      let nextError;
       try {
-        childrenRaw = JSON.parse(await cli.listChildren(keys));
-        hasChildrenCache = true;
+        nextChildren = JSON.parse(await cli.listChildren(keys));
+        const cards = cardsOf(nextChildren);
+        if (cards.length > 0 && !cards.some((card) => card.epic)) {
+          nextChildren = (await Promise.all(keys.map(async (key) => stampRawParent(JSON.parse(await cli.listEpic(key)), key)))).flat();
+        }
+        nextHasCache = true;
       } catch (err) {
-        hasChildrenCache = false;
-        childrenRaw = [];
-        childrenError = err instanceof Error ? err.message : "Epic children list failed";
+        nextHasCache = false;
+        nextChildren = [];
+        nextError = err instanceof Error ? err.message : "Epic children list failed";
       }
+      payload = nextPayload;
+      epicsPayload = nextEpics;
+      childrenRaw = nextChildren;
+      hasChildrenCache = nextHasCache;
+      childrenError = nextError;
       return app.board();
     },
     async children(epic) {
@@ -620,10 +661,9 @@ function createApp(opts) {
             epic: card.epic ?? epic
           }))
         ]));
-        return {
-          columns: Object.entries(cards).filter(([, list]) => list.length).map(([title, list]) => ({ id: title, title, cards: list })),
-          epics: []
-        };
+        const columns = Object.entries(cards).filter(([, list]) => list.length).map(([title, list]) => ({ id: title, title, cards: list }));
+        if (columns.length)
+          return { columns, epics: [] };
       }
       return stampMissingEpic(issuesToBoard(JSON.parse(await cli.listEpic(epic))), epic);
     },
@@ -1070,6 +1110,10 @@ async function runServer(opts) {
   await new Promise((resolve) => server.listen(port, host, resolve));
   const origin = `http://127.0.0.1:${port}`;
   const fakeConfig = writeJiraConfig(join4(tmpdir(), "pipe-kan"), origin);
+  console.log(`pipe-kan http://${host}:${port}`);
+  console.log(`cli ${kind === "jira" ? resolveJiraBin() : "store"}`);
+  console.log(`Fake Jira ${origin}/rest/api/2/search`);
+  console.log(`Fake Jira config ${fakeConfig}`);
   if (kind === "jira") {
     try {
       await refreshFromJira(app, kind, { piped: Boolean(piped) });
@@ -1078,10 +1122,6 @@ async function runServer(opts) {
       console.error(err);
     }
   }
-  console.log(`pipe-kan http://${host}:${port}`);
-  console.log(`cli ${kind === "jira" ? resolveJiraBin() : "store"}`);
-  console.log(`Fake Jira ${origin}/rest/api/2/search`);
-  console.log(`Fake Jira config ${fakeConfig}`);
 }
 
 // src/bin.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pipe-kan",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "Local Kanban for jira-cli",
   "license": "MIT",
   "type": "module",