openapi-explorer 2.2.717 → 2.2.720

package/dist/es/utils/schema-utils.js

@@ -102,7 +102,8 @@ export function getTypeInfo(parameter, options = {
 export function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampleIds) {
   var _Object$values$0$valu, _Object$values$, _schemaObj$type;
   const example = Array.isArray(schemaObj.examples) ? schemaObj.examples[0] : (_Object$values$0$valu = (_Object$values$ = Object.values(schemaObj.examples || {})[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.value) !== null && _Object$values$0$valu !== void 0 ? _Object$values$0$valu : schemaObj.example;
-  if (skipExampleIds && typeof example === 'string' && fallbackPropertyName.match(/id$/i)) {
+  const propertyName = fallbackPropertyName || 'string';
+  if (skipExampleIds && typeof example === 'string' && propertyName.match(/id$/i)) {
     return '';
   }
   if (typeof example !== 'undefined') {
@@ -137,16 +138,16 @@ export function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampl
   if (typeValue.match(/^null/g)) {
     return null;
   }
-  if (skipExampleIds && typeValue.match(/^string/g) && fallbackPropertyName.match(/id$/i)) {
+  if (skipExampleIds && typeValue.match(/^string/g) && propertyName.match(/id$/i)) {
     return '';
   }
   if (typeValue.match(/^string/g)) {
     if (schemaObj.pattern) {
       const examplePattern = schemaObj.pattern.replace(/[+*](?![^\][]*[\]])/g, '{8}').replace(/\{\d*,(\d+)?\}/g, '{8}');
       try {
-        return new RandExp(examplePattern).gen() || fallbackPropertyName || 'string';
+        return new RandExp(examplePattern).gen() || propertyName;
       } catch (error) {
-        return fallbackPropertyName || 'string';
+        return propertyName;
       }
     }
     if (schemaObj.format) {
@@ -183,7 +184,7 @@ export function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampl
           return schemaObj.format;
       }
     } else {
-      return fallbackPropertyName || 'string';
+      return propertyName;
     }
   }
   // If type cannot be determined
@@ -372,7 +373,11 @@ export function schemaInObjectNotation(rawSchema, options, level = 0, suffix = '
       }
     });
     const obj = schemaInObjectNotation(schema, options, 0);
-    return Object.assign({}, objWithAllProps, typeof obj === 'object' && !Array.isArray(obj) ? obj : {});
+    const resultObj = typeof obj === 'object' && !Array.isArray(obj) ? obj : {};
+    // These are the only valuable properties from allOf, everything else isn't going to be available, otherwise fallback to whatever was there from the children objects
+    resultObj['::title'] = schema.title || resultObj['::title'];
+    resultObj['::description'] = schema.description || resultObj['::description'];
+    return Object.assign({}, objWithAllProps, resultObj);
   }
   if (anyOf || oneOf) {
     const objWithAnyOfProps = {};

package/dist/lib/utils/schema-utils.js

@@ -111,7 +111,8 @@ function getTypeInfo(parameter, options = {
 function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampleIds) {
   var _Object$values$0$valu, _Object$values$, _schemaObj$type;
   const example = Array.isArray(schemaObj.examples) ? schemaObj.examples[0] : (_Object$values$0$valu = (_Object$values$ = Object.values(schemaObj.examples || {})[0]) === null || _Object$values$ === void 0 ? void 0 : _Object$values$.value) !== null && _Object$values$0$valu !== void 0 ? _Object$values$0$valu : schemaObj.example;
-  if (skipExampleIds && typeof example === 'string' && fallbackPropertyName.match(/id$/i)) {
+  const propertyName = fallbackPropertyName || 'string';
+  if (skipExampleIds && typeof example === 'string' && propertyName.match(/id$/i)) {
     return '';
   }
   if (typeof example !== 'undefined') {
@@ -146,16 +147,16 @@ function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampleIds) {
   if (typeValue.match(/^null/g)) {
     return null;
   }
-  if (skipExampleIds && typeValue.match(/^string/g) && fallbackPropertyName.match(/id$/i)) {
+  if (skipExampleIds && typeValue.match(/^string/g) && propertyName.match(/id$/i)) {
     return '';
   }
   if (typeValue.match(/^string/g)) {
     if (schemaObj.pattern) {
       const examplePattern = schemaObj.pattern.replace(/[+*](?![^\][]*[\]])/g, '{8}').replace(/\{\d*,(\d+)?\}/g, '{8}');
       try {
-        return new _randexp.default(examplePattern).gen() || fallbackPropertyName || 'string';
+        return new _randexp.default(examplePattern).gen() || propertyName;
       } catch (error) {
-        return fallbackPropertyName || 'string';
+        return propertyName;
       }
     }
     if (schemaObj.format) {
@@ -192,7 +193,7 @@ function getSampleValueByType(schemaObj, fallbackPropertyName, skipExampleIds) {
           return schemaObj.format;
       }
     } else {
-      return fallbackPropertyName || 'string';
+      return propertyName;
     }
   }
   // If type cannot be determined
@@ -381,7 +382,11 @@ function schemaInObjectNotation(rawSchema, options, level = 0, suffix = '') {
       }
     });
     const obj = schemaInObjectNotation(schema, options, 0);
-    return Object.assign({}, objWithAllProps, typeof obj === 'object' && !Array.isArray(obj) ? obj : {});
+    const resultObj = typeof obj === 'object' && !Array.isArray(obj) ? obj : {};
+    // These are the only valuable properties from allOf, everything else isn't going to be available, otherwise fallback to whatever was there from the children objects
+    resultObj['::title'] = schema.title || resultObj['::title'];
+    resultObj['::description'] = schema.description || resultObj['::description'];
+    return Object.assign({}, objWithAllProps, resultObj);
   }
   if (anyOf || oneOf) {
     const objWithAnyOfProps = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-explorer",
-  "version": "2.2.717",
+  "version": "2.2.720",
   "description": "OpenAPI Explorer - API viewer with dynamically generated components, documentation, and interaction console",
   "author": "Authress Developers <developers@authress.io>",
   "type": "module",