StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `util.sanitize` to `util.repair`

This commit is contained in:
jos 2019-07-27 13:13:02 +02:00
parent df952ac61d
commit cec16b9de1
5 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/previewmode.js
View File

@ -437,9 +437,9 @@ previewmode.format = function () {
*/ */
previewmode.repair = function () { previewmode.repair = function () {
var text = this.getText(); var text = this.getText();
var sanitizedText = util.sanitize(text); var repairedText = util.repair(text);
this._setTextAndFireOnChange(sanitizedText); this._setTextAndFireOnChange(repairedText);
}; };
/** /**

4
src/js/textmode.js
View File

@ -642,8 +642,8 @@ textmode.format = function () {
*/ */
textmode.repair = function () { textmode.repair = function () {
var text = this.getText(); var text = this.getText();
var sanitizedText = util.sanitize(text); var repairedText = util.repair(text);
this.setText(sanitizedText); this.setText(repairedText);
}; };
/** /**

12
src/js/treemode.js
View File

@ -279,11 +279,11 @@ treemode.setText = function(jsonText) {
this.set(util.parse(jsonText)); // this can throw an error this.set(util.parse(jsonText)); // this can throw an error
} }
catch (err) { catch (err) {
// try to sanitize json, replace JavaScript notation with JSON notation // try to repair json, replace JavaScript notation with JSON notation
var sanitizedJsonText = util.sanitize(jsonText); var repairedJsonText = util.repair(jsonText);
// try to parse again // try to parse again
this.set(util.parse(sanitizedJsonText)); // this can throw an error this.set(util.parse(repairedJsonText)); // this can throw an error
} }
}; };
@ -297,11 +297,11 @@ treemode.updateText = function(jsonText) {
this.update(util.parse(jsonText)); // this can throw an error this.update(util.parse(jsonText)); // this can throw an error
} }
catch (err) { catch (err) {
// try to sanitize json, replace JavaScript notation with JSON notation // try to repair json, replace JavaScript notation with JSON notation
var sanitizedJsonText = util.sanitize(jsonText); var repairJsonText = util.repair(jsonText);
// try to parse again // try to parse again
this.update(util.parse(sanitizedJsonText)); // this can throw an error this.update(util.parse(repairJsonText)); // this can throw an error
} }
}; };

4
src/js/util.js
View File

@ -28,14 +28,14 @@ exports.parse = function parse(jsonString) {
}; };
/** /**
* Sanitize a JSON-like string containing. For example changes JavaScript * Repair a JSON-like string containing. For example changes JavaScript
* notation into JSON notation. * notation into JSON notation.
* This function for example changes a string like "{a: 2, 'b': {c: 'd'}" * This function for example changes a string like "{a: 2, 'b': {c: 'd'}"
* into '{"a": 2, "b": {"c": "d"}' * into '{"a": 2, "b": {"c": "d"}'
* @param {string} jsString * @param {string} jsString
* @returns {string} json * @returns {string} json
*/ */
exports.sanitize = function (jsString) { exports.repair = function (jsString) {
// escape all single and double quotes inside strings // escape all single and double quotes inside strings
var chars = []; var chars = [];
var i = 0; var i = 0;

104
test/util.test.js
View File

@ -3,94 +3,94 @@ var util = require('../src/js/util');
describe('util', function () { describe('util', function () {
describe('sanitize', function () { describe('repair', function () {
it('should leave valid JSON as is', function () { it('should leave valid JSON as is', function () {
assert.strictEqual(util.sanitize('{"a":2}'), '{"a":2}'); assert.strictEqual(util.repair('{"a":2}'), '{"a":2}');
}); });
it('should replace JavaScript with JSON', function () { it('should replace JavaScript with JSON', function () {
assert.strictEqual(util.sanitize('{a:2}'), '{"a":2}'); assert.strictEqual(util.repair('{a:2}'), '{"a":2}');
assert.strictEqual(util.sanitize('{a: 2}'), '{"a": 2}'); assert.strictEqual(util.repair('{a: 2}'), '{"a": 2}');
assert.strictEqual(util.sanitize('{\n a: 2\n}'), '{\n "a": 2\n}'); assert.strictEqual(util.repair('{\n a: 2\n}'), '{\n "a": 2\n}');
assert.strictEqual(util.sanitize('{\'a\':2}'), '{"a":2}'); assert.strictEqual(util.repair('{\'a\':2}'), '{"a":2}');
assert.strictEqual(util.sanitize('{a:\'foo\'}'), '{"a":"foo"}'); assert.strictEqual(util.repair('{a:\'foo\'}'), '{"a":"foo"}');
assert.strictEqual(util.sanitize('{a:\'foo\',b:\'bar\'}'), '{"a":"foo","b":"bar"}'); assert.strictEqual(util.repair('{a:\'foo\',b:\'bar\'}'), '{"a":"foo","b":"bar"}');
// should leave string content untouched // should leave string content untouched
assert.strictEqual(util.sanitize('"{a:b}"'), '"{a:b}"'); assert.strictEqual(util.repair('"{a:b}"'), '"{a:b}"');
}); });
it('should add/remove escape characters', function () { it('should add/remove escape characters', function () {
assert.strictEqual(util.sanitize('"foo\'bar"'), '"foo\'bar"'); assert.strictEqual(util.repair('"foo\'bar"'), '"foo\'bar"');
assert.strictEqual(util.sanitize('"foo\\"bar"'), '"foo\\"bar"'); assert.strictEqual(util.repair('"foo\\"bar"'), '"foo\\"bar"');
assert.strictEqual(util.sanitize('\'foo"bar\''), '"foo\\"bar"'); assert.strictEqual(util.repair('\'foo"bar\''), '"foo\\"bar"');
assert.strictEqual(util.sanitize('\'foo\\\'bar\''), '"foo\'bar"'); assert.strictEqual(util.repair('\'foo\\\'bar\''), '"foo\'bar"');
assert.strictEqual(util.sanitize('"foo\\\'bar"'), '"foo\'bar"'); assert.strictEqual(util.repair('"foo\\\'bar"'), '"foo\'bar"');
}); });
it('should replace special white characters', function () { it('should replace special white characters', function () {
assert.strictEqual(util.sanitize('{"a":\u00a0"foo\u00a0bar"}'), '{"a": "foo\u00a0bar"}'); assert.strictEqual(util.repair('{"a":\u00a0"foo\u00a0bar"}'), '{"a": "foo\u00a0bar"}');
assert.strictEqual(util.sanitize('{"a":\u2009"foo"}'), '{"a": "foo"}'); assert.strictEqual(util.repair('{"a":\u2009"foo"}'), '{"a": "foo"}');
}); });
it('should escape unescaped control characters', function () { it('should escape unescaped control characters', function () {
assert.strictEqual(util.sanitize('"hello\bworld"'), '"hello\\bworld"') assert.strictEqual(util.repair('"hello\bworld"'), '"hello\\bworld"')
assert.strictEqual(util.sanitize('"hello\fworld"'), '"hello\\fworld"') assert.strictEqual(util.repair('"hello\fworld"'), '"hello\\fworld"')
assert.strictEqual(util.sanitize('"hello\nworld"'), '"hello\\nworld"') assert.strictEqual(util.repair('"hello\nworld"'), '"hello\\nworld"')
assert.strictEqual(util.sanitize('"hello\rworld"'), '"hello\\rworld"') assert.strictEqual(util.repair('"hello\rworld"'), '"hello\\rworld"')
assert.strictEqual(util.sanitize('"hello\tworld"'), '"hello\\tworld"') assert.strictEqual(util.repair('"hello\tworld"'), '"hello\\tworld"')
assert.strictEqual(util.sanitize('{"value\n": "dc=hcm,dc=com"}'), '{"value\\n": "dc=hcm,dc=com"}') assert.strictEqual(util.repair('{"value\n": "dc=hcm,dc=com"}'), '{"value\\n": "dc=hcm,dc=com"}')
}) })
it('should replace left/right quotes', function () { it('should replace left/right quotes', function () {
assert.strictEqual(util.sanitize('\u2018foo\u2019'), '"foo"') assert.strictEqual(util.repair('\u2018foo\u2019'), '"foo"')
assert.strictEqual(util.sanitize('\u201Cfoo\u201D'), '"foo"') assert.strictEqual(util.repair('\u201Cfoo\u201D'), '"foo"')
assert.strictEqual(util.sanitize('\u0060foo\u00B4'), '"foo"') assert.strictEqual(util.repair('\u0060foo\u00B4'), '"foo"')
}); });
it('remove comments', function () { it('remove comments', function () {
assert.strictEqual(util.sanitize('/* foo */ {}'), ' {}'); assert.strictEqual(util.repair('/* foo */ {}'), ' {}');
assert.strictEqual(util.sanitize('/* foo */ {}'), ' {}'); assert.strictEqual(util.repair('/* foo */ {}'), ' {}');
assert.strictEqual(util.sanitize('{a:\'foo\',/*hello*/b:\'bar\'}'), '{"a":"foo","b":"bar"}'); assert.strictEqual(util.repair('{a:\'foo\',/*hello*/b:\'bar\'}'), '{"a":"foo","b":"bar"}');
assert.strictEqual(util.sanitize('{\na:\'foo\',//hello\nb:\'bar\'\n}'), '{\n"a":"foo",\n"b":"bar"\n}'); assert.strictEqual(util.repair('{\na:\'foo\',//hello\nb:\'bar\'\n}'), '{\n"a":"foo",\n"b":"bar"\n}');
// should not remove comments in string // should not remove comments in string
assert.strictEqual(util.sanitize('{"str":"/* foo */"}'), '{"str":"/* foo */"}'); assert.strictEqual(util.repair('{"str":"/* foo */"}'), '{"str":"/* foo */"}');
}); });
it('should strip JSONP notation', function () { it('should strip JSONP notation', function () {
// matching // matching
assert.strictEqual(util.sanitize('callback_123({});'), '{}'); assert.strictEqual(util.repair('callback_123({});'), '{}');
assert.strictEqual(util.sanitize('callback_123([]);'), '[]'); assert.strictEqual(util.repair('callback_123([]);'), '[]');
assert.strictEqual(util.sanitize('callback_123(2);'), '2'); assert.strictEqual(util.repair('callback_123(2);'), '2');
assert.strictEqual(util.sanitize('callback_123("foo");'), '"foo"'); assert.strictEqual(util.repair('callback_123("foo");'), '"foo"');
assert.strictEqual(util.sanitize('callback_123(null);'), 'null'); assert.strictEqual(util.repair('callback_123(null);'), 'null');
assert.strictEqual(util.sanitize('callback_123(true);'), 'true'); assert.strictEqual(util.repair('callback_123(true);'), 'true');
assert.strictEqual(util.sanitize('callback_123(false);'), 'false'); assert.strictEqual(util.repair('callback_123(false);'), 'false');
assert.strictEqual(util.sanitize('/* foo bar */ callback_123 ({})'), '{}'); assert.strictEqual(util.repair('/* foo bar */ callback_123 ({})'), '{}');
assert.strictEqual(util.sanitize('/* foo bar */ callback_123 ({})'), '{}'); assert.strictEqual(util.repair('/* foo bar */ callback_123 ({})'), '{}');
assert.strictEqual(util.sanitize('/* foo bar */\ncallback_123({})'), '{}'); assert.strictEqual(util.repair('/* foo bar */\ncallback_123({})'), '{}');
assert.strictEqual(util.sanitize('/* foo bar */ callback_123 ( {} )'), ' {} '); assert.strictEqual(util.repair('/* foo bar */ callback_123 ( {} )'), ' {} ');
assert.strictEqual(util.sanitize(' /* foo bar */ callback_123 ({}); '), '{}'); assert.strictEqual(util.repair(' /* foo bar */ callback_123 ({}); '), '{}');
assert.strictEqual(util.sanitize('\n/* foo\nbar */\ncallback_123 ({});\n\n'), '{}'); assert.strictEqual(util.repair('\n/* foo\nbar */\ncallback_123 ({});\n\n'), '{}');
// non-matching // non-matching
assert.strictEqual(util.sanitize('callback abc({});'), 'callback abc({});'); assert.strictEqual(util.repair('callback abc({});'), 'callback abc({});');
assert.strictEqual(util.sanitize('callback {}'), 'callback {}'); assert.strictEqual(util.repair('callback {}'), 'callback {}');
assert.strictEqual(util.sanitize('callback({}'), 'callback({}'); assert.strictEqual(util.repair('callback({}'), 'callback({}');
}); });
it('should strip trailing zeros', function () { it('should strip trailing zeros', function () {
// matching // matching
assert.strictEqual(util.sanitize('[1,2,3,]'), '[1,2,3]'); assert.strictEqual(util.repair('[1,2,3,]'), '[1,2,3]');
assert.strictEqual(util.sanitize('[1,2,3,\n]'), '[1,2,3\n]'); assert.strictEqual(util.repair('[1,2,3,\n]'), '[1,2,3\n]');
assert.strictEqual(util.sanitize('[1,2,3, \n ]'), '[1,2,3 \n ]'); assert.strictEqual(util.repair('[1,2,3, \n ]'), '[1,2,3 \n ]');
assert.strictEqual(util.sanitize('{"a":2,}'), '{"a":2}'); assert.strictEqual(util.repair('{"a":2,}'), '{"a":2}');
// not matching // not matching
assert.strictEqual(util.sanitize('"[1,2,3,]"'), '"[1,2,3,]"'); assert.strictEqual(util.repair('"[1,2,3,]"'), '"[1,2,3,]"');
assert.strictEqual(util.sanitize('"{a:2,}"'), '"{a:2,}"'); assert.strictEqual(util.repair('"{a:2,}"'), '"{a:2,}"');
}); });
}); });