@tremho/mist-lift 2.4.0 → 2.5.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 +5 -0
- package/build/commands/actions/initQuestions.js +18 -9
- package/build/commands/actions/initQuestions.js.map +1 -1
- package/build/commands/actions/setupPackageJson.js +20 -11
- package/build/commands/actions/setupPackageJson.js.map +1 -1
- package/build/commands/actions/updateDeployedPermissions.js +22 -13
- package/build/commands/actions/updateDeployedPermissions.js.map +1 -1
- package/build/commands/build.js +18 -9
- package/build/commands/build.js.map +1 -1
- package/build/commands/builtin/ApiDocMaker.js +3 -4
- package/build/commands/builtin/ApiDocMaker.js.map +1 -1
- package/build/commands/builtin/BuiltInHandler.js +20 -11
- package/build/commands/builtin/BuiltInHandler.js.map +1 -1
- package/build/commands/builtin/DeployBuiltInZip.js +1 -2
- package/build/commands/builtin/DeployBuiltInZip.js.map +1 -1
- package/build/commands/builtin/ExportWebroot.js +24 -13
- package/build/commands/builtin/ExportWebroot.js.map +1 -1
- package/build/commands/builtin/StageWebrootZip.js +18 -9
- package/build/commands/builtin/StageWebrootZip.js.map +1 -1
- package/build/commands/builtin/webroot-export/s3webroot.js +21 -10
- package/build/commands/builtin/webroot-export/s3webroot.js.map +1 -1
- package/build/commands/create.js +18 -9
- package/build/commands/create.js.map +1 -1
- package/build/commands/deploy.js +19 -10
- package/build/commands/deploy.js.map +1 -1
- package/build/commands/doctor.js +19 -10
- package/build/commands/doctor.js.map +1 -1
- package/build/commands/help.js +34 -24
- package/build/commands/help.js.map +1 -1
- package/build/commands/info.js +18 -9
- package/build/commands/info.js.map +1 -1
- package/build/commands/init.js +67 -18
- package/build/commands/init.js.map +1 -1
- package/build/commands/package.js +21 -10
- package/build/commands/package.js.map +1 -1
- package/build/commands/publish.js +19 -10
- package/build/commands/publish.js.map +1 -1
- package/build/commands/settings.js +18 -9
- package/build/commands/settings.js.map +1 -1
- package/build/commands/start.js +18 -9
- package/build/commands/start.js.map +1 -1
- package/build/commands/test.js +18 -9
- package/build/commands/test.js.map +1 -1
- package/build/commands/update.js +18 -9
- package/build/commands/update.js.map +1 -1
- package/build/expressRoutes/all.js +18 -9
- package/build/expressRoutes/all.js.map +1 -1
- package/build/expressRoutes/functionBinder.js +28 -15
- package/build/expressRoutes/functionBinder.js.map +1 -1
- package/build/integration-tests/quickstart-scenario.test.js +5 -4
- package/build/integration-tests/quickstart-scenario.test.js.map +1 -1
- package/build/lib/CaseUtils.js +5 -6
- package/build/lib/CaseUtils.js.map +1 -1
- package/build/lib/DirectoryUtils.js +2 -3
- package/build/lib/DirectoryUtils.js.map +1 -1
- package/build/lib/ESBuild.js +19 -10
- package/build/lib/ESBuild.js.map +1 -1
- package/build/lib/IdSrc.js +6 -6
- package/build/lib/IdSrc.js.map +1 -1
- package/build/lib/LiftConfig.js +7 -7
- package/build/lib/LiftConfig.js.map +1 -1
- package/build/lib/LiftVersion.js +21 -11
- package/build/lib/LiftVersion.js.map +1 -1
- package/build/lib/Tests/fileCompare.test.js +17 -7
- package/build/lib/Tests/fileCompare.test.js.map +1 -1
- package/build/lib/TypeCheck.js +8 -6
- package/build/lib/TypeCheck.js.map +1 -1
- package/build/lib/askQuestion.js +18 -9
- package/build/lib/askQuestion.js.map +1 -1
- package/build/lib/executeCommand.js +1 -2
- package/build/lib/executeCommand.js.map +1 -1
- package/build/lib/fileCompare.js +2 -3
- package/build/lib/fileCompare.js.map +1 -1
- package/build/lib/openAPI/ApiBuildCollector.js +1 -2
- package/build/lib/openAPI/ApiBuildCollector.js.map +1 -1
- package/build/lib/openAPI/WebrootFileSupport.js +18 -9
- package/build/lib/openAPI/WebrootFileSupport.js.map +1 -1
- package/build/lib/openAPI/openApiConstruction.js +46 -32
- package/build/lib/openAPI/openApiConstruction.js.map +1 -1
- package/build/lib/pathResolve.js +1 -2
- package/build/lib/pathResolve.js.map +1 -1
- package/build/lib/utils.js +20 -11
- package/build/lib/utils.js.map +1 -1
- package/build/lift.js +18 -8
- package/build/lift.js.map +1 -1
- package/package.json +3 -4
- package/src/commands/actions/updateDeployedPermissions.ts +1 -1
- package/src/commands/builtin/ExportWebroot.ts +5 -5
- package/src/commands/builtin/webroot-export/s3webroot.ts +4 -0
- package/src/commands/help.ts +4 -2
- package/src/commands/init.ts +51 -8
- package/src/commands/package.ts +3 -1
- package/src/commands/publish.ts +5 -4
- package/src/expressRoutes/functionBinder.ts +14 -10
- package/src/integration-tests/quickstart-scenario.test.ts +5 -4
- package/src/lib/IdSrc.ts +2 -2
- package/src/lib/TypeCheck.ts +3 -0
- package/src/lib/openAPI/openApiConstruction.ts +37 -32
- package/src/lift.ts +1 -1
- package/templateData/app/MainPage.tsx +10 -0
- package/templateData/app/app.tsx +39 -0
- package/templateData/webroot/app.js +7 -7
- package/tsconfig.json +2 -2
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
45
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
46
|
};
|
|
37
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.buildOpenApi =
|
|
48
|
+
exports.buildOpenApi = buildOpenApi;
|
|
39
49
|
/**
|
|
40
50
|
* This is part 2 of 2 -- we take our pre-built json array of definitions and apply them to openApi in this phase.
|
|
41
51
|
*/
|
|
@@ -143,9 +153,8 @@ function buildOpenApi(defs_1) {
|
|
|
143
153
|
return bytes;
|
|
144
154
|
});
|
|
145
155
|
}
|
|
146
|
-
exports.buildOpenApi = buildOpenApi;
|
|
147
156
|
function addTypeSchema(builder, schemaName, schema) {
|
|
148
|
-
var _a, _b, _c, _d;
|
|
157
|
+
var _a, _b, _c, _d, _e;
|
|
149
158
|
let primType = '';
|
|
150
159
|
let type = (_a = schema === null || schema === void 0 ? void 0 : schema.type) !== null && _a !== void 0 ? _a : 'Empty';
|
|
151
160
|
if (type === 'empty')
|
|
@@ -155,8 +164,9 @@ function addTypeSchema(builder, schemaName, schema) {
|
|
|
155
164
|
type = type.substring(0, type.length - 2);
|
|
156
165
|
if (type === 'string' || type === 'number' || type === 'object')
|
|
157
166
|
primType = type;
|
|
158
|
-
const
|
|
159
|
-
const
|
|
167
|
+
// const sm: string = schema?.mime
|
|
168
|
+
// const mime: string = sm !== '' ?? primType !== '' ? 'text/plain' : 'application/json'
|
|
169
|
+
const sref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
|
|
160
170
|
let ref = {};
|
|
161
171
|
if (isArray) {
|
|
162
172
|
ref = { type: 'array', items: sref };
|
|
@@ -168,19 +178,20 @@ function addTypeSchema(builder, schemaName, schema) {
|
|
|
168
178
|
if (ref.type === 'object')
|
|
169
179
|
ref.properties = {};
|
|
170
180
|
const constraints = schema.type !== 'object' && Array.isArray(schema === null || schema === void 0 ? void 0 : schema.constraints) ? (0, TypeCheck_1.parseConstraints)(schema.type, schema.constraints.join('\n'), '\n') : undefined;
|
|
171
|
-
const cdesc = (constraints != null) ? '\n - ' + ((
|
|
181
|
+
const cdesc = (constraints != null) ? '\n - ' + ((_b = constraints.describe()) !== null && _b !== void 0 ? _b : '').split('\n').join('\n - ') : '';
|
|
172
182
|
let description = schema.description;
|
|
173
|
-
if (cdesc)
|
|
183
|
+
if (cdesc !== '')
|
|
174
184
|
description += cdesc;
|
|
175
185
|
ref.description = description;
|
|
176
186
|
const required = [];
|
|
177
187
|
if (ref.properties) {
|
|
178
|
-
|
|
188
|
+
const sp = (_c = schema.properties) !== null && _c !== void 0 ? _c : {};
|
|
189
|
+
for (const [propName, propDef] of Object.entries(sp)) {
|
|
179
190
|
const pda = propDef;
|
|
180
191
|
const constraints = Array.isArray(pda === null || pda === void 0 ? void 0 : pda.constraints) ? (0, TypeCheck_1.parseConstraints)(pda.type, pda.constraints.join('\n'), '\n') : undefined;
|
|
181
192
|
const cdesc = (constraints != null) ? '\n - ' + ((_d = constraints.describe()) !== null && _d !== void 0 ? _d : '').split('\n').join('\n - ') : '';
|
|
182
193
|
let description = propDef.description;
|
|
183
|
-
if (cdesc)
|
|
194
|
+
if (cdesc !== '')
|
|
184
195
|
description += cdesc;
|
|
185
196
|
// if(constraints) {
|
|
186
197
|
// console.log("schema definition for "+schemaName+', prop '+propName)
|
|
@@ -193,7 +204,8 @@ function addTypeSchema(builder, schemaName, schema) {
|
|
|
193
204
|
// You can add other custom handling here (e.g., enums, format, pattern)
|
|
194
205
|
ref.properties[propName] = propSchema;
|
|
195
206
|
// Only mark as required if declared explicitly
|
|
196
|
-
|
|
207
|
+
const sr = (_e = schema.required) !== null && _e !== void 0 ? _e : '';
|
|
208
|
+
if (sr !== '' && sr.includes(propName)) {
|
|
197
209
|
required.push(propName);
|
|
198
210
|
}
|
|
199
211
|
}
|
|
@@ -205,7 +217,7 @@ function addTypeSchema(builder, schemaName, schema) {
|
|
|
205
217
|
}
|
|
206
218
|
function addFunctionMethod(pathDef_1, method_1, def_1) {
|
|
207
219
|
return __awaiter(this, arguments, void 0, function* (pathDef, method, def, includeCORS = true) {
|
|
208
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
220
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
209
221
|
const retDef = (def.returns)['200'];
|
|
210
222
|
const content = {};
|
|
211
223
|
let primType = '';
|
|
@@ -217,8 +229,9 @@ function addFunctionMethod(pathDef_1, method_1, def_1) {
|
|
|
217
229
|
type = type.substring(0, type.length - 2);
|
|
218
230
|
if (type === 'string' || type === 'number' || type === 'object')
|
|
219
231
|
primType = type;
|
|
220
|
-
const
|
|
221
|
-
const
|
|
232
|
+
const rdm = (_b = retDef === null || retDef === void 0 ? void 0 : retDef.mime) !== null && _b !== void 0 ? _b : '';
|
|
233
|
+
const mime = rdm !== '' ? rdm : primType !== '' ? 'text/plain' : 'application/json';
|
|
234
|
+
const ref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
|
|
222
235
|
let schema;
|
|
223
236
|
if (isArray) {
|
|
224
237
|
schema = { type: 'array', items: ref };
|
|
@@ -230,15 +243,16 @@ function addFunctionMethod(pathDef_1, method_1, def_1) {
|
|
|
230
243
|
schema
|
|
231
244
|
};
|
|
232
245
|
const region = (_d = (_c = (0, LiftConfig_1.getSettings)()) === null || _c === void 0 ? void 0 : _c.awsPreferredRegion) !== null && _d !== void 0 ? _d : '';
|
|
233
|
-
const accountId = yield (0, IdSrc_1.getAccountId)();
|
|
234
|
-
const decName = (0, IdSrc_1.decoratedName)(def.name);
|
|
235
|
-
const
|
|
246
|
+
const accountId = (_e = yield (0, IdSrc_1.getAccountId)()) !== null && _e !== void 0 ? _e : '';
|
|
247
|
+
const decName = (_f = (0, IdSrc_1.decoratedName)(def.name)) !== null && _f !== void 0 ? _f : '';
|
|
248
|
+
const bodyType = (_g = def.bodyType) !== null && _g !== void 0 ? _g : '';
|
|
249
|
+
const isBinary = bodyType.startsWith('text') && bodyType.endsWith('json');
|
|
236
250
|
const methData = {
|
|
237
251
|
summary: def.name,
|
|
238
252
|
description: def.description,
|
|
239
253
|
responses: {
|
|
240
254
|
200: {
|
|
241
|
-
description: (
|
|
255
|
+
description: (_h = retDef === null || retDef === void 0 ? void 0 : retDef.description) !== null && _h !== void 0 ? _h : 'Success Response',
|
|
242
256
|
headers: includeCORS
|
|
243
257
|
? {
|
|
244
258
|
'Access-Control-Allow-Origin': {
|
|
@@ -275,11 +289,11 @@ function addFunctionMethod(pathDef_1, method_1, def_1) {
|
|
|
275
289
|
if (!includeCORS) {
|
|
276
290
|
// get the other response code declarations
|
|
277
291
|
for (const rcode of Object.getOwnPropertyNames(def.returns)) {
|
|
278
|
-
if (rcode
|
|
279
|
-
const retDef = (
|
|
292
|
+
if (rcode !== '200') {
|
|
293
|
+
const retDef = (_j = def.returns[rcode]) !== null && _j !== void 0 ? _j : {};
|
|
280
294
|
const content = {};
|
|
281
295
|
let primType = '';
|
|
282
|
-
let type = (
|
|
296
|
+
let type = (_k = retDef === null || retDef === void 0 ? void 0 : retDef.type) !== null && _k !== void 0 ? _k : 'Empty';
|
|
283
297
|
if (type === 'empty')
|
|
284
298
|
type = 'Empty'; // fix case
|
|
285
299
|
const isArray = (type.endsWith('[]'));
|
|
@@ -287,8 +301,8 @@ function addFunctionMethod(pathDef_1, method_1, def_1) {
|
|
|
287
301
|
type = type.substring(0, type.length - 2);
|
|
288
302
|
if (type === 'string' || type === 'number' || type === 'object')
|
|
289
303
|
primType = type;
|
|
290
|
-
const mime = (
|
|
291
|
-
const ref = primType ? { type: primType } : { $ref: '#/components/schemas/' + type };
|
|
304
|
+
const mime = (retDef === null || retDef === void 0 ? void 0 : retDef.mime) !== undefined ? (primType === null || primType === void 0 ? void 0 : primType.length) > 0 ? 'text/plain' : 'application/json' : '';
|
|
305
|
+
const ref = primType !== '' ? { type: primType } : { $ref: '#/components/schemas/' + type };
|
|
292
306
|
let schema;
|
|
293
307
|
if (isArray) {
|
|
294
308
|
schema = { type: 'array', items: ref };
|
|
@@ -374,7 +388,7 @@ function addParameter(pathDef, param) {
|
|
|
374
388
|
const constraints = Array.isArray(param.constraints) ? (0, TypeCheck_1.parseConstraints)(param.type, param.constraints.join('\n'), '\n') : undefined;
|
|
375
389
|
const cdesc = (constraints != null) ? '\n - ' + ((_g = constraints.describe()) !== null && _g !== void 0 ? _g : '').split('\n').join('\n - ') : '';
|
|
376
390
|
let description = param.description;
|
|
377
|
-
if (cdesc)
|
|
391
|
+
if (cdesc !== '')
|
|
378
392
|
description += cdesc;
|
|
379
393
|
// don't declare parameters marked as 'body'. OpenAPI doesn't support that.
|
|
380
394
|
if (param.in === 'path' || param.in === 'query') {
|
|
@@ -382,7 +396,7 @@ function addParameter(pathDef, param) {
|
|
|
382
396
|
in: param.in,
|
|
383
397
|
name: param.name,
|
|
384
398
|
description,
|
|
385
|
-
example: example
|
|
399
|
+
example: example !== null && example !== void 0 ? example : undefined,
|
|
386
400
|
required,
|
|
387
401
|
schema: schemaType(deflt, type, true)
|
|
388
402
|
});
|
|
@@ -414,7 +428,7 @@ function schemaType(deflt, namedType, innerOnly) {
|
|
|
414
428
|
type = 'integer';
|
|
415
429
|
if (type === 'bool')
|
|
416
430
|
type = 'boolean';
|
|
417
|
-
if (
|
|
431
|
+
if (deflt === null || deflt === '')
|
|
418
432
|
deflt = undefined;
|
|
419
433
|
return innerOnly ? { type, format, example: deflt } : { schema: { type, format, example: deflt } };
|
|
420
434
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,6CAAkD;AAClD,4CAAmB;AACnB,gDAAuB;AACvB,gDAA6C;AAC7C,gDAAiC;AACjC,oCAAsD;AACtD,8CAA8D;AAC9D,4CAA+D;AAC/D,sDAA0B;AAE1B,SAAsB,YAAY;yDAChC,IAAW,EACX,iBAA0B,KAAK,EAC/B,cAAuB,KAAK,EAC5B,QAAiB;;QAEjB,MAAM,OAAO,GAAG,IAAI,sBAAc,EAAE,CAAA;QAEpC,2CAA2C;QAE3C,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAY,GAAE,CAAA;QACzC,IAAI,CAAC,YAAY,CAAC,QAAQ;YAAE,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA,CAAC,8BAA8B;QAEnF,qDAAqD;QACrD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAA;QACxC,IAAI,GAAG,GAAQ,EAAE,CAAA;QACjB,IAAI,CAAC;YAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAAC,CAAC;QAAC,WAAM,CAAC,CAAA,CAAC;QACtE,MAAM,KAAK,GAAW,MAAA,GAAG,CAAC,IAAI,mCAAI,EAAE,CAAA;QACpC,iCAAiC;QACjC,uCAAuC;QACvC,+CAA+C;QAC/C,MAAM,OAAO,GAAW,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;QAEzC,wDAAwD;QACxD,kEAAkE;QAClE,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAA;QAC7E,IAAI,OAAO,GAAQ,EAAE,CAAA;QACrB,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5D,CAAC;QACD,uCAAuC;QAEvC,wHAAwH;QAExH,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,KAAK;YAC5B,oBAAoB;YACpB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,mCAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAChE,CAAA;QACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAErB,mCAAmC;QACnC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,EAAE,CAAA;YAClB,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,cAAc;gBAAE,SAAQ,CAAC,eAAe;YAErE,MAAM,UAAU,GAAG,MAAA,GAAG,CAAC,UAAU,mCAAI,EAAE,CAAA;YACvC,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;YACvB,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,yBAAyB,GAAG,CAAC,IAAc,EAAE,CAAC,CAAC,CAAA;gBAClE,IAAI,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,4BAA4B;wBAChK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC,CAAA;oBAC9G,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC/C,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,EAAE,CAAA;YACjC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;gBAClC,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;YAC5C,CAAC;YACD,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YACpC,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAA;YAC1D,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,WAAW;gBAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;YAC7C,IAAI,OAAO,GAAG,MAAA,GAAG,CAAC,OAAO,mCAAI,GAAG,GAAI,GAAG,CAAC,IAAe,CAAA;YACvD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;YAElC,uCAAuC;YACvC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAEjC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE;gBACzB,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,QAAQ;aACf,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,cAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;QAE9F,MAAM,MAAM,GAAG,CAAC,GAAW,EAAc,EAAE;YACzC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA,CAAC,wBAAwB;YACpE,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAA;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrD,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;YAChC,CAAC;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAA;QAC9B,IAAI,CAAC,wCAAwC,CAAC,GAAG;YAC/C,0BAA0B;YAC1B,SAAS;YACT,SAAS;SACV,CAAA;QACD,MAAM,QAAQ,GAAG,iBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;QAC9B,yBAAyB;QACzB,YAAE,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACnC,IAAI;QACJ,OAAO,KAAK,CAAA;IACd,CAAC;CAAA;AAvGD,oCAuGC;AAED,SAAS,aAAa,CAAE,OAAY,EAAE,UAAkB,EAAE,MAAW;;IACnE,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,IAAI,IAAI,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,OAAO,CAAA;IAClC,IAAI,IAAI,KAAK,OAAO;QAAE,IAAI,GAAG,OAAO,CAAA,CAAC,WAAW;IAChD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IACrC,IAAI,OAAO;QAAE,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtD,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ;QAAE,QAAQ,GAAG,IAAI,CAAA;IAChF,MAAM,IAAI,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,QAAQ,EAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAA;IACzE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,uBAAuB,GAAG,IAAI,EAAE,CAAA;IACrF,IAAI,GAAG,GAAQ,EAAE,CAAA;IACjB,IAAI,OAAO,EAAE,CAAC;QACZ,GAAG,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACtC,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,IAAI,CAAA;IACZ,CAAC;IAED,GAAG,CAAC,KAAK,GAAG,UAAU,CAAA;IAEtB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;QAAE,GAAG,CAAC,UAAU,GAAG,EAAE,CAAA;IAE9C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,4BAAgB,EAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEnK,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,MAAA,WAAW,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/G,IAAI,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;IACpC,IAAI,KAAK;QAAE,WAAW,IAAI,KAAK,CAAA;IAE/B,GAAG,CAAC,WAAW,GAAG,WAAW,CAAA;IAE7B,MAAM,QAAQ,GAAa,EAAE,CAAA;IAE7B,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QACnB,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;YAC1E,MAAM,GAAG,GAAG,OAAc,CAAA;YAC1B,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAE9H,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,MAAA,WAAW,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAC/G,IAAI,WAAW,GAAI,OAAe,CAAC,WAAW,CAAA;YAC9C,IAAI,KAAK;gBAAE,WAAW,IAAI,KAAK,CAAA;YAE/B,oBAAoB;YACpB,wEAAwE;YACxE,6BAA6B;YAC7B,IAAI;YAEJ,MAAM,UAAU,GAAQ;gBACtB,IAAI,EAAG,OAAe,CAAC,IAAI;gBAC3B,WAAW;aACZ,CAAA;YAED,wEAAwE;YACxE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAA;YAErC,+CAA+C;YAC/C,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1D,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;AACpC,CAAC;AAED,SAAe,iBAAiB;yDAAE,OAAY,EAAE,MAAc,EAAE,GAAQ,EAAE,WAAW,GAAG,IAAI;;QAC1F,MAAM,MAAM,GAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;QACxC,MAAM,OAAO,GAAQ,EAAE,CAAA;QACvB,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,IAAI,IAAI,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,OAAO,CAAA;QAClC,IAAI,IAAI,KAAK,OAAO;YAAE,IAAI,GAAG,OAAO,CAAA,CAAC,WAAW;QAChD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QACrC,IAAI,OAAO;YAAE,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACtD,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ;YAAE,QAAQ,GAAG,IAAI,CAAA;QAChF,MAAM,IAAI,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,QAAQ,EAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAA;QACzE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,uBAAuB,GAAG,IAAI,EAAE,CAAA;QACpF,IAAI,MAAW,CAAA;QACf,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,CAAA;QACd,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG;YACd,MAAM;SACP,CAAA;QAED,MAAM,MAAM,GAAG,MAAA,MAAA,IAAA,wBAAW,GAAE,0CAAE,kBAAkB,mCAAI,EAAE,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAY,GAAE,CAAA;QACtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEvC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAEnG,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,GAAG,CAAC,IAAI;YACjB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE;gBACT,GAAG,EAAE;oBACH,WAAW,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,mCAAI,kBAAkB;oBACtD,OAAO,EAAE,WAAW;wBAClB,CAAC,CAAC;4BACE,6BAA6B,EAAE;gCAC7B,MAAM,EAAE;oCACN,IAAI,EAAE,QAAQ;iCACf;gCACD,OAAO,EAAE,GAAG;6BACb;4BACD,8BAA8B,EAAE;gCAC9B,MAAM,EAAE;oCACN,IAAI,EAAE,QAAQ;iCACf;gCACD,OAAO,EAAE,6BAA6B;6BACvC;4BACD,8BAA8B,EAAE;gCAC9B,MAAM,EAAE;oCACN,IAAI,EAAE,QAAQ;iCACf;gCACD,OAAO,EAAE,sBAAsB;6BAChC;yBACF;wBACH,CAAC,CAAC,SAAS;oBACb,OAAO;iBACR;aACF;YACD,iCAAiC,EAAE;gBACjC,GAAG,EAAE,sBAAsB,MAAM,oDAAoD,MAAM,IAAI,SAAS,aAAa,OAAO,cAAc;gBAC1I,mBAAmB,EAAE,eAAe;gBACpC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS;gBAC3D,UAAU,EAAE,MAAM,EAAE,gFAAgF;gBACpG,IAAI,EAAE,WAAW;aAClB;SACF,CAAA;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,2CAA2C;YAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5D,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;oBACnB,MAAM,MAAM,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAA;oBAEvC,MAAM,OAAO,GAAQ,EAAE,CAAA;oBACvB,IAAI,QAAQ,GAAG,EAAE,CAAA;oBACjB,IAAI,IAAI,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,OAAO,CAAA;oBAClC,IAAI,IAAI,KAAK,OAAO;wBAAE,IAAI,GAAG,OAAO,CAAA,CAAC,WAAW;oBAChD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;oBACrC,IAAI,OAAO;wBAAE,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;oBACtD,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,QAAQ;wBAAE,QAAQ,GAAG,IAAI,CAAA;oBAChF,MAAM,IAAI,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,mCAAI,QAAQ,EAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAA;oBACzE,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,uBAAuB,GAAG,IAAI,EAAE,CAAA;oBACpF,IAAI,MAAW,CAAA;oBACf,IAAI,OAAO,EAAE,CAAC;wBACZ,MAAM,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;oBACxC,CAAC;yBAAM,CAAC;wBACN,MAAM,GAAG,GAAG,CAAA;oBACd,CAAC;oBACD,OAAO,CAAC,IAAI,CAAC,GAAG;wBACd,MAAM;qBACP,CAAA;oBACD,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;oBACxB,QAAQ,CAAC,SAAiB,CAAC,KAAK,CAAC,GAAG,MAAM,CAAA;gBAC7C,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAA;IAC5B,CAAC;CAAA;AACD,SAAS,mBAAmB,CAAE,OAAY;IACxC,8EAA8E;IAC9E,uBAAuB;IACvB,OAAO,CAAC,OAAO,GAAG;QAChB,OAAO,EAAE,cAAc;QACvB,SAAS,EAAE;YACT,GAAG,EAAE;gBACH,WAAW,EAAE,eAAe;gBAC5B,OAAO,EAAE;oBACP,6BAA6B,EAAE;wBAC7B,MAAM,EAAE;4BACN,IAAI,EAAE,QAAQ;yBACf;wBACD,OAAO,EAAE,GAAG;qBACb;oBACD,8BAA8B,EAAE;wBAC9B,MAAM,EAAE;4BACN,IAAI,EAAE,QAAQ;yBACf;wBACD,OAAO,EAAE,sBAAsB;qBAChC;oBACD,8BAA8B,EAAE;wBAC9B,MAAM,EAAE;4BACN,IAAI,EAAE,QAAQ;yBACf;wBACD,OAAO,EAAE,6BAA6B;qBACvC;iBACF;aACF;SACF;QACD,iCAAiC,EAAE;YACjC,IAAI,EAAE,MAAM;YACZ,gBAAgB,EAAE;gBAChB,kBAAkB,EAAE,qBAAqB;aAC1C;YACD,SAAS,EAAE;gBACT,OAAO,EAAE;oBACP,UAAU,EAAE,KAAK;oBACjB,kBAAkB,EAAE;wBAClB,oDAAoD,EAAE,KAAK;wBAC3D,qDAAqD,EAAE,2BAA2B;wBAClF,qDAAqD,EAAE,+BAA+B;qBACvF;iBACF;aACF;YACD,mBAAmB,EAAE,eAAe;SACrC;KACF,CAAA;AACH,CAAC;AAED,SAAS,YAAY,CAAE,OAAY,EAAE,KAAU;;IAC7C,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,CAAC,UAAU,GAAG,EAAE,CAAA;IAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;IACrC,MAAM,OAAO,GAAG,MAAA,KAAK,CAAC,OAAO,mCAAI,EAAE,CAAA;IACnC,MAAM,IAAI,GAAG,MAAA,KAAK,CAAC,IAAI,mCAAI,QAAQ,CAAA;IACnC,MAAM,KAAK,GAAG,MAAA,KAAK,CAAC,OAAO,mCAAI,EAAE,CAAA;IAEjC,qDAAqD;IACrD,wCAAwC;IACxC,wDAAwD;IACxD,MAAM,GAAG,GAAG,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,EAAE,0CAAE,IAAI,GAAG,WAAW,EAAE,mCAAI,EAAE,CAAA;IACjD,IAAI,QAAQ,GAAG,CAAC,GAAG,KAAK,MAAM,CAAC,CAAA;IAC/B,IAAI,GAAG,KAAK,MAAM;QAAE,QAAQ,GAAG,MAAA,KAAK,CAAC,QAAQ,mCAAI,KAAK,CAAA;IAEtD,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,4BAAgB,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEnI,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,MAAA,WAAW,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/G,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IACnC,IAAI,KAAK;QAAE,WAAW,IAAI,KAAK,CAAA;IAE/B,4EAA4E;IAC5E,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,IAAI,KAAK,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC;QAChD,UAAU,CAAC,IAAI,CAAC;YACd,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,WAAW;YACX,OAAO,EAAE,OAAO,IAAI,SAAS;YAC7B,QAAQ;YACR,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;SACtC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAE,KAAyB,EAAE,SAAiB,EAAE,SAAkB;IACnF,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IACnD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACvC,IAAI,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;IACxB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAChE,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;QACjB,IAAI,KAAK,QAAQ;QACjB,IAAI,KAAK,SAAS;QAClB,IAAI,KAAK,SAAS;QAClB,IAAI,KAAK,KAAK;QACd,IAAI,KAAK,MAAM,CACpB,EAAE,CAAC;QACF,OAAO,SAAS;YACd,CAAC,CAAC;gBACE,IAAI,EAAE,wBAAwB,IAAI,EAAE;aACrC;YACH,CAAC,CAAC;gBACE,MAAM,EAAE;oBACN,IAAI,EAAE,wBAAwB,IAAI,EAAE;iBACrC;aACF,CAAA;IACP,CAAC;IACD,IAAI,IAAI,KAAK,KAAK;QAAE,IAAI,GAAG,SAAS,CAAA;IACpC,IAAI,IAAI,KAAK,MAAM;QAAE,IAAI,GAAG,SAAS,CAAA;IACrC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,SAAS,CAAA;IAC7B,OAAO,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAA;AACpG,CAAC"}
|
|
1
|
+
{"version":3,"file":"openApiConstruction.js","sourceRoot":"","sources":["../../../src/lib/openAPI/openApiConstruction.ts"],"names":[],"mappings":"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"}
|
package/build/lib/pathResolve.js
CHANGED
|
@@ -3,7 +3,7 @@ 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.resolvePaths =
|
|
6
|
+
exports.resolvePaths = resolvePaths;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
// Find the path roots in the project directory
|
|
@@ -23,5 +23,4 @@ function resolvePaths() {
|
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
-
exports.resolvePaths = resolvePaths;
|
|
27
26
|
//# sourceMappingURL=pathResolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathResolve.js","sourceRoot":"","sources":["../../src/lib/pathResolve.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pathResolve.js","sourceRoot":"","sources":["../../src/lib/pathResolve.ts"],"names":[],"mappings":";;;;;AAIA,oCAqBC;AAzBD,gDAAuB;AACvB,4CAAmB;AAEnB,+CAA+C;AAC/C,SAAgB,YAAY;IAQ1B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,IAAI,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC1C,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAA;YAC1D,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC9C,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAA;YACvD,MAAM,QAAQ,GAAG,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;YACjG,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;QAC/E,CAAC;IACH,CAAC;AACH,CAAC"}
|
package/build/lib/utils.js
CHANGED
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
25
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -32,7 +42,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
42
|
});
|
|
33
43
|
};
|
|
34
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.
|
|
45
|
+
exports.delay = delay;
|
|
46
|
+
exports.FolderToZip = FolderToZip;
|
|
47
|
+
exports.UnzipToFolder = UnzipToFolder;
|
|
36
48
|
/* eslint @typescript-eslint/no-var-requires: "off" */
|
|
37
49
|
const executeCommand_1 = require("./executeCommand");
|
|
38
50
|
const ac = __importStar(require("ansi-colors"));
|
|
@@ -46,7 +58,6 @@ function delay(ms // milliseconds to delay
|
|
|
46
58
|
return yield new Promise(resolve => { setTimeout(resolve, ms); });
|
|
47
59
|
});
|
|
48
60
|
}
|
|
49
|
-
exports.delay = delay;
|
|
50
61
|
function FolderToZip(folderPath, zipPath) {
|
|
51
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
63
|
return yield new Promise(resolve => {
|
|
@@ -60,7 +71,6 @@ function FolderToZip(folderPath, zipPath) {
|
|
|
60
71
|
});
|
|
61
72
|
});
|
|
62
73
|
}
|
|
63
|
-
exports.FolderToZip = FolderToZip;
|
|
64
74
|
function UnzipToFolder(zipPath_1, folderPath_1) {
|
|
65
75
|
return __awaiter(this, arguments, void 0, function* (zipPath, folderPath, replace = true) {
|
|
66
76
|
// TODO: using CLI -- find a good package. "unzip" has vulnerabilities. Try others.
|
|
@@ -73,5 +83,4 @@ function UnzipToFolder(zipPath_1, folderPath_1) {
|
|
|
73
83
|
}
|
|
74
84
|
});
|
|
75
85
|
}
|
|
76
|
-
exports.UnzipToFolder = UnzipToFolder;
|
|
77
86
|
//# sourceMappingURL=utils.js.map
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUA,sBAIC;AAED,kCAYC;AACD,sCAaC;AA1CD,sDAAsD;AACtD,qDAAiD;AACjD,gDAAiC;AACjC,uCAAwB;AAExB,wBAAwB;AAExB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAEjC,yCAAyC;AACzC,SAAsB,KAAK,CACzB,EAAU,CAAC,wBAAwB;;;QAEnC,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;IAClE,CAAC;CAAA;AAED,SAAsB,WAAW,CAC/B,UAAkB,EAClB,OAAe;;QAEf,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,UAAU,GAAQ,EAAE,MAAkB;gBAC5E,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI;oBAAE,MAAM,GAAG,CAAA;gBAC9D,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,MAAM,CAAC,CAAA;YACjB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AACD,SAAsB,aAAa;yDACjC,OAAe,EACf,UAAkB,EAClB,UAAmB,IAAI;QAEvB,mFAAmF;QAEnF,IAAI,OAAO;YAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACpE,MAAM,MAAM,GAAwC,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAA;QAC9G,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,OAAO,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;YAC3F,MAAM,KAAK,EAAE,CAAA;QACf,CAAC;IACH,CAAC;CAAA"}
|
package/build/lift.js
CHANGED
|
@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
17
17
|
}) : function(o, v) {
|
|
18
18
|
o["default"] = v;
|
|
19
19
|
});
|
|
20
|
-
var __importStar = (this && this.__importStar) || function (
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
};
|
|
20
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
21
|
+
var ownKeys = function(o) {
|
|
22
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
23
|
+
var ar = [];
|
|
24
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
25
|
+
return ar;
|
|
26
|
+
};
|
|
27
|
+
return ownKeys(o);
|
|
28
|
+
};
|
|
29
|
+
return function (mod) {
|
|
30
|
+
if (mod && mod.__esModule) return mod;
|
|
31
|
+
var result = {};
|
|
32
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
33
|
+
__setModuleDefault(result, mod);
|
|
34
|
+
return result;
|
|
35
|
+
};
|
|
36
|
+
})();
|
|
27
37
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
28
38
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
29
39
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -68,7 +78,7 @@ function processCommand() {
|
|
|
68
78
|
yield (0, doctor_1.doDoctor)();
|
|
69
79
|
return;
|
|
70
80
|
case 'init':
|
|
71
|
-
return yield (0, init_1.doInit)((_b = args[0]) !== null && _b !== void 0 ? _b : '');
|
|
81
|
+
return yield (0, init_1.doInit)((_b = args[0]) !== null && _b !== void 0 ? _b : '', args[1]); // folder, clientType (react or js default js)
|
|
72
82
|
case 'create':
|
|
73
83
|
return (0, create_1.doCreate)((_c = args[0]) !== null && _c !== void 0 ? _c : '');
|
|
74
84
|
case 'build':
|
package/build/lift.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":";;AAEA,2DAA2D
|
|
1
|
+
{"version":3,"file":"lift.js","sourceRoot":"","sources":["../src/lift.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tremho/mist-lift",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.5.2",
|
|
4
4
|
"description": "lift command line utility for MistLift development",
|
|
5
5
|
"main": "build/lift.js",
|
|
6
6
|
"bin": {
|
|
7
7
|
"lift": "build/lift.js"
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
10
|
-
"prepublish": "npx rimraf build && npm run build && npm run lint",
|
|
10
|
+
"prepublish": "npx rimraf build && npx rimraf QSTest && npm run build && npm run lint",
|
|
11
11
|
"clean": "npx rimraf build ; npx rimraf node_modules ; npm install",
|
|
12
12
|
"build": "run-script-os",
|
|
13
13
|
"build:windows": "tsc & npm run postbuild",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"lint": "ts-standard --fix src",
|
|
16
16
|
"test": "npm run build && npm run unitTest && npm run integrationTest",
|
|
17
17
|
"unitTest": "tap --reporter=base --color --passes --disable-coverage src/lib/**/*.test.ts",
|
|
18
|
-
"integrationTest": "tap -t
|
|
18
|
+
"integrationTest": "tap -t 200 --reporter=base --color --passes --disable-coverage src/**/*.test.ts",
|
|
19
19
|
"indev": "run-script-os",
|
|
20
20
|
"indev:nix": "echo nix",
|
|
21
21
|
"indev:windows": "echo windows",
|
|
@@ -74,7 +74,6 @@
|
|
|
74
74
|
"@types/node": "^20.14.2",
|
|
75
75
|
"@types/tap": "^15.0.11",
|
|
76
76
|
"@types/ws": "^8.5.10",
|
|
77
|
-
"axios": "^1.7.2",
|
|
78
77
|
"rimraf": "^5.0.7",
|
|
79
78
|
"run-script-os": "^1.1.6",
|
|
80
79
|
"tap": "^19.2.5",
|
|
@@ -28,7 +28,7 @@ export default async function updateDeployedPermissions (apiId: string): Promise
|
|
|
28
28
|
return false
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
const accountId: string = await getAccountId()
|
|
31
|
+
const accountId: string = await getAccountId() ?? ''
|
|
32
32
|
const region: string = getSettings().awsPreferredRegion ?? ''
|
|
33
33
|
|
|
34
34
|
const client = new LambdaClient(getAWSCredentials())
|
|
@@ -63,7 +63,7 @@ let basePath = ''
|
|
|
63
63
|
/**
|
|
64
64
|
* Exports the webroot according to configuration
|
|
65
65
|
*/
|
|
66
|
-
export async function ExportWebroot (): Promise<any> {
|
|
66
|
+
export async function ExportWebroot (): Promise<any> | never {
|
|
67
67
|
const projectPaths = resolvePaths()
|
|
68
68
|
basePath = projectPaths.basePath
|
|
69
69
|
const webrootConfig = readWebrootConfig(path.join(basePath, 'webrootConfig.json'))
|
|
@@ -81,7 +81,7 @@ export async function ExportWebroot (): Promise<any> {
|
|
|
81
81
|
await exportScript(fla, webrootConfig.options as WebrootScriptOptions)
|
|
82
82
|
break
|
|
83
83
|
default: {
|
|
84
|
-
throw new Error(
|
|
84
|
+
throw new Error('UNSUPPORTED WEBROOT EXPORT TYPE (must be SELF, S3, or SCRIPT)')
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -105,7 +105,7 @@ export async function getWebrootSettings (): Promise<{ webrootMethod: string, we
|
|
|
105
105
|
break
|
|
106
106
|
}
|
|
107
107
|
default: {
|
|
108
|
-
const unreachable:
|
|
108
|
+
const unreachable: string = webrootConfig.type ?? '<none?'
|
|
109
109
|
throw new Error(`UNSUPPORTED WEBROOT EXPORT ${unreachable}`)
|
|
110
110
|
}
|
|
111
111
|
}
|
|
@@ -144,7 +144,7 @@ async function exportSelf (): Promise<void> {
|
|
|
144
144
|
await DeployRootFileserves()
|
|
145
145
|
}
|
|
146
146
|
|
|
147
|
-
async function exportScript (fla: string[], options: WebrootScriptOptions) {
|
|
147
|
+
async function exportScript (fla: string[], options: WebrootScriptOptions): Promise<void> {
|
|
148
148
|
// console.log(">> exportScript")
|
|
149
149
|
// console.log(" >> DeployWebrootBuiltIn")
|
|
150
150
|
// await DeployWebrootBuiltIn(true)
|
|
@@ -175,7 +175,7 @@ async function getUpdatedExportFileList (): Promise<string[]> {
|
|
|
175
175
|
// enumerate at webroot and files from all non-root directories
|
|
176
176
|
const folder = path.join(basePath, 'webroot')
|
|
177
177
|
const rootpathsteps = folder.split(path.sep).length
|
|
178
|
-
const enumerating = true
|
|
178
|
+
// const enumerating = true
|
|
179
179
|
|
|
180
180
|
function gatherFiles (filepath: string, stats: fs.Stats): boolean {
|
|
181
181
|
// console.log(filepath, {steps:filepath.split(path.sep).length, rootpathsteps, isDir:stats.isDirectory()})
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
/* eslint-disable */
|
|
2
|
+
|
|
1
3
|
import { S3Client } from '@aws-sdk/client-s3'
|
|
2
4
|
import { s3ListObjects, s3CreateBucket, s3UploadFile, s3Delete, S3ActionsLog } from '@tremho/basic-s3-actions'
|
|
3
5
|
import * as fs from 'fs'
|
|
@@ -76,3 +78,5 @@ export function getS3Prefix () {
|
|
|
76
78
|
const name = determineBucketName()
|
|
77
79
|
return `https://${name}.s3.us-west-1.amazonaws.com/`
|
|
78
80
|
}
|
|
81
|
+
|
|
82
|
+
/* eslint-enable */
|
package/src/commands/help.ts
CHANGED
|
@@ -74,10 +74,12 @@ function helpHelp (): void {
|
|
|
74
74
|
}
|
|
75
75
|
export function helpInit (): void {
|
|
76
76
|
printBanner('init')
|
|
77
|
-
console.log('use ' + ac.bold('lift init .') + '
|
|
78
|
-
|
|
77
|
+
console.log('use ' + ac.bold('lift init ' + ac.grey.dim('projectPath') + ac.grey.dim('[, clientType]')) + ac.grey.italic(' where clientType is one of "js" or "react", default=js') +
|
|
78
|
+
' to create a new directory at ' +
|
|
79
79
|
ac.grey.dim('projectPath') + ' if it does not exist and init a MistLift project in that directory, if not already initialized')
|
|
80
80
|
console.log('')
|
|
81
|
+
console.log('Paths are relative. Use ' + ac.bold('.') + ' to init the current directory')
|
|
82
|
+
|
|
81
83
|
console.log('This will begin an interactive session where you will be asked questions about the project you are creating.')
|
|
82
84
|
console.log('The project will be complete and ready to run right away.')
|
|
83
85
|
console.log('You can then modify the application to your needs.')
|
package/src/commands/init.ts
CHANGED
|
@@ -22,12 +22,18 @@ import { addPackageScripts, installPackage, installDevPackage } from './actions/
|
|
|
22
22
|
|
|
23
23
|
export async function doInit (
|
|
24
24
|
folder?: string,
|
|
25
|
+
clientType?: string,
|
|
25
26
|
defaults?: boolean
|
|
26
27
|
): Promise<void> {
|
|
27
28
|
if (folder === undefined || folder === '') {
|
|
28
29
|
helpInit()
|
|
29
30
|
return
|
|
30
31
|
}
|
|
32
|
+
if (clientType?.length === 0) clientType = 'js'
|
|
33
|
+
if (clientType?.toLowerCase() !== 'react' && clientType?.toLowerCase() !== 'js') {
|
|
34
|
+
helpInit()
|
|
35
|
+
return
|
|
36
|
+
}
|
|
31
37
|
const cwd = process.cwd()
|
|
32
38
|
const refPath = path.isAbsolute(folder) ? path.normalize(folder) : path.normalize(path.join(cwd, folder))
|
|
33
39
|
if (!fs.existsSync(refPath)) {
|
|
@@ -62,14 +68,51 @@ export async function doInit (
|
|
|
62
68
|
fs.copyFileSync(path.join(webrootSrcDir, 'app.css'), path.join(webroot, 'app.css'))
|
|
63
69
|
fs.copyFileSync(path.join(webrootSrcDir, 'watcher.js'), path.join(webroot, 'watcher.js'))
|
|
64
70
|
|
|
65
|
-
|
|
71
|
+
localConfig(clientType, refPath)
|
|
72
|
+
|
|
73
|
+
if (clientType === 'react') {
|
|
74
|
+
const appPath = path.join(refPath, 'app')
|
|
75
|
+
const appSrc = path.join(swaggerSrcDir, 'app')
|
|
76
|
+
if (!fs.existsSync(appPath)) {
|
|
77
|
+
fs.mkdirSync(appPath)
|
|
78
|
+
fs.copyFileSync(path.join(appSrc, 'app.tsx'), path.join(appPath, 'app.tsx'))
|
|
79
|
+
fs.copyFileSync(path.join(appSrc, 'MainPage.tsx'), path.join(appPath, 'MainPage.tsx'))
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
await interrogateUserForPackageJsonSettings(refPath, defaults)
|
|
84
|
+
await addPackageScripts(refPath)
|
|
85
|
+
if (clientType === 'react') {
|
|
86
|
+
await installPackage(refPath, 'react')
|
|
87
|
+
await installPackage(refPath, 'react-dom')
|
|
88
|
+
await installPackage(refPath, 'react-router-dom')
|
|
89
|
+
await installDevPackage(refPath, '@types/react')
|
|
90
|
+
}
|
|
91
|
+
await installDevPackage(refPath, '@types/node')
|
|
92
|
+
await installDevPackage(refPath, 'typescript')
|
|
93
|
+
await installDevPackage(refPath, 'tap')
|
|
94
|
+
await installDevPackage(refPath, '@tremho/tap-assert')
|
|
95
|
+
await installPackage(refPath, '@tremho/inverse-y')
|
|
66
96
|
}
|
|
67
97
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
98
|
+
function localConfig (clientType: string, refpath: string): void {
|
|
99
|
+
const config: any = {
|
|
100
|
+
port: 8081,
|
|
101
|
+
rebuildFunctionsOnChange: false,
|
|
102
|
+
refreshBrowserOnFunctionChange: false,
|
|
103
|
+
refreshBrowserOnWebrootChange: false
|
|
104
|
+
}
|
|
105
|
+
if (clientType === 'react') {
|
|
106
|
+
config.esbuild = {
|
|
107
|
+
watch: false,
|
|
108
|
+
entryPoints: [
|
|
109
|
+
'app/app.tsx'
|
|
110
|
+
],
|
|
111
|
+
outdir: 'webroot'
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
const content = JSON.stringify(config, null, 2)
|
|
116
|
+
fs.writeFileSync(path.join(refpath, 'localServerConfig.json'), content)
|
|
117
|
+
}
|
|
75
118
|
}
|
package/src/commands/package.ts
CHANGED
|
@@ -169,7 +169,9 @@ async function packageFunction (funcName: string): Promise<number> {
|
|
|
169
169
|
}
|
|
170
170
|
const publishUrl = pubInfo.url ?? '/'
|
|
171
171
|
|
|
172
|
-
|
|
172
|
+
/* eslint-disable */
|
|
173
|
+
const stage = publishUrl.substring(publishUrl.lastIndexOf('/')) + 1
|
|
174
|
+
/* eslint-enable */
|
|
173
175
|
setWebroot(webrootExport.webrootMethod, webrootExport.webrootBaseUrl)
|
|
174
176
|
setAws(stage, publishUrl)
|
|
175
177
|
// console.log("getServiceSettings", getServiceSettings())
|