Skip to content

joyent/node-triton#89 -o field,field,...` should be strict about allo… #4

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
YangYong3 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

joyent/node-triton#89 -o field,field,...` should be strict about allo… #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fc6e0
joyent/node-triton#89 -o field,field,...` should be strict about allo…
YangYong3 Mar 8, 2017
51c1c1e
don`t need new Excetion
YangYong3 Mar 10, 2017
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
17 changes: 14 additions & 3 deletions lib/tabula.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ function tabulaFormat(items, options) {
assert.optionalArrayOfString(options.validFields, 'options.validFields');
assert.optionalBool(options.dottedLookup, 'options.dottedLookup');
assert.optionalBool(options.noAnsi, 'options.noAnsi');
assert.optionalBool(options.caseInsensitiveLookup,
'options.caseInsensitiveLookup');

if (!options.columns && items.length === 0) {
return '';
Expand Down Expand Up @@ -287,7 +289,10 @@ function tabulaFormat(items, options) {
if (options.dottedLookup) {
try {
cell = dottedLookup(o, col.lookup);
} catch (e) {}
} catch (e) {
if (options.caseInsensitiveLookup)
throw e;
}
} else {
cell = o[col.lookup];
}
Expand Down Expand Up @@ -403,8 +408,14 @@ function dottedLookup(obj, str, c) {
for (var i = 0; i < dots.length; i++) {
var dot = dots[i];
s.push(dot);
if (!o.hasOwnProperty(dot))
throw new Error('no property ' + s.join(c) + ' found');
if (!o.hasOwnProperty(dot)) {
var msg = 'no property ' + s.join(c) + ' found' + '\n';
msg += 'The following properties are supported :' + '\n\n';
Object.keys(o).forEach(function (k) {
msg += k + '\n';
});
throw new Error(msg);
}
o = o[dot];
}
return o;
Expand Down