modifications to url and request composers

Author: AleksandrRogov

src/client/request/composers/request.ts

@@ -10,15 +10,23 @@ import type { InternalConfig } from "../../../utils/Config";
  * @returns Modified internal request object
  */
 export const composeRequest = (request: InternalRequest, config: Partial<InternalConfig>): InternalRequest => {
-    request.path = request.path || "";
+    request.path = ""; //path must always be reset
     request.functionName = request.functionName || "";
     if (!request.url) {
         if (!request._isUnboundRequest && !request.contentId && !request.collection) {
             ErrorHelper.parameterCheck(request.collection, `DynamicsWebApi.${request.functionName}`, "request.collection");
         }
+
+        if (request.contentId) {
+            ErrorHelper.stringParameterCheck(request.contentId, `DynamicsWebApi.${request.functionName}`, "request.contentId");
+            if (request.contentId.startsWith("$")) {
+                request.path = request.contentId;
+            }
+        }
+
         if (request.collection != null) {
             ErrorHelper.stringParameterCheck(request.collection, `DynamicsWebApi.${request.functionName}`, "request.collection");
-            request.path = request.collection;
+            request.path += request.path ? `/${request.collection}` : request.collection;
 
             //add alternate key feature
             if (request.key) {
@@ -27,13 +35,6 @@ export const composeRequest = (request: InternalRequest, config: Partial<Interna
             }
         }
 
-        if (request.contentId) {
-            ErrorHelper.stringParameterCheck(request.contentId, `DynamicsWebApi.${request.functionName}`, "request.contentId");
-            if (request.contentId.startsWith("$")) {
-                request.path = request.path ? `${request.contentId}/${request.path}` : request.contentId;
-            }
-        }
-
         if (request.addPath) {
             if (request.path) {
                 request.path += "/";
@@ -42,12 +43,6 @@ export const composeRequest = (request: InternalRequest, config: Partial<Interna
         }
 
         request.path = composeUrl(request, config, request.path);
-
-        if (request.fetchXml) {
-            ErrorHelper.stringParameterCheck(request.fetchXml, `DynamicsWebApi.${request.functionName}`, "request.fetchXml");
-            let join = request.path.indexOf("?") === -1 ? "?" : "&";
-            request.path += `${join}fetchXml=${encodeURIComponent(request.fetchXml)}`;
-        }
     } else {
         ErrorHelper.stringParameterCheck(request.url, `DynamicsWebApi.${request.functionName}`, "request.url");
         request.path = request.url.replace(config.dataApi!.url, "");

src/client/request/composers/url.ts

@@ -132,6 +132,11 @@ export const composeUrl = (request: InternalRequest | null, config: Config | nul
             ErrorHelper.boolParameterCheck(request.isBatch, `DynamicsWebApi.${request.functionName}`, "request.isBatch");
         }
 
+        if (request.fetchXml) {
+            ErrorHelper.stringParameterCheck(request.fetchXml, `DynamicsWebApi.${request.functionName}`, "request.fetchXml");
+            queryArray.push("fetchXml=" + encodeURIComponent(request.fetchXml));
+        }
+
         if (!isNull(request.inChangeSet)) {
             ErrorHelper.boolParameterCheck(request.inChangeSet, `DynamicsWebApi.${request.functionName}`, "request.inChangeSet");
         }
@@ -157,7 +162,7 @@ export const composeUrl = (request: InternalRequest | null, config: Config | nul
                     };
                     let expandConverted = composeUrl(expandRequest, config, "", ";");
                     if (expandConverted) {
-                        expandConverted = `(${expandConverted.slice(1)})`;
+                        expandConverted = `(${expandConverted})`;
                     }
                     expandQueryArray.push(property + expandConverted);
                 }
@@ -168,5 +173,17 @@ export const composeUrl = (request: InternalRequest | null, config: Config | nul
         }
     }
 
-    return !queryArray.length ? url : url + "?" + queryArray.join(joinSymbol);
-};
+    // nothing to add to the URL
+    if (!queryArray.length) {
+        return url;
+    }
+
+    // in any other cases the joinSymbol is ";" (during expand process)
+    if (joinSymbol === "&") {
+        url += "?";
+    }
+
+    return url + queryArray.join(joinSymbol);
+
+    // return !queryArray.length ? url : url + "?" + queryArray.join(joinSymbol);
+};