innernote 0.1.1 → 0.2.0

package/dist/index.js

@@ -286,44 +286,44 @@ function wordmark(name, gap = 1) {
 function widest(rows) {
   return Math.max(...rows.map((r) => r.length));
 }
-function lockup(name = "innernote", tagline) {
-  const room = (process.stdout.columns ?? 80) - 5;
-  const mark = logo(2);
-  const markWidth = widest(mark);
+function lockup(name = "innernote", sub) {
+  const room = (process.stdout.columns || 80) - 5;
+  const subs = sub == null ? [] : Array.isArray(sub) ? sub : [sub];
+  const mark = logo(2).map((r) => r.trimEnd());
+  const ink = widest(mark);
   const word = wordmark(name);
   if (word) {
-    const gap2 = 3;
-    if (markWidth + gap2 + widest(word) <= room) {
+    const gap = 2;
+    const wide = Math.max(widest(word), ...subs.map((s) => width(s)));
+    if (ink + gap + wide <= room) {
       const rows2 = mark.map((r, i) => {
         const right = word[i] ?? "";
-        return right ? `${caramel(r.padEnd(markWidth))}${" ".repeat(gap2)}${bold2(caramel(right))}` : caramel(r.trimEnd());
+        return right ? `${caramel(r.padEnd(ink))}${" ".repeat(gap)}${bold2(caramel(right))}` : caramel(r);
       });
-      if (tagline)
-        rows2.push("", `  ${dim2(tagline)}`);
+      const indent = " ".repeat(ink + gap);
+      for (const line of subs)
+        rows2.push(`${indent}${line}`);
       return rows2;
     }
   }
-  const gap = 3;
-  const beside = Math.max(name.length, tagline?.length ?? 0);
-  if (markWidth + gap + beside <= room) {
-    const mid = Math.floor(mark.length / 2);
-    return mark.map((r, i) => {
-      const left = caramel(r.padEnd(markWidth)) + " ".repeat(gap);
-      if (i === mid)
-        return left + bold2(caramel(name));
-      if (i === mid + 1 && tagline)
-        return left + dim2(tagline);
-      return caramel(r.trimEnd());
-    });
-  }
-  const rows = mark.map((r) => caramel(r.trimEnd()));
-  rows.push("", bold2(caramel(name)));
-  if (tagline)
-    rows.push(dim2(tagline));
-  return rows;
+  const mid = Math.floor(mark.length / 2);
+  const below = [];
+  const rows = mark.map((r, i) => {
+    const left = caramel(r.padEnd(ink)) + "   ";
+    if (i === mid)
+      return left + bold2(caramel(name));
+    const sub2 = subs[i - mid - 1];
+    if (i > mid && sub2 !== undefined) {
+      if (ink + 3 + width(sub2) <= room)
+        return left + sub2;
+      below.push(sub2);
+    }
+    return caramel(r);
+  });
+  return [...rows, ...below];
 }
 function banner(tagline = "your voice, from the terminal") {
-  return lockup("innernote", tagline).map((r) => "  " + r).join(`
+  return lockup("innernote", dim2(tagline)).map((r) => "  " + r).join(`
 `);
 }
 function bar(score, width2 = 10) {
@@ -344,6 +344,7 @@ async function login(args) {
   let code = args.find((a) => !a.startsWith("-"))?.trim();
   if (!code) {
     out(`Open ${bold2(config.apiUrl + PAIR_PAGE)} and copy your pairing code.`);
+    out(dim2(`New here? Sign in at ${config.apiUrl.replace(/^https?:\/\//, "")} first.`));
     out();
     if (!process.stdin.isTTY) {
       fail("No pairing code given, and there is no terminal to ask on.");
@@ -1121,6 +1122,9 @@ var dim4 = sgr2("2");
 var green4 = sgr2("32");
 var yellow4 = sgr2("33");
 var red4 = sgr2("31");
+function width2(s) {
+  return s.replace(/\x1b\[[0-9;]*m/g, "").length;
+}
 var canAnimate2 = isTTY2 && process.env.TERM !== "dumb" && !process.env.CI;
 var MARK_GRID2 = [
   "....#....",
@@ -1159,44 +1163,44 @@ function wordmark2(name, gap = 1) {
 function widest2(rows) {
   return Math.max(...rows.map((r) => r.length));
 }
-function lockup2(name = "innernote", tagline) {
-  const room = (process.stdout.columns ?? 80) - 5;
-  const mark = logo2(2);
-  const markWidth = widest2(mark);
+function lockup2(name = "innernote", sub) {
+  const room = (process.stdout.columns || 80) - 5;
+  const subs = sub == null ? [] : Array.isArray(sub) ? sub : [sub];
+  const mark = logo2(2).map((r) => r.trimEnd());
+  const ink = widest2(mark);
   const word = wordmark2(name);
   if (word) {
-    const gap2 = 3;
-    if (markWidth + gap2 + widest2(word) <= room) {
+    const gap = 2;
+    const wide = Math.max(widest2(word), ...subs.map((s) => width2(s)));
+    if (ink + gap + wide <= room) {
       const rows2 = mark.map((r, i) => {
         const right = word[i] ?? "";
-        return right ? `${caramel2(r.padEnd(markWidth))}${" ".repeat(gap2)}${bold4(caramel2(right))}` : caramel2(r.trimEnd());
+        return right ? `${caramel2(r.padEnd(ink))}${" ".repeat(gap)}${bold4(caramel2(right))}` : caramel2(r);
       });
-      if (tagline)
-        rows2.push("", `  ${dim4(tagline)}`);
+      const indent = " ".repeat(ink + gap);
+      for (const line of subs)
+        rows2.push(`${indent}${line}`);
       return rows2;
     }
   }
-  const gap = 3;
-  const beside = Math.max(name.length, tagline?.length ?? 0);
-  if (markWidth + gap + beside <= room) {
-    const mid = Math.floor(mark.length / 2);
-    return mark.map((r, i) => {
-      const left = caramel2(r.padEnd(markWidth)) + " ".repeat(gap);
-      if (i === mid)
-        return left + bold4(caramel2(name));
-      if (i === mid + 1 && tagline)
-        return left + dim4(tagline);
-      return caramel2(r.trimEnd());
-    });
-  }
-  const rows = mark.map((r) => caramel2(r.trimEnd()));
-  rows.push("", bold4(caramel2(name)));
-  if (tagline)
-    rows.push(dim4(tagline));
-  return rows;
+  const mid = Math.floor(mark.length / 2);
+  const below = [];
+  const rows = mark.map((r, i) => {
+    const left = caramel2(r.padEnd(ink)) + "   ";
+    if (i === mid)
+      return left + bold4(caramel2(name));
+    const sub2 = subs[i - mid - 1];
+    if (i > mid && sub2 !== undefined) {
+      if (ink + 3 + width2(sub2) <= room)
+        return left + sub2;
+      below.push(sub2);
+    }
+    return caramel2(r);
+  });
+  return [...rows, ...below];
 }
 function banner2(tagline = "your voice, from the terminal") {
-  return lockup2("innernote", tagline).map((r) => "  " + r).join(`
+  return lockup2("innernote", dim4(tagline)).map((r) => "  " + r).join(`
 `);
 }
 
@@ -1341,12 +1345,12 @@ function commandHelp(name) {
   return lines.join(`
 `);
 }
-function wrap3(text, width2, indent) {
+function wrap3(text, width3, indent) {
   const words = text.split(/\s+/);
   const lines = [];
   let line = "";
   for (const w of words) {
-    if ((line + " " + w).trim().length > width2) {
+    if ((line + " " + w).trim().length > width3) {
       lines.push(indent + line.trim());
       line = w;
     } else {
@@ -1368,65 +1372,68 @@ function margin(rows) {
 `);
 }
 function landing(state) {
-  const rows = ["", ...lockup("innernote"), ""];
-  if (state.name) {
-    rows.push(state.name + (state.plan ? dim2(`   ${state.plan}`) : ""));
-  }
-  const sub = [];
+  const small = [];
+  if (state.plan)
+    small.push(state.plan);
   if (state.powers)
-    sub.push(state.powers);
-  if (typeof state.expiresInDays === "number" && state.expiresInDays <= 14) {
-    sub.push(`key expires in ${state.expiresInDays} ${state.expiresInDays === 1 ? "day" : "days"}`);
-  }
+    small.push(state.powers);
   if (state.version)
-    sub.push(`v${state.version}`);
-  if (sub.length)
-    rows.push(dim2(sub.join("   ")));
-  if (state.week?.length) {
-    rows.push("", ...state.week);
+    small.push(`v${state.version}`);
+  const sub = [];
+  if (state.name)
+    sub.push(`${bold2(state.name)}   ${dim2(small.join("   "))}`);
+  else if (small.length)
+    sub.push(dim2(small.join("   ")));
+  if (typeof state.expiresInDays === "number" && state.expiresInDays <= 14) {
+    sub.push(yellow2(`key expires in ${state.expiresInDays} ${state.expiresInDays === 1 ? "day" : "days"}`));
   }
+  const rows = ["", ...lockup("innernote", sub), ""];
+  if (state.week?.length)
+    rows.push(...state.week, "");
   const counts = [];
   if (state.ideas)
     counts.push(`${state.ideas} ${state.ideas === 1 ? "idea" : "ideas"} waiting`);
   if (state.drafts)
-    counts.push(`${state.drafts} drafts`);
+    counts.push(`${state.drafts} ${state.drafts === 1 ? "draft" : "drafts"}`);
   if (counts.length)
-    rows.push("", dim2(counts.join("   ")));
+    rows.push(dim2(counts.join("   ")));
   if (state.next) {
-    rows.push("", `${caramel(state.next.command)}${pad("", Math.max(1, 20 - width(state.next.command)))}${dim2(state.next.why)}`);
+    rows.push(`${caramel(state.next.command)}   ${dim2(state.next.why)}`);
   }
   rows.push("");
   return margin(rows);
 }
 function landingDisconnected(apiUrl, version) {
+  const host = apiUrl.replace(/^https?:\/\//, "");
+  const sub = [dim2("LinkedIn posts in your voice, from the terminal")];
+  if (version)
+    sub.push(dim2(`v${version}`));
   return margin([
     "",
-    ...lockup("innernote", "your voice, from the terminal"),
-    ...version ? [`  ${dim2(`v${version}`)}`] : [],
+    ...lockup("innernote", sub),
     "",
-    dim2("Write LinkedIn posts in your voice, without leaving here."),
-    "",
-    `${caramel(`${CMD} login`)}${pad("", Math.max(3, 20 - width(`${CMD} login`)))}${dim2("connect this machine")}`,
-    dim2(`Get a code at ${apiUrl.replace(/^https?:\/\//, "")}/dashboard/settings`),
+    `${caramel(`${CMD} login`)}   ${dim2("connect this machine")}`,
+    dim2(`Get a code at ${host}/dashboard/settings`),
+    `${dim2("No account yet?")}   ${caramel(host)}`,
     ""
   ]);
 }
 function suggest(state) {
   if (state.scheduled === 0 && state.ideas > 0) {
-    return { command: `${CMD} ideas`, why: "nothing scheduled, and you have things saved" };
+    return { command: "ideas", why: "nothing scheduled, and you have things saved" };
   }
   if (state.scheduled === 0) {
-    return { command: `${CMD} write`, why: "the week is empty" };
+    return { command: "write", why: "the week is empty" };
   }
   if (state.ideas >= 5) {
-    return { command: `${CMD} ideas`, why: "your inbox is filling up" };
+    return { command: "ideas", why: "your inbox is filling up" };
   }
-  return { command: `${CMD} write`, why: "start something" };
+  return { command: "write", why: "start something" };
 }
 // package.json
 var package_default = {
   name: "innernote",
-  version: "0.1.1",
+  version: "0.2.0",
   description: "Write LinkedIn posts in your voice, from the terminal.",
   type: "module",
   bin: {
@@ -1463,7 +1470,7 @@ function powers2(scopes) {
     return scopes[0];
   return `${scopes.slice(0, -1).join(", ")} and ${scopes[scopes.length - 1]}`;
 }
-async function home() {
+async function home(inSession = false) {
   const config = await loadConfig();
   if (!config.token) {
     out();
@@ -1495,11 +1502,14 @@ async function home() {
 `).map((l) => l.replace(/^ {2}/, "")) : null,
     ideas: ideas2?.ideas.length,
     drafts: drafts2?.posts.length,
-    next: suggest({
-      scheduled,
-      ideas: ideas2?.ideas.length ?? 0,
-      drafts: drafts2?.posts.length ?? 0
-    })
+    next: (() => {
+      const n = suggest({
+        scheduled,
+        ideas: ideas2?.ideas.length ?? 0,
+        drafts: drafts2?.posts.length ?? 0
+      });
+      return inSession ? n : { ...n, command: `${CMD} ${n.command}` };
+    })()
   }));
   out();
   return 0;
@@ -1508,6 +1518,30 @@ async function home() {
 // src/session.ts
 import { createInterface } from "node:readline";
 
+// src/ghost.ts
+function ghostFor(line2, cursor, history, names) {
+  if (!line2 || cursor !== line2.length)
+    return null;
+  if (line2.startsWith(" "))
+    return null;
+  const fromHistory = history.find((h) => h.startsWith(line2) && h.length > line2.length);
+  if (fromHistory)
+    return fromHistory.slice(line2.length);
+  if (!line2.includes(" ")) {
+    const name = names.find((n) => n.startsWith(line2) && n.length > line2.length);
+    return name ? name.slice(line2.length) : null;
+  }
+  if (line2.startsWith("help ")) {
+    const arg = line2.slice(5);
+    if (arg && !arg.includes(" ")) {
+      const name = names.find((n) => n.startsWith(arg) && n.length > arg.length);
+      if (name)
+        return name.slice(arg.length);
+    }
+  }
+  return null;
+}
+
 // src/help.ts
 var COMMANDS2 = {
   login: {
@@ -1649,12 +1683,12 @@ function commandHelp2(name) {
   return lines.join(`
 `);
 }
-function wrap4(text, width2, indent) {
+function wrap4(text, width3, indent) {
   const words = text.split(/\s+/);
   const lines = [];
   let line2 = "";
   for (const w of words) {
-    if ((line2 + " " + w).trim().length > width2) {
+    if ((line2 + " " + w).trim().length > width3) {
       lines.push(indent + line2.trim());
       line2 = w;
     } else {
@@ -1726,6 +1760,40 @@ function indented(run) {
   };
   return run().finally(restore);
 }
+function armGhost(rl, names, promptWidth) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY)
+    return;
+  if (dim2("x") === "x")
+    return;
+  const inner = rl;
+  let shown = null;
+  const clear = () => {
+    if (shown == null)
+      return;
+    process.stdout.write("\x1B[K");
+    shown = null;
+  };
+  const draw = () => {
+    if (process.stdin.isPaused())
+      return;
+    const rest = ghostFor(inner.line ?? "", inner.cursor ?? 0, inner.history ?? [], names);
+    if (!rest)
+      return;
+    const cols = process.stdout.columns || 80;
+    if (promptWidth() + (inner.line?.length ?? 0) + rest.length >= cols - 1)
+      return;
+    process.stdout.write(`${dim2(rest)}\x1B[${rest.length}D`);
+    shown = rest;
+  };
+  process.stdin.prependListener("keypress", (_ch, key) => {
+    const offered = shown;
+    clear();
+    if (key?.name === "right" && offered && inner.cursor === inner.line.length) {
+      rl.write(offered);
+    }
+    setImmediate(draw);
+  });
+}
 async function session(opts) {
   await opts.intro();
   const names = [...Object.keys(COMMANDS2), ...BUILTINS];
@@ -1743,7 +1811,8 @@ async function session(opts) {
       return [hits.length ? hits : names, line2];
     }
   });
-  console.log(`  ${dim2("Type a command, or")} ${caramel("help")}${dim2(". Ctrl-C twice to leave.")}
+  armGhost(rl, names, () => width(promptFor()));
+  console.log(`  ${dim2("Type a command, or")} ${caramel("help")}${dim2(". Right arrow takes the hint. Ctrl-C twice to leave.")}
 `);
   rl.prompt();
   return new Promise((resolve) => {
@@ -1924,7 +1993,7 @@ async function main() {
       return home();
     return session({
       intro: async () => {
-        await home();
+        await home(true);
       },
       status: () => {
         const d = getDraft2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innernote",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Write LinkedIn posts in your voice, from the terminal.",
   "type": "module",
   "bin": {