@griddo/cx 11.9.17 → 11.10.1

package/exporter/services/navigation.ts

@@ -1,12 +1,12 @@
-import type { Footer, Header } from "../types/navigation";
-import type { APIPageObject } from "../types/pages";
+import type { Footer, Header } from "../shared/types/navigation";
+import type { APIPageObject } from "../shared/types/pages";
 
 class NavigationService {
 	private _defaultHeaders: Record<string, Header>;
 	private _defaultFooters: Record<string, Footer>;
 	private _navigations: {
-		headers: Array<Header>;
-		footers: Array<Footer>;
+		headers: Header[];
+		footers: Footer[];
 	};
 
 	constructor() {
@@ -53,11 +53,11 @@ class NavigationService {
 	}
 
 	getRightLanguage(
-		list: Array<{
+		list: {
 			language: number;
-			navigationLanguages: Array<{ navigationId: number }>;
+			navigationLanguages: { navigationId: number }[];
 			id: number;
-		}>,
+		}[],
 		id: number,
 		language: number,
 	) {
@@ -68,9 +68,7 @@ class NavigationService {
 		const rightLanguageItem = list.find(
 			(item) =>
 				item.language === language &&
-				item.navigationLanguages?.find(
-					(version) => version.navigationId === id,
-				),
+				item.navigationLanguages?.find((version) => version.navigationId === id),
 		);
 
 		const result = rightLanguageItem || list.find((item) => item.id === id);
@@ -87,19 +85,15 @@ class NavigationService {
 	}
 
 	getPageNavigations(page: APIPageObject) {
-		const {
-			header: pageHeader,
-			footer: pageFooter,
-			language,
-			template: { templateType },
-			templateConfig: { defaultHeader, defaultFooter, templates },
-		} = page;
+		const { header: pageHeader, footer: pageFooter, language, template, templateConfig } = page;
+		const { templateType } = template;
+		const { defaultHeader, defaultFooter, templates } = templateConfig;
 
 		// The navigations would be:
 		// - The one with the page or ...
 		// - The one defined for that template or ...
 		// - The one you have defined for that data package
-		const getValidNavigation = (values: Array<number | unknown>) => {
+		const getValidNavigation = (values: (number | unknown)[]) => {
 			const fineNavigation = values.find((item) => typeof item === "number");
 
 			return typeof fineNavigation === "number" ? fineNavigation : null;

package/exporter/{utils → services}/pages.ts

@@ -1,3 +1,4 @@
+import type { Core, Fields } from "@griddo/core";
 import type {
 	APIPageObject,
 	GriddoListPage,
@@ -7,15 +8,10 @@ import type {
 	MultiPageElement,
 	MultiPageElements,
 	PageAdditionalInfo,
-} from "../types/pages";
-import type { TemplateWithReferenceField } from "../types/templates";
-import type { Core, Fields } from "@griddo/core";
-
-import dotenv from "dotenv";
+} from "../shared/types/pages";
+import type { TemplateWithReferenceField } from "../shared/types/templates";
 
-import { formatImage } from "./images";
-
-dotenv.config();
+import { formatImage } from "../core/images";
 
 // Consts
 const DEFAULT_ITEMS_PER_PAGE_FOR_LIST_TEMPLATES = 25;
@@ -31,10 +27,7 @@ function getOpenGraph({
 	socialTitle,
 	socialDescription,
 	socialImage,
-}: Pick<
-	Core.Page,
-	"socialTitle" | "socialDescription" | "socialImage"
->): Core.Page["openGraph"] {
+}: Pick<Core.Page, "socialTitle" | "socialDescription" | "socialImage">): Core.Page["openGraph"] {
 	return {
 		type: "website",
 		title: socialTitle,
@@ -49,9 +42,7 @@ function getOpenGraph({
  *
  * @param params A Page object
  */
-function getPageMetadata(
-	params: Core.Page,
-): GriddoPageObject["context"]["pageMetadata"] {
+function getPageMetadata(params: Core.Page): GriddoPageObject["context"]["pageMetadata"] {
 	const {
 		title,
 		metaTitle,
@@ -87,9 +78,7 @@ function getPageMetadata(
 		index: isIndexed ? "index" : "noindex",
 		follow: follow ? "follow" : "nofollow",
 		translate: metasAdvancedList.includes("notranslate") ? "notranslate" : "",
-		metasAdvanced: metasAdvancedList
-			.filter((item) => item !== "notranslate")
-			.join(),
+		metasAdvanced: metasAdvancedList.filter((item) => item !== "notranslate").join(),
 		pageLanguages,
 		metaKeywords: metaKeywords
 			?.filter(Boolean)
@@ -133,8 +122,9 @@ async function createGriddoPageObject(
 		siteSlug,
 		socials,
 		theme,
-		navigations: { header, footer },
+		navigations,
 	} = additionalInfo;
+	const { header, footer } = navigations;
 
 	// Update page object
 	page.breadcrumb = breadcrumb;
@@ -207,10 +197,7 @@ async function createGriddoPageObject(
  * @param page A Griddo single page object.
  * @param additionalInfo Additional page info.
  */
-async function createGriddoSinglePage(
-	page: GriddoSinglePage,
-	additionalInfo: PageAdditionalInfo,
-) {
+async function createGriddoSinglePage(page: GriddoSinglePage, additionalInfo: PageAdditionalInfo) {
 	return createGriddoPageObject(page, additionalInfo);
 }
 
@@ -218,14 +205,7 @@ async function createGriddoSinglePage(
  * Create multiples pages from one page as list paginated pages
  */
 async function createGriddoListPages(
-	{
-		page,
-		pages,
-		isRoot = false,
-		defaultLang,
-		template,
-		totalQueriedItems,
-	}: GriddoListPage,
+	{ page, pages, isRoot = false, defaultLang, template, totalQueriedItems }: GriddoListPage,
 	additionalInfo: PageAdditionalInfo,
 ) {
 	const allPages = pages.map(async (dataInPage, idx) => {
@@ -233,19 +213,8 @@ async function createGriddoListPages(
 		const pageNumber = idx + 1;
 		const { domainUrl, compose } = page.fullPath;
 
-		// Crea un id como número negativo y añadiendo un sufijo para los
-		// listados estáticos. Esto es así para marcarlas y posteriormente
-		// borrarlas siempre en cada nuevo render desde el Adapter.
-		//
-		// id de página con mode:"list": 1546
-		// ids de las "sub-páginas": -15460, -15461, -1546n, (-)id(idx)
-		//
-		// @todo eliminar el concepto multipage de CX, debería ser algo core de
-		// Griddo itself: API/AX, que fuesen páginas con sus ids, etc..
-
 		const paginatedPage = {
 			...page,
-			id: Number.parseInt(`-${page.id}${idx}`),
 			fullPath: {
 				...page.fullPath,
 				// Add a page number (tailPageNumber) from page 2 onwards
@@ -287,16 +256,11 @@ async function createGriddoListPages(
  * @param page A Griddo Multipage object.
  * @param additionalInfo Additional page info.
  */
-function createGriddoMultiPages(
-	page: GriddoMultiPage,
-	additionalInfo: PageAdditionalInfo,
-) {
+function createGriddoMultiPages(page: GriddoMultiPage, additionalInfo: PageAdditionalInfo) {
 	const { multiPageElements: multiPageElementsBulk, ...cleanPage } = page;
 	// TODO: Use structuredClone() when node 18 is available.
 	// WARN!! Se ha probado que parse(stringify()) está tan optimizado que puede ser más rápido que structuredClone...
-	const multiPageElements: MultiPageElements = JSON.parse(
-		JSON.stringify(multiPageElementsBulk),
-	);
+	const multiPageElements: MultiPageElements = JSON.parse(JSON.stringify(multiPageElementsBulk));
 
 	// Si no hay un elemento sin slug, como mínimo hay que dibujar una página
 	// principal para el conjunto de páginas.
@@ -305,7 +269,7 @@ function createGriddoMultiPages(
 	}
 
 	// Creates each page based on `multiPageElements` from the schema.
-	const allPages = multiPageElements.map(async (pageElement, idx) => {
+	const allPages = multiPageElements.map(async (pageElement) => {
 		// TODO: Use structuredClone() when node 18 is available.
 		// WARN!! Se ha probado que parse(stringify()) está tan optimizado que puede ser más rápido que structuredClone...
 		const paginatedPage: APIPageObject = JSON.parse(JSON.stringify(cleanPage));
@@ -323,9 +287,7 @@ function createGriddoMultiPages(
 
 		const cleanSectionSlug = sectionSlug?.replace(/\//g, "");
 		const isRootSlug = sectionSlug === "/";
-		const rightSectionSlug = isRootSlug
-			? cleanSectionSlug
-			: `${cleanSectionSlug}/`;
+		const rightSectionSlug = isRootSlug ? cleanSectionSlug : `${cleanSectionSlug}/`;
 
 		const slash = compose.endsWith("/") ? "" : "/";
 		const newCompose = `${compose}${slash}${rightSectionSlug}`;
@@ -338,24 +300,12 @@ function createGriddoMultiPages(
 			paginatedPage.metaDescription = metaDescription;
 		}
 
-		// Crea un id como número negativo y añadiendo un sufijo para las multipages.
-		// Esto es así para marcarlas y posteriormente borrarlas siempre en cada
-		// nuevo render desde el Adapter.
-		//
-		// id de página con hasMultipageTrue: 1546
-		// ids de las "sub-páginas": -15460, -15461, -1546n, (-)id(idx)
-		//
-		// @todo eliminar el concepto multipage de CX, debería ser algo core de
-		// Griddo itself: API/AX, que fuesen páginas con sus ids, etc..
-		paginatedPage.id = Number.parseInt(`-${paginatedPage.id}${idx}`);
-
 		paginatedPage.fullUrl = `${fullUrl}/${rightSectionSlug}`;
 		paginatedPage.fullPath.compose = newCompose;
 		paginatedPage.slug = newCompose;
 		paginatedPage.template.activeSectionSlug = sectionSlug;
 		paginatedPage.template.activeSectionBase = fullUrl;
-		paginatedPage.metaTitle =
-			metaTitle.trim() || title.trim() || paginatedPage.metaTitle;
+		paginatedPage.metaTitle = metaTitle.trim() || title.trim() || paginatedPage.metaTitle;
 
 		return createGriddoPageObject(paginatedPage, additionalInfo);
 	});
@@ -368,9 +318,7 @@ function createGriddoMultiPages(
  *
  * @param page The page to get the multipage parts.
  */
-function getMultiPageElements(
-	page: TemplateWithReferenceField,
-): Promise<MultiPageElements> | null {
+function getMultiPageElements(page: TemplateWithReferenceField): Promise<MultiPageElements> | null {
 	const multiPageElements = new Promise((resolve) => {
 		// Recursive
 		const getMultiPageComponent = (
@@ -389,13 +337,12 @@ function getMultiPageElements(
 				const currentComponent = template[key] as {
 					component: string;
 					hasGriddoMultiPage: boolean;
-					elements: Array<Record<string, unknown>>;
+					elements: Record<string, unknown>[];
 				};
-				const isValidComponent =
-					currentComponent || typeof currentComponent === "object";
-				const hasGriddoMultiPageProp = JSON.stringify(
-					currentComponent,
-				).includes('"hasGriddoMultiPage":true');
+				const isValidComponent = currentComponent || typeof currentComponent === "object";
+				const hasGriddoMultiPageProp = JSON.stringify(currentComponent).includes(
+					'"hasGriddoMultiPage":true',
+				);
 
 				if (!isValidComponent) {
 					continue;
@@ -445,11 +392,7 @@ function getMultiPageElements(
  * getPage(3, ["a", "b", "c", "d", "e", "f", "g", "h"], 2)
  * // -> ["d", "e", "f"]
  */
-function getPage(
-	itemsPerPage: number,
-	items: Array<Fields.QueriedDataItem>,
-	page: number,
-) {
+function getPage(itemsPerPage: number, items: Fields.QueriedDataItem[], page: number) {
 	return items?.slice(itemsPerPage * (page - 1), itemsPerPage * page);
 }
 
@@ -463,16 +406,11 @@ function getPage(
  * getPageCluster(3, ["a", "b", "c", "d", "e", "f", "g", "h"])
  * // -> [["a", "b", "c"], ["d", "e", "f"], ["g", "h"]]
  */
-function getPageCluster(
-	itemsPerPage: number,
-	items: Array<Fields.QueriedDataItem>,
-) {
+function getPageCluster(itemsPerPage: number, items: Fields.QueriedDataItem[]) {
 	const totalPagesCount = Math.ceil(items.length / itemsPerPage) || 1;
 	const pageNumbers = Array.from({ length: totalPagesCount }, (_, i) => i + 1);
 
-	return pageNumbers?.map((pageNumber) =>
-		getPage(itemsPerPage, items, pageNumber),
-	);
+	return pageNumbers?.map((pageNumber) => getPage(itemsPerPage, items, pageNumber));
 }
 
 /**
@@ -482,8 +420,7 @@ function getPageCluster(
  */
 function getPaginatedPages(listTemplate: TemplateWithReferenceField) {
 	const items = listTemplate.queriedItems || [];
-	const itemsPerPage =
-		listTemplate?.itemsPerPage || DEFAULT_ITEMS_PER_PAGE_FOR_LIST_TEMPLATES;
+	const itemsPerPage = listTemplate?.itemsPerPage || DEFAULT_ITEMS_PER_PAGE_FOR_LIST_TEMPLATES;
 	const pageClusters = getPageCluster(itemsPerPage, items);
 
 	return pageClusters;
@@ -524,9 +461,7 @@ function addPageNumberToUrl(
 		return removeDuplicateTrailing(`${url}${endingSlash}`);
 	}
 
-	return removeDuplicateTrailing(
-		`${url}${trailingSlash}${pageNumber}${endingSlash}`,
-	);
+	return removeDuplicateTrailing(`${url}${trailingSlash}${pageNumber}${endingSlash}`);
 }
 
 /**

package/exporter/services/reference-fields.ts

@@ -1,9 +1,9 @@
-import type { FetchDataProps } from "../types/global";
-import type { APIPageObject } from "../types/pages";
 import type { Core, Fields } from "@griddo/core";
+import type { FetchDataProps } from "../shared/types/global";
+import type { APIPageObject } from "../shared/types/pages";
 
+import { GriddoLog } from "../core/GriddoLog";
 import { getReferenceFieldSiteData } from "./sites";
-import { boxLog } from "../utils/loggin";
 
 /**
  * Get the body data from a ReferenceField.
@@ -54,9 +54,7 @@ function getBody(data: Fields.Reference<unknown>, page: Core.Page) {
 		};
 	}
 
-	console.log(
-		`Error: ReferenceField mode: ${mode} is not recognized on page ${page?.id}.`,
-	);
+	GriddoLog.error(`ReferenceField mode: ${mode} is not recognized on page ${page?.id}.`);
 
 	return data;
 }
@@ -71,17 +69,13 @@ function getBody(data: Fields.Reference<unknown>, page: Core.Page) {
  * @returns The ContentType data.
  */
 async function fetchContentTypeData(props: FetchDataProps) {
-	const {
-		page,
-		component: { data },
-		cacheKey,
-	} = props;
+	const { page, component, cacheKey } = props;
+	const { data } = component;
 
 	// Distrubutor with `hasDistributorData: true` / `getStaticData: true` but without `data` prop
 	if (!data) {
-		boxLog(
+		GriddoLog.info(
 			`Error: Page ${page.id} has \`hasDistributorData: true\` or \`getStaticData: true\` but it doesn't have a \`data\` property.`,
-			"No `data` in `ReferenceField`",
 		);
 
 		return [];
@@ -89,9 +83,8 @@ async function fetchContentTypeData(props: FetchDataProps) {
 
 	// Avoid fetch ReferenceField with empty `data.sources`
 	if (Array.isArray(data.sources) && data.sources.length < 1) {
-		boxLog(
+		GriddoLog.info(
 			`Warning: Page with id: ${page.id} has a ReferenceField with empty \`data.sources\``,
-			"Empty data.sources in ReferenceField",
 		);
 
 		return [];
@@ -101,21 +94,14 @@ async function fetchContentTypeData(props: FetchDataProps) {
 
 	// Inform that the ReferenceField has not `data.sources`
 	if (!data.sources && data.mode === "auto") {
-		boxLog(
+		GriddoLog.info(
 			`Warning: Page with id: ${page.id} has a ReferenceField with \`undefined\` \`data.sources\``,
-			"undefined data.sources in ReferenceField",
 		);
 	}
 
 	const body = getBody(data, page);
 
-	const response = await getReferenceFieldSiteData(
-		page,
-		body,
-		cacheKey,
-		site,
-		lang,
-	);
+	const response = await getReferenceFieldSiteData(page, body, cacheKey, site, lang);
 
 	return response;
 }
@@ -165,10 +151,7 @@ async function getReferenceFieldData({
 					continue;
 				}
 
-				const _key = key as
-					| "hasDistributorData"
-					| "queriedItems"
-					| "getStaticData";
+				const _key = key as "hasDistributorData" | "queriedItems" | "getStaticData";
 				const component = templateChunk[_key] as unknown as {
 					data: Fields.Reference<unknown>;
 					queriedItems: Fields.QueriedData<unknown>;
@@ -181,8 +164,7 @@ async function getReferenceFieldData({
 					continue;
 				}
 
-				const componentHasRequestForData =
-					component.hasDistributorData || component.getStaticData;
+				const componentHasRequestForData = component.hasDistributorData || component.getStaticData;
 
 				if (componentHasRequestForData) {
 					component.queriedItems = await fetchContentTypeData({
@@ -208,9 +190,9 @@ async function getReferenceFieldData({
 
 		return response;
 	} catch (err) {
-		console.error(`Error in getReferenceFieldData ${err}`);
+		GriddoLog.error("Error in getReferenceFieldData:", err);
 
-		process.exit(1);
+		throw err;
 	}
 }
 

package/exporter/services/render-artifacts.ts

@@ -0,0 +1,44 @@
+import type { RenderArtifacts } from "../shared/types/global";
+
+import path from "node:path";
+
+import { getRenderPathsHydratedWithDomainFromDB } from "./render";
+
+/**
+ * Returns the artifacts of CX.
+ */
+async function getRenderArtifacts(domain: string): Promise<RenderArtifacts> {
+	const { __exports, __cache, __root, __ssg } = await getRenderPathsHydratedWithDomainFromDB({
+		domain,
+	});
+
+	return {
+		initials: [
+			__exports, // `<root>/exports/<domain>`
+			__cache, // `<root>/.griddo/<domain>`
+			path.join(__exports, "logs"),
+			path.join(__root, "store"),
+			path.join(__root, "apiCache"),
+		],
+		disposables: [
+			path.join(__root, "store"),
+			path.join(__root, "apiCache"),
+			path.join(__root, "dist"),
+			path.join(__root, "dist-restored"),
+			path.join(__root, "assets"),
+			path.join(__root, "render-detail-log.txt"),
+			path.join(__root, "current-dist"),
+			path.join(__ssg, "domains.json"),
+			path.join(__ssg, "render-metadata.json"),
+		],
+		cacheables: [],
+		archivables: [
+			// dist ya se usa directamente en exports
+			// "dist",
+			"assets",
+		],
+		restaurable: ["dist"],
+	};
+}
+
+export { getRenderArtifacts };