Skip to content

Moved quotes inside span tags for key and string values. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubenhak wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Moved quotes inside span tags for key and string values. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12a6202
Rendered HTML looks much better when quotes of key and string literal…
rubenhak May 20, 2018
2c7760f
test fixes.
rubenhak May 20, 2018
c5a7a80
more test fixes.
rubenhak May 20, 2018
20193d5
replaced quotes.
rubenhak May 20, 2018
98c850a
trimmed expected file ending
rubenhak May 20, 2018
eb63e2a
typo fix.
rubenhak May 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/data/pretty1.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion __tests__/data/pretty2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<style>.json-key{ color: red } .json-string{ color: green } .json-boolean{ color: blue } .json-selected { background-color: #ddd }</style> <br> <div class="json-pretty">{<br>&nbsp;&nbsp;"<span class="json-key">site_info</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">copyright</span>":&nbsp;"<span class="json-string"></span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">favicon</span>":&nbsp;"<span class="json-string">favicon.ico</span>"<br>&nbsp;&nbsp;},<br>&nbsp;&nbsp;"<span class="json-key">nav</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">footer</span>":&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">About</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">/about</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">Facebook</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">www.facebook.com/mywebsite</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">target</span>":&nbsp;"<span class="json-string">_blank</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">Twitter</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">https://twitter/mywebsite</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">target</span>":&nbsp;"<span class="json-string">_blank</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;],<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">header</span>":&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">Home</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">/home</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">Product</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">/product</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">label</span>":&nbsp;"<span class="json-string">Blog</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">url</span>":&nbsp;"<span class="json-string">/blog</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;]<br>&nbsp;&nbsp;},<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;"<span class="json-key">pages</span>":&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">key</span>":&nbsp;"<span class="json-string">A Page</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">body</span>":&nbsp;"<span class="json-string"></span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">search_enabled</span>":&nbsp;<span class="json-boolean">true</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">heading</span>":&nbsp;"<span class="json-string">hello</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">tags</span>":&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-string">foo</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-string">bar</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]<br>&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">key</span>":&nbsp;"<span class="json-string">Another Page</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;],</div><div class="json-pretty">&nbsp;&nbsp;"<span class="json-key">messages</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">errors</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">internalError</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">title</span>":&nbsp;"<span class="json-string">Internal Error</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">message</span>":&nbsp;"<span class="json-string">An internal error occurred</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">connectionError</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">title</span>":&nbsp;"<span class="json-string">Network Error</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">message</span>":&nbsp;"<span class="json-string">There seem to be network issues</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">tooltips</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">welcome</span>":&nbsp;"<span class="json-string">Welcome to my web site</span>",<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">sendEmail</span>":&nbsp;"<span class="json-string">click to send an email</span>"<br>&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;}<br>}</div>
<style>.json-key{ color: red } .json-string{ color: green } .json-boolean{ color: blue } .json-selected { background-color: #ddd }</style> <br> <div class="json-pretty">{<br>&nbsp;&nbsp;<span class="json-key">&quot;site_info&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;copyright&quot;</span>:&nbsp;<span class="json-string">&quot;&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;favicon&quot;</span>:&nbsp;<span class="json-string">&quot;favicon.ico&quot;</span><br>&nbsp;&nbsp;},<br>&nbsp;&nbsp;<span class="json-key">&quot;nav&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;footer&quot;</span>:&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;About&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;/about&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;Facebook&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;www.facebook.com/mywebsite&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;target&quot;</span>:&nbsp;<span class="json-string">&quot;_blank&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;Twitter&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;https://twitter/mywebsite&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;target&quot;</span>:&nbsp;<span class="json-string">&quot;_blank&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;],<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;header&quot;</span>:&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;Home&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;/home&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;Product&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;/product&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;label&quot;</span>:&nbsp;<span class="json-string">&quot;Blog&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;url&quot;</span>:&nbsp;<span class="json-string">&quot;/blog&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;]<br>&nbsp;&nbsp;},<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;<span class="json-key">&quot;pages&quot;</span>:&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;key&quot;</span>:&nbsp;<span class="json-string">&quot;A Page&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;body&quot;</span>:&nbsp;<span class="json-string">&quot;&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;search_enabled&quot;</span>:&nbsp;<span class="json-boolean">true</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;heading&quot;</span>:&nbsp;<span class="json-string">&quot;hello&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;tags&quot;</span>:&nbsp;[<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-string">&quot;foo&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-string">&quot;bar&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;]<br>&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;key&quot;</span>:&nbsp;<span class="json-string">&quot;Another Page&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;],</div><div class="json-pretty">&nbsp;&nbsp;<span class="json-key">&quot;messages&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;errors&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;internalError&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;title&quot;</span>:&nbsp;<span class="json-string">&quot;Internal Error&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;message&quot;</span>:&nbsp;<span class="json-string">&quot;An internal error occurred&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;connectionError&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;title&quot;</span>:&nbsp;<span class="json-string">&quot;Network Error&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;message&quot;</span>:&nbsp;<span class="json-string">&quot;There seem to be network issues&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;&nbsp;&nbsp;},<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;tooltips&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;welcome&quot;</span>:&nbsp;<span class="json-string">&quot;Welcome to my web site&quot;</span>,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;sendEmail&quot;</span>:&nbsp;<span class="json-string">&quot;click to send an email&quot;</span><br>&nbsp;&nbsp;&nbsp;&nbsp;}<br>&nbsp;&nbsp;}<br>}</div>
21 changes: 11 additions & 10 deletions __tests__/prettyPrint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const testPrettyPrint = (jsonFile: string, expected: string, selection: string)
'.json-string{ color: green } .json-boolean{ color: blue } ' +
'.json-selected { background-color: #ddd }</style>';
const all = `${styles} <br> ${html}`;
expect(all).toBe(results[1].toString());
var expectedTrimmed = results[1].toString().replace(/^\s+|\s+$/g, '');
expect(all).toBe(expectedTrimmed);
});
});
};
Expand All @@ -30,25 +31,25 @@ test('undefinedOrNull', () => {

test('simple', () => {
const object = { foo: { bar: 'hux' } };
expect(prettyPrint(object)).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;"<span class="json-key">foo</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;}<br>}</div>');
expect(prettyPrint(object, object.foo)).toBe('<div class="json-pretty">{<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;"<span class="json-key">foo</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;}</div><div class="json-pretty">}</div>');
expect(prettyPrint(object, object)).toBe('<div class="json-pretty json-selected">{<br>&nbsp;&nbsp;"<span class="json-key">foo</span>":&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;}<br>}</div>');
expect(prettyPrint(object)).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;<span class="json-key">&quot;foo&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;}<br>}</div>');
expect(prettyPrint(object, object.foo)).toBe('<div class="json-pretty">{<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;<span class="json-key">&quot;foo&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;}</div><div class="json-pretty">}</div>');
expect(prettyPrint(object, object)).toBe('<div class="json-pretty json-selected">{<br>&nbsp;&nbsp;<span class="json-key">&quot;foo&quot;</span>:&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;}<br>}</div>');
});

test('array', () => {
const json = [ 'foo', 'bar' ];
expect(prettyPrint(json)).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;"<span class="json-string">foo</span>",<br>&nbsp;&nbsp;"<span class="json-string">bar</span>"<br>]</div>');
expect(prettyPrint(json)).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;<span class="json-string">&quot;foo&quot;</span>,<br>&nbsp;&nbsp;<span class="json-string">&quot;bar&quot;</span><br>]</div>');
});

test('arrayWithObject', () => {
const json = [ 'foo', { bar : 'hux' } ];
expect(prettyPrint(json)).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;"<span class="json-string">foo</span>",<br>&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;}<br>]</div>');
expect(prettyPrint(json, <object>json[1])).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;"<span class="json-string">foo</span>",<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">hux</span>"<br>&nbsp;&nbsp;}</div><div class="json-pretty">]</div>');
expect(prettyPrint(json)).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;<span class="json-string">&quot;foo&quot;</span>,<br>&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;}<br>]</div>');
expect(prettyPrint(json, <object>json[1])).toBe('<div class="json-pretty">[<br>&nbsp;&nbsp;<span class="json-string">&quot;foo&quot;</span>,<br></div><div class="json-pretty json-selected">&nbsp;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;hux&quot;</span><br>&nbsp;&nbsp;}</div><div class="json-pretty">]</div>');
});

test('options', () => {
expect(prettyPrint({ foo: 'bar' }, null, { indent: ' ' })).toBe('<div class="json-pretty">{<br> "<span class="json-key">foo</span>":&nbsp;"<span class="json-string">bar</span>"<br>}</div>');
expect(prettyPrint({ foo: 'bar' }, null, { indent: '&nbsp;&nbsp;&nbsp;&nbsp;' })).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;&nbsp;&nbsp;"<span class="json-key">foo</span>":&nbsp;"<span class="json-string">bar</span>"<br>}</div>');
expect(prettyPrint({ foo: 'bar' }, null, { indent: ' ' })).toBe('<div class="json-pretty">{<br> <span class="json-key">&quot;foo&quot;</span>:&nbsp;<span class="json-string">&quot;bar&quot;</span><br>}</div>');
expect(prettyPrint({ foo: 'bar' }, null, { indent: '&nbsp;&nbsp;&nbsp;&nbsp;' })).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="json-key">&quot;foo&quot;</span>:&nbsp;<span class="json-string">&quot;bar&quot;</span><br>}</div>');
});

test('circular', () => {
Expand All @@ -59,5 +60,5 @@ test('circular', () => {

test('escapedHtml', () => {
const json = { foo: 'hello <span> world', 'the<key>': 'other', bar: 'with "double" quotes' };
expect(prettyPrint(json)).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;"<span class="json-key">foo</span>":&nbsp;"<span class="json-string">hello &lt;span&gt; world</span>",<br>&nbsp;&nbsp;"<span class="json-key">the&lt;key&gt;</span>":&nbsp;"<span class="json-string">other</span>",<br>&nbsp;&nbsp;"<span class="json-key">bar</span>":&nbsp;"<span class="json-string">with &quot;double&quot; quotes</span>"<br>}</div>');
expect(prettyPrint(json)).toBe('<div class="json-pretty">{<br>&nbsp;&nbsp;<span class="json-key">&quot;foo&quot;</span>:&nbsp;<span class="json-string">&quot;hello &lt;span&gt; world&quot;</span>,<br>&nbsp;&nbsp;<span class="json-key">&quot;the&lt;key&gt;&quot;</span>:&nbsp;<span class="json-string">&quot;other&quot;</span>,<br>&nbsp;&nbsp;<span class="json-key">&quot;bar&quot;</span>:&nbsp;<span class="json-string">&quot;with &quot;double&quot; quotes&quot;</span><br>}</div>');
});
8 changes: 2 additions & 6 deletions src/prettyPrint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,11 @@ class PrintWriter {
}

public printKey(key: string) {
this.buffer.push('\"');
this.buffer.push(`<span class="json-key">${escapeHtml(key)}</span>`);
this.buffer.push('\"');
this.buffer.push(`<span class="json-key">&quot;${escapeHtml(key)}&quot;</span>`);
}

public printString(value: string) {
this.buffer.push('\"');
this.buffer.push(`<span class="json-string">${escapeHtml(value)}</span>`);
this.buffer.push('\"');
this.buffer.push(`<span class="json-string">&quot;${escapeHtml(value)}&quot;</span>`);
}

public printBoolean(value: boolean) {
Expand Down