fern-api 0.15.3 → 0.15.4

package/bundle.cjs

@@ -108192,7 +108192,7 @@ var require_third_party = __commonJS({
         }
       }
     });
-    var require_lib21 = __commonJS2({
+    var require_lib22 = __commonJS2({
       "node_modules/@babel/helper-validator-identifier/lib/index.js"(exports22) {
         "use strict";
         Object.defineProperty(exports22, "__esModule", {
@@ -109805,7 +109805,7 @@ var require_third_party = __commonJS({
         module22.exports.default = module22.exports;
       }
     });
-    var require_lib22 = __commonJS2({
+    var require_lib23 = __commonJS2({
       "node_modules/@babel/highlight/lib/index.js"(exports22) {
         "use strict";
         Object.defineProperty(exports22, "__esModule", {
@@ -109815,7 +109815,7 @@ var require_third_party = __commonJS({
         exports22.getChalk = getChalk2;
         exports22.shouldHighlight = shouldHighlight2;
         var _jsTokens2 = require_js_tokens();
-        var _helperValidatorIdentifier2 = require_lib21();
+        var _helperValidatorIdentifier2 = require_lib22();
         var _chalk2 = require_chalk();
         var sometimesKeywords2 = /* @__PURE__ */ new Set(["as", "async", "from", "get", "of", "set"]);
         function getDefs2(chalk4) {
@@ -109910,7 +109910,7 @@ var require_third_party = __commonJS({
         });
         exports22.codeFrameColumns = codeFrameColumns2;
         exports22.default = _default3;
-        var _highlight2 = require_lib22();
+        var _highlight2 = require_lib23();
         var deprecationWarningShown2 = false;
         function getDefs2(chalk4) {
           return {
@@ -294653,7 +294653,7 @@ var require_prettier = __commonJS({
         }, value));
       }
     });
-    var require_lib21 = __commonJS22({
+    var require_lib22 = __commonJS22({
       "node_modules/outdent/lib/index.js"(exports22, module22) {
         "use strict";
         Object.defineProperty(exports22, "__esModule", {
@@ -294802,7 +294802,7 @@ var require_prettier = __commonJS({
         "use strict";
         var {
           outdent
-        } = require_lib21();
+        } = require_lib22();
         var CATEGORY_CONFIG = "Config";
         var CATEGORY_EDITOR = "Editor";
         var CATEGORY_FORMAT = "Format";
@@ -298572,7 +298572,7 @@ var require_prettier = __commonJS({
         exports22.Normalizer = Normalizer;
       }
     });
-    var require_lib22 = __commonJS22({
+    var require_lib23 = __commonJS22({
       "node_modules/vnopts/lib/index.js"(exports22) {
         "use strict";
         Object.defineProperty(exports22, "__esModule", {
@@ -298589,7 +298589,7 @@ var require_prettier = __commonJS({
     var require_options_normalizer = __commonJS22({
       "src/main/options-normalizer.js"(exports22, module22) {
         "use strict";
-        var vnopts = require_lib22();
+        var vnopts = require_lib23();
         var getLast = require_get_last();
         var cliDescriptor = {
           key: (key2) => key2.length === 1 ? `-${key2}` : `--${key2}`,
@@ -695906,6 +695906,287 @@ var require_markdown_extensions2 = __commonJS({
   }
 });
 
+// pnp:/home/circleci/project/.yarn/cache/vary-npm-1.1.2-b49f70ae63-ae0123222c.zip/node_modules/vary/index.js
+var require_vary = __commonJS({
+  "pnp:/home/circleci/project/.yarn/cache/vary-npm-1.1.2-b49f70ae63-ae0123222c.zip/node_modules/vary/index.js"(exports2, module2) {
+    "use strict";
+    module2.exports = vary;
+    module2.exports.append = append;
+    var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+    function append(header, field) {
+      if (typeof header !== "string") {
+        throw new TypeError("header argument is required");
+      }
+      if (!field) {
+        throw new TypeError("field argument is required");
+      }
+      var fields = !Array.isArray(field) ? parse6(String(field)) : field;
+      for (var j2 = 0; j2 < fields.length; j2++) {
+        if (!FIELD_NAME_REGEXP.test(fields[j2])) {
+          throw new TypeError("field argument contains an invalid header name");
+        }
+      }
+      if (header === "*") {
+        return header;
+      }
+      var val = header;
+      var vals = parse6(header.toLowerCase());
+      if (fields.indexOf("*") !== -1 || vals.indexOf("*") !== -1) {
+        return "*";
+      }
+      for (var i2 = 0; i2 < fields.length; i2++) {
+        var fld = fields[i2].toLowerCase();
+        if (vals.indexOf(fld) === -1) {
+          vals.push(fld);
+          val = val ? val + ", " + fields[i2] : fields[i2];
+        }
+      }
+      return val;
+    }
+    function parse6(header) {
+      var end = 0;
+      var list3 = [];
+      var start3 = 0;
+      for (var i2 = 0, len = header.length; i2 < len; i2++) {
+        switch (header.charCodeAt(i2)) {
+          case 32:
+            if (start3 === end) {
+              start3 = end = i2 + 1;
+            }
+            break;
+          case 44:
+            list3.push(header.substring(start3, end));
+            start3 = end = i2 + 1;
+            break;
+          default:
+            end = i2 + 1;
+            break;
+        }
+      }
+      list3.push(header.substring(start3, end));
+      return list3;
+    }
+    function vary(res, field) {
+      if (!res || !res.getHeader || !res.setHeader) {
+        throw new TypeError("res argument is required");
+      }
+      var val = res.getHeader("Vary") || "";
+      var header = Array.isArray(val) ? val.join(", ") : String(val);
+      if (val = append(header, field)) {
+        res.setHeader("Vary", val);
+      }
+    }
+  }
+});
+
+// pnp:/home/circleci/project/.yarn/cache/cors-npm-2.8.5-c9935a2d12-ced838404c.zip/node_modules/cors/lib/index.js
+var require_lib20 = __commonJS({
+  "pnp:/home/circleci/project/.yarn/cache/cors-npm-2.8.5-c9935a2d12-ced838404c.zip/node_modules/cors/lib/index.js"(exports2, module2) {
+    (function() {
+      "use strict";
+      var assign2 = require_object_assign();
+      var vary = require_vary();
+      var defaults4 = {
+        origin: "*",
+        methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
+        preflightContinue: false,
+        optionsSuccessStatus: 204
+      };
+      function isString2(s2) {
+        return typeof s2 === "string" || s2 instanceof String;
+      }
+      function isOriginAllowed(origin, allowedOrigin) {
+        if (Array.isArray(allowedOrigin)) {
+          for (var i2 = 0; i2 < allowedOrigin.length; ++i2) {
+            if (isOriginAllowed(origin, allowedOrigin[i2])) {
+              return true;
+            }
+          }
+          return false;
+        } else if (isString2(allowedOrigin)) {
+          return origin === allowedOrigin;
+        } else if (allowedOrigin instanceof RegExp) {
+          return allowedOrigin.test(origin);
+        } else {
+          return !!allowedOrigin;
+        }
+      }
+      function configureOrigin(options, req) {
+        var requestOrigin = req.headers.origin, headers = [], isAllowed;
+        if (!options.origin || options.origin === "*") {
+          headers.push([{
+            key: "Access-Control-Allow-Origin",
+            value: "*"
+          }]);
+        } else if (isString2(options.origin)) {
+          headers.push([{
+            key: "Access-Control-Allow-Origin",
+            value: options.origin
+          }]);
+          headers.push([{
+            key: "Vary",
+            value: "Origin"
+          }]);
+        } else {
+          isAllowed = isOriginAllowed(requestOrigin, options.origin);
+          headers.push([{
+            key: "Access-Control-Allow-Origin",
+            value: isAllowed ? requestOrigin : false
+          }]);
+          headers.push([{
+            key: "Vary",
+            value: "Origin"
+          }]);
+        }
+        return headers;
+      }
+      function configureMethods(options) {
+        var methods = options.methods;
+        if (methods.join) {
+          methods = options.methods.join(",");
+        }
+        return {
+          key: "Access-Control-Allow-Methods",
+          value: methods
+        };
+      }
+      function configureCredentials(options) {
+        if (options.credentials === true) {
+          return {
+            key: "Access-Control-Allow-Credentials",
+            value: "true"
+          };
+        }
+        return null;
+      }
+      function configureAllowedHeaders(options, req) {
+        var allowedHeaders = options.allowedHeaders || options.headers;
+        var headers = [];
+        if (!allowedHeaders) {
+          allowedHeaders = req.headers["access-control-request-headers"];
+          headers.push([{
+            key: "Vary",
+            value: "Access-Control-Request-Headers"
+          }]);
+        } else if (allowedHeaders.join) {
+          allowedHeaders = allowedHeaders.join(",");
+        }
+        if (allowedHeaders && allowedHeaders.length) {
+          headers.push([{
+            key: "Access-Control-Allow-Headers",
+            value: allowedHeaders
+          }]);
+        }
+        return headers;
+      }
+      function configureExposedHeaders(options) {
+        var headers = options.exposedHeaders;
+        if (!headers) {
+          return null;
+        } else if (headers.join) {
+          headers = headers.join(",");
+        }
+        if (headers && headers.length) {
+          return {
+            key: "Access-Control-Expose-Headers",
+            value: headers
+          };
+        }
+        return null;
+      }
+      function configureMaxAge(options) {
+        var maxAge = (typeof options.maxAge === "number" || options.maxAge) && options.maxAge.toString();
+        if (maxAge && maxAge.length) {
+          return {
+            key: "Access-Control-Max-Age",
+            value: maxAge
+          };
+        }
+        return null;
+      }
+      function applyHeaders(headers, res) {
+        for (var i2 = 0, n2 = headers.length; i2 < n2; i2++) {
+          var header = headers[i2];
+          if (header) {
+            if (Array.isArray(header)) {
+              applyHeaders(header, res);
+            } else if (header.key === "Vary" && header.value) {
+              vary(res, header.value);
+            } else if (header.value) {
+              res.setHeader(header.key, header.value);
+            }
+          }
+        }
+      }
+      function cors2(options, req, res, next) {
+        var headers = [], method2 = req.method && req.method.toUpperCase && req.method.toUpperCase();
+        if (method2 === "OPTIONS") {
+          headers.push(configureOrigin(options, req));
+          headers.push(configureCredentials(options, req));
+          headers.push(configureMethods(options, req));
+          headers.push(configureAllowedHeaders(options, req));
+          headers.push(configureMaxAge(options, req));
+          headers.push(configureExposedHeaders(options, req));
+          applyHeaders(headers, res);
+          if (options.preflightContinue) {
+            next();
+          } else {
+            res.statusCode = options.optionsSuccessStatus;
+            res.setHeader("Content-Length", "0");
+            res.end();
+          }
+        } else {
+          headers.push(configureOrigin(options, req));
+          headers.push(configureCredentials(options, req));
+          headers.push(configureExposedHeaders(options, req));
+          applyHeaders(headers, res);
+          next();
+        }
+      }
+      function middlewareWrapper(o2) {
+        var optionsCallback = null;
+        if (typeof o2 === "function") {
+          optionsCallback = o2;
+        } else {
+          optionsCallback = function(req, cb) {
+            cb(null, o2);
+          };
+        }
+        return function corsMiddleware(req, res, next) {
+          optionsCallback(req, function(err, options) {
+            if (err) {
+              next(err);
+            } else {
+              var corsOptions = assign2({}, defaults4, options);
+              var originCallback = null;
+              if (corsOptions.origin && typeof corsOptions.origin === "function") {
+                originCallback = corsOptions.origin;
+              } else if (corsOptions.origin) {
+                originCallback = function(origin, cb) {
+                  cb(null, corsOptions.origin);
+                };
+              }
+              if (originCallback) {
+                originCallback(req.headers.origin, function(err2, origin) {
+                  if (err2 || !origin) {
+                    next(err2);
+                  } else {
+                    corsOptions.origin = origin;
+                    cors2(corsOptions, req, res, next);
+                  }
+                });
+              } else {
+                next();
+              }
+            }
+          });
+        };
+      }
+      module2.exports = middlewareWrapper;
+    })();
+  }
+});
+
 // pnp:/home/circleci/project/.yarn/cache/depd-npm-2.0.0-b6c51a4b43-abbe19c768.zip/node_modules/depd/index.js
 var require_depd = __commonJS({
   "pnp:/home/circleci/project/.yarn/cache/depd-npm-2.0.0-b6c51a4b43-abbe19c768.zip/node_modules/depd/index.js"(exports2, module2) {
@@ -698946,7 +699227,7 @@ var require_parse7 = __commonJS({
 });
 
 // pnp:/home/circleci/project/.yarn/cache/qs-npm-6.11.0-caf1bc9dea-6e1f29dd53.zip/node_modules/qs/lib/index.js
-var require_lib20 = __commonJS({
+var require_lib21 = __commonJS({
   "pnp:/home/circleci/project/.yarn/cache/qs-npm-6.11.0-caf1bc9dea-6e1f29dd53.zip/node_modules/qs/lib/index.js"(exports2, module2) {
     "use strict";
     var stringify5 = require_stringify4();
@@ -699080,7 +699361,7 @@ var require_urlencoded = __commonJS({
       }
       switch (name2) {
         case "qs":
-          mod = require_lib20();
+          mod = require_lib21();
           break;
         case "querystring":
           mod = require("querystring");
@@ -700299,7 +700580,7 @@ var require_query = __commonJS({
     "use strict";
     var merge4 = require_utils_merge();
     var parseUrl = require_parseurl();
-    var qs2 = require_lib20();
+    var qs2 = require_lib21();
     module2.exports = function query(options) {
       var opts = merge4({}, options);
       var queryparse = qs2.parse;
@@ -702218,7 +702499,7 @@ var require_utils17 = __commonJS({
     var mime2 = require_send().mime;
     var etag = require_etag();
     var proxyaddr = require_proxy_addr();
-    var qs2 = require_lib20();
+    var qs2 = require_lib21();
     var querystring = require("querystring");
     exports2.etag = createETagGenerator({ weak: false });
     exports2.wetag = createETagGenerator({ weak: true });
@@ -703547,79 +703828,6 @@ var require_cookie = __commonJS({
   }
 });
 
-// pnp:/home/circleci/project/.yarn/cache/vary-npm-1.1.2-b49f70ae63-ae0123222c.zip/node_modules/vary/index.js
-var require_vary = __commonJS({
-  "pnp:/home/circleci/project/.yarn/cache/vary-npm-1.1.2-b49f70ae63-ae0123222c.zip/node_modules/vary/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = vary;
-    module2.exports.append = append;
-    var FIELD_NAME_REGEXP = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
-    function append(header, field) {
-      if (typeof header !== "string") {
-        throw new TypeError("header argument is required");
-      }
-      if (!field) {
-        throw new TypeError("field argument is required");
-      }
-      var fields = !Array.isArray(field) ? parse6(String(field)) : field;
-      for (var j2 = 0; j2 < fields.length; j2++) {
-        if (!FIELD_NAME_REGEXP.test(fields[j2])) {
-          throw new TypeError("field argument contains an invalid header name");
-        }
-      }
-      if (header === "*") {
-        return header;
-      }
-      var val = header;
-      var vals = parse6(header.toLowerCase());
-      if (fields.indexOf("*") !== -1 || vals.indexOf("*") !== -1) {
-        return "*";
-      }
-      for (var i2 = 0; i2 < fields.length; i2++) {
-        var fld = fields[i2].toLowerCase();
-        if (vals.indexOf(fld) === -1) {
-          vals.push(fld);
-          val = val ? val + ", " + fields[i2] : fields[i2];
-        }
-      }
-      return val;
-    }
-    function parse6(header) {
-      var end = 0;
-      var list3 = [];
-      var start3 = 0;
-      for (var i2 = 0, len = header.length; i2 < len; i2++) {
-        switch (header.charCodeAt(i2)) {
-          case 32:
-            if (start3 === end) {
-              start3 = end = i2 + 1;
-            }
-            break;
-          case 44:
-            list3.push(header.substring(start3, end));
-            start3 = end = i2 + 1;
-            break;
-          default:
-            end = i2 + 1;
-            break;
-        }
-      }
-      list3.push(header.substring(start3, end));
-      return list3;
-    }
-    function vary(res, field) {
-      if (!res || !res.getHeader || !res.setHeader) {
-        throw new TypeError("res argument is required");
-      }
-      var val = res.getHeader("Vary") || "";
-      var header = Array.isArray(val) ? val.join(", ") : String(val);
-      if (val = append(header, field)) {
-        res.setHeader("Vary", val);
-      }
-    }
-  }
-});
-
 // pnp:/home/circleci/project/.yarn/cache/express-npm-4.18.2-bb15ff679a-3c4b9b0768.zip/node_modules/express/lib/response.js
 var require_response = __commonJS({
   "pnp:/home/circleci/project/.yarn/cache/express-npm-4.18.2-bb15ff679a-3c4b9b0768.zip/node_modules/express/lib/response.js"(exports2, module2) {
@@ -718733,7 +718941,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.15.3",
+          version: "0.15.4",
           usingAccessToken: true
         }
       });
@@ -718795,7 +719003,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.15.3",
+        version: "0.15.4",
         ...event,
         ...event.properties
       }
@@ -743041,10 +743249,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.15.3" == null) {
+    if ("0.15.4" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.15.3";
+    return "0.15.4";
   }
   getCliName() {
     if ("fern" == null) {
@@ -745333,11 +745541,20 @@ function convertSingleUnionType({ rawValueType, rawSingleUnionType, fileContaini
 
 // pnp:/home/circleci/project/packages/cli/generation/ir-generator/lib/converters/services/convertExampleEndpointCall.js
 function convertExampleEndpointCall2({ service, endpoint, example, typeResolver, errorResolver, exampleResolver, variableResolver, file }) {
+  const convertedPathParameters = convertPathParameters({
+    service,
+    endpoint,
+    example,
+    typeResolver,
+    exampleResolver,
+    variableResolver,
+    file
+  });
   return {
     name: example.name != null ? file.casingsGenerator.generateName(example.name) : void 0,
     docs: example.docs,
-    url: buildUrl({ service, endpoint, example }),
-    ...convertPathParameters({ service, endpoint, example, typeResolver, exampleResolver, variableResolver, file }),
+    url: buildUrl({ service, endpoint, example, pathParams: convertedPathParameters }),
+    ...convertedPathParameters,
     ...convertHeaders({ service, endpoint, example, typeResolver, exampleResolver, file }),
     queryParameters: example["query-parameters"] != null ? Object.entries(example["query-parameters"]).map(([wireKey, value]) => {
       var _a2, _b2;
@@ -745580,11 +745797,15 @@ function convertExampleResponseBody({ endpoint, example, typeResolver, exampleRe
     fileContainingExample: file
   });
 }
-function buildUrl({ service, endpoint, example }) {
+function buildUrl({ service, endpoint, example, pathParams }) {
   let url = service["base-path"] + endpoint.path;
   if (example["path-parameters"] != null) {
-    for (const [key2, value] of Object.entries(example["path-parameters"])) {
-      url = url.replaceAll(`{${key2}}`, `${value}`);
+    for (const parameter of [
+      ...pathParams.endpointPathParameters,
+      ...pathParams.servicePathParameters,
+      ...pathParams.rootPathParameters
+    ]) {
+      url = url.replaceAll(`{${parameter.name.originalName}}`, `${parameter.value.jsonExample}`);
     }
   }
   return url;
@@ -783351,6 +783572,7 @@ async function generateDocsWorkspace({
 }
 
 // pnp:/home/circleci/project/packages/cli/docs-preview/lib/runPreviewServer.js
+var import_cors = __toESM(require_lib20());
 var import_express = __toESM(require_express3());
 
 // pnp:/home/circleci/project/packages/cli/docs-preview/lib/previewDocs.js
@@ -783617,6 +783839,7 @@ async function convertNavigationItem3({ item, parsedDocsConfig, context, apiColl
 // pnp:/home/circleci/project/packages/cli/docs-preview/lib/runPreviewServer.js
 async function runPreviewServer({ docsWorkspace, apiWorkspaces, context }) {
   const app = (0, import_express.default)();
+  app.use((0, import_cors.default)());
   const docsDefinition = await getPreviewDocsDefinition({
     docsWorkspace,
     apiWorkspaces,
@@ -783624,16 +783847,17 @@ async function runPreviewServer({ docsWorkspace, apiWorkspaces, context }) {
   });
   const response = {
     baseUrl: {
-      domain: "localhost",
+      domain: "localhost:3000",
       basePath: ""
     },
     definition: docsDefinition,
     lightModeEnabled: docsDefinition.config.colorsV3.type !== "dark"
   };
-  app.post("/docs/preview/load", async (_4, res) => {
+  app.post("/v2/registry/docs/load-with-url", async (_4, res) => {
     res.send(response);
   });
   app.listen(3e3);
+  context.logger.info("Running server on https://localhost:3000");
   await new Promise(() => {
   });
 }

package/package.json

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