Skip to content

Empty object fix #20

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

Merged
merged 6 commits into from
Sep 30, 2019
Merged

Empty object fix #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c23e9cc
Add check and alert for larger JSON files
acupoftee Sep 28, 2019
eee7f4d
Refactored text length check
acupoftee Sep 28, 2019
a7587c1
Correct max length
acupoftee Sep 28, 2019
2714179
Add check for empty objects
acupoftee Sep 29, 2019
037fec3
Revert "Add check for empty objects"
acupoftee Sep 29, 2019
7700bce
Add check for empty objects and arrays
acupoftee Sep 29, 2019
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
6 changes: 6 additions & 0 deletions src/js/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ listen((port, msg) => {
port.postMessage(['NOT JSON', 'technically JSON but not an object or array']);
port.disconnect();
return;
}
// If there's an empty object or array, return JSON as is
else if (Object.entries(obj).length === 0 || obj.length === 0) {
Copy link

@pedzed pedzed Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't obj.length === 0 be sufficient?

Copy link
Author

@acupoftee acupoftee Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the suggestion. obj.length === 0 would only work for the array since arrays have a length property, but not objects. (This can also be verified by trying object.hasOwnProperty('length');

Since [Object.entries()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries) returns an array of key value pairs, we can use that to see if an object has any content. (you could do this with .keys() too. I tend to use .entries() for semantics).

port.postMessage(['NOT JSON', 'empty object or array']);
port.disconnect();
return;
}

// And send it the message to confirm that we're now formatting (so it can show a spinner)
Expand Down
2 changes: 2 additions & 0 deletions src/js/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ function ready() {
// First, check if it's plain text and exit if not
const plainText = getTextFromTextOnlyDocument();
if (!plainText || plainText.length > 3000000) {
// If there is plain text and it's over 3MB, send alert
plainText && alert('JSON Formatter Error: Cannot parse JSON larger than 3MB');
port.disconnect();
return;
}
Expand Down