Skip to content

Commit 9ea143f

Browse files
johanjohan
committed
Skip weird leading \uFFFD unprintable in recent builds. Cleaner jsonp regexp.
1 parent 799a88e commit 9ea143f

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

‎QuickJSON/quicklookjson.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "quicklookjson.h"
22

3-
#define HTML_HEADER "<!DOCTYPE html SYSTEM><html><head><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" /><style>.prop{font-weight:bold}.null {color:red}.bool,.num {color:blue}.string {color:green;white-space:pre-wrap}h1 {font-size:1.2em}.error {-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;border:1px solid #970000;background:#F7E8E8;margin:0.5em;padding:0.5em}.json {white-space:pre-wrap;font-family:monospace;font-size:1.1em}.callback {font-family:monospace;color:#A52A2A}.folded * {position:absolute;color:transparent;height:0;width:0;outline:5px solid red;white-space:normal;top:-100000cm;left:-100000cm}*.folded.array:before {content:\"[\\002026 ]\"}.folded.obj:before {content:\"{\\002026 }\"}.callback +.json >.folded:after {content:\"\"}.folded:after {content:\" \"}.folded {background:#FFF}.folded:hover {background:rgba(255,192,203,0.5)}.folded {cursor:se-resize}.unfolded {cursor:nw-resize}.unfolded.hovered {background:rgba(255,192,203,0.5)}</style><script>var JSONFormatter=(function(){var toString=Object.prototype.toString,re=/^[\\s\\u200B\\uFEFF]*([\\w$\\[\\]\\.]+)[\\s\\u200B\\uFEFF]*\\([\\s\\u200B\\uFEFF]*([\\[{][\\s\\S]*[\\]}])[\\s\\u200B\\uFEFF]*\\)([\\s\\u200B\\uFEFF;]*)$/m;function detectJSONP(s){var js=s,cb='',se='',match;if('string'!==typeof s)return wrapJSONP(s,cb,se);if((match=re.exec(s))&&4===match.length){cb=match[1];js=match[2];se=match[3].replace(/[^;]+/g,'');}try{return wrapJSONP(JSON.parse(js),cb,se);}catch(e){return error(e,s);}}function wrapJSONP(val,callback,semicolon){var output=span(value(val,callback?'':null,callback&&'<br\\n/>'),'json');if(callback)output=span(callback+'(','callback')+output+span(')'+semicolon,'callback');return output;}function isArray(obj){return'[object Array]'===toString.call(obj);}function span(html,className){return'<span class=\"\\''+className+'\\\">'+html+'</span>';}function error(e,data){return span('Error parsing JSON: '+e,'error')+'<h1>Content:</h1>'+span(html(data),'json');}function html(s,isAttribute){if(s==null)return'';s=(s+'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');return isAttribute?s.replace(/'/g,'&apos;'):s;}var js=JSON.stringify('\\b\\f\\n\\r\\t').length===12?function saneJSEscaper(s,noQuotes){s=html(JSON.stringify(s).slice(1,-1));return noQuotes?s:'&quot;'+s+'&quot;';}:function insaneEscaper(s,noQuotes){var had={'\\b':'b','\\f':'f','\\r':'r','\\n':'n','\\t':'t'},ws;for(ws in had)if(-1===s.indexOf(ws))delete had[ws];s=JSON.stringify(s).slice(1,-1);for(ws in had)s=s.replace(new RegExp('\\\\\\\\u000'+(ws.charCodeAt().toString(16)),'ig'),'\\\\'+had[ws]);s=html(s);return noQuotes?s:'&quot;'+s+'&quot;';};function value(v,indent,nl){var output;switch(typeof v){case'boolean':output=span(html(v),'bool');break;case'number':output=span(html(v),'num');break;case'string':if(/^(\\w+):\\/\\/[^\\s]+$/i.test(v)){output='&quot;<a href=\"\\''+html(v,!!'attribute')+'\\\">'+js(v,1)+'</a>&quot;';}else{output=span(js(v),'string');}break;case'object':if(null===v){output=span('null','null');}else{indent=indent==null?'':indent+'&nbsp; ';if(isArray(v)){output=array(v,indent,nl);}else{output=object(v,indent,nl);}}break;}return output;}function object(obj,indent,nl){var output='';for(var key in obj){if(output)output+='<br\\n/>'+indent+', ';output+=span(js(key),'prop')+': '+value(obj[key],indent,'<br\\n/>');}if(!output)return'{}';return'<span class=\\'unfolded obj\\'><span class=\"content\">'+(nl?nl+indent:'')+'{ '+output+'<br\\n/>'+indent+'}</span>';}function array(a,indent,nl){for(var i=0,output='';i<a.length;i++){if(output)output+='<br\\n/>'+indent+', ';output+=value(a[i],indent,'');}if(!output)return'[]';return'<span class=\\'unfolded array\\'><span class=\"content\">'+(nl?nl+indent:'')+'[ '+output+'<br\\n/>'+indent+']</span>';}function JSONFormatter(s){return detectJSONP(s);}JSONFormatter.init=function init(doc){doc=doc||document;doc.addEventListener('click',function folding(e){var elem=e.target,is,is_json=elem;while(is_json&&is_json.className!='json')is_json=is_json.parentNode;if(!is_json)return;do{if(/^a$/i.test(elem.nodeName))return;is=elem.className||'';}while(!/\\b(un)?folded /.test(is)&&(elem=elem.parentNode));if(elem){elem.className=/unfolded /.test(is)?is.replace('unfolded ','folded '):is.replace('folded ','unfolded ');}},false);};return JSONFormatter;})();</script><script>function init() { JSONFormatter.init(); var json = document.getElementById('json').textContent; document.body.innerHTML = JSONFormatter(json); }</script></head><body onload=\"init()\"><script id=\"json\" type=\"application/json\">"
3+
#define HTML_HEADER "<!DOCTYPE html SYSTEM><html><head><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" /><style>.prop{font-weight:bold}.null{color:red}.bool,.num{color:blue}.string{color:green;white-space:pre-wrap}h1{font-size:1.2em}.error{-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;border:1px solid #970000;background:#f7e8e8;margin:.5em;padding:.5em}body{white-space:pre-wrap;font-family:monospace;font-size:1.1em}.callback{font-family:monospace;color:#a52a2a}.folded *{position:absolute;color:transparent;height:0;width:0;outline:5px solid red;white-space:normal;top:-100000cm;left:-100000cm}*.folded.array:before{content:\"[\\002026 ]\"}.folded.obj:before{content:\"{\\002026 }\"}.callback+.json>.folded:after{content:\"\"}.folded:after{content:\" \"}.folded{background:#FFF}.folded:hover{background:rgba(255,192,203,0.5)}.folded{cursor:se-resize}.unfolded{cursor:nw-resize}.unfolded.hovered{background:rgba(255,192,203,0.5)}</style><script>var JSONFormatter=(function(){var toString=Object.prototype.toString,re=/^[\\s\\u200B\\uFEFF]*([\\w$\\[\\]\\.]+)[\\s\\u200B\\uFEFF]*\\([\\s\\u200B\\uFEFF]*([\\[{][\\s\\S]*[\\]}])[\\s\\u200B\\uFEFF]*\\)([\\s\\u200B\\uFEFF;]*)$/m;function detectJSONP(s){var js=s,cb='',se='',match;if('string'!==typeof s)return wrapJSONP(s,cb,se);if((match=re.exec(s))&&4===match.length){cb=match[1];js=match[2];se=match[3].replace(/[^;]+/g,'');}try{return wrapJSONP(JSON.parse(js),cb,se);}catch(e){return error(e,s);}}function wrapJSONP(val,callback,semicolon){var output=span(value(val,callback?'':null,callback&&'<br\\n/>'),'json');if(callback)output=span(callback+'(','callback')+output+span(')'+semicolon,'callback');return output;}function isArray(obj){return'[object Array]'===toString.call(obj);}function span(html,className){return'<span class=\"\\''+className+'\\\">'+html+'</span>';}function error(e,data){return span('Error parsing JSON: '+e,'error')+'<h1>Content:</h1>'+span(html(data),'json');}function html(s,isAttribute){if(s==null)return'';s=(s+'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');return isAttribute?s.replace(/'/g,'&apos;'):s;}var js=JSON.stringify('\\b\\f\\n\\r\\t').length===12?function saneJSEscaper(s,noQuotes){s=html(JSON.stringify(s).slice(1,-1));return noQuotes?s:'&quot;'+s+'&quot;';}:function insaneEscaper(s,noQuotes){var had={'\\b':'b','\\f':'f','\\r':'r','\\n':'n','\\t':'t'},ws;for(ws in had)if(-1===s.indexOf(ws))delete had[ws];s=JSON.stringify(s).slice(1,-1);for(ws in had)s=s.replace(new RegExp('\\\\\\\\u000'+(ws.charCodeAt().toString(16)),'ig'),'\\\\'+had[ws]);s=html(s);return noQuotes?s:'&quot;'+s+'&quot;';};function value(v,indent,nl){var output;switch(typeof v){case'boolean':output=span(html(v),'bool');break;case'number':output=span(html(v),'num');break;case'string':if(/^(\\w+):\\/\\/[^\\s]+$/i.test(v)){output='&quot;<a href=\"\\''+html(v,!!'attribute')+'\\\">'+js(v,1)+'</a>&quot;';}else{output=span(js(v),'string');}break;case'object':if(null===v){output=span('null','null');}else{indent=indent==null?'':indent+'&nbsp; ';if(isArray(v)){output=array(v,indent,nl);}else{output=object(v,indent,nl);}}break;}return output;}function object(obj,indent,nl){var output='';for(var key in obj){if(output)output+='<br\\n/>'+indent+', ';output+=span(js(key),'prop')+': '+value(obj[key],indent,'<br\\n/>');}if(!output)return'{}';return'<span class=\\'unfolded obj\\'><span class=\"content\">'+(nl?nl+indent:'')+'{ '+output+'<br\\n/>'+indent+'}</span>';}function array(a,indent,nl){for(var i=0,output='';i<a.length;i++){if(output)output+='<br\\n/>'+indent+', ';output+=value(a[i],indent,'');}if(!output)return'[]';return'<span class=\\'unfolded array\\'><span class=\"content\">'+(nl?nl+indent:'')+'[ '+output+'<br\\n/>'+indent+']</span>';}function JSONFormatter(s){return detectJSONP(s);}JSONFormatter.init=function init(doc){doc=doc||document;doc.addEventListener('click',function folding(e){var elem=e.target,is,is_json=elem;while(is_json&&is_json.className!='json')is_json=is_json.parentNode;if(!is_json)return;do{if(/^a$/i.test(elem.nodeName))return;is=elem.className||'';}while(!/\\b(un)?folded /.test(is)&&(elem=elem.parentNode));if(elem){elem.className=/unfolded /.test(is)?is.replace('unfolded ','folded '):is.replace('folded ','unfolded ');}},false);};return JSONFormatter;})();</script><script>function init() { JSONFormatter.init(); var json = document.getElementById('json').textContent; if (json.charCodeAt() === 65533) json = json.slice(1); document.body.innerHTML = JSONFormatter(json); }</script></head><body onload=\"init()\"><script id=\"json\" type=\"application/json\">"
44
#define HTML_FOOTER "</script></body></html>"
55

66
int main(int argc, char* argv[]) {

‎json-viewer/formatter.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
var JSONFormatter = (function() {
2-
var toString = Object.prototype.toString, re =
3-
// This regex attempts to match a JSONP structure ("ws" includes Unicode ws)
4-
// * optional leading ws
5-
// * callback name (any valid function name as per ECMA-262 Edition 3 specs)
6-
// * optional ws
7-
// * open parenthesis
8-
// * optional ws
9-
// * either { or [, the only two valid characters to start a JSON string
10-
// * any character, any number of times
11-
// * either } or ], the only two valid closing characters of a JSON string
12-
// * optional trailing ws and semicolon
2+
var toString = Object.prototype.toString
3+
, whitespace = '[\s\u200B\uFEFF]*'
4+
, is_jsonp_re = new RegExp // This regex attempts to match a JSONP structure
5+
( '^' + whitespace // optional leading ws
6+
+ '([\\w$\\[\\]\\.]+)' // callback name (function name; ECMA-262, 3rd ed.)
7+
+ whitespace +'\\('+ whitespace // open parenthesis, with optional ws
8+
+ '('
9+
+ '[\\[{]' // { or [, the only two valid characters to open JSON strings
10+
+ '[\\s\\S]*' // any character, any number of times (including newlines)
11+
+ '[\\]}]' // } or ], the only two valid close characters of JSON strings
12+
+ ')'
13+
+ whitespace +'\\)'+ whitespace // closing parenthesis, with optional ws
14+
+ '([\s\u200B\uFEFF;]*)$' // optional trailing ws and semicolon
15+
);
1316
// (this of course misses anything that has comments, more than one callback
1417
// -- or otherwise requires modification before use by a proper JSON parser)
15-
/^[\s\u200B\uFEFF]*([\w$\[\]\.]+)[\s\u200B\uFEFF]*\([\s\u200B\uFEFF]*([\[{][\s\S]*[\]}])[\s\u200B\uFEFF]*\)([\s\u200B\uFEFF;]*)$/m;
1618

1719
function detectJSONP(s, url) {
1820
var js = s, cb = '', se = '', match;
19-
if ((match = re.exec(s)) && 4 === match.length) {
21+
if ((match = is_jsonp_re.exec(s)) && 4 === match.length) {
2022
cb = match[1];
2123
js = match[2];
2224
se = match[3].replace(/[^;]+/g, '');

0 commit comments

Comments
 (0)