@monkeyplus/flow 3.0.9 → 3.0.10
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/helper.js +7 -7
- package/dist/helper.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +21 -12
- package/dist/index.js.map +1 -1
- package/dist/utils/index.js +2 -1
- package/dist/utils/index.js.map +1 -1
- package/package.json +5 -5
- package/types/flow.d.ts +9 -3
- package/types/index.d.ts +3 -1
- package/types/interfaces.d.ts +3 -0
package/dist/helper.js
CHANGED
|
@@ -58,17 +58,17 @@ const handlerPage = async (req, h) => {
|
|
|
58
58
|
pageUrl: `${configs.url}${page.path}`
|
|
59
59
|
// utils
|
|
60
60
|
};
|
|
61
|
-
const
|
|
62
|
-
for (const key in
|
|
63
|
-
if ((_a =
|
|
61
|
+
const extraContexts = req.plugins.flow.context;
|
|
62
|
+
for (const key in extraContexts) {
|
|
63
|
+
if ((_a = extraContexts[key]) === null || _a === void 0 ? void 0 : _a.method) {
|
|
64
64
|
//
|
|
65
|
-
const
|
|
66
|
-
const data = await
|
|
65
|
+
const assign = extraContexts[key].assign;
|
|
66
|
+
const data = await extraContexts[key].method(contextMethod);
|
|
67
67
|
const _context = { [key]: data };
|
|
68
|
-
if (
|
|
68
|
+
if (assign === 'global') {
|
|
69
69
|
Object.assign(global, _context);
|
|
70
70
|
}
|
|
71
|
-
else if (
|
|
71
|
+
else if (assign === 'local') {
|
|
72
72
|
Object.assign(local, _context);
|
|
73
73
|
}
|
|
74
74
|
else {
|
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;;IAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAI,CAAC;IACzC,yCAAyC;IAEzC,wBAAwB;IAExB,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,IAAI,GAAG;QACX,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;QACjD,GAAG,CAAC,CAAC,IAAI,CACP,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,EAC7D,IAAI,CACL;KACF,CAAC;IACF,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,wBAAwB;IAExB,IAAI;IACJ,MAAM,KAAK,GAAG;QACZ,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK;QACzB,WAAW,EAAE,CAAC,IAAY,EAAE,EAAE;YAC5B,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,CAAC;IAEF,MAAM,aAAa,GAAG;QACpB,GAAG;QACH,CAAC;QACD,IAAI;QACJ,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;QACtD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAC9C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;KAC5B,CAAC;IAEF,MAAM,GAAG,GAAG;QACV,GAAG,IAAI,CAAC,GAAG;QACX,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE;QACrC,QAAQ;KACT,CAAC;IAEF,MAAM,
|
|
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, ContextHandler } from "../types/index";
|
|
6
|
+
export { RunDefinePage, OptionsHapiPage, RunPreDefinePage, FlowOptions, FlowOptionPlugins, GenerateFolder, Extension, Flow, FlowExtensions, FlowPluginExtension, FlowPluginUtils, FlowPluginGlobal, FlowPluginLocal, Contexts, FlowContextPage, FlowContextSeo, FlowContextView, ContextHandler, FlowEngines, FlowStatePlugins } 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
|
@@ -37,7 +37,9 @@ exports.plugin = {
|
|
|
37
37
|
generate: {
|
|
38
38
|
folders: {}
|
|
39
39
|
},
|
|
40
|
-
prePackage: {}
|
|
40
|
+
prePackage: {},
|
|
41
|
+
engines: {},
|
|
42
|
+
plugins: {}
|
|
41
43
|
};
|
|
42
44
|
// const stateExtension: any = {};
|
|
43
45
|
// const stateGenerate = {
|
|
@@ -65,6 +67,15 @@ exports.plugin = {
|
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
69
|
};
|
|
70
|
+
const statePlugins = {
|
|
71
|
+
global: {},
|
|
72
|
+
local: {},
|
|
73
|
+
context: {},
|
|
74
|
+
//@ts-ignore
|
|
75
|
+
utils: {},
|
|
76
|
+
//@ts-ignore
|
|
77
|
+
extensions: {}
|
|
78
|
+
};
|
|
68
79
|
/**
|
|
69
80
|
*
|
|
70
81
|
*/
|
|
@@ -72,15 +83,7 @@ exports.plugin = {
|
|
|
72
83
|
/**
|
|
73
84
|
* Initize states route
|
|
74
85
|
*/
|
|
75
|
-
req.plugins.flow =
|
|
76
|
-
global: {},
|
|
77
|
-
local: {},
|
|
78
|
-
handler: {},
|
|
79
|
-
//@ts-ignore
|
|
80
|
-
utils: {},
|
|
81
|
-
//@ts-ignore
|
|
82
|
-
extensions: {}
|
|
83
|
-
};
|
|
86
|
+
req.plugins.flow = statePlugins;
|
|
84
87
|
const pathRedirect = state.redirects[req.path];
|
|
85
88
|
if (state.truncates[req.path]) {
|
|
86
89
|
return h.redirect('/').takeover();
|
|
@@ -90,10 +93,14 @@ exports.plugin = {
|
|
|
90
93
|
}
|
|
91
94
|
return h.continue;
|
|
92
95
|
});
|
|
96
|
+
// const addContext = (_context: any) => {
|
|
97
|
+
// const { context } = statePlugins;
|
|
98
|
+
// Object.assign(context, _context);
|
|
99
|
+
// };
|
|
93
100
|
/**
|
|
94
101
|
*
|
|
95
102
|
*/
|
|
96
|
-
|
|
103
|
+
const getUrl = (_locale, _name) => {
|
|
97
104
|
// console.log('locale: %s, name:%s', _locale, _name);
|
|
98
105
|
try {
|
|
99
106
|
const pageName = path_1.default.posix.join(_locale, _name);
|
|
@@ -110,7 +117,9 @@ exports.plugin = {
|
|
|
110
117
|
config_1.logger.error(error);
|
|
111
118
|
return '/';
|
|
112
119
|
}
|
|
113
|
-
}
|
|
120
|
+
};
|
|
121
|
+
server.decorate('toolkit', 'getUrl', getUrl);
|
|
122
|
+
server.method('getUrl', getUrl);
|
|
114
123
|
const flowDecorate = (route, options) => {
|
|
115
124
|
var _a, _b, _c, _d, _e, _f;
|
|
116
125
|
// route.settings.
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,qCAAqD;AACrD,qDAA8D;AAU9D,4CAAoB;AACpB,kDAA0B;AAC1B,oDAAoD;AACpD,yCAAqC;AACrC,qCAAuC;AACvC,gDAAwB;AACxB,yCAA8C;AAC9C,mCAAqC;AAE5B,2FAFA,kBAAU,OAEA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.js
CHANGED
|
@@ -17,7 +17,8 @@ const defaults = {
|
|
|
17
17
|
relativeTo: '',
|
|
18
18
|
dirTemplates: '',
|
|
19
19
|
outputDir: 'build',
|
|
20
|
-
url: process.env.URL
|
|
20
|
+
url: process.env.URL,
|
|
21
|
+
engine: 'eta'
|
|
21
22
|
};
|
|
22
23
|
function getConfigs(server, options) {
|
|
23
24
|
const relativeTo = path_1.default.resolve(options.relativeTo);
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +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,GAAI;
|
|
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,GAAI;IACrB,MAAM,EAAE,KAAK;CACd,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@monkeyplus/flow",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.10",
|
|
4
4
|
"description": "Utils hapi",
|
|
5
5
|
"author": "Andres Navarrete",
|
|
6
6
|
"license": "MIT",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
20
|
"@types/fs-extra": "^9.0.8",
|
|
21
|
-
"@types/ramda": "^0.27.
|
|
21
|
+
"@types/ramda": "^0.27.39"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@monkeyplus/flow-core": "^3.0.
|
|
24
|
+
"@monkeyplus/flow-core": "^3.0.5",
|
|
25
25
|
"chalk": "^4.1.0",
|
|
26
|
-
"consola": "^2.15.
|
|
26
|
+
"consola": "^2.15.3",
|
|
27
27
|
"fs-extra": "^9.1.0",
|
|
28
28
|
"ramda": "^0.27.1"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "62f71665890cc50993c485356e5b3e29184fe990"
|
|
31
31
|
}
|
package/types/flow.d.ts
CHANGED
|
@@ -17,13 +17,16 @@ import {
|
|
|
17
17
|
FlowPluginGlobal,
|
|
18
18
|
FlowPluginLocal,
|
|
19
19
|
FlowPluginUtils,
|
|
20
|
-
FlowExtensions
|
|
20
|
+
FlowExtensions,
|
|
21
|
+
FlowEngines,
|
|
22
|
+
FlowStatePlugins
|
|
21
23
|
} from './interfaces';
|
|
22
24
|
|
|
23
25
|
// eslint-disable-next-line @typescript-eslint/no-empty-interface
|
|
24
26
|
export interface FlowOptionPlugins {}
|
|
25
27
|
export interface FlowOptions {
|
|
26
28
|
relativeTo: string;
|
|
29
|
+
engine?: string;
|
|
27
30
|
outputDir?: string;
|
|
28
31
|
routeOptions?: RouteOptions;
|
|
29
32
|
dirTemplates?: string;
|
|
@@ -75,10 +78,10 @@ export namespace Flow {
|
|
|
75
78
|
global: FlowPluginGlobal;
|
|
76
79
|
utils: FlowPluginUtils;
|
|
77
80
|
extensions: FlowPluginExtension;
|
|
78
|
-
|
|
81
|
+
context: Record<
|
|
79
82
|
string,
|
|
80
83
|
{
|
|
81
|
-
|
|
84
|
+
assign: 'global' | 'local' | 'seo';
|
|
82
85
|
method: any;
|
|
83
86
|
}
|
|
84
87
|
>;
|
|
@@ -98,6 +101,8 @@ export namespace Flow {
|
|
|
98
101
|
generate: {
|
|
99
102
|
folders: Record<string, GenerateFolder>;
|
|
100
103
|
};
|
|
104
|
+
engines: FlowEngines;
|
|
105
|
+
plugins: FlowStatePlugins;
|
|
101
106
|
}
|
|
102
107
|
export interface Configs extends FlowOptions {
|
|
103
108
|
relativeTo: string;
|
|
@@ -107,6 +112,7 @@ export namespace Flow {
|
|
|
107
112
|
publicPath: string;
|
|
108
113
|
locale: string;
|
|
109
114
|
url: string;
|
|
115
|
+
engine: string;
|
|
110
116
|
// redirects: {};
|
|
111
117
|
}
|
|
112
118
|
export interface GenerateOptions {
|
package/types/index.d.ts
CHANGED