drop2run 0.8.0 → 0.9.0

package/README.md

@@ -29,6 +29,9 @@ drop2run pause [site]                        Take a site off the air, keeping it
 drop2run resume [site]                       Put a paused site back on the air
 drop2run rollback <deployId> [--site X]      Put an earlier version back live
 drop2run rm <site> --yes                     Delete a site and everything on it
+drop2run comments [site]                     Read the comments left on a site's pages
+drop2run comments reply <thread> <text>      Answer a thread as the owner [--resolve]
+drop2run comments resolve|reopen <thread>    Resolve a thread, or open it again
 drop2run token list                          List your access tokens
 drop2run whoami                              Check the token and whose it is
 drop2run where                               Show which token source is in use
@@ -37,6 +40,23 @@ drop2run --version                           Print the version
 
 `--json` on any command prints machine-readable output instead of text.
 
+## Comments
+
+On a plan that includes comments, people viewing a site can pin comments to its pages. `drop2run comments`
+reads them — each thread's id, page, the words it points at, and every comment — with `--status
+open|resolved|all` and `--path /page` to narrow it. The owner of the account can answer from here:
+
+```bash
+drop2run comments calm-cedar                                   # open threads
+drop2run deploy dist                                           # publish the fix first
+drop2run comments reply 01JTHREAD... "Fixed — please check" --site calm-cedar
+```
+
+The reply shows on the page under your name, as one typed there would, and the people in the thread are
+emailed.
+It leaves the thread open unless `--resolve` is given, so the person who raised it can check the fix and
+resolve it themselves. `comments resolve` and `comments reopen` change a thread's state on its own.
+
 ## Which site a command acts on
 
 `--subdomain` creates one under the name you give; otherwise `--site`, then `drop2run.json`, then a new

package/dist/index.js

@@ -344,6 +344,33 @@ const ROOT_FOLDER = "root";
 async function resolveFolderTarget(credentials, folder) {
   return folder.trim().toLowerCase() === ROOT_FOLDER ? ROOT_FOLDER : await resolveFolder(credentials, folder);
 }
+async function listComments(credentials, siteId, query = {}) {
+  const search = new URLSearchParams();
+  if (query.status !== void 0) search.set("status", query.status);
+  if (query.path !== void 0) search.set("path", query.path);
+  if (query.since !== void 0) search.set("since", String(query.since));
+  if (query.page !== void 0) search.set("page", String(query.page));
+  const encoded = search.toString();
+  const suffix = encoded === "" ? "" : `?${encoded}`;
+  return await call(
+    credentials,
+    `sites/${encodeURIComponent(siteId)}/feedback/threads${suffix}`
+  );
+}
+async function replyToComment(credentials, siteId, threadId, body, resolve2 = false) {
+  return await call(
+    credentials,
+    `sites/${encodeURIComponent(siteId)}/feedback/threads/${encodeURIComponent(threadId)}/comments`,
+    { method: "POST", body: JSON.stringify({ body, resolve: resolve2 }) }
+  );
+}
+async function setCommentResolved(credentials, siteId, threadId, resolved) {
+  return await call(
+    credentials,
+    `sites/${encodeURIComponent(siteId)}/feedback/threads/${encodeURIComponent(threadId)}/${resolved ? "resolve" : "reopen"}`,
+    { method: "POST" }
+  );
+}
 const VERSIONS_LISTED = 10;
 function servingModeOf$1(site) {
   if (site.spaMode) return "spa";
@@ -2651,6 +2678,96 @@ async function tokens() {
     return failure(error instanceof Error ? error.message : String(error));
   }
 }
+const COMMENTS_USAGE = [
+  "  drop2run comments [site] [--status open|resolved|all] [--path /page]",
+  "  drop2run comments reply <thread> <text> [--resolve] [--site X]",
+  "  drop2run comments resolve|reopen <thread> [--site X]"
+].join("\n");
+async function comments(subcommand, rest, site, options) {
+  const found = credentialsOr();
+  if ("result" in found) return found.result;
+  const acting = subcommand === "reply" || subcommand === "resolve" || subcommand === "reopen";
+  if (!acting) {
+    const status = options.status ?? "open";
+    if (status !== "open" && status !== "resolved" && status !== "all") {
+      return failure(
+        `\`--status\` is open, resolved or all, not "${status}".
+
+${COMMENTS_USAGE}`
+      );
+    }
+    const target2 = siteOr(subcommand ?? site, "drop2run comments <subdomain>");
+    if ("result" in target2) return target2.result;
+    try {
+      const summary = await findSite(found.credentials, target2.named);
+      const read = await listComments(found.credentials, summary.siteId, {
+        status,
+        path: options.path
+      });
+      return {
+        text: describeComments(read.threads, status, summary.subdomain, read.more),
+        json: read,
+        code: 0
+      };
+    } catch (error) {
+      return failure(error instanceof Error ? error.message : String(error));
+    }
+  }
+  const [thread, ...words] = rest;
+  if (thread === void 0)
+    return failure(`Name the thread, from \`drop2run comments\`.
+
+${COMMENTS_USAGE}`);
+  const body = words.join(" ").trim();
+  if (subcommand === "reply" && body === "") {
+    return failure(`Write the reply after the thread id.
+
+${COMMENTS_USAGE}`);
+  }
+  const target = siteOr(site, `drop2run comments ${subcommand} <thread> --site <subdomain>`);
+  if ("result" in target) return target.result;
+  try {
+    const summary = await findSite(found.credentials, target.named);
+    const answered = subcommand === "reply" ? await replyToComment(
+      found.credentials,
+      summary.siteId,
+      thread,
+      body,
+      options.resolve === true
+    ) : await setCommentResolved(
+      found.credentials,
+      summary.siteId,
+      thread,
+      subcommand === "resolve"
+    );
+    const done = subcommand === "reply" ? `Replied on ${answered.path}${answered.resolvedAt === null ? "" : " and resolved the thread"}.` : `${subcommand === "resolve" ? "Resolved" : "Reopened"} the thread on ${answered.path}.`;
+    return { text: `${done}
+${answered.url}`, json: answered, code: 0 };
+  } catch (error) {
+    return failure(error instanceof Error ? error.message : String(error));
+  }
+}
+function describeComments(threads, status, subdomain, more) {
+  const which = status === "all" ? "" : `${status} `;
+  if (threads.length === 0) return `No ${which}comment threads on ${subdomain}.`;
+  const heading = `${threads.length} ${which}comment ${threads.length === 1 ? "thread" : "threads"} on ${subdomain}` + (more ? " (more follow; `--json` shows the cursor)." : ".");
+  const blocks = threads.map((thread) => {
+    const where2 = thread.place.quote ?? (thread.place.snippet || null);
+    const flags = [
+      ...thread.resolvedAt === null ? [] : ["resolved"],
+      ...thread.outdated ? ["earlier version"] : []
+    ];
+    return [
+      `${thread.id}  ${thread.path}${where2 === null ? "" : `  "${where2}"`}` + (flags.length === 0 ? "" : `  (${flags.join(", ")})`),
+      ...thread.comments.map((comment) => {
+        const who = comment.author.owner ? `${comment.author.name} (owner)` : comment.author.name;
+        return `  ${who}: ${comment.body.replace(/\s*\n\s*/g, " ")}`;
+      }),
+      `  ${thread.url}`
+    ].join("\n");
+  });
+  return [heading, ...blocks].join("\n\n");
+}
 function day(iso) {
   const parsed = new Date(iso);
   return Number.isNaN(parsed.getTime()) ? iso : parsed.toISOString().slice(0, 10);
@@ -2691,6 +2808,9 @@ const HELP = `drop2run — publish a static site from the command line
   drop2run resume [site]                       Put a paused site back on the air
   drop2run rollback <deployId> [--site X]      Put an earlier version back live
   drop2run rm <site> --yes                     Delete a site and everything on it
+  drop2run comments [site]                     Read the comments left on a site's pages
+  drop2run comments reply <thread> <text>      Answer a thread as the owner [--resolve]
+  drop2run comments resolve|reopen <thread>    Resolve a thread, or open it again
   drop2run token list                          List your access tokens
   drop2run whoami                              Check the token and whose it is
   drop2run where                               Show which token source is in use
@@ -2706,6 +2826,16 @@ Flags
   --yes          Confirm a deletion, which cannot be undone
   --then X       What \`set expires\` does when the date arrives: pause
                  (the default, keeps the files) or delete (needs --yes)
+  --status X     Which comment threads: open (the default), resolved or all
+  --path X       Only the comments on one page, such as /pricing
+  --resolve      Resolve the thread with the reply (\`comments reply\` only)
+
+Comments
+  \`comments reply\`, \`resolve\` and \`reopen\` act on --site, else the site in
+  drop2run.json, and only the account's owner can use them. Deploy the fix
+  before replying that it is fixed. A reply leaves the thread open unless
+  --resolve is given, so the person who raised it can check the fix and
+  resolve it themselves.
 
 Settings
   set name <text>               What the dashboard calls the site; put a
@@ -2749,7 +2879,7 @@ function flagValue(args, flag) {
   const value = args[at + 1];
   return value === void 0 || value.startsWith("-") ? void 0 : value;
 }
-const VALUE_FLAGS = ["--site", "--subdomain", "--folder", "--then"];
+const VALUE_FLAGS = ["--site", "--subdomain", "--folder", "--then", "--status", "--path"];
 function positionals(argv) {
   const found = [];
   for (let at = 0; at < argv.length; at++) {
@@ -2798,7 +2928,7 @@ async function run(commandLine) {
   const positional = [...positionals(argv), ...literal];
   const [command, ...rest] = positional;
   if (argv.includes("--version")) {
-    const { version } = await import("./package-BycuI1VJ.js").then(
+    const { version } = await import("./package-LdzYr7IV.js").then(
       (module) => module.default
     );
     return { text: version, json: { version }, code: 0 };
@@ -2828,11 +2958,16 @@ async function run(commandLine) {
     argv.includes("--device"),
     argv.includes("--yes"),
     { subdomain, folder },
-    then
+    then,
+    {
+      status: flagValue(argv, "--status"),
+      path: flagValue(argv, "--path"),
+      resolve: argv.includes("--resolve")
+    }
   );
   return json ? { ...result, text: JSON.stringify(result.json, null, 2) } : result;
 }
-async function dispatch(command, rest, site, json, device, confirmed, newSite = {}, then = void 0) {
+async function dispatch(command, rest, site, json, device, confirmed, newSite = {}, then = void 0, commentOptions = {}) {
   switch (command) {
     case "login": {
       const print = json ? () => {
@@ -2871,6 +3006,8 @@ async function dispatch(command, rest, site, json, device, confirmed, newSite =
       return await rollback(rest[0], site);
     case "rm":
       return await remove(rest[0] ?? site, confirmed);
+    case "comments":
+      return await comments(rest[0], rest.slice(1), site, commentOptions);
     case "token":
     case "tokens":
       return rest[0] === void 0 || rest[0] === "list" ? await tokens() : {

package/dist/{package-BycuI1VJ.js → package-LdzYr7IV.js}

@@ -1,5 +1,5 @@
 const name = "drop2run";
-const version = "0.8.0";
+const version = "0.9.0";
 const description = "Publish a page, a folder of documents or a built site to Drop2Run from the command line.";
 const license = "MIT";
 const type = "module";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drop2run",
-	"version": "0.8.0",
+	"version": "0.9.0",
 	"description": "Publish a page, a folder of documents or a built site to Drop2Run from the command line.",
 	"license": "MIT",
 	"type": "module",