frontpage-host 0.1.23 → 0.1.25

package/dist/commands/people-workspace.js

@@ -0,0 +1,137 @@
+import { readFile } from "node:fs/promises";
+import { assertNoUnknownFlags, takeFlag } from "../argv.js";
+import { CliHttpError, EXIT_OK, EXIT_USAGE, v1Post } from "../http/client.js";
+import { emitOk, isJson } from "../runtime.js";
+const AREAS = [
+    "groups",
+    "stages",
+    "membership",
+    "rules",
+    "import",
+    "attachments",
+    "person",
+    "company",
+];
+export function isPeopleWorkspaceCommand(sub) {
+    return (!!sub &&
+        (AREAS.includes(sub) ||
+            ["overview", "sources", "audience", "workspace"].includes(sub)));
+}
+export async function runPeopleWorkspace(slug, args) {
+    const work = [...args], area = work.shift();
+    const operation = area === "workspace"
+        ? work.shift()
+        : area === "overview" || area === "sources"
+            ? area
+            : `${area}.${work.shift() ?? (area === "company" ? "get" : area === "audience" ? "preview" : "list")}`;
+    const file = takeFlag(work, "--file"), json = takeFlag(work, "--data");
+    if (file && json)
+        throw new CliHttpError("Use --file or --data, not both.", EXIT_USAGE, 0, "bad_request");
+    let payload = {};
+    if (file || json) {
+        try {
+            const parsed = JSON.parse(file ? await readFile(file, "utf8") : json);
+            if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+                throw Error();
+            payload = parsed;
+        }
+        catch {
+            throw new CliHttpError("Provide a JSON object through --file or --data.", EXIT_USAGE, 0, "bad_request");
+        }
+    }
+    for (const [flag, key] of Object.entries({
+        "--id": "id",
+        "--name": "name",
+        "--label": "label",
+        "--group": "groupId",
+        "--stage": "stageId",
+        "--person": "personId",
+        "--from-group": "fromGroupId",
+        "--mode": "mode",
+        "--color": "color",
+        "--run": "runId",
+        "--rule": "ruleId",
+        "--email-id": "emailId",
+        "--email-kind": "emailKind",
+        "--override": "override",
+        "--cursor": "cursor",
+        "--request-key": "requestKey",
+    })) {
+        const v = takeFlag(work, flag);
+        if (v !== undefined)
+            payload[key] = key === "override" && v === "auto" ? null : v;
+    }
+    for (const [flag, key] of Object.entries({
+        "--position": "position",
+        "--limit": "limit",
+    })) {
+        const v = takeFlag(work, flag);
+        if (v !== undefined) {
+            const n = Number(v);
+            if (!Number.isInteger(n))
+                throw new CliHttpError(`${flag} requires an integer.`, EXIT_USAGE, 0, "bad_request");
+            payload[key] = n;
+        }
+    }
+    for (const [flag, key] of Object.entries({
+        "--enabled": "enabled",
+        "--hold": "hold",
+        "--terminal": "terminal",
+        "--allowed": "allowed",
+        "--archived": "archived",
+        "--reset": "reset",
+    })) {
+        const v = takeFlag(work, flag);
+        if (v !== undefined) {
+            if (v !== "true" && v !== "false")
+                throw new CliHttpError(`${flag} is true or false.`, EXIT_USAGE, 0, "bad_request");
+            payload[key] = v === "true";
+        }
+    }
+    const csv = takeFlag(work, "--csv");
+    if (csv)
+        payload.csv = await readFile(csv, "utf8");
+    if (operation === "import.start" && !payload.requestKey)
+        throw new CliHttpError("Provide --request-key with a stable UUID so retries reuse this import.", EXIT_USAGE, 0, "bad_request");
+    assertNoUnknownFlags(work, "people");
+    if (work.length || !operation)
+        throw new CliHttpError("Unexpected arguments. Run frontpage help people.", EXIT_USAGE, 0, "bad_request");
+    const result = await v1Post(`/api/v1/sites/${encodeURIComponent(slug)}/people/workspace`, { ...payload, operation });
+    if (isJson())
+        emitOk("people", result);
+    else
+        console.log(JSON.stringify(result, null, 2));
+    return EXIT_OK;
+}
+export async function runCampaign(slug, args) {
+    const work = [...args], operation = work.shift() ?? "get", file = takeFlag(work, "--file"), data = takeFlag(work, "--data"), documentId = takeFlag(work, "--id"), requestKey = takeFlag(work, "--request-key");
+    if (file && data)
+        throw new CliHttpError("Use --file or --data.", EXIT_USAGE, 0, "bad_request");
+    let payload = {};
+    if (file || data) {
+        try {
+            payload = JSON.parse(file ? await readFile(file, "utf8") : data);
+            if (!payload || Array.isArray(payload) || typeof payload !== "object")
+                throw Error();
+        }
+        catch {
+            throw new CliHttpError("Provide a JSON object.", EXIT_USAGE, 0, "bad_request");
+        }
+    }
+    assertNoUnknownFlags(work, "mail");
+    if (work.length)
+        throw new CliHttpError("Unexpected campaign arguments.", EXIT_USAGE, 0, "bad_request");
+    const result = await v1Post(`/api/v1/sites/${encodeURIComponent(slug)}/mail/campaign`, {
+        ...payload,
+        operation,
+        ...(documentId ? { documentId } : {}),
+        ...(operation === "send"
+            ? { requestKey: requestKey ?? payload.requestKey }
+            : {}),
+    });
+    if (isJson())
+        emitOk("mail", result);
+    else
+        console.log(JSON.stringify(result, null, 2));
+    return EXIT_OK;
+}

package/dist/commands/people.js

@@ -1,3 +1,4 @@
+import { isPeopleWorkspaceCommand, runPeopleWorkspace } from "./people-workspace.js";
 import { writeFile } from "node:fs/promises";
 import { resolveSlug } from "../site.js";
 import { CliHttpError, EXIT_OK, EXIT_USAGE, apiBase, exitCodeForError, getBearerAuthHeader, httpErrorFromV1, v1Delete, v1Get, v1Patch, v1Post, } from "../http/client.js";
@@ -73,11 +74,15 @@ export async function runPeople(args) {
     try {
         const { slug, rest } = await resolveSlug(args);
         const sub = rest[0];
+        if (isPeopleWorkspaceCommand(sub))
+            return await runPeopleWorkspace(slug, rest);
         const base = `/api/v1/sites/${encodeURIComponent(slug)}/people`;
         if (!sub || sub === "list") {
             const work = sub === "list" ? rest.slice(1) : [...rest];
             const q = takeFlag(work, "--q") ?? takeFlag(work, "--query");
             const status = takeFlag(work, "--status");
+            const groupId = takeFlag(work, "--group");
+            const stageId = takeFlag(work, "--stage");
             const source = takeFlag(work, "--source");
             const formSlug = takeFlag(work, "--form-slug");
             const followUp = takeFlag(work, "--follow-up");
@@ -91,6 +96,10 @@ export async function runPeople(args) {
             const params = new URLSearchParams();
             if (q)
                 params.set("q", q);
+            if (groupId)
+                params.set("groupId", groupId);
+            if (stageId)
+                params.set("stageId", stageId);
             if (status)
                 params.set("status", status);
             if (source)
@@ -313,6 +322,8 @@ export async function runPeople(args) {
             const work = rest.slice(1);
             const q = takeFlag(work, "--q") ?? takeFlag(work, "--query");
             const status = takeFlag(work, "--status");
+            const groupId = takeFlag(work, "--group");
+            const stageId = takeFlag(work, "--stage");
             const source = takeFlag(work, "--source");
             const formSlug = takeFlag(work, "--form-slug");
             const followUp = takeFlag(work, "--follow-up");
@@ -325,6 +336,10 @@ export async function runPeople(args) {
             const params = new URLSearchParams();
             if (q)
                 params.set("q", q);
+            if (groupId)
+                params.set("groupId", groupId);
+            if (stageId)
+                params.set("stageId", stageId);
             if (status)
                 params.set("status", status);
             if (source)

package/dist/commands/push.js

@@ -1,7 +1,8 @@
 import { readdir, readFile, stat } from "node:fs/promises";
 import { join, relative, sep } from "node:path";
 import { resolveSlug } from "../site.js";
-import { EXIT_OK, EXIT_USAGE, v1Get, v1Put } from "../http/client.js";
+import { CliHttpError, EXIT_CONFLICT, EXIT_OK, EXIT_USAGE, v1Get, v1Put, } from "../http/client.js";
+import { gitBlobSha } from "../git-blob-sha.js";
 import { readState, writeState } from "../state/frontpage-state.js";
 import { emitErr, emitOk, emitUsage, isJson } from "../runtime.js";
 import { waitForAgentThenCompile } from "./wait-site-compile.js";
@@ -47,7 +48,9 @@ async function walkAllowlisted(cwd) {
         for (const ent of entries) {
             const child = join(abs, ent.name);
             if (ent.isDirectory()) {
-                if (ent.name === "node_modules" || ent.name === ".git" || ent.name === ".frontpage")
+                if (ent.name === "node_modules" ||
+                    ent.name === ".git" ||
+                    ent.name === ".frontpage")
                     continue;
                 await walk(child);
             }
@@ -83,7 +86,9 @@ export async function runPush(args) {
         const messageIdx = work.indexOf("--message");
         const message = messageIdx >= 0
             ? work[messageIdx + 1]
-            : work.find((a) => a.startsWith("--message="))?.slice("--message=".length);
+            : work
+                .find((a) => a.startsWith("--message="))
+                ?.slice("--message=".length);
         const cwd = process.cwd();
         const state = await readState(cwd);
         if (!state.baseCommitSha) {
@@ -94,6 +99,7 @@ export async function runPush(args) {
             return emitUsage("push", "No allowlisted files (src/, public/, content/) found in this folder.", EXIT_USAGE);
         }
         const listing = await v1Get(`/api/v1/sites/${encodeURIComponent(slug)}/files`);
+        const remoteByPath = new Map(listing.files.map((file) => [file.path, file.blobSha]));
         const files = [
             ...pushDeletesForMissingLocal(paths, listing.files.map((f) => f.path)),
         ];
@@ -102,21 +108,38 @@ export async function runPush(args) {
             const st = await stat(abs);
             if (!st.isFile())
                 continue;
+            const buf = await readFile(abs);
+            if (gitBlobSha(buf) === remoteByPath.get(path))
+                continue;
             if (isTextPath(path)) {
-                const content = await readFile(abs, "utf8");
+                const content = buf.toString("utf8");
                 files.push({ path, encoding: "utf-8", content });
             }
             else {
-                const buf = await readFile(abs);
-                files.push({ path, encoding: "base64", content: buf.toString("base64") });
+                files.push({
+                    path,
+                    encoding: "base64",
+                    content: buf.toString("base64"),
+                });
             }
         }
-        const data = await v1Put(`/api/v1/sites/${encodeURIComponent(slug)}/files`, {
-            baseCommitSha: state.baseCommitSha,
-            expectedHeadSha: state.baseCommitSha,
-            message: message || undefined,
-            files,
-        });
+        if (!files.length && listing.baseCommitSha !== state.baseCommitSha) {
+            throw new CliHttpError("Remote tip moved since your last pull. Run frontpage pull and retry.", EXIT_CONFLICT, 409, "conflict");
+        }
+        const data = files.length
+            ? await v1Put(`/api/v1/sites/${encodeURIComponent(slug)}/files`, {
+                baseCommitSha: state.baseCommitSha,
+                expectedHeadSha: state.baseCommitSha,
+                message: message || undefined,
+                files,
+            })
+            : {
+                changed: false,
+                commitSha: state.baseCommitSha,
+                baseCommitSha: state.baseCommitSha,
+                filesChanged: [],
+                warnings: [],
+            };
         if (data.commitSha) {
             await writeState({ ...state, slug, baseCommitSha: data.commitSha }, cwd);
         }

package/dist/commands/settings.js

@@ -32,7 +32,7 @@ export async function runSettings(args) {
             }
             const buildModel = takeFlag(work, "--build-model");
             if (buildModel !== undefined)
-                body.buildModel = buildModel;
+                body.buildModel = buildModel === "default" ? null : buildModel;
             const brandName = takeFlag(work, "--brand-name");
             const brandLogo = takeFlag(work, "--brand-logo");
             if (work.includes("--brand-reset")) {

package/dist/commands/shop.js

@@ -164,7 +164,7 @@ export async function runShop(args) {
         const group = rest[0];
         const base = `/api/v1/sites/${encodeURIComponent(slug)}/shop`;
         if (!group)
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         if (group === "items") {
             const sub = rest[1];
             const work = rest.slice(2);
@@ -181,7 +181,7 @@ export async function runShop(args) {
                 const suffix = qs.toString() ? `?${qs.toString()}` : "";
                 const data = await v1Get(`${base}/items${suffix}`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 const rows = data.items ?? [];
@@ -198,7 +198,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Get(`${base}/items/${encodeURIComponent(itemId)}`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -271,7 +271,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Post(`${base}/items`, body);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -313,7 +313,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Patch(`${base}/items/${encodeURIComponent(itemId)}`, body);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -324,7 +324,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Post(`${base}/items/${encodeURIComponent(itemId)}/archive`, {});
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -337,7 +337,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Post(`${base}/items/${encodeURIComponent(itemId)}/activate`, { active: active ?? true });
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -349,7 +349,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Put(`${base}/items/${encodeURIComponent(itemId)}/images`, { images: urls });
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -396,13 +396,13 @@ export async function runShop(args) {
                 }
                 const data = await v1Post(`${base}/items/${encodeURIComponent(itemId)}/stock`, body);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printStock(data);
                 return EXIT_OK;
             }
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         }
         if (group === "variants") {
             const sub = rest[1];
@@ -429,7 +429,7 @@ export async function runShop(args) {
                     active,
                 });
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -460,7 +460,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Patch(`${base}/items/${encodeURIComponent(itemId)}/variants/${encodeURIComponent(variantId)}`, body);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
@@ -472,13 +472,13 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Post(`${base}/items/${encodeURIComponent(itemId)}/variants/${encodeURIComponent(variantId)}/archive`, {});
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 printItem(data.item);
                 return EXIT_OK;
             }
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         }
         if (group === "categories") {
             const sub = rest[1];
@@ -490,7 +490,7 @@ export async function runShop(args) {
                 const qs = archived ? "?archived=1" : "";
                 const data = await v1Get(`${base}/categories${qs}`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 const rows = data.categories ?? [];
@@ -517,7 +517,7 @@ export async function runShop(args) {
                     label,
                 });
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 console.log(`${data.category.slug}  ${data.category.label}`);
@@ -532,7 +532,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Patch(`${base}/categories/${encodeURIComponent(slug)}`, { label });
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 console.log(`${data.category.slug}  ${data.category.label}`);
@@ -543,13 +543,13 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Post(`${base}/categories/${encodeURIComponent(slug)}/archive`, {});
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 console.log(`${data.category.slug}  archived`);
                 return EXIT_OK;
             }
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         }
         if (group === "settings") {
             const sub = rest[1] ?? "get";
@@ -558,7 +558,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Get(`${base}/settings`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 const s = data.settings ?? {};
@@ -614,7 +614,7 @@ export async function runShop(args) {
                     freeShippingOverCents: freeCents,
                 });
                 if (isJson())
-                    emitOk("shop", data);
+                    emitOk("store", data);
                 else
                     console.log("Fulfillment saved.");
                 return EXIT_OK;
@@ -627,7 +627,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Post(`${base}/settings/currency`, { currency });
                 if (isJson())
-                    emitOk("shop", data);
+                    emitOk("store", data);
                 else
                     console.log("Currency saved.");
                 return EXIT_OK;
@@ -640,7 +640,7 @@ export async function runShop(args) {
                 }
                 const data = await v1Post(`${base}/settings/checkout`, { checkout });
                 if (isJson())
-                    emitOk("shop", data);
+                    emitOk("store", data);
                 else
                     console.log(checkout === "instant" ? "Checkout is Pay now." : "Checkout is add to cart.");
                 return EXIT_OK;
@@ -654,12 +654,12 @@ export async function runShop(args) {
                     cents,
                 });
                 if (isJson())
-                    emitOk("shop", data);
+                    emitOk("store", data);
                 else
                     console.log(off ? "Service fee off." : "Service fee saved.");
                 return EXIT_OK;
             }
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         }
         if (group === "connect") {
             const work = rest.slice(1);
@@ -668,7 +668,7 @@ export async function runShop(args) {
             const data = await v1Post(`${base}/connect`, { action: "connect" });
             const already = data.alreadyConnected === true;
             if (isJson()) {
-                emitOk("shop", data);
+                emitOk("store", data);
             }
             else {
                 const url = resolveOpenUrl(data.connectUrl);
@@ -688,7 +688,7 @@ export async function runShop(args) {
             assertNoUnknownFlags(work, "store");
             const data = await v1Get(`${base}/connect`);
             if (isJson()) {
-                emitOk("shop", data);
+                emitOk("store", data);
                 return EXIT_OK;
             }
             const connection = (data.connection ?? {});
@@ -707,10 +707,10 @@ export async function runShop(args) {
             assertNoUnknownFlags(work, "store");
             const refuse = requireYesOrTty("disconnect the store (shared Stripe account with payments)");
             if (refuse)
-                return emitUsage("shop", refuse);
+                return emitUsage("store", refuse);
             const data = await v1Post(`${base}/connect`, { action: "disconnect" });
             if (isJson()) {
-                emitOk("shop", data);
+                emitOk("store", data);
                 return EXIT_OK;
             }
             console.log(typeof data.message === "string" ? data.message : "Disconnected.");
@@ -721,7 +721,7 @@ export async function runShop(args) {
             assertNoUnknownFlags(work, "store");
             const data = await v1Post(`${base}/import`, {});
             if (isJson()) {
-                emitOk("shop", data);
+                emitOk("store", data);
                 return EXIT_OK;
             }
             const imported = data.imported ?? [];
@@ -748,7 +748,7 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Get(`${base}/${noun}`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 const rows = data[noun] ?? [];
@@ -766,17 +766,17 @@ export async function runShop(args) {
                 assertNoUnknownFlags(work, "store");
                 const data = await v1Get(`${base}/${noun}/${encodeURIComponent(id)}`);
                 if (isJson()) {
-                    emitOk("shop", data);
+                    emitOk("store", data);
                     return EXIT_OK;
                 }
                 console.log(JSON.stringify(data[noun === "orders" ? "order" : "payment"], null, 2));
                 return EXIT_OK;
             }
-            return emitUsage("shop", USAGE);
+            return emitUsage("store", USAGE);
         }
-        return emitUsage("shop", USAGE);
+        return emitUsage("store", USAGE);
     }
     catch (err) {
-        return emitErr("shop", err);
+        return emitErr("store", err);
     }
 }

package/dist/modules/commands.js

@@ -34,17 +34,18 @@ export const MODULE_COMMANDS = [
     {
         key: "callbar",
         name: "Call bar",
-        summary: "Phone / SMS bar. Typed get/set for phone, sms, and label.",
+        summary: "Phone / SMS bar. Typed get/set for phone, sms, call, and label.",
         genericActions: GENERIC_ACTIONS,
         extraActions: [
             "get",
-            "set --phone +1… [--sms yes|no] [--label \"Call\"]",
+            "set --phone +1… [--sms yes|no] [--call yes|no] [--label \"Call\"]",
         ],
         notYet: [],
         examples: [
             "frontpage modules callbar",
             "frontpage modules callbar get",
             "frontpage modules callbar set --phone +14085551234 --sms no",
+            "frontpage modules callbar set --call no --sms yes",
             "frontpage modules callbar docs",
             `frontpage modules config callbar --config '{"phone":"+1…"}'`,
         ],

package/dist/modules/typed_config.js

@@ -29,6 +29,7 @@ function printLine(label, value) {
 }
 function printCallbar(config) {
     printLine("phone", dash(config.phone));
+    printLine("call", yesNo(config.call));
     printLine("sms", yesNo(config.sms));
     printLine("label", dash(config.label));
 }
@@ -111,6 +112,7 @@ export async function runTypedConfig(key, slug, action, flags) {
         const instanceId = takeFlag(work, "--instance");
         const phone = takeFlag(work, "--phone");
         const sms = takeFlag(work, "--sms");
+        const call = takeFlag(work, "--call");
         const label = takeFlag(work, "--label");
         const notifyEmail = takeFlag(work, "--notify-email");
         const hours = takeFlag(work, "--hours");
@@ -131,6 +133,8 @@ export async function runTypedConfig(key, slug, action, flags) {
             body.phone = phone;
         if (sms !== undefined)
             body.sms = sms;
+        if (call !== undefined)
+            body.call = call;
         if (label !== undefined)
             body.label = label;
         if (notifyEmail !== undefined)