@dropthis/cli 0.6.0 → 0.7.0

package/README.md

@@ -108,7 +108,6 @@ All publish flags:
 | `--metadata <json>` | Metadata as JSON string |
 | `--metadata-file <path>` | Metadata from a JSON file |
 | `--idempotency-key <key>` | Idempotency key |
-| `--from-json <path>` | Read exact POST /drops JSON request body from file |
 | `--url` | Print only the URL, nothing else |
 | `--json` | Output full JSON response |
 | `--dry-run` | Validate without publishing |

package/dist/cli.cjs

@@ -754,13 +754,13 @@ async function runDoctor(_input, deps) {
   const authSource = credential?.source ?? "missing";
   const storageBackend = stored?.storage ?? "none";
   const pairs = [
-    ["Version", "0.6.0"],
+    ["Version", "0.7.0"],
     ["Auth", authSource],
     ["Storage", storageBackend]
   ];
   writeKv(deps, pairs, {
     ok: true,
-    version: "0.6.0",
+    version: "0.7.0",
     auth: { source: authSource },
     storage: { backend: storageBackend }
   });
@@ -1140,22 +1140,6 @@ function shouldSpin(outputMode) {
   return outputMode === "human" && process.stderr.isTTY === true && !process.env.CI;
 }
 
-// src/commands/json_body.ts
-var import_promises2 = require("fs/promises");
-async function readJsonObjectFile(path) {
-  let parsed;
-  try {
-    parsed = JSON.parse(await (0, import_promises2.readFile)(path, "utf8"));
-  } catch (error2) {
-    const message = error2 instanceof Error ? error2.message : "Unknown parse error";
-    throw new Error(`Invalid JSON body in ${path}: ${message}`);
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("JSON body must be an object.");
-  }
-  return parsed;
-}
-
 // src/commands/publish.ts
 async function runPublish(input, raw, deps) {
   let credential;
@@ -1192,14 +1176,9 @@ async function runPublish(input, raw, deps) {
   const hasInput = Array.isArray(input) ? input.length > 0 : input !== void 0;
   const spin = shouldSpin(deps.outputMode) ? createSpinner("Publishing\u2026", deps.stderr) : void 0;
   try {
-    if (raw.fromJson && hasInput) {
-      throw new Error("Use either <input> or --from-json, not both.");
-    }
     const options = withIdempotencyKey(await parseDropOptions(raw), "pub");
-    const jsonBody = raw.fromJson ? await (deps.readJsonObject ?? readJsonObjectFile)(raw.fromJson) : void 0;
-    const idempotencyOpt = options.idempotencyKey ? { idempotencyKey: options.idempotencyKey } : {};
-    const doPublish = (c) => jsonBody ? c.drops.createRaw(jsonBody, idempotencyOpt) : hasInput ? c.publish(input, options) : (() => {
-      throw new Error("Publish requires <input> or --from-json.");
+    const doPublish = (c) => hasInput ? c.publish(input, options) : (() => {
+      throw new Error("Publish requires <input>.");
     })();
     const result = await doPublish(client);
     if (result.error) {
@@ -1259,20 +1238,8 @@ async function handlePublishDryRun(input, raw, deps, client) {
     );
   }
   try {
-    if (raw.fromJson) {
-      if (input)
-        throw new Error("Use either <input> or --from-json, not both.");
-      const body = await (deps.readJsonObject ?? readJsonObjectFile)(
-        raw.fromJson
-      );
-      deps.stdout(
-        `${JSON.stringify({ ok: true, dryRun: true, kind: "raw_json", endpoint: "POST /drops", body }, null, 2)}
-`
-      );
-      return { exitCode: 0 };
-    }
     if (!input || Array.isArray(input) && input.length === 0) {
-      throw new Error("Publish requires <input> or --from-json.");
+      throw new Error("Publish requires <input>.");
     }
     const options = await parseDropOptions(raw);
     if (!client.prepare) {
@@ -1297,6 +1264,27 @@ async function handlePublishDryRun(input, raw, deps, client) {
 var prompts4 = __toESM(require("@clack/prompts"), 1);
 var NO_UPDATE_MESSAGE = "Nothing to update. Provide an input path or at least one update option.";
 var NO_UPDATE_NEXT_ACTION = "Run dropthis drops update --help, or retry with an input path (for example, dropthis drops update <dropId> ./dist) or one of: --title, --slug, --visibility, --password, --no-password, --noindex, --index, --expires-at, or --metadata.";
+var DEPLOY_REJECTS_SETTINGS = "A deployment changes content only \u2014 it can't change settings in the same call.";
+var DEPLOY_SETTINGS_NEXT_ACTION = "Deploy the new content first (dropthis drops update <dropId> ./dist), then change settings separately (dropthis drops update <dropId> --title ... --visibility ...). Settings on an existing drop never require re-uploading content.";
+var SETTINGS_KEYS = [
+  "slug",
+  "title",
+  "visibility",
+  "password",
+  "noindex",
+  "expiresAt",
+  "metadata"
+];
+function hasSettingsFields(options) {
+  return SETTINGS_KEYS.some((key) => options[key] !== void 0);
+}
+function contentDeployOptions(options) {
+  const out = {};
+  if (options.entry !== void 0) out.entry = options.entry;
+  if (options.contentType !== void 0) out.contentType = options.contentType;
+  if (options.path !== void 0) out.path = options.path;
+  return out;
+}
 async function runUpdate(target, input, raw, deps) {
   try {
     await requireCredential({
@@ -1313,12 +1301,9 @@ async function runUpdate(target, input, raw, deps) {
   let spin;
   try {
     assertDropId(target);
-    if (raw.fromJson && input) {
-      throw new Error("Use either [input] or --from-json, not both.");
-    }
     let updateInput = input;
     let parsed = await parseDropOptions(raw);
-    if (!updateInput && !raw.fromJson && !hasUpdateFields(parsed)) {
+    if (!updateInput && !hasUpdateFields(parsed)) {
       if (shouldPromptForUpdate(deps)) {
         const prompted = await promptForUpdate(target, deps.prompts ?? prompts4);
         if (!prompted) return { exitCode: 0 };
@@ -1333,22 +1318,23 @@ async function runUpdate(target, input, raw, deps) {
         );
       }
     }
+    if (updateInput && hasSettingsFields(parsed)) {
+      return writeError(
+        deps,
+        "invalid_usage",
+        DEPLOY_REJECTS_SETTINGS,
+        DEPLOY_SETTINGS_NEXT_ACTION
+      );
+    }
     const revisionOptions = raw.ifRevision !== void 0 ? { ifRevision: Number(raw.ifRevision) } : {};
     spin = shouldSpin(deps.outputMode) ? createSpinner("Updating\u2026", deps.stderr) : void 0;
-    const result = raw.fromJson ? await deps.client.deployments.createRaw(
+    const result = updateInput ? await deps.client.deploy(
       target,
-      await (deps.readJsonObject ?? readJsonObjectFile)(raw.fromJson),
+      updateInput,
       withIdempotencyKey(
-        {
-          ...revisionOptions,
-          ...parsed.idempotencyKey ? { idempotencyKey: parsed.idempotencyKey } : {}
-        },
+        { ...contentDeployOptions(parsed), ...revisionOptions },
         "upd"
       )
-    ) : updateInput ? await deps.client.deploy(
-      target,
-      updateInput,
-      withIdempotencyKey({ ...parsed, ...revisionOptions }, "upd")
     ) : await deps.client.update(
       target,
       withIdempotencyKey({ ...parsed, ...revisionOptions }, "upd")
@@ -1536,18 +1522,6 @@ async function handleUpdateDryRun(target, input, raw, deps) {
   }
   try {
     assertDropId(target);
-    if (raw.fromJson) {
-      if (input)
-        throw new Error("Use either [input] or --from-json, not both.");
-      const body = await (deps.readJsonObject ?? readJsonObjectFile)(
-        raw.fromJson
-      );
-      deps.stdout(
-        `${JSON.stringify({ ok: true, dryRun: true, kind: "raw_json", endpoint: `POST /drops/${target}/deployments`, body }, null, 2)}
-`
-      );
-      return { exitCode: 0 };
-    }
     const options = await parseDropOptions(raw);
     if (!input) {
       const fields = {};
@@ -1663,7 +1637,7 @@ function createContext(input) {
 }
 
 // src/storage.ts
-var import_promises3 = require("fs/promises");
+var import_promises2 = require("fs/promises");
 var import_node_os = require("os");
 var import_node_path = require("path");
 var import_keyring = require("@napi-rs/keyring");
@@ -1697,7 +1671,7 @@ var InsecureFileCredentialStore = class {
     });
   }
   async clear() {
-    await (0, import_promises3.rm)(this.filePath, { force: true });
+    await (0, import_promises2.rm)(this.filePath, { force: true });
   }
 };
 var KeyringCredentialStore = class {
@@ -1724,7 +1698,7 @@ var KeyringCredentialStore = class {
   }
   async clear() {
     await this.keyring.deletePassword();
-    await (0, import_promises3.rm)(this.filePath, { force: true });
+    await (0, import_promises2.rm)(this.filePath, { force: true });
   }
 };
 function createCredentialStore(options = {}) {
@@ -1749,7 +1723,7 @@ function credentialPath(configDir) {
 }
 async function readJsonFile(path) {
   try {
-    return JSON.parse(await (0, import_promises3.readFile)(path, "utf8"));
+    return JSON.parse(await (0, import_promises2.readFile)(path, "utf8"));
   } catch (error2) {
     if (error2 && typeof error2 === "object" && "code" in error2 && error2.code === "ENOENT") {
       return null;
@@ -1758,14 +1732,14 @@ async function readJsonFile(path) {
   }
 }
 async function writeCredentialFile(path, credential) {
-  await (0, import_promises3.mkdir)((0, import_node_path.dirname)(path), { recursive: true });
+  await (0, import_promises2.mkdir)((0, import_node_path.dirname)(path), { recursive: true });
   const tmpPath = `${path}.${process.pid}.tmp`;
-  await (0, import_promises3.writeFile)(tmpPath, `${JSON.stringify(credential, null, 2)}
+  await (0, import_promises2.writeFile)(tmpPath, `${JSON.stringify(credential, null, 2)}
 `, {
     mode: 384
   });
-  await (0, import_promises3.chmod)(tmpPath, 384);
-  await (0, import_promises3.rename)(tmpPath, path);
+  await (0, import_promises2.chmod)(tmpPath, 384);
+  await (0, import_promises2.rename)(tmpPath, path);
 }
 
 // src/program.ts
@@ -1794,7 +1768,7 @@ function buildProgram(options = {}) {
       `  ${import_picocolors4.default.cyan("dropthis login")}`,
       `  ${import_picocolors4.default.cyan("dropthis publish ./dist")}`
     ].join("\n")
-  ).version("0.6.0").configureHelp({
+  ).version("0.7.0").configureHelp({
     subcommandTerm(cmd) {
       const args = cmd.registeredArguments.map((a) => {
         const name = a.name();
@@ -1827,12 +1801,12 @@ function buildProgram(options = {}) {
   ).option("--metadata-file <path>", "Read metadata JSON from a file").option("--path <name>", "Set filename when publishing from stdin").option("--url", "Print only the published URL (no JSON envelope)").option(
     "--dry-run",
     "Show what would be published without publishing (JSON; cannot combine with --url)"
-  ).option("--json", "Force JSON output").option("--from-json <path>", "Send raw API request body from a JSON file").option(
+  ).option("--json", "Force JSON output").option(
     "--idempotency-key <key>",
     "Prevent duplicate publishes on retry (auto-generated)"
   ).action(async (inputs, commandOptions) => {
     const stdinIsTTY = options.stdinIsTTY ?? process.stdin.isTTY ?? false;
-    if (inputs.length === 0 && stdinIsTTY && !commandOptions.fromJson) {
+    if (inputs.length === 0 && stdinIsTTY) {
       program.outputHelp();
       return;
     }
@@ -1896,9 +1870,6 @@ function buildProgram(options = {}) {
     "--dry-run",
     "Show what would be updated without updating (JSON; cannot combine with --url)"
   ).option("--json", "Force JSON output").option(
-    "--from-json <path>",
-    "Send raw API deployment body from a JSON file"
-  ).option(
     "--idempotency-key <key>",
     "Prevent duplicate updates on retry (auto-generated)"
   ).action(
@@ -2212,7 +2183,6 @@ function toDropOptions(options) {
     ...options.quiet !== void 0 ? { quiet: options.quiet } : {},
     ...options.url !== void 0 ? { url: options.url } : {},
     ...options.ifRevision !== void 0 ? { ifRevision: options.ifRevision } : {},
-    ...options.fromJson ? { fromJson: options.fromJson } : {},
     ...options.dryRun ? { dryRun: options.dryRun } : {}
   };
 }