@islamihab/kds 0.1.1 → 0.1.3

package/index.js

@@ -14404,8 +14404,16 @@ var printHelp = (help) => {
     description: `${field.description ?? ""}${isRequired(field) ? " (required)" : ""}`
   }));
   const usagePositionals = help.positionals?.map(([key, field]) => isRequired(field) ? ` <${key}>` : ` [${key}]`).join("") ?? "";
-  const options = help.options?.filter(({ field }) => !isHidden(field)).concat([{ key: "help", field: exports_external.boolean().default(false).describe("Show this help"), short: "h" }]).map(({ key, field, short }) => ({
-    label: `${short ? `-${short}, ` : "    "}--${key}${valuePlaceholder(field)}`,
+  const options = help.options?.filter(({ field }) => !isHidden(field)).concat([
+    {
+      key: "help",
+      field: exports_external.boolean().default(false).describe("Show this help"),
+      short: "h",
+      negatedKey: undefined,
+      negatedValue: undefined
+    }
+  ]).map(({ key, field, short, negatedKey }) => ({
+    label: `${short ? `-${short}, ` : "    "}--${key}${valuePlaceholder(field)}${negatedKey ? ` | --${negatedKey}` : ""}`,
     description: `${field.description ?? ""}${isRequired(field) ? " (required)" : ""}`
   }));
   const usageOptions = options?.length ? " [options]" : "";
@@ -14413,7 +14421,9 @@ var printHelp = (help) => {
     console.log(`${help.description}
 `);
   console.log(`Usage: ${help.path}${usageCommands}${usageOptions}${usagePositionals}`);
-  const printSection = (title, entries, width) => {
+  const labels = [commands, positionals, options].flatMap((entries) => entries ?? []);
+  const width = Math.max(...labels.map(({ label }) => label.length));
+  const printSection = (title, entries) => {
     if (!entries?.length)
       return;
     console.log(`
@@ -14421,13 +14431,13 @@ ${title}:`);
     for (const entry of entries)
       console.log(`  ${entry.label.padEnd(width)} ${entry.description}`);
   };
-  printSection("Commands", commands, 12);
-  printSection("Arguments", positionals, 28);
-  printSection("Options", options, 28);
+  printSection("Commands", commands);
+  printSection("Arguments", positionals);
+  printSection("Options", options);
 };
 var baseType = (field) => {
   let t = field;
-  while (t instanceof exports_external.ZodOptional || t instanceof exports_external.ZodDefault) {
+  while (t instanceof exports_external.ZodOptional || t instanceof exports_external.ZodDefault || t instanceof exports_external.ZodNullable) {
     const inner = t.unwrap();
     if (!(inner instanceof exports_external.ZodType))
       return t;
@@ -14437,6 +14447,7 @@ var baseType = (field) => {
 };
 var isRequired = (field) => !(field instanceof exports_external.ZodOptional || field instanceof exports_external.ZodDefault);
 var isHidden = (field) => field.meta()?.hidden === true;
+var isNegatable = (field) => field.meta()?.negatable === true;
 var isHelpFlag = (arg) => arg === "-h" || arg === "--help";
 var valuePlaceholder = (field) => {
   const base = baseType(field);
@@ -14462,16 +14473,34 @@ var shortFlag = (key, field, usedShortFlags) => {
   usedShortFlags.add(short);
   return short;
 };
+var optionEntries = (shape) => {
+  const usedShortFlags = new Set;
+  const optionKeys = new Set(Object.keys(shape));
+  return Object.entries(shape).map(([key, field]) => {
+    const negatedKey = isNegatable(field) ? `no-${key}` : undefined;
+    const negatedValue = negatedKey && baseType(field) instanceof exports_external.ZodBoolean ? false : negatedKey ? null : undefined;
+    if (negatedKey && !field.safeParse(negatedValue).success) {
+      throw new Error(`Option '--${key}' is negatable, but its schema does not accept ${String(negatedValue)}`);
+    }
+    if (negatedKey && optionKeys.has(negatedKey)) {
+      throw new Error(`Option '--${negatedKey}' conflicts with the negated form of '--${key}'`);
+    }
+    return { key, field, short: shortFlag(key, field, usedShortFlags), negatedKey, negatedValue };
+  });
+};
 var parseArgs = ({
   args,
   positionalEntries,
   optionsEntries,
   help
 }) => {
-  const options = Object.fromEntries(optionsEntries.map(({ key, field, short }) => {
+  const options = {};
+  for (const { key, field, short, negatedKey } of optionsEntries) {
     const type = baseType(field) instanceof exports_external.ZodBoolean ? "boolean" : "string";
-    return [key, short ? { short, type } : { type }];
-  }));
+    options[key] = short ? { short, type } : { type };
+    if (negatedKey)
+      options[negatedKey] = { type: "boolean" };
+  }
   try {
     const { values, positionals } = nodeParseArgs({
       args,
@@ -14482,7 +14511,18 @@ var parseArgs = ({
       help();
       throw new Error(`Unexpected argument '${positionals[positionalEntries.length]}'`);
     }
-    return { values, positionals };
+    const normalizedValues = { ...values };
+    for (const { key, negatedKey, negatedValue } of optionsEntries) {
+      if (!negatedKey || !Object.hasOwn(normalizedValues, negatedKey))
+        continue;
+      if (Object.hasOwn(normalizedValues, key)) {
+        help();
+        throw new Error(`Options '--${key}' and '--${negatedKey}' cannot be used together`);
+      }
+      delete normalizedValues[negatedKey];
+      normalizedValues[key] = negatedValue;
+    }
+    return { values: normalizedValues, positionals };
   } catch (error51) {
     if (error51 instanceof Error && "code" in error51) {
       if (error51.code === "ERR_PARSE_ARGS_UNKNOWN_OPTION") {
@@ -14500,12 +14540,7 @@ var parseArgs = ({
 var command = (def) => {
   const inputShape = exports_external.object({ positionals: exports_external.object(def.positionals), options: exports_external.object(def.options) });
   const positionalEntries = Object.entries(inputShape.shape.positionals.shape);
-  const usedShortFlags = new Set;
-  const optionsEntries = Object.entries(inputShape.shape.options.shape).map(([key, field]) => ({
-    key,
-    field,
-    short: shortFlag(key, field, usedShortFlags)
-  }));
+  const optionsEntries = optionEntries(inputShape.shape.options.shape);
   const run = async (args, path) => {
     const help = () => printHelp({ path, description: def.description, positionals: positionalEntries, options: optionsEntries });
     if (args.some(isHelpFlag))
@@ -14523,12 +14558,7 @@ var command = (def) => {
 };
 var group = (def) => {
   const optionsShape = exports_external.object(def.options);
-  const usedShortFlags = new Set;
-  const optionsEntries = Object.entries(optionsShape.shape).map(([key, field]) => ({
-    key,
-    field,
-    short: shortFlag(key, field, usedShortFlags)
-  }));
+  const optionsEntries = optionEntries(optionsShape.shape);
   const run = async ([sub, ...rest], path) => {
     const help = () => printHelp({ path, description: def.description, commands: def.commands, options: optionsEntries });
     if (!sub && !def.run || sub === "help" || isHelpFlag(sub))
@@ -14557,7 +14587,7 @@ import { join } from "path";
 // package.json
 var package_default = {
   name: "cli",
-  version: "0.1.1",
+  version: "0.1.3",
   private: true,
   type: "module",
   bin: {
@@ -15081,6 +15111,9 @@ var components = componentsGeneric();
 
 // ../../packages/backend/convex/constants.ts
 var KDS_DEVICE_AUTH_CLIENT_ID = "kds-cli";
+var PAGE_MODES = ["themed", "raw"];
+var PAGE_VISIBILITIES = ["public", "private"];
+var MAX_PAGE_HTML_BYTES = 4000000;
 
 // src/commands/auth/login.ts
 import open from "open";
@@ -17651,7 +17684,7 @@ var login = command({
   description: "Sign in securely through your browser",
   options: {
     server: exports_external.url().optional().describe("Override KDS server URL (only used in development)").meta({ hidden: true }),
-    "no-open": exports_external.boolean().optional().default(false).describe("Do not open the browser automatically")
+    open: exports_external.boolean().optional().default(true).describe("Open the browser automatically").meta({ negatable: true })
   },
   run: async ({ options }) => {
     const oldConfig = await loadConfig({ throwIfMissing: false, throwIfInvalid: false });
@@ -17673,7 +17706,7 @@ Authorize this CLI in your browser:`);
     console.log(`  ${browserUrl}`);
     console.log(`
 Device code: ${userCode}`);
-    if (!options["no-open"]) {
+    if (options.open) {
       if (await openBrowser(browserUrl))
         console.log(`
 Opened your browser.`);
@@ -17723,25 +17756,234 @@ var auth = group({
   commands: [login, logout, status]
 });
 
-// src/commands/hello.ts
-var hello = command({
-  name: "hello",
-  description: "Example command \u2014 replace with a real tool",
-  hidden: true,
+// src/lib/group.ts
+import { basename } from "path";
+var git = async (...args) => {
+  const proc = Bun.spawn(["git", ...args], { stdout: "pipe", stderr: "ignore" });
+  const [output, exitCode] = await Promise.all([new Response(proc.stdout).text(), proc.exited]);
+  return exitCode === 0 ? output.trim() || null : null;
+};
+var repoNameFromRemote = (remote) => remote.replace(/\/+$/, "").replace(/\.git$/, "").split(/[/:]/).pop() || undefined;
+var detectRepoGroup = async () => {
+  const remote = await git("remote", "get-url", "origin");
+  if (remote)
+    return repoNameFromRemote(remote);
+  const root = await git("rev-parse", "--show-toplevel");
+  return root ? basename(root) : undefined;
+};
+var groupForCreate = async (group2) => group2 === null ? undefined : group2 ?? await detectRepoGroup();
+
+// src/lib/input.ts
+var assertSize = (size) => {
+  if (size > MAX_PAGE_HTML_BYTES)
+    throw new Error(`Page is too large (${size} bytes; max ${MAX_PAGE_HTML_BYTES}).`);
+};
+var readBody = async (path) => {
+  if (path === "-") {
+    const html = await Bun.stdin.text();
+    assertSize(new TextEncoder().encode(html).length);
+    return html;
+  }
+  const file2 = Bun.file(path);
+  assertSize(file2.size);
+  return await file2.text();
+};
+var readPageId = (value) => {
+  const trimmed = value.trim();
+  try {
+    const url2 = new URL(trimmed);
+    const pagePath = url2.pathname.match(/\/p\/([^/]+)\/?$/);
+    return pagePath?.[1] ?? trimmed;
+  } catch {
+    return trimmed;
+  }
+};
+
+// src/commands/pages/create.ts
+var create = command({
+  name: "create",
+  description: "Publish a page and print its URL",
+  positionals: {
+    file: exports_external.string().describe("HTML file, or - for stdin")
+  },
+  options: {
+    title: exports_external.string().describe("Page title").meta({ short: "t" }),
+    group: exports_external.string().nullable().optional().describe("Group to list the page under (default: the current repo)").meta({ short: "g", negatable: true }),
+    raw: exports_external.boolean().default(false).describe("Serve a full document verbatim (may run JS)"),
+    private: exports_external.boolean().default(false).describe("Require the publishing account to view the page")
+  },
+  run: async ({ positionals: { file: file2 }, options: { title, group: group2, raw, private: isPrivate } }) => {
+    const newGroup = await groupForCreate(group2);
+    const html = await readBody(file2);
+    const mode = raw ? "raw" : "themed";
+    const visibility = isPrivate ? "private" : "public";
+    const { url: url2 } = await (await backendClient()).action(api2.pages.create, {
+      title,
+      group: newGroup,
+      html,
+      mode,
+      visibility
+    });
+    console.log(url2);
+  }
+});
+
+// src/commands/pages/get.ts
+var get = command({
+  name: "get",
+  description: "Print a page's HTML",
   positionals: {
-    name: exports_external.string().default("world").describe("Who to greet")
+    id: exports_external.string().describe("Page id or URL")
   },
   options: {
-    shout: exports_external.boolean().default(false).describe("Greet loudly").meta({ short: "s" }),
-    repeat: exports_external.coerce.number().int().positive().default(1).describe("Number of times to greet").meta({ short: "r" })
+    json: exports_external.boolean().default(false).describe("Print the full page as JSON"),
+    version: exports_external.coerce.number().int().positive().optional().describe("Print a previous version instead of the current")
   },
-  run: ({ positionals: { name }, options: { shout, repeat } }) => {
-    const greeting = `Hello, ${name}!`;
-    for (let i2 = 0;i2 < repeat; i2++)
-      console.log(shout ? greeting.toUpperCase() : greeting);
+  run: async ({ positionals: { id }, options: { json: json2, version: version4 } }) => {
+    const page = await (await backendClient()).action(api2.pages.get, { id: readPageId(id), version: version4 });
+    if (json2)
+      console.log(JSON.stringify(page, null, 2));
+    else
+      process.stdout.write(page.html);
   }
 });
 
+// ../../packages/backend/convex/lib/format.ts
+var formatBytes = (bytes) => bytes < 1024 ? `${bytes} B` : `${Math.round(bytes / 1024)} KB`;
+
+// src/lib/output.ts
+var printTable = (rows) => {
+  if (rows.length === 0)
+    return;
+  const columnCount = Math.max(...rows.map((row) => row.length));
+  const widths = Array.from({ length: columnCount }, (_, column) => Math.max(...rows.map((row) => (row[column] ?? "").length)));
+  for (const row of rows) {
+    console.log(row.map((cell, column) => cell.padEnd(widths[column] ?? 0)).join("  ").trimEnd());
+  }
+};
+
+// src/commands/pages/list.ts
+var list = command({
+  name: "list",
+  description: "List your published pages",
+  options: {
+    group: exports_external.string().nullable().optional().describe("Only list pages in this group, or --no-group for the ungrouped ones").meta({ short: "g", negatable: true }),
+    json: exports_external.boolean().default(false).describe("Print as JSON")
+  },
+  run: async ({ options: { group: group2, json: json2 } }) => {
+    const pages = await (await backendClient()).query(api2.pages.list, { group: group2 });
+    if (json2)
+      return console.log(JSON.stringify(pages, null, 2));
+    if (pages.length === 0)
+      return console.log(group2 === undefined ? "No pages yet." : "No pages in that group.");
+    printTable([
+      ["TITLE", "GROUP", "ACCESS", "MODE", "SIZE", "VERSIONS", "CREATED", "URL"],
+      ...pages.map((page) => [
+        page.title,
+        page.group ?? "-",
+        page.visibility,
+        page.mode,
+        formatBytes(page.size),
+        page.versions === 0 ? "-" : String(page.versions),
+        new Date(page.createdAt).toISOString().slice(0, 10),
+        page.url
+      ])
+    ]);
+  }
+});
+
+// src/commands/pages/remove.ts
+var remove = command({
+  name: "delete",
+  description: "Delete a page",
+  positionals: {
+    id: exports_external.string().describe("Page id or URL")
+  },
+  run: async ({ positionals: { id } }) => {
+    await (await backendClient()).mutation(api2.pages.remove, { id: readPageId(id) });
+    console.log("Deleted.");
+  }
+});
+
+// src/commands/pages/revert.ts
+var revert = command({
+  name: "revert",
+  description: "Restore a previous version as the page's content",
+  positionals: {
+    id: exports_external.string().describe("Page id or URL"),
+    version: exports_external.coerce.number().int().positive().describe("Version number from `kds pages versions`")
+  },
+  run: async ({ positionals: { id, version: version4 } }) => {
+    const { url: url2 } = await (await backendClient()).mutation(api2.pages.revert, { id: readPageId(id), version: version4 });
+    console.log(url2);
+  }
+});
+
+// src/commands/pages/update.ts
+var update = command({
+  name: "update",
+  description: "Replace a page's HTML, title, group, mode, or visibility",
+  positionals: {
+    id: exports_external.string().describe("Page id or URL"),
+    file: exports_external.string().optional().describe("HTML file, or - for stdin")
+  },
+  options: {
+    title: exports_external.string().optional().describe("New page title").meta({ short: "t" }),
+    group: exports_external.string().nullable().optional().describe("Move the page to this group, or --no-group to remove it from one").meta({ short: "g", negatable: true }),
+    mode: exports_external.enum(PAGE_MODES).optional().describe("New serving mode"),
+    visibility: exports_external.enum(PAGE_VISIBILITIES).optional().describe("Who can view the page")
+  },
+  run: async ({ positionals: { id, file: file2 }, options: { title, group: group2, mode, visibility } }) => {
+    if (!file2 && title === undefined && group2 === undefined && mode === undefined && visibility === undefined)
+      throw new Error("Nothing to update. Pass a file, --title, --group, --no-group, --mode, or --visibility.");
+    const html = file2 ? await readBody(file2) : undefined;
+    const { url: url2 } = await (await backendClient()).action(api2.pages.update, {
+      id: readPageId(id),
+      html,
+      title,
+      group: group2,
+      mode,
+      visibility
+    });
+    console.log(url2);
+  }
+});
+
+// src/commands/pages/versions.ts
+var versions2 = command({
+  name: "versions",
+  description: "List a page's previous versions",
+  positionals: {
+    id: exports_external.string().describe("Page id or URL")
+  },
+  options: {
+    json: exports_external.boolean().default(false).describe("Print as JSON")
+  },
+  run: async ({ positionals: { id }, options: { json: json2 } }) => {
+    const archived = await (await backendClient()).query(api2.pages.versions, { id: readPageId(id) });
+    if (json2)
+      return console.log(JSON.stringify(archived, null, 2));
+    if (archived.length === 0)
+      return console.log("No previous versions.");
+    printTable([
+      ["VERSION", "MODE", "SIZE", "ARCHIVED"],
+      ...archived.map((version4) => [
+        String(version4.version),
+        version4.mode,
+        formatBytes(version4.size),
+        new Date(version4.archivedAt).toISOString().slice(0, 10)
+      ])
+    ]);
+  }
+});
+
+// src/commands/pages/index.ts
+var pages = group({
+  name: "pages",
+  description: "Publish HTML documents to the web",
+  commands: [create, list, get, update, versions2, revert, remove]
+});
+
 // src/commands/upgrade.ts
 var upgrade = command({
   name: "upgrade",
@@ -17757,7 +17999,7 @@ var upgrade = command({
 var rootCommand = group({
   name: "kds",
   description: "KDS CLI",
-  commands: [auth, hello, upgrade],
+  commands: [auth, pages, upgrade],
   options: {
     version: exports_external.boolean().default(false).describe("Show the version").meta({ short: "v" })
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@islamihab/kds",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Command-line client for Kai Dev Studio",
   "license": "MIT",
   "publishConfig": {