@griddo/cx 1.75.192 → 1.75.195

package/scripts/griddo-exporter.ts

@@ -3,19 +3,19 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable node/shebang */
 
-require("dotenv").config();
-
-// External libraries
-import chalk from "chalk";
 import { execSync } from "child_process";
 import fs from "fs";
 import path from "path";
+
+import chalk from "chalk";
+import dotenv from "dotenv";
 import pkgDir from "pkg-dir";
 
-// Utils
 import { initCache } from "../src/utils/cache";
 import { findDomains } from "../src/utils/domains";
-import { exporterLogo as splash } from "../src/utils/shared";
+import { exporterLogo as splash, measureFunctions } from "../src/utils/shared";
+
+dotenv.config();
 
 // Envs
 const artifactsArchivable = ["dist", "assets", "apiCache", ".cache"];
@@ -72,10 +72,16 @@ const logWarning = (...message: Array<any>) => console.log(...message);
 // -----------------------------------------------------------------------------
 const domainExport = async (domain: string) => {
 	const runner = getDomainRunner(domain);
-	runner.init();
-	runner.restoreArtifacts();
+	// onPreExporter
+	const endRestore = measureFunctions(runner.init, runner.restoreArtifacts);
+	logInfo(`\n⌛️ Domain ${domain} restaured: ${endRestore}s`);
+
+	// Gatsby
 	runner.runExporter();
-	runner.archiveArtifacts();
+
+	// onPostExporter
+	const endArchive = measureFunctions(runner.archiveArtifacts);
+	logInfo(`\n⌛️ Domain ${domain} archived: ${endArchive}s`);
 };
 
 const launchExports = async () => {
@@ -108,8 +114,14 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const getArtifactPaths = (artifact = "") => {
-		const domainExportArchiveBasePath = path.resolve(exportArchiveBasePath, domain);
-		const currentExportArchivePath = path.resolve(domainExportArchiveBasePath, artifact);
+		const domainExportArchiveBasePath = path.resolve(
+			exportArchiveBasePath,
+			domain
+		);
+		const currentExportArchivePath = path.resolve(
+			domainExportArchiveBasePath,
+			artifact
+		);
 		const currentExportBackupPath = `${currentExportArchivePath}-BACKUP`;
 		const currentExportWorkingPath = path.resolve(workingPath, artifact);
 
@@ -142,18 +154,27 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const archiveExportArtifact = (artifact: string) => {
-		const { currentExportArchivePath, currentExportWorkingPath } = getArtifactPaths(artifact);
-
-		logInfo(`🚚 Moving files from ${chalk.gray(currentExportWorkingPath)} to ${chalk.gray(currentExportArchivePath)}`);
+		const { currentExportArchivePath, currentExportWorkingPath } =
+			getArtifactPaths(artifact);
+
+		logInfo(
+			`🚚 Moving files from ${chalk.gray(
+				currentExportWorkingPath
+			)} to ${chalk.gray(currentExportArchivePath)}`
+		);
 		run(`mv ${currentExportWorkingPath} ${currentExportArchivePath}`);
 	};
 
 	const archiveArtifacts = () => {
 		for (const artifact of artifactsArchivable) {
-			const { currentExportWorkingPath, currentExportArchivePath } = getArtifactPaths(artifact);
+			const { currentExportWorkingPath, currentExportArchivePath } =
+				getArtifactPaths(artifact);
 
 			if (!fs.existsSync(currentExportWorkingPath)) {
-				logError("📁 Source directory has not been created:", currentExportWorkingPath);
+				logError(
+					"📁 Source directory has not been created:",
+					currentExportWorkingPath
+				);
 				continue;
 			}
 
@@ -162,7 +183,10 @@ const getDomainRunner = (domain: string) => {
 				archiveExportArtifact(artifact);
 				deleteArtifactBackup(artifact);
 			} catch (error) {
-				logError(`🚚 Error moving files to ${currentExportArchivePath}`, error.message);
+				logError(
+					`🚚 Error moving files to ${currentExportArchivePath}`,
+					error.message
+				);
 				restoreArtifactBackup(artifact);
 				continue;
 			}
@@ -171,7 +195,8 @@ const getDomainRunner = (domain: string) => {
 
 	const restoreArtifacts = () => {
 		for (const artifact of artifactsArchivable) {
-			const { currentExportArchivePath, currentExportWorkingPath } = getArtifactPaths(artifact);
+			const { currentExportArchivePath, currentExportWorkingPath } =
+				getArtifactPaths(artifact);
 
 			if (fs.existsSync(currentExportArchivePath)) {
 				logWarning(`️♻️  Restoring ${chalk.gray(currentExportArchivePath)}`);
@@ -183,7 +208,8 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const createArtifactBackup = (artifact: string) => {
-		const { currentExportArchivePath, currentExportBackupPath } = getArtifactPaths(artifact);
+		const { currentExportArchivePath, currentExportBackupPath } =
+			getArtifactPaths(artifact);
 
 		if (fs.existsSync(currentExportArchivePath)) {
 			logInfo(`💿 Creating backup of ${chalk.gray(currentExportArchivePath)}`);
@@ -192,18 +218,22 @@ const getDomainRunner = (domain: string) => {
 	};
 
 	const restoreArtifactBackup = (artifact: string) => {
-		const { currentExportArchivePath, currentExportBackupPath } = getArtifactPaths(artifact);
+		const { currentExportArchivePath, currentExportBackupPath } =
+			getArtifactPaths(artifact);
 
 		if (fs.existsSync(currentExportBackupPath)) {
-			logWarning(`️♻️  Restoring backup ${chalk.gray(currentExportArchivePath)}`);
+			logWarning(
+				`️♻️  Restoring backup ${chalk.gray(currentExportArchivePath)}`
+			);
 			run(`mv ${currentExportBackupPath} ${currentExportArchivePath}`);
 		}
 	};
 
 	const deleteArtifactBackup = (artifact: string) => {
-		const { currentExportArchivePath, currentExportBackupPath } = getArtifactPaths(artifact);
+		const { currentExportArchivePath, currentExportBackupPath } =
+			getArtifactPaths(artifact);
 
-		logWarning(`️❌ Removing backup ${chalk.gray(currentExportArchivePath)}`);
+		logWarning(`️🗑️ Removing backup ${chalk.gray(currentExportArchivePath)}`);
 		run(`rm -rf ${currentExportBackupPath}`);
 	};
 
@@ -211,6 +241,7 @@ const getDomainRunner = (domain: string) => {
 		console.log(`\n${chalk.black(chalk.bgGreen(" Gatsby (start) "))}\n`);
 
 		run("yarn export");
+		// run("cp build-report.json build-report-${domain}.json")
 		logSuccess("Your sites have been exported correctly");
 
 		console.log(`\n${chalk.black(chalk.bgGreen(" Gatsby (end) "))}\n`);
@@ -224,13 +255,14 @@ const getDomainRunner = (domain: string) => {
 		const { currentExportWorkingPath: publicPath } = getArtifactPaths("public");
 
 		if (fs.existsSync(distPath)) {
-			logWarning(`🚚 Moving ${chalk.gray(distPath)} to ${chalk.gray(publicPath)}`);
+			logWarning(
+				`🚚 Moving ${chalk.gray(distPath)} to ${chalk.gray(publicPath)}`
+			);
 			run(`mv ${distPath} ${publicPath}`);
 		}
 	};
 
 	// TODO: Esto no debería hacerse desde infra
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	const movePublicToDist = () => {
 		const { currentExportWorkingPath: publicPath } = getArtifactPaths("public");
 		const { currentExportWorkingPath: distPath } = getArtifactPaths("dist");
@@ -243,10 +275,11 @@ const getDomainRunner = (domain: string) => {
 
 	const removeDisposableArtifacts = () => {
 		for (const artifact of artifactsDisposable) {
-			const { currentExportWorkingPath: artifactPath } = getArtifactPaths(artifact);
+			const { currentExportWorkingPath: artifactPath } =
+				getArtifactPaths(artifact);
 
 			if (fs.existsSync(artifactPath)) {
-				logWarning(`❌ Removing ${chalk.gray(artifactPath)}`);
+				logWarning(`🗑️ Removing ${chalk.gray(artifactPath)}`);
 				run(`rm -rf ${artifactPath}`);
 			}
 		}
@@ -273,6 +306,6 @@ const getDomainRunner = (domain: string) => {
 console.clear();
 
 launchExports().catch((err) => {
-	console.error("❌ ERROR", err?.stdout?.toString() || err);
+	console.error("⛔️ ERROR", err?.stdout?.toString() || err);
 	process.exit(1);
 });

package/src/components/Head.tsx

@@ -1,17 +1,10 @@
-// Types
 import type { CustomHeadProps } from "./types";
 
-// Instance elements
-import {
-	generateAutomaticDimensions,
-	// @ts-ignore
-} from "components";
-
-// External libraries
+// @ts-expect-error components is unknown
+import { generateAutomaticDimensions } from "components";
 import parse from "html-react-parser";
 import * as React from "react";
 
-// Utils
 import { cleanCommaSeparated, composeAnalytics, formatImage } from "./utils";
 
 /**

package/src/components/template.tsx

@@ -1,20 +1,10 @@
-// Types
-import type { Core } from "@griddo/core";
 import type { TemplateProps } from "./types";
+import type { Core } from "@griddo/core";
 
-// Components and functions
 import { Page as RenderGriddoPage } from "@griddo/core";
+// @ts-expect-error components is unknown
+import { components, SiteProvider, templates } from "components";
 import { Link, navigate } from "gatsby";
-
-// Instance elements
-import {
-	components,
-	SiteProvider,
-	templates,
-	// @ts-ignore
-} from "components";
-
-// External libraries
 import * as React from "react";
 import { Helmet } from "react-helmet";
 

package/src/components/types.ts

@@ -1,7 +1,7 @@
-import type { Core } from "@griddo/core";
-import type { HeadProps } from "gatsby";
 import type { AllPagesResponse } from "../types/api";
 import type { GatsbyPageObject } from "../types/pages";
+import type { Core } from "@griddo/core";
+import type { HeadProps } from "gatsby";
 
 export interface CustomHeadProps extends HeadProps {
 	pageContext: GatsbyPageObject["context"] & {

package/src/components/utils.ts

@@ -6,7 +6,6 @@
 //
 // Browserify doesn't work with the mixture of typescript + webpack 5 + SSR
 
-// Types
 import type { Fields } from "@griddo/core";
 
 /**
@@ -22,6 +21,7 @@ function cleanCommaSeparated(str: string) {
 
 /**
  * Format Cloudinary or DAM URL
+ *
  * @param image The image url
  * @param width With of the image
  * @param height Height of the image
@@ -59,7 +59,7 @@ function addGriddoDamParams(image: string, params: string) {
 }
 
 /**
- *  Take a cloudinary url and add query params.
+ * Take a cloudinary url and add query params.
  */
 function addCloudinaryParams(image: string, params: string) {
 	const plainUrl = image.replace("https://", "");
@@ -78,16 +78,13 @@ function composeAnalytics(
 			siteScript: string;
 			page: {
 				dimensions: {
-					// TODO: Type dimensions / remove any
-					values: any;
+					values: Record<string, unknown>;
 				};
 			};
 		};
 	},
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	generateAutomaticDimensions = (page: Record<string, unknown>) => {
-		return null;
-	}
+	generateAutomaticDimensions = (page: Record<string, unknown>) => null
 ) {
 	const {
 		pageContext: {
@@ -107,7 +104,8 @@ function composeAnalytics(
 	const allDimensionsValues = {
 		...dimensionValues,
 		...automaticDimensionValues,
-	};
+		// TODO: remove any
+	} as Record<string, any>;
 
 	const allDimensions = [];
 

package/src/html.tsx

@@ -1,6 +1,8 @@
-import * as React from "react";
 import type { HtmlProps } from "./components/types";
 
+import * as React from "react";
+
+// TODO: JSDoc
 export default function HTML(props: HtmlProps) {
 	return (
 		<html {...props.htmlAttributes}>

package/src/services/auth.ts

@@ -1,4 +1,3 @@
-// External libraries
 import axios from "axios";
 import chalk from "chalk";
 
@@ -43,6 +42,8 @@ class AuthService {
 				};
 			}
 
+			return this.headers;
+
 			console.log("👋 Login\n");
 		} catch (e) {
 			console.error(

package/src/services/distributors.ts

@@ -1,13 +1,13 @@
-// Types
-import type { Core, Fields } from "@griddo/core";
 import type { FetchDataProps } from "../types/global";
 import type { APIPageObject } from "../types/pages";
+import type { Core, Fields } from "@griddo/core";
+import type {
+	QueriedData,
+	Reference,
+} from "@griddo/core/dist/types/api-response-fields";
 
-// Utils
-import { logBox } from "../utils/shared";
-
-// Services
 import { SitesService } from "./sites";
+import { logBox } from "../utils/shared";
 
 /**
  * Service to work with distributors.
@@ -15,6 +15,7 @@ import { SitesService } from "./sites";
 class DistributorService {
 	/**
 	 * Get the body data from a ReferenceField in auto or manual mode.
+	 *
 	 * @param data The ReferenceField props.
 	 * @returns The props for one of the ReferenceField mode.
 	 */
@@ -118,9 +119,10 @@ class DistributorService {
 		try {
 			const { template } = page;
 			const checkDistributors = async (
-				// No puede ser Core.Page['template'] porque a medida que va bajando en
-				// el árbol ya no es la estructura de un template.
-				templateChunk: Record<string, any>, // Core.Page['template'],
+				templateChunk: {
+					hasDistributorData?: boolean;
+					queriedItems: QueriedData<unknown>;
+				},
 				level = 1
 			) => {
 				// If it doesn't a "template strcuture"
@@ -138,7 +140,12 @@ class DistributorService {
 					// Si la key es `queriedItems` saltamos al siguiente `key`
 					if (key === "queriedItems") continue;
 
-					const component = templateChunk[key];
+					const _key = key as "hasDistributorData" | "queriedItems";
+					const component = templateChunk[_key] as unknown as {
+						data: Reference<unknown>;
+						queriedItems: QueriedData<unknown>;
+						hasDistributorData: boolean;
+					};
 
 					// Si el elemento no existe o no es un objeto saltamos al siguiente `key`
 					if (!component || typeof component !== "object") continue;
@@ -147,8 +154,8 @@ class DistributorService {
 					if (component.hasDistributorData) {
 						component.queriedItems = await this.fetchContentTypeData({
 							page,
-							component,
 							cached,
+							component,
 						});
 					}
 
@@ -157,7 +164,9 @@ class DistributorService {
 			};
 
 			const getDistributors = async (template: Core.Page["template"]) => {
-				await checkDistributors([template]); // ==> En array para que también revise la propia template como objeto.
+				// `template` es un array para que también revise la propia template como objeto.
+				// @ts-expect-error	remove the array
+				await checkDistributors([template]);
 
 				return template;
 			};

package/src/services/domains.ts

@@ -1,13 +1,11 @@
-// Types
 import type { Domains } from "../types/global";
 
-// Utils
 import { get } from "../utils/api";
 
 // Envs
 const API_URL = process.env.API_URL;
 
-// Constants
+// Consts
 const ENDPOINTS = {
 	GET_ALL: `${API_URL}/domains`,
 };

package/src/services/navigation.ts

@@ -1,4 +1,3 @@
-// Types
 import type { Footer, Header } from "../types/navigation";
 import type { APIPageObject } from "../types/pages";
 

package/src/services/robots.ts

@@ -1,11 +1,8 @@
-// Types
 import type { Robots } from "../types/global";
 
-// External libraries
 import fs from "fs";
 import path from "path";
 
-// Utils
 import { get } from "../utils/api";
 
 /**
@@ -47,7 +44,7 @@ class RobotsService {
 	/**
 	 * TODO: JSDoc
 	 */
-	async writeFiles(basePath = "") {
+	async writeFiles(basePath: string) {
 		for (const robot of this.robots) {
 			const basePathLocation = path.join(basePath, robot.path);
 			const fileLocation = path.join(basePathLocation, "robots.txt");

package/src/services/settings.ts

@@ -1,7 +1,5 @@
-// Types
 import type { Settings } from "../types/global";
 
-// Utils
 import { get, post } from "../utils/api";
 
 /**

package/src/services/sites.ts

@@ -1,5 +1,3 @@
-// Types
-import type { Core } from "@griddo/core";
 import type {
 	AllPagesResponse,
 	AllSitesReponse,
@@ -14,11 +12,10 @@ import type {
 	StartPageRenderResponse,
 } from "../types/api";
 import type { Site } from "../types/sites";
+import type { Core } from "@griddo/core";
 
-// External libraries
 import dotenv from "dotenv";
 
-// Utils
 import { get, post } from "../utils/api";
 
 dotenv.config();
@@ -26,7 +23,7 @@ dotenv.config();
 // Envs
 const API_URL = process.env.API_URL;
 
-// Constants
+// Consts
 const WITH_URI = `${API_URL}/site/`;
 const ENDPOINTS = {
 	GET_ALL: `${API_URL}/sites/all`,