lxm_front/eruda
1
0
Fork 0
mirror of https://github.com/liriliri/eruda.git synced 2026-03-20 09:38:37 +08:00
Code Issues Projects Releases Wiki Activity

Dev: Console object keys order

Browse Source
This commit is contained in:
surunzi
2017-04-19 14:18:32 +08:00
parent 51a66e2652
commit a3233e5c84
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/getAbstract.es6
View File

@@ -7,7 +7,7 @@ export default function getAbstract(obj, {
level = 0,
getterVal = false,
unenumerable = true
} = {})
} = {})
{
let json = '',
type = '',
@@ -71,7 +71,6 @@ export default function getAbstract(obj, {
return;
}
}
if (typeof topObj[name] === 'function') return;
parts.push(`${key}: ${getAbstract(topObj[name], passOpts)}`);
i++;
}
@@ -89,6 +88,7 @@ export default function getAbstract(obj, {
isNum = (type == '[object Number]'),
isRegExp = (type == '[object RegExp]'),
isSymbol = (type == '[object Symbol]'),
isFn = (type == '[object Function]'),
isBool = (type == '[object Boolean]');
if (circular)
@@ -100,6 +100,9 @@ export default function getAbstract(obj, {
} else if (isRegExp)
{
json = wrapRegExp(util.escapeJsonStr(obj.toString()));
} else if (isFn)
{
json = wrapStr('function');
} else if (isArr)
{
if (doStringify)
@@ -179,7 +182,7 @@ export default function getAbstract(obj, {
return json;
}
const SPECIAL_VAL = ['(...)', 'undefined', 'Symbol', 'Object'];
const SPECIAL_VAL = ['(...)', 'undefined', 'Symbol', 'Object', 'function'];
function canBeProto(obj)
{

35
src/lib/stringify.es6
View File

@@ -8,7 +8,7 @@ export default function stringify(obj, {
circularMarker = false,
getterVal = false,
unenumerable = true
} = {})
} = {})
{
let json = '',
type,
@@ -56,16 +56,17 @@ export default function stringify(obj, {
id = visitor.visit(obj);
}
allKeys = Object.getOwnPropertyNames(obj);
keys = Object.keys(obj);
names = getKeys(obj);
keys = names.keys;
allKeys = names.allKeys;
names = unenumerable ? allKeys : keys;
proto = Object.getPrototypeOf(obj);
if (circularMarker && proto === Object.prototype) proto = null;
if (proto)
{
proto = `${wrapKey('erudaProto')}: ${stringify(proto, passProtoOpts)}`;
}
names.sort(sortObjName);
if (isFn)
{
// We don't need these properties to display for functions.
@@ -125,9 +126,12 @@ export default function stringify(obj, {
});
parts.push(`${wrapKey('erudaObjAbstract')}: ${wrapStr(objAbstract)}`);
if (!circularMarker) parts.push(`"erudaId": "${id}"`);
allKeys = Object.getOwnPropertyNames(obj);
keys = Object.keys(obj);
names = getKeys(obj);
keys = names.keys;
allKeys = names.allKeys;
names = unenumerable ? allKeys : keys;
proto = Object.getPrototypeOf(obj);
if (circularMarker && proto === Object.prototype) proto = null;
if (proto)
@@ -140,7 +144,6 @@ export default function stringify(obj, {
proto = `${wrapKey('erudaProto')}: ${wrapStr(e.message)}`;
}
}
names.sort(sortObjName);
util.each(names, objIteratee);
if (proto) parts.push(proto);
json += parts.join(', ') + ' }';
@@ -185,8 +188,18 @@ export default function stringify(obj, {
return json;
}
function getKeys(obj)
{
let allKeys = Object.getOwnPropertyNames(obj),
keys = Object.keys(obj).sort(sortObjName);
allKeys = keys.concat(util.filter(allKeys, val => !util.contain(keys, val)).sort(sortObjName));
return {keys, allKeys};
}
// $, upperCase, lowerCase, _
var sortObjName = (a, b) =>
function sortObjName(a, b)
{
let lenA = a.length,
lenB = b.length,
@@ -203,8 +216,9 @@ var sortObjName = (a, b) =>
if (lenA > lenB) return 1;
if (lenA < lenB) return -1;
return 0;
};
}
function cmpCode(a, b)
{
@@ -218,7 +232,8 @@ function cmpCode(a, b)
function transCode(code)
{
if (code === 95) return 91;
// _ should be placed after lowercase chars.
if (code === 95) return 123;
return code;
}