@monkeyplus/flow 4.0.0-beta.6 → 4.0.0-beta.8

package/dist/index.mjs

@@ -1,13 +1,18 @@
-import path from 'path';
+import path, { join } from 'path';
 import { applyToDefaults } from '@hapi/hoek';
 import consola from 'consola';
 import * as R from 'ramda';
+import { flatten, dissoc, groupBy, mapObjIndexed } from 'ramda';
 import { notFound } from '@hapi/boom';
 import os from 'os';
+import chalk from 'chalk';
 import fs from 'fs-extra';
+import fs$1 from 'fs';
+import { createHooks } from 'hookable';
+import chokidar from 'chokidar';
 
 const name = "@monkeyplus/flow";
-const version = "4.0.0-beta.6";
+const version = "4.0.0-beta.8";
 const description = "Utils hapi";
 const author = "Andres Navarrete";
 const license = "MIT";
@@ -39,13 +44,17 @@ const dependencies$1 = {
 	"@hapi/boom": "9.x.x",
 	"@hapi/hoek": "9.x.x",
 	consola: "^2.15.3",
+	chalk: "^4.1.2",
+	chokidar: "^3.5.3",
+	hookable: "^5.1.1",
 	"fs-extra": "^10.0.0",
 	ramda: "^0.28.0"
 };
 const devDependencies = {
-	chalk: "^5.0.0",
 	"@types/fs-extra": "^9.0.13",
 	"@types/hapi__hapi": "^20.0.10",
+	"@types/hapi__nes": "^11.0.5",
+	"@types/hapi__vision": "^5.5.3",
 	"@types/ramda": "^0.27.64"
 };
 const peerDependencies = {
@@ -72,8 +81,13 @@ const pkg = {
 
 const logger$1 = consola.withScope(pkg.name);
 const dependencies = {
-  "@hapi/vision": "6.x.x"
+  "@hapi/vision": "6.x.x",
+  "@hapi/inert": "6.x.x",
+  "@hapi/h2o2": "9.x.x",
+  "@hapi/nes": "12.x.x"
 };
+const isProduction = process.env.NODE_ENV === "production";
+const isGenerate = process.env.GENERATE;
 
 const LifeCircle = {
   register: (server) => {
@@ -122,466 +136,6 @@ const LifeCircle = {
   }
 };
 
-const ANSI_BACKGROUND_OFFSET = 10;
-
-const wrapAnsi16 = (offset = 0) => code => `\u001B[${code + offset}m`;
-
-const wrapAnsi256 = (offset = 0) => code => `\u001B[${38 + offset};5;${code}m`;
-
-const wrapAnsi16m = (offset = 0) => (red, green, blue) => `\u001B[${38 + offset};2;${red};${green};${blue}m`;
-
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			overline: [53, 55],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29],
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
-
-			// Bright color
-			blackBright: [90, 39],
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39],
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
-
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49],
-		},
-	};
-
-	// Alias bright black as gray (and grey)
-	styles.color.gray = styles.color.blackBright;
-	styles.bgColor.bgGray = styles.bgColor.bgBlackBright;
-	styles.color.grey = styles.color.blackBright;
-	styles.bgColor.bgGrey = styles.bgColor.bgBlackBright;
-
-	for (const [groupName, group] of Object.entries(styles)) {
-		for (const [styleName, style] of Object.entries(group)) {
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`,
-			};
-
-			group[styleName] = styles[styleName];
-
-			codes.set(style[0], style[1]);
-		}
-
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false,
-		});
-	}
-
-	Object.defineProperty(styles, 'codes', {
-		value: codes,
-		enumerable: false,
-	});
-
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
-
-	styles.color.ansi = wrapAnsi16();
-	styles.color.ansi256 = wrapAnsi256();
-	styles.color.ansi16m = wrapAnsi16m();
-	styles.bgColor.ansi = wrapAnsi16(ANSI_BACKGROUND_OFFSET);
-	styles.bgColor.ansi256 = wrapAnsi256(ANSI_BACKGROUND_OFFSET);
-	styles.bgColor.ansi16m = wrapAnsi16m(ANSI_BACKGROUND_OFFSET);
-
-	// From https://github.com/Qix-/color-convert/blob/3f0e0d4e92e235796ccb17f6e85c72094a651f49/conversions.js
-	Object.defineProperties(styles, {
-		rgbToAnsi256: {
-			value: (red, green, blue) => {
-				// We use the extended greyscale palette here, with the exception of
-				// black and white. normal palette only has 4 greyscale shades.
-				if (red === green && green === blue) {
-					if (red < 8) {
-						return 16;
-					}
-
-					if (red > 248) {
-						return 231;
-					}
-
-					return Math.round(((red - 8) / 247) * 24) + 232;
-				}
-
-				return 16
-					+ (36 * Math.round(red / 255 * 5))
-					+ (6 * Math.round(green / 255 * 5))
-					+ Math.round(blue / 255 * 5);
-			},
-			enumerable: false,
-		},
-		hexToRgb: {
-			value: hex => {
-				const matches = /(?<colorString>[a-f\d]{6}|[a-f\d]{3})/i.exec(hex.toString(16));
-				if (!matches) {
-					return [0, 0, 0];
-				}
-
-				let {colorString} = matches.groups;
-
-				if (colorString.length === 3) {
-					colorString = [...colorString].map(character => character + character).join('');
-				}
-
-				const integer = Number.parseInt(colorString, 16);
-
-				return [
-					/* eslint-disable no-bitwise */
-					(integer >> 16) & 0xFF,
-					(integer >> 8) & 0xFF,
-					integer & 0xFF,
-					/* eslint-enable no-bitwise */
-				];
-			},
-			enumerable: false,
-		},
-		hexToAnsi256: {
-			value: hex => styles.rgbToAnsi256(...styles.hexToRgb(hex)),
-			enumerable: false,
-		},
-		ansi256ToAnsi: {
-			value: code => {
-				if (code < 8) {
-					return 30 + code;
-				}
-
-				if (code < 16) {
-					return 90 + (code - 8);
-				}
-
-				let red;
-				let green;
-				let blue;
-
-				if (code >= 232) {
-					red = (((code - 232) * 10) + 8) / 255;
-					green = red;
-					blue = red;
-				} else {
-					code -= 16;
-
-					const remainder = code % 36;
-
-					red = Math.floor(code / 36) / 5;
-					green = Math.floor(remainder / 6) / 5;
-					blue = (remainder % 6) / 5;
-				}
-
-				const value = Math.max(red, green, blue) * 2;
-
-				if (value === 0) {
-					return 30;
-				}
-
-				// eslint-disable-next-line no-bitwise
-				let result = 30 + ((Math.round(blue) << 2) | (Math.round(green) << 1) | Math.round(red));
-
-				if (value === 2) {
-					result += 60;
-				}
-
-				return result;
-			},
-			enumerable: false,
-		},
-		rgbToAnsi: {
-			value: (red, green, blue) => styles.ansi256ToAnsi(styles.rgbToAnsi256(red, green, blue)),
-			enumerable: false,
-		},
-		hexToAnsi: {
-			value: hex => styles.ansi256ToAnsi(styles.hexToAnsi256(hex)),
-			enumerable: false,
-		},
-	});
-
-	return styles;
-}
-
-const ansiStyles = assembleStyles();
-
-/* eslint-env browser */
-
-const isBlinkBasedBrowser = /\b(Chrome|Chromium)\//.test(navigator.userAgent);
-
-const colorSupport = isBlinkBasedBrowser ? {
-	level: 1,
-	hasBasic: true,
-	has256: false,
-	has16m: false,
-} : false;
-
-const supportsColor = {
-	stdout: colorSupport,
-	stderr: colorSupport,
-};
-
-// TODO: When targeting Node.js 16, use `String.prototype.replaceAll`.
-function stringReplaceAll(string, substring, replacer) {
-	let index = string.indexOf(substring);
-	if (index === -1) {
-		return string;
-	}
-
-	const substringLength = substring.length;
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		returnValue += string.substr(endIndex, index - endIndex) + substring + replacer;
-		endIndex = index + substringLength;
-		index = string.indexOf(substring, endIndex);
-	} while (index !== -1);
-
-	returnValue += string.slice(endIndex);
-	return returnValue;
-}
-
-function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index) {
-	let endIndex = 0;
-	let returnValue = '';
-	do {
-		const gotCR = string[index - 1] === '\r';
-		returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix;
-		endIndex = index + 1;
-		index = string.indexOf('\n', endIndex);
-	} while (index !== -1);
-
-	returnValue += string.slice(endIndex);
-	return returnValue;
-}
-
-const {stdout: stdoutColor, stderr: stderrColor} = supportsColor;
-
-const GENERATOR = Symbol('GENERATOR');
-const STYLER = Symbol('STYLER');
-const IS_EMPTY = Symbol('IS_EMPTY');
-
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = [
-	'ansi',
-	'ansi',
-	'ansi256',
-	'ansi16m',
-];
-
-const styles = Object.create(null);
-
-const applyOptions = (object, options = {}) => {
-	if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
-		throw new Error('The `level` option should be an integer from 0 to 3');
-	}
-
-	// Detect level if not set manually
-	const colorLevel = stdoutColor ? stdoutColor.level : 0;
-	object.level = options.level === undefined ? colorLevel : options.level;
-};
-
-const chalkFactory = options => {
-	const chalk = (...strings) => strings.join(' ');
-	applyOptions(chalk, options);
-
-	Object.setPrototypeOf(chalk, createChalk.prototype);
-
-	return chalk;
-};
-
-function createChalk(options) {
-	return chalkFactory(options);
-}
-
-Object.setPrototypeOf(createChalk.prototype, Function.prototype);
-
-for (const [styleName, style] of Object.entries(ansiStyles)) {
-	styles[styleName] = {
-		get() {
-			const builder = createBuilder(this, createStyler(style.open, style.close, this[STYLER]), this[IS_EMPTY]);
-			Object.defineProperty(this, styleName, {value: builder});
-			return builder;
-		},
-	};
-}
-
-styles.visible = {
-	get() {
-		const builder = createBuilder(this, this[STYLER], true);
-		Object.defineProperty(this, 'visible', {value: builder});
-		return builder;
-	},
-};
-
-const getModelAnsi = (model, level, type, ...arguments_) => {
-	if (model === 'rgb') {
-		if (level === 'ansi16m') {
-			return ansiStyles[type].ansi16m(...arguments_);
-		}
-
-		if (level === 'ansi256') {
-			return ansiStyles[type].ansi256(ansiStyles.rgbToAnsi256(...arguments_));
-		}
-
-		return ansiStyles[type].ansi(ansiStyles.rgbToAnsi(...arguments_));
-	}
-
-	if (model === 'hex') {
-		return getModelAnsi('rgb', level, type, ...ansiStyles.hexToRgb(...arguments_));
-	}
-
-	return ansiStyles[type][model](...arguments_);
-};
-
-const usedModels = ['rgb', 'hex', 'ansi256'];
-
-for (const model of usedModels) {
-	styles[model] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(getModelAnsi(model, levelMapping[level], 'color', ...arguments_), ansiStyles.color.close, this[STYLER]);
-				return createBuilder(this, styler, this[IS_EMPTY]);
-			};
-		},
-	};
-
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const {level} = this;
-			return function (...arguments_) {
-				const styler = createStyler(getModelAnsi(model, levelMapping[level], 'bgColor', ...arguments_), ansiStyles.bgColor.close, this[STYLER]);
-				return createBuilder(this, styler, this[IS_EMPTY]);
-			};
-		},
-	};
-}
-
-const proto = Object.defineProperties(() => {}, {
-	...styles,
-	level: {
-		enumerable: true,
-		get() {
-			return this[GENERATOR].level;
-		},
-		set(level) {
-			this[GENERATOR].level = level;
-		},
-	},
-});
-
-const createStyler = (open, close, parent) => {
-	let openAll;
-	let closeAll;
-	if (parent === undefined) {
-		openAll = open;
-		closeAll = close;
-	} else {
-		openAll = parent.openAll + open;
-		closeAll = close + parent.closeAll;
-	}
-
-	return {
-		open,
-		close,
-		openAll,
-		closeAll,
-		parent,
-	};
-};
-
-const createBuilder = (self, _styler, _isEmpty) => {
-	// Single argument is hot path, implicit coercion is faster than anything
-	// eslint-disable-next-line no-implicit-coercion
-	const builder = (...arguments_) => applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' '));
-
-	// We alter the prototype because we must return a function, but there is
-	// no way to create a function with a different prototype
-	Object.setPrototypeOf(builder, proto);
-
-	builder[GENERATOR] = self;
-	builder[STYLER] = _styler;
-	builder[IS_EMPTY] = _isEmpty;
-
-	return builder;
-};
-
-const applyStyle = (self, string) => {
-	if (self.level <= 0 || !string) {
-		return self[IS_EMPTY] ? '' : string;
-	}
-
-	let styler = self[STYLER];
-
-	if (styler === undefined) {
-		return string;
-	}
-
-	const {openAll, closeAll} = styler;
-	if (string.includes('\u001B')) {
-		while (styler !== undefined) {
-			// Replace any instances already present with a re-opening code
-			// otherwise only the part of the string until said closing code
-			// will be colored, and the rest will simply be 'plain'.
-			string = stringReplaceAll(string, styler.close, styler.open);
-
-			styler = styler.parent;
-		}
-	}
-
-	// We can move both next actions out of loop, because remaining actions in loop won't have
-	// any/visible effect on parts we add here. Close the styling before a linebreak and reopen
-	// after next line to fix a bleed issue on macOS: https://github.com/chalk/chalk/pull/92
-	const lfIndex = string.indexOf('\n');
-	if (lfIndex !== -1) {
-		string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
-	}
-
-	return openAll + string + closeAll;
-};
-
-Object.defineProperties(createChalk.prototype, styles);
-
-const chalk = createChalk();
-createChalk({level: stderrColor ? stderrColor.level : 0});
-
 const ServerInfo = {
   register: (server) => {
     const serverInfo = () => {
@@ -747,7 +301,7 @@ const handlerPage = async (req, h) => {
     return context;
   }
   context.utils = utils;
-  return h.view(`${configs.dirTemplates}${flow.view.template}`, context);
+  return h.view(`${configs.dirTemplates}${flow.view.layout || "default"}`, context);
 };
 
 const logger = consola.withScope("@monkeyplus/flow");
@@ -755,6 +309,10 @@ const defaults = {
   locales: ["es-ec"],
   defaultUbication: "ec",
   defaultLanguage: "es",
+  staticDir: "static",
+  hmr: {
+    dirs: ["views"]
+  },
   publicPath: "/",
   locale: "es-ec",
   relativeTo: "",
@@ -1126,6 +684,47 @@ const definePage = (pageOptions) => (levelOptions) => (configs) => {
   return routes;
 };
 
+const readPagesDir = (pathDir, folder) => {
+  const p = fs$1.readdirSync(pathDir);
+  return flatten(p.filter((f) => !f.includes(".js.map") && !f.includes(" copy.js.map") && !f.includes(" copy.js") && !f.includes(".model")).map((e) => {
+    if (e.includes(".js") || e.includes(".ts")) {
+      return {
+        path: path.join(pathDir, e),
+        prefix: folder
+      };
+    } else {
+      return readPagesDir(path.join(pathDir, e), e);
+    }
+  }));
+};
+const registerPages = async (server, dir) => {
+  const dirPages = path.resolve(dir || "./pages");
+  const listFiles = readPagesDir(dirPages);
+  const listPrePages = [];
+  for (const item of listFiles) {
+    try {
+      const module = require(item.path)?.default;
+      if (typeof module === "function") {
+        listPrePages.push(module());
+      } else if (typeof module === "object") {
+        if (Array.isArray(module)) {
+          module.forEach((el) => listPrePages.push(el()));
+        } else {
+          const _pages = await module.pages({ server });
+          if (Array.isArray(_pages))
+            _pages.forEach((page) => listPrePages.push(definePage(page)()));
+          else
+            listPrePages.push(definePage(_pages)());
+        }
+      }
+    } catch (details) {
+      logger$1.error(details);
+    }
+  }
+  for (const page of listPrePages)
+    await server.flow.addPage(page);
+};
+
 const RunMethods = {
   register: (server) => {
     const { flow: state } = server.app;
@@ -1139,7 +738,7 @@ const RunMethods = {
         server.route(route);
     };
     const addPage = (_page, extra) => {
-      const registerPages = (_pages2) => {
+      const registerPages2 = (_pages2) => {
         for (const _route of _pages2) {
           if (state.routes[_route.path])
             logger$1.warn("The route %s alredy exist", _route.path);
@@ -1150,13 +749,14 @@ const RunMethods = {
       let _pages;
       if (typeof _page === "function") {
         _pages = _page(config);
-        registerPages(_pages);
+        registerPages2(_pages);
       } else {
         _pages = definePage(_page)()(config);
-        registerPages(_pages);
+        registerPages2(_pages);
       }
     };
     const init = async () => {
+      await registerPages(server);
       const pages = server.app.flow.routes;
       for (const key in pages) {
         const page = pages[key];
@@ -1173,6 +773,136 @@ const RunMethods = {
   }
 };
 
+const createHmr = (options) => {
+  const state = {
+    dir: options.relativeTo || "",
+    dirs: options.dirs || [],
+    extensions: options.extensions || ["eta"]
+  };
+  let watcher;
+  const hooks = createHooks();
+  const watch = () => {
+    watcher = chokidar.watch(state.dirs.map((d) => path.join(d, `**/*.(${state.extensions.join("|")})`)), {
+      cwd: state.dir,
+      ignoreInitial: true,
+      ignored: "node_modules/**/*"
+    }).on("change", (path2) => {
+      logger$1.info("Changed file", path2);
+      hooks.callHook("page:refresh");
+    });
+  };
+  watch();
+  return { watcher, hooks };
+};
+
+const RegisterCommon = async (server, configs) => {
+  server.route({
+    method: "GET",
+    path: "/{param*}",
+    options: {
+      ext: {
+        onPreResponse: {
+          method: (req, h) => {
+            return h.continue;
+          }
+        }
+      }
+    },
+    handler: {
+      directory: {
+        path: configs.staticDir,
+        listing: true
+      }
+    }
+  });
+  if (!isGenerate) {
+    const hmr = createHmr({
+      dirs: configs.hmr.dirs,
+      relativeTo: configs.relativeTo
+    });
+    hmr.hooks.hook("page:refresh", () => {
+      setTimeout(() => {
+        logger$1.info("Refresh page");
+        server.publish("/_flow/hmr", { reload: true });
+      }, 40);
+    });
+    server.subscription("/_flow/hmr");
+    server.route({
+      path: "/_flow/hmr/client.js",
+      method: "get",
+      handler: {
+        file: {
+          path: join(__dirname, "../resources/client"),
+          confine: false
+        }
+      }
+    });
+    server.route({
+      path: "/_flow/hmr/connect.js",
+      method: "get",
+      handler: {
+        file: {
+          path: join(__dirname, "../resources/ws.js"),
+          confine: false
+        }
+      }
+    });
+    logger$1.debug("Enable development routes");
+    server.route({
+      path: "/_flow/sitemap",
+      method: "get",
+      handler: async () => {
+        const { pages: getPages } = server.methods.flow;
+        const urls = await getPages();
+        const pages = Object.values(urls).map((p) => dissoc("context", p));
+        return {
+          total: pages.length,
+          pages
+        };
+      }
+    });
+    server.route({
+      path: "/_flow/locales",
+      method: "get",
+      handler: async (req) => {
+        const { pages: getPages } = server.methods.flow;
+        const urls = await getPages();
+        const pages = Object.values(urls).map((p) => dissoc("context", p));
+        const locales = groupBy((page) => page.locale, pages);
+        return {
+          locales: req.server.plugins.flow.configs.locales,
+          all: mapObjIndexed((l) => {
+            return {
+              total: l.length,
+              pages: l
+            };
+          }, locales)
+        };
+      }
+    });
+    server.route({
+      path: "/_flow/configs",
+      method: "get",
+      handler: (req) => {
+        return req.server.plugins.flow.configs;
+      }
+    });
+  }
+  const HMR = {
+    head: ' <script src="/_flow/hmr/client.js"><\/script>',
+    body: ' <script src="/_flow/hmr/connect.js"><\/script>'
+  };
+  server.ext("onPreHandler", async (req, h) => {
+    if (req.route.settings.plugins?.generate === ".html") {
+      const { global } = req.plugins.flow;
+      Object.assign(global, {
+        hmr: isProduction || isGenerate ? { head: "", body: "" } : HMR
+      });
+    }
+    return h.continue;
+  });
+};
+
 const plugin = {
   pkg,
   dependencies,
@@ -1297,6 +1027,7 @@ const plugin = {
         return baseOptions;
       }
     };
+    await RegisterCommon(server, config);
   }
 };