Merge branch 'fix-core' of https://github.com/terminusdb/terminusdb-client-js

Author: Kitty Jose

index.js

@@ -1,45 +1,24 @@
 /* eslint-disable global-require */
-// const { Vars } = require('./lib/query/woqlDoc');
+const Vars = require('./lib/query/woqlDoc');
+const WOQLClient = require('./lib/woqlClient');
+const UTILS = require('./lib/utils');
+const View = require('./lib/viewer/woqlView');
+const WOQL = require('./lib/woql');
+const WOQLResult = require('./lib/viewer/woqlResult');
+const WOQLTable = require('./lib/viewer/woqlTable');
+const WOQLGraph = require('./lib/viewer/woqlGraph');
+const axiosInstance = require('./lib/axiosInstance');
+const AccessControl = require('./lib/accessControl');
 
 module.exports = {
-  /**
-   * @type {typeof import('./lib/query/woqlDoc')}
-   */
-  Vars: require('./lib/query/woqlDoc'),
-  /**
-   * @type {typeof import('./lib/woqlClient')}
-   */
-  WOQLClient: require('./lib/woqlClient'),
-  /**
-     * @type {typeof import('./lib/utils')}
-     */
-  UTILS: require('./lib/utils'),
-  /**
-     * @type {typeof import('./lib/viewer/woqlView')}
-     */
-  View: require('./lib/viewer/woqlView'),
-  /**
-     * @type {typeof import('./lib/woql')}
-     */
-  WOQL: require('./lib/woql'),
-  /**
-     * @type {typeof import('./lib/viewer/woqlResult')}
-     */
-  WOQLResult: require('./lib/viewer/woqlResult'),
-  /**
-     * @type {typeof import('./lib/viewer/woqlTable')}
-     */
-  WOQLTable: require('./lib/viewer/woqlTable'),
-  /**
-     * @type {typeof import('./lib/viewer/woqlGraph')}
-     */
-  WOQLGraph: require('./lib/viewer/woqlGraph'),
-  /**
-     * @type {typeof import('./lib/axiosInstance')}
-     */
-  axiosInstance: require('./lib/axiosInstance'),
-  /**
-   * @type {typeof import('./lib/accessControl')}
-   */
-  AccessControl: require('./lib/accessControl'),
+  Vars,
+  WOQLClient,
+  UTILS,
+  View,
+  WOQL,
+  WOQLResult,
+  WOQLTable,
+  WOQLGraph,
+  axiosInstance,
+  AccessControl,
 };

lib/woqlClient.js

@@ -56,12 +56,30 @@ const WOQLQuery = require('./query/woqlBuilder');
  * }
  */
 
-function WOQLClient(serverUrl, params) {
+class WOQLClient {
+  connectionConfig = null;
+
+  databaseList = [];
+
+  organizationList = [];
+  /**
+  * @constructor
+  * @param {string} serverUrl - the terminusdb server url
+  * @param {typedef.ParamsObj} [params] - an object with the connection parameters
+  * @example
+  */
+
+  constructor(serverUrl, params) {
+    this.connectionConfig = new ConnectionConfig(serverUrl, params);
+  }
+}
+
+/* function WOQLClient(serverUrl, params) {
   // current connection context variables
   this.connectionConfig = new ConnectionConfig(serverUrl, params);
   this.databaseList = [];
   this.organizationList = [];
-}
+} */
 
 /**
  * set the api key to access the cloud resources
@@ -1710,6 +1728,14 @@ WOQLClient.prototype.patch = function (before, patch) {
   ).then((response) => response);
 };
 
+WOQLClient.prototype.sendCustomRequest = function (requestType, customRequest, payload) {
+  return this.dispatch(
+    requestType,
+    customRequest,
+    payload,
+  ).then((response) => response);
+};
+
 // export default WOQLClient;
 
 module.exports = WOQLClient;