Sync up PR #43 to v1.0-dev after it was merged into master

lib/ProgramCall.js

@@ -54,11 +54,7 @@ class ProgramCall {
     }
 
     if (!inDs) { // In recursive mode, if it is an element in DS, then no <parm> or </parm> needed.
-      if (opt && opt.io) {
-        this.xml += iXml.iXmlNodeParmOpen(opt.io);
-      } else {
-        this.xml += iXml.iXmlNodeParmOpen();
-      }
+      this.xml += iXml.iXmlNodeParmOpen(opt);
     }
 
     if (Array.isArray(data)) { // If it is a struct parameter, recursivly parse its children.

lib/ixml.js

@@ -110,6 +110,7 @@ const I_XML_ATTR_KEY_DB = 'db';
 const I_XML_ATTR_KEY_USERID = 'uid';
 const I_XML_ATTR_KEY_PASSWORD = 'pwd';
 const I_XML_ATTR_KEY_IO = 'io';
+const I_XML_ATTR_KEY_BY = 'by';
 const I_XML_ATTR_VALUE_IO = 'both';
 const I_XML_ATTR_KEY_OFFSET = 'offset';
 const I_XML_ATTR_KEY_TOP = 'top';
@@ -161,9 +162,20 @@ const iXmlNodePgmOpen = (xname, xlib, xfunc, xerror) => iXmlNodeOpen(I_XML_NODE_
           + I_XML_NODE_CLOSE;
 const iXmlNodePgmClose = () => I_XML_NODE_PGM_CLOSE;
 
-const iXmlNodeParmOpen = xio => iXmlNodeOpen(I_XML_NODE_PARM_OPEN)
-          + iXmlAttrDefault(I_XML_ATTR_KEY_IO, xio, I_XML_ATTR_VALUE_OPTIONAL)
-          + I_XML_NODE_CLOSE;
+const iXmlNodeParmOpen = (opt) => {
+  if (!(opt && typeof opt === 'object')) {
+    return iXmlNodeOpen(I_XML_NODE_PARM_OPEN)
+    + I_XML_NODE_CLOSE;
+  }
+
+  const io = (opt.io) ? iXmlAttrDefault(I_XML_ATTR_KEY_IO, opt.io, I_XML_ATTR_VALUE_OPTIONAL) : '';
+  const by = (opt.by) ? iXmlAttrDefault(I_XML_ATTR_KEY_BY, opt.by, I_XML_ATTR_VALUE_OPTIONAL) : '';
+
+  return iXmlNodeOpen(I_XML_NODE_PARM_OPEN)
+        + io
+        + by
+        + I_XML_NODE_CLOSE;
+};
 
 const iXmlNodeParmClose = () => I_XML_NODE_PARM_CLOSE;
 

test/unit/iPgmUnit.js

@@ -133,6 +133,58 @@ describe('iPgm Class Unit Tests', () => {
 
       expect(pgm.toXML()).to.equal(expectedXML);
     });
+
+    it('regular <parm> contains by=\'val\'', () => {
+      const pgm = new iPgm('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
+
+      pgm.addParam('', '1A', { by: 'val' });
+      pgm.addReturn('', '2A', { name: 'output' });
+
+      const lookAtXML = pgm.toXML();
+      expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
+    });
+
+    it('data structure <parm> contains by=\'val\'', () => {
+      const pgm = new iPgm('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
+
+      const params = [
+        [0, '3s0'],
+        [0, '7s0', { name: 'ds_fld2' }],
+      ];
+
+      pgm.addParam(params, { name: 'inds', by: 'val' });
+      pgm.addReturn('', '2A', { name: 'output' });
+
+      const lookAtXML = pgm.toXML();
+      expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
+    });
+
+    it('regular <parm> contains by=\'val\', with io=\'both\'', () => {
+      const pgm = new iPgm('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
+
+      pgm.addParam('', '1A', { by: 'val', io: 'both' });
+      pgm.addReturn('', '2A', { name: 'output' });
+
+      const lookAtXML = pgm.toXML();
+      expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
+      expect(lookAtXML).to.match(/<parm .*io='both'.*>/);
+    });
+
+    it('data structure <parm> contains by=\'val\', with io=\'both\'', () => {
+      const pgm = new iPgm('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
+
+      const params = [
+        [0, '3s0'],
+        [0, '7s0', { name: 'ds_fld2' }],
+      ];
+
+      pgm.addParam(params, { name: 'inds', by: 'val', io: 'both' });
+      pgm.addReturn('', '2A', { name: 'output' });
+
+      const lookAtXML = pgm.toXML();
+      expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
+      expect(lookAtXML).to.match(/<parm .*io='both'.*>/);
+    });
   });