Comparing version 2.5.8 to 2.5.9
@@ -6,2 +6,3 @@ var Public = require('../src/public.js'); | ||
options = options || {}; | ||
options.adapter = "automattic"; | ||
@@ -8,0 +9,0 @@ //translations |
@@ -103,1 +103,43 @@ var Chalk = require('chalk'); | ||
console.log(str2); | ||
//var header3 = [ | ||
// { | ||
// alias : "Is organic?", | ||
// value : "organic", | ||
// width : 15 | ||
// } | ||
//]; | ||
// | ||
////Example with objects as rows3 | ||
//var rows3 = [ | ||
// { | ||
// organic : "no" | ||
// }, | ||
// { | ||
// organic : "yes" | ||
// }, | ||
// { | ||
// organic : "no" | ||
// }, | ||
// { | ||
// organic : "yes" | ||
// }, | ||
// { | ||
// organic : "no" | ||
// }, | ||
// { | ||
// organic : "no" | ||
// } | ||
//]; | ||
// | ||
//var t3 = Table(header3,rows3,{ | ||
// borderStyle : 1, | ||
// paddingBottom : 0 | ||
//}); | ||
// | ||
//var str3 = t3.render(); | ||
//console.log(str3); | ||
{ | ||
"name": "tty-table", | ||
"version": "2.5.8", | ||
"version": "2.5.9", | ||
"description": "Command line table generator.", | ||
@@ -5,0 +5,0 @@ "main": "src/main.js", |
@@ -9,3 +9,3 @@ let Merge = require("merge"); | ||
*/ | ||
Render.stringifyData = function(Config,data){ | ||
Render.stringifyData = function(config,data){ | ||
let sections = { | ||
@@ -16,4 +16,4 @@ header : [], | ||
}; | ||
let marginLeft = Array(Config.marginLeft + 1).join('\ '); | ||
let borderStyle = Config.borderCharacters[Config.borderStyle]; | ||
let marginLeft = Array(config.marginLeft + 1).join('\ '); | ||
let borderStyle = config.borderCharacters[config.borderStyle]; | ||
let borders = []; | ||
@@ -23,6 +23,6 @@ | ||
//how rows are passed (array of arrays, objects, etc) | ||
Config.rowFormat = Render.getRowFormat(data[0] || []); | ||
config.rowFormat = Render.getRowFormat(data[0] || [],config); | ||
//now translate them | ||
data = Render.transformRows(Config,data); | ||
data = Render.transformRows(config,data); | ||
@@ -32,12 +32,12 @@ //when streaming values to tty-table, we don't want column widths to change | ||
if(!global.columnWidths){ | ||
global.columnWidths = Config.table.columnWidths = Format.getColumnWidths(Config,data); | ||
global.columnWidths = config.table.columnWidths = Format.getColumnWidths(config,data); | ||
} | ||
else{ | ||
Config.table.columnWidths = global.columnWidths; | ||
config.table.columnWidths = global.columnWidths; | ||
} | ||
//stringify header cells | ||
if(!Config.headerEmpty){ | ||
sections.header = Config.table.header.map(function(row){ | ||
return buildRow(Config,row,'header'); | ||
if(!config.headerEmpty){ | ||
sections.header = config.table.header.map(function(row){ | ||
return buildRow(config,row,'header'); | ||
}); | ||
@@ -51,10 +51,10 @@ } | ||
sections.body = data.map(function(row){ | ||
return buildRow(Config,row,'body'); | ||
return buildRow(config,row,'body'); | ||
}); | ||
//stringify footer cells | ||
sections.footer = (Config.table.footer instanceof Array && Config.table.footer.length > 0) ? [Config.table.footer] : []; | ||
sections.footer = (config.table.footer instanceof Array && config.table.footer.length > 0) ? [config.table.footer] : []; | ||
sections.footer = sections.footer.map(function(row){ | ||
return buildRow(Config,row,'footer'); | ||
return buildRow(config,row,'footer'); | ||
}); | ||
@@ -66,3 +66,3 @@ | ||
borders.push(''); | ||
Config.table.columnWidths.forEach(function(w,i,arr){ | ||
config.table.columnWidths.forEach(function(w,i,arr){ | ||
borders[a] += Array(w).join(borderStyle[a].h) + | ||
@@ -119,3 +119,3 @@ ((i+1 !== arr.length) ? borderStyle[a].j : borderStyle[a].r); | ||
//skip if compact | ||
case(Config.compact && p === 'body' && !row.empty): | ||
case(config.compact && p === 'body' && !row.empty): | ||
break; | ||
@@ -134,3 +134,3 @@ default: | ||
let finalOutput = Array(Config.marginTop + 1).join('\n') + output; | ||
let finalOutput = Array(config.marginTop + 1).join('\n') + output; | ||
@@ -262,3 +262,3 @@ //record the height of the output | ||
Render.getRowFormat = function(row){ | ||
Render.getRowFormat = function(row,config){ | ||
let type; | ||
@@ -269,3 +269,3 @@ | ||
let keys = Object.keys(row); | ||
if(keys.length === 1){ | ||
if(config.adapter === 'automattic'){ | ||
//detected cross table | ||
@@ -272,0 +272,0 @@ let key = keys[0]; |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1058912
17402