openapi-explorer 0.8.270 → 0.8.273

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-explorer",
-  "version": "0.8.270",
+  "version": "0.8.273",
   "description": "OpenAPI Explorer - API viewer with dynamically generated components, documentation, and interaction console",
   "author": "Rhosys Developers <developers@rhosys.ch>",
   "repository": {

package/src/components/api-request.js

@@ -56,7 +56,6 @@ export default class ApiRequest extends LitElement {
       activeSchemaTab: { type: String, attribute: 'active-schema-tab' },
       schemaExpandLevel: { type: Number, attribute: 'schema-expand-level' },
       schemaDescriptionExpanded: { type: String, attribute: 'schema-description-expanded' },
-      allowSchemaDescriptionExpandToggle: { type: String, attribute: 'allow-schema-description-expand-toggle' },
       schemaHideReadOnly: { type: String, attribute: 'schema-hide-read-only' },
       fetchCredentials: { type: String, attribute: 'fetch-credentials' },
 
@@ -336,6 +335,7 @@ export default class ApiRequest extends LitElement {
             false,
             true,
             'text',
+            true
           );
           if (!this.selectedRequestBodyExample) {
             this.selectedRequestBodyExample = (reqBodyExamples.length > 0 ? reqBodyExamples[0].exampleId : '');
@@ -395,6 +395,7 @@ export default class ApiRequest extends LitElement {
             false,
             true,
             'text',
+            true
           );
           if (reqBody.schema) {
             reqBodyFormHtml = this.formDataTemplate(reqBody.schema, reqBody.mimeType, (ex[0] ? ex[0].exampleValue : ''));
@@ -422,7 +423,6 @@ export default class ApiRequest extends LitElement {
               .data = '${schemaAsObj}'
               schema-expand-level = "${this.schemaExpandLevel}"
               schema-description-expanded = "${this.schemaDescriptionExpanded}"
-              allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
               schema-hide-read-only = "${this.schemaHideReadOnly.includes(this.method)}"
               schema-hide-write-only = false
             > </schema-table>
@@ -436,7 +436,6 @@ export default class ApiRequest extends LitElement {
               .data = '${schemaAsObj}'
               schema-expand-level = "${this.schemaExpandLevel}"
               schema-description-expanded = "${this.schemaDescriptionExpanded}"
-              allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
               schema-hide-read-only = "${this.schemaHideReadOnly.includes(this.method)}"
               schema-hide-write-only = false
             > </schema-tree>
@@ -459,8 +458,8 @@ export default class ApiRequest extends LitElement {
           ? html`
             <div class="tab-panel col" style="border-width:0 0 1px 0;">
               <div class="tab-buttons row" @click="${(e) => { if (e.target.tagName.toLowerCase() === 'button') { this.activeSchemaTab = e.target.dataset.tab; } }}">
-                <button class="tab-btn ${this.activeSchemaTab === 'model' ? 'active' : ''}"   data-tab = 'model'  >MODEL</button>
-                <button class="tab-btn ${this.activeSchemaTab === 'body' ? 'active' : ''}" data-tab = 'example'>BODY</button>
+                <button class="tab-btn ${this.activeSchemaTab === 'model' ? 'active' : ''}" data-tab="model" >MODEL</button>
+                <button class="tab-btn ${this.activeSchemaTab === 'body' ? 'active' : ''}" data-tab="body">BODY</button>
               </div>
               ${html`<div class="tab-content col" style="display: ${this.activeSchemaTab === 'model' ? 'block' : 'none'}"> ${reqBodySchemaHtml}</div>`}
               ${html`<div class="tab-content col" style="display: ${this.activeSchemaTab === 'model' ? 'none' : 'block'}"> ${reqBodyExampleHtml}</div>`}
@@ -493,6 +492,7 @@ export default class ApiRequest extends LitElement {
           false,
           true,
           'text',
+          true
         );
 
         formDataTableRows.push(html`
@@ -568,9 +568,7 @@ export default class ApiRequest extends LitElement {
                         <schema-tree
                           .data = '${formdataPartSchema}'
                           schema-expand-level = "${this.schemaExpandLevel}"
-                          schema-description-expanded = "${this.schemaDescriptionExpanded}"
-                          allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
-                        > </schema-tree>
+                          schema-description-expanded = "${this.schemaDescriptionExpanded}"> </schema-tree>
                       </div>`
                     }
                     ${html`
@@ -732,8 +730,8 @@ export default class ApiRequest extends LitElement {
             </div>`
           : html`
             <div class="tab-content col m-markdown" style="flex:1;display:${this.activeResponseTab === 'response' ? 'flex' : 'none'};" >
-              <button class="toolbar-btn" @click='${(e) => { copyToClipboard(this.responseText, e); }}' part="btn btn-fill"> Copy </button>
-              <pre style="white-space:pre; max-height:400px; overflow:auto">${responseFormat
+              <button class="toolbar-copy-btn" @click='${(e) => { copyToClipboard(this.responseText, e); }}' part="btn btn-fill">Copy</button>
+              <pre>${responseFormat
                 ? html`<code>${unsafeHTML(Prism.highlight(this.responseText, Prism.languages[responseFormat], responseFormat))}</code>`
                 : `${this.responseText}`
               }
@@ -741,12 +739,12 @@ export default class ApiRequest extends LitElement {
             </div>`
         }
         <div class="tab-content col m-markdown" style="flex:1;display:${this.activeResponseTab === 'headers' ? 'flex' : 'none'};" >
-          <button class="toolbar-btn" @click='${(e) => { copyToClipboard(this.responseHeaders, e); }}' part="btn btn-fill"> Copy </button>
-          <pre style="white-space:pre"><code>${unsafeHTML(Prism.highlight(this.responseHeaders, Prism.languages.css, 'css'))}</code></pre>
+          <button class="toolbar-copy-btn" @click='${(e) => { copyToClipboard(this.responseHeaders, e); }}' part="btn btn-fill">Copy</button>
+          <pre><code>${unsafeHTML(Prism.highlight(this.responseHeaders, Prism.languages.css, 'css'))}</code></pre>
         </div>
         <div class="tab-content col m-markdown" style="flex:1;display:${this.activeResponseTab === 'curl' ? 'flex' : 'none'};">
-          <button class="toolbar-btn" @click='${(e) => { copyToClipboard(this.curlSyntax.replace(/\\$/, ''), e); }}' part="btn btn-fill"> Copy </button>
-          <pre style="white-space:pre"><code>${unsafeHTML(Prism.highlight(this.curlSyntax.trim().replace(/\\$/, ''), Prism.languages.shell, 'shell'))}</code></pre>
+          <button class="toolbar-copy-btn" @click='${(e) => { copyToClipboard(this.curlSyntax.replace(/\\$/, ''), e); }}' part="btn btn-fill">Copy</button>
+          <pre><code>${unsafeHTML(Prism.highlight(this.curlSyntax.trim().replace(/\\$/, ''), Prism.languages.shell, 'shell'))}</code></pre>
         </div>
       </div>`;
   }

package/src/components/api-response.js

@@ -32,7 +32,6 @@ export default class ApiResponse extends LitElement {
       activeSchemaTab: { type: String, attribute: 'active-schema-tab' },
       schemaExpandLevel: { type: Number, attribute: 'schema-expand-level' },
       schemaDescriptionExpanded: { type: String, attribute: 'schema-description-expanded' },
-      allowSchemaDescriptionExpandToggle: { type: String, attribute: 'allow-schema-description-expand-toggle' },
       schemaHideWriteOnly: { type: String, attribute: 'schema-hide-write-only' },
     };
   }
@@ -317,7 +316,6 @@ export default class ApiResponse extends LitElement {
             class = 'example-panel ${this.renderStyle === 'read' ? 'border pad-8-16' : 'border-top pad-top-8'}'
             schema-expand-level = "${this.schemaExpandLevel}"
             schema-description-expanded = "${this.schemaDescriptionExpanded}"
-            allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
             schema-hide-read-only = false
             schema-hide-write-only = ${this.schemaHideWriteOnly}
           > </schema-tree> `
@@ -328,7 +326,6 @@ export default class ApiResponse extends LitElement {
             class = 'example-panel ${this.renderStyle === 'read' ? 'border pad-8-16' : 'pad-top-8'}'
             schema-expand-level = "${this.schemaExpandLevel}"
             schema-description-expanded = "${this.schemaDescriptionExpanded}"
-            allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
             schema-hide-read-only = false
             schema-hide-write-only = ${this.schemaHideWriteOnly}
           > </schema-tree>`

package/src/components/json-tree.js

@@ -76,7 +76,7 @@ export default class JsonTree extends LitElement {
     return html`
       <div class = "json-tree" >
         <div class='toolbar'> 
-          <button class="toolbar-btn" part="btn btn-fill" @click='${(e) => { copyToClipboard(JSON.stringify(this.data, null, 2), e); }}'> Copy </button>
+          <button class="toolbar-copy-btn" part="btn btn-fill" @click='${(e) => { copyToClipboard(JSON.stringify(this.data, null, 2), e); }}'>Copy</button>
         </div>
         ${this.generateTree(this.data, true)}
       </div>  

package/src/components/schema-table.js

@@ -9,7 +9,6 @@ export default class SchemaTable extends LitElement {
     return {
       schemaExpandLevel: { type: Number, attribute: 'schema-expand-level' },
       schemaDescriptionExpanded: { type: String, attribute: 'schema-description-expanded' },
-      allowSchemaDescriptionExpandToggle: { type: String, attribute: 'allow-schema-description-expand-toggle' },
       schemaHideReadOnly: { type: String, attribute: 'schema-hide-read-only' },
       schemaHideWriteOnly: { type: String, attribute: 'schema-hide-write-only' },
       data: { type: Object },
@@ -86,15 +85,10 @@ export default class SchemaTable extends LitElement {
     return html`
       <div class="table ${this.schemaDescriptionExpanded === 'true' ? 'expanded-descr' : 'collapsed-descr'}">
         <div class='toolbar'>
-          ${this.allowSchemaDescriptionExpandToggle === 'true'
-            ? html`
-              <div style="flex:1"></div>
-              <div class='toolbar-item' @click='${() => { this.schemaDescriptionExpanded = (this.schemaDescriptionExpanded === 'true' ? 'false' : 'true'); }}'> 
-                ${this.schemaDescriptionExpanded === 'true' ? 'Collapse description' : 'Expand description'}
-              </div>
-            `
-            : ''
-          }
+          <div style="flex:1"></div>
+          <div class='toolbar-item' @click='${() => { this.schemaDescriptionExpanded = (this.schemaDescriptionExpanded === 'true' ? 'false' : 'true'); }}'> 
+            ${this.schemaDescriptionExpanded === 'true' ? 'Collapse description' : 'Expand description'}
+          </div>
         </div>
         ${this.data && this.data['::description']
           ? html`<span class='m-markdown'> ${unsafeHTML(marked(this.data['::description'] || ''))}</span>`

package/src/components/schema-tree.js

@@ -11,7 +11,6 @@ export default class SchemaTree extends LitElement {
       data: { type: Object },
       schemaExpandLevel: { type: Number, attribute: 'schema-expand-level' },
       schemaDescriptionExpanded: { type: String, attribute: 'schema-description-expanded' },
-      allowSchemaDescriptionExpandToggle: { type: String, attribute: 'allow-schema-description-expand-toggle' },
       schemaHideReadOnly: { type: String, attribute: 'schema-hide-read-only' },
       schemaHideWriteOnly: { type: String, attribute: 'schema-hide-write-only' },
     };
@@ -91,18 +90,12 @@ export default class SchemaTree extends LitElement {
   render() {
     return html`
       <div class="tree ${this.schemaDescriptionExpanded === 'true' ? 'expanded-descr' : 'collapsed-descr'}">
-        <div class="toolbar">
-          ${this.allowSchemaDescriptionExpandToggle === 'true'
-            ? html`
-              <div style="flex:1"></div>
-              <div class='toolbar-item' @click='${() => { this.schemaDescriptionExpanded = (this.schemaDescriptionExpanded === 'true' ? 'false' : 'true'); }}'> 
-                ${this.schemaDescriptionExpanded === 'true' ? 'Collapse description' : 'Expand description'}
-              </div>
-            `
-            : ''
-          }
+        <div class="toolbar" style="display: flex; justify-content: space-between; align-items: center">
+          ${this.data && this.data['::description'] ? html`<span class='m-markdown' style="margin-block-start: 0"> ${unsafeHTML(marked(this.data['::description'] || ''))}</span>` : '<div>&nbsp;</div>'}  
+          <div class="toolbar-item" @click='${() => { this.schemaDescriptionExpanded = (this.schemaDescriptionExpanded === 'true' ? 'false' : 'true'); }}'> 
+            ${this.schemaDescriptionExpanded === 'true' ? 'Collapse description' : 'Expand description'}
+          </div>
         </div>
-        ${this.data && this.data['::description'] ? html`<span class='m-markdown'> ${unsafeHTML(marked(this.data['::description'] || ''))}</span>` : ''}
         ${this.data
           ? html`${this.generateTree(this.data['::type'] === 'array' ? this.data['::props'] : this.data, this.data['::type'])}`
           : html`<span class='mono-font' style='color:var(--red)'> Schema not found </span>`

package/src/openapi-explorer.js

@@ -84,7 +84,6 @@ export default class OpenApiExplorer extends LitElement {
       allowSearch: { type: String, attribute: 'allow-search' },
       allowAdvancedSearch: { type: String, attribute: 'allow-advanced-search' },
       allowServerSelection: { type: String, attribute: 'show-server-selection' },
-      allowSchemaDescriptionExpandToggle: { type: String, attribute: 'allow-schema-description-expand-toggle' },
       showComponents: { type: String, attribute: 'show-components' },
 
       // Main Colors and Font
@@ -397,7 +396,6 @@ export default class OpenApiExplorer extends LitElement {
     if (!this.showInfo || !'true, false,'.includes(`${this.showInfo},`)) { this.showInfo = 'true'; }
     if (!this.allowServerSelection || !'true, false,'.includes(`${this.allowServerSelection},`)) { this.allowServerSelection = 'true'; }
     if (!this.allowAuthentication || !'true, false,'.includes(`${this.allowAuthentication},`)) { this.allowAuthentication = 'true'; }
-    if (!this.allowSchemaDescriptionExpandToggle || !'true, false,'.includes(`${this.allowSchemaDescriptionExpandToggle},`)) { this.allowSchemaDescriptionExpandToggle = 'true'; }
 
     if (!this.showSideNav || !'true false'.includes(this.showSideNav)) { this.showSideNav = 'true'; }
     if (!this.showComponents || !'true false'.includes(this.showComponents)) { this.showComponents = 'false'; }

package/src/styles/font-styles.js

@@ -113,7 +113,11 @@ export default css`
 
   .m-markdown p,
   .m-markdown-small p {
-    margin-block-end: 0
+    margin-block-end: 0;
+  }
+
+  .toolbar .m-markdown p, .toolbar .m-markdown-small p {
+    margin-block-start: 0;
   }
 
   .m-markdown code span {

package/src/styles/input-styles.js

@@ -44,21 +44,29 @@ export default css`
   cursor: progress;
   opacity: 0.4;
 }
-.toolbar-btn{
+.toolbar-copy-btn{
   cursor: pointer;
-  padding: 4px;
+  padding: .125rem .5rem;
   margin:0 2px;
-  font-size: var(--font-size-small);
-  min-width: 50px;
+  font-size: .8rem;
+  width: 56px;
   color: var(--primary-btn-text-color);
   border-radius: 2px;
   border: none;
   background-color: var(--primary-color);
 }
-.tab-content .toolbar-btn {
+.tab-content .toolbar-copy-btn {
   position: absolute;
   top: 8px;
   right: 8px;
+  margin-right: 8px;
+}
+.tab-content .toolbar-copy-btn + pre {
+  white-space: pre;
+  max-height:400px;
+  overflow: auto;
+  display: flex;
+  padding-right: 70px;
 }
 
 input, textarea, select, button, pre {

package/src/styles/schema-styles.js

@@ -75,14 +75,14 @@ export default css`
 .toolbar {
   width:100%;
   padding: 2px 0;
-  color:var(--primary-color);
 }
 .toolbar-item {
   cursor: pointer;
-  padding:5px 0;
-  margin:0 2px;
+  padding: 5px 0 5px 1rem;
+  margin: 0 1rem !important;
   /* TODO: add: The import highlight color variable */
   color: #38b3f9;
+  flex-shrink: 0;
 }
 .schema-root-type {
   cursor:auto;

package/src/templates/callback-template.js

@@ -34,7 +34,6 @@ export default function callbackTemplate(callbacks) {
                       active-schema-tab = "${this.defaultSchemaTab}"
                       schema-expand-level = "${this.schemaExpandLevel}"
                       schema-description-expanded = "${this.schemaDescriptionExpanded}"
-                      allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}",
                       schema-hide-read-only = "${this.schemaHideReadOnly}"
                       fetch-credentials = "${this.fetchCredentials}"
                       exportparts="btn btn-fill btn-outline btn-try">
@@ -48,7 +47,6 @@ export default function callbackTemplate(callbacks) {
                       active-schema-tab = "${this.defaultSchemaTab}"
                       schema-expand-level = "${this.schemaExpandLevel}"
                       schema-description-expanded = "${this.schemaDescriptionExpanded}"
-                      allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}"
                       exportparts = "btn--resp btn-fill--resp btn-outline--resp"
                     > </api-response>
                   </div>

package/src/templates/code-samples-template.js

@@ -24,8 +24,8 @@ export default function codeSamplesTemplate(xCodeSamples) {
     </div>
     ${xCodeSamples.map((v, i) => html`
       <div class="tab-content m-markdown code-sample-wrapper" style= "display:${i === 0 ? 'block' : 'none'}" data-tab = '${v.lang}${i}'>
-        <button class="toolbar-btn" @click='${(e) => { copyToClipboard(v.source, e); }}'> Copy </button>
-        <pre style="white-space:pre; display: flex;">
+        <button class="toolbar-copy-btn" @click='${(e) => { copyToClipboard(v.source, e); }}'>Copy</button>
+        <pre>
           <code>${Prism.languages[v.lang && v.lang.toLowerCase()] ? unsafeHTML(Prism.highlight(v.source, Prism.languages[v.lang && v.lang.toLowerCase()], v.lang && v.lang.toLowerCase())) : v.source}</code>
         </pre>
       </div>`)

package/src/templates/endpoint-template.js

@@ -112,7 +112,6 @@ function endpointBodyTemplate(path) {
           schema-style = "${this.schemaStyle}" 
           schema-expand-level = "${this.schemaExpandLevel}"
           schema-description-expanded = "${this.schemaDescriptionExpanded}"
-          allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}"
           schema-hide-read-only = "${this.schemaHideReadOnly}"
           fetch-credentials = "${this.fetchCredentials}"
           exportparts="btn btn-fill btn-outline btn-try">
@@ -127,7 +126,6 @@ function endpointBodyTemplate(path) {
         schema-style="${this.schemaStyle}"
         schema-expand-level = "${this.schemaExpandLevel}"
         schema-description-expanded = "${this.schemaDescriptionExpanded}"
-        allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}"
         schema-hide-write-only = "${this.schemaHideWriteOnly}"
         selected-status = "${Object.keys(path.responses || {})[0] || ''}"
         exportparts = "btn--resp btn-fill--resp btn-outline--resp"
@@ -138,7 +136,7 @@ function endpointBodyTemplate(path) {
 
 export default function endpointTemplate() {
   return html`
-    <div style="display:flex; justify-content:flex-end; padding-right: 1rem; font-size: 14px;"> 
+    <div style="display:flex; justify-content:flex-end; padding-right: 1rem; font-size: 14px; margin-top: 16px;"> 
       <span @click="${(e) => expandCollapseAll.call(this, e, 'expand-all')}" style="color:var(--primary-color); cursor: pointer;">Expand</span> 
       &nbsp;|&nbsp; 
       <span @click="${(e) => expandCollapseAll.call(this, e, 'collapse-all')}" style="color:var(--primary-color); cursor: pointer;">Collapse</span>

package/src/templates/expanded-endpoint-template.js

@@ -61,7 +61,6 @@ export function expandedEndpointBodyTemplate(path, tagName = '') {
         active-schema-tab = "${this.defaultSchemaTab}"
         schema-expand-level = "${this.schemaExpandLevel}"
         schema-description-expanded = "${this.schemaDescriptionExpanded}"
-        allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}"
         schema-hide-read-only = "${this.schemaHideReadOnly}"
         fetch-credentials = "${this.fetchCredentials}"
         exportparts = "btn btn-fill btn-outline btn-try"
@@ -77,7 +76,6 @@ export function expandedEndpointBodyTemplate(path, tagName = '') {
         active-schema-tab = "${this.defaultSchemaTab}"
         schema-expand-level = "${this.schemaExpandLevel}"
         schema-description-expanded = "${this.schemaDescriptionExpanded}"
-        allow-schema-description-expand-toggle = "${this.allowSchemaDescriptionExpandToggle}"
         schema-hide-write-only = "${this.schemaHideWriteOnly}"
         selected-status = "${Object.keys(path.responses || {})[0] || ''}"
         exportparts = "btn--resp btn-fill--resp btn-outline--resp"

package/src/templates/focused-endpoint-template.js

@@ -71,8 +71,7 @@ export default function focusedEndpointTemplate() {
     focusedTemplate = serverTemplate.call(this);
   } else if (focusElId === 'section') {
     focusedTemplate = html`
-      <section id='section' style="margin-top:24px; margin-bottom:24px;"
-        class='observe-me ${this.renderStyle === 'focused' ? 'section-gap--focused-mode' : 'section-gap'}'>
+      <section id='section' class='observe-me'>
         <slot name="custom-section"></slot>
       </section>`;
   } else if (focusElId.startsWith('cmp--') && this.showComponents === 'true') {

package/src/utils/schema-utils.js

@@ -94,12 +94,14 @@ export function getTypeInfo(schema) {
   return info;
 }
 
-export function getSampleValueByType(schemaObj, fallbackPropertyName) {
+export function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampleStrings) {
   const example = schemaObj.examples ? schemaObj.examples[0] : schemaObj.example;
   if (example === '') { return ''; }
   if (example === null) { return null; }
   if (example === 0) { return 0; }
+  if (skipExampleStrings && typeof example === 'string') { return ''; }
   if (example) { return example; }
+
   if (schemaObj.default) { return schemaObj.default; }
 
   if (Object.keys(schemaObj).length === 0) {
@@ -130,6 +132,7 @@ export function getSampleValueByType(schemaObj, fallbackPropertyName) {
   }
   if (typeValue.match(/^boolean/g)) { return false; }
   if (typeValue.match(/^null/g)) { return null; }
+  if (skipExampleStrings && typeValue.match(/^string/g)) { return ''; }
   if (typeValue.match(/^string/g)) {
     if (schemaObj.enum) { return schemaObj.enum[0]; }
     if (schemaObj.pattern) {
@@ -267,22 +270,10 @@ function getExampleValuesFromSchemaRecursive(schema, config = {}) {
     return config.xml ? [xmlTagProperties] : objectExamples;
   }
 
-  const value = getSampleValueByType(schema, config.propertyName);
+  const value = getSampleValueByType(schema, config.propertyName, config.skipExampleStrings);
   return [value];
 }
 
-function addSchemaInfoToExample(schema, obj) {
-  if (typeof obj !== 'object' || obj === null) {
-    return;
-  }
-  if (schema.title) {
-    obj['::TITLE'] = schema.title;
-  }
-  if (schema.description) {
-    obj['::DESCRIPTION'] = schema.description;
-  }
-}
-
 function removeTitlesAndDescriptions(obj) {
   if (typeof obj !== 'object' || obj === null) {
     return;
@@ -294,173 +285,6 @@ function removeTitlesAndDescriptions(obj) {
   }
 }
 
-function addPropertyExampleToObjectExamples(example, obj, propertyKey) {
-  for (const key in obj) {
-    obj[key][propertyKey] = example;
-  }
-}
-
-function mergePropertyExamples(obj, propertyName, propExamples) {
-  // Create an example for each variant of the propertyExample, merging them with the current (parent) example
-  let i = 0;
-  const maxCombinations = 10;
-  const mergedObj = {};
-  for (const exampleKey in obj) {
-    for (const propExampleKey in propExamples) {
-      mergedObj[`example-${i}`] = { ...obj[exampleKey] };
-      mergedObj[`example-${i}`][propertyName] = propExamples[propExampleKey];
-      i++;
-      if (i >= maxCombinations) {
-        break;
-      }
-    }
-    if (i >= maxCombinations) {
-      break;
-    }
-  }
-  return mergedObj;
-}
-
-/* For changing JSON-Schema to a Sample Object, as per the schema (to generate examples based on schema) */
-export function schemaToSampleObj(schema, config = { }) {
-  let obj = {};
-  if (!schema) {
-    return null;
-  }
-
-  if (schema.allOf) {
-    const objWithAllProps = {};
-
-    if (schema.allOf.length === 1 && !schema.allOf[0].properties && !schema.allOf[0].items) {
-      // If allOf has single item and the type is not an object or array, then its a primitive
-      if (schema.allOf[0].$ref) {
-        return schema.allOf[0].$ref;
-      }
-      if (schema.allOf[0].readOnly && config.includeReadOnly) {
-        const tempSchema = schema.allOf[0];
-        return getSampleValueByType(tempSchema, config.propertyName);
-      }
-      return null;
-    }
-
-    schema.allOf.forEach((v) => {
-      if (v.type === 'object' || v.properties || v.allOf || v.anyOf || v.oneOf) {
-        const partialObj = schemaToSampleObj(v, config);
-        Object.assign(objWithAllProps, partialObj);
-      } else if (v.type === 'array' || v.items) {
-        const partialObj = [schemaToSampleObj(v, config)];
-        Object.assign(objWithAllProps, partialObj);
-      } else if (v.type) {
-        const prop = `prop${Object.keys(objWithAllProps).length}`;
-        objWithAllProps[prop] = getSampleValueByType(v, config.propertyName);
-      }
-    });
-
-    return objWithAllProps;
-  }
-
-  if (schema.oneOf) {
-    if (!schema.oneOf.length) {
-      return obj;
-    }
-
-    const objWithSchemaProps = {};
-    for (const propertyName in (schema.properties || {})) {
-      objWithSchemaProps[propertyName] = getSampleValueByType(schema.properties[propertyName], config.propertyName);
-    }
-
-    let i = 0;
-    // Add all the oneof to examples
-    for (const key in schema.oneOf) {
-      const oneOfSamples = schemaToSampleObj(schema.oneOf[key], config);
-      for (const sampleKey in oneOfSamples) {
-        obj[`example-${i}`] = Object.assign({}, objWithSchemaProps, oneOfSamples[sampleKey]);
-        addSchemaInfoToExample(schema.oneOf[key], obj[`example-${i}`]);
-        i++;
-      }
-    }
-  } else if (schema.anyOf) {
-    // First generate values for regular properties
-    let commonObj;
-    if (schema.type === 'object' || schema.properties) {
-      commonObj = { 'example-0': {} };
-      for (const propertyName in schema.properties) {
-        if (schema.example) {
-          commonObj = schema;
-          break;
-        }
-        if (schema.properties[propertyName].deprecated && !config.includeDeprecated) { continue; }
-        if (schema.properties[propertyName].readOnly && !config.includeReadOnly) { continue; }
-        if (schema.properties[propertyName].writeOnly && !config.includeWriteOnly) { continue; }
-        commonObj = mergePropertyExamples(commonObj, propertyName, schemaToSampleObj(schema.properties[propertyName], { ...config, propertyName }));
-      }
-    }
-
-    // Combine every variant of the regular properties with every variant of the anyOf samples
-    let i = 0;
-    for (const key in schema.anyOf) {
-      const anyOfSamples = schemaToSampleObj(schema.anyOf[key], config);
-      for (const sampleKey in anyOfSamples) {
-        if (typeof commonObj !== 'undefined') {
-          for (const commonKey in commonObj) {
-            obj[`example-${i}`] = { ...commonObj[commonKey], ...anyOfSamples[sampleKey] };
-          }
-        } else {
-          obj[`example-${i}`] = anyOfSamples[sampleKey];
-        }
-        addSchemaInfoToExample(schema.anyOf[key], obj[`example-${i}`]);
-        i++;
-      }
-    }
-  } else if (schema.type === 'object' || schema.properties) {
-    obj['example-0'] = {};
-    addSchemaInfoToExample(schema, obj['example-0']);
-    if (schema.example) {
-      obj['example-0'] = schema.example;
-    } else {
-      for (const propertyName in schema.properties) {
-        if (schema.properties[propertyName].deprecated && !config.includeDeprecated) { continue; }
-        if (schema.properties[propertyName].readOnly && !config.includeReadOnly) { continue; }
-        if (schema.properties[propertyName].writeOnly && !config.includeWriteOnly) { continue; }
-        if (schema.properties[propertyName].type === 'array' || schema.properties[propertyName].items) {
-          if (schema.properties[propertyName].example) {
-            addPropertyExampleToObjectExamples(schema.properties[propertyName].example, obj, propertyName);
-          } else if (schema.properties[propertyName] && schema.properties[propertyName].items && schema.properties[propertyName].items.example) {
-            // schemas and properties support single example but not multiple examples.
-            addPropertyExampleToObjectExamples([schema.properties[propertyName].items.example], obj, propertyName);
-          } else {
-            const itemSamples = schemaToSampleObj(schema.properties[propertyName].items, { ...config, propertyName });
-            const arraySamples = [];
-            for (const key in itemSamples) {
-              arraySamples[key] = [itemSamples[key]];
-            }
-            obj = mergePropertyExamples(obj, propertyName, arraySamples);
-          }
-          continue;
-        }
-        obj = mergePropertyExamples(obj, propertyName, schemaToSampleObj(schema.properties[propertyName], { ...config, propertyName }));
-      }
-    }
-  } else if (schema.type === 'array' || schema.items) {
-    if (schema.example) {
-      obj['example-0'] = schema.example;
-    } else if (schema.items && schema.items.example) { // schemas and properties support single example but not multiple examples.
-      obj['example-0'] = [schema.items.example];
-    } else {
-      const samples = schemaToSampleObj(schema.items, config);
-      let i = 0;
-      for (const key in samples) {
-        obj[`example-${i}`] = [samples[key]];
-        addSchemaInfoToExample(schema.items, obj[`example-${i}`]);
-        i++;
-      }
-    }
-  } else {
-    return { 'example-0': getSampleValueByType(schema, config.propertyName) };
-  }
-  return obj;
-}
-
 /**
  * For changing OpenAPI-Schema to an Object Notation,
  * This Object would further be an input to UI Components to generate an Object-Tree
@@ -643,7 +467,7 @@ export function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
 }
 
 /* Create Example object */
-export function generateExample(examples, example, schema, rawMimeType, includeReadOnly = true, includeWriteOnly = true, outputType) {
+export function generateExample(examples, example, schema, rawMimeType, includeReadOnly = true, includeWriteOnly = true, outputType, skipExampleStrings = false) {
   const mimeType = rawMimeType || 'application/json';
   const finalExamples = [];
   // First check if examples is provided
@@ -735,6 +559,7 @@ export function generateExample(examples, example, schema, rawMimeType, includeR
     includeReadOnly,
     includeWriteOnly,
     includeDeprecated: true,
+    skipExampleStrings,
     xml: mimeType.toLowerCase().includes('xml'),
   };