@monkeyplus/flow 1.2.0 → 3.0.2
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 +3 -9
- package/dist/config.js +3 -0
- package/dist/config.js.map +1 -1
- package/dist/generate.d.ts +2 -1
- package/dist/generate.js +147 -38
- package/dist/generate.js.map +1 -1
- package/dist/helper.d.ts +2 -0
- package/dist/helper.js +95 -0
- package/dist/helper.js.map +1 -0
- package/dist/index copy.d.ts +0 -0
- package/dist/index copy.js +315 -0
- package/dist/index copy.js.map +1 -0
- package/dist/index.d.ts +18 -13
- package/dist/index.js +186 -218
- package/dist/index.js.map +1 -1
- package/dist/lib/index.d.ts +0 -3
- package/dist/lib/index.js +22 -23
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/pages/index copy.d.ts +0 -0
- package/dist/lib/pages/index copy.js +117 -0
- package/dist/lib/pages/index copy.js.map +1 -0
- package/dist/lib/pages/index.d.ts +0 -2
- package/dist/lib/pages/index.js +115 -121
- package/dist/lib/pages/index.js.map +1 -1
- package/dist/lib/pages/pre.d.ts +0 -8
- package/dist/lib/pages/pre.js +125 -135
- package/dist/lib/pages/pre.js.map +1 -1
- package/dist/lib/utils/index.d.ts +0 -2
- package/dist/lib/utils/index.js +25 -47
- package/dist/lib/utils/index.js.map +1 -1
- package/dist/pages.d.ts +2 -0
- package/dist/pages.js +97 -0
- package/dist/pages.js.map +1 -0
- package/dist/routes.json +0 -0
- package/dist/utils/index.d.ts +3 -2
- package/dist/utils/index.js +34 -7
- package/dist/utils/index.js.map +1 -1
- package/package.json +8 -6
- package/types/flow.d.ts +128 -0
- package/types/index.d.ts +13 -174
package/dist/lib/pages/pre.js
CHANGED
|
@@ -1,137 +1,127 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
})
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
assign: 'context',
|
|
128
|
-
method: async (req) => {
|
|
129
|
-
const _local = req.app.local || {};
|
|
130
|
-
const _global = req.app.global || {};
|
|
131
|
-
return {
|
|
132
|
-
local: R.mergeDeepRight(req.pre.local, _local),
|
|
133
|
-
globals: R.mergeDeepRight(req.pre.globals, _global),
|
|
134
|
-
};
|
|
135
|
-
},
|
|
136
|
-
};
|
|
2
|
+
// import { RouteOptionsPreObject } from '@hapi/hapi';
|
|
3
|
+
// import { RunDefineGlobalContext } from 'types';
|
|
4
|
+
// import * as R from 'ramda';
|
|
5
|
+
// import path from 'path';
|
|
6
|
+
// export const preGlobalContext = async (
|
|
7
|
+
// ctx: any,
|
|
8
|
+
// run: RunDefineGlobalContext = () => ({} as any),
|
|
9
|
+
// ): Promise<RouteOptionsPreObject> => {
|
|
10
|
+
// return {
|
|
11
|
+
// assign: 'globalContext',
|
|
12
|
+
// method: async (req) => {
|
|
13
|
+
// try {
|
|
14
|
+
// const context = await run({
|
|
15
|
+
// ...ctx,
|
|
16
|
+
// isStatic: R.has('static', req.query),
|
|
17
|
+
// });
|
|
18
|
+
// return context;
|
|
19
|
+
// } catch (error) {
|
|
20
|
+
// return {};
|
|
21
|
+
// }
|
|
22
|
+
// },
|
|
23
|
+
// };
|
|
24
|
+
// };
|
|
25
|
+
// export const preSharedContext = async (
|
|
26
|
+
// ctx: any,
|
|
27
|
+
// ): Promise<RouteOptionsPreObject> => {
|
|
28
|
+
// return {
|
|
29
|
+
// assign: 'sharedContext',
|
|
30
|
+
// method: async (req) => {
|
|
31
|
+
// const { app } = req.route.settings;
|
|
32
|
+
// const context = await app?.flow.runSharedContext({
|
|
33
|
+
// ...ctx,
|
|
34
|
+
// globals: req.pre.globals,
|
|
35
|
+
// shared: R.path(['globals', 'SHARED'], req.pre) || {},
|
|
36
|
+
// sharedLocale: R.path(['globals', 'SHARED_LOCALE'], req.pre) || {},
|
|
37
|
+
// isStatic: R.has('static', req.query),
|
|
38
|
+
// });
|
|
39
|
+
// return context;
|
|
40
|
+
// },
|
|
41
|
+
// };
|
|
42
|
+
// };
|
|
43
|
+
// export const preLocalContext = async (
|
|
44
|
+
// ctx: any,
|
|
45
|
+
// ): Promise<RouteOptionsPreObject> => ({
|
|
46
|
+
// assign: 'localContext',
|
|
47
|
+
// method: async (req) => {
|
|
48
|
+
// const { app } = req.route.settings;
|
|
49
|
+
// if (app?.flow.runLocalContext) {
|
|
50
|
+
// const context = await app.flow.runLocalContext({
|
|
51
|
+
// ...ctx,
|
|
52
|
+
// globals: req.pre.globals,
|
|
53
|
+
// shared: R.path(['globals', 'SHARED'], req.pre) || {},
|
|
54
|
+
// sharedLocale: R.path(['globals', 'SHARED_LOCALE'], req.pre) || {},
|
|
55
|
+
// isStatic: R.has('static', req.query),
|
|
56
|
+
// });
|
|
57
|
+
// return context;
|
|
58
|
+
// } else {
|
|
59
|
+
// return {};
|
|
60
|
+
// }
|
|
61
|
+
// },
|
|
62
|
+
// });
|
|
63
|
+
// export const preBuildLocal: RouteOptionsPreObject = {
|
|
64
|
+
// assign: 'local',
|
|
65
|
+
// method: async (req) => {
|
|
66
|
+
// const local = {
|
|
67
|
+
// ...R.omit(['seo'], req.pre.sharedContext),
|
|
68
|
+
// ...req.pre.localContext,
|
|
69
|
+
// };
|
|
70
|
+
// return {
|
|
71
|
+
// ...local,
|
|
72
|
+
// ...R.omit(
|
|
73
|
+
// [
|
|
74
|
+
// 'globalContext',
|
|
75
|
+
// 'localContext',
|
|
76
|
+
// 'sharedContext',
|
|
77
|
+
// 'seo',
|
|
78
|
+
// 'preSeo',
|
|
79
|
+
// 'context',
|
|
80
|
+
// 'globals',
|
|
81
|
+
// ],
|
|
82
|
+
// req.pre,
|
|
83
|
+
// ),
|
|
84
|
+
// };
|
|
85
|
+
// },
|
|
86
|
+
// };
|
|
87
|
+
// export const preBuildGlobal: RouteOptionsPreObject = {
|
|
88
|
+
// assign: 'globals',
|
|
89
|
+
// method: async (req) => {
|
|
90
|
+
// const {
|
|
91
|
+
// seo,
|
|
92
|
+
// bundle,
|
|
93
|
+
// locale,
|
|
94
|
+
// urlObject,
|
|
95
|
+
// blogInfo,
|
|
96
|
+
// } = req.route.settings.app!.flow!;
|
|
97
|
+
// const url = req.query.static ? urlObject.static : urlObject.path;
|
|
98
|
+
// return {
|
|
99
|
+
// ...req.pre.globalContext,
|
|
100
|
+
// SEO: {
|
|
101
|
+
// ...R.mergeDeepRight({ ...seo, ...req.pre.preSeo }, req.pre.seo || {}),
|
|
102
|
+
// url: req.server.app.flow.domain + path.posix.join('/', url),
|
|
103
|
+
// // url: ,
|
|
104
|
+
// },
|
|
105
|
+
// BUNDLE: bundle,
|
|
106
|
+
// LOCALE: `${locale}`,
|
|
107
|
+
// BLOG_INFO: blogInfo,
|
|
108
|
+
// PUBLIC_PATH: path.posix.join('/', urlObject.publicPath),
|
|
109
|
+
// NAME: req.route.settings.id,
|
|
110
|
+
// STATIC: req.query.static || false,
|
|
111
|
+
// IS_AUTHENTICATED: R.path(['auth', 'isAuthenticated'], req),
|
|
112
|
+
// URL: urlObject.path,
|
|
113
|
+
// };
|
|
114
|
+
// },
|
|
115
|
+
// };
|
|
116
|
+
// export const preContext: RouteOptionsPreObject = {
|
|
117
|
+
// assign: 'context',
|
|
118
|
+
// method: async (req) => {
|
|
119
|
+
// const _local = req.app.local || {};
|
|
120
|
+
// const _global = req.app.global || {};
|
|
121
|
+
// return {
|
|
122
|
+
// local: R.mergeDeepRight(req.pre.local, _local),
|
|
123
|
+
// globals: R.mergeDeepRight(req.pre.globals, _global),
|
|
124
|
+
// };
|
|
125
|
+
// },
|
|
126
|
+
// };
|
|
137
127
|
//# sourceMappingURL=pre.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pre.js","sourceRoot":"","sources":["../../../src/lib/pages/pre.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pre.js","sourceRoot":"","sources":["../../../src/lib/pages/pre.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,kDAAkD;AAClD,8BAA8B;AAC9B,2BAA2B;AAE3B,0CAA0C;AAC1C,cAAc;AACd,qDAAqD;AACrD,yCAAyC;AACzC,aAAa;AACb,+BAA+B;AAC/B,+BAA+B;AAC/B,cAAc;AACd,sCAAsC;AACtC,oBAAoB;AACpB,kDAAkD;AAClD,cAAc;AACd,0BAA0B;AAC1B,0BAA0B;AAC1B,qBAAqB;AACrB,UAAU;AACV,SAAS;AACT,OAAO;AACP,KAAK;AAEL,0CAA0C;AAC1C,cAAc;AACd,yCAAyC;AACzC,aAAa;AACb,+BAA+B;AAC/B,+BAA+B;AAC/B,4CAA4C;AAC5C,2DAA2D;AAC3D,kBAAkB;AAClB,oCAAoC;AACpC,gEAAgE;AAChE,6EAA6E;AAC7E,gDAAgD;AAChD,YAAY;AAEZ,wBAAwB;AACxB,SAAS;AACT,OAAO;AACP,KAAK;AAEL,yCAAyC;AACzC,cAAc;AACd,0CAA0C;AAC1C,4BAA4B;AAC5B,6BAA6B;AAC7B,0CAA0C;AAC1C,uCAAuC;AACvC,yDAAyD;AACzD,kBAAkB;AAClB,oCAAoC;AACpC,gEAAgE;AAChE,6EAA6E;AAC7E,gDAAgD;AAChD,YAAY;AAEZ,wBAAwB;AACxB,eAAe;AACf,mBAAmB;AACnB,QAAQ;AACR,OAAO;AACP,MAAM;AAEN,wDAAwD;AACxD,qBAAqB;AACrB,6BAA6B;AAC7B,sBAAsB;AACtB,mDAAmD;AACnD,iCAAiC;AACjC,SAAS;AACT,eAAe;AACf,kBAAkB;AAClB,mBAAmB;AACnB,YAAY;AACZ,6BAA6B;AAC7B,4BAA4B;AAC5B,6BAA6B;AAC7B,mBAAmB;AACnB,sBAAsB;AACtB,uBAAuB;AACvB,uBAAuB;AACvB,aAAa;AACb,mBAAmB;AACnB,WAAW;AACX,SAAS;AACT,OAAO;AACP,KAAK;AACL,yDAAyD;AACzD,uBAAuB;AACvB,6BAA6B;AAC7B,cAAc;AACd,aAAa;AACb,gBAAgB;AAChB,gBAAgB;AAChB,mBAAmB;AACnB,kBAAkB;AAClB,yCAAyC;AACzC,wEAAwE;AAExE,eAAe;AACf,kCAAkC;AAClC,eAAe;AACf,iFAAiF;AACjF,uEAAuE;AACvE,oBAAoB;AACpB,WAAW;AACX,wBAAwB;AACxB,6BAA6B;AAC7B,6BAA6B;AAC7B,iEAAiE;AACjE,qCAAqC;AACrC,2CAA2C;AAC3C,oEAAoE;AACpE,6BAA6B;AAC7B,SAAS;AACT,OAAO;AACP,KAAK;AAEL,qDAAqD;AACrD,uBAAuB;AACvB,6BAA6B;AAC7B,0CAA0C;AAC1C,4CAA4C;AAE5C,eAAe;AACf,wDAAwD;AACxD,6DAA6D;AAC7D,SAAS;AACT,OAAO;AACP,KAAK"}
|
package/dist/lib/utils/index.js
CHANGED
|
@@ -1,49 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
let URL = name;
|
|
28
|
-
let SEO = {};
|
|
29
|
-
const method = R.path(['flowUrl', url], server.methods);
|
|
30
|
-
if (method) {
|
|
31
|
-
const result = await method(locale, name);
|
|
32
|
-
URL = result.url || name;
|
|
33
|
-
SEO = result.seo || {};
|
|
34
|
-
}
|
|
35
|
-
return {
|
|
36
|
-
locale,
|
|
37
|
-
url: URL,
|
|
38
|
-
seo: SEO,
|
|
39
|
-
};
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
return {
|
|
43
|
-
locale,
|
|
44
|
-
url,
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
};
|
|
48
|
-
exports.getUrl = getUrl;
|
|
2
|
+
// import { UrlPromise, GetUrl } from 'types';
|
|
3
|
+
// import * as R from 'ramda';
|
|
4
|
+
// export const getUrl: GetUrl = (server, options, name) => async (locale) => {
|
|
5
|
+
// const url = options[locale].url;
|
|
6
|
+
// if (url.includes('$')) {
|
|
7
|
+
// let URL = name;
|
|
8
|
+
// let SEO = {};
|
|
9
|
+
// const method = R.path<UrlPromise>(['flowUrl', url], server.methods);
|
|
10
|
+
// if (method) {
|
|
11
|
+
// const result = await method(locale, name);
|
|
12
|
+
// URL = result.url || name;
|
|
13
|
+
// SEO = result.seo || {};
|
|
14
|
+
// }
|
|
15
|
+
// return {
|
|
16
|
+
// locale,
|
|
17
|
+
// url: URL,
|
|
18
|
+
// seo: SEO,
|
|
19
|
+
// };
|
|
20
|
+
// } else {
|
|
21
|
+
// return {
|
|
22
|
+
// locale,
|
|
23
|
+
// url,
|
|
24
|
+
// };
|
|
25
|
+
// }
|
|
26
|
+
// };
|
|
49
27
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/utils/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/utils/index.ts"],"names":[],"mappings":";AAAA,8CAA8C;AAC9C,8BAA8B;AAE9B,+EAA+E;AAC/E,qCAAqC;AACrC,6BAA6B;AAC7B,sBAAsB;AACtB,oBAAoB;AACpB,2EAA2E;AAC3E,oBAAoB;AACpB,mDAAmD;AACnD,kCAAkC;AAClC,gCAAgC;AAChC,QAAQ;AACR,eAAe;AACf,gBAAgB;AAChB,kBAAkB;AAClB,kBAAkB;AAClB,SAAS;AACT,aAAa;AACb,eAAe;AACf,gBAAgB;AAChB,aAAa;AACb,SAAS;AACT,MAAM;AACN,KAAK"}
|
package/dist/pages.d.ts
ADDED
package/dist/pages.js
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
exports.definePage = void 0;
|
|
23
|
+
const flow_core_1 = require("@monkeyplus/flow-core");
|
|
24
|
+
const R = __importStar(require("ramda"));
|
|
25
|
+
const definePage = (pageOptions, extensions = {}) => (levelOptions) => (configs) => {
|
|
26
|
+
//
|
|
27
|
+
const pages = [];
|
|
28
|
+
for (const locale in pageOptions.locales) {
|
|
29
|
+
if (configs.locales.find((_locale) => _locale === locale)) {
|
|
30
|
+
const singlePage = pageOptions.locales[locale];
|
|
31
|
+
pages.push({ url: singlePage.url, locale });
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
// R.mapObjIndexed((singlePage, locale) => {
|
|
35
|
+
// return { [locale]: singlePage.u };
|
|
36
|
+
// }, page.locales);
|
|
37
|
+
const infoPages = flow_core_1.definePages({
|
|
38
|
+
name: pageOptions.name,
|
|
39
|
+
view: pageOptions.view,
|
|
40
|
+
context: pageOptions.context,
|
|
41
|
+
level: pageOptions.level,
|
|
42
|
+
locales: pageOptions.locales
|
|
43
|
+
})({
|
|
44
|
+
language: configs.defaultLanguage,
|
|
45
|
+
ubication: configs.defaultUbication,
|
|
46
|
+
publicPath: configs.publicPath
|
|
47
|
+
})(levelOptions).pages(pages);
|
|
48
|
+
const { options: sharedOptions, rules: sharedRules, vhost: sharedVHost } = pageOptions;
|
|
49
|
+
// const = options || {};
|
|
50
|
+
const sharedPre = (sharedOptions === null || sharedOptions === void 0 ? void 0 : sharedOptions.pre) || [];
|
|
51
|
+
const routes = infoPages.map((page) => {
|
|
52
|
+
var _a;
|
|
53
|
+
const localPage = pageOptions.locales[page.locale];
|
|
54
|
+
const route = {
|
|
55
|
+
path: page.urlObject.path,
|
|
56
|
+
method: 'get',
|
|
57
|
+
options: {
|
|
58
|
+
app: {
|
|
59
|
+
...extensions,
|
|
60
|
+
flow: page
|
|
61
|
+
}
|
|
62
|
+
},
|
|
63
|
+
handler: {
|
|
64
|
+
flow: {
|
|
65
|
+
name: page.name,
|
|
66
|
+
locale: page.locale,
|
|
67
|
+
view: { template: page.template, bundle: page.bundle }
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
if (sharedRules || localPage.rules) {
|
|
72
|
+
route.rules = localPage.rules || sharedRules;
|
|
73
|
+
}
|
|
74
|
+
if (sharedVHost || localPage.vhost) {
|
|
75
|
+
route.vhost = localPage.vhost || sharedVHost;
|
|
76
|
+
}
|
|
77
|
+
if (sharedOptions || localPage.options) {
|
|
78
|
+
//
|
|
79
|
+
const localOptions = (localPage === null || localPage === void 0 ? void 0 : localPage.options) || {};
|
|
80
|
+
const localPre = ((_a = localPage === null || localPage === void 0 ? void 0 : localPage.options) === null || _a === void 0 ? void 0 : _a.pre) || [];
|
|
81
|
+
const pre = [...sharedPre, ...localPre];
|
|
82
|
+
const options = R.mergeDeepRight(sharedOptions || {}, localOptions);
|
|
83
|
+
route.options = R.mergeDeepRight(options, route.options);
|
|
84
|
+
if (route.options && pre.length) {
|
|
85
|
+
route.options.pre = pre;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return route;
|
|
89
|
+
});
|
|
90
|
+
return routes;
|
|
91
|
+
};
|
|
92
|
+
exports.definePage = definePage;
|
|
93
|
+
// definePages({
|
|
94
|
+
// name: 'test',
|
|
95
|
+
// view:
|
|
96
|
+
// })
|
|
97
|
+
//# sourceMappingURL=pages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pages.js","sourceRoot":"","sources":["../src/pages.ts"],"names":[],"mappings":"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"}
|
package/dist/routes.json
ADDED
|
File without changes
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Server } from '@hapi/hapi';
|
|
2
|
-
import {
|
|
3
|
-
export declare
|
|
2
|
+
import { Flow, FlowOptions } from "../../types/index";
|
|
3
|
+
export declare const logger: import("consola").Consola;
|
|
4
|
+
export declare function getConfigs(server: Server, options: FlowOptions): Flow.Configs;
|
package/dist/utils/index.js
CHANGED
|
@@ -3,17 +3,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getConfigs = void 0;
|
|
6
|
+
exports.getConfigs = exports.logger = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
|
|
8
|
+
const consola_1 = __importDefault(require("consola"));
|
|
9
|
+
exports.logger = consola_1.default.withScope('@monkeyplus/flow');
|
|
10
|
+
const hoek_1 = require("@hapi/hoek");
|
|
11
|
+
const defaults = {
|
|
12
|
+
locales: ['es-ec'],
|
|
13
|
+
defaultUbication: 'ec',
|
|
14
|
+
defaultLanguage: 'es',
|
|
15
|
+
publicPath: '/',
|
|
16
|
+
locale: 'es-ec',
|
|
17
|
+
relativeTo: '',
|
|
18
|
+
dirTemplates: '',
|
|
19
|
+
outputDir: 'build',
|
|
20
|
+
url: process.env.URL
|
|
21
|
+
};
|
|
22
|
+
function getConfigs(server, options) {
|
|
23
|
+
const relativeTo = path_1.default.resolve(options.relativeTo);
|
|
24
|
+
const getObject = (object) => {
|
|
25
|
+
const config = hoek_1.applyToDefaults(defaults, { ...object, ...options });
|
|
26
|
+
return {
|
|
27
|
+
...config,
|
|
28
|
+
relativeTo,
|
|
29
|
+
locale: `${config.defaultLanguage}-${config.defaultUbication}`
|
|
30
|
+
};
|
|
31
|
+
};
|
|
9
32
|
try {
|
|
10
|
-
const pathWeb = path_1.default.resolve(
|
|
11
|
-
|
|
12
|
-
|
|
33
|
+
const pathWeb = path_1.default.resolve(options.relativeTo, 'flow.config');
|
|
34
|
+
exports.logger.info('Flow apply settings from file: flow.config');
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
36
|
+
const configBase = require(pathWeb);
|
|
37
|
+
const config = getObject(configBase);
|
|
38
|
+
return config;
|
|
13
39
|
}
|
|
14
40
|
catch (error) {
|
|
15
|
-
server.log(['error'], error);
|
|
16
|
-
|
|
41
|
+
// server.log(['error'], error);
|
|
42
|
+
exports.logger.info('Flow no config file apply default settings');
|
|
43
|
+
return getObject({});
|
|
17
44
|
}
|
|
18
45
|
}
|
|
19
46
|
exports.getConfigs = getConfigs;
|
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;
|
|
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;CACtB,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
|
+
"version": "3.0.2",
|
|
4
4
|
"description": "Utils hapi",
|
|
5
5
|
"author": "Andres Navarrete",
|
|
6
6
|
"license": "MIT",
|
|
@@ -11,18 +11,20 @@
|
|
|
11
11
|
"types/"
|
|
12
12
|
],
|
|
13
13
|
"scripts": {
|
|
14
|
-
"build": "ttsc -p tsconfig.build.json",
|
|
14
|
+
"build:ts": "ttsc -p tsconfig.build.json",
|
|
15
15
|
"watch": "ttsc -p tsconfig.build.json -w",
|
|
16
16
|
"test": "jest",
|
|
17
|
-
"prepare": "yarn build"
|
|
17
|
+
"prepare": "yarn build:ts"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@types/
|
|
20
|
+
"@types/fs-extra": "^9.0.8",
|
|
21
|
+
"@types/ramda": "^0.27.38"
|
|
21
22
|
},
|
|
22
23
|
"dependencies": {
|
|
23
|
-
"@monkeyplus/flow-core": "^
|
|
24
|
+
"@monkeyplus/flow-core": "^3.0.2",
|
|
24
25
|
"consola": "^2.15.2",
|
|
26
|
+
"fs-extra": "^9.1.0",
|
|
25
27
|
"ramda": "^0.27.1"
|
|
26
28
|
},
|
|
27
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "2be4e35ffda3d97b7f679ebd413346655ddbd5cd"
|
|
28
30
|
}
|