@fern-api/fern-api-dev 4.70.2 → 4.71.0

package/cli.cjs

@@ -458829,14 +458829,14 @@ function _wrapSingleQueryHandle(query, sqlInstance, options2) {
         }
         const queryWithCallbacks = this;
         queryWithCallbacks.resolve = new Proxy(queryWithCallbacks.resolve, {
-          apply: (resolveTarget, resolveThisArg, resolveArgs) => {
+          apply: (resolveTarget2, resolveThisArg, resolveArgs) => {
             try {
               _setOperationName(span, sanitizedSqlQuery, resolveArgs?.[0]?.command);
               span.end();
             } catch (e6) {
               DEBUG_BUILD && debug.error("Error ending span in resolve callback:", e6);
             }
-            return Reflect.apply(resolveTarget, resolveThisArg, resolveArgs);
+            return Reflect.apply(resolveTarget2, resolveThisArg, resolveArgs);
           }
         });
         queryWithCallbacks.reject = new Proxy(queryWithCallbacks.reject, {
@@ -469534,14 +469534,14 @@ var PostgresJsInstrumentation = class extends InstrumentationBase {
           }
           const originalResolve = this.resolve;
           this.resolve = new Proxy(originalResolve, {
-            apply: (resolveTarget, resolveThisArg, resolveArgs) => {
+            apply: (resolveTarget2, resolveThisArg, resolveArgs) => {
               try {
                 self2._setOperationName(span, sanitizedSqlQuery, resolveArgs?.[0]?.command);
                 span.end();
               } catch (e6) {
                 DEBUG_BUILD4 && debug.error("Error ending span in resolve callback:", e6);
               }
-              return Reflect.apply(resolveTarget, resolveThisArg, resolveArgs);
+              return Reflect.apply(resolveTarget2, resolveThisArg, resolveArgs);
             }
           });
           const originalReject = this.reject;
@@ -621039,7 +621039,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.70.2",
+          version: "4.71.0",
           usingAccessToken: true
         }
       });
@@ -621093,7 +621093,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.70.2",
+        version: "4.71.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -836457,6 +836457,46 @@ async function getPorts(options2) {
   throw new Error("No available ports found");
 }
 
+// ../docs-preview/lib/previewUrlUtils.js
+var PREVIEW_URL_PATTERN = /^[a-z0-9-]+-preview-[a-z0-9-]+\.docs\.buildwithfern\.com$/i;
+var DOMAIN_SUFFIX = "docs.buildwithfern.com";
+var SUBDOMAIN_LIMIT = 62;
+function isPreviewUrl(url3) {
+  let hostname4 = url3.toLowerCase().trim();
+  if (hostname4.startsWith("https://")) {
+    hostname4 = hostname4.slice(8);
+  } else if (hostname4.startsWith("http://")) {
+    hostname4 = hostname4.slice(7);
+  }
+  const slashIndex = hostname4.indexOf("/");
+  if (slashIndex !== -1) {
+    hostname4 = hostname4.slice(0, slashIndex);
+  }
+  return PREVIEW_URL_PATTERN.test(hostname4);
+}
+function sanitizePreviewId(id2) {
+  const sanitized = id2.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
+  if (sanitized.length === 0) {
+    return "default";
+  }
+  return sanitized;
+}
+function buildPreviewDomain({ orgId, previewId }) {
+  const sanitizedId = sanitizePreviewId(previewId);
+  const fullDomain = `${orgId}-preview-${sanitizedId}.${DOMAIN_SUFFIX}`;
+  if (fullDomain.length <= SUBDOMAIN_LIMIT) {
+    return fullDomain;
+  }
+  const prefix2 = `${orgId}-preview-`;
+  const availableSpace = SUBDOMAIN_LIMIT - prefix2.length;
+  const minIdLength = 8;
+  if (availableSpace < minIdLength) {
+    throw new Error(`Organization name "${orgId}" is too long to generate a valid preview URL`);
+  }
+  const truncatedId = sanitizedId.slice(0, availableSpace).replace(/-+$/, "");
+  return `${prefix2}${truncatedId}.${DOMAIN_SUFFIX}`;
+}
+
 // ../docs-preview/lib/runAppPreviewServer.js
 init_lib4();
 init_js();
@@ -838145,7 +838185,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "4.70.2";
+  const version7 = "4.71.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -848392,7 +848432,7 @@ async function asyncPool2(limit, items, fn5) {
 var MEASURE_IMAGE_BATCH_SIZE = 10;
 var UPLOAD_FILE_BATCH_SIZE = 10;
 var HASH_CONCURRENCY = parseInt(process.env.FERN_DOCS_ASSET_HASH_CONCURRENCY ?? "32", 10);
-function sanitizePreviewId(id2) {
+function sanitizePreviewId2(id2) {
   const sanitized = id2.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
   if (sanitized.length === 0) {
     return "default";
@@ -848533,7 +848573,7 @@ async function publishDocs({ token, organization, docsWorkspace, domain: domain3
             filepaths,
             images,
             basePath,
-            previewId: previewId != null ? sanitizePreviewId(previewId) : void 0
+            previewId: previewId != null ? sanitizePreviewId2(previewId) : void 0
           });
           if (startDocsRegisterResponse.ok) {
             urlToOutput = startDocsRegisterResponse.body.previewUrl;
@@ -849392,7 +849432,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.70.2"
+        cliVersion: "4.71.0"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -850183,59 +850223,85 @@ function addPublishCommand(cli) {
 }
 
 // ../cli-v2/lib/commands/docs/preview/delete/command.js
-var PREVIEW_URL_PATTERN = /^[a-z0-9-]+-preview-[a-z0-9-]+\.docs\.buildwithfern\.com$/i;
 var DeleteCommand = class {
   async handle(context3, args) {
-    if (!this.isPreviewUrl(args.url)) {
+    const resolvedUrl = await this.resolveUrl(context3, args);
+    if (!isPreviewUrl(resolvedUrl)) {
       throw new CliError({
-        message: `Invalid preview URL: ${args.url}
+        message: `Invalid preview URL: ${resolvedUrl}
   Preview URLs follow the pattern: {org}-preview-{hash}.docs.buildwithfern.com`,
         code: CliError.Code.ConfigError
       });
     }
     const token = await context3.getTokenOrPrompt();
     const fdr = createFdrService({ token: token.value });
-    context3.stderr.debug(`Deleting preview site: ${args.url}`);
+    context3.stderr.debug(`Deleting preview site: ${resolvedUrl}`);
     const deleteResponse = await fdr.docs.v2.write.deleteDocsSite({
-      url: args.url
+      url: resolvedUrl
     });
     if (!deleteResponse.ok) {
       switch (deleteResponse.error.error) {
         case "UnauthorizedError":
           throw CliError.unauthorized("You do not have permissions to delete this preview site. Reach out to support@buildwithfern.com");
         case "DocsNotFoundError":
-          throw CliError.notFound(`Preview site not found: ${args.url}`);
+          throw CliError.notFound(`Preview site not found: ${resolvedUrl}`);
         default:
           throw new CliError({
-            message: `Failed to delete preview site: ${args.url}`,
+            message: `Failed to delete preview site: ${resolvedUrl}`,
             code: CliError.Code.InternalError
           });
       }
     }
-    context3.stderr.info(source_default.green(`Successfully deleted preview site: ${args.url}`));
+    context3.stderr.info(source_default.green(`Successfully deleted preview site: ${resolvedUrl}`));
   }
-  isPreviewUrl(url3) {
-    let hostname4 = url3.toLowerCase().trim();
-    if (hostname4.startsWith("https://")) {
-      hostname4 = hostname4.slice(8);
-    } else if (hostname4.startsWith("http://")) {
-      hostname4 = hostname4.slice(7);
+  resolveTarget(args) {
+    if (args.url != null) {
+      return { type: "url", value: args.url };
+    }
+    if (args.id != null) {
+      return { type: "id", value: args.id };
+    }
+    if (args.target == null) {
+      throw new CliError({ message: "Must provide a preview URL or --id.", code: CliError.Code.ConfigError });
     }
-    const slashIndex = hostname4.indexOf("/");
-    if (slashIndex !== -1) {
-      hostname4 = hostname4.slice(0, slashIndex);
+    if (isPreviewUrl(args.target)) {
+      return { type: "url", value: args.target };
     }
-    return PREVIEW_URL_PATTERN.test(hostname4);
+    return { type: "id", value: args.target };
+  }
+  async resolveUrl(context3, args) {
+    const resolved = this.resolveTarget(args);
+    if (resolved.type === "id") {
+      const workspace = await context3.loadWorkspaceOrThrow();
+      const url3 = buildPreviewDomain({ orgId: workspace.org, previewId: resolved.value });
+      context3.stderr.debug(`Resolved preview ID "${resolved.value}" to URL: ${url3}`);
+      return url3;
+    }
+    return resolved.value;
   }
 };
 function addDeleteCommand(cli) {
   const cmd = new DeleteCommand();
-  command2(cli, "delete <url>", "Delete a preview deployment", async (context3, args) => {
+  command2(cli, "delete [target]", "Delete a preview deployment", async (context3, args) => {
     await cmd.handle(context3, args);
-  }, (yargs) => yargs.positional("url", {
+  }, (yargs) => yargs.positional("target", {
+    type: "string",
+    description: "A preview URL or ID (auto-detected)"
+  }).option("url", {
     type: "string",
-    description: "The FQDN of the preview deployment to delete (e.g. acme-preview-abc123.docs.buildwithfern.com)",
-    demandOption: true
+    description: "The FQDN of the preview deployment to delete (e.g. acme-preview-abc123.docs.buildwithfern.com)"
+  }).option("id", {
+    type: "string",
+    description: "The preview ID to delete. Resolves the URL from the organization in fern.config.json."
+  }).check((argv) => {
+    const sources = [argv.target, argv.url, argv.id].filter(Boolean);
+    if (sources.length === 0) {
+      throw new Error("Must provide a preview URL or --id.");
+    }
+    if (sources.length > 1) {
+      throw new Error("Provide only one of: [target], --url, or --id.");
+    }
+    return true;
   }));
 }
 
@@ -923696,7 +923762,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.70.2";
+    return "4.71.0";
   }
   getCliName() {
     if (false) {
@@ -930683,27 +930749,57 @@ async function downloadIr(client3, jobId, libraryName, language, context3) {
 }
 
 // src/commands/docs-preview/deleteDocsPreview.ts
-var PREVIEW_URL_PATTERN2 = /^[a-z0-9-]+-preview-[a-z0-9-]+\.docs\.buildwithfern\.com$/i;
-function isPreviewUrl(url3) {
-  let hostname4 = url3.toLowerCase().trim();
-  if (hostname4.startsWith("https://")) {
-    hostname4 = hostname4.slice(8);
-  } else if (hostname4.startsWith("http://")) {
-    hostname4 = hostname4.slice(7);
+async function resolvePreviewUrlFromId({
+  cliContext,
+  previewId
+}) {
+  const fernDirectory = await getFernDirectory();
+  if (fernDirectory == null) {
+    return cliContext.failAndThrow(
+      "No fern directory found. The --id flag requires a Fern project to resolve the organization.\nRun this command from within a Fern project directory, or use the URL argument instead."
+    );
   }
-  const slashIndex = hostname4.indexOf("/");
-  if (slashIndex !== -1) {
-    hostname4 = hostname4.slice(0, slashIndex);
+  const projectConfig = await cliContext.runTask(
+    (context3) => loadProjectConfig({ directory: fernDirectory, context: context3 })
+  );
+  return buildPreviewDomain({ orgId: projectConfig.organization, previewId });
+}
+function resolveTarget({
+  target,
+  url: url3,
+  id: id2
+}) {
+  if (url3 != null) {
+    return { type: "url", value: url3 };
+  }
+  if (id2 != null) {
+    return { type: "id", value: id2 };
   }
-  return PREVIEW_URL_PATTERN2.test(hostname4);
+  if (target == null) {
+    throw new Error("Must provide a preview URL or --id.");
+  }
+  if (isPreviewUrl(target)) {
+    return { type: "url", value: target };
+  }
+  return { type: "id", value: target };
 }
 async function deleteDocsPreview({
   cliContext,
-  previewUrl
+  target,
+  previewUrl,
+  previewId
 }) {
-  if (!isPreviewUrl(previewUrl)) {
+  const resolved = resolveTarget({ target, url: previewUrl, id: previewId });
+  let resolvedUrl;
+  if (resolved.type === "id") {
+    resolvedUrl = await resolvePreviewUrlFromId({ cliContext, previewId: resolved.value });
+    cliContext.logger.debug(`Resolved preview ID "${resolved.value}" to URL: ${resolvedUrl}`);
+  } else {
+    resolvedUrl = resolved.value;
+  }
+  if (!isPreviewUrl(resolvedUrl)) {
     cliContext.failAndThrow(
-      `Invalid preview URL: ${previewUrl}
+      `Invalid preview URL: ${resolvedUrl}
 Only preview sites can be deleted with this command.
 Preview URLs follow the pattern: {org}-preview-{hash}.docs.buildwithfern.com
 Example: acme-preview-abc123.docs.buildwithfern.com`,
@@ -930722,13 +930818,13 @@ Example: acme-preview-abc123.docs.buildwithfern.com`,
     return;
   }
   await cliContext.runTask(async (context3) => {
-    context3.logger.info(`Deleting preview site: ${previewUrl}`);
+    context3.logger.info(`Deleting preview site: ${resolvedUrl}`);
     const fdr = createFdrService({ token: token.value });
     const deleteResponse = await fdr.docs.v2.write.deleteDocsSite({
-      url: previewUrl
+      url: resolvedUrl
     });
     if (deleteResponse.ok) {
-      context3.logger.info(source_default.green(`Successfully deleted preview site: ${previewUrl}`));
+      context3.logger.info(source_default.green(`Successfully deleted preview site: ${resolvedUrl}`));
     } else {
       switch (deleteResponse.error.error) {
         case "UnauthorizedError":
@@ -930738,11 +930834,11 @@ Example: acme-preview-abc123.docs.buildwithfern.com`,
             { code: CliError.Code.NetworkError }
           );
         case "DocsNotFoundError":
-          return context3.failAndThrow(`Preview site not found: ${previewUrl}`, void 0, {
+          return context3.failAndThrow(`Preview site not found: ${resolvedUrl}`, void 0, {
             code: CliError.Code.ConfigError
           });
         default:
-          return context3.failAndThrow(`Failed to delete preview site: ${previewUrl}`, deleteResponse.error, {
+          return context3.failAndThrow(`Failed to delete preview site: ${resolvedUrl}`, deleteResponse.error, {
             code: CliError.Code.NetworkError
           });
       }
@@ -933579,23 +933675,23 @@ function isCI2() {
 }
 
 // src/commands/generate/generateDocsWorkspace.ts
-var DOMAIN_SUFFIX = "docs.buildwithfern.com";
-var SUBDOMAIN_LIMIT = 62;
-function sanitizePreviewId2(id2) {
+var DOMAIN_SUFFIX2 = "docs.buildwithfern.com";
+var SUBDOMAIN_LIMIT2 = 62;
+function sanitizePreviewId3(id2) {
   const sanitized = id2.toLowerCase().replace(/[^a-z0-9-]/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
   if (sanitized.length === 0) {
     return "default";
   }
   return sanitized;
 }
-function buildPreviewDomain({ orgId, previewId }) {
-  const sanitizedId = sanitizePreviewId2(previewId);
-  const fullDomain = `${orgId}-preview-${sanitizedId}.${DOMAIN_SUFFIX}`;
-  if (fullDomain.length <= SUBDOMAIN_LIMIT) {
+function buildPreviewDomain2({ orgId, previewId }) {
+  const sanitizedId = sanitizePreviewId3(previewId);
+  const fullDomain = `${orgId}-preview-${sanitizedId}.${DOMAIN_SUFFIX2}`;
+  if (fullDomain.length <= SUBDOMAIN_LIMIT2) {
     return fullDomain;
   }
   const prefix2 = `${orgId}-preview-`;
-  const availableSpace = SUBDOMAIN_LIMIT - prefix2.length;
+  const availableSpace = SUBDOMAIN_LIMIT2 - prefix2.length;
   const minIdLength = 8;
   if (availableSpace < minIdLength) {
     throw new CliError({
@@ -933604,7 +933700,7 @@ function buildPreviewDomain({ orgId, previewId }) {
     });
   }
   const truncatedId = sanitizedId.slice(0, availableSpace).replace(/-+$/, "");
-  return `${prefix2}${truncatedId}.${DOMAIN_SUFFIX}`;
+  return `${prefix2}${truncatedId}.${DOMAIN_SUFFIX2}`;
 }
 async function generateDocsWorkspace({
   project,
@@ -933668,7 +933764,7 @@ ${source_default.yellow("?")} Are you sure you want to continue?`,
     }
   }
   if (previewId != null && !isCI2() && !force) {
-    const expectedDomain = buildPreviewDomain({ orgId: project.config.organization, previewId });
+    const expectedDomain = buildPreviewDomain2({ orgId: project.config.organization, previewId });
     const fdr = createFdrService({ token: token.value });
     const metadataResponse = await fdr.docs.v2.read.getDocsUrlMetadata({ url: FdrAPI_exports.Url(expectedDomain) });
     if (metadataResponse.ok) {
@@ -943656,12 +943752,26 @@ function addDocsPreviewListCommand(cli, cliContext) {
 }
 function addDocsPreviewDeleteCommand(cli, cliContext) {
   cli.command(
-    "delete <url>",
+    "delete [target]",
     "Delete a preview deployment",
-    (yargs) => yargs.positional("url", {
+    (yargs) => yargs.positional("target", {
       type: "string",
-      description: "The FQDN of the preview deployment to delete (e.g. acme-preview-abc123.docs.buildwithfern.com)",
-      demandOption: true
+      description: "A preview URL or ID (auto-detected)"
+    }).option("url", {
+      type: "string",
+      description: "The FQDN of the preview deployment to delete (e.g. acme-preview-abc123.docs.buildwithfern.com)"
+    }).option("id", {
+      type: "string",
+      description: "The preview ID to delete. Resolves the URL from the organization in fern.config.json."
+    }).check((argv) => {
+      const sources = [argv.target, argv.url, argv.id].filter(Boolean);
+      if (sources.length === 0) {
+        throw new Error("Must provide a preview URL or --id.");
+      }
+      if (sources.length > 1) {
+        throw new Error("Provide only one of: [target], --url, or --id.");
+      }
+      return true;
     }),
     async (argv) => {
       cliContext.instrumentPostHogEvent({
@@ -943669,7 +943779,9 @@ function addDocsPreviewDeleteCommand(cli, cliContext) {
       });
       await deleteDocsPreview({
         cliContext,
-        previewUrl: argv.url
+        target: argv.target,
+        previewUrl: argv.url,
+        previewId: argv.id
       });
     }
   );

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.70.2",
+  "version": "4.71.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",