@monkeyplus/flow 3.0.6 → 3.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.d.ts +11 -5
- package/dist/config.js +16 -7
- package/dist/config.js.map +1 -1
- package/dist/helper.js +19 -0
- package/dist/helper.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +35 -9
- package/dist/index.js.map +1 -1
- package/package.json +3 -2
- package/types/flow.d.ts +10 -2
- package/types/index.d.ts +2 -1
package/dist/config.d.ts
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
declare const pkg: any;
|
|
2
|
+
export declare const logger: import("consola").Consola;
|
|
3
|
+
export declare const dependencies: {
|
|
4
|
+
'@hapi/vision': string;
|
|
5
|
+
};
|
|
6
|
+
export { pkg };
|
|
1
7
|
/**
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
8
|
+
export const FULL_NAME_PLUGIN = `@monkeyplus/flow`;
|
|
9
|
+
|
|
10
|
+
export const DEPENDENCIES = {
|
|
11
|
+
// '@hapi/vision': '6.x.x',
|
|
12
|
+
};
|
|
7
13
|
/**
|
|
8
14
|
*
|
|
9
15
|
*/
|
package/dist/config.js
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
6
|
+
exports.pkg = exports.dependencies = exports.logger = void 0;
|
|
7
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
8
|
+
const pkg = require("../package.json");
|
|
9
|
+
exports.pkg = pkg;
|
|
10
|
+
const consola_1 = __importDefault(require("consola"));
|
|
11
|
+
exports.logger = consola_1.default.withScope(pkg.name);
|
|
12
|
+
exports.dependencies = {
|
|
13
|
+
'@hapi/vision': '6.x.x'
|
|
14
|
+
};
|
|
4
15
|
/**
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
exports.DEPENDENCIES = {
|
|
10
|
-
// '@hapi/vision': '6.x.x',
|
|
16
|
+
export const FULL_NAME_PLUGIN = `@monkeyplus/flow`;
|
|
17
|
+
|
|
18
|
+
export const DEPENDENCIES = {
|
|
19
|
+
// '@hapi/vision': '6.x.x',
|
|
11
20
|
};
|
|
12
21
|
/**
|
|
13
22
|
*
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA8D;AAC9D,MAAM,GAAG,GAAG,OAAO,mBAAmB,CAAC;AAO9B,kBAAG;AANZ,sDAA8B;AACjB,QAAA,MAAM,GAAG,iBAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAErC,QAAA,YAAY,GAAG;IAC1B,cAAc,EAAE,OAAO;CACxB,CAAC;AAGF;;;;;;;;GAQG"}
|
package/dist/helper.js
CHANGED
|
@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
22
22
|
exports.handlerPage = void 0;
|
|
23
23
|
const R = __importStar(require("ramda"));
|
|
24
24
|
const handlerPage = async (req, h) => {
|
|
25
|
+
var _a;
|
|
25
26
|
const { configs } = req.server.plugins.flow;
|
|
26
27
|
const { flow } = req.route.settings.app;
|
|
27
28
|
// console.log(req.server.app.flow.urls);
|
|
@@ -57,6 +58,24 @@ const handlerPage = async (req, h) => {
|
|
|
57
58
|
pageUrl: `${configs.url}${page.path}`
|
|
58
59
|
// utils
|
|
59
60
|
};
|
|
61
|
+
const handler = req.plugins.flow.handler;
|
|
62
|
+
for (const key in handler) {
|
|
63
|
+
if ((_a = handler[key]) === null || _a === void 0 ? void 0 : _a.method) {
|
|
64
|
+
//
|
|
65
|
+
const location = handler[key].context;
|
|
66
|
+
const data = await handler[key].method(contextMethod);
|
|
67
|
+
const _context = { [key]: data };
|
|
68
|
+
if (location === 'global') {
|
|
69
|
+
Object.assign(global, _context);
|
|
70
|
+
}
|
|
71
|
+
else if (location === 'local') {
|
|
72
|
+
Object.assign(local, _context);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
Object.assign(seo, _context);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
60
79
|
if (flow.runSharedContext) {
|
|
61
80
|
const _context = await flow.runSharedContext(contextMethod);
|
|
62
81
|
Object.assign(local, _context);
|
package/dist/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA2B;AAEpB,MAAM,WAAW,GAAqB,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { PageInfo } from '@monkeyplus/flow-core';
|
|
|
3
3
|
import { Flow, FlowOptions, GenerateOptions, FlowExtensions } from "../types/index";
|
|
4
4
|
import { definePage } from "./pages";
|
|
5
5
|
export { definePage };
|
|
6
|
-
export { RunDefinePage, OptionsHapiPage, RunPreDefinePage, FlowOptions, FlowOptionPlugins, GenerateFolder, Extension, Flow, FlowExtensions, FlowPluginExtension, FlowPluginUtils, FlowPluginGlobal, FlowPluginLocal, Contexts, FlowContextPage, FlowContextSeo, FlowContextView } from "../types/index";
|
|
6
|
+
export { RunDefinePage, OptionsHapiPage, RunPreDefinePage, FlowOptions, FlowOptionPlugins, GenerateFolder, Extension, Flow, FlowExtensions, FlowPluginExtension, FlowPluginUtils, FlowPluginGlobal, FlowPluginLocal, Contexts, FlowContextPage, FlowContextSeo, FlowContextView, ContextHandler } from "../types/index";
|
|
7
7
|
export declare const plugin: Plugin<FlowOptions>;
|
|
8
8
|
declare module '@hapi/hapi' {
|
|
9
9
|
interface ServerApplicationState {
|
package/dist/index.js
CHANGED
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.plugin = exports.definePage = void 0;
|
|
7
7
|
const config_1 = require("./config");
|
|
8
8
|
const flow_core_1 = require("@monkeyplus/flow-core");
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
9
11
|
// import { PageInfo } from '@monkeyplus/flow-core';
|
|
10
12
|
const utils_1 = require("./utils/index");
|
|
11
13
|
const helper_1 = require("./helper");
|
|
@@ -16,9 +18,8 @@ Object.defineProperty(exports, "definePage", { enumerable: true, get: function (
|
|
|
16
18
|
// const logger = require('consola').withScope('@monkeyplus/flow');
|
|
17
19
|
const isProduction = process.env.NODE_ENV === 'production';
|
|
18
20
|
exports.plugin = {
|
|
19
|
-
pkg:
|
|
20
|
-
|
|
21
|
-
dependencies: config_1.DEPENDENCIES,
|
|
21
|
+
pkg: config_1.pkg,
|
|
22
|
+
dependencies: config_1.dependencies,
|
|
22
23
|
register: async (server, _options) => {
|
|
23
24
|
const config = utils_1.getConfigs(server, _options);
|
|
24
25
|
// console.log(config);
|
|
@@ -56,7 +57,7 @@ exports.plugin = {
|
|
|
56
57
|
return void 0;
|
|
57
58
|
}
|
|
58
59
|
if (state.urls[key]) {
|
|
59
|
-
|
|
60
|
+
config_1.logger.warn('The namePage %s already exist', state.urls[key]);
|
|
60
61
|
}
|
|
61
62
|
else {
|
|
62
63
|
state.urls[key] = url;
|
|
@@ -73,6 +74,7 @@ exports.plugin = {
|
|
|
73
74
|
req.plugins.flow = {
|
|
74
75
|
global: {},
|
|
75
76
|
local: {},
|
|
77
|
+
handler: {},
|
|
76
78
|
//@ts-ignore
|
|
77
79
|
utils: {},
|
|
78
80
|
//@ts-ignore
|
|
@@ -99,12 +101,12 @@ exports.plugin = {
|
|
|
99
101
|
return page.url;
|
|
100
102
|
}
|
|
101
103
|
else {
|
|
102
|
-
|
|
104
|
+
config_1.logger.warn('Not found link with name: %s', pageName);
|
|
103
105
|
return '/404';
|
|
104
106
|
}
|
|
105
107
|
}
|
|
106
108
|
catch (error) {
|
|
107
|
-
|
|
109
|
+
config_1.logger.error(error);
|
|
108
110
|
return '/';
|
|
109
111
|
}
|
|
110
112
|
});
|
|
@@ -184,7 +186,7 @@ exports.plugin = {
|
|
|
184
186
|
//
|
|
185
187
|
for (const _route of _pages) {
|
|
186
188
|
if (state.pages[_route.path]) {
|
|
187
|
-
|
|
189
|
+
config_1.logger.warn('The route %s alredy exist', _route.path);
|
|
188
190
|
}
|
|
189
191
|
else {
|
|
190
192
|
state.pages[_route.path] = _route;
|
|
@@ -195,7 +197,7 @@ exports.plugin = {
|
|
|
195
197
|
const _routes = server.table();
|
|
196
198
|
const _route = _routes.find((v) => v.path === route.path);
|
|
197
199
|
if (_route) {
|
|
198
|
-
|
|
200
|
+
config_1.logger.warn(`Duplicate route, the route ${route.path} already exists`);
|
|
199
201
|
}
|
|
200
202
|
else {
|
|
201
203
|
server.route(route);
|
|
@@ -270,7 +272,7 @@ exports.plugin = {
|
|
|
270
272
|
await ext.initMethod({ helpers });
|
|
271
273
|
}
|
|
272
274
|
}
|
|
273
|
-
|
|
275
|
+
config_1.logger.info(`Register %s pages`, `${Object.values(state.urls).length}`);
|
|
274
276
|
};
|
|
275
277
|
const getPath = (...paths) => path_1.default.join(config.relativeTo, ...paths);
|
|
276
278
|
const { runGenerate } = generate_1.registerGenerate(server, {
|
|
@@ -278,7 +280,31 @@ exports.plugin = {
|
|
|
278
280
|
getPath
|
|
279
281
|
});
|
|
280
282
|
// server.$content.
|
|
283
|
+
const serverInfo = () => {
|
|
284
|
+
//
|
|
285
|
+
const interfaces = os_1.default.networkInterfaces();
|
|
286
|
+
const hostname = 'localhost';
|
|
287
|
+
const protocol = 'http';
|
|
288
|
+
console.log('');
|
|
289
|
+
config_1.logger.success(chalk_1.default.green(`Flow v${config_1.pkg.version} dev server running at:`));
|
|
290
|
+
console.log('');
|
|
291
|
+
Object.keys(interfaces).forEach((key) => (interfaces[key] || [])
|
|
292
|
+
.filter((details) => details.family === 'IPv4')
|
|
293
|
+
.map((detail) => {
|
|
294
|
+
return {
|
|
295
|
+
type: detail.address.includes('127.0.0.1')
|
|
296
|
+
? 'Local: '
|
|
297
|
+
: 'Network: ',
|
|
298
|
+
host: detail.address.replace('127.0.0.1', hostname)
|
|
299
|
+
};
|
|
300
|
+
})
|
|
301
|
+
.forEach(({ type, host }) => {
|
|
302
|
+
const url = `${protocol}://${host}:${chalk_1.default.bold(server.info.port)}`;
|
|
303
|
+
console.log(` > ${type} ${chalk_1.default.cyan(url)}`);
|
|
304
|
+
}));
|
|
305
|
+
};
|
|
281
306
|
const flow = {
|
|
307
|
+
serverInfo,
|
|
282
308
|
init,
|
|
283
309
|
addPage,
|
|
284
310
|
getPath,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@monkeyplus/flow",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.8",
|
|
4
4
|
"description": "Utils hapi",
|
|
5
5
|
"author": "Andres Navarrete",
|
|
6
6
|
"license": "MIT",
|
|
@@ -22,9 +22,10 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@monkeyplus/flow-core": "^3.0.4",
|
|
25
|
+
"chalk": "^4.1.0",
|
|
25
26
|
"consola": "^2.15.2",
|
|
26
27
|
"fs-extra": "^9.1.0",
|
|
27
28
|
"ramda": "^0.27.1"
|
|
28
29
|
},
|
|
29
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "0de1d79be2805bfeba093758f94535018013cbe5"
|
|
30
31
|
}
|
package/types/flow.d.ts
CHANGED
|
@@ -75,6 +75,13 @@ export namespace Flow {
|
|
|
75
75
|
global: FlowPluginGlobal;
|
|
76
76
|
utils: FlowPluginUtils;
|
|
77
77
|
extensions: FlowPluginExtension;
|
|
78
|
+
handler: Record<
|
|
79
|
+
string,
|
|
80
|
+
{
|
|
81
|
+
context: 'global' | 'local' | 'seo';
|
|
82
|
+
method: any;
|
|
83
|
+
}
|
|
84
|
+
>;
|
|
78
85
|
}
|
|
79
86
|
export interface Helpers {
|
|
80
87
|
addRedirect: (key: string, urlPath: string) => void;
|
|
@@ -107,6 +114,7 @@ export namespace Flow {
|
|
|
107
114
|
}
|
|
108
115
|
|
|
109
116
|
export interface Decorate {
|
|
117
|
+
serverInfo: () => void;
|
|
110
118
|
init: (proxy?: boolean) => Promise<void>;
|
|
111
119
|
addPage: (page: RunDefinePage | OptionsHapiPage) => Promise<void>;
|
|
112
120
|
getPath: (...path: string[]) => string;
|
|
@@ -132,7 +140,7 @@ export interface OptionsHapiLocalPage extends OptionsLocalPage {
|
|
|
132
140
|
context?: RunContextHapi;
|
|
133
141
|
vhost?: string | string[];
|
|
134
142
|
}
|
|
135
|
-
interface
|
|
143
|
+
export interface ContextHandler {
|
|
136
144
|
req: Request;
|
|
137
145
|
h: ResponseToolkit;
|
|
138
146
|
page: {
|
|
@@ -152,7 +160,7 @@ interface Context {
|
|
|
152
160
|
utils: FlowPluginUtils;
|
|
153
161
|
}
|
|
154
162
|
|
|
155
|
-
export type RunContextHapi = (ctx:
|
|
163
|
+
export type RunContextHapi = (ctx: ContextHandler) => Promise<any>;
|
|
156
164
|
|
|
157
165
|
export interface OptionsHapiPage extends OptionsPage {
|
|
158
166
|
options?: RouteOptions;
|