fern-api 0.39.11 → 0.39.13

package/bundle.cjs

@@ -81211,9 +81211,9 @@ var require_symlink = __commonJS({
         if (areIdentical(srcStat, dstStat))
           return;
       }
-      const relative3 = await symlinkPaths(srcpath, dstpath);
-      srcpath = relative3.toDst;
-      const toType = await symlinkType(relative3.toCwd, type2);
+      const relative4 = await symlinkPaths(srcpath, dstpath);
+      srcpath = relative4.toDst;
+      const toType = await symlinkType(relative4.toCwd, type2);
       const dir = path45.dirname(dstpath);
       if (!await pathExists2(dir)) {
         await mkdirs(dir);
@@ -81232,9 +81232,9 @@ var require_symlink = __commonJS({
         if (areIdentical(srcStat, dstStat))
           return;
       }
-      const relative3 = symlinkPathsSync(srcpath, dstpath);
-      srcpath = relative3.toDst;
-      type2 = symlinkTypeSync(relative3.toCwd, type2);
+      const relative4 = symlinkPathsSync(srcpath, dstpath);
+      srcpath = relative4.toDst;
+      type2 = symlinkTypeSync(relative4.toCwd, type2);
       const dir = path45.dirname(dstpath);
       const exists = fs8.existsSync(dir);
       if (exists)
@@ -86020,8 +86020,8 @@ var require_follow_redirects = __commonJS({
       }
       return parsed;
     }
-    function resolveUrl(relative3, base2) {
-      return useNativeURL ? new URL2(relative3, base2) : parseUrl(url.resolve(base2, relative3));
+    function resolveUrl(relative4, base2) {
+      return useNativeURL ? new URL2(relative4, base2) : parseUrl(url.resolve(base2, relative4));
     }
     function validateUrl(input) {
       if (/^\[/.test(input.hostname) && !/^\[[:0-9a-f]+\]$/i.test(input.hostname)) {
@@ -368671,51 +368671,51 @@ var require_uri_all = __commonJS({
         }
         return uriTokens.join("");
       }
-      function resolveComponents(base3, relative3) {
+      function resolveComponents(base3, relative4) {
         var options2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
         var skipNormalization = arguments[3];
         var target = {};
         if (!skipNormalization) {
           base3 = parse10(serialize5(base3, options2), options2);
-          relative3 = parse10(serialize5(relative3, options2), options2);
+          relative4 = parse10(serialize5(relative4, options2), options2);
         }
         options2 = options2 || {};
-        if (!options2.tolerant && relative3.scheme) {
-          target.scheme = relative3.scheme;
-          target.userinfo = relative3.userinfo;
-          target.host = relative3.host;
-          target.port = relative3.port;
-          target.path = removeDotSegments(relative3.path || "");
-          target.query = relative3.query;
+        if (!options2.tolerant && relative4.scheme) {
+          target.scheme = relative4.scheme;
+          target.userinfo = relative4.userinfo;
+          target.host = relative4.host;
+          target.port = relative4.port;
+          target.path = removeDotSegments(relative4.path || "");
+          target.query = relative4.query;
         } else {
-          if (relative3.userinfo !== void 0 || relative3.host !== void 0 || relative3.port !== void 0) {
-            target.userinfo = relative3.userinfo;
-            target.host = relative3.host;
-            target.port = relative3.port;
-            target.path = removeDotSegments(relative3.path || "");
-            target.query = relative3.query;
+          if (relative4.userinfo !== void 0 || relative4.host !== void 0 || relative4.port !== void 0) {
+            target.userinfo = relative4.userinfo;
+            target.host = relative4.host;
+            target.port = relative4.port;
+            target.path = removeDotSegments(relative4.path || "");
+            target.query = relative4.query;
           } else {
-            if (!relative3.path) {
+            if (!relative4.path) {
               target.path = base3.path;
-              if (relative3.query !== void 0) {
-                target.query = relative3.query;
+              if (relative4.query !== void 0) {
+                target.query = relative4.query;
               } else {
                 target.query = base3.query;
               }
             } else {
-              if (relative3.path.charAt(0) === "/") {
-                target.path = removeDotSegments(relative3.path);
+              if (relative4.path.charAt(0) === "/") {
+                target.path = removeDotSegments(relative4.path);
               } else {
                 if ((base3.userinfo !== void 0 || base3.host !== void 0 || base3.port !== void 0) && !base3.path) {
-                  target.path = "/" + relative3.path;
+                  target.path = "/" + relative4.path;
                 } else if (!base3.path) {
-                  target.path = relative3.path;
+                  target.path = relative4.path;
                 } else {
-                  target.path = base3.path.slice(0, base3.path.lastIndexOf("/") + 1) + relative3.path;
+                  target.path = base3.path.slice(0, base3.path.lastIndexOf("/") + 1) + relative4.path;
                 }
                 target.path = removeDotSegments(target.path);
               }
-              target.query = relative3.query;
+              target.query = relative4.query;
             }
             target.userinfo = base3.userinfo;
             target.host = base3.host;
@@ -368723,7 +368723,7 @@ var require_uri_all = __commonJS({
           }
           target.scheme = base3.scheme;
         }
-        target.fragment = relative3.fragment;
+        target.fragment = relative4.fragment;
         return target;
       }
       function resolve6(baseURI, relativeURI, options2) {
@@ -430518,7 +430518,7 @@ var require_lib20 = __commonJS({
 // ../../../node_modules/.pnpm/depd@2.0.0/node_modules/depd/index.js
 var require_depd = __commonJS({
   "../../../node_modules/.pnpm/depd@2.0.0/node_modules/depd/index.js"(exports2, module2) {
-    var relative3 = require("path").relative;
+    var relative4 = require("path").relative;
     module2.exports = depd;
     var basePath = process.cwd();
     function containsNamespace(str3, namespace) {
@@ -430710,7 +430710,7 @@ var require_depd = __commonJS({
       return formatted;
     }
     function formatLocation(callSite) {
-      return relative3(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
+      return relative4(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
     }
     function getStack() {
       var limit = Error.stackTraceLimit;
@@ -1192625,7 +1192625,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.39.11",
+          version: "0.39.13",
           usingAccessToken: true
         }
       });
@@ -1192687,7 +1192687,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.39.11",
+        version: "0.39.13",
         ...event,
         ...event.properties
       }
@@ -1222814,10 +1222814,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.39.11" == null) {
+    if ("0.39.13" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.39.11";
+    return "0.39.13";
   }
   getCliName() {
     if ("fern" == null) {
@@ -1231179,16 +1231179,16 @@ function collect(events, tokenTypes) {
   }
   return result;
 }
-function relativeToPoint(stops, relative3) {
+function relativeToPoint(stops, relative4) {
   let index2 = 0;
-  while (index2 < stops.length && stops[index2][0] <= relative3) {
+  while (index2 < stops.length && stops[index2][0] <= relative4) {
     index2 += 1;
   }
   if (index2 === 0) {
     return void 0;
   }
   const [stopRelative, stopAbsolute] = stops[index2 - 1];
-  const rest = relative3 - stopRelative;
+  const rest = relative4 - stopRelative;
   return {
     line: stopAbsolute.line,
     column: stopAbsolute.column + rest,
@@ -1239704,7 +1239704,7 @@ function convertExampleEndpointCall2({ service, endpoint, example, typeResolver,
     id: example.name ?? hashJSON(example),
     name: example.name != null ? file.casingsGenerator.generateName(example.name) : void 0,
     docs: example.docs,
-    url: buildUrl({ service, endpoint, example, pathParams: convertedPathParameters }),
+    url: buildUrl({ file, service, endpoint, example, pathParams: convertedPathParameters }),
     ...convertedPathParameters,
     ...convertHeaders({ service, endpoint, example, typeResolver, exampleResolver, file, workspace }),
     queryParameters: example["query-parameters"] != null ? Object.entries(example["query-parameters"]).map(([wireKey, value]) => {
@@ -1240024,8 +1240024,8 @@ function convertExampleResponseBody({ endpoint, example, typeResolver, exampleRe
     workspace
   });
 }
-function buildUrl({ service, endpoint, example, pathParams }) {
-  let url = service["base-path"] + endpoint.path;
+function buildUrl({ file, service, endpoint, example, pathParams }) {
+  let url = urlJoin10(file.rootApiFile["base-path"] ?? "", service["base-path"], endpoint.path);
   if (example["path-parameters"] != null) {
     for (const parameter of [
       ...pathParams.endpointPathParameters,
@@ -1240035,6 +1240035,10 @@ function buildUrl({ service, endpoint, example, pathParams }) {
       url = url.replaceAll(`{${parameter.name.originalName}}`, `${parameter.value.jsonExample}`);
     }
   }
+  url = url.replaceAll("//", "/");
+  if (!url.startsWith("/")) {
+    url = `/${url}`;
+  }
   return url;
 }
 
@@ -1240311,7 +1240315,7 @@ async function convertTransport({ file, serviceDeclaration, sourceResolver }) {
     source: serviceDeclaration.source,
     file
   });
-  if (resolvedSource.type !== "protobuf") {
+  if (resolvedSource == null || resolvedSource.type !== "protobuf") {
     return Transport.http();
   }
   const protobufService = convertProtobufService({
@@ -1241870,7 +1241874,7 @@ async function convertTypeDeclarationSource({ file, typeDeclaration, typeName, s
     source: typeDeclaration.source,
     file
   });
-  if (resolvedSource.type !== "protobuf") {
+  if (resolvedSource == null || resolvedSource.type !== "protobuf") {
     return void 0;
   }
   return Source.proto(convertSourceToProtobufType({
@@ -1244146,17 +1244150,21 @@ var ProtobufParser = class {
 
 // ../generation/ir-generator/lib/resolvers/SourceResolver.js
 var SourceResolverImpl = class {
+  context;
   workspace;
   sourceCache;
-  constructor(workspace) {
+  constructor(context, workspace) {
+    this.context = context;
     this.workspace = workspace;
     this.sourceCache = /* @__PURE__ */ new Map();
   }
   async resolveSourceOrThrow({ source, file }) {
     const resolvedType = await this.resolveSource({ source, file });
     if (resolvedType == null) {
-      const filename = isRawProtobufSourceSchema(source) ? source.proto : source.openapi;
-      throw new Error(`Cannot resolve source ${filename} from file ${file.relativeFilepath}`);
+      if (isRawProtobufSourceSchema(source)) {
+        throw new Error(`Cannot resolve source ${source.proto} from file ${file.relativeFilepath}`);
+      }
+      this.context.logger.warn(`Cannot resolve source ${source.openapi} from file ${file.relativeFilepath}`);
     }
     return resolvedType;
   }
@@ -1244448,7 +1244456,7 @@ function getAudienceForEnvironment(environmentId, rawEnvironments) {
 }
 
 // ../generation/ir-generator/lib/generateIntermediateRepresentation.js
-async function generateIntermediateRepresentation({ fdrApiDefinitionId, workspace, generationLanguage, keywords: keywords2, smartCasing, disableExamples, audiences, readme, packageName, version: version3 }) {
+async function generateIntermediateRepresentation({ fdrApiDefinitionId, workspace, generationLanguage, keywords: keywords2, smartCasing, disableExamples, audiences, readme, packageName, version: version3, context }) {
   const casingsGenerator = constructCasingsGenerator({ generationLanguage, keywords: keywords2, smartCasing });
   const irGraph = new IrGraph(audiences);
   const rootApiFileContext = constructRootApiFileContext({
@@ -1244468,7 +1244476,7 @@ async function generateIntermediateRepresentation({ fdrApiDefinitionId, workspac
   const errorResolver = new ErrorResolverImpl(workspace);
   const exampleResolver = new ExampleResolverImpl(typeResolver);
   const variableResolver = new VariableResolverImpl();
-  const sourceResolver = new SourceResolverImpl(workspace);
+  const sourceResolver = new SourceResolverImpl(context, workspace);
   const intermediateRepresentation = {
     fdrApiDefinitionId,
     apiVersion: await convertApiVersionScheme({
@@ -1246927,7 +1246935,8 @@ async function registerApi({ organization, workspace, context, token, audiences,
     disableExamples: false,
     readme: void 0,
     version: void 0,
-    packageName: void 0
+    packageName: void 0,
+    context
   });
   const fdrService = createFdrService({
     token: token.value
@@ -1247294,7 +1247303,8 @@ var DocsDefinitionResolver = class {
           disableExamples: false,
           readme: void 0,
           version: void 0,
-          packageName: void 0
+          packageName: void 0,
+          context: this.taskContext
         });
         const apiDefinitionId = await this.registerApi({ ir, snippetsConfig });
         const api = convertIrToApiDefinition(ir, apiDefinitionId);
@@ -1294878,7 +1294888,8 @@ async function generateIrForFernWorkspace({
     audiences,
     readme,
     version: void 0,
-    packageName: void 0
+    packageName: void 0,
+    context
   });
 }
 
@@ -1305861,7 +1305872,8 @@ async function getIntermediateRepresentation2({ workspace, audiences, generatorI
     disableExamples: generatorInvocation.disableExamples,
     readme: generatorInvocation.readme,
     version: version3,
-    packageName
+    packageName,
+    context
   });
   if (sourceConfig != null) {
     intermediateRepresentation.sourceConfig = sourceConfig;
@@ -1306285,6 +1306297,7 @@ var import_fiddle_sdk4 = __toESM(require_fiddle_sdk(), 1);
 var import_axios6 = __toESM(require_axios4(), 1);
 var import_form_data2 = __toESM(require_form_data(), 1);
 var import_promises48 = require("fs/promises");
+var import_path39 = require("path");
 var import_tar2 = __toESM(require_tar(), 1);
 var import_tmp_promise10 = __toESM(require_tmp_promise(), 1);
 async function createAndStartJob({ projectConfig, workspace, organization, intermediateRepresentation, generatorInvocation, version: version3, context, shouldLogS3Url, token, whitelabel, irVersionOverride, absolutePathToPreview }) {
@@ -1306333,6 +1306346,18 @@ async function createJob({ projectConfig, workspace, organization, generatorInvo
       });
       const absolutePathToFernConfigJson = join(absolutePathToTmpFernDirectory, RelativeFilePath.of(PROJECT_CONFIG_FILENAME));
       await (0, import_promises48.writeFile)(absolutePathToFernConfigJson, JSON.stringify(projectConfig.rawConfig, void 0, 2));
+      try {
+        const sources = workspace.getSources();
+        for (const source of sources) {
+          const sourceContents = await (0, import_promises48.readFile)(source.absoluteFilePath);
+          const relativeLocation = (0, import_path39.relative)(workspace.absoluteFilepath, source.absoluteFilePath);
+          const absolutePathToSourceFile = join(absolutePathToTmpFernDirectory, RelativeFilePath.of(relativeLocation));
+          await (0, import_promises48.mkdir)(dirname(absolutePathToSourceFile), { recursive: true });
+          await (0, import_promises48.writeFile)(absolutePathToSourceFile, sourceContents);
+        }
+      } catch (error) {
+        context.logger.debug(`Failed to write source files to disk, continuing: ${error}`);
+      }
       const tarPath = join(absolutePathToTmpDir, RelativeFilePath.of("definition.tgz"));
       await import_tar2.default.create({ file: tarPath, cwd: absolutePathToTmpFernDirectory }, ["."]);
       context.logger.debug("Getting upload URL for Fern definition.");
@@ -1306537,7 +1306562,7 @@ var import_axios7 = __toESM(require_axios4(), 1);
 var import_decompress3 = __toESM(require_decompress(), 1);
 var import_fs9 = require("fs");
 var import_promises49 = require("fs/promises");
-var import_path39 = __toESM(require("path"), 1);
+var import_path40 = __toESM(require("path"), 1);
 var import_promises50 = require("stream/promises");
 var import_tmp_promise11 = __toESM(require_tmp_promise(), 1);
 var _isFinished, _createdSnippets, _snippetsS3PreSignedReadUrl;
@@ -1306622,7 +1306647,7 @@ var RemoteTaskHandler = class {
     } : void 0;
   }
   getAbsolutePathToLocalOutput() {
-    return this.absolutePathToPreview != null ? join(this.absolutePathToPreview, RelativeFilePath.of(import_path39.default.basename(this.generatorInvocation.name))) : this.generatorInvocation.absolutePathToLocalOutput;
+    return this.absolutePathToPreview != null ? join(this.absolutePathToPreview, RelativeFilePath.of(import_path40.default.basename(this.generatorInvocation.name))) : this.generatorInvocation.absolutePathToLocalOutput;
   }
   get isFinished() {
     return __privateGet(this, _isFinished);
@@ -1306653,7 +1306678,7 @@ async function downloadZipForTask({ s3PreSignedReadUrl, absolutePathToLocalOutpu
     responseType: "stream"
   });
   const tmpDir = await import_tmp_promise11.default.dir({ prefix: "fern", unsafeCleanup: true });
-  const outputZipPath = import_path39.default.join(tmpDir.path, "output.zip");
+  const outputZipPath = import_path40.default.join(tmpDir.path, "output.zip");
   await (0, import_promises50.pipeline)(request.data, (0, import_fs9.createWriteStream)(outputZipPath));
   if (await doesPathExist(absolutePathToLocalOutput)) {
     await (0, import_promises49.rm)(absolutePathToLocalOutput, { recursive: true });
@@ -1306782,7 +1306807,8 @@ async function runRemoteGenerationForGenerator({ projectConfig, organization, wo
     audiences,
     readme,
     packageName,
-    version: version3 ?? await computeSemanticVersion({ fdr, packageName, generatorInvocation })
+    version: version3 ?? await computeSemanticVersion({ fdr, packageName, generatorInvocation }),
+    context: interactiveTaskContext
   });
   const sources = workspace.getSources();
   const apiDefinition = convertIrToFdrApi({ ir, snippetsConfig: {} });
@@ -1307721,7 +1307747,8 @@ async function mockServer({
       disableExamples: false,
       readme: void 0,
       version: void 0,
-      packageName: void 0
+      packageName: void 0,
+      context
     });
     const mockServer2 = new MockServer({
       context,
@@ -1307737,7 +1307764,7 @@ async function mockServer({
 var import_fiddle_sdk6 = __toESM(require_fiddle_sdk(), 1);
 var import_axios9 = __toESM(require_axios4(), 1);
 var import_promises53 = require("fs/promises");
-var import_path40 = __toESM(require("path"), 1);
+var import_path41 = __toESM(require("path"), 1);
 var import_tar3 = __toESM(require_tar(), 1);
 var import_tmp_promise13 = __toESM(require_tmp_promise(), 1);
 async function registerWorkspacesV1({
@@ -1307782,7 +1307809,7 @@ async function registerWorkspacesV1({
           return;
         }
         const tmpDir = await import_tmp_promise13.default.dir();
-        const tarPath = import_path40.default.join(tmpDir.path, "definition.tgz");
+        const tarPath = import_path41.default.join(tmpDir.path, "definition.tgz");
         context.logger.debug(`Compressing definition at ${tmpDir.path}`);
         await import_tar3.default.create({ file: tarPath, cwd: resolvedWorkspace.absoluteFilepath }, ["."]);
         context.logger.info("Uploading definition...");
@@ -1307852,7 +1307879,8 @@ async function testOutput({
       disableExamples: false,
       readme: void 0,
       version: void 0,
-      packageName: void 0
+      packageName: void 0,
+      context
     });
     const mockServer2 = new MockServer({
       context,
@@ -1310280,7 +1310308,7 @@ async function upgrade({
 
 // src/commands/upgrade/upgradeGenerator.ts
 var import_promises77 = require("fs/promises");
-var import_path41 = __toESM(require("path"), 1);
+var import_path42 = __toESM(require("path"), 1);
 var semver3 = __toESM(require_semver2(), 1);
 var import_yaml11 = __toESM(require_dist3(), 1);
 async function loadAndUpdateGenerators({
@@ -1310304,7 +1310332,7 @@ async function loadAndUpdateGenerators({
     return void 0;
   }
   if (!import_yaml11.default.isMap(generatorGroups)) {
-    context.failAndThrow(`Expected 'groups' to be a map in ${import_path41.default.relative(process.cwd(), filepath)}`);
+    context.failAndThrow(`Expected 'groups' to be a map in ${import_path42.default.relative(process.cwd(), filepath)}`);
     return void 0;
   }
   context.logger.debug(`Groups found: ${generatorGroups.toString()}`);
@@ -1310313,7 +1310341,7 @@ async function loadAndUpdateGenerators({
     const group = groupBlock.value;
     if (!import_yaml11.default.isMap(group)) {
       context.failAndThrow(
-        `Expected group ${groupName} to be a map in ${import_path41.default.relative(process.cwd(), filepath)}`
+        `Expected group ${groupName} to be a map in ${import_path42.default.relative(process.cwd(), filepath)}`
       );
       continue;
     }
@@ -1310323,7 +1310351,7 @@ async function loadAndUpdateGenerators({
     const generators = group.get("generators");
     if (!import_yaml11.default.isSeq(generators)) {
       context.failAndThrow(
-        `Expected group ${groupName} to have a 'generators' key in ${import_path41.default.relative(process.cwd(), filepath)}`
+        `Expected group ${groupName} to have a 'generators' key in ${import_path42.default.relative(process.cwd(), filepath)}`
       );
       continue;
     }
@@ -1310331,7 +1310359,7 @@ async function loadAndUpdateGenerators({
     for (const generator of generators.items) {
       if (!import_yaml11.default.isMap(generator)) {
         context.failAndThrow(
-          `Expected generator in group ${groupName} to be a map in ${import_path41.default.relative(process.cwd(), filepath)}`
+          `Expected generator in group ${groupName} to be a map in ${import_path42.default.relative(process.cwd(), filepath)}`
         );
       }
       if (generatorFilter != null && generator.get("name") !== generatorFilter) {
@@ -1310426,7 +1310454,7 @@ async function validateWorkspaces({
 
 // src/commands/write-definition/writeDefinitionForWorkspaces.ts
 var import_promises78 = require("fs/promises");
-var import_path42 = __toESM(require("path"), 1);
+var import_path43 = __toESM(require("path"), 1);
 async function writeDefinitionForWorkspaces({
   project,
   cliContext,
@@ -1310460,7 +1310488,7 @@ async function writeDefinitionForFernWorkspace({
       absolutePathToOutputDirectory
     });
     context.logger.info(
-      source_default.green(`Wrote imported definition at ${import_path42.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
+      source_default.green(`Wrote imported definition at ${import_path43.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
     );
   }
 }
@@ -1310479,7 +1310507,7 @@ async function writeDefinitionForOpenAPIWorkspace2({
     absolutePathToOutputDirectory
   });
   context.logger.info(
-    source_default.green(`Wrote definition to ${import_path42.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
+    source_default.green(`Wrote definition to ${import_path43.default.relative(process.cwd(), absolutePathToOutputDirectory)}`)
   );
 }
 async function writeFernDefinition2({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.39.11",
+  "version": "0.39.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",