From 416f36f473c1411d7fd9389fddf8630a4c309eb3 Mon Sep 17 00:00:00 2001
From: Alex Karo <alex@karo-dev.ru>
Date: Tue, 16 Jul 2019 23:54:03 +0300
Subject: [PATCH] fix: rename normalizer function and some vars

---
 src/services/RedocNormalizedOptions.ts |  4 ++--
 src/utils/jsonToHtml.ts                | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/services/RedocNormalizedOptions.ts b/src/services/RedocNormalizedOptions.ts
index fe924cde..084345e5 100644
--- a/src/services/RedocNormalizedOptions.ts
+++ b/src/services/RedocNormalizedOptions.ts
@@ -111,7 +111,7 @@ export class RedocNormalizedOptions {
     return value;
   }
 
-  private static normalizeSampleCollapseLevel(level?: number | string | 'all'): number {
+  private static normalizeJsonSampleExpandLevel(level?: number | string | 'all'): number {
     if (level === 'all') {
       return +Infinity;
     }
@@ -168,7 +168,7 @@ export class RedocNormalizedOptions {
     this.onlyRequiredInSamples = argValueToBoolean(raw.onlyRequiredInSamples);
     this.showExtensions = RedocNormalizedOptions.normalizeShowExtensions(raw.showExtensions);
     this.hideSingleRequestSampleTab = argValueToBoolean(raw.hideSingleRequestSampleTab);
-    this.jsonSampleExpandLevel = RedocNormalizedOptions.normalizeSampleCollapseLevel(
+    this.jsonSampleExpandLevel = RedocNormalizedOptions.normalizeJsonSampleExpandLevel(
       raw.jsonSampleExpandLevel,
     );
 
diff --git a/src/utils/jsonToHtml.ts b/src/utils/jsonToHtml.ts
index e0eadc9e..bbdc638e 100644
--- a/src/utils/jsonToHtml.ts
+++ b/src/utils/jsonToHtml.ts
@@ -1,10 +1,10 @@
 let level = 1;
 
-export function jsonToHTML(json, maxCollapseLevel) {
+export function jsonToHTML(json, maxExpandLevel) {
   level = 1;
   let output = '';
   output += '<div class="redoc-json">';
-  output += valueToHTML(json, maxCollapseLevel);
+  output += valueToHTML(json, maxExpandLevel);
   output += '</div>';
   return output;
 }
@@ -32,20 +32,20 @@ function punctuation(val) {
   return '<span class="token punctuation">' + val + '</span>';
 }
 
-function valueToHTML(value, maxCollapseLevel: number) {
+function valueToHTML(value, maxExpandLevel: number) {
   const valueType = typeof value;
   let output = '';
   if (value === undefined || value === null) {
     output += decorateWithSpan('null', 'token keyword');
   } else if (value && value.constructor === Array) {
     level++;
-    output += arrayToHTML(value, maxCollapseLevel);
+    output += arrayToHTML(value, maxExpandLevel);
     level--;
   } else if (value && value.constructor === Date) {
     output += decorateWithSpan('"' + value.toISOString() + '"', 'token string');
   } else if (valueType === 'object') {
     level++;
-    output += objectToHTML(value, maxCollapseLevel);
+    output += objectToHTML(value, maxExpandLevel);
     level--;
   } else if (valueType === 'number') {
     output += decorateWithSpan(value, 'token number');
@@ -69,8 +69,8 @@ function valueToHTML(value, maxCollapseLevel: number) {
   return output;
 }
 
-function arrayToHTML(json, maxCollapseLevel: number) {
-  const collapsed = level > maxCollapseLevel ? 'collapsed' : '';
+function arrayToHTML(json, maxExpandLevel: number) {
+  const collapsed = level > maxExpandLevel ? 'collapsed' : '';
   let output = `<div class="collapser"></div>${punctuation(
     '[',
   )}<span class="ellipsis"></span><ul class="array collapsible">`;
@@ -79,7 +79,7 @@ function arrayToHTML(json, maxCollapseLevel: number) {
   for (let i = 0; i < length; i++) {
     hasContents = true;
     output += '<li><div class="hoverable ' + collapsed + '">';
-    output += valueToHTML(json[i], maxCollapseLevel);
+    output += valueToHTML(json[i], maxExpandLevel);
     if (i < length - 1) {
       output += ',';
     }
@@ -92,8 +92,8 @@ function arrayToHTML(json, maxCollapseLevel: number) {
   return output;
 }
 
-function objectToHTML(json, maxCollapseLevel: number) {
-  const collapsed = level > maxCollapseLevel ? 'collapsed' : '';
+function objectToHTML(json, maxExpandLevel: number) {
+  const collapsed = level > maxExpandLevel ? 'collapsed' : '';
   const keys = Object.keys(json);
   const length = keys.length;
   let output = `<div class="collapser"></div>${punctuation(
@@ -105,7 +105,7 @@ function objectToHTML(json, maxCollapseLevel: number) {
     hasContents = true;
     output += '<li><div class="hoverable ' + collapsed + '">';
     output += '<span class="property token string">"' + htmlEncode(key) + '"</span>: ';
-    output += valueToHTML(json[key], maxCollapseLevel);
+    output += valueToHTML(json[key], maxExpandLevel);
     if (i < length - 1) {
       output += punctuation(',');
     }