openapi-explorer 0.9.359 → 0.9.364

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

@@ -375,22 +375,22 @@ function getExampleValuesFromSchemaRecursive(schema, config = {}) {
  */
 
 
-function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
-  if (!schema) {
+function schemaInObjectNotation(rawSchema, _, level = 0, suffix = '') {
+  if (!rawSchema) {
     return undefined;
   }
 
-  if (schema.allOf) {
+  const {
+    allOf,
+    oneOf,
+    anyOf,
+    ...schema
+  } = rawSchema;
+
+  if (allOf) {
+    // If allOf is an array of multiple elements, then all the keys makes a single object
     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
-      const tempSchema = schema.allOf[0];
-      return `${getTypeInfo(tempSchema).html}`;
-    } // If allOf is an array of multiple elements, then all the keys makes a single object
-
-
-    schema.allOf.map((v, i) => {
+    allOf.map((v, i) => {
       if (v.type === 'object' || v.properties || v.allOf || v.anyOf || v.oneOf) {
         const propSuffix = (v.anyOf || v.oneOf) && i > 0 ? i : '';
         const partialObj = schemaInObjectNotation(v, {}, level + 1, propSuffix);
@@ -403,33 +403,12 @@ function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
         const typeObj = getTypeInfo(v);
         objWithAllProps[prop] = `${typeObj.html}`;
       }
-    }); // eslint-disable-next-line no-param-reassign
-
-    obj = objWithAllProps;
-  } else if (schema.anyOf || schema.oneOf) {
-    obj['::description'] = schema.description || ''; // 1. First iterate the regular properties
-
-    if (schema.type === 'object' || schema.properties) {
-      obj['::description'] = schema.description || '';
-      obj['::flags'] = {
-        '🆁': schema.readOnly && '🆁',
-        '🆆': schema.writeOnly && '🆆'
-      };
-      obj['::type'] = 'object'; // obj['::deprecated'] = schema.deprecated || false;
-
-      for (const key in schema.properties) {
-        if (schema.required && schema.required.includes(key)) {
-          obj[`${key}*`] = schemaInObjectNotation(schema.properties[key], {}, level + 1);
-        } else {
-          obj[key] = schemaInObjectNotation(schema.properties[key], {}, level + 1);
-        }
-      }
-    } // 2. Then show allof/anyof objects
-
-
+    });
+    const obj = schemaInObjectNotation(schema, {}, 0);
+    return Object.assign({}, objWithAllProps, typeof obj === 'object' && !Array.isArray(obj) ? obj : {});
+  } else if (anyOf || oneOf) {
     const objWithAnyOfProps = {};
-    const xxxOf = schema.anyOf ? 'anyOf' : 'oneOf';
-    schema[xxxOf].forEach((v, index) => {
+    (anyOf || oneOf || []).forEach((v, index) => {
       if (v.type === 'object' || v.properties || v.allOf || v.anyOf || v.oneOf) {
         const partialObj = schemaInObjectNotation(v, {});
         objWithAnyOfProps[`::OPTION~${index + 1}${v.title ? `~${v.title}` : ''}`] = partialObj;
@@ -445,11 +424,15 @@ function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
         objWithAnyOfProps['::type'] = 'xxx-of-option';
       }
     });
-    obj[schema.anyOf ? `::ANY~OF ${suffix}` : `::ONE~OF ${suffix}`] = objWithAnyOfProps;
-    obj['::type'] = 'xxx-of';
+    const obj = schemaInObjectNotation(schema, {}, 0);
+    const resultObj = typeof obj === 'object' && !Array.isArray(obj) ? obj : {};
+    resultObj[anyOf ? `::ANY~OF ${suffix}` : `::ONE~OF ${suffix}`] = objWithAnyOfProps;
+    resultObj['::type'] = 'xxx-of';
+    return resultObj;
   } else if (Array.isArray(schema.type)) {
-    // When a property has multiple types, then check further if any of the types are array or object, if yes then modify the schema using one-of
+    const obj = {}; // When a property has multiple types, then check further if any of the types are array or object, if yes then modify the schema using one-of
     // Clone the schema - as it will be modified to replace multi-data-types with one-of;
+
     const subSchema = JSON.parse(JSON.stringify(schema));
     const primitiveType = [];
     const complexTypes = [];
@@ -532,7 +515,10 @@ function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
       multiTypeOptions[`::OPTION~${complexTypes.length + 1}`] = multiPrimitiveTypes && multiPrimitiveTypes.html || '';
       obj['::ONE~OF'] = multiTypeOptions;
     }
+
+    return obj;
   } else if (schema.type === 'object' || schema.properties) {
+    const obj = {};
     obj['::title'] = schema.title || '';
     obj['::description'] = schema.description || '';
     obj['::flags'] = {
@@ -553,8 +539,11 @@ function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
     if (schema.additionalProperties) {
       obj['<any-key>'] = schemaInObjectNotation(schema.additionalProperties, {});
     }
+
+    return obj;
   } else if (schema.type === 'array' || schema.items) {
     // If Array
+    const obj = {};
     obj['::title'] = schema.title || '';
     obj['::description'] = schema.description ? schema.description : schema.items && schema.items.description ? `array&lt;${schema.items.description}&gt;` : '';
     obj['::flags'] = {
@@ -568,17 +557,11 @@ function schemaInObjectNotation(schema, obj, level = 0, suffix = '') {
       readOnly: schema.readOnly,
       writeOnly: schema.writeOnly
     }, schema.items), {}, level + 1);
-  } else {
-    const typeObj = getTypeInfo(schema);
-
-    if (typeObj && typeObj.html) {
-      return `${typeObj.html}`;
-    }
-
-    return '';
+    return obj;
   }
 
-  return obj;
+  const typeObj = getTypeInfo(schema);
+  return `${(typeObj === null || typeObj === void 0 ? void 0 : typeObj.html) || ''}`;
 }
 /* Create Example object */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-explorer",
-  "version": "0.9.359",
+  "version": "0.9.364",
   "description": "OpenAPI Explorer - API viewer with dynamically generated components, documentation, and interaction console",
   "author": "Rhosys Developers <developers@rhosys.ch>",
   "repository": {
@@ -50,8 +50,8 @@
     "buffer": "^6.0.3",
     "color": "^4.2.3",
     "create-hash": "^1.2.0",
-    "lit-element": "2.4.0",
-    "lit-html": "^1.1.1",
+    "lit-element": "^3.2.2",
+    "lit-html": "^2.3.1",
     "lodash.clonedeep": "^4.5.0",
     "marked": "^4.0.16",
     "mime-db": "^1.52.0",