@monkeyplus/flow 3.2.6 → 3.3.0-alpha.1

package/dist/runMethods.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const pages_1 = require("./pages");
+const config_1 = require("./config");
+exports.default = {
+    register: (server) => {
+        const { flow: state } = server.app;
+        const { configs: config } = server.plugins.flow;
+        const registerRoute = (route) => {
+            const _routes = server.table();
+            const _route = _routes.find((v) => v.path === route.path);
+            if (_route) {
+                config_1.logger.warn(`Duplicate route, the route ${route.path} already exists`);
+            }
+            else {
+                server.route(route);
+            }
+        };
+        const addPage = (_page, dynamic) => {
+            const registerPages = (_pages) => {
+                for (const _route of _pages) {
+                    if (state.routes[_route.path]) {
+                        config_1.logger.warn('The route %s alredy exist', _route.path);
+                    }
+                    else {
+                        state.routes[_route.path] = _route;
+                    }
+                }
+            };
+            let _pages;
+            if (typeof _page === 'function') {
+                _pages = _page(config);
+                // console.log(_pages);
+                registerPages(_pages);
+            }
+            else {
+                // console.log('Otra', _page);
+                _pages = pages_1.definePage(_page, dynamic)()(config);
+                // console.log(_pages);
+                registerPages(_pages);
+            }
+        };
+        const init = async () => {
+            const pages = server.app.flow.routes;
+            for (const key in pages) {
+                const page = pages[key];
+                registerRoute(page);
+            }
+            for (const key in state.extensions) {
+                const ext = state.extensions[key];
+                if (ext.initMethod) {
+                    await ext.initMethod();
+                }
+            }
+            config_1.logger.debug(`Register %s pages`, `${Object.values(pages).length}`);
+        };
+        return { init, addPage };
+    }
+};
+//# sourceMappingURL=runMethods.js.map

package/dist/runMethods.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runMethods.js","sourceRoot":"","sources":["../src/runMethods.ts"],"names":[],"mappings":";;AACA,mCAAqC;AAOrC,qCAAkC;AAElC,kBAAe;IACb,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;QAC3B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC;QACnC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAEhD,MAAM,aAAa,GAAG,CAAC,KAAkB,EAAE,EAAE;YAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,MAAM,EAAE;gBACV,eAAM,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;aACxE;iBAAM;gBACL,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACrB;QACH,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,CACd,KAAsC,EACtC,OAA6B,EAC7B,EAAE;YACF,MAAM,aAAa,GAAG,CAAC,MAAqB,EAAE,EAAE;gBAC9C,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE;oBAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBAC7B,eAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;qBACvD;yBAAM;wBACL,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;qBACpC;iBACF;YACH,CAAC,CAAC;YACF,IAAI,MAAM,CAAC;YACX,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBAC/B,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;gBACvB,uBAAuB;gBAEvB,aAAa,CAAC,MAAM,CAAC,CAAC;aACvB;iBAAM;gBACL,8BAA8B;gBAE9B,MAAM,GAAG,kBAAU,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;gBAC9C,uBAAuB;gBAEvB,aAAa,CAAC,MAAM,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;QAEF,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBACxB,aAAa,CAAC,IAAI,CAAC,CAAC;aACrB;YACD,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE;gBAClC,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAClC,IAAI,GAAG,CAAC,UAAU,EAAE;oBAClB,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;iBACxB;aACF;YACD,eAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC"}

package/dist/serverInfo.d.ts

@@ -0,0 +1,7 @@
+import { Server } from '@hapi/hapi';
+declare const _default: {
+    register: (server: Server) => {
+        serverInfo: () => void;
+    };
+};
+export default _default;

package/dist/serverInfo.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = __importDefault(require("os"));
+const config_1 = require("./config");
+const chalk_1 = __importDefault(require("chalk"));
+exports.default = {
+    register: (server) => {
+        const serverInfo = () => {
+            const interfaces = os_1.default.networkInterfaces();
+            const hostname = 'localhost';
+            const protocol = 'http';
+            console.log('');
+            config_1.logger.success(chalk_1.default.green(`Flow v${config_1.pkg.version} dev server running at:`));
+            console.log('');
+            Object.keys(interfaces).forEach((key) => (interfaces[key] || [])
+                .filter((details) => details.family === 'IPv4')
+                .map((detail) => {
+                return {
+                    type: detail.address.includes('127.0.0.1')
+                        ? 'Local:   '
+                        : 'Network: ',
+                    host: detail.address.replace('127.0.0.1', hostname)
+                };
+            })
+                .forEach(({ type, host }) => {
+                const url = `${protocol}://${host}:${chalk_1.default.bold(server.info.port)}`;
+                console.log(`  > ${type} ${chalk_1.default.cyan(url)}`);
+            }));
+        };
+        return { serverInfo };
+    }
+};
+//# sourceMappingURL=serverInfo.js.map

package/dist/serverInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverInfo.js","sourceRoot":"","sources":["../src/serverInfo.ts"],"names":[],"mappings":";;;;;AACA,4CAAoB;AACpB,qCAAqD;AACrD,kDAA0B;AAE1B,kBAAe;IACb,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;QAC3B,MAAM,UAAU,GAAG,GAAG,EAAE;YACtB,MAAM,UAAU,GAAG,YAAE,CAAC,iBAAiB,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,WAAW,CAAC;YAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,eAAM,CAAC,OAAO,CACZ,eAAK,CAAC,KAAK,CAAC,SAAS,YAAG,CAAC,OAAO,yBAAyB,CAAC,CAC3D,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAEhB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CACtC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;iBACpB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC;iBAC9C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBACd,OAAO;oBACL,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;wBACxC,CAAC,CAAC,WAAW;wBACb,CAAC,CAAC,WAAW;oBACf,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC;iBACpD,CAAC;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBAC1B,MAAM,GAAG,GAAG,GAAG,QAAQ,MAAM,IAAI,IAAI,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,CAAC,CAAC,CACL,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO,EAAE,UAAU,EAAE,CAAC;IACxB,CAAC;CACF,CAAC"}

package/dist/utils/index.d.ts

@@ -2,3 +2,4 @@ import { Server } from '@hapi/hapi';
 import { Flow, FlowOptions } from "../../types";
 export declare const logger: import("consola").Consola;
 export declare function getConfigs(server: Server, options: FlowOptions): Flow.Configs;
+export declare const isDinamyc: (url: string) => boolean;

package/dist/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigs = exports.logger = void 0;
+exports.isDinamyc = exports.getConfigs = exports.logger = void 0;
 const path_1 = __importDefault(require("path"));
 const consola_1 = __importDefault(require("consola"));
 exports.logger = consola_1.default.withScope('@monkeyplus/flow');
@@ -45,4 +45,6 @@ function getConfigs(server, options) {
     }
 }
 exports.getConfigs = getConfigs;
+const isDinamyc = (url) => /\{url?(.+)\}/.test(url);
+exports.isDinamyc = isDinamyc;
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,sDAA8B;AACjB,QAAA,MAAM,GAAG,iBAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC5D,qCAA6C;AAC7C,MAAM,QAAQ,GAAiB;IAC7B,OAAO,EAAE,CAAC,OAAO,CAAC;IAClB,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,UAAU,EAAE,GAAG;IACf,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,OAAO;IAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAW,IAAI,OAAO,CAAC,GAAG,CAAC,GAAI;IAChD,OAAO,EAAE,CAAC,KAAK,CAAC;CACjB,CAAC;AACF,SAAgB,UAAU,CAAC,MAAc,EAAE,OAAoB;IAC7D,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,CAAC,MAAW,EAAO,EAAE;QACrC,MAAM,MAAM,GAAG,sBAAe,CAAC,QAAQ,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QACpE,OAAO;YACL,GAAG,MAAM;YACT,UAAU;YACV,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,gBAAgB,EAAE;SAC/D,CAAC;IACJ,CAAC,CAAC;IACF,IAAI;QACF,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAEhE,cAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,8DAA8D;QAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,gCAAgC;QAChC,cAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;KACtB;AACH,CAAC;AAvBD,gCAuBC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,sDAA8B;AACjB,QAAA,MAAM,GAAG,iBAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC5D,qCAA6C;AAE7C,MAAM,QAAQ,GAAiB;IAC7B,OAAO,EAAE,CAAC,OAAO,CAAC;IAClB,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,IAAI;IACrB,UAAU,EAAE,GAAG;IACf,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,EAAE;IACd,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,OAAO;IAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAW,IAAI,OAAO,CAAC,GAAG,CAAC,GAAI;IAChD,OAAO,EAAE,CAAC,KAAK,CAAC;CACjB,CAAC;AAEF,SAAgB,UAAU,CAAC,MAAc,EAAE,OAAoB;IAC7D,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,CAAC,MAAW,EAAO,EAAE;QACrC,MAAM,MAAM,GAAG,sBAAe,CAAC,QAAQ,EAAE,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QACpE,OAAO;YACL,GAAG,MAAM;YACT,UAAU;YACV,MAAM,EAAE,GAAG,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,gBAAgB,EAAE;SAC/D,CAAC;IACJ,CAAC,CAAC;IACF,IAAI;QACF,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAEhE,cAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,8DAA8D;QAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,gCAAgC;QAChC,cAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC,EAAE,CAAC,CAAC;KACtB;AACH,CAAC;AAvBD,gCAuBC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAAtD,QAAA,SAAS,aAA6C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "3.2.6",
+  "version": "3.3.0-alpha.1",
   "description": "Utils hapi",
   "author": "Andres Navarrete",
   "license": "MIT",
@@ -21,11 +21,11 @@
     "@types/ramda": "^0.27.44"
   },
   "dependencies": {
-    "@monkeyplus/flow-core": "^3.2.4",
+    "@monkeyplus/flow-core": "^3.3.0-alpha.1",
     "chalk": "^4.1.2",
     "consola": "^2.15.3",
     "fs-extra": "^10.0.0",
     "ramda": "^0.27.1"
   },
-  "gitHead": "b6420b181a78c8eb900379e2f02fd641ae6ffcc4"
+  "gitHead": "86d011e4af5036812bfc4389550cc0672d57dd03"
 }

package/types/flow.d.ts

@@ -50,10 +50,8 @@ export namespace Extension {
     context: RouteContext,
     options: T
   ) => void;
-  export interface InitContext {
-    helpers: Flow.Helpers;
-  }
-  export type InitMethod = (context: InitContext) => Promise<void>;
+
+  export type InitMethod = () => Promise<void>;
   export interface Extension {
     state: any;
     initMethod?: InitMethod;
@@ -61,18 +59,26 @@ export namespace Extension {
   }
 }
 export namespace Flow {
-  interface Url {
+  interface Page {
     url: string;
     locale: string;
     localeName: string;
     name: string;
+    context?: any;
+    dynamicSlug?: string;
   }
-  export type Urls = Record<string, Url>;
-  export type Pages = Record<string, ServerRoute>;
+  export type StaticPages = Record<string, Page>;
+  export type Routes = Record<string, ServerRoute>;
   export type Redirects = Record<string, string>;
   export type Truncates = Record<string, string>;
   export type DynamicContent = Record<string, { path: string; page: PageInfo }>;
-  export type DynamicPages = Record<string, string[]>;
+  export type DynamicPages = Record<string, () => Promise<StaticPages>>;
+  export type Pages = {
+    statics: StaticPages;
+    redirects: Redirects;
+    dynamics: DynamicPages;
+    all: StaticPages;
+  };
 
   export interface PluginState {
     local: FlowPluginLocal;
@@ -92,15 +98,17 @@ export namespace Flow {
     addUrl: (key: string, url: Url) => undefined;
   }
   export interface AppState {
-    prePackage: Record<string, () => Promise<unknown>>;
-    redirects: Redirects;
-    urls: Urls;
+    routes: Routes;
+    // redirects: Redirects;
+    // urls: Urls;
     pages: Pages;
     truncates: Truncates;
     extensions: Record<string, Extension.Extension>;
-    dynamicPages: DynamicPages;
+    // dynamicPages: DynamicPages;
     generate: {
       folders: Record<string, GenerateFolder>;
+      beforePackage: Record<string, () => Promise<unknown>>;
+      postGenerate: Record<string, () => Promise<any>>;
     };
     engines: FlowEngines;
     plugins: FlowStatePlugins;
@@ -119,14 +127,21 @@ export namespace Flow {
   export interface GenerateOptions {
     assets?: GenerateFolder[];
     ommitAssets?: string[];
+    /**
+     * Solo aplicable para compilaciones
+     */
+    virtualGenerate?: boolean;
   }
 
   export interface Decorate {
-    runPrePackage: () => Promise<unknown>;
+    prepagePackage: () => Promise<unknown>;
     serverInfo: () => void;
     init: (proxy?: boolean) => Promise<void>;
-    addPage: (page: RunDefinePage | OptionsHapiPage) => Promise<void>;
-    getPath: (...path: string[]) => string;
+    addPage: (
+      page: RunDefinePage | OptionsHapiPage,
+      dynamic?: OptionsDynamicPages
+    ) => Promise<void>;
+    // getPath: (...path: string[]) => string;
     runGenerate: (options?: GenerateOptions) => Promise<void>;
   }
   export interface HandlerOptions {
@@ -161,6 +176,7 @@ export interface ContextHandler {
     bundle: Bundle;
     publicPath: string;
     path: string;
+    dynamicSlug: string;
   };
   seo: Record<string, any>;
   /**
@@ -176,11 +192,20 @@ export type RunContextHapi = (ctx: ContextHandler) => Promise<any>;
 export interface OptionsHapiPage extends OptionsPage {
   options?: RouteOptions;
   context?: RunContextHapi;
+
   locales: Record<string, OptionsHapiLocalPage>;
   rules?: Record<string, unknown>;
   vhost?: string | string[];
   extensions?: FlowExtensions;
 }
+export interface OptionsDynamicPages {
+  prefix?: (route: RequestRoute) => string | Promise<string>;
+  assign?: string;
+  pages: (ctx: {
+    server: Server;
+    route: RequestRoute;
+  }) => Promise<Flow.StaticPages>;
+}
 // import {} from '..'
 export type RunDefinePage = (configs: Flow.Configs) => ServerRoute[];
 export type RunPreDefinePage = (level?: LevelOptions) => RunDefinePage;

package/types/index.d.ts

@@ -9,7 +9,8 @@ export {
   OptionsHapiPage,
   GenerateFolder,
   Extension,
-  ContextHandler
+  ContextHandler,
+  OptionsDynamicPages
 } from './flow';
 export {
   FlowExtensions,
@@ -22,7 +23,8 @@ export {
   FlowContextSeo,
   FlowContextPage,
   FlowEngines,
-  FlowStatePlugins
+  FlowStatePlugins,
+  FlowServerMethods
 } from './interfaces';
 export type GenerateOptions =
   | boolean

package/types/interfaces.d.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-interface */
 import { Request, ResponseToolkit } from '@hapi/hapi';
+import { Flow } from './flow';
 export interface FlowExtensions {}
 export interface FlowPluginExtension {}
 export interface FlowPluginUtils {}
@@ -54,3 +55,7 @@ export namespace Contexts {
 
 export interface FlowEngines {}
 export interface FlowStatePlugins {}
+export interface FlowServerMethods {
+  pages: () => Promise<Flow.StaticPages>;
+  getUrl: (locale: string, name: string) => string;
+}