@griddo/cx 1.75.236 → 1.75.237

package/gatsby-node.ts

@@ -12,7 +12,7 @@ import {
 	logInfo,
 	logPageSize,
 	msToSec,
-	// sanitizeApiCache,
+	sanitizeApiCache,
 	splash,
 } from "./src/utils/shared";
 import { generateBuildReport, generateSitemaps } from "./src/utils/sites";
@@ -22,7 +22,7 @@ dotenv.config();
 // Consts
 const PUBLIC_FOLDER = path.resolve(__dirname, "./public");
 const STORE_DIR_PATH = path.resolve(__dirname, "./store/");
-// const API_CACHE_FOLDER = path.resolve(__dirname, "./apiCache");
+const API_CACHE_FOLDER = path.resolve(__dirname, "./apiCache");
 const REPORT_FILE = path.resolve(PUBLIC_FOLDER, "__build-report__.json");
 
 // -----------------------------------------------------------------------------
@@ -33,12 +33,11 @@ export const onPreInit = async () => {
 	initCache();
 	prepareStaticFolder();
 
-	StoreService.init(STORE_DIR_PATH, { sanitize: true });
+	StoreService.init(STORE_DIR_PATH);
 	await StoreService.createBuildSource();
 
 	// Remove old cahe page files
-	// TODO: Use disabled
-	// sanitizeApiCache(API_CACHE_FOLDER);
+	sanitizeApiCache(API_CACHE_FOLDER);
 
 	console.log("\n✨ onPreInit\n");
 };
@@ -56,7 +55,7 @@ export const createPages: GatsbyNode["createPages"] = async ({
 	// We need to use a `for..of` to iterate over `pages` since it could be a
 	// generator and for example a `forEach` doesn't work on it. Besides a
 	// `for..of` is probably the best performance option.
-	for (const page of pages) {
+	for await (const page of pages) {
 		const startTime = performance.now();
 
 		createPage(page);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.236",
+	"version": "1.75.237",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -68,7 +68,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.236",
+		"@griddo/eslint-config-back": "^1.75.237",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -116,5 +116,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2f37300231c7a06193cac411e84898c2f34d3c2f"
+	"gitHead": "0849725480a8e13fc3bbeb6226078530016f022e"
 }

package/scripts/griddo-exporter.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable node/shebang */
 
-import { execSync } from "child_process";
+import { spawnSync } from "child_process";
 import fs from "fs";
 import path from "path";
 
@@ -13,6 +13,7 @@ import pkgDir from "pkg-dir";
 
 import { initCache } from "../src/utils/cache";
 import { findDomains } from "../src/utils/domains";
+import { buildHealthCheck } from "../src/utils/health-checks";
 import { exporterLogo as splash, measureFunctions } from "../src/utils/shared";
 
 dotenv.config();
@@ -56,18 +57,29 @@ type Env = Record<string, unknown>;
 // -----------------------------------------------------------------------------
 const getEnvRunner = (env: Env) => (command: string) => runner(command, env);
 
-const runner = (command: string, env: Env = {}) =>
+const runner = (command: string, env: Env) => {
 	// TODO: Cuando esto falle, ejecutar `cleanAfterFail`
-	execSync(command, {
+
+	const [commandName, ...args] = command.split(" ");
+	const { error, status } = spawnSync(commandName, args, {
 		cwd: workingPath,
-		stdio: "inherit",
-		env: {
-			...process.env,
-			...env,
-			GRIDDO_EXPORTER: "true",
-		},
+		stdio: ["ignore", "inherit", "ignore"],
+		encoding: "utf8",
+		shell: true,
+		env: Object.assign({ GRIDDO_EXPORTER: "true" }, process.env, env),
 	});
 
+	if (error) {
+		console.error(error);
+		process.exit(1);
+	}
+
+	if (status !== 0) {
+		console.error(`Command \`${command}\` exited with code ${status}`);
+		process.exit(1);
+	}
+};
+
 const getAssetPrefix = (domain: string) => {
 	// TODO: Usar asset_prefix del dominio
 	if (!(process.env.GRIDDO_ASSET_PREFIX || process.env.ASSET_PREFIX) || !domain)
@@ -114,6 +126,8 @@ const domainExport = async (domain: string) => {
 
 const launchExports = async () => {
 	splash();
+	// Check the server-environment throwing an error and exit if the check is not successfully.
+	buildHealthCheck();
 	initCache();
 
 	const domains = await findDomains();

package/src/components/template.tsx

@@ -20,7 +20,6 @@ const Template = (data: TemplateProps) => {
 			page,
 			siteLangs,
 			siteMetadata,
-			sitePages,
 			socials,
 			theme,
 		},
@@ -50,7 +49,6 @@ const Template = (data: TemplateProps) => {
 			siteId={page.site}
 			siteLangs={siteLangs}
 			siteMetadata={siteMetadata}
-			sitePages={sitePages}
 			socials={socials}
 			theme={mappedTheme}
 		>

package/src/components/types.ts

@@ -1,4 +1,3 @@
-import type { AllPagesResponse } from "../types/api";
 import type { GatsbyPageObject } from "../types/pages";
 import type { Core } from "@griddo/core";
 import type { HeadProps } from "gatsby";
@@ -16,7 +15,6 @@ export interface CustomHeadProps extends HeadProps {
 export interface TemplateProps extends Omit<GatsbyPageObject, "context"> {
 	pageContext: GatsbyPageObject["context"] & {
 		page: Core.Page;
-		sitePages: AllPagesResponse;
 	};
 	location: {
 		pathname: string;

package/src/services/sites.ts

@@ -1,5 +1,4 @@
 import type {
-	AllPagesResponse,
 	AllSitesReponse,
 	DistributorBody,
 	DistributorResponse,
@@ -173,21 +172,6 @@ class SitesService {
 
 		return response;
 	}
-
-	/**
-	 * TODO: JSDoc
-	 */
-	static async getPages(id: number, cacheKey = "") {
-		const {
-			GET_PAGES: [prefix, suffix],
-		} = ENDPOINTS;
-		const response = await get<AllPagesResponse>({
-			endpoint: `${prefix}${id}${suffix}`,
-			cacheKey,
-		});
-
-		return response;
-	}
 }
 
 export { SitesService };

package/src/services/store.ts

@@ -1,35 +1,17 @@
-//                                                                            //
-//                            ┌───────────────────┐                           //
-//                            │   Page from API   │ ∞ loop                    //
-//                            └─────────┬─────────┘                           //
-//                                    ┌─┼─┐                                   //
-//                                 navigations                                //
-//                                 distributors                               //
-//                                     etc..                                  //
-//                                    └─┼─┘                                   //
-//                       ┌──────────────┼─────────────┐                       //
-//                       ▼              ▼             ▼                       //
-//                ┌─────────────┐ ┌───────────┐ ┌───────────┐                 //
-//                │ Single page │ │ Multipage │ │ Listpages │                 //
-//                └─────────────┘ └───────────┘ └───────────┘                 //
-//                       ▼              ▼             ▼                       //
-//                       └──────┐       |       ┌─────┘                       //
-//                              ▼       ▼       ▼                             //
-//                        ┌───────  S T O R E  ─────┐                         //
-//                        │  Array of page objects  │                         //
-//                        ├─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─┤                         //
-//                        │      Build metadata     │                         //
-//                        └─────────────────────────┘                         //
-
 import type { BuildProcessData } from "../types/global";
-import type { GatsbyPageObject, PageAdditionalInfo } from "../types/pages";
+import type {
+	GatsbyPageObject,
+	GriddoListPage,
+	GriddoMultiPage,
+	GriddoSinglePage,
+	PageAdditionalInfo,
+} from "../types/pages";
 import type { Site } from "../types/sites";
 
 import fs from "fs";
 import fsp from "fs/promises";
 import path from "path";
 
-import chalk from "chalk";
 import dotenv from "dotenv";
 import fsx from "fs-extra";
 import pLimit from "p-limit";
@@ -43,9 +25,9 @@ import { version as griddoVersion } from "../../package.json";
 import { createSha256, updatedSiteHash } from "../utils/cache";
 import { deleteSites } from "../utils/folders";
 import {
-	createGriddoListPages,
-	createGriddoMultiPages,
-	createGriddoSinglePage,
+	createGriddoListPagesForGatsby,
+	createGriddoMultiPagesForGatsby,
+	createGriddoSinglePageForGatsby,
 	getMultiPageElements,
 	getPaginatedPages,
 } from "../utils/pages";
@@ -59,7 +41,8 @@ const API_URL = process.env.API_URL as string;
 const CXBRANCH = process.env.CXBRANCH;
 const REACT_APP_INSTANCE =
 	process.env.GRIDDO_REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
-const GRIDDO_API_CONCURRENCY_COUNT = process.env.GRIDDO_API_CONCURRENCY_COUNT;
+const API_CONCURRENCY_COUNT =
+	parseInt(process.env.GRIDDO_API_CONCURRENCY_COUNT || "") || 10;
 const PUBLIC_API_URL = process.env.PUBLIC_API_URL as string;
 const RENDER_ID =
 	process.env.GRIDDO_RENDERID || new Date().valueOf().toString();
@@ -67,7 +50,6 @@ const RENDER_ID =
 // Consts
 const CREATED_PAGES: Array<number> = [];
 const BUILD_PROCESS_DATA: BuildProcessData = {};
-const UNWANTED_PAGE_PROPS = ["editorID", "parentEditorID"];
 
 /**
  * Store service to fetch, process and save object pages and sites data to be
@@ -77,7 +59,7 @@ const UNWANTED_PAGE_PROPS = ["editorID", "parentEditorID"];
  * import { StoreService } from "./store"
  *
  * // Init the store service.
- * StoreService.init("foo/pages", { sanitize: true })
+ * StoreService.init("foo/pages")
  * // Save the data into files.
  * await StoreService.createBuildSource()
  * // Consume the pages as an interator.
@@ -85,7 +67,6 @@ const UNWANTED_PAGE_PROPS = ["editorID", "parentEditorID"];
  */
 class StoreService {
 	static basePath: string;
-	static sanitize? = false;
 	static pages: Array<GatsbyPageObject> = [];
 	static sitesToPublish: Array<Site>;
 	static buildProcessData: BuildProcessData;
@@ -98,17 +79,12 @@ class StoreService {
 	 * @param options An object configuration
 	 * @param options.mode Store mode
 	 */
-	public static init(basePath: string, options: { sanitize?: boolean }) {
-		this.sanitize = options?.sanitize;
-		const griddoCxThreads = parseInt(GRIDDO_API_CONCURRENCY_COUNT || "10");
-
-		console.log(`🧶 Processing API page calls with ${griddoCxThreads} threads`);
+	public static init(basePath: string) {
+		console.log(
+			`🧶 Processing API page calls with ${API_CONCURRENCY_COUNT} threads`
+		);
 		console.log(`📦 Griddo Store initialized`);
 
-		if (this.sanitize) {
-			console.log(`🏥 Sanitize pages enabled`);
-		}
-
 		this.basePath = basePath;
 
 		// Remove old store
@@ -139,19 +115,15 @@ class StoreService {
 				process.exit(0);
 			}
 
-			console.log(
-				chalk.green(`\n⬆ Sites to publish: ${siteList(sitesToPublish)}`)
-			);
-
-			console.log(
-				chalk.red(`\n⬇ Sites to unpublish: ${siteList(sitesToUnpublish)}\n`)
-			);
+			console.log(`\n⬆ Sites to publish: ${siteList(sitesToPublish)}`);
+			console.log(`\n⬇ Sites to unpublish: ${siteList(sitesToUnpublish)}\n`);
 
 			// Unpublish (API) and delete sites
 			// TODO: Manage this to save end data to the __report-build__ file ???
 			await unpublishSites(sitesToUnpublish);
 
 			// Delete (clean) sites to publish
+			// SPREAD: await deleteSites(sitesToPublish);
 			await deleteSites([...sitesToPublish]);
 
 			// Set robots information to use later in the `onPostBuild` phase.
@@ -250,12 +222,14 @@ class StoreService {
 					CREATED_PAGES.push(pageId);
 
 					// TODO: Use structuredClone() when node 18 is available.
+					// SHAME: This new pageAdditionalInfo needs to be a copy because
+					// additionalInfo referenced from outside this function and
+					// its used by other pages.
 					const pageAdditionalInfo = JSON.parse(
 						JSON.stringify(additionalInfo)
 					) as PageAdditionalInfo;
 
 					// Updated with navigations (header & footer)
-					// NavService.getPageNavigations returns { header, footer }
 					pageAdditionalInfo.navigations = NavService.getPageNavigations(page);
 
 					// Content Type Data Query
@@ -270,68 +244,66 @@ class StoreService {
 					// MultiPage Query
 					// Where the pair `hasGriddoMultiPage:true` prop exists, this function
 					// will process the schema and return a multiPageElemtens array to use
-					// in `createGriddoMultipages()`
+					// in `createGriddoMultiPagesForGatsby()`
 					const multiPageElements = await getMultiPageElements(template);
 
 					// -----------------------------------------------------------------------
-					// Build page objects
+					// Build Griddo page objects.
 					// -----------------------------------------------------------------------
-					// Three types of pages
-					// - List with pagination (n pages)
-					// - Multi-page module (n pages)
-					// - Single (1 page)
-
-					// List
-					if (page?.mode === "list") {
-						gatsbyPageObjects = await createGriddoListPages(
-							{
-								...page, // Revisar la inclusión de este ...page.
-								// The first page, the one without the `/2, /3, /4, etc..` slug
-								page,
-								// The other pages
-								// In this case `getPaginatedPages` doesn't require the whole page object, just the `template` part.
-								// This is because only the `template` prop will be different for each page.
-								pages: getPaginatedPages(template),
-								// The `template` key with the (maybe) distributor data items queried
-								template,
-								// Pass all data items
-								totalQueriedItems: template.queriedItems,
-								// Default site language
-								defaultLang,
-							},
+					// A page from the API could be one of those:
+					// - List with pagination (static list template): needs to be splitted in n pages
+					// - Multi-page module: needs to be splitted in n pages
+					// - Single: just one page
+
+					// Griddo page types
+					const isStaticListPage = page?.mode === "list";
+					const isMultiPage = !isStaticListPage && multiPageElements;
+					const isSinglePage = !isMultiPage && !isStaticListPage;
+
+					// >> List (static list template) <<
+					if (isStaticListPage) {
+						const griddoListPage = {
+							page: page,
+							pages: getPaginatedPages(template),
+							isRoot: false,
+							defaultLang: defaultLang,
+							template: template,
+							totalQueriedItems: template.queriedItems,
+						} as GriddoListPage;
+
+						// pageObjects = await createGriddoListPages({ adapter: "Gatsby" })
+						gatsbyPageObjects = await createGriddoListPagesForGatsby(
+							griddoListPage,
 							pageAdditionalInfo
 						);
 					}
 
-					// >> Multi-page
-					if (multiPageElements) {
-						gatsbyPageObjects = await createGriddoMultiPages(
-							{
-								// The whole page object
-								...page,
-								// The `template` key with the (maybe) distributor data items queried
-								template,
-								// Array of object of every element of the MultiPage
-								multiPageElements,
-								// Default site language
-								defaultLang,
-							},
+					// >> Multi-page <<
+					if (isMultiPage) {
+						const griddoMultipage = page as GriddoMultiPage;
+
+						// The `template` key with the (maybe) distributor data items queried
+						griddoMultipage.template = template;
+						griddoMultipage.multiPageElements = multiPageElements;
+						griddoMultipage.defaultLang = defaultLang;
+
+						gatsbyPageObjects = await createGriddoMultiPagesForGatsby(
+							griddoMultipage,
 							pageAdditionalInfo
 						);
 					}
 
-					// >> Single template
-					if (!multiPageElements && page.mode !== "list") {
+					// >> Single template <<
+					if (isSinglePage) {
+						const griddoSinglePage = page as GriddoSinglePage;
+
+						// The `template` key with the (maybe) distributor data items queried
+						griddoSinglePage.template = template;
+						griddoSinglePage.defaultLang = defaultLang;
+
 						gatsbyPageObjects = [
-							await createGriddoSinglePage(
-								{
-									// The whole page object
-									...page,
-									// The `template` key with the (maybe) distributor data items queried
-									template,
-									// Default site language
-									defaultLang,
-								},
+							await createGriddoSinglePageForGatsby(
+								griddoSinglePage,
 								pageAdditionalInfo
 							),
 						];
@@ -347,10 +319,8 @@ class StoreService {
 					this.setCreatedPages(CREATED_PAGES);
 				};
 
-				const griddoCxThreads = parseInt(GRIDDO_API_CONCURRENCY_COUNT || "10");
-
 				// Create the pLimit array of promises
-				const limit = pLimit(griddoCxThreads);
+				const limit = pLimit(API_CONCURRENCY_COUNT);
 				const pagesToRender = validPagesIds.map((id: number) =>
 					limit(() => fetchPageAndSaveToStore(id))
 				);
@@ -372,9 +342,9 @@ class StoreService {
 	 * @param pages An array of pages to save in the store.
 	 */
 	public static async savePages(pages: Array<GatsbyPageObject>) {
-		if (this.sanitize) {
-			pages.forEach((page) => removeProperties(page, UNWANTED_PAGE_PROPS));
-		}
+		pages.forEach((page) =>
+			removeProperties(page, ["editorID", "parentEditorID"])
+		);
 
 		const promises = pages.map(async (pageObject) => {
 			const filename = `${createSha256(pageObject.path)}.json`;
@@ -427,7 +397,7 @@ class StoreService {
 	/**
 	 * Return an iterator with pages read from the file system.
 	 */
-	public static *getPages() {
+	public static async *getPages() {
 		const pagesDirPath = path.resolve(this.basePath);
 		const jsonFilePaths = walk(pagesDirPath).filter(
 			(file) => path.extname(file) === ".json"
@@ -435,10 +405,10 @@ class StoreService {
 
 		for (const filePath of jsonFilePaths) {
 			try {
-				const fileStats = fs.statSync(filePath);
-				const page = fsx.readJSONSync(filePath, {
+				const fileStats = await fsp.stat(filePath);
+				const page = (await fsx.readJSON(filePath, {
 					encoding: "utf-8",
-				}) as GatsbyPageObject;
+				})) as GatsbyPageObject;
 				page.size = fileStats.size / 1024;
 				yield page;
 			} catch (error) {

package/src/types/api.ts

@@ -152,9 +152,6 @@ export interface EndPageInfoResponse {
 /** Describes a response type for GET all sites */
 export type AllSitesReponse = Array<Site>;
 
-/** Describes a response type for GET all pages */
-export type AllPagesResponse = Array<APIPageObject>;
-
 /** Describes a response type for GET one page */
 export type PageResponse = APIPageObject;
 
@@ -172,8 +169,7 @@ export type APIResponses =
 	| PageResponse
 	| EndPageInfoResponse
 	| DistributorResponse
-	| PostSearchInfoResponse
-	| AllPagesResponse;
+	| PostSearchInfoResponse;
 
 // TODO: JSDoc
 export interface ShowApiErrorOptions {

package/src/types/sites.ts

@@ -1,9 +1,9 @@
-import type { AllPagesResponse, SocialsResponse } from "./api";
+import type { SocialsResponse } from "./api";
 import type { Footer, Header } from "./navigation";
 import type { Core } from "@griddo/core";
 
 /**
- * Describe a Griddo site object from API.
+ * Describes a Griddo site object from API.
  * This takes some type props from Core.Site which is a Site for the Gatsby template.tsx.
  */
 export interface Site
@@ -56,7 +56,6 @@ export interface SiteData {
 	headers: Array<Header>;
 	footers: Array<Footer>;
 	socials: SocialsResponse;
-	sitePages: AllPagesResponse;
 }
 
 // TODO: JSDoc

package/src/types/templates.ts

@@ -1,6 +1,6 @@
 import type { Core, Fields } from "@griddo/core";
 
-/** Describe a template object from a Griddo Page */
+/** Describes a template object from a Griddo Page */
 export type Template = Core.Page["template"];
 
 /** Describes a template with distributor data */

package/src/utils/api.ts

@@ -20,7 +20,7 @@ dotenv.config();
 
 // Envs
 const {
-	env: { RETRY_WAIT_SECONDS = "4", RETRY_ATTEMPTS = "1" },
+	env: { RETRY_WAIT_SECONDS = "4", RETRY_ATTEMPTS = "4" },
 } = process;
 
 /**
@@ -30,16 +30,18 @@ const {
  * @returns {Promise<T>} A promise that is resolved with the data from the API response.
  *
  * @example
- *	const response = await requestAPI<Site>({
- *		endpoint: "...",
- *		cacheKey: "..."",
- *	}, { method:"get" });
+ *	const response = await requestAPI<Site>(
+ *		{ endpoint: "...", cacheKey: "...", ... },
+ *		"get",
+ *		"..."
+ *	);
  */
 async function requestAPI<T extends APIResponses>(
-	props: APIRequest & { method: Method },
+	props: APIRequest,
+	method: Method,
 	appendToLog = ""
 ): Promise<T> {
-	const { endpoint, body, cacheKey = "", attempt = 1, method, headers } = props;
+	const { endpoint, body, cacheKey = "", attempt = 1, headers } = props;
 	const cacheOptions = { endpoint, body, headers, cacheKey };
 
 	// Cache
@@ -64,7 +66,7 @@ async function requestAPI<T extends APIResponses>(
 		const { data }: { data: T } = await axios({
 			url: endpoint,
 			method,
-			headers: { ...headers, ...AuthService.headers },
+			headers: Object.assign({}, headers, AuthService.headers),
 			data: body,
 		});
 
@@ -86,7 +88,13 @@ async function requestAPI<T extends APIResponses>(
 			return null;
 		}
 
-		if (attempt > parseInt(RETRY_ATTEMPTS) || !error.response) {
+		if (attempt > parseInt(RETRY_ATTEMPTS)) {
+			console.log(`Max attempts ${RETRY_ATTEMPTS} reached`);
+			process.exit(1);
+		}
+
+		if (!error.response) {
+			console.log("Unknown error occurred");
 			console.log(JSON.stringify(error, null, 2));
 			process.exit(1);
 		}
@@ -102,9 +110,9 @@ async function requestAPI<T extends APIResponses>(
 				endpoint,
 				body,
 				cacheKey,
-				method,
 				attempt: attempt + 1,
 			},
+			method,
 			appendToLog
 		);
 	}
@@ -117,7 +125,7 @@ async function requestAPI<T extends APIResponses>(
  * @returns A promise that is resolved with the data from the API response.
  */
 async function getApi<T extends APIResponses>(props: GetAPI) {
-	return await requestAPI<T>({ ...props, method: "get" });
+	return await requestAPI<T>(props, "get");
 }
 
 /**
@@ -127,7 +135,7 @@ async function getApi<T extends APIResponses>(props: GetAPI) {
  * @returns A promise that is resolved with the data from the API response.
  */
 async function putApi<T extends APIResponses>(props: PutAPI) {
-	return await requestAPI<T>({ ...props, method: "put" });
+	return await requestAPI<T>(props, "put");
 }
 
 /**
@@ -144,10 +152,7 @@ async function postApi<T extends APIResponses>(props: PostAPI) {
 			headers?.lang
 		)}`;
 
-	return await requestAPI<T>(
-		{ ...props, method: "post" },
-		distributorBodyParams || ""
-	);
+	return await requestAPI<T>(props, "post", distributorBodyParams || "");
 }
 
 /**
@@ -159,13 +164,12 @@ function showApiError(error: AxiosError, options: ShowApiErrorOptions) {
 	const { status, statusText, data } = response || {};
 	const callInfoArray = [];
 
-	for (const item of Object.keys(callInfo)) {
-		const itemCasted = item as keyof typeof callInfo;
+	for (const item of Object.keys(callInfo) as Array<keyof typeof callInfo>) {
 		callInfoArray.push(
 			`${item}: ${
-				typeof callInfo[itemCasted] === "object"
-					? JSON.stringify(callInfo[itemCasted])
-					: callInfo[itemCasted]
+				typeof callInfo[item] === "object"
+					? JSON.stringify(callInfo[item])
+					: callInfo[item]
 			}`
 		);
 	}