[VET-5931] whitespace changes

.circleci/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   stardog1:
-    command: ["--port", "5821", "--home", "/var/opt/stardog"]
+    command: ['--port', '5821', '--home', '/var/opt/stardog']
     depends_on:
       - zoo1
     environment:
@@ -18,7 +18,7 @@ services:
       - ../stardog-license-key.bin:/var/opt/stardog/stardog-license-key.bin
       - ./cluster.properties:/var/opt/stardog/stardog.properties
   stardog2:
-    command: ["--port", "5822", "--home", "/var/opt/stardog"]
+    command: ['--port', '5822', '--home', '/var/opt/stardog']
     depends_on:
       - zoo1
     environment:
@@ -71,7 +71,6 @@ services:
     working_dir: /app
     environment:
       - HOST=stardog1
-      - CIRCLECI=true
     volumes:
       - ../:/app/
     depends_on:

.circleci/jwt.yaml

@@ -1,13 +1,13 @@
 ---
-confVersion: "1.0"
+confVersion: '1.0'
 deploymentName: stardog-server
 issuers:
   http://stardog.com:
     algorithms:
       HS256:
-        secret: "some-kind-of-secret-key-here"
+        secret: 'some-kind-of-secret-key-here'
 
 signer:
   algorithm: HS256
-  secret: "some-kind-of-secret-key-here"
+  secret: 'some-kind-of-secret-key-here'
   issuer: http://stardog.com

.eslintrc.js

@@ -31,6 +31,5 @@ module.exports = {
 
     // TODO remove these:
     'no-unused-vars': 'off',
-    'prefer-object-spread': 'warn',
   },
 };

lib/Connection.js

@@ -10,7 +10,7 @@ class Connection {
   // request creation can be overriden by providing a `createRequest` method on
   // `meta`, and header creation can be overriden with `createHeaders`.
   config(options, meta) {
-    const config = Object.assign({}, this, options, { meta });
+    const config = { ...this, ...options, meta };
 
     // If it ends with / slice it off
     if (

lib/catalog.js

@@ -22,7 +22,7 @@ const addCredential = (conn, credentials, label) => {
   const headers = conn.headers();
   headers.set('Content-Type', 'application/json');
 
-  const body = Object.assign({}, credentials, { label });
+  const body = { ...credentials, label };
 
   return fetch(conn.request('admin', 'catalog', 'credentials'), {
     method: 'POST',

lib/db/index.js

@@ -7,14 +7,13 @@ const reasoning = require('./reasoning');
 const docs = require('./docs');
 const namespaces = require('./namespaces');
 
-module.exports = Object.assign(
-  {},
-  db,
-  { icv },
-  { transaction },
-  { options },
-  { docs },
-  { graph },
-  { reasoning },
-  { namespaces }
-);
+module.exports = {
+  ...db,
+  icv,
+  transaction,
+  options,
+  docs,
+  graph,
+  reasoning,
+  namespaces,
+};

lib/db/main.js

@@ -28,9 +28,7 @@ const dispatchChange = (conn, config, content, params = {}) => {
     }
   )
     .then(httpBody)
-    .then(res =>
-      Object.assign({}, res, { transactionId: config.transactionId })
-    );
+    .then(res => ({ ...res, transactionId: config.transactionId }));
 };
 
 const create = (conn, database, databaseOptions = {}, options = {}, params) => {
@@ -151,7 +149,7 @@ const clear = (conn, database, transactionId, params = {}) => {
     }
   )
     .then(httpBody)
-    .then(res => Object.assign({}, res, { transactionId }));
+    .then(res => ({ ...res, transactionId }));
 };
 
 // options - graphUri, contentType, encoding

lib/db/namespaces.js

@@ -10,7 +10,7 @@ const backwardsCompatGetNamespaces = (conn, database) =>
       const n = lodashGet(res, 'body.database.namespaces', []);
       const names = n.reduce((memo, keyValString) => {
         const [key, value] = keyValString.split('=');
-        return Object.assign({}, memo, { [key]: value });
+        return { ...memo, [key]: value };
       }, {});
       res.body = names;
     }
@@ -29,15 +29,13 @@ const get = (conn, database) => {
       return backwardsCompatGetNamespaces(conn, database);
     }
 
-    return httpBody(res).then(bodyRes =>
-      Object.assign({}, bodyRes, {
-        body: lodashGet(bodyRes, 'body.namespaces', []).reduce(
-          (memo, { prefix, name }) =>
-            Object.assign({}, memo, { [prefix]: name }),
-          {}
-        ),
-      })
-    );
+    return httpBody(res).then(bodyRes => ({
+      ...bodyRes,
+      body: lodashGet(bodyRes, 'body.namespaces', []).reduce(
+        (memo, { prefix, name }) => ({ ...memo, [prefix]: name }),
+        {}
+      ),
+    }));
   });
 };
 

lib/db/transaction.js

@@ -1,7 +1,6 @@
 const { httpBody } = require('../response-transforms');
 
-const attachTransactionId = transactionId => res =>
-  Object.assign({}, res, { transactionId });
+const attachTransactionId = transactionId => res => ({ ...res, transactionId });
 
 const begin = (conn, database, params = {}) => {
   const headers = conn.headers();
@@ -11,7 +10,7 @@ const begin = (conn, database, params = {}) => {
     headers,
   })
     .then(httpBody)
-    .then(res => Object.assign({}, res, { transactionId: res.body }));
+    .then(res => ({ ...res, transactionId: res.body }));
 };
 
 const rollback = (conn, database, transactionId, params = {}) => {

lib/query/index.js

@@ -3,4 +3,4 @@ const stored = require('./stored');
 const graphql = require('./graphql');
 const utils = require('./utils');
 
-module.exports = Object.assign({}, query, { stored }, { graphql }, { utils });
+module.exports = { ...query, stored, graphql, utils };

lib/query/main.js

@@ -93,7 +93,7 @@ const executeInTransaction = (
     }
   )
     .then(httpBody)
-    .then(res => Object.assign({}, res, { transactionId }));
+    .then(res => ({ ...res, transactionId }));
 };
 
 const property = (conn, database, config, params) =>
@@ -108,9 +108,7 @@ const property = (conn, database, config, params) =>
   ).then(res => {
     const values = lodashGet(res, 'body.results.bindings', []);
     if (values.length > 0) {
-      return Object.assign({}, res, {
-        body: values[0].val.value,
-      });
+      return { ...res, body: values[0].val.value };
     }
     return res;
   });

lib/query/stored.js

@@ -4,7 +4,7 @@ const CONTENT_TYPE_JSON = 'application/json';
 
 const getBody = (conn, storedQuery, options) => {
   if (!options.contentType || options.contentType === CONTENT_TYPE_JSON) {
-    const body = Object.assign({}, storedQuery);
+    const body = { ...storedQuery };
     body.creator = conn.username;
     body.shared = typeof body.shared === 'boolean' ? body.shared : false;
     return body;

lib/user/index.js

@@ -1,4 +1,4 @@
 const user = require('./main');
 const role = require('./role');
 
-module.exports = Object.assign({}, user, { role });
+module.exports = { ...user, role };

scripts/build.js

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable no-console */
 const { babel } = require('@rollup/plugin-babel');
 const commonjs = require('@rollup/plugin-commonjs');
 const json = require('@rollup/plugin-json');

scripts/changelog.js

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable no-console */
 const fs = require('fs');
 const path = require('path');
 const semver = require('semver');
@@ -78,7 +76,12 @@ function getMilestones(
     }),
   })
     .then(res => res.json())
-    .then(({ data: { repository: { milestones } } }) =>
+    .then(
+      ({
+        data: {
+          repository: { milestones },
+        },
+      }) =>
         Promise.all(
           milestones.nodes.map(milestone => {
             if (!milestoneAndIssuesData[milestone.title]) {

scripts/docs.js

@@ -1,6 +1,3 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable import/no-extraneous-dependencies */
-
 const typedocs = require('typedocs/out');
 const fs = require('fs');
 const path = require('path');
@@ -44,8 +41,9 @@ const getPath = obj => {
     obj.parent === null ||
     obj.parent === undefined ||
     obj.parent.name === `"${pathToDeclaration}"`
-  )
+  ) {
     return obj.name;
+  }
   return `${getPath(obj.parent)}.${obj.name}`;
 };
 
@@ -57,11 +55,9 @@ const getMarkdown = (obj, parent = null) => {
     const typeName = type.slice(type.indexOf('<') + 1, type.lastIndexOf('>'));
     const typeHeading = typeName.split('.').pop();
     return ''.concat(
-      `#### <a name="${obj.name.toLowerCase()}">\`${getPath(
-        parent
-      )}.${obj.name}(${obj.parameters
-        .map(param => param.name)
-        .join(', ')})\`</a>\n\n`,
+      `#### <a name="${obj.name.toLowerCase()}">\`${getPath(parent)}.${
+        obj.name
+      }(${obj.parameters.map(param => param.name).join(', ')})\`</a>\n\n`,
       `${obj.documentation}\n\n`,
       `Expects the following parameters:\n\n${obj.parameters.reduce(
         (acc, val) => acc.concat(`- ${val.name} (${getType(val.type)})\n\n`),
@@ -162,8 +158,12 @@ Promise.resolve(typedocs.generate([pathToDeclaration]))
     markdown =>
       new Promise((resolve, reject) => {
         fs.readFile(pathToREADME, 'utf8', (err, data) => {
-          if (err) return reject(err);
+          if (err) {
+            return reject(err);
+          }
+          // eslint-disable-next-line no-param-reassign
           data = data.slice(0, data.indexOf('<!--- API Goes Here --->'));
+          // eslint-disable-next-line no-param-reassign
           data = data.concat('<!--- API Goes Here --->\n# API\n\n', markdown);
           return fs.writeFile(pathToREADME, data, error => {
             if (error) {
@@ -175,4 +175,7 @@ Promise.resolve(typedocs.generate([pathToDeclaration]))
       })
   )
   .then(console.log)
-  .catch(console.err);
+  .catch(e => {
+    console.error(e);
+    process.exit(1);
+  });

scripts/triggerAnnoyingAlert.js

@@ -14,11 +14,11 @@ const writeCountdown = () => {
   process.stdout.clearLine();
   process.stdout.cursorTo(0);
   process.stdout.write(`                         ...\u0007Publishing in ${countdown} seconds!`);
-}
+};
 
 const beAnnoying = () => {
   writeCountdown();
-  countdown--;
+  countdown -= 1;
   if (countdown < 0) {
     console.log(chalk.green('\n\n                                  Publishing!\n'));
     return;

test/stored.spec.js

@@ -25,18 +25,14 @@ const convertToJsonLd = (conn, storedQuery) => {
     types.push('system:ReasoningQuery');
   }
 
-  const keyValuePairs = Object.entries(
-    Object.assign(
-      {
-        'system:queryName': storedQuery.name,
-        'system:queryDescription': storedQuery.description,
-        'system:queryString': storedQuery.query,
-        'system:queryCreator': conn.username,
-        'system:queryDatabase': storedQuery.database,
-      },
-      storedQuery.annotations
-    )
-  ).reduce((obj, [iri, value]) => {
+  const keyValuePairs = Object.entries({
+    'system:queryName': storedQuery.name,
+    'system:queryDescription': storedQuery.description,
+    'system:queryString': storedQuery.query,
+    'system:queryCreator': conn.username,
+    'system:queryDatabase': storedQuery.database,
+    ...storedQuery.annotations,
+  }).reduce((obj, [iri, value]) => {
     if (typeof value !== 'undefined') {
       // eslint-disable-next-line no-param-reassign
       obj[iri] = { '@value': value };
@@ -49,13 +45,11 @@ const convertToJsonLd = (conn, storedQuery) => {
       system: 'http://system.stardog.com/',
     },
     '@graph': [
-      Object.assign(
-        {
-          '@id': 'system:Query',
-          '@type': types,
-        },
-        keyValuePairs
-      ),
+      {
+        '@id': 'system:Query',
+        '@type': types,
+        ...keyValuePairs,
+      },
     ],
   };
 };

test/transactions.spec.js

@@ -168,7 +168,7 @@ describe('transactions', () => {
   it('Should be able to clean and insert all data in the DB using a transaction.', () => {
     const dbContent = fs.readFileSync(
       `${process.cwd()}/test/fixtures/api_tests.nt`,
-      'utf-8'
+      'utf8'
     );
     return begin()
       .then(res => {