hackolade · Nightlngale · Feb 5, 2025 · Jan 27, 2025 · Jan 27, 2025 · Jan 27, 2025
diff --git a/forward_engineering/helpers/commonHelper.js b/forward_engineering/helpers/commonHelper.js
@@ -19,7 +19,7 @@ function mapExternalDocs({ externalDocsUrl, externalDocsDescription, scopesExten
 	};
 	const externalDocsExtensions = getExtensions(scopesExtensions);
 
-	return Object.assign({}, externalDocs, externalDocsExtensions);
+	return { ...externalDocs, ...externalDocsExtensions };
 }
 
 function mapExternalTagDocs({ tagExternalDocsUrl, tagExternalDocsDescription } = {}) {
@@ -44,7 +44,7 @@ function mapTags(tags = []) {
 		};
 		const tagExtensions = getExtensions(tag.scopesExtensions);
 
-		return Object.assign({}, tagObj, tagExtensions);
+		return { ...tagObj, ...tagExtensions };
 	});
 }
 

diff --git a/forward_engineering/helpers/componentsHelpers/examplesHelper.js b/forward_engineering/helpers/componentsHelpers/examplesHelper.js
@@ -42,7 +42,7 @@ function mapExample(data) {
 	};
 	const extensions = getExtensions(scopesExtensions);
 
-	return Object.assign({}, example, extensions);
+	return { ...example, ...extensions };
 }
 
 module.exports = {

diff --git a/forward_engineering/helpers/componentsHelpers/index.js b/forward_engineering/helpers/componentsHelpers/index.js
@@ -16,9 +16,10 @@ const renameComponents = components => {
 	}
 
 	return Object.keys(components).reduce((result, componentName) => {
-		return Object.assign({}, result, {
+		return {
+			...result,
 			[prepareName(componentName)]: components[componentName],
-		});
+		};
 	}, {});
 };
 
@@ -37,9 +38,8 @@ function getComponents(definitions, containers) {
 
 	const extensions = getExtensions(get(componentsData, `['Specification Extensions'].scopesExtensions`));
 
-	return Object.assign(
-		{},
-		{
+	return {
+		...{
 			schemas,
 			responses,
 			parameters,
@@ -50,8 +50,8 @@ function getComponents(definitions, containers) {
 			links,
 			callbacks,
 		},
-		extensions,
-	);
+		...extensions,
+	};
 }
 
 module.exports = getComponents;
diff --git a/forward_engineering/helpers/componentsHelpers/linksHelper.js b/forward_engineering/helpers/componentsHelpers/linksHelper.js
@@ -48,7 +48,7 @@ function mapLink(data) {
 	};
 	const extensions = getExtensions(scopesExtensions);
 
-	return Object.assign({}, linkData, extensions);
+	return { ...linkData, ...extensions };
 }
 
 function mapParameters(data) {

diff --git a/forward_engineering/helpers/componentsHelpers/parametersHelper.js b/forward_engineering/helpers/componentsHelpers/parametersHelper.js
@@ -48,7 +48,7 @@ function mapParameter(data, required, isParentActivated = false) {
 	};
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return commentDeactivatedItemInner(Object.assign({}, parameter, extensions), data.isActivated, isParentActivated);
+	return commentDeactivatedItemInner({ ...parameter, ...extensions }, data.isActivated, isParentActivated);
 }
 
 function getIn(parameterType) {
@@ -164,7 +164,7 @@ function mapMediaTypeObject(data, isParentActivated = false) {
 	const mediaTypeObj = { schema, examples, encoding, example };
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return Object.assign({}, mediaTypeObj, extensions);
+	return { ...mediaTypeObj, ...extensions };
 }
 
 function mapEncoding(data) {
@@ -183,7 +183,7 @@ function mapEncoding(data) {
 			};
 			const extensions = getExtensions(value.scopesExtensions);
 
-			return { key, value: Object.assign({}, encodingObj, extensions) };
+			return { key, value: { ...encodingObj, ...extensions } };
 		})
 		.reduce((acc, { key, value }) => {
 			acc[key] = value;

diff --git a/forward_engineering/helpers/componentsHelpers/requestBodiesHelper.js b/forward_engineering/helpers/componentsHelpers/requestBodiesHelper.js
@@ -43,7 +43,7 @@ function mapRequestBody(data, required, isParentActivated = false) {
 	};
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return commentDeactivatedItemInner(Object.assign({}, requestBody, extensions), data.isActivated, isParentActivated);
+	return commentDeactivatedItemInner({ ...requestBody, ...extensions }, data.isActivated, isParentActivated);
 }
 
 module.exports = {

diff --git a/forward_engineering/helpers/componentsHelpers/responsesHelper.js b/forward_engineering/helpers/componentsHelpers/responsesHelper.js
@@ -34,12 +34,14 @@ function mapResponse(data, responseCollectionDescription, shouldResponseBeCommen
 	const content = getContent(get(data, `properties.content`), !shouldResponseBeCommented);
 	const links = getLinks(get(data, `properties.links`));
 	const extensions = getExtensions(data.scopesExtensions);
-	const response = {};
-	if (shouldResponseBeCommented) {
-		response[`hackoladeInnerCommentStart`] = true;
-	}
-
-	Object.assign(response, { description, headers, content, links }, extensions);
+	const response = {
+		...(shouldResponseBeCommented && { hackoladeInnerCommentStart: true }),
+		description,
+		headers,
+		content,
+		links,
+		...extensions,
+	};
 
 	if (shouldResponseBeCommented) {
 		response[`hackoladeInnerCommentEnd`] = true;

diff --git a/forward_engineering/helpers/componentsHelpers/securitySchemesHelper.js b/forward_engineering/helpers/componentsHelpers/securitySchemesHelper.js
@@ -25,7 +25,7 @@ const cleanUp = obj => {
 				return acc;
 			}
 
-			return Object.assign({}, acc, { [key]: value });
+			return { ...acc, [key]: value };
 		}, {});
 	}
 
@@ -87,7 +87,7 @@ function mapSecurityScheme(data) {
 	};
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return Object.assign({}, securitySchemeProps, commonFields, extensions);
+	return { ...securitySchemeProps, ...commonFields, ...extensions };
 }
 
 function mapOAuthFlows(data) {
@@ -110,7 +110,7 @@ function mapOAuthFlows(data) {
 
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return cleanUp(Object.assign({}, flows, extensions));
+	return cleanUp({ ...flows, ...extensions });
 }
 
 function mapOAuthFlowObject({ authorizationUrl, tokenUrl, refreshUrl, scopes, scopesExtensions }) {
@@ -122,7 +122,7 @@ function mapOAuthFlowObject({ authorizationUrl, tokenUrl, refreshUrl, scopes, sc
 	};
 	const extensions = getExtensions(scopesExtensions);
 
-	return Object.assign({}, flow, extensions);
+	return { ...flow, ...extensions };
 }
 
 function mapScopes(data) {

diff --git a/forward_engineering/helpers/infoHelper.js b/forward_engineering/helpers/infoHelper.js
@@ -11,7 +11,7 @@ function getInfo({ description, version, modelVersion, title = '', termsOfServic
 	};
 
 	const extensions = getExtensions(infoExtensions);
-	return Object.assign({}, info, extensions);
+	return { ...info, ...extensions };
 }
 
 function getContact(contact) {
@@ -26,7 +26,7 @@ function getContact(contact) {
 	};
 	const extensions = getExtensions(contact.contactExtensions);
 
-	return Object.assign({}, contactObj, extensions);
+	return { ...contactObj, ...extensions };
 }
 
 function getLicense(license) {
@@ -40,7 +40,7 @@ function getLicense(license) {
 	};
 	const extensions = getExtensions(license.contactExtensions);
 
-	return Object.assign({}, licenseObject, extensions);
+	return { ...licenseObject, ...extensions };
 }
 
 module.exports = getInfo;
diff --git a/forward_engineering/helpers/pathHelper.js b/forward_engineering/helpers/pathHelper.js
@@ -6,7 +6,6 @@ const { mapParameter } = require('./componentsHelpers/parametersHelper');
 const { mapRequestBody } = require('./componentsHelpers/requestBodiesHelper');
 const { mapResponse } = require('./componentsHelpers/responsesHelper');
 const { hasRef, getRef } = require('./typeHelper');
-const { commentDeactivatedItemInner } = require('./commentsHelper');
 
 function getPaths(containers, containersIdsForCallbacks = []) {
 	return containers
@@ -40,7 +39,7 @@ function getRequestsForContainer(container, containers, containersPath = [], isP
 
 	const containerExtensions = getExtensions(contactExtensions);
 
-	return Object.assign({}, containerData, additionalContainerData, containerExtensions);
+	return { ...containerData, ...additionalContainerData, ...containerExtensions };
 }
 
 function getRequestData(collections, containers, containerId, containersPath = [], isPathActivated = true) {
@@ -78,7 +77,7 @@ function getRequestData(collections, containers, containerId, containersPath = [
 				isActivated: data.isActivated,
 			};
 
-			return Object.assign({}, request, extensions);
+			return { ...request, ...extensions };
 		})
 		.reduce((acc, collection, index) => {
 			const { methodName, isActivated } = collection;
@@ -159,8 +158,7 @@ function getCallbacks(data, containers, containerId, containersPath = []) {
 			return { [key]: { [value.callbackExpression]: callbackData, ...extensions } };
 		})
 		.reduce((acc, item) => {
-			acc = Object.assign({}, acc, item);
-			return acc;
+			return { ...acc, ...item };
 		}, {});
 }
 

diff --git a/forward_engineering/helpers/serversHelper.js b/forward_engineering/helpers/serversHelper.js
@@ -19,7 +19,7 @@ function mapServer(data) {
 	};
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return Object.assign({}, serverData, extensions);
+	return { ...serverData, ...extensions };
 }
 
 function mapVariables(variables = []) {
@@ -37,13 +37,13 @@ function mapVariables(variables = []) {
 			};
 			const variableExtensions = getExtensions(item.scopesExtensions);
 
-			return Object.assign({}, variable, variableExtensions);
+			return { ...variable, ...variableExtensions };
 		})
 		.reduce((acc, item) => {
 			const { name } = item;
 			delete item.name;
 
-			return Object.assign({}, acc, { [name]: item });
+			return { ...acc, [name]: item };
 		}, {});
 }
 

diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js
@@ -1,6 +1,5 @@
 const get = require('lodash.get');
 const getExtensions = require('./extensionsHelper');
-const { prepareReferenceName } = require('../utils/utils');
 const { commentDeactivatedItemInner } = require('./commentsHelper');
 
 function getType(data, key, isParentActivated = false) {
@@ -9,7 +8,7 @@ function getType(data, key, isParentActivated = false) {
 	}
 
 	if (Array.isArray(data.type)) {
-		return getType(Object.assign({}, data, { type: data.type[0] }), '', isParentActivated);
+		return getType({ ...data, type: data.type[0] }, '', isParentActivated);
 	}
 
 	if (hasRef(data)) {
@@ -43,7 +42,7 @@ function getTypeProps(data, key, isParentActivated) {
 			};
 			const arrayChoices = getChoices(data, key);
 
-			return Object.assign({}, arrayProps, arrayChoices, extensions);
+			return { ...arrayProps, ...arrayChoices, ...extensions };
 		}
 		case 'object': {
 			const objectProps = {
@@ -63,7 +62,7 @@ function getTypeProps(data, key, isParentActivated) {
 			};
 			const objectChoices = getChoices(data, key);
 
-			return Object.assign({}, objectProps, objectChoices, extensions);
+			return { ...objectProps, ...objectChoices, ...extensions };
 		}
 		case 'parameter':
 			if (!properties || properties.length === 0) {
@@ -85,9 +84,9 @@ function hasRef(data = {}) {
 
 function getArrayItemsType(items, isParentActivated) {
 	if (Array.isArray(items)) {
-		return Object.assign({}, items.length > 0 ? getType(items[0], '', isParentActivated) : {});
+		return { ...(items.length > 0 ? getType(items[0], '', isParentActivated) : {}) };
 	}
-	return Object.assign({}, items ? getType(items, '', isParentActivated) : {});
+	return { ...(items ? getType(items, '', isParentActivated) : {}) };
 }
 
 function getObjectProperties(properties, isParentActivated) {
@@ -110,17 +109,16 @@ function getXml(data) {
 		return undefined;
 	}
 
-	return Object.assign(
-		{},
-		{
+	return {
+		...{
 			name: data.xmlName,
 			namespace: data.xmlNamespace,
 			prefix: data.xmlPrefix,
 			attribute: data.xmlAttribute,
 			wrapped: data.xmlWrapped,
 		},
-		getExtensions(data.scopesExtensions),
-	);
+		...getExtensions(data.scopesExtensions),
+	};
 }
 
 function getPrimitiveTypeProps(data) {
@@ -225,9 +223,7 @@ function addIfTrue(data, propertyName, value) {
 		return data;
 	}
 
-	return Object.assign({}, data, {
-		[propertyName]: value,
-	});
+	return { ...data, [propertyName]: value };
 }
 
 function getArrayItemsExample(items) {

diff --git a/forward_engineering/utils/utils.js b/forward_engineering/utils/utils.js
@@ -12,11 +12,9 @@ function removeEmptyObjectFields(inputObj) {
 		.reduce((newObj, key) => {
 			const isObjectAndNotArray = typeof obj[key] === 'object' && !Array.isArray(obj[key]);
 			if (isObjectAndNotArray) {
-				return Object.assign(newObj, {
-					[key]: removeEmptyObjectFields(obj[key]),
-				});
+				return { ...newObj, [key]: removeEmptyObjectFields(obj[key]) };
 			}
-			return Object.assign(newObj, { [key]: obj[key] });
+			return { ...newObj, [key]: obj[key] };
 		}, {});
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/reverse_engineering/helpers/adaptJsonSchema/adaptJsonSchema.js b/reverse_engineering/helpers/adaptJsonSchema/adaptJsonSchema.js
@@ -2,10 +2,11 @@ const mapJsonSchema = require('./mapJsonSchema');
 const commonHelper = require('../commonHelper');
 
 const convertToString = jsonSchema => {
-	return Object.assign({}, jsonSchema, {
+	return {
+		...jsonSchema,
 		type: 'string',
 		nullable: true,
-	});
+	};
 };
 
 const convertMultipleTypeToType = jsonSchema => {