Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ declare namespace stableStringify {

type StableStringifyOptions = {
cmp?: Comparator;
collapseEmpty?: boolean;
cycles?: boolean;
replacer?: (this: Node, key: Key, value: unknown) => unknown;
space?: string | number;
Expand Down
17 changes: 14 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ module.exports = function stableStringify(obj) {
var cycles = !!opts && typeof opts.cycles === 'boolean' && opts.cycles;
/** @type {undefined | typeof defaultReplacer} */
var replacer = opts && opts.replacer ? callBind(opts.replacer) : defaultReplacer;
if (opts && typeof opts.collapseEmpty !== 'undefined' && typeof opts.collapseEmpty !== 'boolean') {
throw new TypeError('`collapseEmpty` must be a boolean, if provided');
}
var collapseEmpty = !!opts && opts.collapseEmpty;

var cmpOpt = typeof opts === 'function' ? opts : opts && opts.cmp;
/** @type {undefined | (<T extends import('.').NonArrayNode>(node: T) => (a: Exclude<keyof T, symbol | number>, b: Exclude<keyof T, symbol | number>) => number)} */
Expand Down Expand Up @@ -66,20 +70,27 @@ module.exports = function stableStringify(obj) {
}

node = replacer(parent, key, node);

if (node === undefined) {
return;
}
if (typeof node !== 'object' || node === null) {
return jsonStringify(node);
}

/** @type {(out: string[], brackets: '[]' | '{}') => string} */
var groupOutput = function (out, brackets) {
return collapseEmpty && out.length === 0
? brackets
: (brackets === '[]' ? '[' : '{') + $join(out, ',') + indent + (brackets === '[]' ? ']' : '}');
};

if (isArray(node)) {
var out = [];
for (var i = 0; i < node.length; i++) {
var item = stringify(node, i, node[i], level + 1) || jsonStringify(null);
out[out.length] = indent + space + item;
}
return '[' + $join(out, ',') + indent + ']';
return groupOutput(out, '[]');
}

if ($indexOf(seen, node) !== -1) {
Expand Down Expand Up @@ -107,7 +118,7 @@ module.exports = function stableStringify(obj) {
out[out.length] = indent + space + keyValue;
}
$splice(seen, $indexOf(seen, node), 1);
return '{' + $join(out, ',') + indent + '}';
return groupOutput(out, '{}');
}({ '': obj }, '', obj, 0)
);
};
25 changes: 25 additions & 0 deletions test/space.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,31 @@ test('space parameter (same as native)', function (t) {
);
});

test('space parameter base empty behavior: empty arrays and objects have added newline and space', function (t) {
t.plan(1);
var obj = { emptyArr: [], emptyObj: {} };
t.equal(
stringify(obj, { space: ' ' }),
'{\n "emptyArr": [\n ],\n "emptyObj": {\n }\n}'
);
});

test('space parameter, with collapseEmpty: true', function (t) {
t.plan(2);
var obj = { emptyArr: [], emptyObj: {} };

t['throws'](
// @ts-expect-error
function () { stringify(obj, { collapseEmpty: 'not a boolean' }); },
TypeError
);

t.equal(
stringify(obj, { collapseEmpty: true, space: ' ' }),
'{\n "emptyArr": [],\n "emptyObj": {}\n}'
);
});

test('space parameter, on a cmp function', function (t) {
t.plan(3);
var obj = { one: 1, two: 2 };
Expand Down
Loading