@js4cytoscape/ndex-client 0.4.3-alpha.2 → 0.4.3-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js4cytoscape/ndex-client",
-  "version": "0.4.3-alpha.2",
+  "version": "0.4.3-alpha.4",
   "description": "NDEx client library",
   "repository": {
     "type": "git",
@@ -28,6 +28,9 @@
     "node": ">=12.16.1"
   },
   "dependencies": {
-    "axios": "^1.3.4"
+    "axios": "^1.4.0"
+  },
+  "devDependencies": {
+    "@microsoft/tsdoc": "^0.14.2"
   }
 }

package/src/NDEx.js

@@ -6,6 +6,9 @@ const CX1_HEADER = {
   }]
 };
 
+/**
+ * NDEx client class.
+ */
 class NDEx {
     constructor(hostprefix) {
       if (hostprefix === undefined || hostprefix === null || hostprefix === '') {
@@ -380,6 +383,16 @@ class NDEx {
       return this._httpGetProtectedObj('network/' + uuid + '/summary', parameters);
     }
 
+    getNetworkV3Summary(uuid, accessKey,fmt) {
+      let parameters =  {format:  fmt != null? fmt : "FULL"}
+
+      if (accessKey != null) {
+        parameters ['accesskey'] = accessKey;
+      }
+
+      return this._httpGetV3ProtectedObj('networks/' + uuid + '/summary', parameters);
+    }
+
     createNetworkFromRawCX(rawCX, parameters) {
       return new Promise((resolve, reject) =>{
         this._httpPostProtectedObj('network', parameters, rawCX).then(
@@ -463,7 +476,7 @@ class NDEx {
       return this._httpPostProtectedObj('search/network', params, data);
     }
 
-    neighborhoodQuery(uuid, searchTerms, saveResult, parameters) {
+    neighborhoodQuery(uuid, searchTerms, saveResult, parameters, outputCX2 = false) {
       let params = {};
 
       if (saveResult !== undefined && saveResult === true) {params.save = true;}
@@ -484,12 +497,18 @@ class NDEx {
         if (parameters.directOnly !== undefined) {
           data.directOnly = parameters.directOnly;
         }
+        if ( parameters.nodeIds !=null) {
+          data.nodeIds = parameters.nodeIds;
+        } 
       }
+      if( outputCX2)
+        return this._httpPostV3ProtectedObj('search/network/' + uuid + '/query', params, data);
+
       return this._httpPostProtectedObj('search/network/' + uuid + '/query', params, data);
 
     }
 
-    interConnectQuery(uuid, searchTerms, saveResult, parameters) {
+    interConnectQuery(uuid, searchTerms, saveResult, parameters, outputCX2 = false) {
       let params = {};
 
       if (saveResult !== undefined && saveResult === true) {params.save = true;}
@@ -503,7 +522,13 @@ class NDEx {
         if (parameters.errorWhenLimitIsOver !== undefined) {
           data.errorWhenLimitIsOver = parameters.errorWhenLimitIsOver;
         }
+        if ( parameters.nodeIds !=null) {
+          data.nodeIds = parameters.nodeIds;
+        }
       }
+      if (outputCX2)
+         return this._httpPostV3ProtectedObj('search/networks/' + uuid + '/interconnectquery', params, data);
+         
       return this._httpPostProtectedObj('search/network/' + uuid + '/interconnectquery', params, data);
 
     }
@@ -524,6 +549,16 @@ class NDEx {
       return this._httpPostProtectedObj('batch/network/summary', parameter, uuidList);
     }
 
+    getNetworkSummariesV3ByUUIDs(uuidList, accessKey,fmt) {
+      let parameter =  {format:  fmt == undefined ? "FULL" : fmt}
+
+      if(accessKey != null) 
+        parameter['accesskey']= accessKey;
+
+      return this._httpPostV3ProtectedObj('batch/networks/summary', parameter, uuidList);
+    }
+
+
     getNetworkPermissionsByUUIDs(uuidList) {
       return this._httpPostProtectedObj('batch/network/permission', undefined, uuidList);
     }
@@ -762,11 +797,11 @@ class NDEx {
     return new Promise((resolve, reject)=> {
       this._httpPostV3ProtectedObj('workspaces', undefined, workspace).then(
         (response) => {
-          let uuidr = response.split('/');
+         // let uuidr = response.split('/');
 
-          let uuid = uuidr[uuidr.length - 1];
+         // let uuid = uuidr[uuidr.length - 1];
 
-          return resolve(uuid);
+          return resolve(response);
         },
         (err) => {reject(err);}
       );