@griddo/cx 1.75.210 → 1.75.212

package/build/index.js

@@ -25,7 +25,7 @@ GFS4: `),console.error(e)});G[Q]||(ea=global[Q]||[],ra(G,ea),G.close=function(e)
 \u2502 Access credentials failure                                 \u2502
 \u2502 Check that the login details are correct in your .env file \u2502
 \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F
-`)),process.exit(1)}}},hr=new On;var Yu=Y(Rn()),Xu=Y(mt()),Ku=Y(Gt());var fp=Y(mt()),Uu=Y(Gt()),hp=Y(eu()),Gu=Y($u());var Hu="1.75.210";Uu.default.config();var dp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);function zu(...e){dp&&console.info(...e)}function Wu(e){return new Promise(t=>setTimeout(t,e))}function ai(e,t=3){return(e/1e3).toFixed(t)}function Ju(e){return"site"in e&&e.site?e?.site:void 0}function ci(...e){let t=performance.now();return e.forEach(r=>r()),ai(performance.now()-t)}function Vu(){let e=`
+`)),process.exit(1)}}},hr=new On;var Yu=Y(Rn()),Xu=Y(mt()),Ku=Y(Gt());var fp=Y(mt()),Uu=Y(Gt()),hp=Y(eu()),Gu=Y($u());var Hu="1.75.212";Uu.default.config();var dp=!!process.env.GRIDDO_BUILD_LOGS&&!!JSON.parse(process.env.GRIDDO_BUILD_LOGS);function zu(...e){dp&&console.info(...e)}function Wu(e){return new Promise(t=>setTimeout(t,e))}function ai(e,t=3){return(e/1e3).toFixed(t)}function Ju(e){return"site"in e&&e.site?e?.site:void 0}function ci(...e){let t=performance.now();return e.forEach(r=>r()),ai(performance.now()-t)}function Vu(){let e=`
 \xB7\xB7
 \xB7\xB7
 \xB7\xB7
@@ -41,7 +41,7 @@ GFS4: `),console.error(e)});G[Q]||(ea=global[Q]||[],ra(G,ea),G.close=function(e)
 \xB7\xB7
 \xB7\xB7
 \xB7\xB7
-`;console.log(Gu.default.cristal(e))}Ku.default.config();var{env:{RETRY_WAIT_SECONDS:pp="4",RETRY_ATTEMPTS:Qu="1"}}=process;async function Zu(e){let{endpoint:t,body:r,cached:n,attempt:i,method:s,headers:o}=e,a={endpoint:t,body:r,cached:n};if(n){let c=hs(a);if(c)return c}try{let{data:c}=await(0,Yu.default)({url:t,method:s,headers:{...o,...hr.headers},data:r});return fs(a,c),c}catch(c){let d=c;if(mp(d,{callInfo:{endpoint:t,body:r,attempt:i},breakProcess:d.response.status!==404}),d.response.status===404)return null;if(i&&i<parseInt(Qu))return console.warn(`Waiting for retry: ${s}`,t),await Wu(parseInt(pp)*1e3),Zu({endpoint:t,body:r,cached:n,method:s,attempt:i+1});throw new Error(`Error in ${s}`)}}async function el(e){let t=new Date,{endpoint:r}=e,n=await Zu({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",s=Ju(n),o=s?`site: ${s} `:"",a=ai(new Date().getTime()-t.getTime());return zu(`GET ${i} ${o} ${r} - ${a}s`),n}function mp(e,t){let{response:r,message:n,stack:i}=e,{breakProcess:s,callInfo:o}=t,{status:a,statusText:c,data:d}=r||{},h=[];for(let _ of Object.keys(o)){let R=_;h.push(`${_}: ${typeof o[R]=="object"?JSON.stringify(o[R]):o[R]}`)}let p=h.join(`
+`;console.log(Gu.default.cristal(e))}Ku.default.config();var{env:{RETRY_WAIT_SECONDS:pp="4",RETRY_ATTEMPTS:Qu="1"}}=process;async function Zu(e){let{endpoint:t,body:r,cached:n,attempt:i=1,method:s,headers:o}=e,a={endpoint:t,body:r,cached:n};if(n){let c=hs(a);if(c)return c}try{let{data:c}=await(0,Yu.default)({url:t,method:s,headers:{...o,...hr.headers},data:r});return fs(a,c),c}catch(c){let d=c;if(mp(d,{callInfo:{endpoint:t,body:r,attempt:i},breakProcess:d.response.status!==404}),d.response.status===404)return null;if(i<=parseInt(Qu))return console.warn(`Waiting for retry: ${s}`,t),await Wu(parseInt(pp)*1e3),Zu({endpoint:t,body:r,cached:n,method:s,attempt:i+1});throw new Error(`Error in ${s}`)}}async function el(e){let t=new Date,{endpoint:r}=e,n=await Zu({...e,method:"get"}),i=e.cached?"(cached)":"(fetch)",s=Ju(n),o=s?`site: ${s} `:"",a=ai(new Date().getTime()-t.getTime());return zu(`GET ${i} ${o} ${r} - ${a}s`),n}function mp(e,t){let{response:r,message:n,stack:i}=e,{breakProcess:s,callInfo:o}=t,{status:a,statusText:c,data:d}=r||{},h=[];for(let _ of Object.keys(o)){let R=_;h.push(`${_}: ${typeof o[R]=="object"?JSON.stringify(o[R]):o[R]}`)}let p=h.join(`
 `),m=r?`Code: ${a} - ${c}
 Response: ${JSON.stringify(d)}`:"",y=`${n}
 ${i}`;console.warn(Xu.default.bold.red(`
@@ -57,7 +57,7 @@ ${m}
 ${y}
 
 =============
-`)),s&&(typeof o?.attempt!="number"||o.attempt>=parseInt(Qu))&&process.exit(1)}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await el({endpoint:t})}};async function tl(){await hr.login();let e=await Dr.getAll();return vp(e)}function vp(e){let t=e.filter(({slug:r})=>!!r).map(({slug:r})=>r.replace("/",""));return[...new Set(t)]}sl.default.config();var ui=["dist","assets","apiCache"],rl=["public","store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),ol=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,il.execSync)(e,{cwd:ol,stdio:"inherit",env:{...process.env,...t,GRIDDO_EXPORTER:"true"}}),Ep=e=>!process.env.GRIDDO_ASSET_PREFIX||!e||!e.startsWith("pro-")?"":`${process.env.GRIDDO_ASSET_PREFIX}/${e}`,nl=(...e)=>console.log(...e),Ge=(...e)=>console.log(...e),Sp=(...e)=>console.log(...e),Ue=(...e)=>console.log(...e),kp=async e=>{let t=Rp(e),r=ci(t.init,t.restoreArtifacts);Ge(`
+`)),s&&(typeof o?.attempt!="number"||o.attempt>parseInt(Qu))&&process.exit(1)}var yp=process.env.API_URL,gp={GET_ALL:`${yp}/domains`},Dr=class{static async getAll(){let{GET_ALL:t}=gp;return await el({endpoint:t})}};async function tl(){await hr.login();let e=await Dr.getAll();return vp(e)}function vp(e){let t=e.filter(({slug:r})=>!!r).map(({slug:r})=>r.replace("/",""));return[...new Set(t)]}sl.default.config();var ui=["dist","assets","apiCache"],rl=["public","store",".cache"],bp=li.default.sync(),wp=It.default.resolve(bp,"exports/sites"),ol=li.default.sync(__dirname),_p=e=>t=>xp(t,e),xp=(e,t={})=>(0,il.execSync)(e,{cwd:ol,stdio:"inherit",env:{...process.env,...t,GRIDDO_EXPORTER:"true"}}),Ep=e=>!process.env.GRIDDO_ASSET_PREFIX||!e||!e.startsWith("pro-")?"":`${process.env.GRIDDO_ASSET_PREFIX}/${e}`,nl=(...e)=>console.log(...e),Ge=(...e)=>console.log(...e),Sp=(...e)=>console.log(...e),Ue=(...e)=>console.log(...e),kp=async e=>{let t=Rp(e),r=ci(t.init,t.restoreArtifacts);Ge(`
 \u231B\uFE0F Domain ${e} restaured: ${r}s`),t.runExporter();let n=ci(t.archiveArtifacts);Ge(`
 \u231B\uFE0F Domain ${e} archived: ${n}s`)},Cp=async()=>{Vu(),us();let e=await tl();for(let t of e)Ge(`\uFE0F\u{1F6A2} Exporting domain ${Z.default.underline(t)}`),await kp(t)},Rp=e=>{let t=Ep(e),r=_p({DOMAIN:e,GRIDDO_ASSET_PREFIX:t,HAS_ASSET_DOMAIN:t&&t!=="",RENDERID:new Date().valueOf()}),n=()=>{Ge(`\u{1F680} Initializing ${Z.default.underline(e)} exporter`),s(),o()},i=(S="")=>{let C=It.default.resolve(wp,e),P=It.default.resolve(C,S),J=`${P}-BACKUP`,de=It.default.resolve(ol,S);return{domainExportArchiveBasePath:C,currentExportArchivePath:P,currentExportBackupPath:J,currentExportWorkingPath:de}},s=()=>{for(let S of[...ui,...rl]){let{currentExportWorkingPath:C}=i(S);Se.default.existsSync(C)&&(Ue(`\u{1F9F9} Cleanup dirty ${Z.default.gray(C)}`),r(`rm -rf ${C}`))}},o=()=>{let{domainExportArchiveBasePath:S}=i();Se.default.existsSync(S)||(Ge(`\u2728 Creating ${S}`),r(`mkdir -p ${S}`))},a=S=>{let{currentExportArchivePath:C,currentExportWorkingPath:P}=i(S);Ge(`\u{1F69A} Moving files from ${Z.default.gray(P)} to ${Z.default.gray(C)}`),r(`mv ${P} ${C}`)},c=()=>{for(let S of ui){let{currentExportWorkingPath:C,currentExportArchivePath:P}=i(S);if(!Se.default.existsSync(C)){nl("\u{1F4C1} Source directory has not been created:",C);continue}try{h(S),a(S),m(S)}catch(J){nl(`\u{1F69A} Error moving files to ${P}`,J.message),p(S);continue}}},d=()=>{for(let S of ui){let{currentExportArchivePath:C,currentExportWorkingPath:P}=i(S);Se.default.existsSync(C)&&(Ue(`\uFE0F\u267B\uFE0F  Restoring ${Z.default.gray(C)}`),r(`cp -R ${C} ${P}`))}_()},h=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Se.default.existsSync(C)&&(Ge(`\u{1F4BF} Creating backup of ${Z.default.gray(C)}`),r(`mv ${C} ${P}`))},p=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Se.default.existsSync(P)&&(Ue(`\uFE0F\u267B\uFE0F  Restoring backup ${Z.default.gray(C)}`),r(`mv ${P} ${C}`))},m=S=>{let{currentExportArchivePath:C,currentExportBackupPath:P}=i(S);Ue(`\uFE0F\u{1F5D1}\uFE0F Removing backup ${Z.default.gray(C)}`),r(`rm -rf ${P}`)},y=()=>{console.log(`
 ${Z.default.black(Z.default.bgGreen(" Gatsby (start) "))}

package/gatsby-node.ts

@@ -22,24 +22,16 @@ const GRIDDO_STORE_MODE = (process.env.GRIDDO_STORE_MODE ||
 const PUBLIC_FOLDER = path.resolve(__dirname, "./public");
 const STORE_DIR_PATH = path.resolve(__dirname, "./store/");
 const REPORT_FILE = path.resolve(PUBLIC_FOLDER, "__build-report__.json");
-const GRIDDO_SANITIZE_PAGES = false;
-const envVars: Record<string, any> = {};
 
 // -----------------------------------------------------------------------------
 // onPreInit
 // -----------------------------------------------------------------------------
 export const onPreInit = async () => {
-	console.log("Envs");
-	Object.keys(process.env)
-		.filter((key) => key.startsWith("GRIDDO_") || key.startsWith("GATSBY"))
-		.forEach((key) => (envVars[key] = process.env[key]));
-	console.log(envVars);
-
 	splash();
 	initCache();
 	prepareStaticFolder();
 	StoreService.init(STORE_DIR_PATH, {
-		sanitize: GRIDDO_SANITIZE_PAGES,
+		sanitize: true,
 		mode: GRIDDO_STORE_MODE,
 	});
 	await StoreService.createBuildSource();

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/cx",
 	"description": "Griddo SSG based on Gatsby",
-	"version": "1.75.210",
+	"version": "1.75.212",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -33,7 +33,7 @@
 		"@babel/preset-env": "^7.14.5",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.16.5",
-		"@griddo/core": "^1.75.210",
+		"@griddo/core": "^1.75.212",
 		"@svgr/webpack": "^5.5.0",
 		"babel-loader": "^8.0.6",
 		"babel-plugin-styled-components": "^1.10.7",
@@ -63,7 +63,7 @@
 		"react-helmet": "^6.0.0"
 	},
 	"devDependencies": {
-		"@griddo/eslint-config-back": "^1.75.210",
+		"@griddo/eslint-config-back": "^1.75.212",
 		"@types/babel__core": "^7.20.0",
 		"@types/babel__preset-env": "^7.9.2",
 		"@types/csvtojson": "^2.0.0",
@@ -111,5 +111,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2b9df0e7e16083025b24814e8952c45078a732a8"
+	"gitHead": "ea263310a45b718e25b02b662d57d6dd3c341f02"
 }

package/src/services/distributors.ts

@@ -14,7 +14,8 @@ import { logBox } from "../utils/shared";
  */
 class DistributorService {
 	/**
-	 * Get the body data from a ReferenceField in auto or manual mode.
+	 * Get the body data from a ReferenceField.
+	 * `auto`, `manual` or `navigation` mode.
 	 *
 	 * @param data The ReferenceField props.
 	 * @returns The props for one of the ReferenceField mode.
@@ -78,7 +79,7 @@ class DistributorService {
 	 * @param props.page The Page object
 	 * @param props.component.data The ReferenceField, always in the data prop.
 	 * @param props.cached Boolean that indicates cache use.
-	 * @returns The Content Type data.
+	 * @returns The ContentType data.
 	 */
 	static async fetchContentTypeData(props: FetchDataProps) {
 		const {

package/src/services/store.ts

@@ -68,20 +68,20 @@ const BUILD_PROCESS_DATA: BuildProcessData = {};
 const UNWANTED_PAGE_PROPS = ["editorID", "parentEditorID"];
 
 /**
- * Store service to fetch, process and save temporarily object pages and site
- * data to be consumed by external services (Griddo itself, Gatsby, etc.)
+ * Store service to fetch, process and save object pages and sites data to be
+ * consumed by other services (Griddo itself, Gatsby, etc.)
  *
  * Modes:
- * - File mode will save the final page objects in individual json files in the file system.
- * - Memory mode will save the final page objects in an array of objects in memory.
+ * - { File mode } save the objects as json files in the file system (json DB)
+ * - { Memory mode } save the objects in an array.
  *
  * @example
  * import { StoreService } from "./store"
  *
  * // Init the store service.
- * StoreService.init("foo/pages", { mode: "file" })
+ * StoreService.init("foo/pages", { mode: "file", ... })
  * // Save the data into files.
- * await StoreService.saveBuildData()
+ * await StoreService.createBuildSource()
  * // Consume the pages as an interator.
  * const pages = StoreService.getPages()
  */
@@ -94,8 +94,6 @@ class StoreService {
 	static buildProcessData: BuildProcessData;
 	static createdPages: Array<number>;
 
-	// Public methods
-
 	/**
 	 * Initialize the Store with a path to save files (file mode) and an option object to configure the Store.
 	 *
@@ -164,6 +162,7 @@ class StoreService {
 			);
 
 			// 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
@@ -172,7 +171,6 @@ class StoreService {
 			// Set robots information to use later in the `onPostBuild` phase.
 			await RobotsService.loadRobots();
 
-			// const siteToPublishPromises = sitesToPublish.map(async (site) => {
 			for (const site of sitesToPublish) {
 				const { id: siteId, slug: siteSlug, theme, favicon } = site;
 
@@ -373,14 +371,6 @@ class StoreService {
 
 				await Promise.all(pagesToRender);
 			}
-
-			// Create the pLimit array of promises
-			// const limit = pLimit(1);
-			// const sitesToPublishAwaited = siteToPublishPromises.map((site) =>
-			// 	limit(() => site)
-			// );
-
-			// await Promise.all(sitesToPublishAwaited);
 		} catch (e) {
 			const error = e as { message: string };
 
@@ -396,11 +386,9 @@ class StoreService {
 	 * If the Store is in memory mode `getPages` will return an array of pages.
 	 */
 	public static getPages() {
-		if (this.mode === "file") {
-			return this.getPagesFromFiles();
-		} else {
-			return this.getPagesFromMemory();
-		}
+		return this.mode === "file"
+			? this.getPagesFromFiles()
+			: this.getPagesFromMemory();
 	}
 
 	/**
@@ -415,11 +403,9 @@ class StoreService {
 			pages.forEach((page) => removeProperties(page, UNWANTED_PAGE_PROPS));
 		}
 
-		if (this.mode === "file") {
-			await this.savePagesToFiles(pages);
-		} else {
-			this.savePagesToMemory(pages);
-		}
+		return this.mode === "file"
+			? await this.savePagesToFiles(pages)
+			: this.savePagesToMemory(pages);
 	}
 
 	/**

package/src/utils/api.ts

@@ -39,7 +39,7 @@ const {
 async function requestAPI<T extends APIResponses>(
 	props: APIRequest & { method: Method }
 ): Promise<T> {
-	const { endpoint, body, cached, attempt, method, headers } = props;
+	const { endpoint, body, cached, attempt = 1, method, headers } = props;
 	const cacheOptions = { endpoint, body, cached };
 
 	// Cache
@@ -76,7 +76,7 @@ async function requestAPI<T extends APIResponses>(
 			return null;
 		}
 
-		if (attempt && attempt < parseInt(RETRY_ATTEMPTS)) {
+		if (attempt <= parseInt(RETRY_ATTEMPTS)) {
 			console.warn(`Waiting for retry: ${method}`, endpoint);
 
 			await delay(parseInt(RETRY_WAIT_SECONDS) * 1000);
@@ -220,7 +220,7 @@ ${errorDetailsStr}
 	if (
 		breakProcess &&
 		(typeof callInfo?.attempt !== "number" ||
-			callInfo.attempt >= parseInt(RETRY_ATTEMPTS))
+			callInfo.attempt > parseInt(RETRY_ATTEMPTS))
 	) {
 		process.exit(1);
 	}