monir refactor

Author: rkodev

packages/abstractions/src/serialization/kiotaJsonSerializer.ts

@@ -10,6 +10,7 @@ import type { ParsableFactory } from "./parsableFactory";
 import type { ModelSerializerFunction } from "./serializationFunctionTypes";
 import { SerializationWriterFactoryRegistry } from "./serializationWriterFactoryRegistry";
 import { ParseNodeFactoryRegistry } from "./parseNodeFactoryRegistry";
+import type { ParseNodeFactory } from "./parseNodeFactory";
 
 const jsonContentType = "application/json";
 /**
@@ -58,22 +59,22 @@ export function serializeCollectionToJsonAsString<T extends Parsable>(serializat
 
 /**
  * Deserializes a buffer into a parsable object
- * @param parseNodeFactoryRegistry the parse node factory registry
+ * @param parseNodeFactory the parse node factory for the content type
  * @param bufferOrString the value to serialize
  * @param factory the factory for the model type
  * @returns the deserialized parsable object
  */
-export function deserializeFromJson<T extends Parsable>(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): Parsable {
-	return deserialize(parseNodeFactoryRegistry, jsonContentType, bufferOrString, factory);
+export function deserializeFromJson<T extends Parsable>(parseNodeFactory: ParseNodeFactory, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): Parsable {
+	return deserialize(parseNodeFactory, jsonContentType, bufferOrString, factory);
 }
 
 /**
  * Deserializes a buffer into a collection of parsable object
- * @param parseNodeFactoryRegistry the parse node factory registry
+ * @param parseNodeFactory the parse node factory for the content type
  * @param bufferOrString the value to serialize
  * @param factory the factory for the model type
  * @returns the deserialized collection of parsable objects
  */
-export function deserializeCollectionFromJson<T extends Parsable>(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): T[] | undefined {
-	return deserializeCollection(parseNodeFactoryRegistry, jsonContentType, bufferOrString, factory);
+export function deserializeCollectionFromJson<T extends Parsable>(parseNodeFactory: ParseNodeFactory, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): T[] | undefined {
+	return deserializeCollection(parseNodeFactory, jsonContentType, bufferOrString, factory);
 }

packages/abstractions/src/serialization/kiotaSerializer.ts

@@ -7,72 +7,72 @@
 import type { Parsable } from "./parsable";
 import type { ParsableFactory } from "./parsableFactory";
 import type { ParseNode } from "./parseNode";
-import { ParseNodeFactoryRegistry } from "./parseNodeFactoryRegistry";
 import type { ModelSerializerFunction } from "./serializationFunctionTypes";
 import type { SerializationWriter } from "./serializationWriter";
-import { SerializationWriterFactoryRegistry } from "./serializationWriterFactoryRegistry";
+import { SerializationWriterFactory } from "./serializationWriterFactory";
+import { ParseNodeFactory } from "./parseNodeFactory";
 
 /**
  * Serializes a parsable object into a buffer
- * @param serializationWriterFactoryRegistry the serialization writer factory registry
+ * @param serializationWriterFactory the serialization writer factory for the content type
  * @param contentType the content type to serialize to
  * @param value the value to serialize
  * @param serializationFunction the serialization function for the model type
  * @returns a buffer containing the serialized value
  */
-export function serialize<T extends Parsable>(serializationWriterFactoryRegistry: SerializationWriterFactoryRegistry, contentType: string, value: T, serializationFunction: ModelSerializerFunction<T>): ArrayBuffer {
-	const writer = getSerializationWriter(serializationWriterFactoryRegistry, contentType, value, serializationFunction);
+export function serialize<T extends Parsable>(serializationWriterFactory: SerializationWriterFactory, contentType: string, value: T, serializationFunction: ModelSerializerFunction<T>): ArrayBuffer {
+	const writer = getSerializationWriter(serializationWriterFactory, contentType, value, serializationFunction);
 	writer.writeObjectValue(undefined, value, serializationFunction);
 	return writer.getSerializedContent();
 }
 /**
  * Serializes a parsable object into a string representation
- * @param serializationWriterFactoryRegistry the serialization writer factory registry
+ * @param serializationWriterFactory the serialization writer factory for the content type
  * @param contentType the content type to serialize to
  * @param value the value to serialize
  * @param serializationFunction the serialization function for the model type
  * @returns a string representing the serialized value
  */
-export function serializeToString<T extends Parsable>(serializationWriterFactoryRegistry: SerializationWriterFactoryRegistry, contentType: string, value: T, serializationFunction: ModelSerializerFunction<T>): string {
-	const buffer = serialize(serializationWriterFactoryRegistry, contentType, value, serializationFunction);
+export function serializeToString<T extends Parsable>(serializationWriterFactory: SerializationWriterFactory, contentType: string, value: T, serializationFunction: ModelSerializerFunction<T>): string {
+	const buffer = serialize(serializationWriterFactory, contentType, value, serializationFunction);
 	return getStringValueFromBuffer(buffer);
 }
 /**
  * Serializes a collection of parsable objects into a buffer
- * @param serializationWriterFactoryRegistry the serialization writer factory registry
+ * @param serializationWriterFactory the serialization writer factory for the content type
  * @param contentType the content type to serialize to
  * @param values the value to serialize
  * @param serializationFunction the serialization function for the model type
  * @returns a string representing the serialized value
  */
-export function serializeCollection<T extends Parsable>(serializationWriterFactoryRegistry: SerializationWriterFactoryRegistry, contentType: string, values: T[], serializationFunction: ModelSerializerFunction<T>): ArrayBuffer {
-	const writer = getSerializationWriter(serializationWriterFactoryRegistry, contentType, values, serializationFunction);
+export function serializeCollection<T extends Parsable>(serializationWriterFactory: SerializationWriterFactory, contentType: string, values: T[], serializationFunction: ModelSerializerFunction<T>): ArrayBuffer {
+	const writer = getSerializationWriter(serializationWriterFactory, contentType, values, serializationFunction);
 	writer.writeCollectionOfObjectValues(undefined, values, serializationFunction);
 	return writer.getSerializedContent();
 }
 
 /**
  * Serializes a collection of parsable objects into a string representation
- * @param serializationWriterFactoryRegistry the serialization writer factory registry
+ * @param serializationWriterFactory the serialization writer factory for the content type
  * @param contentType the content type to serialize to
  * @param values the value to serialize
  * @param serializationFunction the serialization function for the model type
  * @returns a string representing the serialized value
  */
-export function serializeCollectionToString<T extends Parsable>(serializationWriterFactoryRegistry: SerializationWriterFactoryRegistry, contentType: string, values: T[], serializationFunction: ModelSerializerFunction<T>): string {
-	const buffer = serializeCollection(serializationWriterFactoryRegistry, contentType, values, serializationFunction);
+export function serializeCollectionToString<T extends Parsable>(serializationWriterFactory: SerializationWriterFactory, contentType: string, values: T[], serializationFunction: ModelSerializerFunction<T>): string {
+	const buffer = serializeCollection(serializationWriterFactory, contentType, values, serializationFunction);
 	return getStringValueFromBuffer(buffer);
 }
 
 /**
  * Gets a serialization writer for a given content type
- * @param serializationWriterFactoryRegistry the serialization writer factory registry
+ * @param serializationWriterFactory the serialization writer factory for the content type
  * @param contentType the content type to serialize to
  * @param value the value to serialize
  * @param serializationFunction the serialization function for the model type
  * @returns the serialization writer for the given content type
  */
-function getSerializationWriter(serializationWriterFactoryRegistry: SerializationWriterFactoryRegistry, contentType: string, value: unknown, serializationFunction: unknown): SerializationWriter {
+function getSerializationWriter(serializationWriterFactory: SerializationWriterFactory, contentType: string, value: unknown, serializationFunction: unknown): SerializationWriter {
 	if (!contentType) {
 		throw new Error("content type cannot be undefined or empty");
 	}
@@ -82,7 +82,7 @@ function getSerializationWriter(serializationWriterFactoryRegistry: Serializatio
 	if (!serializationFunction) {
 		throw new Error("serializationFunction cannot be undefined");
 	}
-	return serializationWriterFactoryRegistry.getSerializationWriter(contentType);
+	return serializationWriterFactory.getSerializationWriter(contentType);
 }
 
 /**
@@ -97,28 +97,28 @@ function getStringValueFromBuffer(buffer: ArrayBuffer): string {
 
 /**
  * Deserializes a buffer into a parsable object
- * @param parseNodeFactoryRegistry the parse node factory registry
+ * @param parseNodeFactory the parse node factory for the content type
  * @param contentType the content type to serialize to
  * @param bufferOrString the value to serialize
  * @param factory the factory for the model type
  * @returns the deserialized parsable object
  */
-export function deserialize<T extends Parsable>(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, contentType: string, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): Parsable {
+export function deserialize<T extends Parsable>(parseNodeFactory: ParseNodeFactory, contentType: string, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): Parsable {
 	if (typeof bufferOrString === "string") {
 		bufferOrString = getBufferFromString(bufferOrString);
 	}
-	const reader = getParseNode(parseNodeFactoryRegistry, contentType, bufferOrString, factory);
+	const reader = getParseNode(parseNodeFactory, contentType, bufferOrString, factory);
 	return reader.getObjectValue(factory);
 }
 /**
  * Deserializes a buffer into a parsable object
- * @param parseNodeFactoryRegistry the parse node factory registry
+ * @param parseNodeFactory the parse node factory for the content type
  * @param contentType the content type to serialize to
  * @param buffer the value to deserialize
  * @param factory the factory for the model type
  * @returns the deserialized parsable object
  */
-function getParseNode(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, contentType: string, buffer: ArrayBuffer, factory: unknown): ParseNode {
+function getParseNode(parseNodeFactory: ParseNodeFactory, contentType: string, buffer: ArrayBuffer, factory: unknown): ParseNode {
 	if (!contentType) {
 		throw new Error("content type cannot be undefined or empty");
 	}
@@ -128,21 +128,21 @@ function getParseNode(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, conten
 	if (!factory) {
 		throw new Error("factory cannot be undefined");
 	}
-	return parseNodeFactoryRegistry.getRootParseNode(contentType, buffer);
+	return parseNodeFactory.getRootParseNode(contentType, buffer);
 }
 /**
  * Deserializes a buffer into a collection of parsable object
- * @param parseNodeFactoryRegistry the parse node factory registry
+ * @param parseNodeFactory the parse node factory for the content type
  * @param contentType the content type to serialize to
  * @param bufferOrString the value to serialize
  * @param factory the factory for the model type
  * @returns the deserialized collection of parsable objects
  */
-export function deserializeCollection<T extends Parsable>(parseNodeFactoryRegistry: ParseNodeFactoryRegistry, contentType: string, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): T[] | undefined {
+export function deserializeCollection<T extends Parsable>(parseNodeFactory: ParseNodeFactory, contentType: string, bufferOrString: ArrayBuffer | string, factory: ParsableFactory<T>): T[] | undefined {
 	if (typeof bufferOrString === "string") {
 		bufferOrString = getBufferFromString(bufferOrString);
 	}
-	const reader = getParseNode(parseNodeFactoryRegistry, contentType, bufferOrString, factory);
+	const reader = getParseNode(parseNodeFactory, contentType, bufferOrString, factory);
 	return reader.getCollectionOfObjectValues(factory);
 }
 

packages/bundle/src/defaultRequestAdapter.ts

@@ -30,12 +30,12 @@ export class DefaultRequestAdapter extends FetchRequestAdapter {
 	}
 
 	private setupDefaults() {
-		registerDefaultSerializer(super.getSerializationWriterFactory(), JsonSerializationWriterFactory);
-		registerDefaultSerializer(super.getSerializationWriterFactory(), TextSerializationWriterFactory);
-		registerDefaultSerializer(super.getSerializationWriterFactory(), FormSerializationWriterFactory);
-		registerDefaultSerializer(super.getSerializationWriterFactory(), MultipartSerializationWriterFactory);
-		registerDefaultDeserializer(super.getSerializationWriterFactory(), JsonParseNodeFactory);
-		registerDefaultDeserializer(super.getSerializationWriterFactory(), TextParseNodeFactory);
-		registerDefaultDeserializer(super.getSerializationWriterFactory(), FormParseNodeFactory);
+		registerDefaultSerializer(super.getSerializationWriterFactory() as SerializationWriterFactoryRegistry, JsonSerializationWriterFactory);
+		registerDefaultSerializer(super.getSerializationWriterFactory() as SerializationWriterFactoryRegistry, TextSerializationWriterFactory);
+		registerDefaultSerializer(super.getSerializationWriterFactory() as SerializationWriterFactoryRegistry, FormSerializationWriterFactory);
+		registerDefaultSerializer(super.getSerializationWriterFactory() as SerializationWriterFactoryRegistry, MultipartSerializationWriterFactory);
+		registerDefaultDeserializer(super.getParseNodeFactory() as ParseNodeFactoryRegistry, JsonParseNodeFactory);
+		registerDefaultDeserializer(super.getParseNodeFactory() as ParseNodeFactoryRegistry, TextParseNodeFactory);
+		registerDefaultDeserializer(super.getParseNodeFactory() as ParseNodeFactoryRegistry, FormParseNodeFactory);
 	}
 }