@griddo/cx 11.2.4 → 11.2.5-rc.1

package/exporter/utils/sites.ts

@@ -5,14 +5,14 @@ import path from "node:path";
 import fs from "fs-extra";
 import { parse } from "js2xmlparser";
 
+import { envs } from "../constants";
 import { getConfig } from "./core-utils";
 import { buildLog, verboseLog } from "./loggin";
 import { getBuildMetadata } from "./store";
-import { envs } from "../constants";
 import { AuthService } from "../services/auth";
 import {
 	endSiteRender,
-	getAllSites,
+	getAllSitesFromDomain,
 	getSiteInfo,
 	getSiteLanguages,
 	getSitemap,
@@ -25,60 +25,20 @@ const config = getConfig();
 /**
  * Check the instance sites and returns site prepared to be published and unpublished.
  */
-async function checkSites(domain: string) {
-	console.info(`API URL ${envs.GRIDDO_API_URL as string}`);
-
-	// Login to API
-	await AuthService.login();
-
-	// Get all sites. An array of Site
-	const allSites = await getAllSites();
-
-	// Filter the array of sites to get only the ones to build/render
-	const validSites = envs.GRIDDO_RENDER_ALL_SITES
-		? allSites.filter(
-				(site) =>
-					!envs.GRIDDO_RENDER_SITE || site.id === envs.GRIDDO_RENDER_SITE,
-			)
-		: allSites.filter((site) =>
-				envs.GRIDDO_RENDER_SITE
-					? site.id === envs.GRIDDO_RENDER_SITE
-					: !!site.shouldBeUpdated,
-			);
-
-	// If there are valid sites...
-	if (validSites.length) {
-		for (const site of validSites) {
-			const { items } = await getSiteLanguages(site.id);
-
-			// Añadimos la prop domains con el dominio "cocinado" con los idiomas y teniendo en cuenta solo el dominio actual
-			site.domains = items
-				.filter(
-					(item) =>
-						item.domain &&
-						(item.domain.slug === domain || item.domain.slug === `/${domain}`),
-				)
-				.map((item) => ({ [item.id]: `${item.domain.slug}${item.path}` }));
-		}
-	}
-
-	// Sites with domains as empty arrays are sites that are not from the
-	// current domain.
-	const validSitesFromCurrentDomain = validSites.filter(
-		(site) => site.domains.length > 0,
-	);
+async function getSitesToRender(domain: string) {
+	const allSites = await getAllSitesFromDomain(domain);
 
 	// Save sites object to publish
-	const sitesToPublish = validSitesFromCurrentDomain.filter((site) =>
-		envs.GRIDDO_RENDER_SITE
+	const sitesToPublish = allSites.filter((site) => {
+		return envs.GRIDDO_RENDER_SITE
 			? site.id === envs.GRIDDO_RENDER_SITE
-			: !!site.isPublished,
-	);
+			: !!site.isPublished;
+	});
 
 	// Save sites object to unpublish
-	const sitesToUnpublish = validSitesFromCurrentDomain.filter(
-		(site) => !site.isPublished && site.shouldBeUpdated,
-	);
+	const sitesToUnpublish = allSites.filter((site) => {
+		return !site.isPublished && site.shouldBeUpdated;
+	});
 
 	return {
 		sitesToPublish,
@@ -301,9 +261,9 @@ function saveFile(filePath: string, content: string) {
 }
 
 export {
-	checkSites,
 	generateBuildReport,
 	generateSitemaps,
 	getSiteData,
+	getSitesToRender,
 	unpublishSites,
 };

package/exporter/utils/store.ts

@@ -21,9 +21,7 @@ const config = getConfig();
  *
  * @param domain - The domain to get the pages from.
  */
-function getBuildPagesFromCachedStore<PageType extends GriddoPageObject>(
-	domain: string,
-) {
+function getBuildPagesFromCachedStore<PageType extends GriddoPageObject>(domain: string) {
 	const { __cache } = config.paths(domain);
 	return getBuildPagesFromStore<PageType>({
 		basePath: path.join(__cache, "store"),
@@ -47,9 +45,7 @@ function* getBuildPagesFromStore<PageType extends GriddoPageObject>(args?: {
 	const { __cx } = config.paths();
 	const pagesDirPath = basePath || path.join(__cx, "store");
 
-	const jsonFilePaths = walkStore(pagesDirPath).filter(
-		(file) => path.extname(file) === ".json",
-	);
+	const jsonFilePaths = walkStore(pagesDirPath).filter((file) => path.extname(file) === ".json");
 
 	for (const filePath of jsonFilePaths) {
 		try {
@@ -81,9 +77,7 @@ function getBuildPagesPath() {
 	const { __cx } = config.paths();
 
 	const PAGES_DIR = path.join(__cx, "store");
-	const PAGE_FILES = walk(PAGES_DIR).filter(
-		(file) => path.extname(file) === ".json",
-	);
+	const PAGE_FILES = walk(PAGES_DIR).filter((file) => path.extname(file) === ".json");
 
 	return PAGE_FILES;
 }
@@ -126,10 +120,7 @@ function createStoreDir() {
 function saveRenderInfoInStore(renderInfo: RenderInfo) {
 	const { __cx } = config.paths();
 
-	fs.writeFileSync(
-		path.join(__cx, "render-metadata.json"),
-		JSON.stringify(renderInfo),
-	);
+	fs.writeFileSync(path.join(__cx, "render-metadata.json"), JSON.stringify(renderInfo));
 }
 
 /**
@@ -189,10 +180,7 @@ function getPageInStoreDir(basePath: string): Array<number> {
  * Save the pages into the file system.
  * @param pages - An array of Griddo page objects to be saved.
  */
-function savePagesInStore(
-	siteFolderName: string,
-	pages: Array<GriddoPageObject>,
-) {
+function savePagesInStore(siteFolderName: string, pages: Array<GriddoPageObject>) {
 	const { __cx } = config.paths();
 
 	try {
@@ -211,7 +199,7 @@ function savePagesInStore(
  * Remove files from dir.
  * @param filenames - An array of ids representing file page names.
  */
-function removePagesFromStore(siteDirName: string, filenames: Array<number>) {
+function removeSitePagesFromStore(siteDirName: string, filenames: Array<number>) {
 	const { __cx } = config.paths();
 
 	if (filenames.length === 0) {
@@ -238,7 +226,7 @@ function removePagesFromStore(siteDirName: string, filenames: Array<number>) {
  * @param props.changedPages - Array of pages that have been modified in the site.
  * @returns - An object containing the pages to be created and deleted in the site.
  */
-async function getPagesToCreateOrDelete(sitePages: {
+async function getSitePagesToCreateOrDelete(sitePages: {
 	sitesToPublish: Array<Site>;
 	validPagesIds: Array<number>;
 	changedPages: Array<number>;
@@ -255,9 +243,7 @@ async function getPagesToCreateOrDelete(sitePages: {
 
 	// Array<ids> que están el `validPagesIds` pero no están por algún
 	// motivo en el store. Se incluyen porque deben ser creadas.
-	const pagesMissingInStore = validPagesIds.filter(
-		(page) => !pagesInStore.includes(page),
-	);
+	const pagesMissingInStore = validPagesIds.filter((page) => !pagesInStore.includes(page));
 
 	// Array<ids> para enviar al store, que son las que han cambiado y
 	// las missings.
@@ -276,21 +262,63 @@ async function getPagesToCreateOrDelete(sitePages: {
 		(page) => !pagesToDeleteFromStore.includes(page),
 	);
 
-	// 1 - Leer el store
-	// 2 - eliminar las páginas que tengan como site uno despublicado o borrado
-	// const allPagesInStore = getBuildPagesFromStore();
-
-	// const pagesFromInvalidSites: Array<number> = [];
-	// for await (const page of allPagesInStore) {
-	// 	const pageSite = page.context.page.site;
-	// 	const pageId = page.context.page.id!;
-	// 	// Si el `site.id` de la página no es ninguno de los `sitesToPublish`
-	// 	// añadimos la página a `pagesFromIvalidSites` para borrarla
-	// 	// posteriormente.
-	// 	if (!sitesToPublish.map((site) => site.id).includes(pageSite)) {
-	// 		pagesFromInvalidSites.push(pageId);
-	// 	}
-	// }
+	return {
+		pagesInStore,
+		pagesMissingInStore,
+		pagesToDeleteFromStore: [
+			...pagesToDeleteFromStore,
+			// ...pagesFromInvalidSites,
+		],
+		pagesToWriteToStore,
+	};
+}
+
+/**
+ * Returns pages that need to be created or deleted for a site in the store based on the provided arguments.
+ * @param sitePages - Properties for page retrieval.
+ * @param props.storeDir - Absolute path of the Griddo store.
+ * @param props.pages - Exhaustive array of all pages in the site.
+ * @param props.validPagesIds - Array of valid pages in the site.
+ * @param props.changedPages - Array of pages that have been modified in the site.
+ * @returns - An object containing the pages to be created and deleted in the site.
+ */
+async function getSitePagesToCreateOrDeleteCached(sitePages: {
+	sitesToPublish: Array<Site>;
+	validPagesIds: Array<number>;
+	changedPages: Array<number>;
+	siteDirName: string;
+	domain: string;
+}) {
+	const { changedPages, validPagesIds, siteDirName, domain } = sitePages;
+
+	const { __cache } = config.paths(domain);
+	const storeDir = path.join(__cache, "store");
+
+	// Array<ids> de las páginas que están físicamente en el store en el
+	// site actual del bucle.
+	const siteDirStorePath = path.join(storeDir, siteDirName);
+	const pagesInStore = getPageInStoreDir(siteDirStorePath);
+
+	// Array<ids> que están el `validPagesIds` pero no están por algún
+	// motivo en el store. Se incluyen porque deben ser creadas.
+	const pagesMissingInStore = validPagesIds.filter((page) => !pagesInStore.includes(page));
+
+	// Array<ids> para enviar al store, que son las que han cambiado y
+	// las missings.
+	const pagesToStore = pagesMissingInStore.concat(changedPages);
+
+	// Array<ids> de las páginas que han sido eliminadas para quitarlas
+	// físicamente de la carpeta store.
+	const pagesToDeleteFromStore = pagesInStore.filter((page) => {
+		// Las que no estén en validPages
+		return !validPagesIds.includes(page);
+	});
+
+	// 1 - Elimina del array final las páginas borradas.
+	// 2 - Elimina las posibles páginas (ids) duplicadas. (new Set)
+	const pagesToWriteToStore = Array.from(new Set(pagesToStore)).filter(
+		(page) => !pagesToDeleteFromStore.includes(page),
+	);
 
 	return {
 		pagesInStore,
@@ -303,6 +331,24 @@ async function getPagesToCreateOrDelete(sitePages: {
 	};
 }
 
+/**
+ * Removes sites from store that are not in `sitesToPublish` array.
+ */
+function deleteZombieSitesFoldersFromStore(sitesToPublish: Array<Site>) {
+	const { __cx } = getConfig().paths();
+	const storeDir = path.join(__cx, "store");
+	const siteDirs = fs.readdirSync(storeDir, { withFileTypes: true });
+	const siteIds = sitesToPublish.map((site) => `${site.id}`);
+	for (const dir of siteDirs) {
+		if (dir.isDirectory() && !siteIds.includes(dir.name)) {
+			fs.rmSync(path.join(storeDir, dir.name), {
+				force: true,
+				recursive: true,
+			});
+		}
+	}
+}
+
 /**
  * Removes sites that exist in the store that should no longer be there because
  * the domain has been changed. This is necessary because those sites will not
@@ -312,9 +358,7 @@ function removeOrphanSites(sitesToPublish: Array<Site>, domain: string) {
 	const { __cx } = getConfig().paths(domain);
 	const currentSitesInStore = fs.readdirSync(path.join(__cx, "store"));
 	const sitesFromAPI = sitesToPublish.map(({ id }) => `${id}`);
-	const sitesToDelete = currentSitesInStore.filter(
-		(site) => !sitesFromAPI.includes(site),
-	);
+	const sitesToDelete = currentSitesInStore.filter((site) => !sitesFromAPI.includes(site));
 
 	for (const site of sitesToDelete) {
 		fs.rmSync(path.join(__cx, "store", site), { recursive: true, force: true });
@@ -324,14 +368,16 @@ function removeOrphanSites(sitesToPublish: Array<Site>, domain: string) {
 
 export {
 	createStoreDir,
+	deleteZombieSitesFoldersFromStore,
 	getBuildMetadata,
 	getBuildPagesFromCachedStore,
 	getBuildPagesFromStore,
 	getBuildPagesPath,
 	getPageInStoreDir,
-	getPagesToCreateOrDelete,
+	getSitePagesToCreateOrDelete,
+	getSitePagesToCreateOrDeleteCached,
 	removeOrphanSites,
-	removePagesFromStore,
+	removeSitePagesFromStore,
 	savePagesInStore,
 	saveRenderInfoInStore,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "11.2.4",
+	"version": "11.2.5-rc.1",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -16,7 +16,8 @@
 		"url": "https://github.com/griddo/griddo"
 	},
 	"bin": {
-		"griddo-cx": "./start-render.js"
+		"griddo-cx": "./start-render.js",
+		"griddo-start-render": "./start-render.js"
 	},
 	"exports": {
 		".": {
@@ -44,7 +45,9 @@
 		"upload-search-content": "node ./build/upload-search-content.js",
 		"complete-render": "node ./build/end-render.js",
 		"end-render": "node ./build/end-render.js",
+		"start-render": "node ./build/start-render.js",
 		"reset-render": "node ./build/reset-render.js",
+		"prepare-domains-render": "node ./build/prepare-domains-render.js",
 		"// SSG": "",
 		"clean": "gatsby clean; rm -rf assets .cx-cache caches store apiCache build .render-sentinel",
 		"gatsby-build": "gatsby telemetry --disable && gatsby build --prefix-paths",
@@ -60,7 +63,7 @@
 		"@babel/preset-env": "7.26.0",
 		"@babel/preset-react": "7.26.3",
 		"@babel/preset-typescript": "7.26.0",
-		"@griddo/core": "11.2.4",
+		"@griddo/core": "11.2.5-rc.1",
 		"@svgr/webpack": "5.5.0",
 		"axios": "1.7.9",
 		"babel-loader": "9.2.1",
@@ -128,5 +131,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2e9f58f7f0ef82f9dfe46960132b879b4819332e"
+	"gitHead": "ab766204bc991ccef66621f969cb492ba012464d"
 }

package/start-render.js

@@ -4,4 +4,4 @@
 
 // This is the "bin" for the griddo-cx package used by "infra" to trigger a
 // render running `npm run griddo-cx`.
-require("./build/run-start-render.js");
+require("./build/start-render.js");