@tremho/mist-lift 1.0.2-pre-release.4 → 1.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/README.md +12 -0
- package/build/commands/actions/initQuestions.js +24 -22
- package/build/commands/actions/initQuestions.js.map +1 -1
- package/build/commands/actions/setupPackageJson.js +4 -4
- package/build/commands/actions/setupPackageJson.js.map +1 -1
- package/build/commands/build.js +31 -25
- package/build/commands/build.js.map +1 -1
- package/build/commands/builtin/ApiDocMaker.js +60 -23
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/builtin/BuiltInHandler.js +6 -6
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/DeployBuiltInZip.js +4 -4
- package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +1 -0
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/create.js +10 -11
- package/build/commands/create.js.map +1 -1
- package/build/commands/deploy.js +38 -42
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/doctor.js +38 -37
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/help.js +93 -93
- package/build/commands/help.js.map +1 -1
- package/build/commands/init.js +7 -7
- package/build/commands/init.js.map +1 -1
- package/build/commands/package.js +50 -51
- package/build/commands/package.js.map +1 -1
- package/build/commands/publish.js +98 -102
- package/build/commands/publish.js.map +1 -1
- package/build/commands/settings.js +19 -18
- package/build/commands/settings.js.map +1 -1
- package/build/commands/start.js +4 -4
- package/build/commands/start.js.map +1 -1
- package/build/commands/test.js +3 -3
- package/build/commands/test.js.map +1 -1
- package/build/commands/user.js +1 -1
- package/build/commands/user.js.map +1 -1
- package/build/expressRoutes/all.js +27 -26
- package/build/expressRoutes/all.js.map +1 -1
- package/build/expressRoutes/api.js +9 -7
- package/build/expressRoutes/api.js.map +1 -1
- package/build/expressRoutes/functionBinder.js +38 -36
- package/build/expressRoutes/functionBinder.js.map +1 -1
- package/build/lib/CaseUtils.js +2 -2
- package/build/lib/CaseUtils.js.map +1 -1
- package/build/lib/DirectoryUtils.js +4 -3
- package/build/lib/DirectoryUtils.js.map +1 -1
- package/build/lib/LiftConfig.js +18 -20
- package/build/lib/LiftConfig.js.map +1 -1
- package/build/lib/LiftVersion.js +17 -12
- package/build/lib/LiftVersion.js.map +1 -1
- package/build/lib/Tests/fileCompare.test.js +11 -10
- package/build/lib/Tests/fileCompare.test.js.map +1 -1
- package/build/lib/askQuestion.js +3 -2
- package/build/lib/askQuestion.js.map +1 -1
- package/build/lib/executeCommand.js +46 -33
- package/build/lib/executeCommand.js.map +1 -1
- package/build/lib/fileCompare.js +9 -8
- package/build/lib/fileCompare.js.map +1 -1
- package/build/lib/openAPI/ApiBuildCollector.js +9 -8
- package/build/lib/openAPI/ApiBuildCollector.js.map +1 -1
- package/build/lib/openAPI/WebrootFileSupport.js +4 -3
- package/build/lib/openAPI/WebrootFileSupport.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +62 -61
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/build/lib/pathResolve.js +4 -4
- package/build/lib/pathResolve.js.map +1 -1
- package/build/lib/utils.js +5 -4
- package/build/lib/utils.js.map +1 -1
- package/build/lift.js +14 -15
- package/build/lift.js.map +1 -1
- package/package.json +2 -1
- package/src/commands/actions/initQuestions.ts +112 -112
- package/src/commands/actions/setupPackageJson.ts +21 -25
- package/src/commands/build.ts +143 -146
- package/src/commands/builtin/ApiDocMaker.ts +86 -54
- package/src/commands/builtin/BuiltInHandler.ts +31 -35
- package/src/commands/builtin/DeployBuiltInZip.ts +15 -17
- package/src/commands/builtin/StageWebrootZip.ts +29 -32
- package/src/commands/create.ts +40 -47
- package/src/commands/deploy.ts +139 -152
- package/src/commands/doctor.ts +86 -82
- package/src/commands/help.ts +152 -153
- package/src/commands/init.ts +37 -39
- package/src/commands/package.ts +201 -204
- package/src/commands/publish.ts +277 -312
- package/src/commands/settings.ts +67 -70
- package/src/commands/start.ts +32 -37
- package/src/commands/test.ts +15 -16
- package/src/commands/user.ts +1 -1
- package/src/expressRoutes/all.ts +73 -78
- package/src/expressRoutes/api.ts +14 -16
- package/src/expressRoutes/functionBinder.ts +144 -151
- package/src/lib/CaseUtils.ts +49 -54
- package/src/lib/DirectoryUtils.ts +25 -27
- package/src/lib/LiftConfig.ts +46 -54
- package/src/lib/LiftVersion.ts +69 -77
- package/src/lib/Tests/fileCompare.test.ts +27 -26
- package/src/lib/askQuestion.ts +12 -13
- package/src/lib/executeCommand.ts +40 -33
- package/src/lib/fileCompare.ts +46 -37
- package/src/lib/openAPI/ApiBuildCollector.ts +36 -36
- package/src/lib/openAPI/WebrootFileSupport.ts +15 -17
- package/src/lib/openAPI/openApiConstruction.ts +169 -175
- package/src/lib/pathResolve.ts +22 -28
- package/src/lib/utils.ts +31 -33
- package/src/lift.ts +68 -67
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/commands/user.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AAEH,QAAQ;AAER;;;;;;;;GAQG;AACH,OAAO;AACP,
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/commands/user.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AAEH,QAAQ;AAER;;;;;;;;GAQG;AACH,OAAO;AACP,IAAI"}
|
|
@@ -38,32 +38,33 @@ function allBinder() {
|
|
|
38
38
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
39
39
|
const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
|
|
40
40
|
/**
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
41
|
+
* @name /all
|
|
42
|
+
* @description
|
|
43
|
+
* Catch-all handler for URLs
|
|
44
|
+
* Provides some simple spam blocking and checks for file pass through at file root.
|
|
45
|
+
*
|
|
46
|
+
* ##### Filtering:
|
|
47
|
+
* - all .php extension references
|
|
48
|
+
*
|
|
49
|
+
* ##### File root:
|
|
50
|
+
* - file root is at service root + 'Public'
|
|
51
|
+
* - no path or path ending in / is appended with '/index.html' for folder root default behavior
|
|
52
|
+
* - File contents passed through using `sendFile` (will handle its own 404 if not found)
|
|
53
|
+
*
|
|
54
|
+
*/
|
|
55
55
|
router.all('*', (req, res, next) => {
|
|
56
|
+
var _a;
|
|
56
57
|
// any PHP requests should be ignored
|
|
57
58
|
// ClogTrace('incoming: '+req.originalUrl)
|
|
58
|
-
if (req.originalUrl.
|
|
59
|
+
if (req.originalUrl.includes('.php')) {
|
|
59
60
|
return res.send('');
|
|
60
61
|
}
|
|
61
|
-
if (req.originalUrl.
|
|
62
|
+
if (req.originalUrl.includes('.env')) {
|
|
62
63
|
return res.send('');
|
|
63
64
|
}
|
|
64
|
-
let filepath = req.originalUrl
|
|
65
|
+
let filepath = (_a = req.originalUrl) !== null && _a !== void 0 ? _a : '/';
|
|
65
66
|
// match cloud behavior for docs because /api doesn't change cwd there
|
|
66
|
-
if (filepath.substring(0, 10)
|
|
67
|
+
if (filepath.substring(0, 10) === '/api/docs/') {
|
|
67
68
|
filepath = filepath.replace('/api', '');
|
|
68
69
|
}
|
|
69
70
|
let funcFound = filepath === '/api'; // reserved "function"
|
|
@@ -79,7 +80,7 @@ function allBinder() {
|
|
|
79
80
|
rootEntity = rootEntity.substring(0, n);
|
|
80
81
|
for (const entry of defs) {
|
|
81
82
|
let entryRoot = entry.pathMap;
|
|
82
|
-
|
|
83
|
+
const n = entryRoot.indexOf('/{');
|
|
83
84
|
if (n !== -1)
|
|
84
85
|
entryRoot = entryRoot.substring(0, n);
|
|
85
86
|
if (rootEntity === entryRoot) {
|
|
@@ -91,23 +92,23 @@ function allBinder() {
|
|
|
91
92
|
}
|
|
92
93
|
if (!funcFound) {
|
|
93
94
|
// check for '/' in path beyond the first one
|
|
94
|
-
if (filepath.
|
|
95
|
+
if (filepath.includes('/', 1)) {
|
|
95
96
|
// console.log(ac.magenta.italic("Warning: / path delimiters will not be honored in a cloud deployment, use + instead ")+filepath)
|
|
96
97
|
}
|
|
97
98
|
// convert any incoming + to / to match cloud behavior
|
|
98
|
-
while (filepath.
|
|
99
|
-
filepath = filepath.replace(
|
|
99
|
+
while (filepath.includes('+'))
|
|
100
|
+
filepath = filepath.replace('+', '/');
|
|
100
101
|
// Put any other filtering here
|
|
101
|
-
if (filepath.
|
|
102
|
+
if (filepath.includes('?')) {
|
|
102
103
|
filepath = filepath.substring(0, filepath.indexOf('?'));
|
|
103
104
|
}
|
|
104
105
|
if (filepath.substring(filepath.length - 1) === '/')
|
|
105
106
|
filepath += 'index.html';
|
|
106
|
-
if (filepath.substring(0, 10)
|
|
107
|
+
if (filepath.substring(0, 10) === '/api/docs/') {
|
|
107
108
|
filepath = filepath.replace('/api', '');
|
|
108
109
|
}
|
|
109
|
-
if (filepath.
|
|
110
|
-
if (filepath.
|
|
110
|
+
if (filepath.includes('/docs')) {
|
|
111
|
+
if (filepath.includes('.map')) {
|
|
111
112
|
return res.sendStatus(200);
|
|
112
113
|
}
|
|
113
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/expressRoutes/all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"all.js","sourceRoot":"","sources":["../../src/expressRoutes/all.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,4CAAmB;AAEnB,gDAAiC;AACjC,oDAAiD;AACjD,wEAA4E;AAE5E,sDAA6B;AAC7B,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,SAAgB,SAAS;IACvB,MAAM,YAAY,GAAG,IAAA,0BAAY,GAAE,CAAA;IACnC,MAAM,IAAI,GAAG,IAAA,6CAAyB,GAAE,CAAA;IAExC;;;;;;;;;;;;;;SAcK;IACL,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;QACjC,qCAAqC;QACrC,0CAA0C;QAC1C,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;QACD,IAAI,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;QAED,IAAI,QAAQ,GAAG,MAAA,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAA;QACrC,sEAAsE;QACtE,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,YAAY,EAAE,CAAC;YAC/C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACzC,CAAC;QACD,IAAI,SAAS,GAAG,QAAQ,KAAK,MAAM,CAAA,CAAC,sBAAsB;QAC1D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;gBAChC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAA;gBACjC,IAAI,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACzC,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBAC3B,IAAI,CAAC,KAAK,CAAC,CAAC;oBAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAA;gBACnC,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACvC,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;oBACzB,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAA;oBAC7B,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACjC,IAAI,CAAC,KAAK,CAAC,CAAC;wBAAE,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;oBACnD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;wBAC7B,SAAS,GAAG,IAAI,CAAA;wBAChB,MAAK;oBACP,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,6CAA6C;YAC7C,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC9B,kIAAkI;YACpI,CAAC;YACD,sDAAsD;YACtD,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAEpE,+BAA+B;YAC/B,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;YACzD,CAAC;YACD,IAAI,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;gBAAE,QAAQ,IAAI,YAAY,CAAA;YAC7E,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,YAAY,EAAE,CAAC;gBAC/C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACzC,CAAC;YACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC9B,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;gBAC5B,CAAC;YACH,CAAC;YACD,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA,CAAC,kBAAkB;YACjG,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAA;gBAClD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,wEAAwE;QACxE,IAAI,EAAE,CAAA;IACR,CAAC,CAAC,CAAA;AACJ,CAAC;AAvFD,8BAuFC;AACD,kBAAe,MAAM,CAAA"}
|
|
@@ -3,20 +3,22 @@ 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
|
+
/* eslint @typescript-eslint/no-var-requires: "off" */
|
|
6
7
|
const express_1 = __importDefault(require("express"));
|
|
7
|
-
const router = express_1.default.Router();
|
|
8
8
|
const LiftVersion_1 = require("../lib/LiftVersion");
|
|
9
|
-
const
|
|
9
|
+
const openApiUi = require('openapi-ui');
|
|
10
|
+
const router = express_1.default.Router();
|
|
10
11
|
router.get('/', function (req, res, next) {
|
|
11
12
|
res.send(generateApiDoc());
|
|
12
13
|
});
|
|
13
14
|
exports.default = router;
|
|
14
15
|
function generateApiDoc() {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
var _a, _b, _c;
|
|
17
|
+
console.log('---- Serving up api');
|
|
18
|
+
return openApiUi.generateIndex({
|
|
19
|
+
baseUrl: 'docs',
|
|
20
|
+
title: `${(_a = (0, LiftVersion_1.getProjectName)()) !== null && _a !== void 0 ? _a : ''} ${(_c = (_b = (0, LiftVersion_1.getProjectVersion)()) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : ''}`,
|
|
21
|
+
url: 'docs/apidoc.yaml'
|
|
20
22
|
});
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/expressRoutes/api.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/expressRoutes/api.ts"],"names":[],"mappings":";;;;;AAAA,sDAAsD;AACtD,sDAA6B;AAE7B,oDAAsE;AAEtE,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AACvC,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;AAE/B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,GAAG,EAAE,GAAG,EAAE,IAAI;IACtC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAA;AAC5B,CAAC,CAAC,CAAA;AAEF,kBAAe,MAAM,CAAA;AAErB,SAAS,cAAc;;IACrB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IAClC,OAAO,SAAS,CAAC,aAAa,CAAC;QAC7B,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,GAAG,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,IAAI,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,EAAE;QAC3E,GAAG,EAAE,kBAAkB;KACxB,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -27,42 +27,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.functionBinder = void 0;
|
|
30
|
+
/* eslint @typescript-eslint/no-var-requires: "off" */
|
|
30
31
|
const path_1 = __importDefault(require("path"));
|
|
31
|
-
const clearModule = require('clear-module');
|
|
32
32
|
const ac = __importStar(require("ansi-colors"));
|
|
33
33
|
const pathResolve_1 = require("../lib/pathResolve");
|
|
34
34
|
const express_1 = __importDefault(require("express"));
|
|
35
35
|
const ApiBuildCollector_1 = require("../lib/openAPI/ApiBuildCollector");
|
|
36
36
|
const openApiConstruction_1 = require("../lib/openAPI/openApiConstruction");
|
|
37
|
+
// import * as clearModule from 'clear-module'
|
|
38
|
+
const clearModule = require('clear-module');
|
|
37
39
|
const router = express_1.default.Router();
|
|
38
40
|
function functionBinder() {
|
|
39
41
|
const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
|
|
40
42
|
(0, openApiConstruction_1.buildOpenApi)(defs).then(() => {
|
|
41
43
|
const projectPaths = (0, pathResolve_1.resolvePaths)();
|
|
42
|
-
for (
|
|
44
|
+
for (const def of defs) {
|
|
43
45
|
const { name, pathMap, allowedMethods } = def;
|
|
44
46
|
const methods = allowedMethods.split(',');
|
|
45
47
|
for (let method of methods) {
|
|
46
48
|
method = method.trim().toLowerCase();
|
|
47
|
-
|
|
49
|
+
const rpath = path_1.default.join(projectPaths.buildPath, 'functions', name, 'src', 'main.js');
|
|
48
50
|
clearModule(rpath);
|
|
49
51
|
const { start } = require(rpath);
|
|
50
52
|
let entryRoot = pathMap;
|
|
51
|
-
|
|
53
|
+
const n = entryRoot.indexOf('/{');
|
|
52
54
|
if (n !== -1)
|
|
53
|
-
entryRoot = entryRoot.substring(0, n) +
|
|
55
|
+
entryRoot = entryRoot.substring(0, n) + '/*';
|
|
54
56
|
const callNoBody = (pathMap, req, res) => {
|
|
55
57
|
const event = requestToEvent(pathMap, req);
|
|
56
58
|
Promise.resolve(start(event, null, null)).then(respOut => {
|
|
57
59
|
handleResponse(res, respOut);
|
|
58
|
-
});
|
|
60
|
+
}).catch((reason) => undefined);
|
|
59
61
|
};
|
|
60
62
|
const callWithBody = (pathMap, req, res) => {
|
|
61
63
|
const event = requestToEvent(pathMap, req);
|
|
62
64
|
event.body = req.body;
|
|
63
65
|
Promise.resolve(start(event, null, null)).then(respOut => {
|
|
64
66
|
handleResponse(res, respOut);
|
|
65
|
-
});
|
|
67
|
+
}).catch((reason) => undefined);
|
|
66
68
|
};
|
|
67
69
|
if (method === 'get') {
|
|
68
70
|
router.get(entryRoot, (req, res) => callNoBody(pathMap, req, res));
|
|
@@ -80,39 +82,39 @@ function functionBinder() {
|
|
|
80
82
|
router.delete(entryRoot, (req, res) => callNoBody(pathMap, req, res));
|
|
81
83
|
}
|
|
82
84
|
else {
|
|
83
|
-
console.log(ac.red.bold(
|
|
85
|
+
console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method));
|
|
84
86
|
}
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
|
-
});
|
|
89
|
+
}).catch((reason) => undefined);
|
|
88
90
|
}
|
|
89
91
|
exports.functionBinder = functionBinder;
|
|
90
92
|
function requestToEvent(template, req) {
|
|
91
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
92
|
-
let path = req.originalUrl;
|
|
93
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
94
|
+
let path = (_a = req.originalUrl) !== null && _a !== void 0 ? _a : '';
|
|
93
95
|
const qi = path.indexOf('?');
|
|
94
96
|
if (qi !== -1)
|
|
95
97
|
path = path.substring(0, qi);
|
|
96
|
-
|
|
97
|
-
|
|
98
|
+
const ptci = path.indexOf('://') + 3;
|
|
99
|
+
const ei = path.indexOf('/', ptci);
|
|
98
100
|
let host = path.substring(0, ei);
|
|
99
101
|
if (ptci < 3) {
|
|
100
|
-
host = (
|
|
101
|
-
if (
|
|
102
|
-
host = (
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
host = ptci > 3 ? path.substring(0, ei) :
|
|
102
|
+
host = (_c = (_b = req.headers) === null || _b === void 0 ? void 0 : _b.origin) !== null && _c !== void 0 ? _c : '';
|
|
103
|
+
if (host !== '') {
|
|
104
|
+
host = (_e = (_d = req.headers) === null || _d === void 0 ? void 0 : _d.referer) !== null && _e !== void 0 ? _e : '';
|
|
105
|
+
const ptci = path.indexOf('://') + 3;
|
|
106
|
+
const ei = path.indexOf('/', ptci);
|
|
107
|
+
host = ptci > 3 ? path.substring(0, ei) : '';
|
|
106
108
|
}
|
|
107
|
-
if (
|
|
109
|
+
if (host !== '') {
|
|
108
110
|
// todo: http or https?
|
|
109
|
-
host = (
|
|
111
|
+
host = `http://${(_g = (_f = req.headers) === null || _f === void 0 ? void 0 : _f.host) !== null && _g !== void 0 ? _g : ''}`;
|
|
110
112
|
}
|
|
111
113
|
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
for (
|
|
114
|
+
const cookies = {};
|
|
115
|
+
const cookieString = (_j = (_h = req.headers) === null || _h === void 0 ? void 0 : _h.cookie) !== null && _j !== void 0 ? _j : '';
|
|
116
|
+
const crumbs = cookieString.split(';');
|
|
117
|
+
for (const c of crumbs) {
|
|
116
118
|
const pair = c.split('=');
|
|
117
119
|
if (pair.length === 2)
|
|
118
120
|
cookies[pair[0]] = pair[1];
|
|
@@ -121,13 +123,13 @@ function requestToEvent(template, req) {
|
|
|
121
123
|
const tslots = template.split('/');
|
|
122
124
|
const pslots = path.split('/');
|
|
123
125
|
for (let i = 0; i < tslots.length; i++) {
|
|
124
|
-
const brknm = ((
|
|
126
|
+
const brknm = ((_k = tslots[i]) !== null && _k !== void 0 ? _k : '').trim();
|
|
125
127
|
if (brknm.charAt(0) === '{') {
|
|
126
128
|
const pn = brknm.substring(1, brknm.length - 1);
|
|
127
|
-
parameters[pn] = ((
|
|
129
|
+
parameters[pn] = ((_l = pslots[i]) !== null && _l !== void 0 ? _l : '').trim();
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
|
-
for (
|
|
132
|
+
for (const p of Object.getOwnPropertyNames(req.query)) {
|
|
131
133
|
parameters[p] = req.query[p];
|
|
132
134
|
}
|
|
133
135
|
const eventOut = {
|
|
@@ -144,28 +146,28 @@ function requestToEvent(template, req) {
|
|
|
144
146
|
function handleResponse(res, resp) {
|
|
145
147
|
// console.log(">>>>>>>> Handling response >>>>>>>>>")
|
|
146
148
|
var _a;
|
|
147
|
-
if (resp) {
|
|
149
|
+
if (resp !== undefined) {
|
|
148
150
|
if (resp.cookies !== undefined) {
|
|
149
151
|
// console.log("--- see cookies", resp.cookies)
|
|
150
|
-
|
|
152
|
+
let cookies = [];
|
|
151
153
|
if (Array.isArray(resp.cookies)) {
|
|
152
154
|
cookies = resp.cookies;
|
|
153
155
|
}
|
|
154
156
|
else {
|
|
155
|
-
|
|
157
|
+
const age = (_a = resp.cookies.expireSeconds) !== null && _a !== void 0 ? _a : 60; // 1 minute
|
|
156
158
|
delete resp.expireSeconds;
|
|
157
159
|
Object.getOwnPropertyNames(resp.cookies).forEach(name => {
|
|
158
|
-
|
|
160
|
+
const value = resp.cookies[name];
|
|
159
161
|
cookies.push(`${name}=${value}; Max-Age=${age}; `);
|
|
160
162
|
});
|
|
161
163
|
}
|
|
162
164
|
// console.log("cookies being set", cookies)
|
|
163
|
-
res.setHeader(
|
|
165
|
+
res.setHeader('set-cookie', cookies);
|
|
164
166
|
delete resp.cookies;
|
|
165
167
|
}
|
|
166
168
|
if (resp.headers !== undefined) {
|
|
167
169
|
// if (resp.statusCode === 301) ClogTrace("Redirecting...");
|
|
168
|
-
for (
|
|
170
|
+
for (const hdr of Object.getOwnPropertyNames(resp.headers)) {
|
|
169
171
|
// ClogTrace("Setting header ", hdr, resp.headers[hdr]);
|
|
170
172
|
res.setHeader(hdr, resp.headers[hdr]);
|
|
171
173
|
}
|
|
@@ -177,10 +179,10 @@ function handleResponse(res, resp) {
|
|
|
177
179
|
delete resp.statusCode;
|
|
178
180
|
}
|
|
179
181
|
if (resp.contentType !== undefined) {
|
|
180
|
-
res.setHeader(
|
|
182
|
+
res.setHeader('Content-Type', resp.contentType);
|
|
181
183
|
delete resp.contentType;
|
|
182
184
|
}
|
|
183
|
-
if (resp.body)
|
|
185
|
+
if (resp.body !== undefined)
|
|
184
186
|
resp = resp.body;
|
|
185
187
|
}
|
|
186
188
|
// console.log("headers to be sent", res.getHeaders())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":"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"}
|
package/build/lib/CaseUtils.js
CHANGED
|
@@ -5,7 +5,7 @@ exports.dashCase = exports.snakeCase = exports.pascalCase = exports.camelCase =
|
|
|
5
5
|
function separated(instr) {
|
|
6
6
|
let outstr = '';
|
|
7
7
|
for (let i = 0; i < instr.length; i++) {
|
|
8
|
-
|
|
8
|
+
const c = instr.charAt(i);
|
|
9
9
|
if (!isAlphaNum(c) || isUpperCase(c)) {
|
|
10
10
|
outstr += ' ';
|
|
11
11
|
}
|
|
@@ -43,7 +43,7 @@ function pascalCase(instr) {
|
|
|
43
43
|
}
|
|
44
44
|
exports.pascalCase = pascalCase;
|
|
45
45
|
function snakeCase(instr) {
|
|
46
|
-
return dashCase(instr,
|
|
46
|
+
return dashCase(instr, '_');
|
|
47
47
|
}
|
|
48
48
|
exports.snakeCase = snakeCase;
|
|
49
49
|
function dashCase(instr, dashChar = '-', allCaps = false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CaseUtils.js","sourceRoot":"","sources":["../../src/lib/CaseUtils.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,SAAgB,SAAS,
|
|
1
|
+
{"version":3,"file":"CaseUtils.js","sourceRoot":"","sources":["../../src/lib/CaseUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ function recurseDirectory(dirpath, callback) {
|
|
|
11
11
|
fs_1.default.readdirSync(dirpath).forEach((file) => {
|
|
12
12
|
const fpath = path_1.default.join(dirpath, file);
|
|
13
13
|
const stat = fs_1.default.lstatSync(fpath);
|
|
14
|
-
if (callback && !callback(fpath, stat)) {
|
|
14
|
+
if ((callback != null) && !callback(fpath, stat)) {
|
|
15
15
|
if (stat.isDirectory()) {
|
|
16
16
|
recurseDirectory(fpath, callback);
|
|
17
17
|
}
|
|
@@ -24,11 +24,12 @@ function latestModification(dirpath, match) {
|
|
|
24
24
|
let latestTime = new Date(0);
|
|
25
25
|
if (fs_1.default.existsSync(dirpath)) {
|
|
26
26
|
recurseDirectory(dirpath, (filepath, stats) => {
|
|
27
|
-
|
|
28
|
-
if (basefile.match(match)) {
|
|
27
|
+
const basefile = filepath.substring(filepath.lastIndexOf('/') + 1);
|
|
28
|
+
if (basefile.match(match) != null) {
|
|
29
29
|
if (stats.mtime > latestTime)
|
|
30
30
|
latestTime = stats.mtime;
|
|
31
31
|
}
|
|
32
|
+
return false;
|
|
32
33
|
});
|
|
33
34
|
}
|
|
34
35
|
return latestTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DirectoryUtils.js","sourceRoot":"","sources":["../../src/lib/DirectoryUtils.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"DirectoryUtils.js","sourceRoot":"","sources":["../../src/lib/DirectoryUtils.ts"],"names":[],"mappings":";;;;;;AACA,4CAA8B;AAC9B,gDAAuB;AAKvB,mFAAmF;AACnF,SAAgB,gBAAgB,CAAE,OAAe,EAAE,QAAoB;IACrE,YAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;QAC/C,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACtC,MAAM,IAAI,GAAG,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAChC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACvB,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;YACnC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAVD,4CAUC;AAED,kEAAkE;AAClE,SAAgB,kBAAkB,CAAE,OAAe,EAAE,KAAa;IAChE,IAAI,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;IAC5B,IAAI,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,gBAAgB,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,KAAY,EAAE,EAAE;YAC3D,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;YAClE,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,IAAI,KAAK,CAAC,KAAK,GAAG,UAAU;oBAAE,UAAU,GAAG,KAAK,CAAC,KAAK,CAAA;YACxD,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAZD,gDAYC"}
|
package/build/lib/LiftConfig.js
CHANGED
|
@@ -9,51 +9,51 @@ exports.getAWSCredentials = exports.getSettings = exports.areSettingsAvailable =
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const fs_1 = __importDefault(require("fs"));
|
|
11
11
|
const credential_providers_1 = require("@aws-sdk/credential-providers");
|
|
12
|
-
let
|
|
12
|
+
let sLiftConfigLoaded = null;
|
|
13
13
|
// Defines the structure of the .mistlft json file
|
|
14
14
|
// All relevant configuration for the cloud host goes here
|
|
15
15
|
class LiftConfig {
|
|
16
16
|
constructor() {
|
|
17
|
-
this.cloudHost =
|
|
17
|
+
this.cloudHost = 'AWS'; // all we support now
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
exports.LiftConfig = LiftConfig;
|
|
21
21
|
// Available for general use because, why not?
|
|
22
22
|
function getUserHome() {
|
|
23
23
|
var _a, _b, _c;
|
|
24
|
-
return (_c = (_b = (_a = process.env.HOME) !== null && _a !== void 0 ? _a : process.env.HOMEPATH) !== null && _b !== void 0 ? _b : process.env.USERPROFILE) !== null && _c !== void 0 ? _c :
|
|
24
|
+
return (_c = (_b = (_a = process.env.HOME) !== null && _a !== void 0 ? _a : process.env.HOMEPATH) !== null && _b !== void 0 ? _b : process.env.USERPROFILE) !== null && _c !== void 0 ? _c : '~';
|
|
25
25
|
}
|
|
26
26
|
exports.getUserHome = getUserHome;
|
|
27
27
|
function LoadLiftConfig() {
|
|
28
|
-
if (
|
|
29
|
-
const mistlift = path_1.default.join(getUserHome(),
|
|
30
|
-
let configJson =
|
|
28
|
+
if (sLiftConfigLoaded == null) {
|
|
29
|
+
const mistlift = path_1.default.join(getUserHome(), '.mistlift');
|
|
30
|
+
let configJson = '{}';
|
|
31
31
|
if (fs_1.default.existsSync(mistlift)) {
|
|
32
32
|
try {
|
|
33
33
|
configJson = fs_1.default.readFileSync(mistlift).toString();
|
|
34
|
-
|
|
34
|
+
sLiftConfigLoaded = JSON.parse(configJson);
|
|
35
35
|
}
|
|
36
36
|
catch (e) {
|
|
37
37
|
//
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
-
return
|
|
41
|
+
return sLiftConfigLoaded;
|
|
42
42
|
}
|
|
43
43
|
exports.LoadLiftConfig = LoadLiftConfig;
|
|
44
44
|
function resetLiftConfig() {
|
|
45
|
-
|
|
45
|
+
sLiftConfigLoaded = null;
|
|
46
46
|
}
|
|
47
47
|
exports.resetLiftConfig = resetLiftConfig;
|
|
48
48
|
function areSettingsAvailable() {
|
|
49
|
-
const mistlift = path_1.default.join(getUserHome(),
|
|
49
|
+
const mistlift = path_1.default.join(getUserHome(), '.mistlift');
|
|
50
50
|
return fs_1.default.existsSync(mistlift);
|
|
51
51
|
}
|
|
52
52
|
exports.areSettingsAvailable = areSettingsAvailable;
|
|
53
53
|
function getSettings() {
|
|
54
|
-
if (
|
|
54
|
+
if (sLiftConfigLoaded == null)
|
|
55
55
|
LoadLiftConfig();
|
|
56
|
-
return
|
|
56
|
+
return sLiftConfigLoaded;
|
|
57
57
|
}
|
|
58
58
|
exports.getSettings = getSettings;
|
|
59
59
|
/**
|
|
@@ -65,18 +65,16 @@ exports.getSettings = getSettings;
|
|
|
65
65
|
function getAWSCredentials() {
|
|
66
66
|
var _a, _b;
|
|
67
67
|
let config = LoadLiftConfig();
|
|
68
|
-
if (
|
|
68
|
+
if (config == null) {
|
|
69
69
|
// console.error("No .mistlift configuration found - using AWS default profile");
|
|
70
|
-
config = { cloudHost:
|
|
70
|
+
config = { cloudHost: 'AWS', awsIniProfile: 'default' };
|
|
71
71
|
}
|
|
72
|
-
if (((_a = config.cloudHost) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !==
|
|
73
|
-
throw Error(
|
|
72
|
+
if (((_a = config.cloudHost) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'AWS') {
|
|
73
|
+
throw Error('HostType Not Supported');
|
|
74
74
|
}
|
|
75
75
|
let credentials = {};
|
|
76
|
-
const profile = (_b = config.awsIniProfile) !== null && _b !== void 0 ? _b :
|
|
77
|
-
|
|
78
|
-
credentials = (0, credential_providers_1.fromIni)({ profile });
|
|
79
|
-
}
|
|
76
|
+
const profile = (_b = config.awsIniProfile) !== null && _b !== void 0 ? _b : 'default';
|
|
77
|
+
credentials = (0, credential_providers_1.fromIni)({ profile });
|
|
80
78
|
return credentials;
|
|
81
79
|
}
|
|
82
80
|
exports.getAWSCredentials = getAWSCredentials;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiftConfig.js","sourceRoot":"","sources":["../../src/lib/LiftConfig.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,2DAA2D;;;;;;AAE3D,
|
|
1
|
+
{"version":3,"file":"LiftConfig.js","sourceRoot":"","sources":["../../src/lib/LiftConfig.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,2DAA2D;;;;;;AAE3D,gDAAuB;AACvB,4CAAmB;AACnB,wEAAuD;AAEvD,IAAI,iBAAiB,GAAsB,IAAI,CAAA;AAE/C,kDAAkD;AAClD,0DAA0D;AAC1D,MAAa,UAAU;IAAvB;QACS,cAAS,GAAW,KAAK,CAAA,CAAC,qBAAqB;IAKxD,CAAC;CAAA;AAND,gCAMC;AAGD,8CAA8C;AAC9C,SAAgB,WAAW;;IACzB,OAAO,MAAA,MAAA,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,mCAAI,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,GAAG,CAAA;AACnF,CAAC;AAFD,kCAEC;AAED,SAAgB,cAAc;IAC5B,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,CAAA;QACtD,IAAI,UAAU,GAAG,IAAI,CAAA;QACrB,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,UAAU,GAAG,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAA;gBACjD,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YAC5C,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,EAAE;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAdD,wCAcC;AACD,SAAgB,eAAe;IAC7B,iBAAiB,GAAG,IAAI,CAAA;AAC1B,CAAC;AAFD,0CAEC;AAED,SAAgB,oBAAoB;IAClC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,CAAA;IACtD,OAAO,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;AAChC,CAAC;AAHD,oDAGC;AAED,SAAgB,WAAW;IACzB,IAAI,iBAAiB,IAAI,IAAI;QAAE,cAAc,EAAE,CAAA;IAC/C,OAAO,iBAA+B,CAAA;AACxC,CAAC;AAHD,kCAGC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB;;IAC/B,IAAI,MAAM,GAAG,cAAc,EAAE,CAAA;IAC7B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,iFAAiF;QACjF,MAAM,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,CAAA;IACzD,CAAC;IACD,IAAI,CAAA,MAAA,MAAM,CAAC,SAAS,0CAAE,WAAW,EAAE,MAAK,KAAK,EAAE,CAAC;QAC9C,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAA;IACvC,CAAC;IACD,IAAI,WAAW,GAAG,EAAE,CAAA;IACpB,MAAM,OAAO,GAAG,MAAA,MAAM,CAAC,aAAa,mCAAI,SAAS,CAAA;IACjD,WAAW,GAAG,IAAA,8BAAO,EAAC,EAAE,OAAO,EAAE,CAAC,CAAA;IAClC,OAAO,WAAW,CAAA;AACpB,CAAC;AAbD,8CAaC"}
|