Skip to content

Improved array handling: Fixes for issue npm/ini#52 and should also fix npm/ini#56 #74

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

Closed
sthuber90 wants to merge 7 commits into from
Closed

Improved array handling: Fixes for issue npm/ini#52 and should also fix npm/ini#56 #74

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
689f988
fixes for issue npm/ini#52 and should also fix npm/ini#56
Mar 16, 2018
3408bf6
fixed `isArray` option handling
Mar 16, 2018
a110982
some further improvements and changed dependencies back to original
Mar 20, 2018
70d29c5
working on passing tests
Mar 20, 2018
314b411
updated documentation and added tests to new functionality
May 8, 2018
a48da46
updated gitignore
May 8, 2018
48e7ce5
updated win32 test to use EOL
May 8, 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
Next Next commit
fixes for issue #52 and should also fix #56
  • Loading branch information
Stephan Huber committed Mar 16, 2018
commit 689f98867a5283381c4469ff1d58dfb41de1e578
23 changes: 13 additions & 10 deletions ini.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ exports.stringify = exports.encode = encode
exports.safe = safe
exports.unsafe = unsafe

var eol = typeof process !== 'undefined' &&
process.platform === 'win32' ? '\r\n' : '\n'
var eol = require('os').EOL

function encode (obj, opt) {
var children = []
Expand All @@ -23,12 +22,15 @@ function encode (obj, opt) {
}

var separator = opt.whitespace ? ' = ' : '='

Object.keys(obj).forEach(function (k, _, __) {
var val = obj[k]
if (val && Array.isArray(val)) {
val.forEach(function (item) {
out += safe(k + '[]') + separator + safe(item) + '\n'
if (opt.isArray) {
out += safe(k + '[]') + separator + safe(item) + eol
} else {
out += safe(k) + separator + safe(item) + eol
}
})
} else if (val && typeof val === 'object') {
children.push(k)
Expand Down Expand Up @@ -62,7 +64,7 @@ function dotSplit (str) {
.replace(/\\\./g, '\u0001')
.split(/\./).map(function (part) {
return part.replace(/\1/g, '\\.')
.replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
.replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
})
}

Expand All @@ -73,7 +75,6 @@ function decode (str) {
// section |key = value
var re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
var lines = str.split(/[\r\n]+/g)

lines.forEach(function (line, _, __) {
if (!line || line.match(/^\s*[;#]/)) return
var match = line.match(re)
Expand All @@ -92,13 +93,15 @@ function decode (str) {
}

// Convert keys with '[]' suffix to an array
if (key.length > 2 && key.slice(-2) === '[]') {
if ((key.length > 2 && key.slice(-2) === '[]')) {
key = key.substring(0, key.length - 2)
if (!p[key]) {
p[key] = []
} else if (!Array.isArray(p[key])) {
p[key] = [p[key]]
}
} else if (p[key]) {
p[key] = [p[key]]
}

// safeguard against resetting a previously defined
Expand Down Expand Up @@ -150,10 +153,10 @@ function safe (val) {
val.match(/[=\r\n]/) ||
val.match(/^\[/) ||
(val.length > 1 &&
isQuoted(val)) ||
isQuoted(val)) ||
val !== val.trim())
? JSON.stringify(val)
: val.replace(/;/g, '\\;').replace(/#/g, '\\#')
? JSON.stringify(val)
: val.replace(/;/g, '\\;').replace(/#/g, '\\#')
}

function unsafe (val, doUnesc) {
Expand Down
Loading