startgg-helper 2.2.1 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "startgg-helper",
-  "version": "2.2.1",
+  "version": "2.3.1",
   "description": "A set of functions and classes useful to communicate with the start.gg API, using any client (YOU NEED TO PROVIDE A CLIENT YOURSELF, SEE README)",
   "main": "main.js",
   "module": "main.js",

package/src/query.js

@@ -93,7 +93,7 @@ export class Query {
      * @param {{[varName: string]: value}} params 
      * @param {string} connectionPathInQuery JSON path to the paginated collection that must aggregated in the query (JSON path : property names separated by dots)
      * @param {TimedQuerySemaphore} limiter 
-     * @param {{pageParamName?: string, perPageParamName?: string, perPage?: number, delay?: number, maxElements?: number, includeWholeQuery?: number}} config 
+     * @param {{pageParamName?: string, perPageParamName?: string, perPage?: number, delay?: number, maxElements?: number, includeWholeQuery?: number, callback: (localResult: T[], page: number, totalPages: number) => T[]?}} config 
      * @param {boolean} silentErrors 
      * @param {number} maxTries 
      * @returns 
@@ -132,9 +132,15 @@ export class Query {
             if (!isConnection(connection)) throw "The given path does not point to a connection type";
 
             let localResult = connection.nodes;
+
             if (connection.pageInfo && connection.pageInfo.totalPages){
                 let totalPages = connection.pageInfo.totalPages;
                 if (!totalPages || currentPage >= totalPages) {
+                    if (config.callback){
+                        let cbRes = config.callback(localResult, currentPage);
+                        if (cbRes) break;
+                        localResult = cbRes;
+                    }
                     result = result.concat(localResult);
                     break;
                 }
@@ -142,6 +148,12 @@ export class Query {
                 if (localResult.length < 1) break;
             }
 
+            if (config.callback){
+                let cbRes = config.callback(localResult, currentPage);
+                if (!cbRes) break;
+                localResult = cbRes;
+            }
+
             result = result.concat(localResult);
             currentPage++;
             params[pageParamName] = currentPage;

package/src/tournamentUtil.js

@@ -17,8 +17,9 @@ const placements = [
  */
 export function extractSlug(string){
     if (string.includes("start.gg/")){
-        return string.split("start.gg/")[1];
-    } 
+        string = string.split("start.gg/")[1];
+    };
+    string = string.split("/").slice(0, 4).join("/");
     return string;
 }