Skip to content

fix: delete properties when reviver returns undefined #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feritcemkahraman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: delete properties when reviver returns undefined #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions cjs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ const Primitives = (_, value) => (
typeof value === primitive ? new Primitive(value) : value
);

const reviveProperty = (output, key, value, reviver) => {
const revived = reviver.call(output, key, value);
if (revived === void 0)
delete output[key];
else
output[key] = revived;
};

const resolver = (input, lazy, parsed, $) => output => {
for (let ke = keys(output), {length} = ke, y = 0; y < length; y++) {
const k = ke[y];
Expand All @@ -34,10 +42,10 @@ const resolver = (input, lazy, parsed, $) => output => {
lazy.push({ o: output, k, r: tmp });
}
else
output[k] = $.call(output, k, tmp);
reviveProperty(output, k, tmp, $);
}
else if (output[k] !== ignore)
output[k] = $.call(output, k, value);
reviveProperty(output, k, value, $);
}
return output;
};
Expand Down Expand Up @@ -69,7 +77,7 @@ const parse = (text, reviver) => {
while (i < lazy.length) {
// it could be a lazy.shift() but that's costly
const {o, k, r} = lazy[i++];
o[k] = $.call(o, k, revive(r));
reviveProperty(o, k, revive(r), $);
}
}

Expand Down
2 changes: 1 addition & 1 deletion es.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion esm.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions esm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ const Primitives = (_, value) => (
typeof value === primitive ? new Primitive(value) : value
);

const reviveProperty = (output, key, value, reviver) => {
const revived = reviver.call(output, key, value);
if (revived === void 0)
delete output[key];
else
output[key] = revived;
};

const resolver = (input, lazy, parsed, $) => output => {
for (let ke = keys(output), {length} = ke, y = 0; y < length; y++) {
const k = ke[y];
Expand All @@ -33,10 +41,10 @@ const resolver = (input, lazy, parsed, $) => output => {
lazy.push({ o: output, k, r: tmp });
}
else
output[k] = $.call(output, k, tmp);
reviveProperty(output, k, tmp, $);
}
else if (output[k] !== ignore)
output[k] = $.call(output, k, value);
reviveProperty(output, k, value, $);
}
return output;
};
Expand Down Expand Up @@ -68,7 +76,7 @@ export const parse = (text, reviver) => {
while (i < lazy.length) {
// it could be a lazy.shift() but that's costly
const {o, k, r} = lazy[i++];
o[k] = $.call(o, k, revive(r));
reviveProperty(o, k, revive(r), $);
}
}

Expand Down
10 changes: 7 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ self.Flatted = (function (exports) {
var Primitives = function Primitives(_, value) {
return _typeof(value) === primitive ? new Primitive(value) : value;
};
var reviveProperty = function reviveProperty(output, key, value, reviver) {
var revived = reviver.call(output, key, value);
if (revived === void 0) delete output[key];else output[key] = revived;
};
var resolver = function resolver(input, lazy, parsed, $) {
return function (output) {
for (var ke = keys(output), length = ke.length, y = 0; y < length; y++) {
Expand All @@ -47,8 +51,8 @@ self.Flatted = (function (exports) {
k: k,
r: tmp
});
} else output[k] = $.call(output, k, tmp);
} else if (output[k] !== ignore) output[k] = $.call(output, k, value);
} else reviveProperty(output, k, tmp, $);
} else if (output[k] !== ignore) reviveProperty(output, k, value, $);
}
return output;
};
Expand Down Expand Up @@ -80,7 +84,7 @@ self.Flatted = (function (exports) {
o = _lazy$i.o,
k = _lazy$i.k,
r = _lazy$i.r;
o[k] = $.call(o, k, revive(r));
reviveProperty(o, k, revive(r), $);
}
}
return $.call({
Expand Down
2 changes: 1 addition & 1 deletion min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
var Flatted = require('../cjs');
var assert = require('assert');

var filtered = {number: 1, string: 'keep', removeString: 'drop', nested: {value: 2}, array: [3, 'keep']};
var removeNumbers = function (key, value) {
return typeof value === 'number' || key === 'nested' || key === 'removeString' ? undefined : value;
};
assert.deepStrictEqual(
Flatted.parse(Flatted.stringify(filtered), removeNumbers),
JSON.parse(JSON.stringify(filtered), removeNumbers),
'reviver removes object properties and creates array holes'
);

var filteredCycle = {};
filteredCycle.self = filteredCycle;
assert.deepStrictEqual(
Flatted.parse(Flatted.stringify(filteredCycle), function (key, value) {
return key === 'self' ? undefined : value;
}),
{},
'reviver removes circular reference properties'
);

console.assert(Flatted.stringify([null, null]) === '[[null,null]]', 'multiple null');

Expand Down