@stoplight/elements-core 7.7.14 → 7.7.16

package/components/Docs/Article/Article.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/components/TryIt/build-request.d.ts

@@ -20,4 +20,5 @@ export declare const getQueryParams: ({ httpOperation, parameterValues, }: Pick<
 }[];
 export declare function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, parameterValues, mockData, auth, chosenServer, credentials, corsProxy, }: BuildRequestInput): Promise<Parameters<typeof fetch>>;
 export declare function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeContent, auth, mockData, chosenServer, corsProxy, }: BuildRequestInput): Promise<HarRequest>;
+export declare function getAcceptedMimeTypes(httpOperation: IHttpOperation): string[];
 export {};

package/index.esm.js

@@ -1,4 +1,4 @@
-import { __awaiter, __rest } from 'tslib';
+import { __rest, __awaiter } from 'tslib';
 import * as React from 'react';
 import React__default, { useContext, useMemo } from 'react';
 import { convertToJsonSchema } from '@stoplight/http-spec/oas';
@@ -256,12 +256,22 @@ const MarkdownViewer = (props) => {
 };
 MarkdownViewer.displayName = 'MarkdownViewer';
 
-const ArticleComponent = React.memo(({ data }) => {
+const ArticleComponentForHashRouter = React.memo(({ data }) => {
     const { pathname } = useLocation();
-    const routerKind = React.useContext(RouterTypeContext);
-    const basePath = routerKind === 'hash' ? `#${pathname.split('#')[0]}` : '';
+    const basePath = `#${pathname.split('#')[0]}`;
+    return React.createElement(BaseArticleComponent, { data: data, tocBasePath: basePath });
+});
+const BaseArticleComponent = React.memo((_a) => {
+    var { data } = _a, props = __rest(_a, ["data"]);
     return (React.createElement(Box, { className: "sl-elements-article" },
-        React.createElement(MarkdownViewer, { className: "sl-elements-article-content", markdown: data, includeToc: true, tocBasePath: basePath })));
+        React.createElement(MarkdownViewer, Object.assign({ className: "sl-elements-article-content", markdown: data, includeToc: true }, props))));
+});
+const ArticleComponent = React.memo(({ data }) => {
+    const routerKind = useRouterType();
+    if (routerKind === 'hash') {
+        return React.createElement(ArticleComponentForHashRouter, { data: data });
+    }
+    return React.createElement(BaseArticleComponent, { data: data });
 });
 const Article = withErrorBoundary(ArticleComponent, { recoverableProps: ['data'] });
 
@@ -1470,7 +1480,7 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const rawHeaders = filterOutAuthorizationParams((_b = (_a = httpOperation.request) === null || _a === void 0 ? void 0 : _a.headers) !== null && _b !== void 0 ? _b : [], httpOperation.security)
             .map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })
@@ -1480,7 +1490,9 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
         const urlObject = new URL(serverUrl + expandedPath);
         urlObject.search = new URLSearchParams(queryParamsWithAuth.map(nameAndValueObjectToPair)).toString();
         const body = typeof bodyInput === 'object' ? yield createRequestBody(mediaTypeContent, bodyInput) : bodyInput;
-        const headers = Object.assign(Object.assign(Object.assign({}, ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' && {
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        const headers = Object.assign(Object.assign(Object.assign(Object.assign({}, (acceptedMimeTypes.length > 0 && { Accept: acceptedMimeTypes.join(', ') })), ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' &&
+            shouldIncludeBody && {
             'Content-Type': (_c = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _c !== void 0 ? _c : 'application/json',
         })), Object.fromEntries(headersWithAuth.map(nameAndValueObjectToPair))), mockData === null || mockData === void 0 ? void 0 : mockData.header);
         return [
@@ -1545,12 +1557,19 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
     return __awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
         const mimeType = (_a = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _a !== void 0 ? _a : 'application/json';
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const headerParams = (_d = (_c = (_b = httpOperation.request) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })) !== null && _d !== void 0 ? _d : [];
         if (mockData === null || mockData === void 0 ? void 0 : mockData.header) {
             headerParams.push({ name: 'Prefer', value: mockData.header.Prefer });
         }
+        if (shouldIncludeBody) {
+            headerParams.push({ name: 'Content-Type', value: mimeType });
+        }
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        if (acceptedMimeTypes.length > 0) {
+            headerParams.push({ name: 'Accept', value: acceptedMimeTypes.join(', ') });
+        }
         const [queryParamsWithAuth, headerParamsWithAuth] = runAuthRequestEhancements(auth, queryParams, headerParams);
         const expandedPath = uriExpand(httpOperation.path, parameterValues);
         const urlObject = new URL(serverUrl + expandedPath);
@@ -1581,7 +1600,7 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
             url: urlObject.href,
             httpVersion: 'HTTP/1.1',
             cookies: [],
-            headers: [{ name: 'Content-Type', value: mimeType }, ...headerParamsWithAuth],
+            headers: headerParamsWithAuth,
             queryString: queryParamsWithAuth,
             postData: postData,
             headersSize: -1,
@@ -1596,6 +1615,11 @@ function uriExpand(uri, data) {
     return uri.replace(/{([^#?]+?)}/g, (match, value) => {
         return data[value] || value;
     });
+}
+function getAcceptedMimeTypes(httpOperation) {
+    return Array.from(new Set(httpOperation.responses.flatMap(response => response === undefined || response.contents === undefined
+        ? []
+        : response.contents.map(contentType => contentType.mediaType))));
 }
 
 const formatMultiValueHeader = (...keyValuePairs) => {

package/index.js

@@ -309,12 +309,22 @@ const MarkdownViewer = (props) => {
 };
 MarkdownViewer.displayName = 'MarkdownViewer';
 
-const ArticleComponent = React__namespace.memo(({ data }) => {
+const ArticleComponentForHashRouter = React__namespace.memo(({ data }) => {
     const { pathname } = reactRouterDom.useLocation();
-    const routerKind = React__namespace.useContext(RouterTypeContext);
-    const basePath = routerKind === 'hash' ? `#${pathname.split('#')[0]}` : '';
+    const basePath = `#${pathname.split('#')[0]}`;
+    return React__namespace.createElement(BaseArticleComponent, { data: data, tocBasePath: basePath });
+});
+const BaseArticleComponent = React__namespace.memo((_a) => {
+    var { data } = _a, props = tslib.__rest(_a, ["data"]);
     return (React__namespace.createElement(mosaic.Box, { className: "sl-elements-article" },
-        React__namespace.createElement(MarkdownViewer, { className: "sl-elements-article-content", markdown: data, includeToc: true, tocBasePath: basePath })));
+        React__namespace.createElement(MarkdownViewer, Object.assign({ className: "sl-elements-article-content", markdown: data, includeToc: true }, props))));
+});
+const ArticleComponent = React__namespace.memo(({ data }) => {
+    const routerKind = useRouterType();
+    if (routerKind === 'hash') {
+        return React__namespace.createElement(ArticleComponentForHashRouter, { data: data });
+    }
+    return React__namespace.createElement(BaseArticleComponent, { data: data });
 });
 const Article = reactErrorBoundary.withErrorBoundary(ArticleComponent, { recoverableProps: ['data'] });
 
@@ -1523,7 +1533,7 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
     var _a, _b, _c;
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const rawHeaders = filterOutAuthorizationParams((_b = (_a = httpOperation.request) === null || _a === void 0 ? void 0 : _a.headers) !== null && _b !== void 0 ? _b : [], httpOperation.security)
             .map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })
@@ -1533,7 +1543,9 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
         const urlObject = new URL(serverUrl + expandedPath);
         urlObject.search = new URLSearchParams(queryParamsWithAuth.map(nameAndValueObjectToPair)).toString();
         const body = typeof bodyInput === 'object' ? yield createRequestBody(mediaTypeContent, bodyInput) : bodyInput;
-        const headers = Object.assign(Object.assign(Object.assign({}, ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' && {
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        const headers = Object.assign(Object.assign(Object.assign(Object.assign({}, (acceptedMimeTypes.length > 0 && { Accept: acceptedMimeTypes.join(', ') })), ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' &&
+            shouldIncludeBody && {
             'Content-Type': (_c = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _c !== void 0 ? _c : 'application/json',
         })), Object.fromEntries(headersWithAuth.map(nameAndValueObjectToPair))), mockData === null || mockData === void 0 ? void 0 : mockData.header);
         return [
@@ -1598,12 +1610,19 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
         const mimeType = (_a = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _a !== void 0 ? _a : 'application/json';
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const headerParams = (_d = (_c = (_b = httpOperation.request) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })) !== null && _d !== void 0 ? _d : [];
         if (mockData === null || mockData === void 0 ? void 0 : mockData.header) {
             headerParams.push({ name: 'Prefer', value: mockData.header.Prefer });
         }
+        if (shouldIncludeBody) {
+            headerParams.push({ name: 'Content-Type', value: mimeType });
+        }
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        if (acceptedMimeTypes.length > 0) {
+            headerParams.push({ name: 'Accept', value: acceptedMimeTypes.join(', ') });
+        }
         const [queryParamsWithAuth, headerParamsWithAuth] = runAuthRequestEhancements(auth, queryParams, headerParams);
         const expandedPath = uriExpand(httpOperation.path, parameterValues);
         const urlObject = new URL(serverUrl + expandedPath);
@@ -1634,7 +1653,7 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
             url: urlObject.href,
             httpVersion: 'HTTP/1.1',
             cookies: [],
-            headers: [{ name: 'Content-Type', value: mimeType }, ...headerParamsWithAuth],
+            headers: headerParamsWithAuth,
             queryString: queryParamsWithAuth,
             postData: postData,
             headersSize: -1,
@@ -1649,6 +1668,11 @@ function uriExpand(uri, data) {
     return uri.replace(/{([^#?]+?)}/g, (match, value) => {
         return data[value] || value;
     });
+}
+function getAcceptedMimeTypes(httpOperation) {
+    return Array.from(new Set(httpOperation.responses.flatMap(response => response === undefined || response.contents === undefined
+        ? []
+        : response.contents.map(contentType => contentType.mediaType))));
 }
 
 const formatMultiValueHeader = (...keyValuePairs) => {

package/index.mjs

@@ -1,4 +1,4 @@
-import { __awaiter, __rest } from 'tslib';
+import { __rest, __awaiter } from 'tslib';
 import * as React from 'react';
 import React__default, { useContext, useMemo } from 'react';
 import { convertToJsonSchema } from '@stoplight/http-spec/oas';
@@ -256,12 +256,22 @@ const MarkdownViewer = (props) => {
 };
 MarkdownViewer.displayName = 'MarkdownViewer';
 
-const ArticleComponent = React.memo(({ data }) => {
+const ArticleComponentForHashRouter = React.memo(({ data }) => {
     const { pathname } = useLocation();
-    const routerKind = React.useContext(RouterTypeContext);
-    const basePath = routerKind === 'hash' ? `#${pathname.split('#')[0]}` : '';
+    const basePath = `#${pathname.split('#')[0]}`;
+    return React.createElement(BaseArticleComponent, { data: data, tocBasePath: basePath });
+});
+const BaseArticleComponent = React.memo((_a) => {
+    var { data } = _a, props = __rest(_a, ["data"]);
     return (React.createElement(Box, { className: "sl-elements-article" },
-        React.createElement(MarkdownViewer, { className: "sl-elements-article-content", markdown: data, includeToc: true, tocBasePath: basePath })));
+        React.createElement(MarkdownViewer, Object.assign({ className: "sl-elements-article-content", markdown: data, includeToc: true }, props))));
+});
+const ArticleComponent = React.memo(({ data }) => {
+    const routerKind = useRouterType();
+    if (routerKind === 'hash') {
+        return React.createElement(ArticleComponentForHashRouter, { data: data });
+    }
+    return React.createElement(BaseArticleComponent, { data: data });
 });
 const Article = withErrorBoundary(ArticleComponent, { recoverableProps: ['data'] });
 
@@ -1470,7 +1480,7 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const rawHeaders = filterOutAuthorizationParams((_b = (_a = httpOperation.request) === null || _a === void 0 ? void 0 : _a.headers) !== null && _b !== void 0 ? _b : [], httpOperation.security)
             .map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })
@@ -1480,7 +1490,9 @@ function buildFetchRequest({ httpOperation, mediaTypeContent, bodyInput, paramet
         const urlObject = new URL(serverUrl + expandedPath);
         urlObject.search = new URLSearchParams(queryParamsWithAuth.map(nameAndValueObjectToPair)).toString();
         const body = typeof bodyInput === 'object' ? yield createRequestBody(mediaTypeContent, bodyInput) : bodyInput;
-        const headers = Object.assign(Object.assign(Object.assign({}, ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' && {
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        const headers = Object.assign(Object.assign(Object.assign(Object.assign({}, (acceptedMimeTypes.length > 0 && { Accept: acceptedMimeTypes.join(', ') })), ((mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== 'multipart/form-data' &&
+            shouldIncludeBody && {
             'Content-Type': (_c = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _c !== void 0 ? _c : 'application/json',
         })), Object.fromEntries(headersWithAuth.map(nameAndValueObjectToPair))), mockData === null || mockData === void 0 ? void 0 : mockData.header);
         return [
@@ -1545,12 +1557,19 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
     return __awaiter(this, void 0, void 0, function* () {
         const serverUrl = getServerUrl({ httpOperation, mockData, chosenServer, corsProxy });
         const mimeType = (_a = mediaTypeContent === null || mediaTypeContent === void 0 ? void 0 : mediaTypeContent.mediaType) !== null && _a !== void 0 ? _a : 'application/json';
-        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase());
+        const shouldIncludeBody = ['PUT', 'POST', 'PATCH'].includes(httpOperation.method.toUpperCase()) && bodyInput !== undefined;
         const queryParams = getQueryParams({ httpOperation, parameterValues });
         const headerParams = (_d = (_c = (_b = httpOperation.request) === null || _b === void 0 ? void 0 : _b.headers) === null || _c === void 0 ? void 0 : _c.map(header => { var _a; return ({ name: header.name, value: (_a = parameterValues[header.name]) !== null && _a !== void 0 ? _a : '' }); })) !== null && _d !== void 0 ? _d : [];
         if (mockData === null || mockData === void 0 ? void 0 : mockData.header) {
             headerParams.push({ name: 'Prefer', value: mockData.header.Prefer });
         }
+        if (shouldIncludeBody) {
+            headerParams.push({ name: 'Content-Type', value: mimeType });
+        }
+        const acceptedMimeTypes = getAcceptedMimeTypes(httpOperation);
+        if (acceptedMimeTypes.length > 0) {
+            headerParams.push({ name: 'Accept', value: acceptedMimeTypes.join(', ') });
+        }
         const [queryParamsWithAuth, headerParamsWithAuth] = runAuthRequestEhancements(auth, queryParams, headerParams);
         const expandedPath = uriExpand(httpOperation.path, parameterValues);
         const urlObject = new URL(serverUrl + expandedPath);
@@ -1581,7 +1600,7 @@ function buildHarRequest({ httpOperation, bodyInput, parameterValues, mediaTypeC
             url: urlObject.href,
             httpVersion: 'HTTP/1.1',
             cookies: [],
-            headers: [{ name: 'Content-Type', value: mimeType }, ...headerParamsWithAuth],
+            headers: headerParamsWithAuth,
             queryString: queryParamsWithAuth,
             postData: postData,
             headersSize: -1,
@@ -1596,6 +1615,11 @@ function uriExpand(uri, data) {
     return uri.replace(/{([^#?]+?)}/g, (match, value) => {
         return data[value] || value;
     });
+}
+function getAcceptedMimeTypes(httpOperation) {
+    return Array.from(new Set(httpOperation.responses.flatMap(response => response === undefined || response.contents === undefined
+        ? []
+        : response.contents.map(contentType => contentType.mediaType))));
 }
 
 const formatMultiValueHeader = (...keyValuePairs) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoplight/elements-core",
-  "version": "7.7.14",
+  "version": "7.7.16",
   "main": "./index.js",
   "sideEffects": [
     "web-components.min.js",