Handle Guid in query parameters.

packages/abstractions/src/requestInformation.ts

@@ -18,6 +18,7 @@ import type { RequestConfiguration } from "./requestConfiguration";
 import type { RequestOption } from "./requestOption";
 import type { ModelSerializerFunction, Parsable, SerializationWriter } from "./serialization";
 import { TimeOnly } from "./timeOnly";
+import { Guid } from "guid-typescript";
 
 /** This class represents an abstract HTTP request. */
 export class RequestInformation implements RequestInformationSetContent {
@@ -63,12 +64,12 @@ export class RequestInformation implements RequestInformationSetContent {
 			const data = {} as Record<string, unknown>;
 			for (const key in this.queryParameters) {
 				if (this.queryParameters[key] !== null && this.queryParameters[key] !== undefined) {
-					data[key] = this.queryParameters[key];
+					data[key] = this.normalizeValue(this.queryParameters[key]);
 				}
 			}
 			for (const key in this.pathParameters) {
 				if (this.pathParameters[key]) {
-					data[key] = this.pathParameters[key];
+					data[key] = this.normalizeValue(this.pathParameters[key]);
 				}
 			}
 			return StdUriTemplate.expand(this.urlTemplate, data);
@@ -230,9 +231,22 @@ export class RequestInformation implements RequestInformationSetContent {
 		this.headers.tryAdd(RequestInformation.contentTypeHeader, contentType);
 		this.content = value;
 	};
+
+	private normalizeValue(value: unknown): unknown {
+		if (value instanceof Guid || value instanceof DateOnly || value instanceof TimeOnly) {
+			return value.toString();
+		}
+		if (value instanceof Date) {
+			return value.toISOString();
+		}
+		if (Array.isArray(value)) {
+			return value.map((val) => this.normalizeValue(val));
+		}
+		return value;
+	}
 	/**
 	 * Sets the query string parameters from a raw object.
-	 * @param parameters the parameters.
+	 * @param q parameters the parameters.
 	 * @param p the mapping from code symbol to URI template parameter name.
 	 */
 	public setQueryStringParametersFromRawObject<T extends object>(q?: T, p?: Record<string, string>): void {
@@ -246,6 +260,8 @@ export class RequestInformation implements RequestInformationSetContent {
 				}
 			}
 			if (typeof v === "boolean" || typeof v === "number" || typeof v === "string" || Array.isArray(v)) this.queryParameters[key] = v;
+			else if (v instanceof Guid || v instanceof DateOnly || v instanceof TimeOnly) this.queryParameters[key] = v.toString();
+			else if (v instanceof Date) this.queryParameters[key] = v.toISOString();
 			else if (v === undefined) this.queryParameters[key] = undefined;
 		});
 	}

packages/abstractions/test/common/requestInformation.ts

@@ -7,9 +7,10 @@
 
 import { assert, describe, it } from "vitest";
 
-import { Headers, HttpMethod, type Parsable, type RequestAdapter, RequestInformation, type SerializationWriter, type SerializationWriterFactory } from "../../src";
+import { DateOnly, HttpMethod, type Parsable, parseGuidString, type RequestAdapter, RequestInformation, type SerializationWriter, type SerializationWriterFactory, TimeOnly } from "../../src";
 import { MultipartBody } from "../../src/multipartBody";
 import { TestEnum } from "./store/testEnum";
+import { Guid } from "guid-typescript";
 
 interface GetQueryParameters {
 	select?: string[];
@@ -19,6 +20,12 @@ interface GetQueryParameters {
 	search?: string;
 	dataset?: TestEnum;
 	datasets?: TestEnum[];
+	objectId?: Guid;
+	startDate?: DateOnly;
+	startTime?: TimeOnly;
+	endTime?: TimeOnly;
+	endDate?: DateOnly;
+	timeStamp?: Date;
 }
 
 const getQueryParameterMapper: Record<string, string> = {
@@ -190,6 +197,17 @@ describe("RequestInformation", () => {
 		assert.equal(methodCalledCount, 1);
 	});
 
+	it("should correctly handle custom type in query/path parameter", () => {
+		const expected: string = `http://localhost/users/33933a8d-32bb-c6a8-784a-f60b5a1dd66a/2021-12-12?objectId=83afbf49-5583-152c-d7fb-176105d518bc&startDate=2021-12-12&startTime=23%3A12%3A00.0000000&timeStamp=2024-06-11T00%3A00%3A00.000Z`;
+		const requestInformation = new RequestInformation(HttpMethod.GET);
+		requestInformation.pathParameters["baseurl"] = baseUrl;
+		requestInformation.pathParameters["userId"] = Guid.parse("33933a8d-32bb-c6a8-784a-f60b5a1dd66a");
+		requestInformation.pathParameters["date"] = DateOnly.parse("2021-12-12");
+		requestInformation.urlTemplate = "http://localhost/users/{userId}/{date}{?objectId,startDate,startTime,endDate,endTime,timeStamp}";
+		requestInformation.setQueryStringParametersFromRawObject<GetQueryParameters>({ objectId: parseGuidString("83afbf49-5583-152c-d7fb-176105d518bc"), startDate: new DateOnly({ year: 2021, month: 12, day: 12 }), startTime: new TimeOnly({ hours: 23, minutes: 12 }), timeStamp: new Date("2024-06-11T00:00:00.000Z") }, getQueryParameterMapper);
+		assert.equal(requestInformation.URL, expected);
+	});
+
 	it("Sets a scalar content", () => {
 		const requestInformation = new RequestInformation();
 		let writtenValue = "";