@dropthis/cli 0.17.0 → 0.19.0

package/dist/cli.cjs

@@ -702,6 +702,13 @@ var COMMAND_ANNOTATIONS = {
     auth: "required",
     examples: ["dropthis get drop_abc --json"]
   },
+  resolve: {
+    auth: "required",
+    examples: [
+      "dropthis resolve https://abc123.dropthis.app/",
+      "dropthis resolve abc123 --json"
+    ]
+  },
   list: {
     auth: "required",
     examples: [
@@ -909,13 +916,13 @@ async function runDoctor(_input, deps) {
   const authSource = credential?.source ?? "missing";
   const storageBackend = stored?.storage ?? "none";
   const pairs = [
-    ["Version", "0.17.0"],
+    ["Version", "0.19.0"],
     ["Auth", authSource],
     ["Storage", storageBackend]
   ];
   writeKv(deps, pairs, {
     ok: true,
-    version: "0.17.0",
+    version: "0.19.0",
     auth: { source: authSource },
     storage: { backend: storageBackend }
   });
@@ -1286,9 +1293,19 @@ async function resolveDropTarget(target, deps) {
   return {
     ok: true,
     dropId: resolved.data.id,
-    ...resolved.data.slug ? { slug: resolved.data.slug } : {}
+    resolvedFrom: target,
+    ...resolved.data.slug ? { slug: resolved.data.slug } : {},
+    ...typeof resolved.data.title === "string" ? { title: resolved.data.title } : {}
   };
 }
+function writeResolvedLine(deps, resolved) {
+  if (!resolved.resolvedFrom || deps.outputMode !== "human") return;
+  const title = resolved.title ? ` (${resolved.title})` : "";
+  deps.stdout(
+    `${hint(`resolved ${resolved.resolvedFrom} \u2192 ${resolved.dropId}${title}`)}
+`
+  );
+}
 async function runDropsList(input, deps) {
   try {
     await requireCredential({
@@ -1352,6 +1369,7 @@ async function runDropsGet(target, _input, deps) {
   }
   const resolved = await resolveDropTarget(target, deps);
   if (!resolved.ok) return { exitCode: resolved.exitCode };
+  writeResolvedLine(deps, resolved);
   const result = await deps.client.drops.get(resolved.dropId);
   if (result.error) return writeApiError(deps, result.error);
   const data = result.data;
@@ -1374,6 +1392,34 @@ async function runDropsGet(target, _input, deps) {
   writeKv(deps, pairs, { ok: true, drop: result.data });
   return { exitCode: 0 };
 }
+async function runDropsResolve(target, _input, deps) {
+  try {
+    await requireCredential({
+      ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+      env: deps.env,
+      store: deps.store
+    });
+  } catch {
+    return writeAuthError(deps);
+  }
+  const result = await deps.client.drops.resolve(target);
+  if (result.error) return writeApiError(deps, result.error);
+  if (result.data === null) {
+    return writeApiError(deps, {
+      code: "not_found",
+      message: `No drop matching "${target}" found in your account.`,
+      suggestion: "It may belong to another account or have been deleted. Run dropthis list to see your drops, or pass the full drop_\u2026 id."
+    });
+  }
+  const drop = result.data;
+  const pairs = [];
+  if (drop.id) pairs.push(["ID", String(drop.id)]);
+  if (drop.url) pairs.push(["URL", url(String(drop.url))]);
+  if (drop.title) pairs.push(["Title", String(drop.title)]);
+  if (drop.slug) pairs.push(["Slug", String(drop.slug)]);
+  writeKv(deps, pairs, { ok: true, drop });
+  return { exitCode: 0 };
+}
 async function runDropsDelete(target, input, deps) {
   if (!input.yes && input.interactive === false) {
     return writeError(
@@ -1393,6 +1439,7 @@ async function runDropsDelete(target, input, deps) {
   }
   const resolved = await resolveDropTarget(target, deps);
   if (!resolved.ok) return { exitCode: resolved.exitCode };
+  writeResolvedLine(deps, resolved);
   const dropId = resolved.dropId;
   if (!input.yes && input.interactive !== false) {
     const confirmed = await prompts3.confirm({
@@ -1609,6 +1656,7 @@ function formatDryRunManifest(prepared, extra) {
 
 // src/options.ts
 var import_promises = require("fs/promises");
+var import_node = require("@dropthis/node");
 async function parseDropOptions(raw) {
   if (raw.metadata && raw.metadataFile) {
     throw new Error("Use either --metadata or --metadata-file, not both.");
@@ -1619,6 +1667,9 @@ async function parseDropOptions(raw) {
   if (raw.noindex && raw.index) {
     throw new Error("Use either --noindex or --index, not both.");
   }
+  if (raw.shared && raw.domain) {
+    throw new Error("Use either --shared or --domain <hostname>, not both.");
+  }
   if (raw.visibility && raw.visibility !== "public" && raw.visibility !== "unlisted") {
     throw new Error(
       `Invalid visibility "${raw.visibility}". Use "public" or "unlisted".`
@@ -1649,7 +1700,7 @@ async function parseDropOptions(raw) {
     ...raw.contentType ? { contentType: raw.contentType } : {},
     ...raw.path ? { path: raw.path } : {},
     ...raw.idempotencyKey ? { idempotencyKey: raw.idempotencyKey } : {},
-    ...raw.domain ? { domain: raw.domain } : {},
+    ...raw.shared ? { domain: import_node.SHARED_POOL } : raw.domain ? { domain: raw.domain } : {},
     ...raw.slug ? { slug: raw.slug } : {}
   };
 }
@@ -1820,6 +1871,7 @@ async function runPull(target, input, deps) {
   }
   const resolved = await resolveDropTarget(target, deps);
   if (!resolved.ok) return { exitCode: resolved.exitCode };
+  writeResolvedLine(deps, resolved);
   const dropId = resolved.dropId;
   const defaultDirName = resolved.slug || resolved.dropId;
   const spin = shouldSpin(deps.outputMode) ? createSpinner("Pulling content\u2026", deps.stderr) : void 0;
@@ -1905,22 +1957,30 @@ function contentOptions(options) {
   if (options.path !== void 0) out.path = options.path;
   return out;
 }
-async function runUpdateContent(dropId, input, raw, deps) {
+async function runUpdateContent(target, input, raw, deps) {
+  const apiKey = raw.apiKey ?? deps.apiKey;
   try {
     await requireCredential({
-      ...raw.apiKey ?? deps.apiKey ? { apiKey: raw.apiKey ?? deps.apiKey } : {},
+      ...apiKey ? { apiKey } : {},
       env: deps.env,
       store: deps.store
     });
   } catch {
     return writeAuthError(deps);
   }
+  const resolveDeps = {
+    ...deps,
+    ...apiKey ? { apiKey } : {}
+  };
+  const resolved = await resolveDropTarget(target, resolveDeps);
+  if (!resolved.ok) return { exitCode: resolved.exitCode };
+  const dropId = resolved.dropId;
   if (raw.dryRun) {
     return handleDryRun(dropId, input, raw, deps);
   }
+  writeResolvedLine(deps, resolved);
   let spin;
   try {
-    assertDropId(dropId);
     const hasInput = Array.isArray(input) ? input.length > 0 : input !== void 0;
     if (!hasInput) {
       return writeError(
@@ -1967,7 +2027,6 @@ async function handleDryRun(dropId, input, raw, deps) {
     );
   }
   try {
-    assertDropId(dropId);
     const hasInput = Array.isArray(input) ? input.length > 0 : input !== void 0;
     if (!hasInput) {
       return writeError(
@@ -1995,34 +2054,35 @@ async function handleDryRun(dropId, input, raw, deps) {
     return writeError(deps, code, message);
   }
 }
-function assertDropId(target) {
-  if (!target.startsWith("drop_")) {
-    throw new Error(
-      "update-content needs the full drop_\u2026 id from the publish response, not the URL slug, for example drop_..."
-    );
-  }
-}
 
 // src/commands/update-settings.ts
 var prompts5 = __toESM(require("@clack/prompts"), 1);
 var NO_SETTINGS_MESSAGE = "Nothing to update. Provide at least one settings option.";
 var NO_SETTINGS_NEXT_ACTION = "Run dropthis update-settings --help, or retry with one of: --title, --visibility, --password, --no-password, --noindex, --index, --expires-at, --metadata, or --metadata-file. To replace the content at the URL instead, use dropthis update-content <dropId> ./dist.";
-async function runUpdateSettings(dropId, raw, deps) {
+async function runUpdateSettings(target, raw, deps) {
+  const apiKey = raw.apiKey ?? deps.apiKey;
   try {
     await requireCredential({
-      ...raw.apiKey ?? deps.apiKey ? { apiKey: raw.apiKey ?? deps.apiKey } : {},
+      ...apiKey ? { apiKey } : {},
       env: deps.env,
       store: deps.store
     });
   } catch {
     return writeAuthError(deps);
   }
+  const resolveDeps = {
+    ...deps,
+    ...apiKey ? { apiKey } : {}
+  };
+  const resolved = await resolveDropTarget(target, resolveDeps);
+  if (!resolved.ok) return { exitCode: resolved.exitCode };
+  const dropId = resolved.dropId;
   if (raw.dryRun) {
     return handleDryRun2(dropId, raw, deps);
   }
+  writeResolvedLine(deps, resolved);
   let spin;
   try {
-    assertDropId2(dropId);
     let parsed = await parseDropOptions(raw);
     if (!hasSettingsFields(parsed)) {
       if (shouldPrompt(deps)) {
@@ -2211,7 +2271,6 @@ async function handleDryRun2(dropId, raw, deps) {
     );
   }
   try {
-    assertDropId2(dropId);
     const options = await parseDropOptions(raw);
     const fields = {};
     if (options.title) fields.title = options.title;
@@ -2230,13 +2289,6 @@ async function handleDryRun2(dropId, raw, deps) {
     return writeError(deps, "invalid_usage", message);
   }
 }
-function assertDropId2(target) {
-  if (!target.startsWith("drop_")) {
-    throw new Error(
-      "update-settings needs the full drop_\u2026 id from the publish response, not the URL slug, for example drop_..."
-    );
-  }
-}
 
 // src/commands/upgrade.ts
 var import_node_child_process = require("child_process");
@@ -2389,7 +2441,7 @@ async function runWhoami(_input, deps) {
 }
 
 // src/context.ts
-var import_node = require("@dropthis/node");
+var import_node2 = require("@dropthis/node");
 function createContext(input) {
   const env = input.env ?? process.env;
   const global = input.global ?? {};
@@ -2406,7 +2458,7 @@ function createContext(input) {
     stderr: input.stderr ?? ((value) => process.stderr.write(value)),
     createClient(apiKey) {
       const baseUrl = global.apiUrl ?? env.DROPTHIS_API_URL;
-      return new import_node.Dropthis({
+      return new import_node2.Dropthis({
         ...apiKey ? { apiKey } : {},
         ...baseUrl ? { baseUrl } : {}
       });
@@ -2596,7 +2648,7 @@ function buildProgram(options = {}) {
       `  ${import_picocolors6.default.cyan("dropthis login")}`,
       `  ${import_picocolors6.default.cyan("dropthis publish ./dist")}`
     ].join("\n")
-  ).version("0.17.0").configureHelp({
+  ).version("0.19.0").configureHelp({
     subcommandTerm(cmd) {
       const args = cmd.registeredArguments.map((a) => {
         const name = a.name();
@@ -2640,7 +2692,10 @@ ${lines.map((l) => `  ${l}`).join("\n")}
     `Attach JSON key-value pairs, e.g. '{"source":"ci"}'`
   ).option("--metadata-file <path>", "Read metadata JSON from a file").option("--path <name>", "Set filename when publishing from stdin").option(
     "--domain <hostname>",
-    "Serve this drop under a connected custom domain (must be live \u2014 see: dropthis domains list), or pass the literal 'shared' to publish to the shared pool even when the account has a default domain. Path-mode: drop lives at https://domain/{slug}/. Dedicated: drop is at the root (409 if occupied). Omit to use the account's default path domain."
+    "Serve this drop under a connected custom domain (must be live \u2014 see: dropthis domains list). Path-mode: drop lives at https://domain/{slug}/. Dedicated: drop is at the root (409 if occupied). Omit to use the account's default path domain. To publish to the shared pool instead, use --shared."
+  ).option(
+    "--shared",
+    "Deliberately publish to the shared dropthis pool, bypassing your default custom domain (an off-domain publish). Cannot combine with --domain."
   ).option(
     "--slug <vanity-slug>",
     "Vanity slug for path-mode custom domains (1\u201363 lowercase letters/digits/hyphens). Auto-suffixed if taken. Only valid with --domain on a path-mode domain."
@@ -2657,7 +2712,7 @@ ${lines.map((l) => `  ${l}`).join("\n")}
       "dropthis publish ./dist --title 'Launch page'",
       "cat report.md | dropthis publish - --content-type text/markdown --path report.md",
       "dropthis publish ./dist --domain reports.example.com --slug launch",
-      "dropthis publish ./report.html --domain shared   # bypass the account default domain",
+      "dropthis publish ./report.html --shared   # bypass your default domain \u2192 shared pool",
       "URL=$(dropthis publish ./dist --url)"
     ])
   ).addHelpText(
@@ -2849,6 +2904,19 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
     const result = await runDropsGet(dropId, commandOptions, deps);
     process.exitCode = result.exitCode;
   });
+  program.command("resolve <target>").description(
+    "Resolve a public drop URL or slug back to its drop_\u2026 id (accepts the id too).\nWrites are id-only \u2014 use this to recover the id from a URL, then update-content/update-settings/delete by that id."
+  ).option("--json", "Force JSON output").addHelpText(
+    "after",
+    examplesBlock([
+      "dropthis resolve https://abc123.dropthis.app/   # \u2192 drop_\u2026 id + url",
+      "dropthis resolve abc123 --json | jq -r .drop.id"
+    ])
+  ).action(async (target, commandOptions) => {
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const result = await runDropsResolve(target, commandOptions, deps);
+    process.exitCode = result.exitCode;
+  });
   program.command("list").description("List your drops").option("--limit <n>", "Page size", parseInteger).option("--cursor <cursor>", "Pagination cursor").option("--domain <hostname>", "Only drops mounted on this custom domain").option("--json", "Force JSON output").addHelpText(
     "after",
     examplesBlock([
@@ -3153,7 +3221,7 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
     );
     const result = await runUpgrade(commandOptions, {
       ...deps,
-      currentVersion: "0.17.0"
+      currentVersion: "0.19.0"
     });
     process.exitCode = result.exitCode;
   });
@@ -3261,6 +3329,7 @@ function toDropOptions(options) {
     ...options.path ? { path: options.path } : {},
     ...options.idempotencyKey ? { idempotencyKey: options.idempotencyKey } : {},
     ...options.domain ? { domain: options.domain } : {},
+    ...options.shared ? { shared: true } : {},
     ...options.slug ? { slug: options.slug } : {},
     ...options.json !== void 0 ? { json: options.json } : {},
     ...options.quiet !== void 0 ? { quiet: options.quiet } : {},
@@ -3396,7 +3465,7 @@ var showNotice = shouldShowNotice({
 if (showNotice) {
   const notice = noticeFromCache({
     cache: updateCache,
-    currentVersion: "0.17.0"
+    currentVersion: "0.19.0"
   });
   if (notice) {
     process.stderr.write(`