fix: JSON.stringify() throws StackOverflow for Java objects
This commit is contained in:
@@ -9,8 +9,8 @@ android {
|
|||||||
applicationId "com.stardust.scriptdroid"
|
applicationId "com.stardust.scriptdroid"
|
||||||
minSdkVersion 17
|
minSdkVersion 17
|
||||||
targetSdkVersion 23
|
targetSdkVersion 23
|
||||||
versionCode 218
|
versionCode 219
|
||||||
versionName "3.0.0 Alpha18"
|
versionName "3.0.0 Alpha19"
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
ndk {
|
ndk {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.stardust.scriptdroid.ui.floating;
|
package com.stardust.scriptdroid.ui.floating;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.view.ContextThemeWrapper;
|
import android.view.ContextThemeWrapper;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -8,6 +9,7 @@ import android.widget.ImageView;
|
|||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import com.afollestad.materialdialogs.MaterialDialog;
|
import com.afollestad.materialdialogs.MaterialDialog;
|
||||||
|
import com.google.gson.Gson;
|
||||||
import com.stardust.app.DialogUtils;
|
import com.stardust.app.DialogUtils;
|
||||||
import com.stardust.app.OperationDialogBuilder;
|
import com.stardust.app.OperationDialogBuilder;
|
||||||
import com.stardust.autojs.core.record.Recorder;
|
import com.stardust.autojs.core.record.Recorder;
|
||||||
@@ -22,8 +24,10 @@ import com.stardust.scriptdroid.autojs.record.GlobalRecorder;
|
|||||||
import com.stardust.scriptdroid.io.StorageFileProvider;
|
import com.stardust.scriptdroid.io.StorageFileProvider;
|
||||||
import com.stardust.scriptdroid.model.script.ScriptFile;
|
import com.stardust.scriptdroid.model.script.ScriptFile;
|
||||||
import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
|
import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
|
||||||
|
import com.stardust.scriptdroid.tool.GsonUtils;
|
||||||
import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutBoundsFloatyWindow;
|
import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutBoundsFloatyWindow;
|
||||||
import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow;
|
import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow;
|
||||||
|
import com.stardust.scriptdroid.ui.main.MainActivity_;
|
||||||
import com.stardust.scriptdroid.ui.main.scripts.ScriptListView;
|
import com.stardust.scriptdroid.ui.main.scripts.ScriptListView;
|
||||||
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
|
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
|
||||||
import com.stardust.util.ClipboardUtil;
|
import com.stardust.util.ClipboardUtil;
|
||||||
@@ -213,6 +217,7 @@ public class CircularMenu implements Recorder.OnStateChangedListener {
|
|||||||
mContext.getString(R.string.text_current_package) + mRunningPackage)
|
mContext.getString(R.string.text_current_package) + mRunningPackage)
|
||||||
.item(R.id.class_name, R.drawable.ic_ali_android,
|
.item(R.id.class_name, R.drawable.ic_ali_android,
|
||||||
mContext.getString(R.string.text_current_activity) + mRunningActivity)
|
mContext.getString(R.string.text_current_activity) + mRunningActivity)
|
||||||
|
.item(R.id.open_launcher, R.drawable.ic_android_eat_js, R.string.text_open_main_activity)
|
||||||
.item(R.id.exit, R.drawable.ic_close_white_48dp, R.string.text_exit_floating_window)
|
.item(R.id.exit, R.drawable.ic_close_white_48dp, R.string.text_exit_floating_window)
|
||||||
.bindItemClick(this)
|
.bindItemClick(this)
|
||||||
.title(R.string.text_more)
|
.title(R.string.text_more)
|
||||||
@@ -255,14 +260,28 @@ public class CircularMenu implements Recorder.OnStateChangedListener {
|
|||||||
Toast.makeText(mContext, R.string.text_already_copy_to_clip, Toast.LENGTH_SHORT).show();
|
Toast.makeText(mContext, R.string.text_already_copy_to_clip, Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Optional
|
||||||
|
@OnClick(R.id.open_launcher)
|
||||||
|
void openLauncher() {
|
||||||
|
dismissSettingsDialog();
|
||||||
|
mContext.startActivity(new Intent(mContext, MainActivity_.class)
|
||||||
|
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Optional
|
@Optional
|
||||||
@OnClick(R.id.exit)
|
@OnClick(R.id.exit)
|
||||||
public void close() {
|
public void close() {
|
||||||
dismissSettingsDialog();
|
dismissSettingsDialog();
|
||||||
mWindow.close();
|
try {
|
||||||
|
mWindow.close();
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} finally {
|
||||||
|
EventBus.getDefault().post(new StateChangeEvent(STATE_CLOSED, mState));
|
||||||
|
mState = STATE_CLOSED;
|
||||||
|
}
|
||||||
mRecorder.removeOnStateChangedListener(this);
|
mRecorder.removeOnStateChangedListener(this);
|
||||||
EventBus.getDefault().post(new StateChangeEvent(STATE_CLOSED, mState));
|
|
||||||
mState = STATE_CLOSED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -278,7 +297,6 @@ public class CircularMenu implements Recorder.OnStateChangedListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPause() {
|
public void onPause() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -6,4 +6,5 @@
|
|||||||
<item name="delete" type="id"/>
|
<item name="delete" type="id"/>
|
||||||
<item name="package_name" type="id"/>
|
<item name="package_name" type="id"/>
|
||||||
<item name="class_name" type="id"/>
|
<item name="class_name" type="id"/>
|
||||||
|
<item name="open_launcher" type="id"/>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -309,4 +309,5 @@
|
|||||||
<item>binary</item>
|
<item>binary</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
<string name="title_activity_log">LogActivity</string>
|
<string name="title_activity_log">LogActivity</string>
|
||||||
|
<string name="text_open_main_activity">打开主界面</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ __runtime__.bridges.setBridges({
|
|||||||
});
|
});
|
||||||
|
|
||||||
var __that__ = this;
|
var __that__ = this;
|
||||||
|
JSON = require('__json2__.js');
|
||||||
util = require('__util__.js');
|
util = require('__util__.js');
|
||||||
|
|
||||||
var __asGlobal__ = function(obj, functions){
|
var __asGlobal__ = function(obj, functions){
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ module.exports = function(__runtime__, scope){
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.print = function(){
|
console.print = function(){
|
||||||
rtConsole.print(util.format.apply(util, arguments));
|
rtConsole.print(android.util.Log.DEBUG, util.format.apply(util, arguments));
|
||||||
}
|
}
|
||||||
|
|
||||||
console.info = function(){
|
console.info = function(){
|
||||||
@@ -43,7 +43,7 @@ module.exports = function(__runtime__, scope){
|
|||||||
console.clear = rtConsole.clear.bind(rtConsole);
|
console.clear = rtConsole.clear.bind(rtConsole);
|
||||||
console.setTitle = rtConsole.setTitle.bind(rtConsole);
|
console.setTitle = rtConsole.setTitle.bind(rtConsole);
|
||||||
|
|
||||||
scope.print = console.print.bind(console, android.util.Log.DEBUG);
|
scope.print = console.print.bind(console);
|
||||||
scope.log = console.log.bind(console);
|
scope.log = console.log.bind(console);
|
||||||
scope.err = console.error.bind(console);
|
scope.err = console.error.bind(console);
|
||||||
scope.openConsole = console.show.bind(console);
|
scope.openConsole = console.show.bind(console);
|
||||||
|
|||||||
510
autojs/src/main/assets/modules/__json2__.js
Normal file
510
autojs/src/main/assets/modules/__json2__.js
Normal file
@@ -0,0 +1,510 @@
|
|||||||
|
// json2.js
|
||||||
|
// 2016-10-28
|
||||||
|
// Public Domain.
|
||||||
|
// NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
|
||||||
|
// See http://www.JSON.org/js.html
|
||||||
|
// This code should be minified before deployment.
|
||||||
|
// See http://javascript.crockford.com/jsmin.html
|
||||||
|
|
||||||
|
// USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
|
||||||
|
// NOT CONTROL.
|
||||||
|
|
||||||
|
// This file creates a global JSON object containing two methods: stringify
|
||||||
|
// and parse. This file provides the ES5 JSON capability to ES3 systems.
|
||||||
|
// If a project might run on IE8 or earlier, then this file should be included.
|
||||||
|
// This file does nothing on ES5 systems.
|
||||||
|
|
||||||
|
// JSON.stringify(value, replacer, space)
|
||||||
|
// value any JavaScript value, usually an object or array.
|
||||||
|
// replacer an optional parameter that determines how object
|
||||||
|
// values are stringified for objects. It can be a
|
||||||
|
// function or an array of strings.
|
||||||
|
// space an optional parameter that specifies the indentation
|
||||||
|
// of nested structures. If it is omitted, the text will
|
||||||
|
// be packed without extra whitespace. If it is a number,
|
||||||
|
// it will specify the number of spaces to indent at each
|
||||||
|
// level. If it is a string (such as "\t" or " "),
|
||||||
|
// it contains the characters used to indent at each level.
|
||||||
|
// This method produces a JSON text from a JavaScript value.
|
||||||
|
// When an object value is found, if the object contains a toJSON
|
||||||
|
// method, its toJSON method will be called and the result will be
|
||||||
|
// stringified. A toJSON method does not serialize: it returns the
|
||||||
|
// value represented by the name/value pair that should be serialized,
|
||||||
|
// or undefined if nothing should be serialized. The toJSON method
|
||||||
|
// will be passed the key associated with the value, and this will be
|
||||||
|
// bound to the value.
|
||||||
|
|
||||||
|
// For example, this would serialize Dates as ISO strings.
|
||||||
|
|
||||||
|
// Date.prototype.toJSON = function (key) {
|
||||||
|
// function f(n) {
|
||||||
|
// // Format integers to have at least two digits.
|
||||||
|
// return (n < 10)
|
||||||
|
// ? "0" + n
|
||||||
|
// : n;
|
||||||
|
// }
|
||||||
|
// return this.getUTCFullYear() + "-" +
|
||||||
|
// f(this.getUTCMonth() + 1) + "-" +
|
||||||
|
// f(this.getUTCDate()) + "T" +
|
||||||
|
// f(this.getUTCHours()) + ":" +
|
||||||
|
// f(this.getUTCMinutes()) + ":" +
|
||||||
|
// f(this.getUTCSeconds()) + "Z";
|
||||||
|
// };
|
||||||
|
|
||||||
|
// You can provide an optional replacer method. It will be passed the
|
||||||
|
// key and value of each member, with this bound to the containing
|
||||||
|
// object. The value that is returned from your method will be
|
||||||
|
// serialized. If your method returns undefined, then the member will
|
||||||
|
// be excluded from the serialization.
|
||||||
|
|
||||||
|
// If the replacer parameter is an array of strings, then it will be
|
||||||
|
// used to select the members to be serialized. It filters the results
|
||||||
|
// such that only members with keys listed in the replacer array are
|
||||||
|
// stringified.
|
||||||
|
|
||||||
|
// Values that do not have JSON representations, such as undefined or
|
||||||
|
// functions, will not be serialized. Such values in objects will be
|
||||||
|
// dropped; in arrays they will be replaced with null. You can use
|
||||||
|
// a replacer function to replace those with JSON values.
|
||||||
|
|
||||||
|
// JSON.stringify(undefined) returns undefined.
|
||||||
|
|
||||||
|
// The optional space parameter produces a stringification of the
|
||||||
|
// value that is filled with line breaks and indentation to make it
|
||||||
|
// easier to read.
|
||||||
|
|
||||||
|
// If the space parameter is a non-empty string, then that string will
|
||||||
|
// be used for indentation. If the space parameter is a number, then
|
||||||
|
// the indentation will be that many spaces.
|
||||||
|
|
||||||
|
// Example:
|
||||||
|
|
||||||
|
// text = JSON.stringify(["e", {pluribus: "unum"}]);
|
||||||
|
// // text is '["e",{"pluribus":"unum"}]'
|
||||||
|
|
||||||
|
// text = JSON.stringify(["e", {pluribus: "unum"}], null, "\t");
|
||||||
|
// // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
|
||||||
|
|
||||||
|
// text = JSON.stringify([new Date()], function (key, value) {
|
||||||
|
// return this[key] instanceof Date
|
||||||
|
// ? "Date(" + this[key] + ")"
|
||||||
|
// : value;
|
||||||
|
// });
|
||||||
|
// // text is '["Date(---current time---)"]'
|
||||||
|
|
||||||
|
// JSON.parse(text, reviver)
|
||||||
|
// This method parses a JSON text to produce an object or array.
|
||||||
|
// It can throw a SyntaxError exception.
|
||||||
|
|
||||||
|
// The optional reviver parameter is a function that can filter and
|
||||||
|
// transform the results. It receives each of the keys and values,
|
||||||
|
// and its return value is used instead of the original value.
|
||||||
|
// If it returns what it received, then the structure is not modified.
|
||||||
|
// If it returns undefined then the member is deleted.
|
||||||
|
|
||||||
|
// Example:
|
||||||
|
|
||||||
|
// // Parse the text. Values that look like ISO date strings will
|
||||||
|
// // be converted to Date objects.
|
||||||
|
|
||||||
|
// myData = JSON.parse(text, function (key, value) {
|
||||||
|
// var a;
|
||||||
|
// if (typeof value === "string") {
|
||||||
|
// a =
|
||||||
|
// /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
|
||||||
|
// if (a) {
|
||||||
|
// return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
|
||||||
|
// +a[5], +a[6]));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// return value;
|
||||||
|
// });
|
||||||
|
|
||||||
|
// myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
|
||||||
|
// var d;
|
||||||
|
// if (typeof value === "string" &&
|
||||||
|
// value.slice(0, 5) === "Date(" &&
|
||||||
|
// value.slice(-1) === ")") {
|
||||||
|
// d = new Date(value.slice(5, -1));
|
||||||
|
// if (d) {
|
||||||
|
// return d;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// return value;
|
||||||
|
// });
|
||||||
|
|
||||||
|
// This is a reference implementation. You are free to copy, modify, or
|
||||||
|
// redistribute.
|
||||||
|
|
||||||
|
/*jslint
|
||||||
|
eval, for, this
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*property
|
||||||
|
JSON, apply, call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
|
||||||
|
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
|
||||||
|
lastIndex, length, parse, prototype, push, replace, slice, stringify,
|
||||||
|
test, toJSON, toString, valueOf
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
// Create a JSON object only if one does not already exist. We create the
|
||||||
|
// methods in a closure to avoid creating global variables.
|
||||||
|
var gson = new com.google.gson.Gson();
|
||||||
|
JSON = {};
|
||||||
|
|
||||||
|
(function () {
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
var rx_one = /^[\],:{}\s]*$/;
|
||||||
|
var rx_two = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g;
|
||||||
|
var rx_three = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g;
|
||||||
|
var rx_four = /(?:^|:|,)(?:\s*\[)+/g;
|
||||||
|
var rx_escapable = /[\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
|
||||||
|
var rx_dangerous = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
|
||||||
|
|
||||||
|
function f(n) {
|
||||||
|
// Format integers to have at least two digits.
|
||||||
|
return n < 10
|
||||||
|
? "0" + n
|
||||||
|
: n;
|
||||||
|
}
|
||||||
|
|
||||||
|
function this_value() {
|
||||||
|
return this.valueOf();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof Date.prototype.toJSON !== "function") {
|
||||||
|
|
||||||
|
Date.prototype.toJSON = function () {
|
||||||
|
|
||||||
|
return isFinite(this.valueOf())
|
||||||
|
? this.getUTCFullYear() + "-" +
|
||||||
|
f(this.getUTCMonth() + 1) + "-" +
|
||||||
|
f(this.getUTCDate()) + "T" +
|
||||||
|
f(this.getUTCHours()) + ":" +
|
||||||
|
f(this.getUTCMinutes()) + ":" +
|
||||||
|
f(this.getUTCSeconds()) + "Z"
|
||||||
|
: null;
|
||||||
|
};
|
||||||
|
|
||||||
|
Boolean.prototype.toJSON = this_value;
|
||||||
|
Number.prototype.toJSON = this_value;
|
||||||
|
String.prototype.toJSON = this_value;
|
||||||
|
}
|
||||||
|
|
||||||
|
var gap;
|
||||||
|
var indent;
|
||||||
|
var meta;
|
||||||
|
var rep;
|
||||||
|
|
||||||
|
|
||||||
|
function quote(string) {
|
||||||
|
|
||||||
|
// If the string contains no control characters, no quote characters, and no
|
||||||
|
// backslash characters, then we can safely slap some quotes around it.
|
||||||
|
// Otherwise we must also replace the offending characters with safe escape
|
||||||
|
// sequences.
|
||||||
|
|
||||||
|
rx_escapable.lastIndex = 0;
|
||||||
|
return rx_escapable.test(string)
|
||||||
|
? "\"" + string.replace(rx_escapable, function (a) {
|
||||||
|
var c = meta[a];
|
||||||
|
return typeof c === "string"
|
||||||
|
? c
|
||||||
|
: "\\u" + ("0000" + a.charCodeAt(0).toString(16)).slice(-4);
|
||||||
|
}) + "\""
|
||||||
|
: "\"" + string + "\"";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function str(key, holder) {
|
||||||
|
|
||||||
|
// Produce a string from holder[key].
|
||||||
|
|
||||||
|
var i; // The loop counter.
|
||||||
|
var k; // The member key.
|
||||||
|
var v; // The member value.
|
||||||
|
var length;
|
||||||
|
var mind = gap;
|
||||||
|
var partial;
|
||||||
|
var value = holder[key];
|
||||||
|
|
||||||
|
if(value.getClass){
|
||||||
|
return gson.toJson(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the value has a toJSON method, call it to obtain a replacement value.
|
||||||
|
|
||||||
|
if (value && typeof value === "object" &&
|
||||||
|
typeof value.toJSON === "function") {
|
||||||
|
value = value.toJSON(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we were called with a replacer function, then call the replacer to
|
||||||
|
// obtain a replacement value.
|
||||||
|
|
||||||
|
if (typeof rep === "function") {
|
||||||
|
value = rep.call(holder, key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// What happens next depends on the value's type.
|
||||||
|
|
||||||
|
switch (typeof value) {
|
||||||
|
case "string":
|
||||||
|
return quote(value);
|
||||||
|
|
||||||
|
case "number":
|
||||||
|
|
||||||
|
// JSON numbers must be finite. Encode non-finite numbers as null.
|
||||||
|
|
||||||
|
return isFinite(value)
|
||||||
|
? String(value)
|
||||||
|
: "null";
|
||||||
|
|
||||||
|
case "boolean":
|
||||||
|
case "null":
|
||||||
|
|
||||||
|
// If the value is a boolean or null, convert it to a string. Note:
|
||||||
|
// typeof null does not produce "null". The case is included here in
|
||||||
|
// the remote chance that this gets fixed someday.
|
||||||
|
|
||||||
|
return String(value);
|
||||||
|
|
||||||
|
// If the type is "object", we might be dealing with an object or an array or
|
||||||
|
// null.
|
||||||
|
|
||||||
|
case "object":
|
||||||
|
|
||||||
|
// Due to a specification blunder in ECMAScript, typeof null is "object",
|
||||||
|
// so watch out for that case.
|
||||||
|
|
||||||
|
if (!value) {
|
||||||
|
return "null";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make an array to hold the partial results of stringifying this object value.
|
||||||
|
|
||||||
|
gap += indent;
|
||||||
|
partial = [];
|
||||||
|
|
||||||
|
// Is the value an array?
|
||||||
|
|
||||||
|
if (Object.prototype.toString.apply(value) === "[object Array]") {
|
||||||
|
|
||||||
|
// The value is an array. Stringify every element. Use null as a placeholder
|
||||||
|
// for non-JSON values.
|
||||||
|
|
||||||
|
length = value.length;
|
||||||
|
for (i = 0; i < length; i += 1) {
|
||||||
|
partial[i] = str(i, value) || "null";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Join all of the elements together, separated with commas, and wrap them in
|
||||||
|
// brackets.
|
||||||
|
|
||||||
|
v = partial.length === 0
|
||||||
|
? "[]"
|
||||||
|
: gap
|
||||||
|
? "[\n" + gap + partial.join(",\n" + gap) + "\n" + mind + "]"
|
||||||
|
: "[" + partial.join(",") + "]";
|
||||||
|
gap = mind;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the replacer is an array, use it to select the members to be stringified.
|
||||||
|
|
||||||
|
if (rep && typeof rep === "object") {
|
||||||
|
length = rep.length;
|
||||||
|
for (i = 0; i < length; i += 1) {
|
||||||
|
if (typeof rep[i] === "string") {
|
||||||
|
k = rep[i];
|
||||||
|
v = str(k, value);
|
||||||
|
if (v) {
|
||||||
|
partial.push(quote(k) + (
|
||||||
|
gap
|
||||||
|
? ": "
|
||||||
|
: ":"
|
||||||
|
) + v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Otherwise, iterate through all of the keys in the object.
|
||||||
|
|
||||||
|
for (k in value) {
|
||||||
|
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
||||||
|
v = str(k, value);
|
||||||
|
if (v) {
|
||||||
|
partial.push(quote(k) + (
|
||||||
|
gap
|
||||||
|
? ": "
|
||||||
|
: ":"
|
||||||
|
) + v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Join all of the member texts together, separated with commas,
|
||||||
|
// and wrap them in braces.
|
||||||
|
|
||||||
|
v = partial.length === 0
|
||||||
|
? "{}"
|
||||||
|
: gap
|
||||||
|
? "{\n" + gap + partial.join(",\n" + gap) + "\n" + mind + "}"
|
||||||
|
: "{" + partial.join(",") + "}";
|
||||||
|
gap = mind;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the JSON object does not yet have a stringify method, give it one.
|
||||||
|
|
||||||
|
if (typeof JSON.stringify !== "function") {
|
||||||
|
meta = { // table of character substitutions
|
||||||
|
"\b": "\\b",
|
||||||
|
"\t": "\\t",
|
||||||
|
"\n": "\\n",
|
||||||
|
"\f": "\\f",
|
||||||
|
"\r": "\\r",
|
||||||
|
"\"": "\\\"",
|
||||||
|
"\\": "\\\\"
|
||||||
|
};
|
||||||
|
JSON.stringify = function (value, replacer, space) {
|
||||||
|
|
||||||
|
// The stringify method takes a value and an optional replacer, and an optional
|
||||||
|
// space parameter, and returns a JSON text. The replacer can be a function
|
||||||
|
// that can replace values, or an array of strings that will select the keys.
|
||||||
|
// A default replacer method can be provided. Use of the space parameter can
|
||||||
|
// produce text that is more easily readable.
|
||||||
|
|
||||||
|
var i;
|
||||||
|
gap = "";
|
||||||
|
indent = "";
|
||||||
|
|
||||||
|
// If the space parameter is a number, make an indent string containing that
|
||||||
|
// many spaces.
|
||||||
|
|
||||||
|
if (typeof space === "number") {
|
||||||
|
for (i = 0; i < space; i += 1) {
|
||||||
|
indent += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the space parameter is a string, it will be used as the indent string.
|
||||||
|
|
||||||
|
} else if (typeof space === "string") {
|
||||||
|
indent = space;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If there is a replacer, it must be a function or an array.
|
||||||
|
// Otherwise, throw an error.
|
||||||
|
|
||||||
|
rep = replacer;
|
||||||
|
if (replacer && typeof replacer !== "function" &&
|
||||||
|
(typeof replacer !== "object" ||
|
||||||
|
typeof replacer.length !== "number")) {
|
||||||
|
throw new Error("JSON.stringify");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make a fake root object containing our value under the key of "".
|
||||||
|
// Return the result of stringifying the value.
|
||||||
|
|
||||||
|
return str("", {"": value});
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// If the JSON object does not yet have a parse method, give it one.
|
||||||
|
|
||||||
|
if (typeof JSON.parse !== "function") {
|
||||||
|
JSON.parse = function (text, reviver) {
|
||||||
|
|
||||||
|
// The parse method takes a text and an optional reviver function, and returns
|
||||||
|
// a JavaScript value if the text is a valid JSON text.
|
||||||
|
|
||||||
|
var j;
|
||||||
|
|
||||||
|
function walk(holder, key) {
|
||||||
|
|
||||||
|
// The walk method is used to recursively walk the resulting structure so
|
||||||
|
// that modifications can be made.
|
||||||
|
|
||||||
|
var k;
|
||||||
|
var v;
|
||||||
|
var value = holder[key];
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
for (k in value) {
|
||||||
|
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
||||||
|
v = walk(value, k);
|
||||||
|
if (v !== undefined) {
|
||||||
|
value[k] = v;
|
||||||
|
} else {
|
||||||
|
delete value[k];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return reviver.call(holder, key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Parsing happens in four stages. In the first stage, we replace certain
|
||||||
|
// Unicode characters with escape sequences. JavaScript handles many characters
|
||||||
|
// incorrectly, either silently deleting them, or treating them as line endings.
|
||||||
|
|
||||||
|
text = String(text);
|
||||||
|
rx_dangerous.lastIndex = 0;
|
||||||
|
if (rx_dangerous.test(text)) {
|
||||||
|
text = text.replace(rx_dangerous, function (a) {
|
||||||
|
return "\\u" +
|
||||||
|
("0000" + a.charCodeAt(0).toString(16)).slice(-4);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// In the second stage, we run the text against regular expressions that look
|
||||||
|
// for non-JSON patterns. We are especially concerned with "()" and "new"
|
||||||
|
// because they can cause invocation, and "=" because it can cause mutation.
|
||||||
|
// But just to be safe, we want to reject all unexpected forms.
|
||||||
|
|
||||||
|
// We split the second stage into 4 regexp operations in order to work around
|
||||||
|
// crippling inefficiencies in IE's and Safari's regexp engines. First we
|
||||||
|
// replace the JSON backslash pairs with "@" (a non-JSON character). Second, we
|
||||||
|
// replace all simple value tokens with "]" characters. Third, we delete all
|
||||||
|
// open brackets that follow a colon or comma or that begin the text. Finally,
|
||||||
|
// we look to see that the remaining characters are only whitespace or "]" or
|
||||||
|
// "," or ":" or "{" or "}". If that is so, then the text is safe for eval.
|
||||||
|
|
||||||
|
if (
|
||||||
|
rx_one.test(
|
||||||
|
text
|
||||||
|
.replace(rx_two, "@")
|
||||||
|
.replace(rx_three, "]")
|
||||||
|
.replace(rx_four, "")
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
|
||||||
|
// In the third stage we use the eval function to compile the text into a
|
||||||
|
// JavaScript structure. The "{" operator is subject to a syntactic ambiguity
|
||||||
|
// in JavaScript: it can begin a block or an object literal. We wrap the text
|
||||||
|
// in parens to eliminate the ambiguity.
|
||||||
|
|
||||||
|
j = eval("(" + text + ")");
|
||||||
|
|
||||||
|
// In the optional fourth stage, we recursively walk the new structure, passing
|
||||||
|
// each name/value pair to a reviver function for possible transformation.
|
||||||
|
|
||||||
|
return (typeof reviver === "function")
|
||||||
|
? walk({"": j}, "")
|
||||||
|
: j;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the text is not JSON parseable, then a SyntaxError is thrown.
|
||||||
|
|
||||||
|
throw new SyntaxError("JSON.parse");
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}());
|
||||||
|
|
||||||
|
module.exports = JSON;
|
||||||
@@ -24,7 +24,9 @@ exports.format = function(f) {
|
|||||||
if (!isString(f)) {
|
if (!isString(f)) {
|
||||||
var objects = [];
|
var objects = [];
|
||||||
for (var i = 0; i < arguments.length; i++) {
|
for (var i = 0; i < arguments.length; i++) {
|
||||||
objects.push(inspect(arguments[i]));
|
var v = isJavaObject(arguments[i]) ? arguments[i].toString() :
|
||||||
|
arguments[i];
|
||||||
|
objects.push(inspect(v));
|
||||||
}
|
}
|
||||||
return objects.join(' ');
|
return objects.join(' ');
|
||||||
}
|
}
|
||||||
@@ -445,6 +447,10 @@ function reduceToSingleString(output, base, braces) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function isJavaObject(obj){
|
||||||
|
return !!obj.getClass;
|
||||||
|
}
|
||||||
|
|
||||||
// NOTE: These type checking functions intentionally don't use `instanceof`
|
// NOTE: These type checking functions intentionally don't use `instanceof`
|
||||||
// because it is fragile and can be easily faked with `Object.create()`.
|
// because it is fragile and can be easily faked with `Object.create()`.
|
||||||
function isArray(ar) {
|
function isArray(ar) {
|
||||||
|
|||||||
Reference in New Issue
Block a user