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

Added support for string interpolation. Fixes #20 #23

Merged
merged 17 commits into from
Jun 9, 2018
Merged

Added support for string interpolation. Fixes #20 #23

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5731fa2
feat(): support printf-like formatting
rjoydip May 27, 2018
e244713
fix(test): removed one code comment
rjoydip May 27, 2018
50755f5
fix(#24): Print stringified and colorized objects
rjoydip May 27, 2018
d384e37
Merge branch 'master' into issue-20
klaudiosinani May 29, 2018
4bee762
Merge branch 'master' into issue-20
klaudiosinani May 30, 2018
bb02846
Merge branch 'master' into issue-20
klaudiosinani Jun 6, 2018
9e1cac7
refactor: requested changes done but except message destructuring
rjoydip Jun 9, 2018
cdbf135
Merge branch 'issue-20' of https://github.com/rjoydip/signale into is…
rjoydip Jun 9, 2018
fe8c7cb
Merge branch 'master' into issue-20
rjoydip Jun 9, 2018
5b6b670
Merge branch 'master' into issue-20
rjoydip Jun 9, 2018
721a146
fix: message destructuring and changed const to let for assign args i…
rjoydip Jun 9, 2018
664013b
Merge branch 'issue-20' of https://github.com/rjoydip/signale into is…
rjoydip Jun 9, 2018
938daa0
fix: lint error
rjoydip Jun 9, 2018
37a7fc1
refactor: simplify to a one-liner
rjoydip Jun 9, 2018
ffaa379
fix: tslint error and changed let to const
rjoydip Jun 9, 2018
55f58df
fix: checked suffux and prefix exists or not by func
rjoydip Jun 9, 2018
e7252da
refactor
rjoydip Jun 9, 2018
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: 5 additions & 1 deletion signale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ class Signale {
return meta;
}

_prefixSufixNestedTernary(prefix, suffix, args) {
Copy link
Owner

@klaudiosinani klaudiosinani Jun 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Awesome! A couple of minor tweaks and it is ready to be merged! 🎉

  _hasAdditional({suffix, prefix}, args) { // Rename to something simpler, for example: _hasAdditional() 
    // Use destructuring directly on function definition
    return (suffix || prefix) ? '' : util.format(...args); // Add simple parentheses around the condition to make it clearer
  }

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's better than previous

return prefix || suffix ? '' : util.format(args);
}

_buildSignale(type, ...args) {
let [msg, additional] = [{}, {}];

Expand All @@ -163,7 +167,7 @@ class Signale {
[msg] = args;
} else {
const [{prefix, message, suffix}] = args;
Copy link
Owner

Choose a reason for hiding this comment

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

Here message is needed for destructuring args

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have removed message because now it became death code.
Here is the senerior which i am testing and getting { prefix: undefined, message: undefined, suffix: undefined }

signale.success({a: 2});
signale.success([1, 2]);

Can you give some use cases so tat i can check that.

Copy link
Owner

@klaudiosinani klaudiosinani Jun 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Looks nice! The only thing left is to bring back message for destructuring args :

const [{prefix, message, suffix}] = args;

and directly apply interpolation on it:

msg = util.format(...message);

Thank you a lot for taking the time to help out : )

Copy link
Contributor Author

@rjoydip-zz rjoydip-zz Jun 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, that I have to do. I am getting {prefix, message, suffix} as undefined all the times

Copy link
Owner

@klaudiosinani klaudiosinani Jun 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Yep, it is only applicable when using the prefix and suffix attributes, for example:

const signale = require('signale');

signale.complete({prefix: '[task]', message: ['Fix issue #%s', 59], suffix: '(@santa)'});
//=> [task] ☒  complete  Fix issue #59 (@santa)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

now I have to check undefined 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.

Done. message for destructuring args

Copy link
Owner

Choose a reason for hiding this comment

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

Original comment: #23 (comment)

msg = message ? util.format(...message) : util.format(...args);
msg = message ? util.format(...message) : this._prefixSufixNestedTernary(prefix, suffix, ...args);
additional = Object.assign({}, {suffix, prefix});
Copy link
Owner

Choose a reason for hiding this comment

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

Just a minor reordering of the assignments:

const [{prefix, message, suffix}] = args;
additional = Object.assign({}, {suffix, prefix});
msg = message ? util.format(...message) : this._hasAdditional(additional, args);

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's better than my previous method

}
} else {
Expand Down