@monkeyplus/flow 4.0.0-beta.7 → 4.0.0-beta.9

package/dist/index.cjs

@@ -10,6 +10,9 @@ const boom = require('@hapi/boom');
 const os = require('os');
 const chalk = require('chalk');
 const fs = require('fs-extra');
+const fs$1 = require('fs');
+const hookable = require('hookable');
+const chokidar = require('chokidar');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -31,9 +34,11 @@ const R__namespace = /*#__PURE__*/_interopNamespace(R);
 const os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 const chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
 const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
+const fs__default$1 = /*#__PURE__*/_interopDefaultLegacy(fs$1);
+const chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
 const name = "@monkeyplus/flow";
-const version = "4.0.0-beta.7";
+const version = "4.0.0-beta.9";
 const description = "Utils hapi";
 const author = "Andres Navarrete";
 const license = "MIT";
@@ -66,12 +71,16 @@ const dependencies$1 = {
 	"@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 = {
 	"@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 = {
@@ -98,8 +107,13 @@ const pkg = {
 
 const logger$1 = consola__default.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) => {
@@ -313,7 +327,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__default.withScope("@monkeyplus/flow");
@@ -321,6 +335,10 @@ const defaults = {
   locales: ["es-ec"],
   defaultUbication: "ec",
   defaultLanguage: "es",
+  staticDir: "static",
+  hmr: {
+    dirs: ["views"]
+  },
   publicPath: "/",
   locale: "es-ec",
   relativeTo: "",
@@ -692,6 +710,47 @@ const definePage = (pageOptions) => (levelOptions) => (configs) => {
   return routes;
 };
 
+const readPagesDir = (pathDir, folder) => {
+  const p = fs__default$1.readdirSync(pathDir);
+  return R.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__default.join(pathDir, e),
+        prefix: folder
+      };
+    } else {
+      return readPagesDir(path__default.join(pathDir, e), e);
+    }
+  }));
+};
+const registerPages = async (server, dir) => {
+  const dirPages = path__default.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;
@@ -705,7 +764,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);
@@ -716,13 +775,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];
@@ -739,6 +799,136 @@ const RunMethods = {
   }
 };
 
+const createHmr = (options) => {
+  const state = {
+    dir: options.relativeTo || "",
+    dirs: options.dirs || [],
+    extensions: options.extensions || ["eta"]
+  };
+  let watcher;
+  const hooks = hookable.createHooks();
+  const watch = () => {
+    watcher = chokidar__default.watch(state.dirs.map((d) => path__default.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: path.join(__dirname, "../resources/client"),
+          confine: false
+        }
+      }
+    });
+    server.route({
+      path: "/_flow/hmr/connect.js",
+      method: "get",
+      handler: {
+        file: {
+          path: 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) => R.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) => R.dissoc("context", p));
+        const locales = R.groupBy((page) => page.locale, pages);
+        return {
+          locales: req.server.plugins.flow.configs.locales,
+          all: R.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,
@@ -863,6 +1053,7 @@ const plugin = {
         return baseOptions;
       }
     };
+    await RegisterCommon(server, config);
   }
 };
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from '@hapi/hapi';
+import { Server, Plugin } from '@hapi/hapi';
 import { PageInfo } from '../types/core';
 import { OptionsHapiPage, RunPreDefinePage, Flow, FlowExtensions, OptionDynamicLocalePages, GenerateOptions, FlowServerMethods, FlowOptions } from '../types';
 export { ContextHandler, Contexts, Extension, Flow, FlowContextPage, FlowContextSeo, FlowContextView, FlowEngines, FlowExtensions, FlowOptionPlugins, FlowOptions, FlowPluginExtension, FlowPluginGlobal, FlowPluginLocal, FlowPluginUtils, FlowServerMethods, FlowStatePlugins, GenerateFolder, OptionDynamicLocalePages, OptionsDynamicPages, OptionsHapiPage, RunDefinePage, RunPreDefinePage } from '../types';
@@ -6,7 +6,14 @@ export { ContextHandler, Contexts, Extension, Flow, FlowContextPage, FlowContext
 declare type DefinePage = (page: OptionsHapiPage) => RunPreDefinePage;
 declare const definePage: DefinePage;
 
+declare type HapiPages = OptionsHapiPage | OptionsHapiPage[];
+interface Context {
+    server: Server;
+}
+declare type Pages = (ctx: Context) => Promise<HapiPages>;
+
 declare const plugin: Plugin<FlowOptions>;
+
 declare module '@hapi/hapi' {
     interface ServerApplicationState {
         flow: Flow.AppState;
@@ -54,4 +61,4 @@ declare module '@hapi/hapi' {
     }
 }
 
-export { definePage, plugin };
+export { Pages, definePage, plugin };

package/dist/index.mjs

@@ -1,14 +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.7";
+const version = "4.0.0-beta.9";
 const description = "Utils hapi";
 const author = "Andres Navarrete";
 const license = "MIT";
@@ -41,12 +45,16 @@ const dependencies$1 = {
 	"@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 = {
 	"@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 = {
@@ -73,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) => {
@@ -288,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");
@@ -296,6 +309,10 @@ const defaults = {
   locales: ["es-ec"],
   defaultUbication: "ec",
   defaultLanguage: "es",
+  staticDir: "static",
+  hmr: {
+    dirs: ["views"]
+  },
   publicPath: "/",
   locale: "es-ec",
   relativeTo: "",
@@ -667,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;
@@ -680,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);
@@ -691,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];
@@ -714,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,
@@ -838,6 +1027,7 @@ const plugin = {
         return baseOptions;
       }
     };
+    await RegisterCommon(server, config);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "description": "Utils hapi",
   "author": "Andres Navarrete",
   "license": "MIT",
@@ -22,12 +22,16 @@
     "@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"
   },
   "devDependencies": {
     "@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"
   },
   "peerDependencies": {

package/types/flow.d.ts

@@ -33,6 +33,10 @@ export interface FlowOptions {
   routeOptions?: RouteOptions
   dirTemplates?: string
   plugins: FlowOptionPlugins
+  staticDir: string
+  hmr: {
+    dirs: string[]
+  }
   engines?: ('eta' | 'nunjucks')[]
 }
 
@@ -118,6 +122,7 @@ export namespace Flow {
   }
   export interface Configs extends FlowOptions {
     relativeTo: string
+
     locales: string[]
     defaultUbication: string
     defaultLanguage: string