ssh-config 5.0.0 → 5.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ssh-config",
   "description": "SSH config parser and stringifier",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "author": "Chen Yangjian (https://www.cyj.me)",
   "repository": {
     "type": "git",

package/src/ssh-config.js

@@ -20,7 +20,7 @@ var LineType;
     LineType[LineType["DIRECTIVE"] = 1] = "DIRECTIVE";
     LineType[LineType["COMMENT"] = 2] = "COMMENT";
 })(LineType || (exports.LineType = LineType = {}));
-const MULTIPLE_VALUE_PROPS = [
+const REPEATABLE_DIRECTIVES = [
     'IdentityFile',
     'LocalForward',
     'RemoteForward',
@@ -115,18 +115,31 @@ class SSHConfig extends Array {
         };
         const obj = {};
         const setProperty = (name, value) => {
-            if (MULTIPLE_VALUE_PROPS.includes(name)) {
-                const list = obj[name] || (obj[name] = []);
-                list.push(value);
+            let val;
+            if (Array.isArray(value)) {
+                if (/ProxyCommand/i.test(name)) {
+                    val = value.map(({ val, separator }) => `${separator}${val}`).join('').trim();
+                }
+                else {
+                    val = value.map(({ val }) => val);
+                }
+            }
+            else {
+                val = value;
+            }
+            const val0 = Array.isArray(val) ? val[0] : val;
+            if (REPEATABLE_DIRECTIVES.includes(name)) {
+                const list = (obj[name] || (obj[name] = []));
+                list.push(...[].concat(val));
             }
             else if (obj[name] == null) {
                 if (name === 'HostName') {
-                    context.params.HostName = value;
+                    context.params.HostName = val0;
                 }
                 else if (name === 'User') {
-                    context.params.User = value;
+                    context.params.User = val0;
                 }
-                obj[name] = value;
+                obj[name] = val;
             }
         };
         if (opts.User !== undefined) {
@@ -542,7 +555,7 @@ function stringify(config) {
         if (line.type === LineType.COMMENT) {
             str += line.content;
         }
-        else if (line.type === LineType.DIRECTIVE && MULTIPLE_VALUE_PROPS.includes(line.param)) {
+        else if (line.type === LineType.DIRECTIVE && REPEATABLE_DIRECTIVES.includes(line.param)) {
             (Array.isArray(line.value) ? line.value : [line.value]).forEach((value, i, values) => {
                 str += formatDirective({ ...line, value: typeof value !== 'string' ? value.val : value });
                 if (i < values.length - 1)