itoolkit 1.0.0 → 1.0.1

package/test/functional/iSqlFunctional.js

@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');
@@ -23,13 +22,13 @@ const { parseString } = require('xml2js');
 const { iSql, Connection } = require('../../lib/itoolkit');
 const { config, printConfig } = require('./config');
 
-describe('iSql Functional Tests', () => {
-  before(() => {
+describe('iSql Functional Tests', function () {
+  before(function () {
     printConfig();
   });
 
-  describe('prepare & execute', () => {
-    it('prepares & executes stored procedure then fetch results', (done) => {
+  describe('prepare & execute', function () {
+    it('prepares & executes stored procedure then fetch results', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -62,8 +61,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('addQuery & fetch', () => {
-    it('runs a query and fetches results', (done) => {
+  describe('addQuery & fetch', function () {
+    it('runs a query and fetches results', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -88,8 +87,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('added test to ensure issue #11 was resolved', () => {
-    it('should parse SQL result set empty data tags correctly', (done) => {
+  describe('added test to ensure issue #11 was resolved', function () {
+    it('should parse SQL result set empty data tags correctly', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -115,8 +114,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('tables', () => {
-    it('returns meta data for specified table', (done) => {
+  describe('tables', function () {
+    it('returns meta data for specified table', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -140,8 +139,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('tablePriv', () => {
-    it('returns privilege data for a table', (done) => {
+  describe('tablePriv', function () {
+    it('returns privilege data for a table', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -167,8 +166,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('columns', () => {
-    it('returns meta data for a column', (done) => {
+  describe('columns', function () {
+    it('returns meta data for a column', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -205,8 +204,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('columnPriv', () => {
-    it('returns privilege data for a column', (done) => {
+  describe('columnPriv', function () {
+    it('returns privilege data for a column', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -234,8 +233,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('procedures', () => {
-    it('returns meta data on for a procedure', (done) => {
+  describe('procedures', function () {
+    it('returns meta data on for a procedure', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -262,8 +261,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('pColumns', () => {
-    it('returns meta data for procedure column', (done) => {
+  describe('pColumns', function () {
+    it('returns meta data for procedure column', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -301,8 +300,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('primaryKeys', () => {
-    it('returns meta data for a primary key', (done) => {
+  describe('primaryKeys', function () {
+    it('returns meta data for a primary key', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -327,8 +326,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('foreignKeys', () => {
-    it('returns meta data for a foreign key', (done) => {
+  describe('foreignKeys', function () {
+    it('returns meta data for a foreign key', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -362,8 +361,8 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe('statistics', () => {
-    it('returns stats info for table', (done) => {
+  describe('statistics', function () {
+    it('returns stats info for table', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();
@@ -395,10 +394,10 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe.skip('special', () => {
+  describe.skip('special', function () {
     // TODO: find passing case
     // Below test fails with error code 9- argument value not valid
-    it.skip('returns meta data for special columns', (done) => {
+    it.skip('returns meta data for special columns', function (done) {
       // [catalog, schema, table, row | transaction |session, no | nullable]
       const connection = new Connection(config);
 
@@ -419,9 +418,9 @@ describe('iSql Functional Tests', () => {
     });
   });
 
-  describe.skip('rowCount', () => {
+  describe.skip('rowCount', function () {
     // Skip for now need to create a table for this test  to insert to.
-    it.skip('returns the number of rows affected by statement', (done) => {
+    it.skip('returns the number of rows affected by statement', function (done) {
       const connection = new Connection(config);
 
       const sql = new iSql();

package/test/functional/iUserSpaceFunctional.js

@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');
@@ -38,15 +37,15 @@ function generateRandomName() {
   return name.toUpperCase();
 }
 
-describe('UserSpace Functional Tests', () => {
-  before(() => {
+describe('UserSpace Functional Tests', function () {
+  before(function () {
     printConfig();
   });
 
   let userSpaceName;
 
-  describe('createUserSpace', () => {
-    it('creates a user space', (done) => {
+  describe('createUserSpace', function () {
+    it('creates a user space', function (done) {
       const connection = new Connection(config);
 
       const userSpace = new iUserSpace(connection);
@@ -55,18 +54,25 @@ describe('UserSpace Functional Tests', () => {
 
       const name = generateRandomName();
 
-      userSpace.createUserSpace(name, lib, 'LOG', 50, '*EXCLUDE',
-        description, (error, output) => {
+      userSpace.createUserSpace(
+        name,
+        lib,
+        'LOG',
+        50,
+        '*EXCLUDE',
+        description,
+        (error, output) => {
           expect(error).to.equal(null);
           expect(output).to.be.a('boolean').and.to.equal(true);
           userSpaceName = name;
           done();
-        });
+        },
+      );
     });
   });
 
-  describe('setUserSpaceData', () => {
-    it('sets data within the user space', (done) => {
+  describe('setUserSpaceData', function () {
+    it('sets data within the user space', function (done) {
       if (!userSpaceName) {
         this.skip();
       }
@@ -77,17 +83,22 @@ describe('UserSpace Functional Tests', () => {
 
       const msg = 'Hello from userspace!';
 
-      userSpace.setUserSpaceData(userSpaceName, lib, msg.length, msg,
+      userSpace.setUserSpaceData(
+        userSpaceName,
+        lib,
+        msg.length,
+        msg,
         (error, output) => {
           expect(error).to.equal(null);
           expect(output).to.be.a('boolean').and.to.equal(true);
           done();
-        });
+        },
+      );
     });
   });
 
-  describe('getUserSpaceData', () => {
-    it('returns specified length of data', (done) => {
+  describe('getUserSpaceData', function () {
+    it('returns specified length of data', function (done) {
       if (!userSpaceName) {
         this.skip();
       }
@@ -104,8 +115,8 @@ describe('UserSpace Functional Tests', () => {
     });
   });
 
-  describe('deleteUserSpace', () => {
-    it('removes a user space', (done) => {
+  describe('deleteUserSpace', function () {
+    it('removes a user space', function (done) {
       if (!userSpaceName) {
         this.skip();
       }

package/test/functional/iWorkFunctional.js

@@ -15,7 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 /* eslint-disable new-cap */
 
 const { expect } = require('chai');
@@ -23,13 +22,13 @@ const { Connection, iWork } = require('../../lib/itoolkit');
 const { config, printConfig } = require('./config');
 const { checkObjectExists } = require('./checkObjectExists');
 
-describe('iWork Functional Tests', () => {
-  before(() => {
+describe('iWork Functional Tests', function () {
+  before(function () {
     printConfig();
   });
 
-  describe('getSysValue', () => {
-    it('returns the value of system variable', (done) => {
+  describe('getSysValue', function () {
+    it('returns the value of system variable', function (done) {
       const connection = new Connection(config);
 
       const work = new iWork(connection);
@@ -41,7 +40,7 @@ describe('iWork Functional Tests', () => {
       });
     });
 
-    it('returns an error when the specified system value is invalid', (done) => {
+    it('returns an error when the specified system value is invalid', function (done) {
       const connection = new Connection(config);
 
       const work = new iWork(connection);
@@ -53,8 +52,8 @@ describe('iWork Functional Tests', () => {
     });
   });
 
-  describe('getSysStatus', () => {
-    it('returns basic system status information about the signed-on users and batch jobs', (done) => {
+  describe('getSysStatus', function () {
+    it('returns basic system status information about the signed-on users and batch jobs', function (done) {
       const connection = new Connection(config);
       const work = new iWork(connection);
 
@@ -82,8 +81,8 @@ describe('iWork Functional Tests', () => {
     });
   });
 
-  describe('getSysStatusExt', () => {
-    it('returns more detailed system status info', (done) => {
+  describe('getSysStatusExt', function () {
+    it('returns more detailed system status info', function (done) {
       const connection = new Connection(config);
 
       const work = new iWork(connection);
@@ -127,8 +126,8 @@ describe('iWork Functional Tests', () => {
     });
   });
 
-  describe('getJobStatus', () => {
-    it('returns status of specified job', (done) => {
+  describe('getJobStatus', function () {
+    it('returns status of specified job', function (done) {
       const connection = new Connection(config);
 
       const work = new iWork(connection);
@@ -143,8 +142,8 @@ describe('iWork Functional Tests', () => {
     });
   });
 
-  describe('getJobInfo', () => {
-    it('returns info on specfed job', (done) => {
+  describe('getJobInfo', function () {
+    it('returns info on specfed job', function (done) {
       const connection = new Connection(config);
 
       const work = new iWork(connection);
@@ -192,27 +191,24 @@ describe('iWork Functional Tests', () => {
     });
   });
 
-  describe('getDataArea', () => {
-    before('check if data area exists for tests', (done) => {
+  describe('getDataArea', function () {
+    it('returns contents of a data area', function (done) {
       checkObjectExists(config, 'TESTDA', '*DTAARA', (error) => {
         if (error) { throw error; }
-        done();
-      });
-    });
-    it('returns contents of a data area', (done) => {
-      const connection = new Connection(config);
-
-      const work = new iWork(connection);
-
-      work.getDataArea('NODETKTEST', 'TESTDA', 20, (error, output) => {
-        expect(error).to.equal(null);
-        expect(output).to.be.an('Object');
-        expect(output).to.have.a.property('Type_of_value_returned');
-        expect(output).to.have.a.property('Library_name');
-        expect(output).to.have.a.property('Length_of_value_returned');
-        expect(output).to.have.a.property('Number_of_decimal_positions');
-        expect(output).to.have.a.property('Value');
-        done();
+        const connection = new Connection(config);
+
+        const work = new iWork(connection);
+
+        work.getDataArea('NODETKTEST', 'TESTDA', 20, (error2, output) => {
+          expect(error2).to.equal(null);
+          expect(output).to.be.an('Object');
+          expect(output).to.have.a.property('Type_of_value_returned');
+          expect(output).to.have.a.property('Library_name');
+          expect(output).to.have.a.property('Length_of_value_returned');
+          expect(output).to.have.a.property('Number_of_decimal_positions');
+          expect(output).to.have.a.property('Value');
+          done();
+        });
       });
     });
   });

package/test/unit/CommandCallUnit.js

@@ -15,13 +15,12 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
 const { expect } = require('chai');
 const { CommandCall } = require('../../lib/itoolkit');
 
-describe('Command Call Unit Tests', () => {
-  describe('SH command tests', () => {
-    it('accepts command input and returns <sh> XML output', () => {
+describe('Command Call Unit Tests', function () {
+  describe('SH command tests', function () {
+    it('accepts command input and returns <sh> XML output', function () {
       const command = new CommandCall({ command: 'ls -lah', type: 'sh' });
 
       const expectedXML = '<sh error=\'fast\'>ls -lah</sh>';
@@ -29,7 +28,7 @@ describe('Command Call Unit Tests', () => {
       expect(command.toXML()).to.be.a('string').and.to.equal(expectedXML);
     });
 
-    it('accepts command input and options returns <sh> with optional attributes', () => {
+    it('accepts command input and options returns <sh> with optional attributes', function () {
       const options = {
         error: 'on', before: '65535', after: '37', rows: 'on',
       };
@@ -42,8 +41,8 @@ describe('Command Call Unit Tests', () => {
     });
   });
 
-  describe('CL command tests', () => {
-    it('accepts command input and returns <cmd> XML output', () => {
+  describe('CL command tests', function () {
+    it('accepts command input and returns <cmd> XML output', function () {
       const command = new CommandCall({ command: 'RTVJOBA USRLIBL(?) SYSLIBL(?)', type: 'cl' });
 
       const expectedXML = '<cmd exec=\'rexx\' error=\'fast\'>RTVJOBA USRLIBL(?) SYSLIBL(?)</cmd>';
@@ -51,7 +50,7 @@ describe('Command Call Unit Tests', () => {
       expect(command.toXML()).to.be.a('string').and.to.equal(expectedXML);
     });
 
-    it('accepts command input and options returns <cmd> with optional attributes', () => {
+    it('accepts command input and options returns <cmd> with optional attributes', function () {
       const options = {
         exec: 'cmd', error: 'on', before: '65535', after: '37', hex: 'on',
       };
@@ -65,8 +64,8 @@ describe('Command Call Unit Tests', () => {
     });
   });
 
-  describe('QSH command tests', () => {
-    it('accepts command input and returns <qsh> XML output', () => {
+  describe('QSH command tests', function () {
+    it('accepts command input and returns <qsh> XML output', function () {
       const command = new CommandCall({ command: 'ls -lah', type: 'qsh' });
 
       const expectedXML = '<qsh error=\'fast\'>ls -lah</qsh>';
@@ -74,7 +73,7 @@ describe('Command Call Unit Tests', () => {
       expect(command.toXML()).to.be.a('string').and.to.equal(expectedXML);
     });
 
-    it('accepts command input and options returns <qsh> with optional attributes', () => {
+    it('accepts command input and options returns <qsh> with optional attributes', function () {
       const options = {
         error: 'on', before: '65535', after: '37', rows: 'on',
       };

package/test/unit/ConnectionUnit.js

@@ -15,16 +15,13 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
-/* eslint-disable new-cap */
-
 const { expect } = require('chai');
 const sinon = require('sinon');
 const { Connection, CommandCall } = require('../../lib/itoolkit');
 
-describe('Connection Class Unit Tests', () => {
-  describe('constructor', () => {
-    it('creates and returns an instance of Connection with idb transport', () => {
+describe('Connection Class Unit Tests', function () {
+  describe('constructor', function () {
+    it('creates and returns an instance of Connection with idb transport', function () {
       const options = {
         transport: 'idb',
         transportOptions: {
@@ -46,7 +43,7 @@ describe('Connection Class Unit Tests', () => {
       expect(connection.commandList.length).to.equal(0);
     });
 
-    it('creates and returns an instance of Connection with rest transport', () => {
+    it('creates and returns an instance of Connection with rest transport', function () {
       const options = {
         transport: 'rest',
         transportOptions: {
@@ -79,8 +76,8 @@ describe('Connection Class Unit Tests', () => {
     });
   });
 
-  describe('add', () => {
-    it('appends to xml service request to the command list using Connection class', () => {
+  describe('add', function () {
+    it('appends to xml service request to the command list using Connection class', function () {
       const options = {
         transport: 'idb',
         transportOptions: {
@@ -97,9 +94,8 @@ describe('Connection Class Unit Tests', () => {
     });
   });
 
-
-  describe('debug', () => {
-    it('turns verbose mode on/off using Connection class', () => {
+  describe('debug', function () {
+    it('turns verbose mode on/off using Connection class', function () {
       const options = {
         transport: 'idb',
         transportOptions: {
@@ -117,9 +113,8 @@ describe('Connection Class Unit Tests', () => {
     });
   });
 
-
-  describe('getTransportOptions', () => {
-    it('returns conn (object) property from Connection instance', () => {
+  describe('getTransportOptions', function () {
+    it('returns conn (object) property from Connection instance', function () {
       const options = {
         transport: 'rest',
         transportOptions: {
@@ -138,7 +133,6 @@ describe('Connection Class Unit Tests', () => {
 
       const transportOptions = connection.getTransportOptions();
 
-
       expect(transportOptions).to.be.an('Object');
       expect(transportOptions.database).to.equal(options.transportOptions.database);
       expect(transportOptions.username).to.equal(options.transportOptions.username);
@@ -149,9 +143,8 @@ describe('Connection Class Unit Tests', () => {
     });
   });
 
-
-  describe('run', () => {
-    it('(Connection) invokes transport to execute xml input and returns xml output in callback', () => {
+  describe('run', function () {
+    it('(Connection) invokes transport to execute xml input and returns xml output in callback', function () {
       const options = {
         transport: 'idb',
         transportOptions: {

package/test/unit/ProgamCallUnit.js

@@ -15,9 +15,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-/* eslint-env mocha */
-/* eslint-disable new-cap */
-
 const { expect } = require('chai');
 const { ProgramCall } = require('../../lib/itoolkit');
 
@@ -38,22 +35,24 @@ const errno = [
   { type: '1A', value: '' },
 ];
 
-describe('ProgramCall Class Unit Tests', () => {
-  describe('constructor', () => {
-    it('creates and returns an instance of ProgramCall with lib and function set', () => {
+describe('ProgramCall Class Unit Tests', function () {
+  describe('constructor', function () {
+    it('creates and returns an instance of ProgramCall with lib and function set', function () {
       const pgm = new ProgramCall('QTOCNETSTS');
       expect(pgm).to.be.instanceOf(ProgramCall);
     });
   });
 
-  describe('toXML', () => {
-    it('returns pgm XML', () => {
-      const pgm = new ProgramCall('QTOCNETSTS',
+  describe('toXML', function () {
+    it('returns pgm XML', function () {
+      const pgm = new ProgramCall(
+        'QTOCNETSTS',
         {
           lib: 'QSYS',
           func: 'QtoRtvTCPA',
           error: 'on',
-        });
+        },
+      );
 
       const expectedXML = '<pgm name=\'QTOCNETSTS\' lib=\'QSYS\' func=\'QtoRtvTCPA\' error=\'on\'></pgm>';
 
@@ -61,14 +60,16 @@ describe('ProgramCall Class Unit Tests', () => {
     });
   });
 
-  describe('addParam', () => {
-    it('appends param to pgm xml', () => {
-      const pgm = new ProgramCall('QTOCNETSTS',
+  describe('addParam', function () {
+    it('appends param to pgm xml', function () {
+      const pgm = new ProgramCall(
+        'QTOCNETSTS',
         {
           lib: 'QSYS',
           func: 'QtoRtvTCPA',
           error: 'fast',
-        });
+        },
+      );
 
       pgm.addParam({ type: 'ds', io: 'out', fields: outBuf });
 
@@ -135,7 +136,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(pgm.toXML()).to.equal(expectedXML);
     });
 
-    it('regular <parm> contains by=\'val\'', () => {
+    it('regular <parm> contains by=\'val\'', function () {
       const pgm = new ProgramCall('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
 
       pgm.addParam({ value: '', type: '1A', by: 'val' });
@@ -145,7 +146,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
     });
 
-    it('data structure <parm> contains by=\'val\'', () => {
+    it('data structure <parm> contains by=\'val\'', function () {
       const pgm = new ProgramCall('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
 
       const params = [
@@ -162,7 +163,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(lookAtXML).to.match(/<parm .*by='val'.*>/);
     });
 
-    it('regular <parm> contains by=\'val\', with io=\'both\'', () => {
+    it('regular <parm> contains by=\'val\', with io=\'both\'', function () {
       const pgm = new ProgramCall('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
 
       pgm.addParam({
@@ -175,7 +176,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(lookAtXML).to.match(/<parm .*io='both'.*>/);
     });
 
-    it('data structure <parm> contains by=\'val\', with io=\'both\'', () => {
+    it('data structure <parm> contains by=\'val\', with io=\'both\'', function () {
       const pgm = new ProgramCall('MYPGM', { lib: 'MYLIB', func: 'MY_PROCEDURE' });
 
       const params = [
@@ -193,7 +194,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(lookAtXML).to.match(/<parm .*io='both'.*>/);
     });
 
-    it('add nested data structure parameter', () => {
+    it('add nested data structure parameter', function () {
       const pgm = new ProgramCall('MYPGM', { lib: 'MYLIB' });
 
       const nestedDs = {
@@ -238,15 +239,16 @@ describe('ProgramCall Class Unit Tests', () => {
     });
   });
 
-
-  describe('addReturn', () => {
-    it('appends return to pgm xml', () => {
-      const pgm = new ProgramCall('QTOCNETSTS',
+  describe('addReturn', function () {
+    it('appends return to pgm xml', function () {
+      const pgm = new ProgramCall(
+        'QTOCNETSTS',
         {
           lib: 'QSYS',
           func: 'QtoRtvTCPA',
           error: 'fast',
-        });
+        },
+      );
 
       pgm.addReturn({ type: '20A', value: '0' });
 
@@ -256,7 +258,7 @@ describe('ProgramCall Class Unit Tests', () => {
       expect(pgm.toXML()).to.equal(expectedXML);
     });
 
-    it('appends return with ds to pgm xml', () => {
+    it('appends return with ds to pgm xml', function () {
       const pgm = new ProgramCall('TEST');
 
       const ds = {