@monkeyplus/flow 1.1.2 → 1.1.6
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/index.d.ts +6 -1
- package/dist/index.js +69 -44
- package/dist/index.js.map +1 -1
- package/dist/lib/pages/index.js +13 -12
- package/dist/lib/pages/index.js.map +1 -1
- package/package.json +3 -2
- package/types/index.d.ts +10 -10
package/dist/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export { PluginOptions } from "./config";
|
|
|
5
5
|
import { PageInfo } from '@monkeyplus/flow-core';
|
|
6
6
|
export { definePage, defineSharedContext } from "./lib/index";
|
|
7
7
|
export { defineImages, PageInfo } from '@monkeyplus/flow-core';
|
|
8
|
-
export { AppObject, DefinePage, ResultPage, RunDefinePage, Flow, PreRunDefinePage, UrlPromise, RunContextHapi, CtxHapiBuildLocal, FlowConfigs
|
|
8
|
+
export { AppObject, DefinePage, ResultPage, RunDefinePage, Flow, PreRunDefinePage, UrlPromise, RunContextHapi, CtxHapiBuildLocal, FlowConfigs } from "../types/index";
|
|
9
9
|
export declare const plugin: Plugin<PluginOptions>;
|
|
10
10
|
declare module '@hapi/hapi' {
|
|
11
11
|
interface ServerApplicationState {
|
|
@@ -18,6 +18,11 @@ declare module '@hapi/hapi' {
|
|
|
18
18
|
local: any;
|
|
19
19
|
global: any;
|
|
20
20
|
}
|
|
21
|
+
interface PluginSpecificConfiguration {
|
|
22
|
+
flow?: {
|
|
23
|
+
proxy?: boolean;
|
|
24
|
+
};
|
|
25
|
+
}
|
|
21
26
|
interface Server {
|
|
22
27
|
flow: Flow;
|
|
23
28
|
}
|
package/dist/index.js
CHANGED
|
@@ -33,6 +33,7 @@ var flow_core_1 = require("@monkeyplus/flow-core");
|
|
|
33
33
|
Object.defineProperty(exports, "defineImages", { enumerable: true, get: function () { return flow_core_1.defineImages; } });
|
|
34
34
|
const path_1 = __importDefault(require("path"));
|
|
35
35
|
const utils_1 = require("./utils/index");
|
|
36
|
+
const logger = require('consola').withScope('@monkeyplus/flow');
|
|
36
37
|
exports.plugin = {
|
|
37
38
|
pkg: require("../package.json"),
|
|
38
39
|
name: config_1.FULL_NAME_PLUGIN,
|
|
@@ -53,7 +54,11 @@ exports.plugin = {
|
|
|
53
54
|
pages: new Map(),
|
|
54
55
|
localePages: {},
|
|
55
56
|
locale: LOCALE,
|
|
56
|
-
domain: config.domain || 'http://localhost'
|
|
57
|
+
domain: config.domain || 'http://localhost'
|
|
58
|
+
};
|
|
59
|
+
const logs = {
|
|
60
|
+
pages: [],
|
|
61
|
+
warns: []
|
|
57
62
|
};
|
|
58
63
|
/**
|
|
59
64
|
*
|
|
@@ -61,23 +66,28 @@ exports.plugin = {
|
|
|
61
66
|
const inserPage = (pages) => {
|
|
62
67
|
for (const page of pages) {
|
|
63
68
|
if (server.app.flow.pages.has(page.name)) {
|
|
64
|
-
server.log(['warn',
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
});
|
|
69
|
+
// server.log(['warn', FULL_NAME_PLUGIN], {
|
|
70
|
+
// error: 'insertPage',
|
|
71
|
+
// message: `Duplicate name page, "${page.name}" already exists`,
|
|
72
|
+
// details: page,
|
|
73
|
+
// });
|
|
74
|
+
// logger.error(
|
|
75
|
+
// new Error(`Duplicate name page, "${page.name}" already exists`),
|
|
76
|
+
// );
|
|
77
|
+
// logs.warns.push(`Duplicate name page, "${page.name}" already exists`);
|
|
69
78
|
}
|
|
70
79
|
else {
|
|
71
|
-
server.log(['debug',
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
});
|
|
80
|
+
// server.log(['debug', FULL_NAME_PLUGIN], {
|
|
81
|
+
// method: 'isertPage',
|
|
82
|
+
// message: `Insert page`,
|
|
83
|
+
// info: {
|
|
84
|
+
// url: page.urlObject.path,
|
|
85
|
+
// name: page.name,
|
|
86
|
+
// locale: page.locale,
|
|
87
|
+
// level: page.level,
|
|
88
|
+
// },
|
|
89
|
+
// });
|
|
90
|
+
logs.pages.push(page.urlObject.path);
|
|
81
91
|
server.app.flow.pages.set(page.name, page);
|
|
82
92
|
server.app.flow.localePages = R.groupBy((f) => {
|
|
83
93
|
return f.locale;
|
|
@@ -97,7 +107,7 @@ exports.plugin = {
|
|
|
97
107
|
const result = await page(server, {
|
|
98
108
|
language: config.defaultLanguage,
|
|
99
109
|
ubication: config.defaultUbication,
|
|
100
|
-
publicPath: config.publicPath
|
|
110
|
+
publicPath: config.publicPath
|
|
101
111
|
}, locales, options.globals);
|
|
102
112
|
// server.log(['debug', FULL_NAME_PLUGIN], {
|
|
103
113
|
// method: 'addPage',
|
|
@@ -105,11 +115,12 @@ exports.plugin = {
|
|
|
105
115
|
// });
|
|
106
116
|
const hasPage = server.app.flow.prevRoutes.has(result.name);
|
|
107
117
|
if (hasPage) {
|
|
108
|
-
server.log(['warn',
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
});
|
|
118
|
+
// server.log(['warn', FULL_NAME_PLUGIN], {
|
|
119
|
+
// error: 'addPage',
|
|
120
|
+
// message: `The name of group pages '${result.name}' already exists`,
|
|
121
|
+
// page: result,
|
|
122
|
+
// });
|
|
123
|
+
logger.warn(`The name of group pages '${result.name}' already exists`);
|
|
113
124
|
}
|
|
114
125
|
else {
|
|
115
126
|
server.app.flow.prevRoutes.set(result.name, result);
|
|
@@ -120,7 +131,7 @@ exports.plugin = {
|
|
|
120
131
|
server.log(['error', config_1.FULL_NAME_PLUGIN], {
|
|
121
132
|
error: 'addPage',
|
|
122
133
|
message: 'Error addPage',
|
|
123
|
-
details
|
|
134
|
+
details
|
|
124
135
|
});
|
|
125
136
|
}
|
|
126
137
|
};
|
|
@@ -129,13 +140,14 @@ exports.plugin = {
|
|
|
129
140
|
const _routes = server.table();
|
|
130
141
|
const _route = _routes.find((v) => v.path === route.path);
|
|
131
142
|
if (_route) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
}
|
|
143
|
+
logger.warn(`Duplicate route, the route ${route.path} already exists`);
|
|
144
|
+
// server.log(['warn'], {
|
|
145
|
+
// error: 'registerRoutes',
|
|
146
|
+
// message: `Duplicate route, the route already exists`,
|
|
147
|
+
// info: {
|
|
148
|
+
// path: route.path
|
|
149
|
+
// }
|
|
150
|
+
// });
|
|
139
151
|
}
|
|
140
152
|
else {
|
|
141
153
|
if (route.path.includes('_context')) {
|
|
@@ -146,7 +158,7 @@ exports.plugin = {
|
|
|
146
158
|
...route,
|
|
147
159
|
options: R.hasPath(['options'], route)
|
|
148
160
|
? R.mergeDeepLeft(route.options, options.routeOptions || {})
|
|
149
|
-
: undefined
|
|
161
|
+
: undefined
|
|
150
162
|
};
|
|
151
163
|
server.route(r);
|
|
152
164
|
}
|
|
@@ -163,28 +175,28 @@ exports.plugin = {
|
|
|
163
175
|
view: _opts.view ? _opts.view : { template: '' },
|
|
164
176
|
locales: {
|
|
165
177
|
[_opts.locale]: {
|
|
166
|
-
url: _opts.path
|
|
167
|
-
}
|
|
168
|
-
}
|
|
178
|
+
url: _opts.path
|
|
179
|
+
}
|
|
180
|
+
}
|
|
169
181
|
})()(server, {
|
|
170
182
|
language: config.defaultLanguage,
|
|
171
183
|
ubication: config.defaultUbication,
|
|
172
|
-
publicPath: config.publicPath
|
|
184
|
+
publicPath: config.publicPath
|
|
173
185
|
}, locales, options.globals);
|
|
174
186
|
const flow = info.pages[0];
|
|
175
187
|
return {
|
|
176
188
|
path: flow.urlObject.path,
|
|
177
|
-
flow
|
|
189
|
+
flow
|
|
178
190
|
};
|
|
179
191
|
};
|
|
180
192
|
const visioHandler = (req, h) => {
|
|
181
193
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
182
194
|
const { template } = req.route.settings.app.flow;
|
|
183
195
|
return h.view(`${options.dirTemplates || ''}${template}`, {
|
|
184
|
-
...req.pre.context
|
|
196
|
+
...req.pre.context
|
|
185
197
|
});
|
|
186
198
|
};
|
|
187
|
-
const init = async () => {
|
|
199
|
+
const init = async (proxy = false) => {
|
|
188
200
|
const list = Array.from(server.app.flow.prevRoutes.values());
|
|
189
201
|
const prePages = server
|
|
190
202
|
.table()
|
|
@@ -203,20 +215,33 @@ exports.plugin = {
|
|
|
203
215
|
page: {},
|
|
204
216
|
defaultLocal: LOCALE,
|
|
205
217
|
pages: server.app.flow.pages,
|
|
206
|
-
server
|
|
218
|
+
server
|
|
207
219
|
}, visioHandler);
|
|
208
|
-
|
|
220
|
+
if (proxy) {
|
|
221
|
+
//
|
|
222
|
+
const _r = routes.map((v) => {
|
|
223
|
+
return {
|
|
224
|
+
...v
|
|
225
|
+
// handler: {}
|
|
226
|
+
};
|
|
227
|
+
});
|
|
228
|
+
registerRoutes(_r);
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
registerRoutes(routes);
|
|
232
|
+
}
|
|
209
233
|
}
|
|
210
|
-
|
|
234
|
+
logger.info(`Flow ${logs.pages.length} pages registers`);
|
|
235
|
+
// server.log(['info', FULL_NAME_PLUGIN], 'Init flow');
|
|
211
236
|
};
|
|
212
237
|
const flow = {
|
|
213
238
|
init,
|
|
214
239
|
addPage,
|
|
215
240
|
defineInfoPage,
|
|
216
|
-
getPath: (...paths) => path_1.default.join(config.relativeTo, ...paths)
|
|
241
|
+
getPath: (...paths) => path_1.default.join(config.relativeTo, ...paths)
|
|
217
242
|
};
|
|
218
243
|
server.decorate('server', 'flow', flow);
|
|
219
|
-
server.log(['debug',
|
|
220
|
-
}
|
|
244
|
+
// server.log(['debug', FULL_NAME_PLUGIN], { message: 'Registered plugin' });
|
|
245
|
+
}
|
|
221
246
|
};
|
|
222
247
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAAyE;AAWzE,yCAA2B;AAC3B,mCAAwD;AAA/C,iGAAA,UAAU,OAAA;AAAE,0GAAA,mBAAmB,OAAA;AACxC,qCAAmC;AACnC,mDAA+D;AAAtD,yGAAA,YAAY,OAAA;AACrB,gDAAwB;AACxB,yCAAqC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/pages/index.js
CHANGED
|
@@ -52,7 +52,7 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
52
52
|
name: page.name,
|
|
53
53
|
originName: page.originName,
|
|
54
54
|
locale: page.locale,
|
|
55
|
-
page
|
|
55
|
+
page
|
|
56
56
|
};
|
|
57
57
|
const preGlobal = await pre_1.preGlobalContext(ctxLocal, runGlobal);
|
|
58
58
|
const preShared = await pre_1.preSharedContext(ctxLocal);
|
|
@@ -61,6 +61,7 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
61
61
|
id: page.name,
|
|
62
62
|
app: {
|
|
63
63
|
flow: page,
|
|
64
|
+
pre: mergePre
|
|
64
65
|
},
|
|
65
66
|
pre: [
|
|
66
67
|
...mergePre,
|
|
@@ -68,8 +69,8 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
68
69
|
pre_1.preBuildGlobal,
|
|
69
70
|
[preShared, preLocal],
|
|
70
71
|
pre_1.preBuildLocal,
|
|
71
|
-
pre_1.preContext
|
|
72
|
-
]
|
|
72
|
+
pre_1.preContext
|
|
73
|
+
]
|
|
73
74
|
});
|
|
74
75
|
const routes = [
|
|
75
76
|
{
|
|
@@ -78,14 +79,14 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
78
79
|
options: R.mergeDeepRight({
|
|
79
80
|
plugins: {
|
|
80
81
|
generate: {
|
|
81
|
-
ext: 'html'
|
|
82
|
-
}
|
|
83
|
-
}
|
|
82
|
+
ext: 'html'
|
|
83
|
+
}
|
|
84
|
+
}
|
|
84
85
|
}, routeOptions),
|
|
85
86
|
handler,
|
|
86
87
|
rules: options.locales[page.locale].rules || options.rules,
|
|
87
|
-
vhost: options.locales[page.locale].vhost || options.vhost
|
|
88
|
-
}
|
|
88
|
+
vhost: options.locales[page.locale].vhost || options.vhost
|
|
89
|
+
}
|
|
89
90
|
];
|
|
90
91
|
if (page.redirect) {
|
|
91
92
|
routes.push({
|
|
@@ -93,7 +94,7 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
93
94
|
method: 'get',
|
|
94
95
|
handler: (r, h) => {
|
|
95
96
|
return h.redirect(page.urlObject.path);
|
|
96
|
-
}
|
|
97
|
+
}
|
|
97
98
|
});
|
|
98
99
|
}
|
|
99
100
|
if (process.env.NODE_ENV !== 'production') {
|
|
@@ -105,9 +106,9 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
105
106
|
handler: (req) => {
|
|
106
107
|
return {
|
|
107
108
|
page: req.route.settings.app.flow,
|
|
108
|
-
context: req.pre.context
|
|
109
|
+
context: req.pre.context
|
|
109
110
|
};
|
|
110
|
-
}
|
|
111
|
+
}
|
|
111
112
|
});
|
|
112
113
|
}
|
|
113
114
|
}
|
|
@@ -115,7 +116,7 @@ const definePage = (options) => (extOpts, prefixName) => async (server, defs, lo
|
|
|
115
116
|
});
|
|
116
117
|
const r = await Promise.all(routes);
|
|
117
118
|
return R.flatten(r);
|
|
118
|
-
}
|
|
119
|
+
}
|
|
119
120
|
};
|
|
120
121
|
};
|
|
121
122
|
exports.definePage = definePage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/pages/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,qDAAoD;AAEpD,yCAA2B;AAE3B,gDAAwB;AACxB,+BAOe;AACf,0CAAkC;AAE3B,MAAM,UAAU,GAAe,CAAC,OAAO,EAAE,EAAE,CAAC,CACjD,OAAO,EACP,UAAU,EACV,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;IAC3C,MAAM,MAAM,GAAG,uBAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,IAAI,EAAE,CAAC;IAE/C,MAAM,QAAQ,GAAG,IAAI;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SACxC,GAAG,CAAC,cAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO;QACL,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI;QACzD,KAAK;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACtC,MAAM,iBAAiB,GACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC;gBAElD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,IAAI,EAAE,CAAC;gBAE7C,MAAM,iBAAiB,GAAG,CAAC,CAAC,cAAc,CACxC,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;gBACF,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAE7C,MAAM,QAAQ,GAAG;oBACf,GAAG,GAAG;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,IAAI;iBACL,CAAC;gBACF,MAAM,SAAS,GAAG,MAAM,sBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC9D,MAAM,SAAS,GAAG,MAAM,sBAAgB,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,QAAQ,GAAG,MAAM,qBAAe,CAAC,QAAQ,CAAC,CAAC;gBAEjD,MAAM,YAAY,GAAiB,CAAC,CAAC,cAAc,CAAC,iBAAiB,EAAE;oBACrE,EAAE,EAAE,IAAI,CAAC,IAAI;oBACb,GAAG,EAAE;wBACH,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/pages/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,qDAAoD;AAEpD,yCAA2B;AAE3B,gDAAwB;AACxB,+BAOe;AACf,0CAAkC;AAE3B,MAAM,UAAU,GAAe,CAAC,OAAO,EAAE,EAAE,CAAC,CACjD,OAAO,EACP,UAAU,EACV,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;IAC3C,MAAM,MAAM,GAAG,uBAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEnD,MAAM,kBAAkB,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;IACtD,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,IAAI,EAAE,CAAC;IAE/C,MAAM,QAAQ,GAAG,IAAI;SAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;SACxC,GAAG,CAAC,cAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO;QACL,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI;QACzD,KAAK;QACL,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACtC,MAAM,iBAAiB,GACrB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC;gBAElD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,IAAI,EAAE,CAAC;gBAE7C,MAAM,iBAAiB,GAAG,CAAC,CAAC,cAAc,CACxC,kBAAkB,EAClB,iBAAiB,CAClB,CAAC;gBACF,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAE7C,MAAM,QAAQ,GAAG;oBACf,GAAG,GAAG;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,IAAI;iBACL,CAAC;gBACF,MAAM,SAAS,GAAG,MAAM,sBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;gBAC9D,MAAM,SAAS,GAAG,MAAM,sBAAgB,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,QAAQ,GAAG,MAAM,qBAAe,CAAC,QAAQ,CAAC,CAAC;gBAEjD,MAAM,YAAY,GAAiB,CAAC,CAAC,cAAc,CAAC,iBAAiB,EAAE;oBACrE,EAAE,EAAE,IAAI,CAAC,IAAI;oBACb,GAAG,EAAE;wBACH,IAAI,EAAE,IAAI;wBACV,GAAG,EAAE,QAAQ;qBACd;oBAED,GAAG,EAAE;wBACH,GAAG,QAAQ;wBACX,SAAS;wBACT,oBAAc;wBACd,CAAC,SAAS,EAAE,QAAQ,CAAC;wBACrB,mBAAa;wBACb,gBAAU;qBACX;iBACc,CAAQ,CAAC;gBAE1B,MAAM,MAAM,GAAkB;oBAC5B;wBACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;wBACzB,MAAM,EAAE,KAAK;wBACb,OAAO,EAAE,CAAC,CAAC,cAAc,CACvB;4BACE,OAAO,EAAE;gCACP,QAAQ,EAAE;oCACR,GAAG,EAAE,MAAM;iCACZ;6BACK;yBACT,EACD,YAAY,CACb;wBACD,OAAO;wBACP,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK;wBAC1D,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK;qBAC3D;iBACF,CAAC;gBAEF,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACjB,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,MAAM,EAAE,KAAK;wBACb,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;4BAChB,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;wBACzC,CAAC;qBACF,CAAC,CAAC;iBACJ;gBAED,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;oBACzC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACvC,MAAM,CAAC,IAAI,CAAC;4BACV,IAAI,EAAE,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC;4BACtD,MAAM,EAAE,KAAK;4BACb,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;4BACrC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gCACf,OAAO;oCACL,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAI,CAAC,IAAI;oCAClC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO;iCACzB,CAAC;4BACJ,CAAC;yBACF,CAAC,CAAC;qBACJ;iBACF;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA/GW,QAAA,UAAU,cA+GrB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@monkeyplus/flow",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"description": "Utils hapi",
|
|
5
5
|
"author": "Andres Navarrete",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,7 +21,8 @@
|
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@monkeyplus/flow-core": "^2.0.7",
|
|
24
|
+
"consola": "^2.15.2",
|
|
24
25
|
"ramda": "^0.27.1"
|
|
25
26
|
},
|
|
26
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "55d80976edb7445a94433a9b9260db35192a88b0"
|
|
27
28
|
}
|
package/types/index.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
DictionaryImagesSeo,
|
|
10
10
|
ExtraOptions,
|
|
11
11
|
BlogInfo,
|
|
12
|
-
LocalesUrl
|
|
12
|
+
LocalesUrl
|
|
13
13
|
} from '@monkeyplus/flow-core';
|
|
14
14
|
import { Dictionary } from 'ramda';
|
|
15
15
|
import { Lifecycle, RouteOptions, Server, ServerRoute } from '@hapi/hapi';
|
|
@@ -77,7 +77,7 @@ export interface ResultPage {
|
|
|
77
77
|
name: string;
|
|
78
78
|
routes: (
|
|
79
79
|
ctx: CtxHapiBuildLocal,
|
|
80
|
-
handler: Lifecycle.Method
|
|
80
|
+
handler: Lifecycle.Method
|
|
81
81
|
) => Promise<ServerRoute[]>;
|
|
82
82
|
pages: PageInfo[];
|
|
83
83
|
}
|
|
@@ -86,12 +86,12 @@ export type RunDefinePage = (
|
|
|
86
86
|
server: Server,
|
|
87
87
|
defs: DefaultLocale,
|
|
88
88
|
locales: string[],
|
|
89
|
-
runGlobal?: RunDefineGlobalContext
|
|
89
|
+
runGlobal?: RunDefineGlobalContext
|
|
90
90
|
) => Promise<ResultPage>;
|
|
91
91
|
|
|
92
92
|
export type PreRunDefinePage<T = RunDefinePage> = (
|
|
93
93
|
extOpts?: ExtraOptions,
|
|
94
|
-
prefixName?: string
|
|
94
|
+
prefixName?: string
|
|
95
95
|
) => T;
|
|
96
96
|
export type DefinePage = (options: OptionsHapiPage) => PreRunDefinePage;
|
|
97
97
|
|
|
@@ -104,11 +104,11 @@ export interface ResultPage2 {
|
|
|
104
104
|
export type RunDefinePage2 = (
|
|
105
105
|
server: Server,
|
|
106
106
|
defs: DefaultLocale,
|
|
107
|
-
locales: string[]
|
|
107
|
+
locales: string[]
|
|
108
108
|
) => Promise<ResultPage2>;
|
|
109
109
|
|
|
110
110
|
export type DefinePage2 = (
|
|
111
|
-
options: OptionsHapiPage
|
|
111
|
+
options: OptionsHapiPage
|
|
112
112
|
) => PreRunDefinePage<RunDefinePage2>;
|
|
113
113
|
|
|
114
114
|
/**
|
|
@@ -124,10 +124,10 @@ export interface OptionsInfo {
|
|
|
124
124
|
};
|
|
125
125
|
}
|
|
126
126
|
export interface Flow {
|
|
127
|
-
init: () => Promise<void>;
|
|
127
|
+
init: (proxy?: boolean) => Promise<void>;
|
|
128
128
|
addPage: (page: RunDefinePage | OptionsHapiPage) => Promise<void>;
|
|
129
129
|
defineInfoPage: (
|
|
130
|
-
options: OptionsInfo
|
|
130
|
+
options: OptionsInfo
|
|
131
131
|
) => Promise<{ path: string; flow: PageInfo }>;
|
|
132
132
|
getPath: (...path: string[]) => string;
|
|
133
133
|
}
|
|
@@ -135,11 +135,11 @@ export interface Flow {
|
|
|
135
135
|
export type GetUrl = (
|
|
136
136
|
server: Server,
|
|
137
137
|
options: R.Dictionary<OptionsHapiLocalPage>,
|
|
138
|
-
def: string
|
|
138
|
+
def: string
|
|
139
139
|
) => (locale: string) => Promise<LocalesUrl>;
|
|
140
140
|
export type UrlPromise = (
|
|
141
141
|
locale: string,
|
|
142
|
-
name: string
|
|
142
|
+
name: string
|
|
143
143
|
) => Promise<{ url: string; seo: any; [key: string]: any }>;
|
|
144
144
|
/**
|
|
145
145
|
*
|