Skip to content
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

Jump to bottom

Converter: Fix 'bytes' field decoding into an empty array, now decoded into an empty Buffer #1020

Merged
merged 5 commits into from
Apr 30, 2018
Merged

Converter: Fix 'bytes' field decoding into an empty array, now decoded into an empty Buffer #1020

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b734152
Converter: Fix 'bytes' field decoding into an empty array, now decode…
assaf-xm Apr 15, 2018
025045f
Converter: fix tests (Buffer.from -> util.newBuffer)
assaf-xm Apr 15, 2018
feafa54
CR Fix: converter.toObject, use default types value for 'bytes' field…
assaf-xm Apr 17, 2018
2f0c5d9
CR Fix: converter.toObject, create array default types value once in …
assaf-xm Apr 17, 2018
719662b
Converter: remove whitespaces
assaf-xm Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ converter.toObject = function toObject(mtype) {
("}else")
("d%s=o.longs===String?%j:%i", prop, field.typeDefault.toString(), field.typeDefault.toNumber());
else if (field.bytes) gen
("d%s=o.bytes===String?%j:%s", prop, String.fromCharCode.apply(String, field.typeDefault), "[" + Array.prototype.slice.call(field.typeDefault).join(",") + "]");
("d%s=o.bytes===String?%j:o.bytes===Array?%s:%s", prop, String.fromCharCode.apply(String, field.typeDefault), "[" + Array.prototype.slice.call(field.typeDefault).join(",") + "]", "util.newBuffer([])");
Copy link
Member

Choose a reason for hiding this comment

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

Seems the default for buffer doesn't use the default value. What do you think of making an array all the time, similar to how it was before, but wrapping it with util.newBuffer conditionally for the !== Array case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Pushed a fix

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, this'd still generate the same array literal two times, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It looks like:
object.buf = options.bytes === String ? "" : options.bytes === Array ? [] : $util.newBuffer([]);

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, if the default value is empty. What's on my mind is something along the lines of:

if (options.bytes === String) object.buf = "...";
else {
  object.buf = [...];
  if (options.bytes !== Array) object.buf = $util.newBuffer(object.buf);
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK possible as well, pushed now.
The generated code is:

    if (options.bytes === String)
        object.buf = "";
    else {
        object.buf = [];
        if (options.bytes !== Array)
            object.buf = $util.newBuffer(object.buf);
        }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dcodeIO , is it better now?

else gen
("d%s=%j", prop, field.typeDefault); // also messages (=null)
} gen
Expand Down