Address post-merge deploy PR comments. (#271)

Author: mcglincy

src/observableApiClient.ts

@@ -77,7 +77,7 @@ export class ObservableApiClient {
       method: "GET",
       headers: this._apiHeaders
     });
-    if (response.status !== 200) {
+    if (!response.ok) {
       throw new HttpError("Unexpected response status", response.status);
     }
     const responseJson = await response.json();
@@ -91,7 +91,7 @@ export class ObservableApiClient {
       headers: [...this._apiHeaders, ["Content-Type", "application/json"]],
       body: JSON.stringify({slug, workspace})
     });
-    if (response.status !== 200) {
+    if (!response.ok) {
       throw new HttpError("Unexpected response status", response.status);
     }
     const responseJson = await response.json();
@@ -105,7 +105,7 @@ export class ObservableApiClient {
       headers: [...this._apiHeaders, ["Content-Type", "application/json"]],
       body: JSON.stringify({})
     });
-    if (response.status !== 200) {
+    if (!response.ok) {
       throw new HttpError("Unexpected response status", response.status);
     }
     const responseJson = await response.json();
@@ -127,7 +127,7 @@ export class ObservableApiClient {
       body
     });
 
-    if (response.status !== 200 && response.status !== 204) {
+    if (!response.ok) {
       throw new HttpError("Unexpected response status", response.status);
     }
   }
@@ -141,7 +141,7 @@ export class ObservableApiClient {
       body: JSON.stringify({})
     });
 
-    if (response.status !== 200 && response.status !== 204) {
+    if (!response.ok) {
       throw new HttpError("Unexpected response status", response.status);
     }
   }

src/toolConfig.ts

@@ -3,8 +3,8 @@ import os from "node:os";
 import path from "node:path";
 import {isEnoent} from "./error.js";
 
-const observableConfigName = ".observablehq";
-interface ObservableConfig {
+const userConfigName = ".observablehq";
+interface UserConfig {
   auth?: {
     id: string;
     key: string;
@@ -20,14 +20,14 @@ export interface DeployConfig {
 }
 
 export async function getObservableApiKey(): Promise<string | null> {
-  const {config} = await loadObservableConfig();
+  const {config} = await loadUserConfig();
   return config.auth?.key ?? null;
 }
 
 export async function setObservableApiKey(id: string, key: string): Promise<void> {
-  const {config, configPath} = await loadObservableConfig();
+  const {config, configPath} = await loadUserConfig();
   config.auth = {id, key};
-  await writeObservableConfig({config, configPath});
+  await writeUserConfig({config, configPath});
 }
 
 export async function getDeployConfig(sourceRoot: string): Promise<DeployConfig | null> {
@@ -48,10 +48,10 @@ export async function setDeployConfig(sourceRoot: string, newConfig: DeployConfi
   await fs.writeFile(deployConfigPath, JSON.stringify(merged, null, 2));
 }
 
-async function loadObservableConfig(): Promise<{configPath: string; config: ObservableConfig}> {
+async function loadUserConfig(): Promise<{configPath: string; config: UserConfig}> {
   let cursor = path.resolve(process.cwd());
   while (true) {
-    const configPath = path.join(cursor, observableConfigName);
+    const configPath = path.join(cursor, userConfigName);
     let content: string | null = null;
     try {
       content = await fs.readFile(configPath, "utf8");
@@ -71,15 +71,9 @@ async function loadObservableConfig(): Promise<{configPath: string; config: Obse
     }
   }
 
-  return {config: {}, configPath: path.join(os.homedir(), observableConfigName)};
+  return {config: {}, configPath: path.join(os.homedir(), userConfigName)};
 }
 
-async function writeObservableConfig({
-  configPath,
-  config
-}: {
-  configPath: string;
-  config: ObservableConfig;
-}): Promise<void> {
+async function writeUserConfig({configPath, config}: {configPath: string; config: UserConfig}): Promise<void> {
   await fs.writeFile(configPath, JSON.stringify(config, null, 2));
 }