@griddo/cx 11.7.5 → 11.7.6-rc.1

package/exporter/utils/folders.ts

@@ -1,14 +1,14 @@
-import fs from "node:fs";
+import type { MakeDirectoryOptions } from "node:fs";
+
+import fsp from "node:fs/promises";
 import path from "node:path";
 
-import fsx, { type MakeDirectoryOptions } from "fs-extra";
+import { findUp, findUpSync } from "find-up-simple";
 
-import { throwError } from "../errors";
-import { getConfig, walkStore } from "./core-utils";
+import { ArtifactError } from "../constants/errors";
+import { walkStore } from "./core-utils";
+import { throwError } from "./errors";
 import { verboseLog } from "./loggin";
-import { ArtifactError } from "../errors/errors-data";
-
-const config = getConfig();
 
 /**
  * Remove an empty directory from the basePath recursively.
@@ -16,37 +16,34 @@ const config = getConfig();
  *
  * @param baseDir - The base directory.
  */
-function deleteDisposableSiteDirs() {
-	const { __cx } = config.paths();
-	const baseDir = path.join(__cx, "dist");
-
-	if (!fs.existsSync(baseDir)) {
+async function deleteDisposableSiteDirs(baseDir: string) {
+	if (!(await pathExists(baseDir))) {
 		return;
 	}
 
-	const sitesDirs = fs
-		.readdirSync(baseDir, { withFileTypes: true })
-		.filter((file) => file.isDirectory());
+	const sitesDirs = (await fsp.readdir(baseDir, { withFileTypes: true })).filter((file) =>
+		file.isDirectory(),
+	);
 
 	for (const siteDir of sitesDirs) {
 		const sitePath = path.join(baseDir, siteDir.name);
-		if (siteIsEmpty(sitePath)) {
-			fs.rmSync(sitePath, { recursive: true });
+		if (await siteIsEmpty(sitePath)) {
+			await fsp.rm(sitePath, { recursive: true });
 		}
 	}
 }
 
 /**
- * Creates multiple directories.
+ * Creates multiple artifact directories.
  *
  * @param dirs - An array of directory paths.
  * @param options - Same option as `fs.mkdirSync()`
  */
-function createArtifacts(dirs: Array<string>, options?: MakeDirectoryOptions) {
+async function createDirs(dirs: Array<string>, options?: MakeDirectoryOptions) {
 	for (const dir of dirs) {
 		try {
-			if (!fs.existsSync(dir)) {
-				fs.mkdirSync(dir, { recursive: true, ...options });
+			if (!(await pathExists(dir))) {
+				await fsp.mkdir(dir, { recursive: true, ...options });
 				verboseLog(`create directory: ${dir}`);
 			}
 		} catch (error) {
@@ -55,10 +52,10 @@ function createArtifacts(dirs: Array<string>, options?: MakeDirectoryOptions) {
 	}
 }
 
-function renameArtifact(src: string, dst: string) {
+async function renamePath(src: string, dst: string) {
 	try {
-		if (fs.existsSync(src)) {
-			fs.renameSync(src, dst);
+		if (await pathExists(src)) {
+			await fsp.rename(src, dst);
 			verboseLog(`rename ${src} to ${dst}`);
 		}
 	} catch (error) {
@@ -74,7 +71,7 @@ function renameArtifact(src: string, dst: string) {
  * @param dirs - Directories to copy.
  * @param options.withBackup - Create a previous backup before copy.
  */
-function copyArtifacts(
+async function copyDirs(
 	src: string,
 	dst: string,
 	dirs: Array<string>,
@@ -88,41 +85,39 @@ function copyArtifacts(
 		const dstCompose = path.join(dst, dir);
 
 		// The dir we want to copy, doesn't exist.
-		if (!fsx.existsSync(srcCompose)) {
-			console.log(
-				`(Maybe first render) Source directory does not exist: ${srcCompose}`,
-			);
+		if (!(await pathExists(srcCompose))) {
+			console.log(`(Maybe first render) Source directory does not exist: ${srcCompose}`);
 			continue;
 		}
 
 		// Create the backup
 		if (withBackup) {
-			createBackup(dstCompose);
+			await createBackup(dstCompose);
 			verboseLog(`create backup: ${dstCompose}`);
 		}
 
 		// Copy directory
 		try {
 			// First clean destination
-			if (fsx.existsSync(dstCompose)) {
-				fs.rmSync(dstCompose, { recursive: true, force: true });
+			if (await pathExists(dstCompose)) {
+				await fsp.rm(dstCompose, { recursive: true, force: true });
 				verboseLog(`clean destination: ${dstCompose}`);
 			}
 
 			// Then copy src to dst
-			fs.cpSync(srcCompose, dstCompose, {
+			await fsp.cp(srcCompose, dstCompose, {
 				recursive: true,
 				preserveTimestamps: true,
 			});
 			verboseLog(`copy: ${srcCompose} to ${dstCompose}`);
 
 			if (withBackup) {
-				deleteBackup(dstCompose);
+				await deleteBackup(dstCompose);
 				verboseLog(`delete backup: ${dstCompose}`);
 			}
 		} catch (error) {
 			if (withBackup) {
-				restoreBackup(dstCompose);
+				await restoreBackup(dstCompose);
 				console.log("Backup has been restored.");
 			}
 
@@ -139,7 +134,7 @@ function copyArtifacts(
  * @param dirs - Directories to move.
  * @param options - Options.
  */
-function moveArtifacts(
+async function moveDirs(
 	src: string,
 	dst: string,
 	dirs: Array<string>,
@@ -151,29 +146,29 @@ function moveArtifacts(
 		const srcCompose = path.join(src, dir);
 		const dstCompose = path.join(dst, dir);
 
-		if (!fsx.existsSync(srcCompose)) {
+		if (!(await pathExists(srcCompose))) {
 			continue;
 		}
 
 		if (withBackup) {
-			createBackup(dstCompose);
+			await createBackup(dstCompose);
 		}
 
 		try {
 			// Clean destination
-			if (override && fsx.existsSync(dstCompose)) {
-				fs.rmSync(dstCompose, { recursive: true, force: true });
+			if (override && (await pathExists(dstCompose))) {
+				await fsp.rm(dstCompose, { recursive: true, force: true });
 			}
 
-			fs.renameSync(srcCompose, dstCompose);
+			await fsp.rename(srcCompose, dstCompose);
 			verboseLog(`moved: ${srcCompose} to ${dstCompose}`);
 
 			if (withBackup) {
-				deleteBackup(dstCompose);
+				await deleteBackup(dstCompose);
 			}
 		} catch (error) {
 			if (withBackup) {
-				restoreBackup(dstCompose);
+				await restoreBackup(dstCompose);
 				console.log("Backup has been restored.");
 			}
 
@@ -185,30 +180,23 @@ function moveArtifacts(
 /**
  * Removes multiple artifact directories.
  *
- * @param artifacts - An array of artifact directory paths.
+ * @param dirs - An array of directory paths.
  */
-function removeArtifacts(artifacts: Array<string>) {
-	for (const dir of artifacts) {
-		if (!dir) {
-			continue;
-		}
-
+async function removeDirs(dirs: Array<string>) {
+	for (const dir of dirs) {
 		try {
-			if (fsx.existsSync(dir)) {
-				const kind = fs.statSync(dir).isDirectory() ? "dir" : "file";
-				fs.rmSync(dir, { recursive: true, force: true });
-				verboseLog(`artifact (${kind}) removed: ${dir}`);
-			}
+			await fsp.rm(dir, { recursive: true, force: true });
+			verboseLog(`artifact removed: ${dir}`);
 		} catch (error) {
 			throwError(ArtifactError, error);
 		}
 	}
 }
 
-function restoreBackup(src: string, suffix = "-BACKUP") {
+async function restoreBackup(src: string, suffix = "-BACKUP") {
 	const dst = src + suffix;
 	try {
-		fs.renameSync(dst, src);
+		await fsp.rename(dst, src);
 		console.log(`Backup ${dst} has been restored`);
 	} catch (error) {
 		console.log(error);
@@ -216,15 +204,15 @@ function restoreBackup(src: string, suffix = "-BACKUP") {
 	}
 }
 
-function deleteBackup(src: string, suffix = "-BACKUP") {
+async function deleteBackup(src: string, suffix = "-BACKUP") {
 	const dst = src + suffix;
 
-	if (!fsx.existsSync(dst)) {
+	if (!(await pathExists(dst))) {
 		return;
 	}
 
 	try {
-		fs.rmSync(dst, { recursive: true, force: true });
+		await fsp.rm(dst, { recursive: true, force: true });
 		console.log(`Backup ${dst} has been deleted`);
 	} catch (error) {
 		console.log(error);
@@ -232,20 +220,20 @@ function deleteBackup(src: string, suffix = "-BACKUP") {
 	}
 }
 
-function createBackup(src: string, suffix = "-BACKUP") {
+async function createBackup(src: string, suffix = "-BACKUP") {
 	const dst = src + suffix;
 
-	if (!fsx.existsSync(src)) {
+	if (!(await pathExists(src))) {
 		return;
 	}
 
-	if (fsx.existsSync(dst)) {
+	if (await pathExists(dst)) {
 		console.log(`Destination ${dst} already exists`);
 		return;
 	}
 
 	try {
-		fs.renameSync(src, dst);
+		await fsp.rename(src, dst);
 		console.log(`Backup of ${src} has been created in ${dst}`);
 	} catch (error) {
 		console.log(`Error while coping ${src} to ${dst} backup`);
@@ -254,25 +242,23 @@ function createBackup(src: string, suffix = "-BACKUP") {
 }
 
 /**
- * Elimina todas las páginas del store (de todos los sites) cuyo nombre empiece con un guión "-".
- * Estas páginas son "virtuales" y no tienen ids desde API por lo que mantenerlas en el store es un problema cuando se hacen modificaciones en la página "madre".
- * La solución por ahora es borrarlas del store y rehacerlas en todos los renders.
+ * Elimina todas las páginas del store (de todos los sites) cuyo nombre empiece
+ * con un guión "-". Estas páginas son "virtuales" y no tienen ids desde API por
+ * lo que mantenerlas en el store es un problema cuando se hacen modificaciones
+ * en la página "madre". La solución por ahora es borrarlas del store y
+ * rehacerlas en todos los renders.
  */
-async function removeVirtualPagesFromStore() {
-	const { __cx } = config.paths();
-	const storePath = path.join(__cx, "store");
-
+async function removeVirtualPages(dirPath: string) {
 	try {
-		const allJsonPageFilesPath = walkStore(storePath);
-
-		for (const filePath of allJsonPageFilesPath) {
+		// Procesamos archivos uno por uno para evitar cargar todos en memoria
+		for await (const filePath of walkStore(dirPath)) {
 			if (path.basename(filePath).startsWith("-")) {
-				fs.unlinkSync(filePath);
+				await fsp.unlink(filePath);
 			}
 		}
 	} catch (error) {
 		console.info(
-			"`store` folder does not exist. Skipping multipage or static list template cleaning.",
+			`${dirPath} folder does not exist. Skipping multipage or static list template cleaning.`,
 			error,
 		);
 	}
@@ -281,15 +267,13 @@ async function removeVirtualPagesFromStore() {
 /**
  * Return true if the site folder is empty or only has xml files. (Recursively)
  */
-function siteIsEmpty(sitePath: string) {
-	const siteFiles = fs
-		.readdirSync(sitePath, {
+async function siteIsEmpty(sitePath: string) {
+	const siteFiles = (
+		await fsp.readdir(sitePath, {
 			withFileTypes: true,
 			recursive: true,
 		})
-		.filter(
-			(file) => file.isFile() && !path.basename(file.name).startsWith("."),
-		);
+	).filter((file) => file.isFile() && !path.basename(file.name).startsWith("."));
 
 	const xmlFiles = siteFiles.filter((file) => file.name.endsWith(".xml"));
 
@@ -298,23 +282,108 @@ function siteIsEmpty(sitePath: string) {
 	}
 }
 
-function prependFileSync(filePath: string, content: string) {
+async function prependFileSync(filePath: string, content: string) {
 	let currentContent = "";
 
-	if (fs.existsSync(filePath)) {
-		currentContent = fs.readFileSync(filePath, "utf8");
+	if (await pathExists(filePath)) {
+		currentContent = await fsp.readFile(filePath, "utf8");
 	}
 
-	fs.writeFileSync(filePath, content + currentContent, "utf8");
+	await fsp.writeFile(filePath, content + currentContent, "utf8");
+}
+
+/**
+ * Delete empty directories from the given directory in a recursive way.
+ */
+async function deleteEmptyDirectories(dirPath: string) {
+	try {
+		const stats = await fsp.stat(dirPath);
+
+		// Si no es un directorio, no hacemos nada
+		if (!stats.isDirectory()) {
+			return;
+		}
+
+		let filesInDirectory: string[];
+		try {
+			filesInDirectory = await fsp.readdir(dirPath);
+		} catch (err: any) {
+			// Si el directorio no existe o no se puede leer (ej. permisos), lo saltamos.
+			if (err.code === "ENOENT") {
+				console.warn(`El directorio "${dirPath}" no existe. Se omite.`);
+				return;
+			}
+			console.error(`Error al leer el directorio "${dirPath}":`, err);
+			throw err; // Re-lanza el error para que sea manejado por el llamador
+		}
+
+		// Recorrer los contenidos del directorio
+		for (const file of filesInDirectory) {
+			const fullPath = path.join(dirPath, file);
+			await deleteEmptyDirectories(fullPath); // Llamada recursiva síncrona
+		}
+
+		// Después de procesar todos los subdirectorios, verifica si el directorio actual está vacío
+		const remainingFiles = await fsp.readdir(dirPath);
+
+		if (remainingFiles.length === 0) {
+			try {
+				await fsp.rmdir(dirPath);
+				console.log(`Remove empty directory: ${dirPath}`);
+			} catch (err: any) {
+				// Puede que haya habido un problema de concurrencia o permisos
+				if (err.code === "ENOENT") {
+					console.warn(
+						`El directorio "${dirPath}" ya no existe. Posiblemente fue borrado por otra operación.`,
+					);
+				} else {
+					console.error(`Error al borrar el directorio "${dirPath}":`, err);
+				}
+			}
+		}
+	} catch (err: any) {
+		if (err.code === "ENOENT") {
+			// El directorio ya no existe, no es un error para nosotros en este contexto
+			console.warn(`El directorio "${dirPath}" no existe o ya ha sido procesado.`);
+		} else {
+			console.error(`Error general al procesar "${dirPath}":`, err);
+			throw err;
+		}
+	}
+}
+
+async function pathExists(dir: string) {
+	try {
+		await fsp.access(dir);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+async function pkgDir(options?: { readonly cwd?: string }) {
+	const { cwd } = options || {};
+	const filePath = await findUp("package.json", { cwd });
+	return filePath && path.dirname(filePath);
+}
+
+function pkgDirSync(options?: { readonly cwd?: string }) {
+	const { cwd } = options || {};
+	const filePath = findUpSync("package.json", { cwd });
+	return filePath && path.dirname(filePath);
 }
 
 export {
-	copyArtifacts,
-	createArtifacts,
+	copyDirs,
+	createDirs,
 	deleteDisposableSiteDirs,
-	moveArtifacts,
+	deleteEmptyDirectories,
+	moveDirs,
+	pathExists,
+	pkgDir,
+	pkgDirSync,
 	prependFileSync,
-	removeArtifacts,
-	removeVirtualPagesFromStore,
-	renameArtifact,
+	removeDirs,
+	removeVirtualPages,
+	renamePath,
 };

package/exporter/utils/images.ts

@@ -13,12 +13,7 @@ import type { Fields } from "@griddo/core";
  * formatImage("https://images.griddo.io/tree", 300, 200, "jpg")
  * // https://images.griddo.io/tree/w/300/h/200/f/jpg
  */
-function formatImage(
-	image: Fields.Image | string,
-	width: number,
-	height: number,
-	format = "jpg",
-) {
+function formatImage(image: Fields.Image | string, width: number, height: number, format = "jpg") {
 	const url = typeof image === "string" ? image : image?.url;
 
 	if (!url) {

package/exporter/utils/instance.ts

@@ -1,10 +1,10 @@
 import path from "node:path";
 
-import findUp from "find-up";
-import pkgDir from "pkg-dir";
+import { findUpSync } from "find-up-simple";
 
-import { throwError } from "../errors";
-import { NoJSConfigFileFound } from "../errors/errors-data";
+import { NoJSConfigFileFound } from "../constants/errors";
+import { throwError } from "./errors";
+import { pkgDirSync } from "./folders";
 
 // Consts
 const isComponentLibrary = __dirname.includes("node_modules");
@@ -17,22 +17,18 @@ const componentLibraryPathAlias = getComponentsLibAliases();
  */
 function resolveComponentsPath(customPath = "") {
 	return isComponentLibrary
-		? path.resolve(pkgDir.sync(__dirname) as string, "../../../", customPath)
-		: path.resolve(
-				pkgDir.sync(__dirname) as string,
-				"../griddo-components",
-				customPath,
-			);
+		? path.resolve(pkgDirSync({ cwd: __dirname }) as string, "../../../", customPath)
+		: path.resolve(pkgDirSync({ cwd: __dirname }) as string, "../griddo-components", customPath);
 }
 
 /**
  * Return the instance or monorepo components {t|j}sconfig.json file.
  */
 function getComponentsJSConfig() {
-	const jsConfigPath = findUp.sync("jsconfig.json", {
+	const jsConfigPath = findUpSync("jsconfig.json", {
 		cwd: resolveComponentsPath(),
 	});
-	const tsConfigPath = findUp.sync("tsconfig.json", {
+	const tsConfigPath = findUpSync("tsconfig.json", {
 		cwd: resolveComponentsPath(),
 	});
 
@@ -57,6 +53,7 @@ function getComponentsLibAliases() {
 			const absolutePath = resolveComponentsPath(relativePathToDir);
 
 			return {
+				// biome-ignore lint/performance/noAccumulatingSpread: to be fixed
 				...currentAlias,
 				[aliasKey]: absolutePath,
 			};