Support duplicate property names as array #100

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
         platform:
         - os: ubuntu-latest
         - os: macos-latest

.gitignore

@@ -2,3 +2,4 @@
 /coverage
 /node_modules
 /npm-debug.log
+/.history

.taprc

@@ -0,0 +1 @@
+--test-ignore=.history

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
+    "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
+}

README.md

@@ -82,6 +82,7 @@ The `options` object may contain the following:
   `=` character.  By default, whitespace is omitted, to be friendly to
   some persnickety old parsers that don't tolerate it well.  But some
   find that it's more human-readable and pretty with the whitespace.
+* `withoutArraySuffix` Boolean to specify whether to insert `[]` as array properties. default is `false`.
 
 For backwards compatibility reasons, if a `string` options is passed
 in, then it is assumed to be the `section` value.

lib/ini.js

@@ -12,19 +12,22 @@ const encode = (obj, opt) => {
     opt = {
       section: opt,
       whitespace: false,
+      withoutArraySuffix: false,
     }
   } else {
     opt = opt || Object.create(null)
     opt.whitespace = opt.whitespace === true
+    opt.withoutArraySuffix = opt.withoutArraySuffix === true
   }
 
   const separator = opt.whitespace ? ' = ' : '='
+  const arraySuffix = opt.withoutArraySuffix ? '' : '[]'
 
   for (const k of Object.keys(obj)) {
     const val = obj[k]
     if (val && Array.isArray(val)) {
       for (const item of val)
-        out += safe(k + '[]') + separator + safe(item) + eol
+        out += safe(k + arraySuffix) + separator + safe(item) + eol
     } else if (val && typeof val === 'object')
       children.push(k)
     else
@@ -37,10 +40,11 @@ const encode = (obj, opt) => {
   for (const k of children) {
     const nk = dotSplit(k).join('\\.')
     const section = (opt.section ? opt.section + '.' : '') + nk
-    const { whitespace } = opt
+    const { whitespace, withoutArraySuffix } = opt
     const child = encode(obj[k], {
       section,
       whitespace,
+      withoutArraySuffix,
     })
     if (out.length && child.length)
       out += eol
@@ -59,13 +63,15 @@ const dotSplit = str =>
       part.replace(/\1/g, '\\.')
         .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001'))
 
-const decode = str => {
+const decode = (str, opt) => {
   const out = Object.create(null)
   let p = out
   let section = null
   //          section     |key      = value
   const re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
   const lines = str.split(/[\r\n]+/g)
+  // for duplicate property statist
+  const bucket = {}
 
   for (const line of lines) {
     if (!line || line.match(/^\s*[;#]/))
@@ -85,8 +91,11 @@ const decode = str => {
       continue
     }
     const keyRaw = unsafe(match[2])
-    const isArray = keyRaw.length > 2 && keyRaw.slice(-2) === '[]'
+    let isArray = keyRaw.length > 2 && keyRaw.slice(-2) === '[]'
     const key = isArray ? keyRaw.slice(0, -2) : keyRaw
+    bucket[key] = ~~bucket[key] + 1
+    if (opt && opt.withoutArraySuffix && bucket[key] > 1)
+      isArray = true
     if (key === '__proto__')
       continue
     const valueRaw = match[3] ? unsafe(match[4]) : true
@@ -116,8 +125,8 @@ const decode = str => {
   const remove = []
   for (const k of Object.keys(out)) {
     if (!hasOwnProperty.call(out, k) ||
-        typeof out[k] !== 'object' ||
-        Array.isArray(out[k]))
+      typeof out[k] !== 'object' ||
+      Array.isArray(out[k]))
       continue
 
     // see if the parent section is also an object.
@@ -147,14 +156,14 @@ const decode = str => {
 
 const isQuoted = val =>
   (val.charAt(0) === '"' && val.slice(-1) === '"') ||
-    (val.charAt(0) === "'" && val.slice(-1) === "'")
+  (val.charAt(0) === "'" && val.slice(-1) === "'")
 
 const safe = val =>
   (typeof val !== 'string' ||
     val.match(/[=\r\n]/) ||
     val.match(/^\[/) ||
     (val.length > 1 &&
-     isQuoted(val)) ||
+      isQuoted(val)) ||
     val !== val.trim())
     ? JSON.stringify(val)
     : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
@@ -168,7 +177,7 @@ const unsafe = (val, doUnesc) => {
 
     try {
       val = JSON.parse(val)
-    } catch (_) {}
+    } catch (_) { }
   } else {
     // walk the val to find the first not-escaped ; character
     let esc = false

tap-snapshots/test/foo.js.test.cjs

@@ -36,6 +36,13 @@ Null Object {
     "this is included",
   ],
   "br": "warm",
+  "duplicate": Null Object {
+    "ar": Array [
+      "2",
+      "3",
+    ],
+    "br": "2",
+  },
   "eq": "eq=eq",
   "false": false,
   "null": null,
@@ -100,6 +107,11 @@ cr[]=eight
 e=1
 j=2
 
+[duplicate]
+ar[]=2
+ar[]=3
+br=2
+
 [x\\.y\\.z]
 x.y.z=xyz